Diff of the two buildlogs:

--
--- b1/build.log	2025-08-27 08:26:58.090370050 +0000
+++ b2/build.log	2025-08-27 08:34:58.466934246 +0000
@@ -1,7 +1,6 @@
-W: cgroups are not available on the host, not using them.
 I: pbuilder: network access will be disabled during build
-I: Current time: Tue Aug 26 20:17:23 -12 2025
-I: pbuilder-time-stamp: 1756282643
+I: Current time: Wed Sep 30 04:50:04 +14 2026
+I: pbuilder-time-stamp: 1790693404
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/unstable-reproducible-base.tgz]
 I: copying local configuration
@@ -23,52 +22,85 @@
 dpkg-source: info: unpacking git_2.51.0-1.debian.tar.xz
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/295742/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/1962045/tmp/hooks/D01_modify_environment starting
+debug: Running on codethink03-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 Sep 29 14:50 /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/1962045/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/1962045/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='unstable'
-  HOME='/root'
-  HOST_ARCH='arm64'
+  DIRSTACK=()
+  DISTRIBUTION=unstable
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=aarch64
+  HOST_ARCH=arm64
   IFS=' 	
   '
-  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='295742'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=4420f966f3de401796aea5c1d8d82955
+  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=1962045
   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.U1cr0Zix/pbuilderrc_n0XY --distribution unstable --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.U1cr0Zix/b1 --logfile b1/build.log git_2.51.0-1.dsc'
-  SUDO_GID='109'
-  SUDO_HOME='/var/lib/jenkins'
-  SUDO_UID='104'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/sbin/chroot'
-  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.U1cr0Zix/pbuilderrc_tsl4 --distribution unstable --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.U1cr0Zix/b2 --logfile b2/build.log git_2.51.0-1.dsc'
+  SUDO_GID=109
+  SUDO_HOME=/var/lib/jenkins
+  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 codethink04-arm64 6.12.41+deb13-cloud-arm64 #1 SMP Debian 6.12.41-1 (2025-08-12) aarch64 GNU/Linux
+  Linux i-capture-the-hostname 6.12.41+deb13-cloud-arm64 #1 SMP Debian 6.12.41-1 (2025-08-12) aarch64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 Aug 10 12:30 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/295742/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Aug 10  2025 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/1962045/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -309,7 +341,7 @@
 Get: 153 http://deb.debian.org/debian unstable/main arm64 tcl arm64 8.6.16 [4096 B]
 Get: 154 http://deb.debian.org/debian unstable/main arm64 unzip arm64 6.0-29 [163 kB]
 Get: 155 http://deb.debian.org/debian unstable/main arm64 xmlto arm64 0.0.29-2 [27.3 kB]
-Fetched 51.5 MB in 0s (119 MB/s)
+Fetched 51.5 MB in 0s (185 MB/s)
 Preconfiguring packages ...
 Selecting previously unselected package libexpat1: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 ... 20011 files and directories currently installed.)
@@ -819,8 +851,8 @@
 Setting up tzdata (2025b-5) ...
 
 Current default time zone: 'Etc/UTC'
-Local time is now:      Wed Aug 27 08:17:45 UTC 2025.
-Universal Time is now:  Wed Aug 27 08:17:45 UTC 2025.
+Local time is now:      Tue Sep 29 14:50:25 UTC 2026.
+Universal Time is now:  Tue Sep 29 14:50:25 UTC 2026.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 Setting up liberror-perl (0.17030-1) ...
@@ -964,7 +996,11 @@
 fakeroot is already the newest version (1.37.1.2-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.51.0/ && 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.51.0-1_source.changes
+I: user script /srv/workspace/pbuilder/1962045/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for unstable
+I: user script /srv/workspace/pbuilder/1962045/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/git-2.51.0/ && 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.51.0-1_source.changes
 dpkg-buildpackage: info: source package git
 dpkg-buildpackage: info: source version 1:2.51.0-1
 dpkg-buildpackage: info: source distribution unstable
@@ -985,6 +1021,9 @@
 GIT_VERSION=2.51.0
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f /build/reproducible-path/git-2.51.0/./*.gcda /build/reproducible-path/git-2.51.0/builtin/*.gcda /build/reproducible-path/git-2.51.0/compat/*.gcda /build/reproducible-path/git-2.51.0/compat/linux/*.gcda /build/reproducible-path/git-2.51.0/compat/simple-ipc/*.gcda /build/reproducible-path/git-2.51.0/compiler-tricks/*.gcda /build/reproducible-path/git-2.51.0/ewah/*.gcda /build/reproducible-path/git-2.51.0/negotiator/*.gcda /build/reproducible-path/git-2.51.0/oss-fuzz/*.gcda /build/reproducible-path/git-2.51.0/refs/*.gcda /build/reproducible-path/git-2.51.0/reftable/*.gcda /build/reproducible-path/git-2.51.0/sha1dc/*.gcda /build/reproducible-path/git-2.51.0/sha256/block/*.gcda /build/reproducible-path/git-2.51.0/t/helper/*.gcda /build/reproducible-path/git-2.51.0/t/unit-tests/*.gcda /build/reproducible-path/git-2.51.0/t/unit-tests/clar/*.gcda /build/reproducible-path/git-2.51.0/trace2/*.gcda /build/reproducible-path/git-2.51.0/xdiff/*.gcda
 rm -f /build/reproducible-path/git-2.51.0/./*.gcno /build/reproducible-path/git-2.51.0/builtin/*.gcno /build/reproducible-path/git-2.51.0/compat/*.gcno /build/reproducible-path/git-2.51.0/compat/linux/*.gcno /build/reproducible-path/git-2.51.0/compat/simple-ipc/*.gcno /build/reproducible-path/git-2.51.0/compiler-tricks/*.gcno /build/reproducible-path/git-2.51.0/ewah/*.gcno /build/reproducible-path/git-2.51.0/negotiator/*.gcno /build/reproducible-path/git-2.51.0/oss-fuzz/*.gcno /build/reproducible-path/git-2.51.0/refs/*.gcno /build/reproducible-path/git-2.51.0/reftable/*.gcno /build/reproducible-path/git-2.51.0/sha1dc/*.gcno /build/reproducible-path/git-2.51.0/sha256/block/*.gcno /build/reproducible-path/git-2.51.0/t/helper/*.gcno /build/reproducible-path/git-2.51.0/t/unit-tests/*.gcno /build/reproducible-path/git-2.51.0/t/unit-tests/clar/*.gcno /build/reproducible-path/git-2.51.0/trace2/*.gcno /build/reproducible-path/git-2.51.0/xdiff/*.gcno
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
@@ -994,9 +1033,6 @@
 rm -f contrib/coccinelle/*.cocci.patch
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f ./*.gcov builtin/*.gcov compat/*.gcov compat/linux/*.gcov compat/simple-ipc/*.gcov compiler-tricks/*.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 compiler-tricks/*.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
@@ -1120,106 +1156,76 @@
     * new prefix flags
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  alloc.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  common-main.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  advice.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  archive-zip.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  checkout.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bundle-uri.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  chunk-format.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  common-exit.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  color.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  cache-tree.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o compat/open.o -c -MF compat/.depend/open.o.d -MQ compat/open.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/open.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc -o compiler-tricks/not-constant.o -c -MF compiler-tricks/.depend/not-constant.o.d -MQ compiler-tricks/not-constant.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compiler-tricks/not-constant.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  column.c
+gcc -o compat/open.o -c -MF compat/.depend/open.o.d -MQ compat/open.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/open.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  connected.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/terminal.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ctype.c
@@ -1231,222 +1237,225 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  convert.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit-reach.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-merges.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  blame.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-no-index.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diagnose.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-delta.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-delta.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  delta-islands.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-order.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-rotate.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  date.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  dir-iterator.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  combine-diff.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-pickaxe.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/ewah_io.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/bitmap.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/ewah_rlw.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fetch-negotiator.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  environment.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DETC_GITCONFIG='"/etc/gitconfig"' config.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsmonitor-settings.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsmonitor.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  apply.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  git-zlib.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /bin/sh ./generate-cmdlist.sh \
 	 \
 	. command-list.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hash-lookup.c
+gcc -o hash.o -c -MF ./.depend/hash.o.d -MQ 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hash.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o hash.o -c -MF ./.depend/hash.o.d -MQ 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hash.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsmonitor.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hex.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hashmap.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hook.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsck.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  json-writer.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  graph.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  linear-assignment.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  line-range.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  list-objects-filter-options.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  lockfile.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  list-objects-filter.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  list-objects.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  grep.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ident.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  loose.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  mailmap.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-blobs.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ll.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  negotiator/default.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  kwset.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  log-tree.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  negotiator/noop.c
@@ -1458,25 +1467,22 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  mailinfo.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes-utils.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  line-log.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes-utils.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fetch-pack.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object-file-convert.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  midx.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oidmap.c
@@ -1485,9 +1491,6 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
@@ -1497,133 +1500,139 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oidset.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+gcc -o odb.o -c -MF ./.depend/odb.o.d -MQ odb.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  odb.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-objects.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object-file.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-revindex.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o odb.o -c -MF ./.depend/odb.o.d -MQ odb.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  odb.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  midx-write.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parallel-checkout.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-write.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse-options-cb.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  patch-ids.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object-name.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-bitmap-write.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  prio-queue.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  path-walk.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  preload-index.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  prompt.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pkt-line.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  packfile.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  protocol-caps.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  progress.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse-options.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  prune-packed.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pathspec.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rebase-interactive.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rebase.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  quote.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reachable.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  path.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reflog.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reflog-walk.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-bitmap.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pseudo-merge.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ort.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refspec.c
@@ -1632,52 +1641,49 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  repo-settings.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  repository.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pretty.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/ref-cache.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reset.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  resolve-undo.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  serve.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rerere.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  server-info.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ref-filter.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  run-command.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc -o sideband.o -c -MF ./.depend/sideband.o.d -MQ sideband.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sideband.c
@@ -1686,40 +1692,37 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  split-index.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  shallow.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  remote.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  read-cache.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  streaming.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  split-index.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sub-process.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strvec.c
@@ -1728,6 +1731,12 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
@@ -1737,10 +1746,7 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_ctr.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_cmd_name.c
@@ -1749,52 +1755,52 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_sid.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_sysenv.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tbuf.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_dst.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strbuf.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_normal.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  submodule-config.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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_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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tls.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  submodule.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tree-diff.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_event.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tree.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_perf.c
@@ -1803,112 +1809,112 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  userdiff.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  transport-helper.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  usage.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trailer.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  versioncmp.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  varint.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  wildmatch.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  revision.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  transport.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  upload-pack.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unix-socket.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  write-or-die.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/simple-ipc/ipc-shared.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff-interface.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/simple-ipc/ipc-unix-socket.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/qsort_s.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/fopen.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha256/block/sha256.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha1dc/ubc_check.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xemit.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xpatience.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xhistogram.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unpack-trees.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xdiffi.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xmerge.c
@@ -1917,25 +1923,25 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/iter.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/basics.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/pq.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xutils.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/merged.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/blocksource.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/pq.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/block.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/system.c
@@ -1944,7 +1950,7 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha1dc/sha1.c
+gcc -o reftable/table.o -c -MF reftable/.depend/table.o.d -MQ reftable/table.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/table.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  shell.c
@@ -1953,31 +1959,39 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/writer.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o reftable/table.o -c -MF reftable/.depend/table.o.d -MQ reftable/table.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/table.c
+    * new script parameters
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/stack.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-    * new script parameters
+    * new perl-specific parameters
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-    * new perl-specific parameters
+/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+./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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/record.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-walker.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/annotate.c
@@ -1986,10 +2000,7 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/backfill.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/archive.c
@@ -1998,22 +2009,22 @@
 /bin/sh ./generate-hooklist.sh . hook-list.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  imap-send.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/add.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-attr.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  remote-curl.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/bundle.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-mailmap.c
@@ -2022,70 +2033,73 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-ref-format.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-push.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout-index.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/commit-graph.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/branch.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/cat-file.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential-cache.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  wt-status.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential-cache--daemon.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/clean.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-files.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-index.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-files.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-tree.c
@@ -2094,58 +2108,61 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/am.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fetch-pack.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fmt-merge-msg.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/config.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/for-each-ref.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/describe.c
+/bin/sh ./generate-configlist.sh . config-list.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/get-tar-commit-id.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh ./generate-configlist.sh . config-list.h
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/difftool.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/init-db.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/clone.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/interpret-trailers.c
@@ -2154,37 +2171,34 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-base.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fast-export.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-tree.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-recursive.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mailsplit.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-files.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mktag.c
@@ -2193,10 +2207,10 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/multi-pack-index.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-tree.c
@@ -2205,49 +2219,58 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/name-rev.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-refs.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/gc.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/patch-id.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/prune.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/index-pack.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/notes.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fast-import.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-redundant.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/log.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote-fd.c
@@ -2256,61 +2279,64 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote-ext.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/reflog.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/push.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pull.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rerere.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/replay.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/revert.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rm.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/replace.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/shortlog.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/reset.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/send-pack.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/show-index.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/stripspace.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/sparse-checkout.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/show-ref.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/shortlog.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/sparse-checkout.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/unpack-file.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/show-branch.c
@@ -2319,63 +2345,84 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/update-server-info.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/repack.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/update-index.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/upload-pack.c
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote.c
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/verify-commit.c
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/stash.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/upload-archive.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-mergetool--lib.sh" "git-mergetool--lib+" ./GIT-BUILD-OPTIONS && \
-mv git-mergetool--lib+ git-mergetool--lib
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-sh-i18n.sh" "git-sh-i18n+" ./GIT-BUILD-OPTIONS && \
-mv git-sh-i18n+ git-sh-i18n
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/var.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-sh-setup.sh" "git-sh-setup+" ./GIT-BUILD-OPTIONS && \
-mv git-sh-setup+ git-sh-setup
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/verify-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/write-tree.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-GIT_BUILT_FROM_COMMIT="" GIT_DATE="" GIT_USER_AGENT="git/2.51.0" GIT_VERSION="" /bin/sh ""/build/reproducible-path/git-2.51.0"/GIT-VERSION-GEN" ""/build/reproducible-path/git-2.51.0"" "version-def.h.in" "version-def.h"
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+GIT_BUILT_FROM_COMMIT="" GIT_DATE="" GIT_USER_AGENT="git/2.51.0" GIT_VERSION="" /bin/sh ""/build/reproducible-path/git-2.51.0"/GIT-VERSION-GEN" ""/build/reproducible-path/git-2.51.0"" "version-def.h.in" "version-def.h"
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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/record.o reftable/stack.o reftable/system.o reftable/table.o reftable/tree.o reftable/writer.o
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
@@ -2383,9 +2430,6 @@
 mv git-difftool--helper+ git-difftool--helper
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 ./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.51.0'
@@ -2398,29 +2442,33 @@
 mv git-merge-one-file+ git-merge-one-file
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/receive-pack.c
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-mergetool.sh" "git-mergetool+" ./GIT-BUILD-OPTIONS && \
-mv git-mergetool+ git-mergetool
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-merge-resolve.sh" "git-merge-resolve+" ./GIT-BUILD-OPTIONS && \
-mv git-merge-resolve+ git-merge-resolve
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 ./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 ./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+./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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+./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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 \
 INSTLIBDIR='/usr/share/perl5' && \
 INSTLIBDIR_EXTRA='' && \
@@ -2434,19 +2482,10 @@
 mv GIT-PERL-HEADER+ GIT-PERL-HEADER
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-instaweb.sh" "git-instaweb+" ./GIT-BUILD-OPTIONS && \
-chmod +x git-instaweb+ && \
-mv git-instaweb+ git-instaweb
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/tag.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-archimport.perl" "git-archimport+" && \
@@ -2461,25 +2500,28 @@
 mv git-cvsimport+ git-cvsimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rebase.c
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-send-email.perl" "git-send-email+" && \
+mv git-send-email+ git-send-email
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsserver.perl" "git-cvsserver+" && \
 mv git-cvsserver+ git-cvsserver
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-send-email.perl" "git-send-email+" && \
-mv git-send-email+ git-send-email
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  version.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DETC_GITATTRIBUTES='"/etc/gitattributes"' attr.c
@@ -2488,34 +2530,31 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  help.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  scalar.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-objects.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/submodule--helper.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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/open.o compat/terminal.o compiler-tricks/not-constant.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 hash.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.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 odb.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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/worktree.c
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-remote-http -Wl,-z,relro   remote-curl.o http.o http-walker.o common-main.o \
@@ -2540,15 +2579,12 @@
 cp git-remote-http git-remote-ftps
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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 \
@@ -2571,12 +2607,6 @@
 cp git git-am
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-annotate && \
 ln git git-annotate 2>/dev/null || \
 ln -s git git-annotate 2>/dev/null || \
@@ -2589,8 +2619,10 @@
 cp git git-apply
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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 \
-	-lcurl    libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread
+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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-backfill && \
@@ -2605,18 +2637,18 @@
 cp git git-bisect
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-blame && \
+ln git git-blame 2>/dev/null || \
+ln -s git git-blame 2>/dev/null || \
+cp git git-blame
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-branch && \
 ln git git-branch 2>/dev/null || \
 ln -s git git-branch 2>/dev/null || \
 cp git git-branch
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-bugreport && \
-ln git git-bugreport 2>/dev/null || \
-ln -s git git-bugreport 2>/dev/null || \
-cp git git-bugreport
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-bundle && \
 ln git git-bundle 2>/dev/null || \
 ln -s git git-bundle 2>/dev/null || \
@@ -2635,6 +2667,12 @@
 cp git git-check-attr
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-bugreport && \
+ln git git-bugreport 2>/dev/null || \
+ln -s git git-bugreport 2>/dev/null || \
+cp git git-bugreport
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-check-ignore && \
 ln git git-check-ignore 2>/dev/null || \
 ln -s git git-check-ignore 2>/dev/null || \
@@ -2647,24 +2685,18 @@
 cp git git-check-mailmap
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-check-ref-format && \
-ln git git-check-ref-format 2>/dev/null || \
-ln -s git git-check-ref-format 2>/dev/null || \
-cp git git-check-ref-format
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-blame && \
-ln git git-blame 2>/dev/null || \
-ln -s git git-blame 2>/dev/null || \
-cp git git-blame
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-checkout--worker && \
 ln git git-checkout--worker 2>/dev/null || \
 ln -s git git-checkout--worker 2>/dev/null || \
 cp git git-checkout--worker
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-check-ref-format && \
+ln git git-check-ref-format 2>/dev/null || \
+ln -s git git-check-ref-format 2>/dev/null || \
+cp git git-check-ref-format
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-checkout-index && \
 ln git git-checkout-index 2>/dev/null || \
 ln -s git git-checkout-index 2>/dev/null || \
@@ -2677,18 +2709,18 @@
 cp git git-checkout
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-clone && \
-ln git git-clone 2>/dev/null || \
-ln -s git git-clone 2>/dev/null || \
-cp git git-clone
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-clean && \
 ln git git-clean 2>/dev/null || \
 ln -s git git-clean 2>/dev/null || \
 cp git git-clean
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-clone && \
+ln git git-clone 2>/dev/null || \
+ln -s git git-clone 2>/dev/null || \
+cp git git-clone
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-column && \
 ln git git-column 2>/dev/null || \
 ln -s git git-column 2>/dev/null || \
@@ -2719,6 +2751,12 @@
 cp git git-config
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-count-objects && \
+ln git git-count-objects 2>/dev/null || \
+ln -s git git-count-objects 2>/dev/null || \
+cp git git-count-objects
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-credential-cache--daemon && \
 ln git git-credential-cache--daemon 2>/dev/null || \
 ln -s git git-credential-cache--daemon 2>/dev/null || \
@@ -2731,12 +2769,6 @@
 cp git git-credential-cache
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-count-objects && \
-ln git git-count-objects 2>/dev/null || \
-ln -s git git-count-objects 2>/dev/null || \
-cp git git-count-objects
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-credential-store && \
 ln git git-credential-store 2>/dev/null || \
 ln -s git git-credential-store 2>/dev/null || \
@@ -2773,10 +2805,8 @@
 cp git git-diff-index
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-diff-pairs && \
-ln git git-diff-pairs 2>/dev/null || \
-ln -s git git-diff-pairs 2>/dev/null || \
-cp git git-diff-pairs
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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 \
+	-lcurl    libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-diff-tree && \
@@ -2785,12 +2815,24 @@
 cp git git-diff-tree
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-diff-pairs && \
+ln git git-diff-pairs 2>/dev/null || \
+ln -s git git-diff-pairs 2>/dev/null || \
+cp git git-diff-pairs
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-diff && \
 ln git git-diff 2>/dev/null || \
 ln -s git git-diff 2>/dev/null || \
 cp git git-diff
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-fast-export && \
+ln git git-fast-export 2>/dev/null || \
+ln -s git git-fast-export 2>/dev/null || \
+cp git git-fast-export
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-difftool && \
 ln git git-difftool 2>/dev/null || \
 ln -s git git-difftool 2>/dev/null || \
@@ -2815,36 +2857,36 @@
 cp git git-fetch
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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 || \
-cp git git-fmt-merge-msg
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-for-each-ref && \
 ln git git-for-each-ref 2>/dev/null || \
 ln -s git git-for-each-ref 2>/dev/null || \
 cp git git-for-each-ref
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-fast-export && \
-ln git git-fast-export 2>/dev/null || \
-ln -s git git-fast-export 2>/dev/null || \
-cp git git-fast-export
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-for-each-repo && \
 ln git git-for-each-repo 2>/dev/null || \
 ln -s git git-for-each-repo 2>/dev/null || \
 cp git git-for-each-repo
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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 || \
+cp git git-fmt-merge-msg
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-fsck && \
 ln git git-fsck 2>/dev/null || \
 ln -s git git-fsck 2>/dev/null || \
 cp git git-fsck
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-fsmonitor--daemon && \
+ln git git-fsmonitor--daemon 2>/dev/null || \
+ln -s git git-fsmonitor--daemon 2>/dev/null || \
+cp git git-fsmonitor--daemon
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-gc && \
 ln git git-gc 2>/dev/null || \
 ln -s git git-gc 2>/dev/null || \
@@ -2875,12 +2917,6 @@
 cp git git-help
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-fsmonitor--daemon && \
-ln git git-fsmonitor--daemon 2>/dev/null || \
-ln -s git git-fsmonitor--daemon 2>/dev/null || \
-cp git git-fsmonitor--daemon
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-hook && \
 ln git git-hook 2>/dev/null || \
 ln -s git git-hook 2>/dev/null || \
@@ -2899,6 +2935,12 @@
 cp git git-init-db
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-log && \
+ln git git-log 2>/dev/null || \
+ln -s git git-log 2>/dev/null || \
+cp git git-log
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-interpret-trailers && \
 ln git git-interpret-trailers 2>/dev/null || \
 ln -s git git-interpret-trailers 2>/dev/null || \
@@ -2911,10 +2953,10 @@
 cp git git-ls-remote
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-log && \
-ln git git-log 2>/dev/null || \
-ln -s git git-log 2>/dev/null || \
-cp git git-log
+rm -f git-ls-tree && \
+ln git git-ls-tree 2>/dev/null || \
+ln -s git git-ls-tree 2>/dev/null || \
+cp git git-ls-tree
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-ls-files && \
@@ -2923,22 +2965,16 @@
 cp git git-ls-files
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-ls-tree && \
-ln git git-ls-tree 2>/dev/null || \
-ln -s git git-ls-tree 2>/dev/null || \
-cp git git-ls-tree
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-mailinfo && \
 ln git git-mailinfo 2>/dev/null || \
 ln -s git git-mailinfo 2>/dev/null || \
 cp git git-mailinfo
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-merge-index && \
-ln git git-merge-index 2>/dev/null || \
-ln -s git git-merge-index 2>/dev/null || \
-cp git git-merge-index
+rm -f git-merge-base && \
+ln git git-merge-base 2>/dev/null || \
+ln -s git git-merge-base 2>/dev/null || \
+cp git git-merge-base
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-mailsplit && \
@@ -2947,12 +2983,6 @@
 cp git git-mailsplit
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-merge-base && \
-ln git git-merge-base 2>/dev/null || \
-ln -s git git-merge-base 2>/dev/null || \
-cp git git-merge-base
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-merge-file && \
 ln git git-merge-file 2>/dev/null || \
 ln -s git git-merge-file 2>/dev/null || \
@@ -2965,10 +2995,10 @@
 cp git git-merge-ours
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-merge-recursive && \
-ln git git-merge-recursive 2>/dev/null || \
-ln -s git git-merge-recursive 2>/dev/null || \
-cp git git-merge-recursive
+rm -f git-merge-index && \
+ln git git-merge-index 2>/dev/null || \
+ln -s git git-merge-index 2>/dev/null || \
+cp git git-merge-index
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-merge-tree && \
@@ -2977,24 +3007,30 @@
 cp git git-merge-tree
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-merge-recursive && \
+ln git git-merge-recursive 2>/dev/null || \
+ln -s git git-merge-recursive 2>/dev/null || \
+cp git git-merge-recursive
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-merge && \
 ln git git-merge 2>/dev/null || \
 ln -s git git-merge 2>/dev/null || \
 cp git git-merge
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-mktree && \
-ln git git-mktree 2>/dev/null || \
-ln -s git git-mktree 2>/dev/null || \
-cp git git-mktree
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-mktag && \
 ln git git-mktag 2>/dev/null || \
 ln -s git git-mktag 2>/dev/null || \
 cp git git-mktag
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-mktree && \
+ln git git-mktree 2>/dev/null || \
+ln -s git git-mktree 2>/dev/null || \
+cp git git-mktree
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-multi-pack-index && \
 ln git git-multi-pack-index 2>/dev/null || \
 ln -s git git-multi-pack-index 2>/dev/null || \
@@ -3013,6 +3049,12 @@
 cp git git-name-rev
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-pack-objects && \
+ln git git-pack-objects 2>/dev/null || \
+ln -s git git-pack-objects 2>/dev/null || \
+cp git git-pack-objects
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-notes && \
 ln git git-notes 2>/dev/null || \
 ln -s git git-notes 2>/dev/null || \
@@ -3025,24 +3067,12 @@
 cp git git-pack-redundant
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-pack-objects && \
-ln git git-pack-objects 2>/dev/null || \
-ln -s git git-pack-objects 2>/dev/null || \
-cp git git-pack-objects
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-pack-refs && \
 ln git git-pack-refs 2>/dev/null || \
 ln -s git git-pack-refs 2>/dev/null || \
 cp git git-pack-refs
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-patch-id && \
 ln git git-patch-id 2>/dev/null || \
 ln -s git git-patch-id 2>/dev/null || \
@@ -3055,24 +3085,30 @@
 cp git git-prune-packed
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-push && \
-ln git git-push 2>/dev/null || \
-ln -s git git-push 2>/dev/null || \
-cp git git-push
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-range-diff && \
 ln git git-range-diff 2>/dev/null || \
 ln -s git git-range-diff 2>/dev/null || \
 cp git git-range-diff
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-push && \
+ln git git-push 2>/dev/null || \
+ln -s git git-push 2>/dev/null || \
+cp git git-push
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-read-tree && \
 ln git git-read-tree 2>/dev/null || \
 ln -s git git-read-tree 2>/dev/null || \
@@ -3091,30 +3127,30 @@
 cp git git-receive-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-remote-fd && \
-ln git git-remote-fd 2>/dev/null || \
-ln -s git git-remote-fd 2>/dev/null || \
-cp git git-remote-fd
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-remote-fd && \
+ln git git-remote-fd 2>/dev/null || \
+ln -s git git-remote-fd 2>/dev/null || \
+cp git git-remote-fd
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-remote && \
 ln git git-remote 2>/dev/null || \
 ln -s git git-remote 2>/dev/null || \
@@ -3139,12 +3175,6 @@
 cp git git-replay
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-rerere && \
-ln git git-rerere 2>/dev/null || \
-ln -s git git-rerere 2>/dev/null || \
-cp git git-rerere
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-reset && \
 ln git git-reset 2>/dev/null || \
 ln -s git git-reset 2>/dev/null || \
@@ -3157,6 +3187,18 @@
 cp git git-rev-list
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-rev-parse && \
+ln git git-rev-parse 2>/dev/null || \
+ln -s git git-rev-parse 2>/dev/null || \
+cp git git-rev-parse
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-rerere && \
+ln git git-rerere 2>/dev/null || \
+ln -s git git-rerere 2>/dev/null || \
+cp git git-rerere
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-revert && \
 ln git git-revert 2>/dev/null || \
 ln -s git git-revert 2>/dev/null || \
@@ -3169,12 +3211,6 @@
 cp git git-rm
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-rev-parse && \
-ln git git-rev-parse 2>/dev/null || \
-ln -s git git-rev-parse 2>/dev/null || \
-cp git git-rev-parse
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-send-pack && \
 ln git git-send-pack 2>/dev/null || \
 ln -s git git-send-pack 2>/dev/null || \
@@ -3193,12 +3229,6 @@
 cp git git-show-branch
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-stripspace && \
-ln git git-stripspace 2>/dev/null || \
-ln -s git git-stripspace 2>/dev/null || \
-cp git git-stripspace
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-show-index && \
 ln git git-show-index 2>/dev/null || \
 ln -s git git-show-index 2>/dev/null || \
@@ -3223,6 +3253,12 @@
 cp git git-stash
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-stripspace && \
+ln git git-stripspace 2>/dev/null || \
+ln -s git git-stripspace 2>/dev/null || \
+cp git git-stripspace
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-submodule--helper && \
 ln git git-submodule--helper 2>/dev/null || \
 ln -s git git-submodule--helper 2>/dev/null || \
@@ -3235,12 +3271,6 @@
 cp git git-symbolic-ref
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-unpack-objects && \
-ln git git-unpack-objects 2>/dev/null || \
-ln -s git git-unpack-objects 2>/dev/null || \
-cp git git-unpack-objects
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-tag && \
 ln git git-tag 2>/dev/null || \
 ln -s git git-tag 2>/dev/null || \
@@ -3253,6 +3283,12 @@
 cp git git-unpack-file
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-unpack-objects && \
+ln git git-unpack-objects 2>/dev/null || \
+ln -s git git-unpack-objects 2>/dev/null || \
+cp git git-unpack-objects
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-update-index && \
 ln git git-update-index 2>/dev/null || \
 ln -s git git-update-index 2>/dev/null || \
@@ -3331,12 +3367,6 @@
 cp git git-cherry-pick
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-format-patch && \
-ln git git-format-patch 2>/dev/null || \
-ln -s git git-format-patch 2>/dev/null || \
-cp git git-format-patch
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-fsck-objects && \
 ln git git-fsck-objects 2>/dev/null || \
 ln -s git git-fsck-objects 2>/dev/null || \
@@ -3349,10 +3379,10 @@
 cp git git-init
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-restore && \
-ln git git-restore 2>/dev/null || \
-ln -s git git-restore 2>/dev/null || \
-cp git git-restore
+rm -f git-format-patch && \
+ln git git-format-patch 2>/dev/null || \
+ln -s git git-format-patch 2>/dev/null || \
+cp git git-format-patch
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-maintenance && \
@@ -3367,24 +3397,30 @@
 cp git git-merge-subtree
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-restore && \
+ln git git-restore 2>/dev/null || \
+ln -s git git-restore 2>/dev/null || \
+cp git git-restore
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-show && \
 ln git git-show 2>/dev/null || \
 ln -s git git-show 2>/dev/null || \
 cp git git-show
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-rm -f git-status && \
-ln git git-status 2>/dev/null || \
-ln -s git git-status 2>/dev/null || \
-cp git git-status
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-stage && \
 ln git git-stage 2>/dev/null || \
 ln -s git git-stage 2>/dev/null || \
 cp git git-stage
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+rm -f git-status && \
+ln git git-status 2>/dev/null || \
+ln -s git git-status 2>/dev/null || \
+cp git git-status
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 rm -f git-switch && \
 ln git git-switch 2>/dev/null || \
 ln -s git git-switch 2>/dev/null || \
@@ -3415,14 +3451,14 @@
 579 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
-msgfmt --statistics --tcl -l fr -d po/ po/fr.po 
-520 translated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
 msgfmt --statistics --tcl -l el -d po/ po/el.po 
 381 translated messages, 4 fuzzy translations, 6 untranslated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
+msgfmt --statistics --tcl -l fr -d po/ po/fr.po 
+520 translated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
 msgfmt --statistics --tcl -l hu -d po/ po/hu.po 
 514 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
@@ -3431,6 +3467,10 @@
 519 translated messages, 1 untranslated message.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
+msgfmt --statistics --tcl -l ja -d po/ po/ja.po 
+546 translated messages, 1 untranslated message.
+make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
 msgfmt --statistics --tcl -l nb -d po/ po/nb.po 
 474 translated messages, 39 untranslated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
@@ -3439,34 +3479,30 @@
 520 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
-msgfmt --statistics --tcl -l ja -d po/ po/ja.po 
-546 translated messages, 1 untranslated message.
-make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
-msgfmt --statistics --tcl -l ru -d po/ po/ru.po 
-579 translated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
 msgfmt --statistics --tcl -l pt_pt -d po/ po/pt_pt.po 
 550 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
+msgfmt --statistics --tcl -l zh_cn -d po/ po/zh_cn.po 
+366 translated messages, 7 fuzzy translations, 17 untranslated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
 msgfmt --statistics --tcl -l sv -d po/ po/sv.po 
 576 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
-msgfmt --statistics --tcl -l vi -d po/ po/vi.po 
-543 translated messages.
+msgfmt --statistics --tcl -l ru -d po/ po/ru.po 
+579 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
-msgfmt --statistics --tcl -l zh_cn -d po/ po/zh_cn.po 
-366 translated messages, 7 fuzzy translations, 17 untranslated messages.
+/bin/sh generate-script.sh git-gui--askpass git-gui--askpass.sh ./GIT-GUI-BUILD-OPTIONS
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
-/bin/sh generate-git-gui.sh "git-gui.sh" "git-gui" ./GIT-GUI-BUILD-OPTIONS ./GIT-VERSION-FILE
+msgfmt --statistics --tcl -l vi -d po/ po/vi.po 
+543 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
-/bin/sh generate-script.sh git-gui--askpass git-gui--askpass.sh ./GIT-GUI-BUILD-OPTIONS
+/bin/sh generate-git-gui.sh "git-gui.sh" "git-gui" ./GIT-GUI-BUILD-OPTIONS ./GIT-VERSION-FILE
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
 /bin/sh generate-tclindex.sh . ./GIT-GUI-BUILD-OPTIONS lib/about.tcl lib/blame.tcl lib/branch.tcl lib/branch_checkout.tcl lib/branch_create.tcl lib/branch_delete.tcl lib/branch_rename.tcl lib/browser.tcl lib/checkout_op.tcl lib/choose_font.tcl lib/choose_repository.tcl lib/choose_rev.tcl lib/chord.tcl lib/class.tcl lib/commit.tcl lib/console.tcl lib/database.tcl lib/date.tcl lib/diff.tcl lib/encoding.tcl lib/error.tcl lib/index.tcl lib/line.tcl lib/logo.tcl lib/merge.tcl lib/mergetool.tcl lib/option.tcl lib/remote.tcl lib/remote_add.tcl lib/remote_branch_delete.tcl lib/search.tcl lib/shortcut.tcl lib/spellcheck.tcl lib/sshkey.tcl lib/status_bar.tcl lib/themed.tcl lib/tools.tcl lib/tools_dlg.tcl lib/transport.tcl lib/win32.tcl
@@ -3476,16 +3512,16 @@
     * new Tcl/Tk interpreter location
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/gitk-git'
-Generating catalog po/ca.msg
-msgfmt --statistics --tcl -l ca -d po/ po/ca.po
-307 translated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/gitk-git'
 Generating catalog po/bg.msg
 msgfmt --statistics --tcl -l bg -d po/ po/bg.po
 322 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/gitk-git'
+Generating catalog po/ca.msg
+msgfmt --statistics --tcl -l ca -d po/ po/ca.po
+307 translated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/gitk-git'
 Generating catalog po/de.msg
 msgfmt --statistics --tcl -l de -d po/ po/de.po
 307 translated messages.
@@ -3511,16 +3547,16 @@
 274 translated messages, 17 fuzzy translations, 16 untranslated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/gitk-git'
-Generating catalog po/pt_br.msg
-msgfmt --statistics --tcl -l pt_br -d po/ po/pt_br.po
-279 translated messages, 16 fuzzy translations, 12 untranslated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/gitk-git'
 Generating catalog po/ja.msg
 msgfmt --statistics --tcl -l ja -d po/ po/ja.po
 311 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/gitk-git'
+Generating catalog po/pt_br.msg
+msgfmt --statistics --tcl -l pt_br -d po/ po/pt_br.po
+279 translated messages, 16 fuzzy translations, 12 untranslated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/gitk-git'
 Generating catalog po/pt_pt.msg
 msgfmt --statistics --tcl -l pt_pt -d po/ po/pt_pt.po
 311 translated messages.
@@ -3541,16 +3577,16 @@
 327 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/gitk-git'
-Generating catalog po/zh_cn.msg
-msgfmt --statistics --tcl -l zh_cn -d po/ po/zh_cn.po
-317 translated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/gitk-git'
 Generating catalog po/vi.msg
 msgfmt --statistics --tcl -l vi -d po/ po/vi.po
 307 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/gitk-git'
+Generating catalog po/zh_cn.msg
+msgfmt --statistics --tcl -l zh_cn -d po/ po/zh_cn.po
+317 translated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/gitk-git'
 rm -f gitk-wish gitk-wish+ && \
 /bin/sh ./generate-tcl.sh "wish" "gitk" "gitk-wish"
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
@@ -3573,31 +3609,36 @@
 date >boilerplates.made
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/templates'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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/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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-commit-graph.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-config.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-pack-headers.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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 
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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   \
@@ -3605,9 +3646,9 @@
 	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 
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-pack-headers -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 
+	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 
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-config -Wl,-z,relro   \
@@ -3615,19 +3656,14 @@
 	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 
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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   \
-	-Wl,--allow-multiple-definition \
-	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 
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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 
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-pack-headers -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-commit-graph -Wl,-z,relro   \
 	-Wl,--allow-multiple-definition \
-	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 
+	oss-fuzz/fuzz-commit-graph.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 
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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   \
@@ -3635,9 +3671,9 @@
 	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 
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-commit-graph -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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   \
 	-Wl,--allow-multiple-definition \
-	oss-fuzz/fuzz-commit-graph.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 
+	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 
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 msgfmt --check -o po/build/locale/is/LC_MESSAGES/git.mo po/is.po
@@ -3646,19 +3682,19 @@
 msgfmt --check -o po/build/locale/el/LC_MESSAGES/git.mo po/el.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-msgfmt --check -o po/build/locale/bg/LC_MESSAGES/git.mo po/bg.po
+msgfmt --check -o po/build/locale/es/LC_MESSAGES/git.mo po/es.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-msgfmt --check -o po/build/locale/ca/LC_MESSAGES/git.mo po/ca.po
+msgfmt --check -o po/build/locale/de/LC_MESSAGES/git.mo po/de.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-msgfmt --check -o po/build/locale/de/LC_MESSAGES/git.mo po/de.po
+msgfmt --check -o po/build/locale/fr/LC_MESSAGES/git.mo po/fr.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-msgfmt --check -o po/build/locale/es/LC_MESSAGES/git.mo po/es.po
+msgfmt --check -o po/build/locale/bg/LC_MESSAGES/git.mo po/bg.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-msgfmt --check -o po/build/locale/fr/LC_MESSAGES/git.mo po/fr.po
+msgfmt --check -o po/build/locale/ca/LC_MESSAGES/git.mo po/ca.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 msgfmt --check -o po/build/locale/ko/LC_MESSAGES/git.mo po/ko.po
@@ -3667,37 +3703,37 @@
 msgfmt --check -o po/build/locale/id/LC_MESSAGES/git.mo po/id.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-msgfmt --check -o po/build/locale/pt_PT/LC_MESSAGES/git.mo po/pt_PT.po
+msgfmt --check -o po/build/locale/ga/LC_MESSAGES/git.mo po/ga.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-msgfmt --check -o po/build/locale/ga/LC_MESSAGES/git.mo po/ga.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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-msgfmt --check -o po/build/locale/it/LC_MESSAGES/git.mo po/it.po
+msgfmt --check -o po/build/locale/ru/LC_MESSAGES/git.mo po/ru.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-msgfmt --check -o po/build/locale/tr/LC_MESSAGES/git.mo po/tr.po
+msgfmt --check -o po/build/locale/pl/LC_MESSAGES/git.mo po/pl.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 msgfmt --check -o po/build/locale/sv/LC_MESSAGES/git.mo po/sv.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 msgfmt --check -o po/build/locale/uk/LC_MESSAGES/git.mo po/uk.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-msgfmt --check -o po/build/locale/pl/LC_MESSAGES/git.mo po/pl.po
+msgfmt --check -o po/build/locale/zh_TW/LC_MESSAGES/git.mo po/zh_TW.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 msgfmt --check -o po/build/locale/vi/LC_MESSAGES/git.mo po/vi.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-msgfmt --check -o po/build/locale/zh_TW/LC_MESSAGES/git.mo po/zh_TW.po
+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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git.pm" "perl/build/lib/Git.pm"
@@ -3751,127 +3787,124 @@
 /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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-advise.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-delete-gpgsig.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-drop-caches.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-split-index.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-cache-tree.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-fsmonitor.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-delta.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-genrandom.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-config.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hash-speed.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-example-tap.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hexdump.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-example-tap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-match-trees.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o t/helper/test-hashmap.o -c -MF t/helper/.depend/test-hashmap.o.d -MQ t/helper/test-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hashmap.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hash.c
+gcc -o t/helper/test-hashmap.o -c -MF t/helper/.depend/test-hashmap.o.d -MQ t/helper/test-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hashmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-mktemp.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-parse-pathspec-file.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-bundle-uri.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-name-hash.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc -o t/helper/test-pack-deltas.o -c -MF t/helper/.depend/test-pack-deltas.o.d -MQ t/helper/test-pack-deltas.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-pack-deltas.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-pack-mtimes.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc -o t/helper/test-partial-clone.o -c -MF t/helper/.depend/test-partial-clone.o.d -MQ t/helper/test-partial-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-partial-clone.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-pcre2-config.c
@@ -3880,82 +3913,88 @@
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-cache.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-graph.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-proc-receive.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-path-walk.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-repository.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-ref-store.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-progress.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-ref-store.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule-nested-repo-config.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-subprocess.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule-config.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-windows-named-pipe.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule-nested-repo-config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -3968,9 +4007,6 @@
 chmod +x bin-wrappers/git
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@BUILD_DIR@|/build/reproducible-path/git-2.51.0|' \
      -e 's|@GIT_TEXTDOMAINDIR@|/build/reproducible-path/git-2.51.0/po/build/locale|' \
@@ -3981,7 +4017,7 @@
 chmod +x bin-wrappers/scalar
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -3994,6 +4030,9 @@
 chmod +x bin-wrappers/git-receive-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@BUILD_DIR@|/build/reproducible-path/git-2.51.0|' \
      -e 's|@GIT_TEXTDOMAINDIR@|/build/reproducible-path/git-2.51.0/po/build/locale|' \
@@ -4004,7 +4043,7 @@
 chmod +x bin-wrappers/git-shell
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o t/helper/test-write-cache.o -c -MF t/helper/.depend/test-write-cache.o.d -MQ t/helper/test-write-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-write-cache.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -4017,7 +4056,10 @@
 chmod +x bin-wrappers/git-upload-archive
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-run-command.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+gcc -o t/helper/test-write-cache.o -c -MF t/helper/.depend/test-write-cache.o.d -MQ t/helper/test-write-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-write-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -4030,9 +4072,6 @@
 chmod +x bin-wrappers/git-upload-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o t/helper/test-zlib.o -c -MF t/helper/.depend/test-zlib.o.d -MQ t/helper/test-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-zlib.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@BUILD_DIR@|/build/reproducible-path/git-2.51.0|' \
      -e 's|@GIT_TEXTDOMAINDIR@|/build/reproducible-path/git-2.51.0/po/build/locale|' \
@@ -4043,9 +4082,6 @@
 chmod +x bin-wrappers/git-cvsserver
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@BUILD_DIR@|/build/reproducible-path/git-2.51.0|' \
      -e 's|@GIT_TEXTDOMAINDIR@|/build/reproducible-path/git-2.51.0/po/build/locale|' \
@@ -4056,7 +4092,10 @@
 chmod +x bin-wrappers/test-fake-ssh
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+gcc -o t/helper/test-zlib.o -c -MF t/helper/.depend/test-zlib.o.d -MQ t/helper/test-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-zlib.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
     * new test suites
@@ -4072,13 +4111,10 @@
 chmod +x bin-wrappers/test-tool
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-truncate.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/test-lib.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /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-basics.c t/unit-tests/u-reftable-block.c t/unit-tests/u-reftable-merged.c t/unit-tests/u-reftable-pq.c t/unit-tests/u-reftable-readwrite.c t/unit-tests/u-reftable-stack.c t/unit-tests/u-reftable-table.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-string-list.c t/unit-tests/u-strvec.c t/unit-tests/u-trailer.c t/unit-tests/u-urlmatch-normalization.c
@@ -4087,58 +4123,61 @@
 /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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-userdiff.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-oidmap.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-hash.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-oidtree.c
+gcc -o t/unit-tests/u-reftable-basics.o -c -MF t/unit-tests/.depend/u-reftable-basics.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-basics.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o t/unit-tests/u-strbuf.o -c -MF t/unit-tests/.depend/u-strbuf.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-strbuf.c
+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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-oidmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o t/unit-tests/u-reftable-tree.o -c -MF t/unit-tests/.depend/u-reftable-tree.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-tree.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o t/unit-tests/u-reftable-basics.o -c -MF t/unit-tests/.depend/u-reftable-basics.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-basics.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc -o t/unit-tests/u-reftable-pq.o -c -MF t/unit-tests/.depend/u-reftable-pq.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-pq.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-reftable-table.o -c -MF t/unit-tests/.depend/u-reftable-table.o.d -MQ t/unit-tests/u-reftable-table.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-table.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-strbuf.o -c -MF t/unit-tests/.depend/u-strbuf.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-strbuf.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o t/unit-tests/u-reftable-table.o -c -MF t/unit-tests/.depend/u-reftable-table.o.d -MQ t/unit-tests/u-reftable-table.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-table.c
+gcc -o t/unit-tests/u-reftable-tree.o -c -MF t/unit-tests/.depend/u-reftable-tree.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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/u-reftable-block.o -c -MF t/unit-tests/.depend/u-reftable-block.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-block.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc -o t/unit-tests/u-strcmp-offset.o -c -MF t/unit-tests/.depend/u-strcmp-offset.o.d -MQ t/unit-tests/u-strcmp-offset.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-strcmp-offset.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o t/unit-tests/u-reftable-block.o -c -MF t/unit-tests/.depend/u-reftable-block.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-block.c
+gcc -o t/unit-tests/u-reftable-merged.o -c -MF t/unit-tests/.depend/u-reftable-merged.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-merged.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc -o t/unit-tests/u-trailer.o -c -MF t/unit-tests/.depend/u-trailer.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-trailer.c
@@ -4147,28 +4186,22 @@
 gcc -o t/unit-tests/u-string-list.o -c -MF t/unit-tests/.depend/u-string-list.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-string-list.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o t/unit-tests/u-reftable-merged.o -c -MF t/unit-tests/.depend/u-reftable-merged.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-merged.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/lib-reftable.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o t/unit-tests/u-urlmatch-normalization.o -c -MF t/unit-tests/.depend/u-urlmatch-normalization.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-urlmatch-normalization.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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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/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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/lib-reftable.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o t/unit-tests/u-reftable-stack.o -c -MF t/unit-tests/.depend/u-reftable-stack.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-stack.c
+gcc -o t/unit-tests/u-reftable-readwrite.o -c -MF t/unit-tests/.depend/u-reftable-readwrite.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-readwrite.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-deltas.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/helper/test-zlib.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
+gcc -o t/unit-tests/u-urlmatch-normalization.o -c -MF t/unit-tests/.depend/u-urlmatch-normalization.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-urlmatch-normalization.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-gcc -o t/unit-tests/u-reftable-readwrite.o -c -MF t/unit-tests/.depend/u-reftable-readwrite.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -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-deltas.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/helper/test-zlib.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
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc -o t/unit-tests/u-strvec.o -c -MF t/unit-tests/.depend/u-strvec.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-strvec.c
@@ -4177,6 +4210,9 @@
 gcc -o t/unit-tests/clar/clar.o -c -MF t/unit-tests/clar/.depend/clar.o.d -MQ t/unit-tests/clar/clar.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/clar/clar.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+gcc -o t/unit-tests/u-reftable-stack.o -c -MF t/unit-tests/.depend/u-reftable-stack.o.d -MQ t/unit-tests/u-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.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-reftable-stack.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.51.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_SYSINFO -DHAVE_GETDELIM -DHAVE_GETRANDOM -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/unit-tests -Wl,-z,relro   t/unit-tests/u-ctype.o t/unit-tests/u-example-decorate.o t/unit-tests/u-hash.o t/unit-tests/u-hashmap.o t/unit-tests/u-mem-pool.o t/unit-tests/u-oid-array.o t/unit-tests/u-oidmap.o t/unit-tests/u-oidtree.o t/unit-tests/u-prio-queue.o t/unit-tests/u-reftable-basics.o t/unit-tests/u-reftable-block.o t/unit-tests/u-reftable-merged.o t/unit-tests/u-reftable-pq.o t/unit-tests/u-reftable-readwrite.o t/unit-tests/u-reftable-stack.o t/unit-tests/u-reftable-table.o t/unit-tests/u-reftable-tree.o t/unit-tests/u-strbuf.o t/unit-tests/u-strcmp-offset.o t/unit-tests/u-string-list.o t/unit-tests/u-strvec.o t/unit-tests/u-trailer.o t/unit-tests/u-urlmatch-normalization.o t/unit-tests/clar/clar.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o t/unit-tests/unit-test.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
@@ -4222,10 +4258,10 @@
     * new asciidoc flags
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-rm -f docinfo.html && cat docinfo-html.in >docinfo.html
+cp SubmittingPatches SubmittingPatches.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-cp SubmittingPatches SubmittingPatches.adoc
+rm -f docinfo.html && cat docinfo-html.in >docinfo.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 GIT_BUILT_FROM_COMMIT="" GIT_DATE="" GIT_USER_AGENT="" GIT_VERSION="" /bin/sh ""/build/reproducible-path/git-2.51.0/Documentation/.."/GIT-VERSION-GEN" ""/build/reproducible-path/git-2.51.0/Documentation/.."" "asciidoc.conf.in" "asciidoc.conf"
@@ -4237,58 +4273,64 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-backfill.xml git-backfill.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-apply.xml git-apply.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-archimport.xml git-archimport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/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
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-annotate.xml git-annotate.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-annotate.xml git-annotate.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-bugreport.xml git-bugreport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-archive.xml git-archive.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-apply.xml git-apply.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-bisect.xml git-bisect.adoc
+'/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-archimport.xml git-archimport.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-add.xml git-add.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-blame.xml git-blame.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-am.xml git-am.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-archive.xml git-archive.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-blame.xml git-blame.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-mailmap.xml git-check-mailmap.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-bundle.xml git-bundle.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-branch.xml git-branch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-bisect.xml git-bisect.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-citool.xml git-citool.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-clean.xml git-clean.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cherry-pick.xml git-cherry-pick.adoc
@@ -4297,31 +4339,28 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cherry.xml git-cherry.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-clean.xml git-clean.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-count-objects.xml git-count-objects.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-checkout.xml git-checkout.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-column.xml git-column.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cvsexportcommit.xml git-cvsexportcommit.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential-store.xml git-credential-store.adoc
@@ -4330,58 +4369,61 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential.xml git-credential.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diagnose.xml git-diagnose.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-commit.xml git-commit.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-clone.xml git-clone.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cvsimport.xml git-cvsimport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cvsserver.xml git-cvsserver.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-describe.xml git-describe.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-daemon.xml git-daemon.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-difftool.xml git-difftool.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-difftool.xml git-difftool.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fetch.xml git-fetch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-filter-branch.xml git-filter-branch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fast-export.xml git-fast-export.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fsck-objects.xml git-fsck-objects.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.adoc
@@ -4390,97 +4432,100 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fsck.xml git-fsck.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-gc.xml git-gc.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fast-import.xml git-fast-import.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fetch.xml git-fetch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-grep.xml git-grep.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-help.xml git-help.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-gui.xml git-gui.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-hook.xml git-hook.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-help.xml git-help.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-instaweb.xml git-instaweb.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff.xml git-diff.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-init-db.xml git-init-db.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-instaweb.xml git-instaweb.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-init.xml git-init.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mailinfo.xml git-mailinfo.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-maintenance.xml git-maintenance.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-tree.xml git-merge-tree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mktag.xml git-mktag.adoc
@@ -4489,70 +4534,58 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mktree.xml git-mktree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-base.xml git-merge-base.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-tree.xml git-merge-tree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mv.xml git-mv.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mergetool.xml git-mergetool.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-maintenance.xml git-maintenance.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-notes.xml git-notes.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-notes.xml git-notes.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge.xml git-merge.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-prune.xml git-prune.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-quiltimport.xml git-quiltimport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-refs.xml git-refs.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-p4.xml git-p4.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-reflog.xml git-reflog.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-range-diff.xml git-range-diff.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pull.xml git-pull.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-push.xml git-push.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.adoc
@@ -4561,118 +4594,127 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-refs.xml git-refs.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-remote.xml git-remote.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-replace.xml git-replace.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-log.xml git-log.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rerere.xml git-rerere.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-revert.xml git-revert.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rm.xml git-rm.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-log.xml git-log.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-repack.xml git-repack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rebase.xml git-rebase.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sh-i18n--envsubst.xml git-sh-i18n--envsubst.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-replay.xml git-replay.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-restore.xml git-restore.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-reset.xml git-reset.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show-branch.xml git-show-branch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show-index.xml git-show-index.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-reset.xml git-reset.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show-index.xml git-show-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-shell.xml git-shell.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-replay.xml git-replay.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-config.xml git-config.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stage.xml git-stage.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rev-list.xml git-rev-list.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stash.xml git-stash.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show-ref.xml git-show-ref.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-shortlog.xml git-shortlog.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-status.xml git-status.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-symbolic-ref.xml git-symbolic-ref.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-unpack-objects.xml git-unpack-objects.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stripspace.xml git-stripspace.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stash.xml git-stash.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-unpack-objects.xml git-unpack-objects.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-submodule.xml git-submodule.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-switch.xml git-switch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-svn.xml git-svn.adoc
@@ -4681,181 +4723,172 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-verify-pack.xml git-verify-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-var.xml git-var.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-tag.xml git-tag.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-upload-archive.xml git-upload-archive.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-var.xml git-var.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-version.xml git-version.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-update-ref.xml git-update-ref.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-version.xml git-version.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-update-index.xml git-update-index.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-whatchanged.xml git-whatchanged.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-verify-tag.xml git-verify-tag.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show.xml git-show.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitk.xml gitk.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-bundle.xml gitformat-bundle.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-commit-graph.xml gitformat-commit-graph.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-worktree.xml git-worktree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o scalar.xml scalar.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-index.xml gitformat-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o scalar.xml scalar.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitweb.xml gitweb.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitmailmap.xml gitmailmap.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-chunk.xml gitformat-chunk.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show.xml git-show.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitweb.xml gitweb.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitignore.xml gitignore.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitmodules.xml gitmodules.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o githooks.xml githooks.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitattributes.xml gitattributes.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitmailmap.xml gitmailmap.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-pack.xml gitformat-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitignore.xml gitignore.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-pack.xml gitprotocol-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcli.xml gitcli.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcredentials.xml gitcredentials.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcvs-migration.xml gitcvs-migration.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o githooks.xml githooks.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitdiffcore.xml gitdiffcore.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git.xml git.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o git.xml git.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o giteveryday.xml giteveryday.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcvs-migration.xml gitcvs-migration.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitpacking.xml gitpacking.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o giteveryday.xml giteveryday.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitdiffcore.xml gitdiffcore.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitfaq.xml gitfaq.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcredentials.xml gitcredentials.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitpacking.xml gitpacking.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitrevisions.xml gitrevisions.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitworkflows.xml gitworkflows.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitrevisions.xml gitrevisions.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-annotate.html git-annotate.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-archimport.html git-archimport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitworkflows.xml gitworkflows.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-am.html git-am.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-apply.html git-apply.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitglossary.xml gitglossary.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-archive.html git-archive.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-backfill.html git-backfill.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-archive.html git-archive.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-bugreport.html git-bugreport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gittutorial.xml gittutorial.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-backfill.html git-backfill.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-bugreport.html git-bugreport.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-bisect.html git-bisect.adoc
@@ -4864,88 +4897,91 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-add.html git-add.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-bundle.html git-bundle.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-bundle.html git-bundle.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitglossary.xml gitglossary.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-branch.html git-branch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-attr.html git-check-attr.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-blame.html git-blame.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-citool.html git-citool.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-branch.html git-branch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cherry.html git-cherry.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cherry-pick.html git-cherry-pick.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cherry.html git-cherry.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-clean.html git-clean.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-citool.html git-citool.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential-store.html git-credential-store.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential-cache--daemon.html git-credential-cache--daemon.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-column.html git-column.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-clone.html git-clone.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsexportcommit.html git-cvsexportcommit.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-describe.html git-describe.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsimport.html git-cvsimport.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential.html git-credential.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsserver.html git-cvsserver.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-checkout.html git-checkout.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diagnose.html git-diagnose.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-describe.html git-describe.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-commit.html git-commit.adoc
@@ -4960,142 +4996,139 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fmt-merge-msg.html git-fmt-merge-msg.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fmt-merge-msg.html git-fmt-merge-msg.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-for-each-repo.html git-for-each-repo.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-for-each-ref.html git-for-each-ref.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fetch.html git-fetch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsck.html git-fsck.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-gc.html git-gc.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-hook.html git-hook.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff.html git-diff.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsck.html git-fsck.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-gui.html git-gui.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-hook.html git-hook.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-help.html git-help.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff.html git-diff.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-http-push.html git-http-push.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-index-pack.html git-index-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-instaweb.html git-instaweb.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-init.html git-init.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-init.html git-init.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-grep.html git-grep.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mailsplit.html git-mailsplit.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-ls-remote.html git-ls-remote.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mailinfo.html git-mailinfo.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-file.html git-merge-file.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-maintenance.html git-maintenance.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mktag.html git-mktag.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mktag.html git-mktag.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mktree.html git-mktree.adoc
@@ -5107,19 +5140,16 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mergetool.html git-mergetool.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mv.html git-mv.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mergetool.html git-mergetool.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-prune-packed.html git-prune-packed.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pack-objects.html git-pack-objects.adoc
@@ -5128,19 +5158,25 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-notes.html git-notes.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-prune.html git-prune.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge.html git-merge.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-quiltimport.html git-quiltimport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-read-tree.html git-read-tree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-p4.html git-p4.adoc
@@ -5149,118 +5185,118 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-reflog.html git-reflog.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pull.html git-pull.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-refs.html git-refs.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-push.html git-push.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-remote.html git-remote.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-repack.html git-repack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-config.html git-config.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-replace.html git-replace.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-log.html git-log.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-restore.html git-restore.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rebase.html git-rebase.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-reset.html git-reset.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rerere.html git-rerere.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-restore.html git-restore.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sh-i18n--envsubst.html git-sh-i18n--envsubst.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rm.html git-rm.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rebase.html git-rebase.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-revert.html git-revert.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-shell.html git-shell.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-replay.html git-replay.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sh-i18n--envsubst.html git-sh-i18n--envsubst.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-stage.html git-stage.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-stage.html git-stage.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-symbolic-ref.html git-symbolic-ref.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-stripspace.html git-stripspace.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sparse-checkout.html git-sparse-checkout.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-stash.html git-stash.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-submodule.html git-submodule.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-status.html git-status.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-shortlog.html git-shortlog.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-unpack-file.html git-unpack-file.adoc
@@ -5269,25 +5305,28 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-unpack-objects.html git-unpack-objects.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-stash.html git-stash.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-update-index.html git-update-index.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-switch.html git-switch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-upload-archive.html git-upload-archive.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-var.html git-var.adoc
@@ -5296,34 +5335,40 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-svn.html git-svn.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-tag.html git-tag.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-version.html git-version.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-web--browse.html git-web--browse.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-bundle.html gitformat-bundle.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-whatchanged.html git-whatchanged.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-write-tree.html git-write-tree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitweb.html gitweb.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-web--browse.html git-web--browse.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitk.html gitk.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-commit-graph.html gitformat-commit-graph.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitk.html gitk.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show.html git-show.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-index.html gitformat-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-chunk.html gitformat-chunk.adoc
@@ -5335,116 +5380,110 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o scalar.html scalar.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-index.html gitformat-index.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-commit-graph.html gitformat-commit-graph.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-pack.html gitformat-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitweb.html gitweb.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitmodules.html gitmodules.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitmailmap.html gitmailmap.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitignore.html gitignore.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-signature.html gitformat-signature.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-capabilities.html gitprotocol-capabilities.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitattributes.html gitattributes.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-common.html gitprotocol-common.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitattributes.html gitattributes.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitignore.html gitignore.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitmailmap.html gitmailmap.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o githooks.html githooks.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitrepository-layout.html gitrepository-layout.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitmodules.html gitmodules.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-http.html gitprotocol-http.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o githooks.html githooks.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git.html git.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcli.html gitcli.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcvs-migration.html gitcvs-migration.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-v2.html gitprotocol-v2.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-pack.html gitprotocol-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitdiffcore.html gitdiffcore.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcredentials.html gitcredentials.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-v2.html gitprotocol-v2.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitdiffcore.html gitdiffcore.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitpacking.html gitpacking.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitnamespaces.html gitnamespaces.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcvs-migration.html gitcvs-migration.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitweb.conf.html gitweb.conf.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git.html git.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitnamespaces.html gitnamespaces.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o giteveryday.html giteveryday.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcore-tutorial.html gitcore-tutorial.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitsubmodules.html gitsubmodules.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitremote-helpers.html gitremote-helpers.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o giteveryday.html giteveryday.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 howto-index.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 git-tools.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitrevisions.html gitrevisions.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gittutorial.html gittutorial.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gittutorial-2.html gittutorial-2.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gittutorial.html gittutorial.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 git-tools.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 howto-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitworkflows.html gitworkflows.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitsubmodules.html gitsubmodules.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitfaq.html gitfaq.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 \
-sed -e '1,/^$/d' howto/using-merge-subtree.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/using-merge-subtree.html
+sed -e '1,/^$/d' howto/new-command.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/new-command.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 \
-sed -e '1,/^$/d' howto/update-hook-example.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/update-hook-example.html
+sed -e '1,/^$/d' howto/revert-branch-rebase.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitglossary.html gitglossary.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 \
@@ -5452,12 +5491,17 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/use-git-daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcore-tutorial.html gitcore-tutorial.adoc
+\
+sed -e '1,/^$/d' howto/update-hook-example.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitworkflows.html gitworkflows.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 \
-sed -e '1,/^$/d' howto/new-command.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/new-command.html
+sed -e '1,/^$/d' howto/using-signed-tag-in-pull-request.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/using-signed-tag-in-pull-request.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 \
@@ -5466,18 +5510,23 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 \
-sed -e '1,/^$/d' howto/recover-corrupted-blob-object.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/recover-corrupted-blob-object.html
+sed -e '1,/^$/d' howto/revert-a-faulty-merge.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 \
-sed -e '1,/^$/d' howto/revert-branch-rebase.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/revert-branch-rebase.html
+sed -e '1,/^$/d' howto/using-merge-subtree.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 \
-sed -e '1,/^$/d' howto/using-signed-tag-in-pull-request.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/using-signed-tag-in-pull-request.html
+sed -e '1,/^$/d' howto/recover-corrupted-blob-object.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+\
+sed -e '1,/^$/d' howto/setup-git-server-over-http.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 \
@@ -5490,7 +5539,9 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitglossary.html gitglossary.adoc
+\
+sed -e '1,/^$/d' howto/keep-canonical-history-correct.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 \
@@ -5498,14 +5549,7 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-\
-sed -e '1,/^$/d' howto/keep-canonical-history-correct.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-\
-sed -e '1,/^$/d' howto/setup-git-server-over-http.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/setup-git-server-over-http.html
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-merge.adoc
@@ -5517,82 +5561,80 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 \
-sed -e '1,/^$/d' howto/revert-a-faulty-merge.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-\
 sed -e '1,/^$/d' howto/maintain-git.adoc | \
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/maintain-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-error-handling.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 DecisionMaking.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 git-bisect-lk2009.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 BreakingChanges.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-path-walk.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-simple-ipc.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-parse-options.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 ReviewingGuidelines.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-simple-ipc.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 ToolsForGit.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 BreakingChanges.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 git-bisect-lk2009.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 ReviewingGuidelines.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-trace2.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/build-systems.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 ToolsForGit.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/bitmap-format.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 MyFirstContribution.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/bundle-uri.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 MyFirstObjectWalk.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/pack-heuristics.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 SubmittingPatches.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/partial-clone.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/racy-git.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/parallel-checkout.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/multi-pack-index.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/platform-support.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 MyFirstObjectWalk.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/scalar.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -f asciidoc.conf -b xhtml11 SubmittingPatches.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/send-pack-pipeline.adoc
@@ -5601,22 +5643,16 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/shallow.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/scalar.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/trivial-merge.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -o git-remote-helpers.html git-remote-helpers.adoco
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 MyFirstContribution.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -o everyday.html everyday.adoco
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-index.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b xhtml11 -o git-remote-helpers.html git-remote-helpers.adoco
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/unit-tests.adoc
@@ -5625,55 +5661,55 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/reftable.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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-archimport.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -f asciidoc.conf -b docbook -d book -o user-manual.xml user-manual.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-add.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-annotate.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-archive.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-backfill.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-bundle.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-branch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-cat-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -5685,55 +5721,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-cherry.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-count-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-commit.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-credential-cache--daemon.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -5742,64 +5772,70 @@
 xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-pairs.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-fetch-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-files.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-for-each-ref.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-fast-import.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-for-each-repo.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-filter-branch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-fetch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-diff-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-fsmonitor--daemon.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -5808,40 +5844,40 @@
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-hash-object.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-gui.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-grep.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-hook.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-http-backend.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-http-push.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-http-fetch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-init-db.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-imap-send.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-index-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -5850,100 +5886,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-ls-files.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-config.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-ls-remote.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-one-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-maintenance.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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--lib.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-merge.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-mergetool.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-log.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-multi-pack-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-notes.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-redundant.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-refs.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-range-diff.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -5952,13 +5988,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-read-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-pull.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -5967,7 +5997,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-remote-ext.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -5976,58 +6009,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-request-pull.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-rebase.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-replace.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-replay.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-rev-parse.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-show-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-show-branch.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-rev-list.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-stage.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-sparse-checkout.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -6036,43 +6078,37 @@
 xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-symbolic-ref.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-submodule.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-unpack-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-unpack-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-show.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-tag.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-update-ref.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-svn.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -6084,37 +6120,37 @@
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-var.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-update-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-web--browse.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-whatchanged.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 git-write-tree.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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
@@ -6123,25 +6159,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 gitformat-bundle.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitformat-chunk.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitformat-commit-graph.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitattributes.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 git.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitformat-signature.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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
@@ -6150,82 +6186,82 @@
 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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitmailmap.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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 githooks.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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
+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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitprotocol-capabilities.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitprotocol-common.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitrepository-layout.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitcredentials.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitcvs-migration.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitdiffcore.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitcli.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitprotocol-v2.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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
+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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitcore-tutorial.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitnamespaces.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 giteveryday.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xsltproc --xinclude --stringparam html.stylesheet docbook-xsl.css --param generate.consistent.ids 1 -o user-manual.html docbook.xsl user-manual.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 gitglossary.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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
+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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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
+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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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-2.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gittutorial.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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
+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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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
@@ -6235,79 +6271,76 @@
   GIT_SKIP_TESTS="t9128 t9167" \
   GIT_TEST_OPTS='--verbose' /usr/bin/make test 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.51.0=. -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.51.0'
-./generate-script.sh "git-difftool--helper.sh" "git-difftool--helper+" ./GIT-BUILD-OPTIONS && \
-mv git-difftool--helper+ git-difftool--helper
+./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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-archimport.perl" "git-archimport+" && \
+mv git-archimport+ git-archimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 ./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-merge-resolve.sh" "git-merge-resolve+" ./GIT-BUILD-OPTIONS && \
-mv git-merge-resolve+ git-merge-resolve
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 ./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-request-pull.sh" "git-request-pull+" ./GIT-BUILD-OPTIONS && \
-mv git-request-pull+ git-request-pull
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-web--browse.sh" "git-web--browse+" ./GIT-BUILD-OPTIONS && \
-mv git-web--browse+ git-web--browse
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsimport.perl" "git-cvsimport+" && \
-mv git-cvsimport+ git-cvsimport
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-archimport.perl" "git-archimport+" && \
-mv git-archimport+ git-archimport
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-mergetool.sh" "git-mergetool+" ./GIT-BUILD-OPTIONS && \
-mv git-mergetool+ git-mergetool
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsimport.perl" "git-cvsimport+" && \
+mv git-cvsimport+ git-cvsimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsserver.perl" "git-cvsserver+" && \
-mv git-cvsserver+ git-cvsserver
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-send-email.perl" "git-send-email+" && \
-mv git-send-email+ git-send-email
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsserver.perl" "git-cvsserver+" && \
+mv git-cvsserver+ git-cvsserver
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-submodule.sh" "git-submodule+" ./GIT-BUILD-OPTIONS && \
-mv git-submodule+ git-submodule
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 ./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-sh-setup.sh" "git-sh-setup+" ./GIT-BUILD-OPTIONS && \
-mv git-sh-setup+ git-sh-setup
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-send-email.perl" "git-send-email+" && \
+mv git-send-email+ git-send-email
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 ./generate-script.sh "git-mergetool--lib.sh" "git-mergetool--lib+" ./GIT-BUILD-OPTIONS && \
@@ -6318,6 +6351,9 @@
 chmod +x git-instaweb+ && \
 mv git-instaweb+ git-instaweb
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 /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'
@@ -6325,49 +6361,46 @@
 : no custom templates yet
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/templates'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git.pm" "perl/build/lib/Git.pm"
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/I18N.pm" "perl/build/lib/Git/I18N.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/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/LoadCPAN/Error.pm" "perl/build/lib/Git/LoadCPAN/Error.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/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.pm" "perl/build/lib/Git.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/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.pm" "perl/build/lib/Git/LoadCPAN.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/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/Packet.pm" "perl/build/lib/Git/Packet.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /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"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Fetcher.pm" "perl/build/lib/Git/SVN/Fetcher.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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/GlobSpec.pm" "perl/build/lib/Git/SVN/GlobSpec.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Log.pm" "perl/build/lib/Git/SVN/Log.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Log.pm" "perl/build/lib/Git/SVN/Log.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Fetcher.pm" "perl/build/lib/Git/SVN/Fetcher.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Migration.pm" "perl/build/lib/Git/SVN/Migration.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/GlobSpec.pm" "perl/build/lib/Git/SVN/GlobSpec.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Prompt.pm" "perl/build/lib/Git/SVN/Prompt.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Migration.pm" "perl/build/lib/Git/SVN/Migration.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Ra.pm" "perl/build/lib/Git/SVN/Ra.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/LoadCPAN/Mail/Address.pm" "perl/build/lib/Git/LoadCPAN/Mail/Address.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Prompt.pm" "perl/build/lib/Git/SVN/Prompt.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Utils.pm" "perl/build/lib/Git/SVN/Utils.pm"
@@ -6375,6 +6408,9 @@
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/LoadCPAN/Mail/Address.pm" "perl/build/lib/Git/LoadCPAN/Mail/Address.pm"
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 /usr/bin/make -C t/ all
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 rm -f -r 'test-results'
@@ -6806,176 +6842,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0017-env-helper.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0007-git-var.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0007-git-var/.git/
 expecting success of 0007.1 'get GIT_AUTHOR_IDENT': 
@@ -7013,41 +6879,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@codethink04-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@codethink04-arm64.debian.net>) not allowed
-ok 3 - requested identities are strict
+second user <pbuilder2@codethink03-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': 
 	(
@@ -7440,6 +7274,218 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0017-env-helper.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0022-crlf-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0022-crlf-rename/.git/
+expecting success of 0022.1 'setup': 
+
+	cat "$TEST_DIRECTORY"/t0022-crlf-rename.sh >sample &&
+	git add sample &&
+
+	test_tick &&
+	git commit -m Initial &&
+
+	append_cr <"$TEST_DIRECTORY"/t0022-crlf-rename.sh >elpmas &&
+	git add elpmas &&
+	rm -f sample &&
+
+	test_tick &&
+	git commit -a -m Second
+
+
+[master (root-commit) 1308cf6] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 33 insertions(+)
+ create mode 100644 sample
+[master 6485017] Second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 33 insertions(+), 33 deletions(-)
+ rename sample => elpmas (94%)
+ok 1 - setup
+
+expecting success of 0022.2 'diff -M': 
+
+	git diff-tree -M -r --name-status HEAD^ HEAD >tmp &&
+	sed -e "s/R[0-9]*/RNUM/" tmp >actual &&
+	echo "RNUM	sample	elpmas" >expect &&
+	test_cmp expect actual
+
+
+ok 2 - diff -M
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0019-json-writer.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0019-json-writer/.git/
 expecting success of 0019.1 'unit test of json-writer routines': 
@@ -7755,48 +7801,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0022-crlf-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0022-crlf-rename/.git/
-expecting success of 0022.1 'setup': 
-
-	cat "$TEST_DIRECTORY"/t0022-crlf-rename.sh >sample &&
-	git add sample &&
-
-	test_tick &&
-	git commit -m Initial &&
-
-	append_cr <"$TEST_DIRECTORY"/t0022-crlf-rename.sh >elpmas &&
-	git add elpmas &&
-	rm -f sample &&
-
-	test_tick &&
-	git commit -a -m Second
-
-
-[master (root-commit) 1308cf6] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 33 insertions(+)
- create mode 100644 sample
-[master 6485017] Second
- Author: A U Thor <author@example.com>
- 1 file changed, 33 insertions(+), 33 deletions(-)
- rename sample => elpmas (94%)
-ok 1 - setup
-
-expecting success of 0022.2 'diff -M': 
-
-	git diff-tree -M -r --name-status HEAD^ HEAD >tmp &&
-	sed -e "s/R[0-9]*/RNUM/" tmp >actual &&
-	echo "RNUM	sample	elpmas" >expect &&
-	test_cmp expect actual
-
-
-ok 2 - diff -M
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0023-crlf-am.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0023-crlf-am/.git/
 expecting success of 0023.1 'setup': 
@@ -7968,6 +7972,103 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0026-eol-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0029-core-unsetenvvars.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0029-core-unsetenvvars/.git/
+1..0 # SKIP skipping Windows-specific tests
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0006-date.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0006-date/.git/
 checking prerequisite: TIME_IS_64BIT
@@ -8791,103 +8892,6 @@
 1..129
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0026-eol-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0029-core-unsetenvvars.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0029-core-unsetenvvars/.git/
-1..0 # SKIP skipping Windows-specific tests
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0020-crlf.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0020-crlf/.git/
 expecting success of 0020.1 'setup': 
@@ -9318,6 +9322,7 @@
 Turn off this advice by setting config variable advice.detachedHead to false
 
 HEAD is now at f2c783e second
+M	three
 Previous HEAD position was f2c783e second
 Switched to branch 'main'
 ok 28 - checkout when deleting .gitattributes
@@ -9329,6 +9334,10 @@
 
 
 +crlf is not a valid attribute name: .gitattributes:1
++crlf is not a valid attribute name: .gitattributes:1
+diff --git a/three b/three
+index 98efc5e..c5c386a 100644
+Binary files a/three and b/three differ
 ok 29 - invalid .gitattributes (must not crash)
 
 expecting success of 0020.30 'setting up for new autocrlf tests': 
@@ -11227,6 +11236,70 @@
 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
 
@@ -11286,6 +11359,38 @@
 | 16:  a  
 
 warning: in the working copy of 'eol.utf16', CRLF will be replaced by LF the next time Git touches it
+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 (eol.utf16, considered utf-16):
 |  0: ff   |  1: fe   |  2: 6f o |  3:  0   |  4: 6e n |  5:  0   |  6: 65 e |  7:  0  
 |  8:  d   |  9:  0   | 10:  a   | 11:  0   | 12: 74 t | 13:  0   | 14: 77 w | 15:  0  
@@ -11298,12 +11403,172 @@
 |  8:  d   |  9:  a   | 10: 74 t | 11: 68 h | 12: 72 r | 13: 65 e | 14: 65 e | 15:  d  
 | 16:  a  
 
+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 ?
+
 [main 85a4f33] eol
  Author: A U Thor <author@example.com>
  1 file changed, 3 insertions(+)
  create mode 100644 eol.utf16
 Updated 1 path from the index
+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 ?
+
 Updated 1 path from the index
+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 ?
+
+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 8 - eol conversion for UTF-16 encoded files on checkout
 
@@ -11344,6 +11609,70 @@
 hint: The file 'bebom.utf32le' contains a byte order mark (BOM). Please use UTF-32 as working-tree-encoding.
 fatal: BOM is prohibited in 'lebom.utf32le' if encoded as utf-32LE
 hint: The file 'lebom.utf32le' contains a byte order mark (BOM). Please use UTF-32 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 9 - check prohibited UTF-32 BOM
 
@@ -11366,6 +11695,70 @@
 hint: The file 'nobom.utf32' is missing a byte order mark (BOM). Please use UTF-32BE or UTF-32LE (depending on the byte order) as working-tree-encoding.
 fatal: BOM is required in 'nobom.utf32' if encoded as utf-32
 hint: The file 'nobom.utf32' is missing a byte order mark (BOM). Please use UTF-32BE or UTF-32LE (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 10 - check required UTF-32 BOM
 
@@ -11429,6 +11822,38 @@
 | 16:  a  
 
 warning: in the working copy of 'eol.utf32', CRLF will be replaced by LF the next time Git touches it
+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 (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  
@@ -11445,12 +11870,172 @@
 |  8:  d   |  9:  a   | 10: 74 t | 11: 68 h | 12: 72 r | 13: 65 e | 14: 65 e | 15:  d  
 | 16:  a  
 
+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 ?
+
 [main 674dc3f] eol
  Author: A U Thor <author@example.com>
  1 file changed, 3 insertions(+)
  create mode 100644 eol.utf32
 Updated 1 path from the index
+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 ?
+
 Updated 1 path from the index
+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 ?
+
+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 11 - eol conversion for UTF-32 encoded files on checkout
 
@@ -11517,8 +12102,136 @@
 	git diff 2>err.out &&
 	test_grep "error: BOM is required" err.out
 
+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 ?
+
 error: BOM is required in 'nonsense.utf16' if encoded as utf-16
 error: BOM is required in 'nonsense.utf16' if encoded as utf-16
+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 14 - error if encoding garbage is already in Git
 
@@ -11570,77 +12283,301 @@
 	git reset
 
 Checking roundtrip encoding for SHIFT-JIS...
-Unstaged changes after reset:
-M	.gitattributes
-Unstaged changes after reset:
-M	.gitattributes
-Unstaged changes after reset:
-M	.gitattributes
-Checking roundtrip encoding for utf-16...
-Unstaged changes after reset:
-M	.gitattributes
-Checking roundtrip encoding for utf-16...
-Unstaged changes after reset:
-M	.gitattributes
-HEAD is now at dfb2bb8 initial
-ok 15 - check roundtrip encoding
-
-expecting success of 0028.16 'Commit UTF-8, checkout UTF-8': 
-		test_when_finished "git checkout HEAD -- .gitattributes" &&
+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  
 
-		test_ext="commit_utf8_checkout_$encoding" &&
-		test_file="test.$test_ext" &&
+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 ?
 
-		# Commit as UTF-8
-		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
-		printf "$orig_string" >$test_file &&
-		git add $test_file &&
-		git commit -m "Test data" &&
+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  
 
-		# Checkout in tested encoding
-		rm $test_file &&
-		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
-		git checkout HEAD -- $test_file &&
+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 ?
 
-		# Test
-		printf $expect_bytes >$test_file.raw &&
-		test_cmp_bin $test_file.raw $test_file
-	
-[main 7887505] Test data
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.commit_utf8_checkout_UTF-8
-ok 16 - Commit UTF-8, checkout UTF-8
+Unstaged changes after reset:
+M	.gitattributes
+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  
 
-expecting success of 0028.17 'Commit UTF-8, checkout UTF-16LE': 
-		test_when_finished "git checkout HEAD -- .gitattributes" &&
+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 ?
 
-		test_ext="commit_utf8_checkout_$encoding" &&
-		test_file="test.$test_ext" &&
+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  
 
-		# Commit as UTF-8
-		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
-		printf "$orig_string" >$test_file &&
-		git add $test_file &&
-		git commit -m "Test data" &&
+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 ?
 
-		# Checkout in tested encoding
-		rm $test_file &&
-		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
-		git checkout HEAD -- $test_file &&
+Unstaged changes after reset:
+M	.gitattributes
+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  
 
-		# Test
-		printf $expect_bytes >$test_file.raw &&
-		test_cmp_bin $test_file.raw $test_file
-	
-[main dd0bb11] Test data
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.commit_utf8_checkout_UTF-16LE
-ok 17 - Commit UTF-8, checkout UTF-16LE
+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 ?
 
-expecting success of 0028.18 'Commit UTF-8, checkout UTF-16BE': 
-		test_when_finished "git checkout HEAD -- .gitattributes" &&
+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 ?
+
+Unstaged changes after reset:
+M	.gitattributes
+Checking roundtrip encoding for utf-16...
+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 ?
+
+Unstaged changes after reset:
+M	.gitattributes
+Checking roundtrip encoding for utf-16...
+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 ?
+
+Unstaged changes after reset:
+M	.gitattributes
+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 15 - check roundtrip encoding
+
+expecting success of 0028.16 'Commit UTF-8, checkout UTF-8': 
+		test_when_finished "git checkout HEAD -- .gitattributes" &&
+
+		test_ext="commit_utf8_checkout_$encoding" &&
+		test_file="test.$test_ext" &&
+
+		# Commit as UTF-8
+		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
+		printf "$orig_string" >$test_file &&
+		git add $test_file &&
+		git commit -m "Test data" &&
+
+		# Checkout in tested encoding
+		rm $test_file &&
+		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
+		git checkout HEAD -- $test_file &&
+
+		# Test
+		printf $expect_bytes >$test_file.raw &&
+		test_cmp_bin $test_file.raw $test_file
+	
+[main 7887505] Test data
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.commit_utf8_checkout_UTF-8
+ok 16 - Commit UTF-8, checkout UTF-8
+
+expecting success of 0028.17 'Commit UTF-8, checkout UTF-16LE': 
+		test_when_finished "git checkout HEAD -- .gitattributes" &&
+
+		test_ext="commit_utf8_checkout_$encoding" &&
+		test_file="test.$test_ext" &&
+
+		# Commit as UTF-8
+		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
+		printf "$orig_string" >$test_file &&
+		git add $test_file &&
+		git commit -m "Test data" &&
+
+		# Checkout in tested encoding
+		rm $test_file &&
+		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
+		git checkout HEAD -- $test_file &&
+
+		# Test
+		printf $expect_bytes >$test_file.raw &&
+		test_cmp_bin $test_file.raw $test_file
+	
+[main dd0bb11] Test data
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.commit_utf8_checkout_UTF-16LE
+ok 17 - Commit UTF-8, checkout UTF-16LE
+
+expecting success of 0028.18 'Commit UTF-8, checkout UTF-16BE': 
+		test_when_finished "git checkout HEAD -- .gitattributes" &&
 
 		test_ext="commit_utf8_checkout_$encoding" &&
 		test_file="test.$test_ext" &&
@@ -12298,7 +13235,7 @@
 	expect_accepted_implicit -C outer-repo/bare-repo
 
 .
-08:19:49.218523 setup.c:1552                 | d0 | main                     | data         |     |  0.002280 |  0.002280 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+14:51:35.024625 setup.c:1552                 | d0 | main                     | data         |     |  0.000704 |  0.000704 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 2 - safe.bareRepository unset
 
 expecting success of 0035.3 'safe.bareRepository=all': 
@@ -12306,7 +13243,7 @@
 	expect_accepted_implicit -C outer-repo/bare-repo
 
 .
-08:19:49.253261 setup.c:1552                 | d0 | main                     | data         |     |  0.008565 |  0.008565 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+14:51:35.057660 setup.c:1552                 | d0 | main                     | data         |     |  0.000603 |  0.000603 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 3 - safe.bareRepository=all
 
 expecting success of 0035.4 'safe.bareRepository=explicit': 
@@ -12314,7 +13251,7 @@
 	expect_rejected -C outer-repo/bare-repo
 
 fatal: cannot use bare repository '/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-08:19:49.291152 setup.c:1552                 | d0 | main                     | data         |     |  0.000656 |  0.000656 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+14:51:35.091808 setup.c:1552                 | d0 | main                     | data         |     |  0.001204 |  0.001204 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/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': 
@@ -12326,7 +13263,7 @@
 	expect_rejected -C outer-repo/bare-repo
 
 fatal: cannot use bare repository '/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-08:19:49.337205 setup.c:1552                 | d0 | main                     | data         |     |  0.000635 |  0.000635 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+14:51:35.131581 setup.c:1552                 | d0 | main                     | data         |     |  0.000655 |  0.000655 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/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': 
@@ -12335,7 +13272,7 @@
 		-c safe.bareRepository=all
 
 .
-08:19:49.387595 setup.c:1552                 | d0 | main                     | data         |     |  0.001552 |  0.001552 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+14:51:35.171889 setup.c:1552                 | d0 | main                     | data         |     |  0.000622 |  0.000622 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/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': 
@@ -12347,7 +13284,7 @@
 	expect_rejected -C outer-repo/bare-repo
 
 fatal: cannot use bare repository '/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-08:19:49.450983 setup.c:1552                 | d0 | main                     | data         |     |  0.000703 |  0.000703 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+14:51:35.199618 setup.c:1552                 | d0 | main                     | data         |     |  0.000632 |  0.000632 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/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': 
@@ -12360,34 +13297,39 @@
 	expect_accepted_implicit -C outer-repo/.git
 
 .
-08:19:49.504324 setup.c:1552                 | d0 | main                     | data         |     |  0.000657 |  0.000657 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
+14:51:35.221078 setup.c:1552                 | d0 | main                     | data         |     |  0.000619 |  0.000619 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
-08:19:49.517294 setup.c:1552                 | d0 | main                     | data         |     |  0.000656 |  0.000656 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
+14:51:35.230314 setup.c:1552                 | d0 | main                     | data         |     |  0.000598 |  0.000598 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/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
 
 .
-08:19:49.541629 setup.c:1552                 | d0 | main                     | data         |     |  0.000699 |  0.000699 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/worktrees/outer-secondary
+14:51:35.239979 setup.c:1552                 | d0 | main                     | data         |     |  0.000624 |  0.000624 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/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
 
 .
-08:19:49.578612 setup.c:1552                 | d0 | main                     | data         |     |  0.000668 |  0.000668 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/modules/subn
+14:51:35.249567 setup.c:1552                 | d0 | main                     | data         |     |  0.000612 |  0.000612 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.51.0/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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0051-windows-named-pipe.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0051-windows-named-pipe/.git/
+1..0 # SKIP skipping Windows-specific tests
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0012-help.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0012-help/.git/
 expecting success of 0012.1 'setup': 
@@ -17292,6 +18234,356 @@
 1..176
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0055-beyond-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0055-beyond-symlinks/.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 0055.1 'setup': 
+	>a &&
+	mkdir b &&
+	ln -s b c &&
+	>c/d &&
+	git update-index --add a b/d
+
+ok 1 - setup
+
+expecting success of 0055.2 'update-index --add beyond symlinks': 
+	test_must_fail git update-index --add c/d &&
+	cat >expect <<-\EOF &&
+	a
+	b/d
+	EOF
+	git ls-files >actual &&
+	test_cmp expect actual
+
+error: 'c/d' is beyond a symbolic link
+fatal: Unable to process path c/d
+ok 2 - update-index --add beyond symlinks
+
+expecting success of 0055.3 'add beyond symlinks': 
+	test_must_fail git add c/d &&
+	cat >expect <<-\EOF &&
+	a
+	b/d
+	EOF
+	git ls-files >actual &&
+	test_cmp expect actual
+
+fatal: pathspec 'c/d' is beyond a symbolic link
+ok 3 - add beyond symlinks
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0041-usage.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0041-usage/.git/
+expecting success of 0041.1 'setup ': 
+	test_commit "v1.0"
+
+[main (root-commit) 843b676] v1.0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 v1.0.t
+ok 1 - setup 
+
+expecting success of 0041.2 'tag --contains <existent_tag>': 
+	git tag --contains "v1.0" >actual 2>actual.err &&
+	grep "v1.0" actual &&
+	test_line_count = 0 actual.err
+
+v1.0
+ok 2 - tag --contains <existent_tag>
+
+expecting success of 0041.3 'tag --contains <inexistent_tag>': 
+	test_must_fail git tag --contains "notag" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "error" actual.err &&
+	test_grep ! "usage" actual.err
+
+error: malformed object name notag
+ok 3 - tag --contains <inexistent_tag>
+
+expecting success of 0041.4 'tag --no-contains <existent_tag>': 
+	git tag --no-contains "v1.0" >actual 2>actual.err  &&
+	test_line_count = 0 actual &&
+	test_line_count = 0 actual.err
+
+ok 4 - tag --no-contains <existent_tag>
+
+expecting success of 0041.5 'tag --no-contains <inexistent_tag>': 
+	test_must_fail git tag --no-contains "notag" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "error" actual.err &&
+	test_grep ! "usage" actual.err
+
+error: malformed object name notag
+ok 5 - tag --no-contains <inexistent_tag>
+
+expecting success of 0041.6 'tag usage error': 
+	test_must_fail git tag --noopt >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "usage" actual.err
+
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+ok 6 - tag usage error
+
+expecting success of 0041.7 'branch --contains <existent_commit>': 
+	git branch --contains "main" >actual 2>actual.err &&
+	test_grep "main" actual &&
+	test_line_count = 0 actual.err
+
+* main
+ok 7 - branch --contains <existent_commit>
+
+expecting success of 0041.8 'branch --contains <inexistent_commit>': 
+	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "error" actual.err &&
+	test_grep ! "usage" actual.err
+
+error: malformed object name nocommit
+ok 8 - branch --contains <inexistent_commit>
+
+expecting success of 0041.9 'branch --no-contains <existent_commit>': 
+	git branch --no-contains "main" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_line_count = 0 actual.err
+
+ok 9 - branch --no-contains <existent_commit>
+
+expecting success of 0041.10 'branch --no-contains <inexistent_commit>': 
+	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "error" actual.err &&
+	test_grep ! "usage" actual.err
+
+error: malformed object name nocommit
+ok 10 - branch --no-contains <inexistent_commit>
+
+expecting success of 0041.11 'branch usage error': 
+	test_must_fail git branch --noopt >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "usage" actual.err
+
+usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
+ok 11 - branch usage error
+
+expecting success of 0041.12 'for-each-ref --contains <existent_object>': 
+	git for-each-ref --contains "main" >actual 2>actual.err &&
+	test_line_count = 2 actual &&
+	test_line_count = 0 actual.err
+
+ok 12 - for-each-ref --contains <existent_object>
+
+expecting success of 0041.13 'for-each-ref --contains <inexistent_object>': 
+	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "error" actual.err &&
+	test_grep ! "usage" actual.err
+
+error: malformed object name noobject
+ok 13 - for-each-ref --contains <inexistent_object>
+
+expecting success of 0041.14 'for-each-ref --no-contains <existent_object>': 
+	git for-each-ref --no-contains "main" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_line_count = 0 actual.err
+
+ok 14 - for-each-ref --no-contains <existent_object>
+
+expecting success of 0041.15 'for-each-ref --no-contains <inexistent_object>': 
+	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "error" actual.err &&
+	test_grep ! "usage" actual.err
+
+error: malformed object name noobject
+ok 15 - for-each-ref --no-contains <inexistent_object>
+
+expecting success of 0041.16 'for-each-ref usage error': 
+	test_must_fail git for-each-ref --noopt >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "usage" actual.err
+
+usage: git for-each-ref [<options>] [<pattern>]
+ok 16 - for-each-ref usage error
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0050-filesystem.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0050-filesystem/.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
+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 detection of case insensitive filesystem during repo init (missing CASE_INSENSITIVE_FS)
+
+expecting success of 0050.2 'detection of case insensitive filesystem during repo init': 
+	{
+		test_must_fail git config --bool core.ignorecase >/dev/null ||
+			test $(git config --bool core.ignorecase) = false
+	}
+
+ok 2 - detection of case insensitive filesystem during repo init
+
+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 0050.3 'detection of filesystem w/o symlink support during repo init': 
+	{
+		test_must_fail git config --bool core.symlinks ||
+		test "$(git config --bool core.symlinks)" = true
+	}
+
+ok 3 - detection of filesystem w/o symlink support during repo init
+
+ok 4 # skip detection of filesystem w/o symlink support during repo init (missing !SYMLINKS)
+
+expecting success of 0050.5 'setup case tests': 
+	git config core.ignorecase true &&
+	touch camelcase &&
+	git add camelcase &&
+	git commit -m "initial" &&
+	git tag initial &&
+	git checkout -b topic &&
+	git mv camelcase tmp &&
+	git mv tmp CamelCase &&
+	git commit -m "rename" &&
+	git checkout -f main
+
+[main (root-commit) 4f2cf87] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 camelcase
+Switched to a new branch 'topic'
+[topic 0a6fec9] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename camelcase => CamelCase (100%)
+Switched to branch 'main'
+ok 5 - setup case tests
+
+expecting success of 0050.6 'rename (case change)': 
+	git mv camelcase CamelCase &&
+	git commit -m "rename"
+
+[main 0a6fec9] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename camelcase => CamelCase (100%)
+ok 6 - rename (case change)
+
+expecting success of 0050.7 'merge (case change)': 
+	rm -f CamelCase &&
+	rm -f camelcase &&
+	git reset --hard initial &&
+	git merge topic
+
+HEAD is now at 4f2cf87 initial
+Updating 4f2cf87..0a6fec9
+Fast-forward
+ camelcase => CamelCase | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename camelcase => CamelCase (100%)
+ok 7 - merge (case change)
+
+ok 8 # skip add directory (with different case) (missing CASE_INSENSITIVE_FS)
+
+ok 9 # skip add (with different case) (missing CASE_INSENSITIVE_FS)
+
+expecting success of 0050.10 'setup unicode normalization tests': 
+	test_create_repo unicode &&
+	cd unicode &&
+	git config core.precomposeunicode false &&
+	touch "$aumlcdiar" &&
+	git add "$aumlcdiar" &&
+	git commit -m initial &&
+	git tag initial &&
+	git checkout -b topic &&
+	git mv $aumlcdiar tmp &&
+	git mv tmp "$auml" &&
+	git commit -m rename &&
+	git checkout -f main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0050-filesystem/unicode/.git/
+[main (root-commit) 34f0acb] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 "a\314\210"
+Switched to a new branch 'topic'
+[topic 591d19c] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename "a\314\210" => "\303\244" (100%)
+Switched to branch 'main'
+ok 10 - setup unicode normalization tests
+
+expecting success of 0050.11 'rename (silent unicode normalization)': 
+	git mv "$aumlcdiar" "$auml" &&
+	git commit -m rename
+
+[main 591d19c] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename "a\314\210" => "\303\244" (100%)
+ok 11 - rename (silent unicode normalization)
+
+expecting success of 0050.12 'merge (silent unicode normalization)': 
+	git reset --hard initial &&
+	git merge topic
+
+HEAD is now at 34f0acb initial
+Updating 34f0acb..591d19c
+Fast-forward
+ "a\314\210" => "\303\244" | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename "a\314\210" => "\303\244" (100%)
+ok 12 - merge (silent unicode normalization)
+
+ok 13 # skip checkout with no pathspec and a case insensitive fs (missing CASE_INSENSITIVE_FS)
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0001-init.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0001-init/.git/
 expecting success of 0001.1 'plain': 
@@ -18558,233 +19850,166 @@
 1..101
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0051-windows-named-pipe.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0051-windows-named-pipe/.git/
-1..0 # SKIP skipping Windows-specific tests
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0041-usage.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0041-usage/.git/
-expecting success of 0041.1 'setup ': 
-	test_commit "v1.0"
+*** t0062-revision-walking.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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"
 
-[main (root-commit) 843b676] v1.0
+[master (root-commit) 925677c] add a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 v1.0.t
-ok 1 - setup 
-
-expecting success of 0041.2 'tag --contains <existent_tag>': 
-	git tag --contains "v1.0" >actual 2>actual.err &&
-	grep "v1.0" actual &&
-	test_line_count = 0 actual.err
-
-v1.0
-ok 2 - tag --contains <existent_tag>
-
-expecting success of 0041.3 'tag --contains <inexistent_tag>': 
-	test_must_fail git tag --contains "notag" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "error" actual.err &&
-	test_grep ! "usage" actual.err
-
-error: malformed object name notag
-ok 3 - tag --contains <inexistent_tag>
-
-expecting success of 0041.4 'tag --no-contains <existent_tag>': 
-	git tag --no-contains "v1.0" >actual 2>actual.err  &&
-	test_line_count = 0 actual &&
-	test_line_count = 0 actual.err
-
-ok 4 - tag --no-contains <existent_tag>
-
-expecting success of 0041.5 'tag --no-contains <inexistent_tag>': 
-	test_must_fail git tag --no-contains "notag" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "error" actual.err &&
-	test_grep ! "usage" actual.err
-
-error: malformed object name notag
-ok 5 - tag --no-contains <inexistent_tag>
-
-expecting success of 0041.6 'tag usage error': 
-	test_must_fail git tag --noopt >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "usage" actual.err
-
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-ok 6 - tag usage error
-
-expecting success of 0041.7 'branch --contains <existent_commit>': 
-	git branch --contains "main" >actual 2>actual.err &&
-	test_grep "main" actual &&
-	test_line_count = 0 actual.err
-
-* main
-ok 7 - branch --contains <existent_commit>
-
-expecting success of 0041.8 'branch --contains <inexistent_commit>': 
-	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "error" actual.err &&
-	test_grep ! "usage" actual.err
+ 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
 
-error: malformed object name nocommit
-ok 8 - branch --contains <inexistent_commit>
+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 0041.9 'branch --no-contains <existent_commit>': 
-	git branch --no-contains "main" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_line_count = 0 actual.err
+ok 2 - revision walking can be done twice
 
-ok 9 - branch --no-contains <existent_commit>
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0066-dir-iterator.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0066-dir-iterator/.git/
+expecting success of 0066.1 'setup': 
+	mkdir -p dir &&
+	mkdir -p dir/a/b/c/ &&
+	>dir/b &&
+	>dir/c &&
+	mkdir -p dir/d/e/d/ &&
+	>dir/a/b/c/d &&
+	>dir/a/e &&
+	>dir/d/e/d/a &&
 
-expecting success of 0041.10 'branch --no-contains <inexistent_commit>': 
-	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "error" actual.err &&
-	test_grep ! "usage" actual.err
+	mkdir -p dir2/a/b/c/ &&
+	>dir2/a/b/c/d
 
-error: malformed object name nocommit
-ok 10 - branch --no-contains <inexistent_commit>
+ok 1 - setup
 
-expecting success of 0041.11 'branch usage error': 
-	test_must_fail git branch --noopt >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "usage" actual.err
+expecting success of 0066.2 'dir-iterator should iterate through all files': 
+	cat >expected-iteration-sorted-output <<-EOF &&
+	[d] (a) [a] ./dir/a
+	[d] (a/b) [b] ./dir/a/b
+	[d] (a/b/c) [c] ./dir/a/b/c
+	[d] (d) [d] ./dir/d
+	[d] (d/e) [e] ./dir/d/e
+	[d] (d/e/d) [d] ./dir/d/e/d
+	[f] (a/b/c/d) [d] ./dir/a/b/c/d
+	[f] (a/e) [e] ./dir/a/e
+	[f] (b) [b] ./dir/b
+	[f] (c) [c] ./dir/c
+	[f] (d/e/d/a) [a] ./dir/d/e/d/a
+	EOF
 
-usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
-ok 11 - branch usage error
+	test-tool dir-iterator ./dir >out &&
+	sort out >./actual-iteration-sorted-output &&
 
-expecting success of 0041.12 'for-each-ref --contains <existent_object>': 
-	git for-each-ref --contains "main" >actual 2>actual.err &&
-	test_line_count = 2 actual &&
-	test_line_count = 0 actual.err
+	test_cmp expected-iteration-sorted-output actual-iteration-sorted-output
 
-ok 12 - for-each-ref --contains <existent_object>
+ok 2 - dir-iterator should iterate through all files
 
-expecting success of 0041.13 'for-each-ref --contains <inexistent_object>': 
-	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "error" actual.err &&
-	test_grep ! "usage" actual.err
+expecting success of 0066.3 'dir-iterator should list files in the correct order': 
+	cat >expected-pre-order-output <<-EOF &&
+	[d] (a) [a] ./dir2/a
+	[d] (a/b) [b] ./dir2/a/b
+	[d] (a/b/c) [c] ./dir2/a/b/c
+	[f] (a/b/c/d) [d] ./dir2/a/b/c/d
+	EOF
 
-error: malformed object name noobject
-ok 13 - for-each-ref --contains <inexistent_object>
+	test-tool dir-iterator ./dir2 >actual-pre-order-output &&
 
-expecting success of 0041.14 'for-each-ref --no-contains <existent_object>': 
-	git for-each-ref --no-contains "main" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_line_count = 0 actual.err
+	test_cmp expected-pre-order-output actual-pre-order-output
 
-ok 14 - for-each-ref --no-contains <existent_object>
+ok 3 - dir-iterator should list files in the correct order
 
-expecting success of 0041.15 'for-each-ref --no-contains <inexistent_object>': 
-	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "error" actual.err &&
-	test_grep ! "usage" actual.err
+expecting success of 0066.4 'begin should fail upon inexistent paths': 
+	test_must_fail test-tool dir-iterator ./inexistent-path \
+		>actual-inexistent-path-output &&
+	echo "dir_iterator_begin failure: ENOENT" >expected-inexistent-path-output &&
+	test_cmp expected-inexistent-path-output actual-inexistent-path-output
 
-error: malformed object name noobject
-ok 15 - for-each-ref --no-contains <inexistent_object>
+ok 4 - begin should fail upon inexistent paths
 
-expecting success of 0041.16 'for-each-ref usage error': 
-	test_must_fail git for-each-ref --noopt >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "usage" actual.err
+expecting success of 0066.5 'begin should fail upon non directory paths': 
+	test_must_fail test-tool dir-iterator ./dir/b >actual-non-dir-output &&
+	echo "dir_iterator_begin failure: ENOTDIR" >expected-non-dir-output &&
+	test_cmp expected-non-dir-output actual-non-dir-output
 
-usage: git for-each-ref [<options>] [<pattern>]
-ok 16 - for-each-ref usage error
+ok 5 - begin should fail upon non directory paths
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0055-beyond-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0055-beyond-symlinks/.git/
-checking prerequisite: SYMLINKS
+checking prerequisite: SANITY
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
 (
-	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 0055.1 'setup': 
-	>a &&
-	mkdir b &&
-	ln -s b c &&
-	>c/d &&
-	git update-index --add a b/d
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-ok 1 - setup
+	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 0055.2 'update-index --add beyond symlinks': 
-	test_must_fail git update-index --add c/d &&
-	cat >expect <<-\EOF &&
-	a
-	b/d
-	EOF
-	git ls-files >actual &&
-	test_cmp expect actual
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-error: 'c/d' is beyond a symbolic link
-fatal: Unable to process path c/d
-ok 2 - update-index --add beyond symlinks
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-expecting success of 0055.3 'add beyond symlinks': 
-	test_must_fail git add c/d &&
-	cat >expect <<-\EOF &&
-	a
-	b/d
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 0066.6 'advance should not fail on errors by default': 
+	cat >expected-no-permissions-output <<-EOF &&
+	[d] (a) [a] ./dir3/a
 	EOF
-	git ls-files >actual &&
-	test_cmp expect actual
-
-fatal: pathspec 'c/d' is beyond a symbolic link
-ok 3 - add beyond symlinks
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0050-filesystem.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0050-filesystem/.git/
-checking prerequisite: UTF8_NFD_TO_NFC
+	mkdir -p dir3/a &&
+	>dir3/a/b &&
+	chmod 0 dir3/a &&
 
-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"
+	test-tool dir-iterator ./dir3 >actual-no-permissions-output &&
+	test_cmp expected-no-permissions-output actual-no-permissions-output &&
+	chmod 755 dir3/a &&
+	rm -rf dir3
 
-)
-prerequisite UTF8_NFD_TO_NFC not satisfied
-checking prerequisite: CASE_INSENSITIVE_FS
+warning: error opening directory './dir3/a/': Permission denied
+ok 6 - advance should not fail on errors by default
 
-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 0066.7 'advance should fail on errors, w/ pedantic flag': 
+	cat >expected-no-permissions-pedantic-output <<-EOF &&
+	[d] (a) [a] ./dir3/a
+	dir_iterator_advance failure
+	EOF
 
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 1 # skip detection of case insensitive filesystem during repo init (missing CASE_INSENSITIVE_FS)
+	mkdir -p dir3/a &&
+	>dir3/a/b &&
+	chmod 0 dir3/a &&
 
-expecting success of 0050.2 'detection of case insensitive filesystem during repo init': 
-	{
-		test_must_fail git config --bool core.ignorecase >/dev/null ||
-			test $(git config --bool core.ignorecase) = false
-	}
+	test_must_fail test-tool dir-iterator --pedantic ./dir3 \
+		>actual-no-permissions-pedantic-output &&
+	test_cmp expected-no-permissions-pedantic-output \
+		actual-no-permissions-pedantic-output &&
+	chmod 755 dir3/a &&
+	rm -rf dir3
 
-ok 2 - detection of case insensitive filesystem during repo init
+warning: error opening directory './dir3/a/': Permission denied
+ok 7 - advance should fail on errors, w/ pedantic flag
 
 checking prerequisite: SYMLINKS
 
@@ -18796,121 +20021,44 @@
 
 )
 prerequisite SYMLINKS ok
-expecting success of 0050.3 'detection of filesystem w/o symlink support during repo init': 
-	{
-		test_must_fail git config --bool core.symlinks ||
-		test "$(git config --bool core.symlinks)" = true
-	}
-
-ok 3 - detection of filesystem w/o symlink support during repo init
-
-ok 4 # skip detection of filesystem w/o symlink support during repo init (missing !SYMLINKS)
-
-expecting success of 0050.5 'setup case tests': 
-	git config core.ignorecase true &&
-	touch camelcase &&
-	git add camelcase &&
-	git commit -m "initial" &&
-	git tag initial &&
-	git checkout -b topic &&
-	git mv camelcase tmp &&
-	git mv tmp CamelCase &&
-	git commit -m "rename" &&
-	git checkout -f main
-
-[main (root-commit) 4f2cf87] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 camelcase
-Switched to a new branch 'topic'
-[topic 0a6fec9] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename camelcase => CamelCase (100%)
-Switched to branch 'main'
-ok 5 - setup case tests
-
-expecting success of 0050.6 'rename (case change)': 
-	git mv camelcase CamelCase &&
-	git commit -m "rename"
-
-[main 0a6fec9] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename camelcase => CamelCase (100%)
-ok 6 - rename (case change)
-
-expecting success of 0050.7 'merge (case change)': 
-	rm -f CamelCase &&
-	rm -f camelcase &&
-	git reset --hard initial &&
-	git merge topic
-
-HEAD is now at 4f2cf87 initial
-Updating 4f2cf87..0a6fec9
-Fast-forward
- camelcase => CamelCase | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename camelcase => CamelCase (100%)
-ok 7 - merge (case change)
+expecting success of 0066.8 'setup dirs with symlinks': 
+	mkdir -p dir4/a &&
+	mkdir -p dir4/b/c &&
+	>dir4/a/d &&
+	ln -s d dir4/a/e &&
+	ln -s ../b dir4/a/f &&
 
-ok 8 # skip add directory (with different case) (missing CASE_INSENSITIVE_FS)
+	ln -s dir4 dir5
 
-ok 9 # skip add (with different case) (missing CASE_INSENSITIVE_FS)
+ok 8 - setup dirs with symlinks
 
-expecting success of 0050.10 'setup unicode normalization tests': 
-	test_create_repo unicode &&
-	cd unicode &&
-	git config core.precomposeunicode false &&
-	touch "$aumlcdiar" &&
-	git add "$aumlcdiar" &&
-	git commit -m initial &&
-	git tag initial &&
-	git checkout -b topic &&
-	git mv $aumlcdiar tmp &&
-	git mv tmp "$auml" &&
-	git commit -m rename &&
-	git checkout -f main
+expecting success of 0066.9 'dir-iterator should not follow symlinks by default': 
+	cat >expected-no-follow-sorted-output <<-EOF &&
+	[d] (a) [a] ./dir4/a
+	[d] (b) [b] ./dir4/b
+	[d] (b/c) [c] ./dir4/b/c
+	[f] (a/d) [d] ./dir4/a/d
+	[s] (a/e) [e] ./dir4/a/e
+	[s] (a/f) [f] ./dir4/a/f
+	EOF
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0050-filesystem/unicode/.git/
-[main (root-commit) 34f0acb] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 "a\314\210"
-Switched to a new branch 'topic'
-[topic 591d19c] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename "a\314\210" => "\303\244" (100%)
-Switched to branch 'main'
-ok 10 - setup unicode normalization tests
+	test-tool dir-iterator ./dir4 >out &&
+	sort out >actual-no-follow-sorted-output &&
 
-expecting success of 0050.11 'rename (silent unicode normalization)': 
-	git mv "$aumlcdiar" "$auml" &&
-	git commit -m rename
+	test_cmp expected-no-follow-sorted-output actual-no-follow-sorted-output
 
-[main 591d19c] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename "a\314\210" => "\303\244" (100%)
-ok 11 - rename (silent unicode normalization)
+ok 9 - dir-iterator should not follow symlinks by default
 
-expecting success of 0050.12 'merge (silent unicode normalization)': 
-	git reset --hard initial &&
-	git merge topic
+expecting success of 0066.10 'dir-iterator does not resolve top-level symlinks': 
+	test_must_fail test-tool dir-iterator ./dir5 >out &&
 
-HEAD is now at 34f0acb initial
-Updating 34f0acb..591d19c
-Fast-forward
- "a\314\210" => "\303\244" | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename "a\314\210" => "\303\244" (100%)
-ok 12 - merge (silent unicode normalization)
+	grep "ENOTDIR" out
 
-ok 13 # skip checkout with no pathspec and a case insensitive fs (missing CASE_INSENSITIVE_FS)
+dir_iterator_begin failure: ENOTDIR
+ok 10 - dir-iterator does not resolve top-level symlinks
 
-# passed all 13 test(s)
-1..13
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0056-git-C.sh ***
@@ -19032,6 +20180,121 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0067-parse_pathspec_file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0067-parse_pathspec_file/.git/
+expecting success of 0067.1 'one item from stdin': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
+
+	echo fileA.t |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+
+ok 1 - one item from stdin
+
+expecting success of 0067.2 'one item from file': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
+
+	echo fileA.t >list &&
+	test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
+
+	test_cmp expect actual
+
+ok 2 - one item from file
+
+expecting success of 0067.3 'NUL delimiters': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\0fileB.t\0" |
+	test-tool parse-pathspec-file --pathspec-from-file=- --pathspec-file-nul >actual &&
+
+	test_cmp expect actual
+
+ok 3 - NUL delimiters
+
+expecting success of 0067.4 'LF delimiters': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\nfileB.t\n" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+
+ok 4 - LF delimiters
+
+expecting success of 0067.5 'no trailing delimiter': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\nfileB.t" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+
+ok 5 - no trailing delimiter
+
+expecting success of 0067.6 'CRLF delimiters': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\r\nfileB.t\r\n" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+
+ok 6 - CRLF delimiters
+
+expecting success of 0067.7 'quotes': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
+
+	test_cmp expect actual
+
+ok 7 - quotes
+
+expecting success of 0067.8 '--pathspec-file-nul takes quotes literally': 
+	# Note: there is an extra newline because --pathspec-file-nul takes
+	# input \n literally, too
+	cat >expect <<-\EOF &&
+	"file\101.t"
+
+	EOF
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test-tool parse-pathspec-file --pathspec-from-file=list --pathspec-file-nul >actual &&
+
+	test_cmp expect actual
+
+ok 8 - --pathspec-file-nul takes quotes literally
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0040-parse-options.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0040-parse-options/.git/
 expecting success of 0040.1 'test help': 
@@ -19872,481 +21135,6 @@
 1..94
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0062-revision-walking.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0066-dir-iterator.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0066-dir-iterator/.git/
-expecting success of 0066.1 'setup': 
-	mkdir -p dir &&
-	mkdir -p dir/a/b/c/ &&
-	>dir/b &&
-	>dir/c &&
-	mkdir -p dir/d/e/d/ &&
-	>dir/a/b/c/d &&
-	>dir/a/e &&
-	>dir/d/e/d/a &&
-
-	mkdir -p dir2/a/b/c/ &&
-	>dir2/a/b/c/d
-
-ok 1 - setup
-
-expecting success of 0066.2 'dir-iterator should iterate through all files': 
-	cat >expected-iteration-sorted-output <<-EOF &&
-	[d] (a) [a] ./dir/a
-	[d] (a/b) [b] ./dir/a/b
-	[d] (a/b/c) [c] ./dir/a/b/c
-	[d] (d) [d] ./dir/d
-	[d] (d/e) [e] ./dir/d/e
-	[d] (d/e/d) [d] ./dir/d/e/d
-	[f] (a/b/c/d) [d] ./dir/a/b/c/d
-	[f] (a/e) [e] ./dir/a/e
-	[f] (b) [b] ./dir/b
-	[f] (c) [c] ./dir/c
-	[f] (d/e/d/a) [a] ./dir/d/e/d/a
-	EOF
-
-	test-tool dir-iterator ./dir >out &&
-	sort out >./actual-iteration-sorted-output &&
-
-	test_cmp expected-iteration-sorted-output actual-iteration-sorted-output
-
-ok 2 - dir-iterator should iterate through all files
-
-expecting success of 0066.3 'dir-iterator should list files in the correct order': 
-	cat >expected-pre-order-output <<-EOF &&
-	[d] (a) [a] ./dir2/a
-	[d] (a/b) [b] ./dir2/a/b
-	[d] (a/b/c) [c] ./dir2/a/b/c
-	[f] (a/b/c/d) [d] ./dir2/a/b/c/d
-	EOF
-
-	test-tool dir-iterator ./dir2 >actual-pre-order-output &&
-
-	test_cmp expected-pre-order-output actual-pre-order-output
-
-ok 3 - dir-iterator should list files in the correct order
-
-expecting success of 0066.4 'begin should fail upon inexistent paths': 
-	test_must_fail test-tool dir-iterator ./inexistent-path \
-		>actual-inexistent-path-output &&
-	echo "dir_iterator_begin failure: ENOENT" >expected-inexistent-path-output &&
-	test_cmp expected-inexistent-path-output actual-inexistent-path-output
-
-ok 4 - begin should fail upon inexistent paths
-
-expecting success of 0066.5 'begin should fail upon non directory paths': 
-	test_must_fail test-tool dir-iterator ./dir/b >actual-non-dir-output &&
-	echo "dir_iterator_begin failure: ENOTDIR" >expected-non-dir-output &&
-	test_cmp expected-non-dir-output actual-non-dir-output
-
-ok 5 - begin should fail upon non directory paths
-
-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 0066.6 'advance should not fail on errors by default': 
-	cat >expected-no-permissions-output <<-EOF &&
-	[d] (a) [a] ./dir3/a
-	EOF
-
-	mkdir -p dir3/a &&
-	>dir3/a/b &&
-	chmod 0 dir3/a &&
-
-	test-tool dir-iterator ./dir3 >actual-no-permissions-output &&
-	test_cmp expected-no-permissions-output actual-no-permissions-output &&
-	chmod 755 dir3/a &&
-	rm -rf dir3
-
-warning: error opening directory './dir3/a/': Permission denied
-ok 6 - advance should not fail on errors by default
-
-expecting success of 0066.7 'advance should fail on errors, w/ pedantic flag': 
-	cat >expected-no-permissions-pedantic-output <<-EOF &&
-	[d] (a) [a] ./dir3/a
-	dir_iterator_advance failure
-	EOF
-
-	mkdir -p dir3/a &&
-	>dir3/a/b &&
-	chmod 0 dir3/a &&
-
-	test_must_fail test-tool dir-iterator --pedantic ./dir3 \
-		>actual-no-permissions-pedantic-output &&
-	test_cmp expected-no-permissions-pedantic-output \
-		actual-no-permissions-pedantic-output &&
-	chmod 755 dir3/a &&
-	rm -rf dir3
-
-warning: error opening directory './dir3/a/': Permission denied
-ok 7 - advance should fail on errors, w/ pedantic flag
-
-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 0066.8 'setup dirs with symlinks': 
-	mkdir -p dir4/a &&
-	mkdir -p dir4/b/c &&
-	>dir4/a/d &&
-	ln -s d dir4/a/e &&
-	ln -s ../b dir4/a/f &&
-
-	ln -s dir4 dir5
-
-ok 8 - setup dirs with symlinks
-
-expecting success of 0066.9 'dir-iterator should not follow symlinks by default': 
-	cat >expected-no-follow-sorted-output <<-EOF &&
-	[d] (a) [a] ./dir4/a
-	[d] (b) [b] ./dir4/b
-	[d] (b/c) [c] ./dir4/b/c
-	[f] (a/d) [d] ./dir4/a/d
-	[s] (a/e) [e] ./dir4/a/e
-	[s] (a/f) [f] ./dir4/a/f
-	EOF
-
-	test-tool dir-iterator ./dir4 >out &&
-	sort out >actual-no-follow-sorted-output &&
-
-	test_cmp expected-no-follow-sorted-output actual-no-follow-sorted-output
-
-ok 9 - dir-iterator should not follow symlinks by default
-
-expecting success of 0066.10 'dir-iterator does not resolve top-level symlinks': 
-	test_must_fail test-tool dir-iterator ./dir5 >out &&
-
-	grep "ENOTDIR" out
-
-dir_iterator_begin failure: ENOTDIR
-ok 10 - dir-iterator does not resolve top-level symlinks
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0067-parse_pathspec_file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0067-parse_pathspec_file/.git/
-expecting success of 0067.1 'one item from stdin': 
-	cat >expect <<-\EOF &&
-	fileA.t
-	EOF
-
-	echo fileA.t |
-	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
-
-	test_cmp expect actual
-
-ok 1 - one item from stdin
-
-expecting success of 0067.2 'one item from file': 
-	cat >expect <<-\EOF &&
-	fileA.t
-	EOF
-
-	echo fileA.t >list &&
-	test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
-
-	test_cmp expect actual
-
-ok 2 - one item from file
-
-expecting success of 0067.3 'NUL delimiters': 
-	cat >expect <<-\EOF &&
-	fileA.t
-	fileB.t
-	EOF
-
-	printf "fileA.t\0fileB.t\0" |
-	test-tool parse-pathspec-file --pathspec-from-file=- --pathspec-file-nul >actual &&
-
-	test_cmp expect actual
-
-ok 3 - NUL delimiters
-
-expecting success of 0067.4 'LF delimiters': 
-	cat >expect <<-\EOF &&
-	fileA.t
-	fileB.t
-	EOF
-
-	printf "fileA.t\nfileB.t\n" |
-	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
-
-	test_cmp expect actual
-
-ok 4 - LF delimiters
-
-expecting success of 0067.5 'no trailing delimiter': 
-	cat >expect <<-\EOF &&
-	fileA.t
-	fileB.t
-	EOF
-
-	printf "fileA.t\nfileB.t" |
-	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
-
-	test_cmp expect actual
-
-ok 5 - no trailing delimiter
-
-expecting success of 0067.6 'CRLF delimiters': 
-	cat >expect <<-\EOF &&
-	fileA.t
-	fileB.t
-	EOF
-
-	printf "fileA.t\r\nfileB.t\r\n" |
-	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
-
-	test_cmp expect actual
-
-ok 6 - CRLF delimiters
-
-expecting success of 0067.7 'quotes': 
-	cat >expect <<-\EOF &&
-	fileA.t
-	EOF
-
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
-
-	test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
-
-	test_cmp expect actual
-
-ok 7 - quotes
-
-expecting success of 0067.8 '--pathspec-file-nul takes quotes literally': 
-	# Note: there is an extra newline because --pathspec-file-nul takes
-	# input \n literally, too
-	cat >expect <<-\EOF &&
-	"file\101.t"
-
-	EOF
-
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
-
-	test-tool parse-pathspec-file --pathspec-from-file=list --pathspec-file-nul >actual &&
-
-	test_cmp expect actual
-
-ok 8 - --pathspec-file-nul takes quotes literally
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0070-fundamental.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0070-fundamental/.git/
-expecting success of 0070.1 'mktemp to nonexistent directory prints filename': 
-	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.51.0/t/trash directory.t0070-fundamental/doesnotexist/testIYFnv0': No such file or directory
-ok 1 - mktemp to nonexistent directory prints filename
-
-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 0070.2 'mktemp to unwritable directory prints filename': 
-	mkdir cannotwrite &&
-	test_when_finished "chmod +w cannotwrite" &&
-	chmod -w cannotwrite &&
-	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.51.0/t/trash directory.t0070-fundamental/cannotwrite/testzdKo81': 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': 
-	git commit --allow-empty -m message <&-
-
-[master (root-commit) b293b08] message
- Author: A U Thor <author@example.com>
-ok 3 - git_mkstemps_mode does not fail if fd 0 is not open
-
-expecting success of 0070.4 'check for a bug in the regex routines': 
-	# if this test fails, re-build git with NO_REGEX=1
-	test-tool regex --bug
-
-ok 4 - check for a bug in the regex routines
-
-expecting success of 0070.5 'incomplete sideband messages are reassembled': 
-	test-tool pkt-line send-split-sideband >split-sideband &&
-	test-tool pkt-line receive-sideband <split-sideband 2>err &&
-	grep "Hello, world" err
-
-primary: regular output
-remote: Hello, world!        
-ok 5 - incomplete sideband messages are reassembled
-
-expecting success of 0070.6 'eof on sideband message is reported': 
-	printf 1234 >input &&
-	test-tool pkt-line receive-sideband <input 2>err &&
-	test_grep "unexpected disconnect" err
-
-sideband: unexpected disconnect while reading sideband packet
-ok 6 - eof on sideband message is reported
-
-expecting success of 0070.7 'missing sideband designator is reported': 
-	printf 0004 >input &&
-	test-tool pkt-line receive-sideband <input 2>err &&
-	test_grep "missing sideband" err
-
-sideband: protocol error: missing sideband designator
-ok 7 - missing sideband designator is reported
-
-expecting success of 0070.8 'unpack-sideband: --no-chomp-newline': 
-	test_when_finished "rm -f expect-out expect-err" &&
-	test-tool pkt-line send-split-sideband >split-sideband &&
-	test-tool pkt-line unpack-sideband \
-		--no-chomp-newline <split-sideband >out 2>err &&
-	cat >expect-out <<-EOF &&
-		primary: regular output
-	EOF
-	cat >expect-err <<-EOF &&
-		Foo.
-		Bar.
-		Hello, world!
-	EOF
-	test_cmp expect-out out &&
-	test_cmp expect-err err
-
-ok 8 - unpack-sideband: --no-chomp-newline
-
-expecting success of 0070.9 'unpack-sideband: --chomp-newline (default)': 
-	test_when_finished "rm -f expect-out expect-err" &&
-	test-tool pkt-line send-split-sideband >split-sideband &&
-	test-tool pkt-line unpack-sideband \
-		--chomp-newline <split-sideband >out 2>err &&
-	printf "primary: regular output" >expect-out &&
-	printf "Foo.Bar.Hello, world!" >expect-err &&
-	test_cmp expect-out out &&
-	test_cmp expect-err err
-
-ok 9 - unpack-sideband: --chomp-newline (default)
-
-expecting success of 0070.10 'unpack-sideband: packet_reader_read() consumes sideband, no chomp payload': 
-	test_when_finished "rm -f expect-out expect-err" &&
-	test-tool pkt-line send-split-sideband >split-sideband &&
-	test-tool pkt-line unpack-sideband \
-		--reader-use-sideband \
-		--no-chomp-newline <split-sideband >out 2>err &&
-	cat >expect-out <<-EOF &&
-		primary: regular output
-	EOF
-	printf "remote: Foo.        \n"           >expect-err &&
-	printf "remote: Bar.        \n"          >>expect-err &&
-	printf "remote: Hello, world!        \n" >>expect-err &&
-	test_cmp expect-out out &&
-	test_cmp expect-err err
-
-ok 10 - unpack-sideband: packet_reader_read() consumes sideband, no chomp payload
-
-expecting success of 0070.11 'unpack-sideband: packet_reader_read() consumes sideband, chomp payload': 
-	test_when_finished "rm -f expect-out expect-err" &&
-	test-tool pkt-line send-split-sideband >split-sideband &&
-	test-tool pkt-line unpack-sideband \
-		--reader-use-sideband \
-		--chomp-newline <split-sideband >out 2>err &&
-	printf "primary: regular output" >expect-out &&
-	printf "remote: Foo.        \n"           >expect-err &&
-	printf "remote: Bar.        \n"          >>expect-err &&
-	printf "remote: Hello, world!        \n" >>expect-err &&
-	test_cmp expect-out out &&
-	test_cmp expect-err err
-
-ok 11 - unpack-sideband: packet_reader_read() consumes sideband, chomp payload
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0061-run-command.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0061-run-command/.git/
 ok 1 # skip subprocess inherits only std handles (missing MINGW)
@@ -20598,6 +21386,155 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0070-fundamental.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0070-fundamental/.git/
+expecting success of 0070.1 'mktemp to nonexistent directory prints filename': 
+	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.51.0/t/trash directory.t0070-fundamental/doesnotexist/testuxYvCG': No such file or directory
+ok 1 - mktemp to nonexistent directory prints filename
+
+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 0070.2 'mktemp to unwritable directory prints filename': 
+	mkdir cannotwrite &&
+	test_when_finished "chmod +w cannotwrite" &&
+	chmod -w cannotwrite &&
+	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.51.0/t/trash directory.t0070-fundamental/cannotwrite/testlHcML9': 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': 
+	git commit --allow-empty -m message <&-
+
+[master (root-commit) b293b08] message
+ Author: A U Thor <author@example.com>
+ok 3 - git_mkstemps_mode does not fail if fd 0 is not open
+
+expecting success of 0070.4 'check for a bug in the regex routines': 
+	# if this test fails, re-build git with NO_REGEX=1
+	test-tool regex --bug
+
+ok 4 - check for a bug in the regex routines
+
+expecting success of 0070.5 'incomplete sideband messages are reassembled': 
+	test-tool pkt-line send-split-sideband >split-sideband &&
+	test-tool pkt-line receive-sideband <split-sideband 2>err &&
+	grep "Hello, world" err
+
+primary: regular output
+remote: Hello, world!        
+ok 5 - incomplete sideband messages are reassembled
+
+expecting success of 0070.6 'eof on sideband message is reported': 
+	printf 1234 >input &&
+	test-tool pkt-line receive-sideband <input 2>err &&
+	test_grep "unexpected disconnect" err
+
+sideband: unexpected disconnect while reading sideband packet
+ok 6 - eof on sideband message is reported
+
+expecting success of 0070.7 'missing sideband designator is reported': 
+	printf 0004 >input &&
+	test-tool pkt-line receive-sideband <input 2>err &&
+	test_grep "missing sideband" err
+
+sideband: protocol error: missing sideband designator
+ok 7 - missing sideband designator is reported
+
+expecting success of 0070.8 'unpack-sideband: --no-chomp-newline': 
+	test_when_finished "rm -f expect-out expect-err" &&
+	test-tool pkt-line send-split-sideband >split-sideband &&
+	test-tool pkt-line unpack-sideband \
+		--no-chomp-newline <split-sideband >out 2>err &&
+	cat >expect-out <<-EOF &&
+		primary: regular output
+	EOF
+	cat >expect-err <<-EOF &&
+		Foo.
+		Bar.
+		Hello, world!
+	EOF
+	test_cmp expect-out out &&
+	test_cmp expect-err err
+
+ok 8 - unpack-sideband: --no-chomp-newline
+
+expecting success of 0070.9 'unpack-sideband: --chomp-newline (default)': 
+	test_when_finished "rm -f expect-out expect-err" &&
+	test-tool pkt-line send-split-sideband >split-sideband &&
+	test-tool pkt-line unpack-sideband \
+		--chomp-newline <split-sideband >out 2>err &&
+	printf "primary: regular output" >expect-out &&
+	printf "Foo.Bar.Hello, world!" >expect-err &&
+	test_cmp expect-out out &&
+	test_cmp expect-err err
+
+ok 9 - unpack-sideband: --chomp-newline (default)
+
+expecting success of 0070.10 'unpack-sideband: packet_reader_read() consumes sideband, no chomp payload': 
+	test_when_finished "rm -f expect-out expect-err" &&
+	test-tool pkt-line send-split-sideband >split-sideband &&
+	test-tool pkt-line unpack-sideband \
+		--reader-use-sideband \
+		--no-chomp-newline <split-sideband >out 2>err &&
+	cat >expect-out <<-EOF &&
+		primary: regular output
+	EOF
+	printf "remote: Foo.        \n"           >expect-err &&
+	printf "remote: Bar.        \n"          >>expect-err &&
+	printf "remote: Hello, world!        \n" >>expect-err &&
+	test_cmp expect-out out &&
+	test_cmp expect-err err
+
+ok 10 - unpack-sideband: packet_reader_read() consumes sideband, no chomp payload
+
+expecting success of 0070.11 'unpack-sideband: packet_reader_read() consumes sideband, chomp payload': 
+	test_when_finished "rm -f expect-out expect-err" &&
+	test-tool pkt-line send-split-sideband >split-sideband &&
+	test-tool pkt-line unpack-sideband \
+		--reader-use-sideband \
+		--chomp-newline <split-sideband >out 2>err &&
+	printf "primary: regular output" >expect-out &&
+	printf "remote: Foo.        \n"           >expect-err &&
+	printf "remote: Bar.        \n"          >>expect-err &&
+	printf "remote: Hello, world!        \n" >>expect-err &&
+	test_cmp expect-out out &&
+	test_cmp expect-err err
+
+ok 11 - unpack-sideband: packet_reader_read() consumes sideband, chomp payload
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0080-unit-test-output.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0080-unit-test-output/.git/
 expecting success of 0080.1 'TAP output from unit tests': 
@@ -22583,7 +23520,7 @@
 
 Diagnostics complete.
 All of the gathered info is captured in 'report/git-diagnostics-test.zip'
-Available space on '/build/reproducible-path/git-2.51.0/t/trash directory.t0092-diagnose': 88.56 GiB (mount flags 0x1000)
+Available space on '/build/reproducible-path/git-2.51.0/t/trash directory.t0092-diagnose': 83.60 GiB (mount flags 0x1000)
 Contents of .git/objects:
 Total: 0 loose objects
 ok 1 - creates diagnostics zip archive
@@ -22646,138 +23583,166 @@
 Diagnostics complete.
 All of the gathered info is captured in 'report/git-diagnostics-test.zip'
 Contents of .git/objects:
-        2  2025-08-27 08:19   .git/COMMIT_EDITMSG
-      137  2025-08-27 08:19   .git/index
-       23  2025-08-27 08:19   .git/HEAD
-       92  2025-08-27 08:19   .git/config
-       73  2025-08-27 08:19   .git/description
-      478  2025-08-27 08:19   .git/hooks/applypatch-msg.sample
-      896  2025-08-27 08:19   .git/hooks/commit-msg.sample
-     4726  2025-08-27 08:19   .git/hooks/fsmonitor-watchman.sample
-      189  2025-08-27 08:19   .git/hooks/post-update.sample
-      424  2025-08-27 08:19   .git/hooks/pre-applypatch.sample
-     1649  2025-08-27 08:19   .git/hooks/pre-commit.sample
-      416  2025-08-27 08:19   .git/hooks/pre-merge-commit.sample
-     1492  2025-08-27 08:19   .git/hooks/prepare-commit-msg.sample
-     1374  2025-08-27 08:19   .git/hooks/pre-push.sample
-     4898  2025-08-27 08:19   .git/hooks/pre-rebase.sample
-      544  2025-08-27 08:19   .git/hooks/pre-receive.sample
-     2783  2025-08-27 08:19   .git/hooks/push-to-checkout.sample
-     2308  2025-08-27 08:19   .git/hooks/sendemail-validate.sample
-     3650  2025-08-27 08:19   .git/hooks/update.sample
-      240  2025-08-27 08:19   .git/info/exclude
-      154  2025-08-27 08:19   .git/logs/refs/heads/master
-      154  2025-08-27 08:19   .git/logs/refs/heads/HEAD
+        2  2026-09-29 14:51   .git/COMMIT_EDITMSG
+      137  2026-09-29 14:51   .git/index
+       23  2026-09-29 14:51   .git/HEAD
+       92  2026-09-29 14:51   .git/config
+       73  2026-09-29 14:51   .git/description
+      478  2026-09-29 14:51   .git/hooks/applypatch-msg.sample
+      896  2026-09-29 14:51   .git/hooks/commit-msg.sample
+     4726  2026-09-29 14:51   .git/hooks/fsmonitor-watchman.sample
+      189  2026-09-29 14:51   .git/hooks/post-update.sample
+      424  2026-09-29 14:51   .git/hooks/pre-applypatch.sample
+     1649  2026-09-29 14:51   .git/hooks/pre-commit.sample
+      416  2026-09-29 14:51   .git/hooks/pre-merge-commit.sample
+     1492  2026-09-29 14:51   .git/hooks/prepare-commit-msg.sample
+     1374  2026-09-29 14:51   .git/hooks/pre-push.sample
+     4898  2026-09-29 14:51   .git/hooks/pre-rebase.sample
+      544  2026-09-29 14:51   .git/hooks/pre-receive.sample
+     2783  2026-09-29 14:51   .git/hooks/push-to-checkout.sample
+     2308  2026-09-29 14:51   .git/hooks/sendemail-validate.sample
+     3650  2026-09-29 14:51   .git/hooks/update.sample
+      240  2026-09-29 14:51   .git/info/exclude
+      154  2026-09-29 14:51   .git/logs/refs/heads/master
+      154  2026-09-29 14:51   .git/logs/refs/heads/HEAD
 ok 4 - --mode=all includes .git dir contents
 
 # passed all 4 test(s)
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0010-racy-git.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0010-racy-git/.git/
-expecting success of 0010.1 'Racy git trial #0 part A': 
-		rm -f .git/index &&
-		echo frotz >infocom &&
-		git update-index --add infocom &&
-		echo xyzzy >infocom &&
-
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 1 - Racy git trial #0 part A
-
-expecting success of 0010.2 'Racy git trial #0 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
-
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 2 - Racy git trial #0 part B
+*** t0081-find-pack.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0081-find-pack/.git/
+expecting success of 0081.1 'setup': 
+	test_commit one &&
+	test_commit two &&
+	test_commit three &&
+	test_commit four &&
+	test_commit five
 
-expecting success of 0010.3 'Racy git trial #1 part A': 
-		rm -f .git/index &&
-		echo frotz >infocom &&
-		git update-index --add infocom &&
-		echo xyzzy >infocom &&
+[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 1 - setup
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 3 - Racy git trial #1 part A
+expecting success of 0081.2 'repack everything into a single packfile': 
+	git repack -a -d --no-write-bitmap-index &&
 
-expecting success of 0010.4 'Racy git trial #1 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
+	head_commit_pack=$(test-tool find-pack HEAD) &&
+	head_tree_pack=$(test-tool find-pack HEAD^{tree}) &&
+	one_pack=$(test-tool find-pack HEAD:one.t) &&
+	three_pack=$(test-tool find-pack HEAD:three.t) &&
+	old_commit_pack=$(test-tool find-pack HEAD~4) &&
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 4 - Racy git trial #1 part B
+	test-tool find-pack --check-count 1 HEAD &&
+	test-tool find-pack --check-count=1 HEAD^{tree} &&
+	! test-tool find-pack --check-count=0 HEAD:one.t &&
+	! test-tool find-pack -c 2 HEAD:one.t &&
+	test-tool find-pack -c 1 HEAD:three.t &&
 
-expecting success of 0010.5 'Racy git trial #2 part A': 
-		rm -f .git/index &&
-		echo frotz >infocom &&
-		git update-index --add infocom &&
-		echo xyzzy >infocom &&
+	# Packfile exists at the right path
+	case "$head_commit_pack" in
+		".git/objects/pack/pack-"*".pack") true ;;
+		*) false ;;
+	esac &&
+	test -f "$head_commit_pack" &&
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 5 - Racy git trial #2 part A
+	# Everything is in the same pack
+	test "$head_commit_pack" = "$head_tree_pack" &&
+	test "$head_commit_pack" = "$one_pack" &&
+	test "$head_commit_pack" = "$three_pack" &&
+	test "$head_commit_pack" = "$old_commit_pack"
 
-expecting success of 0010.6 'Racy git trial #2 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
+.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
+.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
+fatal: bad packfile count 1 instead of 0
+.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
+fatal: bad packfile count 1 instead of 2
+.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
+.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
+ok 2 - repack everything into a single packfile
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 6 - Racy git trial #2 part B
+expecting success of 0081.3 'add more packfiles': 
+	git rev-parse HEAD^{tree} HEAD:two.t HEAD:four.t >objects &&
+	git pack-objects .git/objects/pack/mypackname1 >packhash1 <objects &&
 
-expecting success of 0010.7 'Racy git trial #3 part A': 
-		rm -f .git/index &&
-		echo frotz >infocom &&
-		git update-index --add infocom &&
-		echo xyzzy >infocom &&
+	git rev-parse HEAD~ HEAD~^{tree} HEAD:five.t >objects &&
+	git pack-objects .git/objects/pack/mypackname2 >packhash2 <objects &&
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 7 - Racy git trial #3 part A
+	head_commit_pack=$(test-tool find-pack HEAD) &&
 
-expecting success of 0010.8 'Racy git trial #3 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
+	# HEAD^{tree} is in 2 packfiles
+	test-tool find-pack HEAD^{tree} >head_tree_packs &&
+	grep "$head_commit_pack" head_tree_packs &&
+	grep mypackname1 head_tree_packs &&
+	! grep mypackname2 head_tree_packs &&
+	test-tool find-pack --check-count 2 HEAD^{tree} &&
+	! test-tool find-pack --check-count 1 HEAD^{tree} &&
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 8 - Racy git trial #3 part B
+	# HEAD:five.t is also in 2 packfiles
+	test-tool find-pack HEAD:five.t >five_packs &&
+	grep "$head_commit_pack" five_packs &&
+	! grep mypackname1 five_packs &&
+	grep mypackname2 five_packs &&
+	test-tool find-pack -c 2 HEAD:five.t &&
+	! test-tool find-pack --check-count=0 HEAD:five.t
 
-expecting success of 0010.9 'Racy git trial #4 part A': 
-		rm -f .git/index &&
-		echo frotz >infocom &&
-		git update-index --add infocom &&
-		echo xyzzy >infocom &&
+.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
+.git/objects/pack/mypackname1-23655ebb0ec5ad51d3617053df8e98a5f2d6bd45.pack
+.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
+.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/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
+.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
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 9 - Racy git trial #4 part A
+expecting success of 0081.4 'add more commits (as loose objects)': 
+	test_commit six &&
+	test_commit seven &&
 
-expecting success of 0010.10 'Racy git trial #4 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
+	test -z "$(test-tool find-pack HEAD)" &&
+	test -z "$(test-tool find-pack HEAD:six.t)" &&
+	test-tool find-pack --check-count 0 HEAD &&
+	test-tool find-pack -c 0 HEAD:six.t &&
+	! test-tool find-pack -c 1 HEAD:seven.t
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 10 - Racy git trial #4 part B
+[master 5891a38] six
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 six.t
+[master c9b0832] seven
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 seven.t
+fatal: bad packfile count 0 instead of 1
+ok 4 - add more commits (as loose objects)
 
-# passed all 10 test(s)
-1..10
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0091-bugreport.sh ***
@@ -22851,7 +23816,7 @@
 	git bugreport -o foo/ &&
 	test_path_is_file foo/git-bugreport-*
 
-Created new report at 'foo/git-bugreport-2025-08-27-0819.txt'.
+Created new report at 'foo/git-bugreport-2026-09-29-1451.txt'.
 ok 5 - --output-directory puts the report in the provided dir
 
 expecting success of 0091.6 'incorrect arguments abort with usage': 
@@ -22876,14 +23841,14 @@
 	test_when_finished rm non-repo/git-bugreport-* &&
 	nongit git bugreport
 
-Created new report at 'git-bugreport-2025-08-27-0819.txt'.
+Created new report at 'git-bugreport-2026-09-29-1451.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-2025-08-27-0819.txt'.
+Created new report at 'foo/bar/baz/git-bugreport-2026-09-29-1451.txt'.
 ok 9 - can create leading directories outside of a git dir
 
 expecting success of 0091.10 'indicates populated hooks': 
@@ -22974,7 +23939,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.51.0/t/trash directory.t0091-bugreport': 88.56 GiB (mount flags 0x1000)
+Available space on '/build/reproducible-path/git-2.51.0/t/trash directory.t0091-bugreport': 83.60 GiB (mount flags 0x1000)
 Contents of .git/objects:
 Total: 0 loose objects
 ok 11 - --diagnose creates diagnostics zip archive
@@ -23014,164 +23979,30 @@
 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  2025-08-27 08:19   .git/HEAD
-       92  2025-08-27 08:19   .git/config
-       73  2025-08-27 08:19   .git/description
-      478  2025-08-27 08:19   .git/hooks/applypatch-msg.sample
-      896  2025-08-27 08:19   .git/hooks/commit-msg.sample
-     4726  2025-08-27 08:19   .git/hooks/fsmonitor-watchman.sample
-      189  2025-08-27 08:19   .git/hooks/post-update.sample
-      424  2025-08-27 08:19   .git/hooks/pre-applypatch.sample
-     1649  2025-08-27 08:19   .git/hooks/pre-commit.sample
-      416  2025-08-27 08:19   .git/hooks/pre-merge-commit.sample
-     1492  2025-08-27 08:19   .git/hooks/prepare-commit-msg.sample
-     1374  2025-08-27 08:19   .git/hooks/pre-push.sample
-     4898  2025-08-27 08:19   .git/hooks/pre-rebase.sample
-      544  2025-08-27 08:19   .git/hooks/pre-receive.sample
-     2783  2025-08-27 08:19   .git/hooks/push-to-checkout.sample
-     2308  2025-08-27 08:19   .git/hooks/sendemail-validate.sample
-     3650  2025-08-27 08:19   .git/hooks/update.sample
-      240  2025-08-27 08:19   .git/info/exclude
+       23  2026-09-29 14:51   .git/HEAD
+       92  2026-09-29 14:51   .git/config
+       73  2026-09-29 14:51   .git/description
+      478  2026-09-29 14:51   .git/hooks/applypatch-msg.sample
+      896  2026-09-29 14:51   .git/hooks/commit-msg.sample
+     4726  2026-09-29 14:51   .git/hooks/fsmonitor-watchman.sample
+      189  2026-09-29 14:51   .git/hooks/post-update.sample
+      424  2026-09-29 14:51   .git/hooks/pre-applypatch.sample
+     1649  2026-09-29 14:51   .git/hooks/pre-commit.sample
+      416  2026-09-29 14:51   .git/hooks/pre-merge-commit.sample
+     1492  2026-09-29 14:51   .git/hooks/prepare-commit-msg.sample
+     1374  2026-09-29 14:51   .git/hooks/pre-push.sample
+     4898  2026-09-29 14:51   .git/hooks/pre-rebase.sample
+      544  2026-09-29 14:51   .git/hooks/pre-receive.sample
+     2783  2026-09-29 14:51   .git/hooks/push-to-checkout.sample
+     2308  2026-09-29 14:51   .git/hooks/sendemail-validate.sample
+     3650  2026-09-29 14:51   .git/hooks/update.sample
+      240  2026-09-29 14:51   .git/info/exclude
 ok 13 - --diagnose=all includes .git dir contents
 
 # passed all 13 test(s)
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0081-find-pack.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0081-find-pack/.git/
-expecting success of 0081.1 'setup': 
-	test_commit one &&
-	test_commit two &&
-	test_commit three &&
-	test_commit four &&
-	test_commit five
-
-[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 1 - setup
-
-expecting success of 0081.2 'repack everything into a single packfile': 
-	git repack -a -d --no-write-bitmap-index &&
-
-	head_commit_pack=$(test-tool find-pack HEAD) &&
-	head_tree_pack=$(test-tool find-pack HEAD^{tree}) &&
-	one_pack=$(test-tool find-pack HEAD:one.t) &&
-	three_pack=$(test-tool find-pack HEAD:three.t) &&
-	old_commit_pack=$(test-tool find-pack HEAD~4) &&
-
-	test-tool find-pack --check-count 1 HEAD &&
-	test-tool find-pack --check-count=1 HEAD^{tree} &&
-	! test-tool find-pack --check-count=0 HEAD:one.t &&
-	! test-tool find-pack -c 2 HEAD:one.t &&
-	test-tool find-pack -c 1 HEAD:three.t &&
-
-	# Packfile exists at the right path
-	case "$head_commit_pack" in
-		".git/objects/pack/pack-"*".pack") true ;;
-		*) false ;;
-	esac &&
-	test -f "$head_commit_pack" &&
-
-	# Everything is in the same pack
-	test "$head_commit_pack" = "$head_tree_pack" &&
-	test "$head_commit_pack" = "$one_pack" &&
-	test "$head_commit_pack" = "$three_pack" &&
-	test "$head_commit_pack" = "$old_commit_pack"
-
-.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
-.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
-fatal: bad packfile count 1 instead of 0
-.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
-fatal: bad packfile count 1 instead of 2
-.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
-.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
-ok 2 - repack everything into a single packfile
-
-expecting success of 0081.3 'add more packfiles': 
-	git rev-parse HEAD^{tree} HEAD:two.t HEAD:four.t >objects &&
-	git pack-objects .git/objects/pack/mypackname1 >packhash1 <objects &&
-
-	git rev-parse HEAD~ HEAD~^{tree} HEAD:five.t >objects &&
-	git pack-objects .git/objects/pack/mypackname2 >packhash2 <objects &&
-
-	head_commit_pack=$(test-tool find-pack HEAD) &&
-
-	# HEAD^{tree} is in 2 packfiles
-	test-tool find-pack HEAD^{tree} >head_tree_packs &&
-	grep "$head_commit_pack" head_tree_packs &&
-	grep mypackname1 head_tree_packs &&
-	! grep mypackname2 head_tree_packs &&
-	test-tool find-pack --check-count 2 HEAD^{tree} &&
-	! test-tool find-pack --check-count 1 HEAD^{tree} &&
-
-	# HEAD:five.t is also in 2 packfiles
-	test-tool find-pack HEAD:five.t >five_packs &&
-	grep "$head_commit_pack" five_packs &&
-	! grep mypackname1 five_packs &&
-	grep mypackname2 five_packs &&
-	test-tool find-pack -c 2 HEAD:five.t &&
-	! test-tool find-pack --check-count=0 HEAD:five.t
-
-.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
-.git/objects/pack/mypackname1-23655ebb0ec5ad51d3617053df8e98a5f2d6bd45.pack
-.git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
-.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/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
-.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)': 
-	test_commit six &&
-	test_commit seven &&
-
-	test -z "$(test-tool find-pack HEAD)" &&
-	test -z "$(test-tool find-pack HEAD:six.t)" &&
-	test-tool find-pack --check-count 0 HEAD &&
-	test-tool find-pack -c 0 HEAD:six.t &&
-	! test-tool find-pack -c 1 HEAD:seven.t
-
-[master 5891a38] six
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 six.t
-[master c9b0832] seven
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 seven.t
-fatal: bad packfile count 0 instead of 1
-ok 4 - add more commits (as loose objects)
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0095-bloom.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0095-bloom/.git/
 expecting success of 0095.1 'compute unseeded murmur3 hash for empty string': 
@@ -23379,76 +24210,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0201-gettext-fallbacks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0201-gettext-fallbacks/.git/
-# lib-gettext: No is_IS UTF-8 locale available
-# lib-gettext: No is_IS ISO-8859-1 locale available
-expecting success of 0201.1 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to fallthrough)': 
-    test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
-
-ok 1 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to fallthrough)
-
-expecting success of 0201.2 'sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set': 
-    test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
-
-ok 2 - sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set
-
-expecting success of 0201.3 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough': 
-    echo fallthrough >expect &&
-    echo $GIT_INTERNAL_GETTEXT_SH_SCHEME >actual &&
-    test_cmp expect actual
-
-ok 3 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough
-
-expecting success of 0201.4 'gettext: our gettext() fallback has pass-through semantics': 
-    printf "test" >expect &&
-    gettext "test" >actual &&
-    test_cmp expect actual &&
-    printf "test more words" >expect &&
-    gettext "test more words" >actual &&
-    test_cmp expect actual
-
-ok 4 - gettext: our gettext() fallback has pass-through semantics
-
-expecting success of 0201.5 'eval_gettext: our eval_gettext() fallback has pass-through semantics': 
-    printf "test" >expect &&
-    eval_gettext "test" >actual &&
-    test_cmp expect actual &&
-    printf "test more words" >expect &&
-    eval_gettext "test more words" >actual &&
-    test_cmp expect actual
-
-ok 5 - eval_gettext: our eval_gettext() fallback has pass-through semantics
-
-expecting success of 0201.6 'eval_gettext: our eval_gettext() fallback can interpolate variables': 
-    printf "test YesPlease" >expect &&
-    GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" >actual &&
-    test_cmp expect actual
-
-ok 6 - eval_gettext: our eval_gettext() fallback can interpolate variables
-
-expecting success of 0201.7 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces': 
-    cmdline="git am" &&
-    export cmdline &&
-    printf "When you have resolved this problem, run git am --resolved." >expect &&
-    eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual &&
-    test_cmp expect actual
-
-ok 7 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces
-
-expecting success of 0201.8 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes': 
-    cmdline="git am" &&
-    export cmdline &&
-    printf "When you have resolved this problem, run \"git am --resolved\"." >expect &&
-    eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual &&
-    test_cmp expect actual
-
-ok 8 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0200-gettext-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0200-gettext-basic/.git/
 # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
@@ -23571,6 +24332,76 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0201-gettext-fallbacks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0201-gettext-fallbacks/.git/
+# lib-gettext: No is_IS UTF-8 locale available
+# lib-gettext: No is_IS ISO-8859-1 locale available
+expecting success of 0201.1 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to fallthrough)': 
+    test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
+
+ok 1 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to fallthrough)
+
+expecting success of 0201.2 'sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set': 
+    test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
+
+ok 2 - sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set
+
+expecting success of 0201.3 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough': 
+    echo fallthrough >expect &&
+    echo $GIT_INTERNAL_GETTEXT_SH_SCHEME >actual &&
+    test_cmp expect actual
+
+ok 3 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough
+
+expecting success of 0201.4 'gettext: our gettext() fallback has pass-through semantics': 
+    printf "test" >expect &&
+    gettext "test" >actual &&
+    test_cmp expect actual &&
+    printf "test more words" >expect &&
+    gettext "test more words" >actual &&
+    test_cmp expect actual
+
+ok 4 - gettext: our gettext() fallback has pass-through semantics
+
+expecting success of 0201.5 'eval_gettext: our eval_gettext() fallback has pass-through semantics': 
+    printf "test" >expect &&
+    eval_gettext "test" >actual &&
+    test_cmp expect actual &&
+    printf "test more words" >expect &&
+    eval_gettext "test more words" >actual &&
+    test_cmp expect actual
+
+ok 5 - eval_gettext: our eval_gettext() fallback has pass-through semantics
+
+expecting success of 0201.6 'eval_gettext: our eval_gettext() fallback can interpolate variables': 
+    printf "test YesPlease" >expect &&
+    GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" >actual &&
+    test_cmp expect actual
+
+ok 6 - eval_gettext: our eval_gettext() fallback can interpolate variables
+
+expecting success of 0201.7 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces': 
+    cmdline="git am" &&
+    export cmdline &&
+    printf "When you have resolved this problem, run git am --resolved." >expect &&
+    eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual &&
+    test_cmp expect actual
+
+ok 7 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces
+
+expecting success of 0201.8 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes': 
+    cmdline="git am" &&
+    export cmdline &&
+    printf "When you have resolved this problem, run \"git am --resolved\"." >expect &&
+    eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual &&
+    test_cmp expect actual
+
+ok 8 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0100-previous.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0100-previous/.git/
 expecting success of 0100.1 'branch -d @{-1}': 
@@ -23756,43 +24587,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0202-gettext-perl.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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: __n has a $$$ prototype
-ok 6 - sanity: __ 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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0204-gettext-reencode-sanity.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0204-gettext-reencode-sanity/.git/
 # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
@@ -23839,6 +24633,43 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0202-gettext-perl.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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: N__ has a $ prototype
+ok 6 - sanity: __n has a $$$ prototype
+ok 7 - sanity: __ 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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0210-trace2-normal.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0210-trace2-normal/.git/
 expecting success of 0210.1 'normal stream, return code 0': 
@@ -24101,14 +24932,444 @@
 Cloning into 'clone2'...
 warning: You appear to have cloned an empty repository.
 done.
-08:19:52.342072 common-init.c:58                  start /build/reproducible-path/git-2.51.0/git clone https://user:pwd@example.com/ clone2
-08:19:52.343401 config.c:2576                     def_param scope:unknown remote.origin.url=https://user:pwd@example.com/
+14:51:37.606300 common-init.c:58                  start /build/reproducible-path/git-2.51.0/git clone https://user:pwd@example.com/ clone2
+14:51:37.607650 config.c:2576                     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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0212-trace2-event.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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":"20260929T145137.835922Z-H5c947e1c-P001ec78b","thread":"main","time":"2026-09-29T14:51:37.836009Z","file":"common-init.c","line":57,"evt":"4","exe":"2.51.0"}
+{"event":"too_many_files","sid":"20260929T145137.835922Z-H5c947e1c-P001ec78b","thread":"main","time":"2026-09-29T14:51:37.836020Z","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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0010-racy-git.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0010-racy-git/.git/
+expecting success of 0010.1 'Racy git trial #0 part A': 
+		rm -f .git/index &&
+		echo frotz >infocom &&
+		git update-index --add infocom &&
+		echo xyzzy >infocom &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 1 - Racy git trial #0 part A
+
+expecting success of 0010.2 'Racy git trial #0 part B': 
+		echo xyzzy >cornerstone &&
+		git update-index --add cornerstone &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 2 - Racy git trial #0 part B
+
+expecting success of 0010.3 'Racy git trial #1 part A': 
+		rm -f .git/index &&
+		echo frotz >infocom &&
+		git update-index --add infocom &&
+		echo xyzzy >infocom &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 3 - Racy git trial #1 part A
+
+expecting success of 0010.4 'Racy git trial #1 part B': 
+		echo xyzzy >cornerstone &&
+		git update-index --add cornerstone &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 4 - Racy git trial #1 part B
+
+expecting success of 0010.5 'Racy git trial #2 part A': 
+		rm -f .git/index &&
+		echo frotz >infocom &&
+		git update-index --add infocom &&
+		echo xyzzy >infocom &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 5 - Racy git trial #2 part A
+
+expecting success of 0010.6 'Racy git trial #2 part B': 
+		echo xyzzy >cornerstone &&
+		git update-index --add cornerstone &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 6 - Racy git trial #2 part B
+
+expecting success of 0010.7 'Racy git trial #3 part A': 
+		rm -f .git/index &&
+		echo frotz >infocom &&
+		git update-index --add infocom &&
+		echo xyzzy >infocom &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 7 - Racy git trial #3 part A
+
+expecting success of 0010.8 'Racy git trial #3 part B': 
+		echo xyzzy >cornerstone &&
+		git update-index --add cornerstone &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 8 - Racy git trial #3 part B
+
+expecting success of 0010.9 'Racy git trial #4 part A': 
+		rm -f .git/index &&
+		echo frotz >infocom &&
+		git update-index --add infocom &&
+		echo xyzzy >infocom &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 9 - Racy git trial #4 part A
+
+expecting success of 0010.10 'Racy git trial #4 part B': 
+		echo xyzzy >cornerstone &&
+		git update-index --add cornerstone &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 10 - Racy git trial #4 part B
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0060-path-utils.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0060-path-utils/.git/
 expecting success of 0060.1 'basename': test-tool path-utils basename
@@ -25852,870 +27113,1781 @@
 1..219
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0212-trace2-event.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t0021-conversion.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/.git/
+expecting success of 0021.1 'setup': 
+	git config filter.rot13.smudge ./rot13.sh &&
+	git config filter.rot13.clean ./rot13.sh &&
 
-error: hello world
-error: this is a test
-ok 1 - event stream, error event
+	{
+	    echo "*.t filter=rot13" &&
+	    echo "*.i ident"
+	} >.gitattributes &&
 
-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
+	{
+	    echo a b c d e f g h i j k l m &&
+	    echo n o p q r s t u v w x y z &&
+	    echo '$Id$'
+	} >test &&
+	cat test >test.t &&
+	cat test >test.o &&
+	cat test >test.i &&
+	git add test test.t test.i &&
+	rm -f test test.t test.i &&
+	git checkout -- test test.t test.i &&
 
-ok 2 - event stream, return code 0
+	echo "content-test2" >test2.o &&
+	echo "content-test3 - filename with special characters" >"test3 'sq',\$x=.o"
 
-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 1 - setup
 
-ok 3 - event stream, list config
+expecting success of 0021.2 'check': 
 
-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
+	test_cmp test.o test &&
+	test_cmp test.o test.t &&
 
-ok 4 - event stream, list env vars
+	# ident should be stripped in the repository
+	git diff --raw --exit-code :test :test.i &&
+	id=$(git rev-parse --verify :test) &&
+	embedded=$(sed -ne "$script" test.i) &&
+	test "z$id" = "z$embedded" &&
 
-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
+	git cat-file blob :test.t >test.r &&
 
-ok 5 - basic trace2_data
+	./rot13.sh <test.o >test.t &&
+	test_cmp test.r test.t
 
-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"
-	|  }
-	|};
+ok 2 - check
+
+expecting success of 0021.3 'expanded_in_repo': 
+	cat >expanded-keywords.0 <<-\EOF &&
+	File with expanded keywords
+	$Id$
+	$Id:$
+	$Id: 0000000000000000000000000000000000000000 $
+	$Id: NoSpaceAtEnd$
+	$Id:NoSpaceAtFront $
+	$Id:NoSpaceAtEitherEnd$
+	$Id: NoTerminatingSymbol
+	$Id: Foreign Commit With Spaces $
 	EOF
-	test_cmp expect actual
 
-error: hello world
-error: this is a test
-ok 6 - using global config, event stream, error event
+	{
+		cat expanded-keywords.0 &&
+		printf "\$Id: NoTerminatingSymbolAtEOF"
+	} >expanded-keywords &&
+	cat expanded-keywords >expanded-keywords-crlf &&
+	git add expanded-keywords expanded-keywords-crlf &&
+	git commit -m "File with keywords expanded" &&
+	id=$(git rev-parse --verify :expanded-keywords) &&
 
-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\"
+	cat >expected-output.0 <<-EOF &&
+	File with expanded keywords
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: NoTerminatingSymbol
+	\$Id: Foreign Commit With Spaces \$
+	EOF
+	{
+		cat expected-output.0 &&
+		printf "\$Id: NoTerminatingSymbolAtEOF"
+	} >expected-output &&
+	{
+		append_cr <expected-output.0 &&
+		printf "\$Id: NoTerminatingSymbolAtEOF"
+	} >expected-output-crlf &&
+	{
+		echo "expanded-keywords ident" &&
+		echo "expanded-keywords-crlf ident text eol=crlf"
+	} >>.gitattributes &&
 
-{"event":"version","sid":"20250827T081952.866153Z-Hcf858c9d-P00058ea3","thread":"main","time":"2025-08-27T08:19:52.866234Z","file":"common-init.c","line":57,"evt":"4","exe":"2.51.0"}
-{"event":"too_many_files","sid":"20250827T081952.866153Z-Hcf858c9d-P00058ea3","thread":"main","time":"2025-08-27T08:19:52.866246Z","file":"common-init.c","line":57}
-ok 7 - discard traces when there are too many files
+	rm -f expanded-keywords expanded-keywords-crlf &&
 
-expecting success of 0212.8 'unsafe URLs are redacted by default in cmd_start events': 
-	test_when_finished \
-		"rm -r trace.event" &&
+	git checkout -- expanded-keywords &&
+	test_cmp expected-output expanded-keywords &&
 
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-		test-tool trace2 300redact_start git clone https://user:pwd@example.com/ clone2 &&
-	! grep user:pwd trace.event
+	git checkout -- expanded-keywords-crlf &&
+	test_cmp expected-output-crlf expanded-keywords-crlf
 
-ok 8 - unsafe URLs are redacted by default in cmd_start events
+[main (root-commit) bf31399] File with keywords expanded
+ Author: A U Thor <author@example.com>
+ 5 files changed, 29 insertions(+)
+ create mode 100644 expanded-keywords
+ create mode 100644 expanded-keywords-crlf
+ create mode 100644 test
+ create mode 100644 test.i
+ create mode 100644 test.t
+ok 3 - expanded_in_repo
 
-expecting success of 0212.9 'unsafe URLs are redacted by default in child_start events': 
-	test_when_finished \
-		"rm -r trace.event" &&
+expecting success of 0021.4 'filter shell-escaped filenames': 
+	cat >argc.sh <<-EOF &&
+	#!$SHELL_PATH
+	cat >/dev/null
+	echo argc: \$# "\$@"
+	EOF
+	normal=name-no-magic &&
+	special="name  with 'sq' and \$x" &&
+	echo some test text >"$normal" &&
+	echo some test text >"$special" &&
+	git add "$normal" "$special" &&
+	git commit -q -m "add files" &&
+	echo "name* filter=argc" >.gitattributes &&
 
-	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
+	# delete the files and check them out again, using a smudge filter
+	# that will count the args and echo the command-line back to us
+	test_config filter.argc.smudge "sh ./argc.sh %f" &&
+	rm "$normal" "$special" &&
+	git checkout -- "$normal" "$special" &&
 
-ok 9 - unsafe URLs are redacted by default in child_start events
+	# make sure argc.sh counted the right number of args
+	echo "argc: 1 $normal" >expect &&
+	test_cmp expect "$normal" &&
+	echo "argc: 1 $special" >expect &&
+	test_cmp expect "$special" &&
 
-expecting success of 0212.10 'unsafe URLs are redacted by default in exec events': 
-	test_when_finished \
-		"rm -r trace.event" &&
+	# do the same thing, but with more args in the filter expression
+	test_config filter.argc.smudge "sh ./argc.sh %f --my-extra-arg" &&
+	rm "$normal" "$special" &&
+	git checkout -- "$normal" "$special" &&
 
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-		test-tool trace2 302redact_exec git clone https://user:pwd@example.com/ clone2 &&
-	! grep user:pwd trace.event
+	# make sure argc.sh counted the right number of args
+	echo "argc: 2 $normal --my-extra-arg" >expect &&
+	test_cmp expect "$normal" &&
+	echo "argc: 2 $special --my-extra-arg" >expect &&
+	test_cmp expect "$special" &&
+	:
 
-ok 10 - unsafe URLs are redacted by default in exec events
+ok 4 - filter shell-escaped filenames
 
-expecting success of 0212.11 'unsafe URLs are redacted by default in def_param events': 
-	test_when_finished \
-		"rm -r trace.event" &&
+expecting success of 0021.5 'required filter should filter data': 
+	test_config filter.required.smudge ./rot13.sh &&
+	test_config filter.required.clean ./rot13.sh &&
+	test_config filter.required.required true &&
 
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-		test-tool trace2 303redact_def_param url https://user:pwd@example.com/ &&
-	! grep user:pwd trace.event
+	echo "*.r filter=required" >.gitattributes &&
 
-ok 11 - unsafe URLs are redacted by default in def_param events
+	cat test.o >test.r &&
+	git add test.r &&
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0090-cache-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0090-cache-tree/.git/
-expecting success of 0090.1 'initial commit has cache-tree': 
-	test_commit foo &&
-	test_cache_tree
+	rm -f test.r &&
+	git checkout -- test.r &&
+	test_cmp test.o test.r &&
 
-[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
+	./rot13.sh <test.o >expected &&
+	git cat-file blob :test.r >actual &&
+	test_cmp expected actual
 
-expecting success of 0090.2 'read-tree HEAD establishes cache-tree': 
-	git read-tree HEAD &&
-	test_cache_tree
+ok 5 - required filter should filter data
 
-ok 2 - read-tree HEAD establishes cache-tree
+expecting success of 0021.6 'required filter smudge failure': 
+	test_config filter.failsmudge.smudge false &&
+	test_config filter.failsmudge.clean cat &&
+	test_config filter.failsmudge.required true &&
 
-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
+	echo "*.fs filter=failsmudge" >.gitattributes &&
 
-HEAD is now at ddd63c9 foo
-ok 3 - git-add invalidates cache-tree
+	echo test >test.fs &&
+	git add test.fs &&
+	rm -f test.fs &&
+	test_must_fail git checkout -- test.fs
 
-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: external filter 'false' failed 1
+error: external filter 'false' failed
+fatal: test.fs: smudge filter failsmudge failed
+ok 6 - required filter smudge failure
 
-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 0021.7 'required filter clean failure': 
+	test_config filter.failclean.smudge cat &&
+	test_config filter.failclean.clean false &&
+	test_config filter.failclean.required true &&
 
-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)
-	EOF
-	cmp_cache_tree expect
+	echo "*.fc filter=failclean" >.gitattributes &&
 
-[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
+	echo test >test.fc &&
+	test_must_fail git add test.fc
 
-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
+error: external filter 'false' failed 1
+error: external filter 'false' failed
+fatal: test.fc: clean filter 'failclean' failed
+ok 7 - required filter clean failure
 
-HEAD is now at ddd63c9 foo
-ok 6 - update-index invalidates cache-tree
+expecting success of 0021.8 'required filter with absent clean field': 
+	test_config filter.absentclean.smudge cat &&
+	test_config filter.absentclean.required true &&
 
-expecting success of 0090.7 'write-tree establishes cache-tree': 
-	test-tool scrap-cache-tree &&
-	git write-tree &&
-	test_cache_tree
+	echo "*.ac filter=absentclean" >.gitattributes &&
 
-64fd3796c57084e7b8cbae358ce37970b8e954f6
-ok 7 - write-tree establishes cache-tree
+	echo test >test.ac &&
+	test_must_fail git add test.ac 2>stderr &&
+	test_grep "fatal: test.ac: clean filter .absentclean. failed" stderr
 
-expecting success of 0090.8 'test-tool scrap-cache-tree works': 
-	git read-tree HEAD &&
-	test-tool scrap-cache-tree &&
-	test_no_cache_tree
+fatal: test.ac: clean filter 'absentclean' failed
+ok 8 - required filter with absent clean field
 
-ok 8 - test-tool scrap-cache-tree works
+expecting success of 0021.9 'required filter with absent smudge field': 
+	test_config filter.absentsmudge.clean cat &&
+	test_config filter.absentsmudge.required true &&
 
-expecting success of 0090.9 'second commit has cache-tree': 
-	test_commit bar &&
-	test_cache_tree
+	echo "*.as filter=absentsmudge" >.gitattributes &&
 
-[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
+	echo test >test.as &&
+	git add test.as &&
+	rm -f test.as &&
+	test_must_fail git checkout -- test.as 2>stderr &&
+	test_grep "fatal: test.as: smudge filter absentsmudge failed" stderr
 
-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
+fatal: test.as: smudge filter absentsmudge failed
+ok 9 - required filter with absent smudge field
 
-[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 0021.10 'filtering large input to small output should use little memory': 
+	test_config filter.devnull.clean "cat >/dev/null" &&
+	test_config filter.devnull.required true &&
+	test_seq -f "%1048576d" 1 30 >30MB &&
+	echo "30MB filter=devnull" >.gitattributes &&
+	GIT_MMAP_LIMIT=1m GIT_ALLOC_LIMIT=1m git add 30MB
 
-*** 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 10 - filtering large input to small output should use little memory
 
-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 0021.11 'filter that does not read is fine': 
+	test-tool genrandom foo $((128 * 1024 + 1)) >big &&
+	echo "big filter=epipe" >.gitattributes &&
+	test_config filter.epipe.clean "echo xyzzy" &&
+	git add big &&
+	git cat-file blob :big >actual &&
+	echo xyzzy >expect &&
+	test_cmp expect actual
 
-	before=$(wc -c <.git/index) &&
-	git commit -m delete -p &&
-	after=$(wc -c <.git/index) &&
+ok 11 - filter that does not read is fine
 
-	# double check that the index shrank
-	test $before -gt $after &&
+checking prerequisite: EXPENSIVE
 
-	# and that our index was not corrupted
-	git fsck
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
 
-[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
+)
+prerequisite EXPENSIVE not satisfied
+ok 12 # skip filter large file (missing EXPENSIVE)
 
-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
+expecting success of 0021.13 'filter: clean empty file': 
+	test_config filter.in-repo-header.clean  "echo cleaned && cat" &&
+	test_config filter.in-repo-header.smudge "sed 1d" &&
 
-[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
+	echo "empty-in-worktree    filter=in-repo-header" >>.gitattributes &&
+	>empty-in-worktree &&
 
-expecting success of 0090.13 'reset --hard gives cache-tree': 
-	test-tool scrap-cache-tree &&
-	git reset --hard &&
-	test_cache_tree
+	echo cleaned >expected &&
+	git add empty-in-worktree &&
+	git show :empty-in-worktree >actual &&
+	test_cmp expected actual
 
-HEAD is now at d3413ee dir/child.t
-ok 13 - reset --hard gives cache-tree
+ok 13 - filter: clean empty file
 
-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 0021.14 'filter: smudge empty file': 
+	test_config filter.empty-in-repo.clean "cat >/dev/null" &&
+	test_config filter.empty-in-repo.smudge "echo smudged && cat" &&
 
-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
+	echo "empty-in-repo filter=empty-in-repo" >>.gitattributes &&
+	echo dead data walking >empty-in-repo &&
+	git add empty-in-repo &&
 
-expecting success of 0090.15 'checkout gives cache-tree': 
-	git tag current &&
-	git checkout HEAD^ &&
-	test_cache_tree
+	echo smudged >expected &&
+	git checkout-index --prefix=filtered- empty-in-repo &&
+	test_cmp expected filtered-empty-in-repo
 
-Note: switching to 'HEAD^'.
+ok 14 - filter: smudge empty 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 0021.15 'disable filter with empty override': 
+	test_config_global filter.disable.smudge false &&
+	test_config_global filter.disable.clean false &&
+	test_config filter.disable.smudge false &&
+	test_config filter.disable.clean false &&
 
-If you want to 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 "*.disable filter=disable" >.gitattributes &&
 
-  git switch -c <new-branch-name>
+	echo test >test.disable &&
+	git -c filter.disable.clean= add test.disable 2>err &&
+	test_must_be_empty err &&
+	rm -f test.disable &&
+	git -c filter.disable.smudge= checkout -- test.disable 2>err &&
+	test_must_be_empty err
 
-Or undo this operation with:
+ok 15 - disable filter with empty override
 
-  git switch -
+expecting success of 0021.16 'diff does not reuse worktree files that need cleaning': 
+	test_config filter.counter.clean "echo . >>count; sed s/^/clean:/" &&
+	echo "file filter=counter" >.gitattributes &&
+	test_commit one file &&
+	test_commit two file &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	>count &&
+	git diff-tree -p HEAD &&
+	test_line_count = 0 count
 
-HEAD is now at 73c66c3 delete
-ok 15 - checkout gives cache-tree
+[main 2e1b3a0] one
+ Author: A U Thor <author@example.com>
+ 9 files changed, 9 insertions(+)
+ create mode 100644 30MB
+ create mode 100644 big
+ create mode 100644 empty-in-repo
+ create mode 100644 empty-in-worktree
+ create mode 100644 file
+ create mode 100644 test.as
+ create mode 100644 test.disable
+ create mode 100644 test.fs
+ create mode 100644 test.r
+[main 5763447] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+57634479428deffd4cbb8230d4ff66a3801fc1be
+diff --git a/file b/file
+index e4a1655..0c54b7b 100644
+--- a/file
++++ b/file
+@@ -1 +1 @@
+-clean:one
++clean:two
+ok 16 - diff does not reuse worktree files that need cleaning
 
-expecting success of 0090.16 'checkout -b gives cache-tree': 
-	git checkout current &&
-	git checkout -b prev HEAD^ &&
-	test_cache_tree
+expecting success of 0021.17 'required process filter should filter data': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	test_config_global filter.protocol.required true &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
 
-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
+		echo "*.r filter=protocol" >.gitattributes &&
+		git add . &&
+		git commit -m "test commit 1" &&
+		git branch empty-branch &&
 
-expecting success of 0090.17 'checkout -B gives cache-tree': 
-	git checkout current &&
-	git checkout -B prev HEAD^ &&
-	test_cache_tree
+		cp "$TEST_ROOT/test.o" test.r &&
+		cp "$TEST_ROOT/test2.o" test2.r &&
+		mkdir testsubdir &&
+		cp "$TEST_ROOT/test3 'sq',\$x=.o" "testsubdir/test3 'sq',\$x=.r" &&
+		>test4-empty.r &&
 
-Note: switching to 'current'.
+		S=$(test_file_size test.r) &&
+		S2=$(test_file_size test2.r) &&
+		S3=$(test_file_size "testsubdir/test3 'sq',\$x=.r") &&
+		M=$(git hash-object test.r) &&
+		M2=$(git hash-object test2.r) &&
+		M3=$(git hash-object "testsubdir/test3 'sq',\$x=.r") &&
+		EMPTY=$(git hash-object /dev/null) &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+		filter_git add . &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: clean test.r $S [OK] -- OUT: $S . [OK]
+			IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK]
+			IN: clean test4-empty.r 0 [OK] -- OUT: 0  [OK]
+			IN: clean testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_count expected.log debug.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:
+		git commit -m "test commit 2" &&
+		MAIN=$(git rev-parse --verify main) &&
+		META="ref=refs/heads/main treeish=$MAIN" &&
+		rm -f test2.r "testsubdir/test3 'sq',\$x=.r" &&
 
-  git switch -c <new-branch-name>
+		filter_git checkout --quiet --no-progress . &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
 
-Or undo this operation with:
+		# Make sure that the file appears dirty, so checkout below has to
+		# run the configured filter.
+		touch test.r &&
+		filter_git checkout --quiet --no-progress empty-branch &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: clean test.r $S [OK] -- OUT: $S . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
 
-  git switch -
+		filter_git checkout --quiet --no-progress main &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test3 'sq',\$x=.o" "testsubdir/test3 'sq',\$x=.r"
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
+[main (root-commit) 56d459b] test commit 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 .gitattributes
+[main 9ea74df] test commit 2
+ Author: A U Thor <author@example.com>
+ 4 files changed, 5 insertions(+)
+ create mode 100644 test.r
+ create mode 100644 test2.r
+ create mode 100644 test4-empty.r
+ create mode 100644 testsubdir/test3 'sq',$x=.r
+ok 17 - required process filter should filter data
 
-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
+expecting success of 0021.18 'required process filter should filter data for various subcommands': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	test_config_global filter.protocol.required true &&
+	(
+		cd repo &&
 
-Note: switching to 'current'.
+		S=$(test_file_size test.r) &&
+		S2=$(test_file_size test2.r) &&
+		S3=$(test_file_size "testsubdir/test3 'sq',\$x=.r") &&
+		M=$(git hash-object test.r) &&
+		M2=$(git hash-object test2.r) &&
+		M3=$(git hash-object "testsubdir/test3 'sq',\$x=.r") &&
+		EMPTY=$(git hash-object /dev/null) &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+		MAIN=$(git rev-parse --verify 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:
+		cp "$TEST_ROOT/test.o" test5.r &&
+		git add test5.r &&
+		git commit -m "test commit 3" &&
+		git checkout empty-branch &&
+		filter_git rebase --onto empty-branch main^^ main &&
+		MAIN2=$(git rev-parse --verify main) &&
+		META="ref=refs/heads/main treeish=$MAIN2" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
 
-  git switch -c <new-branch-name>
+		git reset --hard empty-branch &&
+		filter_git reset --hard $MAIN &&
+		META="treeish=$MAIN" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
 
-Or undo this operation with:
+		git branch old-main $MAIN &&
+		git reset --hard empty-branch &&
+		filter_git reset --hard old-main &&
+		META="ref=refs/heads/old-main treeish=$MAIN" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
 
-  git switch -
+		git checkout -b merge empty-branch &&
+		git branch -f main $MAIN2 &&
+		filter_git merge main &&
+		META="treeish=$MAIN2" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		filter_git archive main >/dev/null &&
+		META="ref=refs/heads/main treeish=$MAIN2" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
 
-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
+		TREE="$(git rev-parse $MAIN2^{tree})" &&
+		filter_git archive $TREE >/dev/null &&
+		META="treeish=$TREE" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log
+	)
+
+[main 07631f7] test commit 3
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 pachyderm.t
-Note: switching to 'current'.
+ 1 file changed, 3 insertions(+)
+ create mode 100644 test5.r
+Switched to branch 'empty-branch'
+Current branch main is up to date.
+HEAD is now at 56d459b test commit 1
+HEAD is now at 9ea74df test commit 2
+HEAD is now at 56d459b test commit 1
+HEAD is now at 9ea74df test commit 2
+Switched to a new branch 'merge'
+Updating 56d459b..07631f7
+Fast-forward
+ test.r                      | 3 +++
+ test2.r                     | 1 +
+ test4-empty.r               | 0
+ test5.r                     | 3 +++
+ testsubdir/test3 'sq',$x=.r | 1 +
+ 5 files changed, 8 insertions(+)
+ create mode 100644 test.r
+ create mode 100644 test2.r
+ create mode 100644 test4-empty.r
+ create mode 100644 test5.r
+ create mode 100644 testsubdir/test3 'sq',$x=.r
+ok 18 - required process filter should filter data for various subcommands
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 0021.19 'required process filter takes precedence': 
+	test_config_global filter.protocol.clean false &&
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean" &&
+	test_config_global filter.protocol.required true &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
 
-If you want to 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 "*.r filter=protocol" >.gitattributes &&
+		cp "$TEST_ROOT/test.o" test.r &&
+		S=$(test_file_size test.r) &&
 
-  git switch -c <new-branch-name>
+		# Check that the process filter is invoked here
+		filter_git add . &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: clean test.r $S [OK] -- OUT: $S . [OK]
+			STOP
+		EOF
+		test_cmp_count expected.log debug.log
+	)
 
-Or undo this operation with:
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
+ok 19 - required process filter takes precedence
 
-  git switch -
+expecting success of 0021.20 'required process filter should be used only for "clean" operation only': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean" &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		echo "*.r filter=protocol" >.gitattributes &&
+		cp "$TEST_ROOT/test.o" test.r &&
+		S=$(test_file_size test.r) &&
 
-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
+		filter_git add . &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: clean test.r $S [OK] -- OUT: $S . [OK]
+			STOP
+		EOF
+		test_cmp_count expected.log debug.log &&
 
-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
+		rm test.r &&
 
-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'.
+		filter_git checkout --quiet --no-progress . &&
+		# If the filter would be used for "smudge", too, we would see
+		# "IN: smudge test.r 57 [OK] -- OUT: 57 . [OK]" here
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.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.
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
+ok 20 - required process filter should be used only for "clean" operation only
 
-If you want to 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 0021.21 'required process filter should process multiple packets': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	test_config_global filter.protocol.required true &&
 
-  git switch -c <new-branch-name>
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
 
-Or undo this operation with:
+		# Generate data requiring 1, 2, 3 packets
+		S=65516 && # PKTLINE_DATA_MAXLEN -> Maximal size of a packet
+		generate_random_characters $(($S    )) 1pkt_1__.file &&
+		generate_random_characters $(($S  +1)) 2pkt_1+1.file &&
+		generate_random_characters $(($S*2-1)) 2pkt_2-1.file &&
+		generate_random_characters $(($S*2  )) 2pkt_2__.file &&
+		generate_random_characters $(($S*2+1)) 3pkt_2+1.file &&
 
-  git switch -
+		for FILE in "$TEST_ROOT"/*.file
+		do
+			cp "$FILE" . &&
+			rot13.sh <"$FILE" >"$FILE.rot13" || return 1
+		done &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		echo "*.file filter=protocol" >.gitattributes &&
+		filter_git add *.file .gitattributes &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: clean 1pkt_1__.file $(($S    )) [OK] -- OUT: $(($S    )) . [OK]
+			IN: clean 2pkt_1+1.file $(($S  +1)) [OK] -- OUT: $(($S  +1)) .. [OK]
+			IN: clean 2pkt_2-1.file $(($S*2-1)) [OK] -- OUT: $(($S*2-1)) .. [OK]
+			IN: clean 2pkt_2__.file $(($S*2  )) [OK] -- OUT: $(($S*2  )) .. [OK]
+			IN: clean 3pkt_2+1.file $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK]
+			STOP
+		EOF
+		test_cmp_count expected.log debug.log &&
 
-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
+		M1="blob=$(git hash-object 1pkt_1__.file)" &&
+		M2="blob=$(git hash-object 2pkt_1+1.file)" &&
+		M3="blob=$(git hash-object 2pkt_2-1.file)" &&
+		M4="blob=$(git hash-object 2pkt_2__.file)" &&
+		M5="blob=$(git hash-object 3pkt_2+1.file)" &&
+		rm -f *.file debug.log &&
 
-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
+		filter_git checkout --quiet --no-progress -- *.file &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge 1pkt_1__.file $M1 $(($S    )) [OK] -- OUT: $(($S    )) . [OK]
+			IN: smudge 2pkt_1+1.file $M2 $(($S  +1)) [OK] -- OUT: $(($S  +1)) .. [OK]
+			IN: smudge 2pkt_2-1.file $M3 $(($S*2-1)) [OK] -- OUT: $(($S*2-1)) .. [OK]
+			IN: smudge 2pkt_2__.file $M4 $(($S*2  )) [OK] -- OUT: $(($S*2  )) .. [OK]
+			IN: smudge 3pkt_2+1.file $M5 $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+		for FILE in *.file
+		do
+			test_cmp_committed_rot13 "$TEST_ROOT/$FILE" $FILE || return 1
+		done
+	)
 
-  e104fa1 Merge branch 'changes2' into HEAD
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
+ok 21 - required process filter should process multiple packets
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 0021.22 'required process filter with clean error should fail': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	test_config_global filter.protocol.required true &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
 
- git branch <new-branch-name> e104fa1
+		echo "*.r filter=protocol" >.gitattributes &&
 
-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
+		cp "$TEST_ROOT/test.o" test.r &&
+		echo "this is going to fail" >clean-write-fail.r &&
+		echo "content-test3-subdir" >test3.r &&
 
-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_must_fail git add .
+	)
 
-A	newdir/one
-M	one.t
-ok 21 - no phantom error when switching trees
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
+fatal: clean write error
+error: external filter 'test-tool rot13-filter --log=debug.log clean smudge' failed
+fatal: clean-write-fail.r: clean filter 'protocol' failed
+ok 22 - required process filter with clean error should fail
 
-expecting success of 0090.22 'switching trees does not invalidate shared index': 
+expecting success of 0021.23 'process filter should restart after unexpected write failure': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	rm -rf repo &&
+	mkdir repo &&
 	(
-		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
-	)
+		cd repo &&
+		git init &&
 
-[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
+		echo "*.r filter=protocol" >.gitattributes &&
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0211-trace2-perf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0211-trace2-perf/.git/
-expecting success of 0211.1 'perf stream, return code 0': 
-	test_when_finished "rm trace.perf actual expect" &&
-	GIT_TRACE2_PERF="$(pwd)/trace.perf" test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
-	cat >expect <<-EOF &&
-		d0|main|version|||||$V
-		d0|main|start||_T_ABS_|||_EXE_ trace2 001return 0
-		d0|main|cmd_name|||||trace2 (trace2)
-		d0|main|exit||_T_ABS_|||code:0
-		d0|main|atexit||_T_ABS_|||code:0
-	EOF
-	test_cmp expect actual
+		cp "$TEST_ROOT/test.o" test.r &&
+		cp "$TEST_ROOT/test2.o" test2.r &&
+		echo "this is going to fail" >smudge-write-fail.o &&
+		cp smudge-write-fail.o smudge-write-fail.r &&
 
-ok 1 - perf stream, return code 0
+		S=$(test_file_size test.r) &&
+		S2=$(test_file_size test2.r) &&
+		SF=$(test_file_size smudge-write-fail.r) &&
+		M=$(git hash-object test.r) &&
+		M2=$(git hash-object test2.r) &&
+		MF=$(git hash-object smudge-write-fail.r) &&
+		rm -f debug.log &&
 
-expecting success of 0211.2 'perf stream, return code 1': 
-	test_when_finished "rm trace.perf actual expect" &&
-	test_must_fail env GIT_TRACE2_PERF="$(pwd)/trace.perf" test-tool trace2 001return 1 &&
-	perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
-	cat >expect <<-EOF &&
-		d0|main|version|||||$V
-		d0|main|start||_T_ABS_|||_EXE_ trace2 001return 1
-		d0|main|cmd_name|||||trace2 (trace2)
-		d0|main|exit||_T_ABS_|||code:1
-		d0|main|atexit||_T_ABS_|||code:1
-	EOF
-	test_cmp expect actual
+		git add . &&
+		rm -f *.r &&
 
-ok 2 - perf stream, return code 1
+		rm -f debug.log &&
+		git checkout --quiet --no-progress . 2>git-stderr.log &&
 
-expecting success of 0211.3 'perf stream, error event': 
+		grep "smudge write error" git-stderr.log &&
+		test_grep "error: external filter" git-stderr.log &&
+
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge smudge-write-fail.r blob=$MF $SF [OK] -- [WRITE FAIL]
+			START
+			init handshake complete
+			IN: smudge test.r blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r &&
+
+		# Smudge failed
+		! test_cmp smudge-write-fail.o smudge-write-fail.r &&
+		rot13.sh <smudge-write-fail.o >expected &&
+		git cat-file blob :smudge-write-fail.r >actual &&
+		test_cmp expected actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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-09-29 14:51:36.462548970 +0000
++++ smudge-write-fail.r	2026-09-29 14:51:36.542548970 +0000
+@@ -1 +1 @@
+-this is going to fail
++guvf vf tbvat gb snvy
+ok 23 - process filter should restart after unexpected write failure
+
+expecting success of 0021.24 'process filter should not be restarted if it signals an error': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+
+		echo "*.r filter=protocol" >.gitattributes &&
+
+		cp "$TEST_ROOT/test.o" test.r &&
+		cp "$TEST_ROOT/test2.o" test2.r &&
+		echo "this will cause an error" >error.o &&
+		cp error.o error.r &&
+
+		S=$(test_file_size test.r) &&
+		S2=$(test_file_size test2.r) &&
+		SE=$(test_file_size error.r) &&
+		M=$(git hash-object test.r) &&
+		M2=$(git hash-object test2.r) &&
+		ME=$(git hash-object error.r) &&
+		rm -f debug.log &&
+
+		git add . &&
+		rm -f *.r &&
+
+		filter_git checkout --quiet --no-progress . &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge error.r blob=$ME $SE [OK] -- [ERROR]
+			IN: smudge test.r blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r &&
+		test_cmp error.o error.r
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
+ok 24 - process filter should not be restarted if it signals an error
+
+expecting success of 0021.25 'process filter abort stops processing of all further files': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+
+		echo "*.r filter=protocol" >.gitattributes &&
+
+		cp "$TEST_ROOT/test.o" test.r &&
+		cp "$TEST_ROOT/test2.o" test2.r &&
+		echo "error this blob and all future blobs" >abort.o &&
+		cp abort.o abort.r &&
+
+		M="blob=$(git hash-object abort.r)" &&
+		rm -f debug.log &&
+		SA=$(test_file_size abort.r) &&
+
+		git add . &&
+		rm -f *.r &&
+
+
+		# Note: This test assumes that Git filters files in alphabetical
+		# order ("abort.r" before "test.r").
+		filter_git checkout --quiet --no-progress . &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge abort.r $M $SA [OK] -- [ABORT]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		test_cmp "$TEST_ROOT/test.o" test.r &&
+		test_cmp "$TEST_ROOT/test2.o" test2.r &&
+		test_cmp abort.o abort.r
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
+ok 25 - process filter abort stops processing of all further files
+
+expecting success of 0021.26 'invalid process filter must fail (and not hang!)': 
+	test_config_global filter.protocol.process cat &&
+	test_config_global filter.protocol.required true &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+
+		echo "*.r filter=protocol" >.gitattributes &&
+
+		cp "$TEST_ROOT/test.o" test.r &&
+		test_must_fail git add . 2>git-stderr.log &&
+		grep "expected git-filter-server" git-stderr.log
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
+error: Unexpected line 'git-filter-client', expected git-filter-server
+ok 26 - invalid process filter must fail (and not hang!)
+
+expecting success of 0021.27 'delayed checkout in process filter': 
+	test_config_global filter.a.process "test-tool rot13-filter --log=a.log clean smudge delay" &&
+	test_config_global filter.a.required true &&
+	test_config_global filter.b.process "test-tool rot13-filter --log=b.log clean smudge delay" &&
+	test_config_global filter.b.required true &&
+
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		echo "*.a filter=a" >.gitattributes &&
+		echo "*.b filter=b" >>.gitattributes &&
+		cp "$TEST_ROOT/test.o" test.a &&
+		cp "$TEST_ROOT/test.o" test-delay10.a &&
+		cp "$TEST_ROOT/test.o" test-delay11.a &&
+		cp "$TEST_ROOT/test.o" test-delay20.a &&
+		cp "$TEST_ROOT/test.o" test-delay10.b &&
+		git add . &&
+		git commit -m "test commit"
+	) &&
+
+	S=$(test_file_size "$TEST_ROOT/test.o") &&
+	PM="ref=refs/heads/main treeish=$(git -C repo rev-parse --verify main) " &&
+	M="${PM}blob=$(git -C repo rev-parse --verify main:test.a)" &&
+	cat >a.exp <<-EOF &&
+		START
+		init handshake complete
+		IN: smudge test.a $M $S [OK] -- OUT: $S . [OK]
+		IN: smudge test-delay10.a $M $S [OK] -- [DELAYED]
+		IN: smudge test-delay11.a $M $S [OK] -- [DELAYED]
+		IN: smudge test-delay20.a $M $S [OK] -- [DELAYED]
+		IN: list_available_blobs test-delay10.a test-delay11.a [OK]
+		IN: smudge test-delay10.a $M 0 [OK] -- OUT: $S . [OK]
+		IN: smudge test-delay11.a $M 0 [OK] -- OUT: $S . [OK]
+		IN: list_available_blobs test-delay20.a [OK]
+		IN: smudge test-delay20.a $M 0 [OK] -- OUT: $S . [OK]
+		IN: list_available_blobs [OK]
+		STOP
+	EOF
+	cat >b.exp <<-EOF &&
+		START
+		init handshake complete
+		IN: smudge test-delay10.b $M $S [OK] -- [DELAYED]
+		IN: list_available_blobs test-delay10.b [OK]
+		IN: smudge test-delay10.b $M 0 [OK] -- OUT: $S . [OK]
+		IN: list_available_blobs [OK]
+		STOP
+	EOF
+
+	rm -rf repo-cloned &&
+	filter_git clone repo repo-cloned &&
+	test_cmp_count a.exp repo-cloned/a.log &&
+	test_cmp_count b.exp repo-cloned/b.log &&
+
+	(
+		cd repo-cloned &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay11.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay20.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.b &&
+
+		rm *.a *.b &&
+		filter_git checkout . &&
+		# We are not checking out a ref here, so filter out ref metadata.
+		sed -e "s!$PM!!" ../a.exp >a.exp.filtered &&
+		sed -e "s!$PM!!" ../b.exp >b.exp.filtered &&
+		test_cmp_count a.exp.filtered a.log &&
+		test_cmp_count b.exp.filtered b.log &&
+
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay11.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay20.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.b
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
+[main (root-commit) 27d7fe8] test commit
+ Author: A U Thor <author@example.com>
+ 6 files changed, 17 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 test-delay10.a
+ create mode 100644 test-delay10.b
+ create mode 100644 test-delay11.a
+ create mode 100644 test-delay20.a
+ create mode 100644 test.a
+Cloning into 'repo-cloned'...
+done.
+Updated 5 paths from the index
+ok 27 - delayed checkout in process filter
+
+expecting success of 0021.28 'missing file in delayed checkout': 
+	test_config_global filter.bug.process "test-tool rot13-filter --log=bug.log clean smudge delay" &&
+	test_config_global filter.bug.required true &&
+
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		echo "*.a filter=bug" >.gitattributes &&
+		cp "$TEST_ROOT/test.o" missing-delay.a &&
+		git add . &&
+		git commit -m "test commit"
+	) &&
+
+	rm -rf repo-cloned &&
+	test_must_fail git clone repo repo-cloned 2>git-stderr.log &&
+	grep "error: .missing-delay\.a. was not filtered properly" git-stderr.log
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
+[main (root-commit) 5567259] test commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 missing-delay.a
+error: 'missing-delay.a' was not filtered properly
+ok 28 - missing file in delayed checkout
+
+expecting success of 0021.29 'invalid file in delayed checkout': 
+	test_config_global filter.bug.process "test-tool rot13-filter --log=bug.log clean smudge delay" &&
+	test_config_global filter.bug.required true &&
+
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		echo "*.a filter=bug" >.gitattributes &&
+		cp "$TEST_ROOT/test.o" invalid-delay.a &&
+		cp "$TEST_ROOT/test.o" unfiltered &&
+		git add . &&
+		git commit -m "test commit"
+	) &&
+
+	rm -rf repo-cloned &&
+	test_must_fail git clone repo repo-cloned 2>git-stderr.log &&
+	grep "error: external filter .* signaled that .unfiltered. is now available although it has not been delayed earlier" git-stderr.log
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
+[main (root-commit) 636012f] test commit
+ Author: A U Thor <author@example.com>
+ 3 files changed, 7 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 invalid-delay.a
+ create mode 100644 unfiltered
+error: external filter 'test-tool rot13-filter --log=bug.log clean smudge delay' signaled that 'unfiltered' is now available although it has not been delayed earlier
+ok 29 - invalid file in delayed checkout
+
+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: 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 30 # skip delayed checkout with case-collision don't write to the wrong place (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
+
+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
+ok 31 # skip delayed checkout with utf-8-collision don't write to the wrong place (missing UTF8_NFD_TO_NFC of SYMLINKS,UTF8_NFD_TO_NFC)
+
+ok 32 # skip delayed checkout with submodule collision don't write to the wrong place (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
+
+expecting success of 0021.33 'setup for progress tests': 
+	git init progress &&
+	(
+		cd progress &&
+		git config filter.delay.process "test-tool rot13-filter --log=delay-progress.log clean smudge delay" &&
+		git config filter.delay.required true &&
+
+		echo "*.a filter=delay" >.gitattributes &&
+		touch test-delay10.a &&
+		git add . &&
+		git commit -m files
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/progress/.git/
+[main (root-commit) 36dc8bf] files
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 .gitattributes
+ create mode 100644 test-delay10.a
+ok 33 - setup for progress tests
+
+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 0021.34 'delayed checkout shows progress by default on tty (pathspec checkout)': 
+		test_delayed_checkout_progress test_terminal git checkout $opt
+	
+IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
+ok 34 - delayed checkout shows progress by default on tty (pathspec checkout)
+
+expecting success of 0021.35 'delayed checkout omits progress on non-tty (pathspec checkout)': 
+		test_delayed_checkout_progress ! git checkout $opt
+	
+IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+ok 35 - delayed checkout omits progress on non-tty (pathspec checkout)
+
+expecting success of 0021.36 'delayed checkout omits progress with --quiet (pathspec checkout)': 
+		test_delayed_checkout_progress ! test_terminal git checkout --quiet $opt
+	
+IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+ok 36 - delayed checkout omits progress with --quiet (pathspec checkout)
+
+expecting success of 0021.37 'delayed checkout honors --[no]-progress (pathspec checkout)': 
+		test_delayed_checkout_progress ! test_terminal git checkout --no-progress $opt &&
+		test_delayed_checkout_progress test_terminal git checkout --quiet --progress $opt
+	
+IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
+ok 37 - delayed checkout honors --[no]-progress (pathspec checkout)
+
+expecting success of 0021.38 'delayed checkout shows progress by default on tty (branch checkout)': 
+		test_delayed_checkout_progress test_terminal git checkout $opt
+	
+IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
+ok 38 - delayed checkout shows progress by default on tty (branch checkout)
+
+expecting success of 0021.39 'delayed checkout omits progress on non-tty (branch checkout)': 
+		test_delayed_checkout_progress ! git checkout $opt
+	
+IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+ok 39 - delayed checkout omits progress on non-tty (branch checkout)
+
+expecting success of 0021.40 'delayed checkout omits progress with --quiet (branch checkout)': 
+		test_delayed_checkout_progress ! test_terminal git checkout --quiet $opt
+	
+IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+ok 40 - delayed checkout omits progress with --quiet (branch checkout)
+
+expecting success of 0021.41 'delayed checkout honors --[no]-progress (branch checkout)': 
+		test_delayed_checkout_progress ! test_terminal git checkout --no-progress $opt &&
+		test_delayed_checkout_progress test_terminal git checkout --quiet --progress $opt
+	
+IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
+ok 41 - delayed checkout honors --[no]-progress (branch checkout)
+
+expecting success of 0021.42 'delayed checkout correctly reports the number of updated entries': 
+	rm -rf repo &&
+	git init repo &&
+	(
+		cd repo &&
+		git config filter.delay.process "test-tool rot13-filter --log=delayed.log clean smudge delay" &&
+		git config filter.delay.required true &&
+
+		echo "*.a filter=delay" >.gitattributes &&
+		echo a >test-delay10.a &&
+		echo a >test-delay11.a &&
+		git add . &&
+		git commit -m files &&
+
+		rm *.a &&
+		git checkout . 2>err &&
+		grep "IN: smudge test-delay10.a .* \\[DELAYED\\]" delayed.log &&
+		grep "IN: smudge test-delay11.a .* \\[DELAYED\\]" delayed.log &&
+		grep "Updated 2 paths from the index" err
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
+[main (root-commit) 6d52fcb] files
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 test-delay10.a
+ create mode 100644 test-delay11.a
+IN: smudge test-delay10.a blob=8ba3a16384aacc37d01564b28401755ce8053f51 2 [OK] -- [DELAYED]
+IN: smudge test-delay11.a blob=8ba3a16384aacc37d01564b28401755ce8053f51 2 [OK] -- [DELAYED]
+Updated 2 paths from the index
+ok 42 - delayed checkout correctly reports the number of updated entries
+
+# passed all 42 test(s)
+1..42
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0090-cache-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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)
+	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
+
+[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
+
+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
+
+[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
+
+HEAD is now at d3413ee dir/child.t
+ok 13 - reset --hard gives cache-tree
+
+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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0211-trace2-perf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0211-trace2-perf/.git/
+expecting success of 0211.1 'perf stream, return code 0': 
+	test_when_finished "rm trace.perf actual expect" &&
+	GIT_TRACE2_PERF="$(pwd)/trace.perf" test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
+	cat >expect <<-EOF &&
+		d0|main|version|||||$V
+		d0|main|start||_T_ABS_|||_EXE_ trace2 001return 0
+		d0|main|cmd_name|||||trace2 (trace2)
+		d0|main|exit||_T_ABS_|||code:0
+		d0|main|atexit||_T_ABS_|||code:0
+	EOF
+	test_cmp expect actual
+
+ok 1 - perf stream, return code 0
+
+expecting success of 0211.2 'perf stream, return code 1': 
+	test_when_finished "rm trace.perf actual expect" &&
+	test_must_fail env GIT_TRACE2_PERF="$(pwd)/trace.perf" test-tool trace2 001return 1 &&
+	perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
+	cat >expect <<-EOF &&
+		d0|main|version|||||$V
+		d0|main|start||_T_ABS_|||_EXE_ trace2 001return 1
+		d0|main|cmd_name|||||trace2 (trace2)
+		d0|main|exit||_T_ABS_|||code:1
+		d0|main|atexit||_T_ABS_|||code:1
+	EOF
+	test_cmp expect actual
+
+ok 2 - perf stream, return code 1
+
+expecting success of 0211.3 'perf stream, error event': 
 	test_when_finished "rm trace.perf actual expect" &&
 	GIT_TRACE2_PERF="$(pwd)/trace.perf" test-tool trace2 003error "hello world" "this is a test" &&
 	perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
@@ -26882,26 +29054,26 @@
 Cloning into 'clone2'...
 warning: You appear to have cloned an empty repository.
 done.
-08:19:52.643643 common-init.c:58|d0|main|start||_T_REL_|||/build/reproducible-path/git-2.51.0/git clone https://user:pwd@example.com/ clone2
-08:19:52.646187 config.c:2576|d0|main|def_param||||scope:unknow|remote.origin.url:https://user:pwd@example.com/
+14:51:37.872905 common-init.c:58|d0|main|start||_T_REL_|||/build/reproducible-path/git-2.51.0/git clone https://user:pwd@example.com/ clone2
+14:51:37.874297 config.c:2576|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.51.0
-08:19:52.708965 git.c:477|d0|main|cmd_name|||||version (version)
-08:19:52.709054 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-08:19:52.709070 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+14:51:37.925921 git.c:477|d0|main|cmd_name|||||version (version)
+14:51:37.926002 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+14:51:37.926018 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
-08:19:52.769605 git.c:187|d0|main|cmd_name|||||_query_ (_query_)
-08:19:52.769685 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-08:19:52.769700 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+14:51:37.997993 git.c:187|d0|main|cmd_name|||||_query_ (_query_)
+14:51:37.998070 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+14:51:37.998085 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_': 
@@ -26929,12 +29101,12 @@
 
 warning: url has no scheme: y/
 fatal: credential url cannot be parsed: y/
-08:19:52.840935 git.c:769|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-08:19:52.840986 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-08:19:52.841001 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-08:19:52.871865 remote-curl.c:1573|d1|main|cmd_name|||||remote-curl (_run_dashed_/remote-curl)
-08:19:52.871886 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-08:19:52.871901 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+14:51:38.075734 git.c:769|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+14:51:38.075787 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+14:51:38.075801 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+14:51:38.093513 remote-curl.c:1573|d1|main|cmd_name|||||remote-curl (_run_dashed_/remote-curl)
+14:51:38.093535 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+14:51:38.093550 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_': 
@@ -26961,12 +29133,12 @@
 	grep "d1|main|def_param|.*|cfg.prop.foo:red" actual &&
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
-08:19:52.944109 git.c:769|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-08:19:52.944160 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-08:19:52.944174 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-08:19:52.964870 http-fetch.c:152|d1|main|cmd_name|||||http-fetch (_run_dashed_/http-fetch)
-08:19:52.964984 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-08:19:52.964999 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+14:51:38.166708 git.c:769|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+14:51:38.166762 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+14:51:38.166776 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+14:51:38.178909 http-fetch.c:152|d1|main|cmd_name|||||http-fetch (_run_dashed_/http-fetch)
+14:51:38.179019 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+14:51:38.179034 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': 
@@ -27004,13 +29176,13 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.51.0
-08:19:53.053511 git.c:769|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-08:19:53.053677 git.c:825|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_git_alias_)
-08:19:53.053561 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-08:19:53.053575 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-08:19:53.055474 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_git_alias_/version)
-08:19:53.055556 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-08:19:53.055573 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+14:51:38.252774 git.c:769|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+14:51:38.252973 git.c:825|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_git_alias_)
+14:51:38.252825 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+14:51:38.252840 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+14:51:38.254544 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_git_alias_/version)
+14:51:38.254622 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+14:51:38.254638 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': 
@@ -27051,13 +29223,13 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.51.0
-08:19:53.158138 git.c:769|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-08:19:53.158369 git.c:394|d0|main|cmd_name|||||_run_shell_alias_ (_run_dashed_/_run_shell_alias_)
-08:19:53.158190 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-08:19:53.158205 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-08:19:53.169085 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_shell_alias_/version)
-08:19:53.169192 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-08:19:53.169210 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+14:51:38.348662 git.c:769|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+14:51:38.351973 git.c:394|d0|main|cmd_name|||||_run_shell_alias_ (_run_dashed_/_run_shell_alias_)
+14:51:38.348713 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+14:51:38.348728 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+14:51:38.354988 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_shell_alias_/version)
+14:51:38.355742 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+14:51:38.355765 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': 
@@ -27108,23 +29280,515 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.51.0
-08:19:53.293749 git.c:769|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-08:19:53.293825 run-command.c:740|d0|main|child_start||_T_REL_|||[ch0] class:dashed argv:[git-xxx]
-08:19:53.293913 git.c:424|d0|main|alias|||||alias:xxx argv:[yyy]
-08:19:53.293965 git.c:769|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_/_run_dashed_)
-08:19:53.293969 run-command.c:740|d0|main|child_start||_T_REL_|||[ch1] class:dashed argv:[git-yyy]
-08:19:53.294035 git.c:424|d0|main|alias|||||alias:yyy argv:[version]
-08:19:53.294042 git.c:825|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_dashed_/_run_git_alias_)
-08:19:53.293815 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-08:19:53.298400 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_dashed_/_run_git_alias_/version)
-08:19:53.298478 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-08:19:53.298493 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+14:51:38.454100 git.c:769|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+14:51:38.454175 run-command.c:740|d0|main|child_start||_T_REL_|||[ch0] class:dashed argv:[git-xxx]
+14:51:38.454265 git.c:424|d0|main|alias|||||alias:xxx argv:[yyy]
+14:51:38.454317 git.c:769|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_/_run_dashed_)
+14:51:38.454321 run-command.c:740|d0|main|child_start||_T_REL_|||[ch1] class:dashed argv:[git-yyy]
+14:51:38.454393 git.c:424|d0|main|alias|||||alias:yyy argv:[version]
+14:51:38.454400 git.c:825|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_dashed_/_run_git_alias_)
+14:51:38.454166 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+14:51:38.456014 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_dashed_/_run_git_alias_/version)
+14:51:38.456085 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+14:51:38.456101 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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0411-clone-from-partial.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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 &&
+
+	# The --path-walk feature of "git pack-objects" is not
+	# compatible with this kind of fetch from an incomplete repo.
+	GIT_TEST_PACK_PATH_WALK=0 &&
+	export GIT_TEST_PACK_PATH_WALK &&
+
+	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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0500-progress-display.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0500-progress-display/.git/
+expecting success of 0500.1 'simple progress display': 
+	cat >expect <<-\EOF &&
+	Working hard: 1<CR>
+	Working hard: 2<CR>
+	Working hard: 5<CR>
+	Working hard: 5, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 0
+	update
+	progress 1
+	update
+	progress 2
+	progress 3
+	progress 4
+	update
+	progress 5
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 1 - simple progress display
+
+expecting success of 0500.2 'progress display with total': 
+	cat >expect <<-\EOF &&
+	Working hard:  33% (1/3)<CR>
+	Working hard:  66% (2/3)<CR>
+	Working hard: 100% (3/3)<CR>
+	Working hard: 100% (3/3), done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 3
+	progress 1
+	progress 2
+	progress 3
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 2 - progress display with total
+
+expecting success of 0500.3 'progress display breaks long lines #1': 
+	sed -e "s/Z$//" >expect <<\EOF &&
+Working hard.......2.........3.........4.........5.........6:   0% (100/100000)<CR>
+Working hard.......2.........3.........4.........5.........6:   1% (1000/100000)<CR>
+Working hard.......2.........3.........4.........5.........6:                   Z
+   10% (10000/100000)<CR>
+  100% (100000/100000)<CR>
+  100% (100000/100000), done.
+EOF
+
+	cat >in <<-\EOF &&
+	start 100000 Working hard.......2.........3.........4.........5.........6
+	progress 100
+	progress 1000
+	progress 10000
+	progress 100000
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 3 - progress display breaks long lines #1
+
+expecting success of 0500.4 'progress display breaks long lines #2': 
+	# Note: we do not need that many spaces after the title to cover up
+	# the last line before breaking the progress line.
+	sed -e "s/Z$//" >expect <<\EOF &&
+Working hard.......2.........3.........4.........5.........6:   0% (1/100000)<CR>
+Working hard.......2.........3.........4.........5.........6:   0% (2/100000)<CR>
+Working hard.......2.........3.........4.........5.........6:                   Z
+   10% (10000/100000)<CR>
+  100% (100000/100000)<CR>
+  100% (100000/100000), done.
+EOF
+
+	cat >in <<-\EOF &&
+	start 100000 Working hard.......2.........3.........4.........5.........6
+	update
+	progress 1
+	update
+	progress 2
+	progress 10000
+	progress 100000
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 4 - progress display breaks long lines #2
+
+expecting success of 0500.5 'progress display breaks long lines #3 - even the first is too long': 
+	# Note: we do not actually need any spaces at the end of the title
+	# line, because there is no previous progress line to cover up.
+	sed -e "s/Z$//" >expect <<\EOF &&
+Working hard.......2.........3.........4.........5.........6:                   Z
+   25% (25000/100000)<CR>
+   50% (50000/100000)<CR>
+   75% (75000/100000)<CR>
+  100% (100000/100000)<CR>
+  100% (100000/100000), done.
+EOF
+
+	cat >in <<-\EOF &&
+	start 100000 Working hard.......2.........3.........4.........5.........6
+	progress 25000
+	progress 50000
+	progress 75000
+	progress 100000
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 5 - progress display breaks long lines #3 - even the first is too long
+
+expecting success of 0500.6 'progress display breaks long lines #4 - title line matches terminal width': 
+	cat >expect <<\EOF &&
+Working hard.......2.........3.........4.........5.........6.........7.........:
+   25% (25000/100000)<CR>
+   50% (50000/100000)<CR>
+   75% (75000/100000)<CR>
+  100% (100000/100000)<CR>
+  100% (100000/100000), done.
+EOF
+
+	cat >in <<-\EOF &&
+	start 100000 Working hard.......2.........3.........4.........5.........6.........7.........
+	progress 25000
+	progress 50000
+	progress 75000
+	progress 100000
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 6 - progress display breaks long lines #4 - title line matches terminal width
+
+expecting success of 0500.7 'progress shortens - crazy caller': 
+	cat >expect <<-\EOF &&
+	Working hard:  10% (100/1000)<CR>
+	Working hard:  20% (200/1000)<CR>
+	Working hard:   0% (1/1000)  <CR>
+	Working hard: 100% (1000/1000)<CR>
+	Working hard: 100% (1000/1000), done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 1000
+	progress 100
+	progress 200
+	progress 1
+	progress 1000
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 7 - progress shortens - crazy caller
+
+expecting success of 0500.8 'progress display with throughput': 
+	cat >expect <<-\EOF &&
+	Working hard: 10<CR>
+	Working hard: 20, 200.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 30, 300.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 40, 400.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 40, 400.00 KiB | 100.00 KiB/s, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 0
+	throughput 102400 1000
+	update
+	progress 10
+	throughput 204800 2000
+	update
+	progress 20
+	throughput 307200 3000
+	update
+	progress 30
+	throughput 409600 4000
+	update
+	progress 40
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 8 - progress display with throughput
+
+expecting success of 0500.9 'progress display with throughput and total': 
+	cat >expect <<-\EOF &&
+	Working hard:  25% (10/40)<CR>
+	Working hard:  50% (20/40), 200.00 KiB | 100.00 KiB/s<CR>
+	Working hard:  75% (30/40), 300.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 100% (40/40), 400.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 100% (40/40), 400.00 KiB | 100.00 KiB/s, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 40
+	throughput 102400 1000
+	progress 10
+	throughput 204800 2000
+	progress 20
+	throughput 307200 3000
+	progress 30
+	throughput 409600 4000
+	progress 40
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 9 - progress display with throughput and total
+
+expecting success of 0500.10 'cover up after throughput shortens': 
+	cat >expect <<-\EOF &&
+	Working hard: 1<CR>
+	Working hard: 2, 800.00 KiB | 400.00 KiB/s<CR>
+	Working hard: 3, 1.17 MiB | 400.00 KiB/s  <CR>
+	Working hard: 4, 1.56 MiB | 400.00 KiB/s<CR>
+	Working hard: 4, 1.56 MiB | 400.00 KiB/s, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 0
+	throughput 409600 1000
+	update
+	progress 1
+	throughput 819200 2000
+	update
+	progress 2
+	throughput 1228800 3000
+	update
+	progress 3
+	throughput 1638400 4000
+	update
+	progress 4
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 10 - cover up after throughput shortens
+
+expecting success of 0500.11 'cover up after throughput shortens a lot': 
+	cat >expect <<-\EOF &&
+	Working hard: 1<CR>
+	Working hard: 2, 1000.00 KiB | 1000.00 KiB/s<CR>
+	Working hard: 3, 3.00 MiB | 1.50 MiB/s      <CR>
+	Working hard: 3, 3.00 MiB | 1024.00 KiB/s, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 0
+	throughput 1 1000
+	update
+	progress 1
+	throughput 1024000 2000
+	update
+	progress 2
+	throughput 3145728 3000
+	update
+	progress 3
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 11 - cover up after throughput shortens a lot
+
+expecting success of 0500.12 'progress generates traces': 
+	cat >in <<-\EOF &&
+	start 40
+	throughput 102400 1000
+	update
+	progress 10
+	throughput 204800 2000
+	update
+	progress 20
+	throughput 307200 3000
+	update
+	progress 30
+	throughput 409600 4000
+	update
+	progress 40
+	stop
+	EOF
+
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool progress \
+		<in 2>stderr &&
+
+	# t0212/parse_events.perl intentionally omits regions and data.
+	test_region progress "Working hard" trace.event &&
+	grep "\"key\":\"total_objects\",\"value\":\"40\"" trace.event &&
+	grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event
+
+{"event":"region_enter","sid":"20260929T145138.923443Z-H5c947e1c-P001ed8d4","thread":"main","time":"2026-09-29T14:51:38.923801Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_leave","sid":"20260929T145138.923443Z-H5c947e1c-P001ed8d4","thread":"main","time":"2026-09-29T14:51:38.923843Z","file":"progress.c","line":357,"repo":0,"t_rel":0.000043,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"data","sid":"20260929T145138.923443Z-H5c947e1c-P001ed8d4","thread":"main","time":"2026-09-29T14:51:38.923830Z","file":"progress.c","line":350,"repo":0,"t_abs":0.000568,"t_rel":0.000029,"nesting":2,"category":"progress","key":"total_objects","value":"40"}
+{"event":"data","sid":"20260929T145138.923443Z-H5c947e1c-P001ed8d4","thread":"main","time":"2026-09-29T14:51:38.923838Z","file":"progress.c","line":354,"repo":0,"t_abs":0.000577,"t_rel":0.000038,"nesting":2,"category":"progress","key":"total_bytes","value":"409600"}
+ok 12 - progress generates traces
+
+expecting success of 0500.13 'progress generates traces: stop / start': 
+	cat >in <<-\EOF &&
+	start 0
+	stop
+	EOF
+
+	GIT_TRACE2_EVENT="$PWD/trace-startstop.event" test-tool progress \
+		<in 2>stderr &&
+	test_region progress "Working hard" trace-startstop.event
+
+{"event":"region_enter","sid":"20260929T145138.944276Z-H5c947e1c-P001ed933","thread":"main","time":"2026-09-29T14:51:38.944641Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_leave","sid":"20260929T145138.944276Z-H5c947e1c-P001ed933","thread":"main","time":"2026-09-29T14:51:38.944654Z","file":"progress.c","line":357,"repo":0,"t_rel":0.000013,"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': 
+	cat >in <<-\EOF &&
+	start 0
+	EOF
+
+	GIT_TRACE2_EVENT="$PWD/trace-start.event" \
+	LSAN_OPTIONS=detect_leaks=0 \
+	test-tool progress \
+		<in 2>stderr &&
+	grep region_enter.*progress trace-start.event &&
+	! grep region_leave.*progress trace-start.event
+
+{"event":"region_enter","sid":"20260929T145138.958374Z-H5c947e1c-P001ed972","thread":"main","time":"2026-09-29T14:51:38.958724Z","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': 
+	cat >in <<-\EOF &&
+	stop
+	EOF
+
+	GIT_TRACE2_EVENT="$PWD/trace-stop.event" test-tool progress \
+		<in 2>stderr &&
+	! grep region_enter.*progress trace-stop.event &&
+	! grep region_leave.*progress trace-stop.event
+
+ok 15 - progress generates traces: stop without start
+
+expecting success of 0500.16 'progress generates traces: start with active progress bar (no stops)': 
+	cat >in <<-\EOF &&
+	start 0 One
+	start 0 Two
+	EOF
+
+	GIT_TRACE2_EVENT="$PWD/trace-2start.event" \
+	LSAN_OPTIONS=detect_leaks=0 \
+	test-tool progress \
+		<in 2>stderr &&
+	grep region_enter.*progress.*One trace-2start.event &&
+	grep region_enter.*progress.*Two trace-2start.event &&
+	! grep region_leave trace-2start.event
+
+{"event":"region_enter","sid":"20260929T145138.984271Z-H5c947e1c-P001ed9d8","thread":"main","time":"2026-09-29T14:51:38.984649Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"One"}
+{"event":"region_enter","sid":"20260929T145138.984271Z-H5c947e1c-P001ed9d8","thread":"main","time":"2026-09-29T14:51:38.984655Z","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)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0008-ignores.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0008-ignores/.git/
 expecting success of 0008.1 'setup': 
@@ -30506,1733 +33170,6 @@
 1..397
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0411-clone-from-partial.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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 &&
-
-	# The --path-walk feature of "git pack-objects" is not
-	# compatible with this kind of fetch from an incomplete repo.
-	GIT_TEST_PACK_PATH_WALK=0 &&
-	export GIT_TEST_PACK_PATH_WALK &&
-
-	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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0021-conversion.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/.git/
-expecting success of 0021.1 'setup': 
-	git config filter.rot13.smudge ./rot13.sh &&
-	git config filter.rot13.clean ./rot13.sh &&
-
-	{
-	    echo "*.t filter=rot13" &&
-	    echo "*.i ident"
-	} >.gitattributes &&
-
-	{
-	    echo a b c d e f g h i j k l m &&
-	    echo n o p q r s t u v w x y z &&
-	    echo '$Id$'
-	} >test &&
-	cat test >test.t &&
-	cat test >test.o &&
-	cat test >test.i &&
-	git add test test.t test.i &&
-	rm -f test test.t test.i &&
-	git checkout -- test test.t test.i &&
-
-	echo "content-test2" >test2.o &&
-	echo "content-test3 - filename with special characters" >"test3 'sq',\$x=.o"
-
-ok 1 - setup
-
-expecting success of 0021.2 'check': 
-
-	test_cmp test.o test &&
-	test_cmp test.o test.t &&
-
-	# ident should be stripped in the repository
-	git diff --raw --exit-code :test :test.i &&
-	id=$(git rev-parse --verify :test) &&
-	embedded=$(sed -ne "$script" test.i) &&
-	test "z$id" = "z$embedded" &&
-
-	git cat-file blob :test.t >test.r &&
-
-	./rot13.sh <test.o >test.t &&
-	test_cmp test.r test.t
-
-ok 2 - check
-
-expecting success of 0021.3 'expanded_in_repo': 
-	cat >expanded-keywords.0 <<-\EOF &&
-	File with expanded keywords
-	$Id$
-	$Id:$
-	$Id: 0000000000000000000000000000000000000000 $
-	$Id: NoSpaceAtEnd$
-	$Id:NoSpaceAtFront $
-	$Id:NoSpaceAtEitherEnd$
-	$Id: NoTerminatingSymbol
-	$Id: Foreign Commit With Spaces $
-	EOF
-
-	{
-		cat expanded-keywords.0 &&
-		printf "\$Id: NoTerminatingSymbolAtEOF"
-	} >expanded-keywords &&
-	cat expanded-keywords >expanded-keywords-crlf &&
-	git add expanded-keywords expanded-keywords-crlf &&
-	git commit -m "File with keywords expanded" &&
-	id=$(git rev-parse --verify :expanded-keywords) &&
-
-	cat >expected-output.0 <<-EOF &&
-	File with expanded keywords
-	\$Id: $id \$
-	\$Id: $id \$
-	\$Id: $id \$
-	\$Id: $id \$
-	\$Id: $id \$
-	\$Id: $id \$
-	\$Id: NoTerminatingSymbol
-	\$Id: Foreign Commit With Spaces \$
-	EOF
-	{
-		cat expected-output.0 &&
-		printf "\$Id: NoTerminatingSymbolAtEOF"
-	} >expected-output &&
-	{
-		append_cr <expected-output.0 &&
-		printf "\$Id: NoTerminatingSymbolAtEOF"
-	} >expected-output-crlf &&
-	{
-		echo "expanded-keywords ident" &&
-		echo "expanded-keywords-crlf ident text eol=crlf"
-	} >>.gitattributes &&
-
-	rm -f expanded-keywords expanded-keywords-crlf &&
-
-	git checkout -- expanded-keywords &&
-	test_cmp expected-output expanded-keywords &&
-
-	git checkout -- expanded-keywords-crlf &&
-	test_cmp expected-output-crlf expanded-keywords-crlf
-
-[main (root-commit) bf31399] File with keywords expanded
- Author: A U Thor <author@example.com>
- 5 files changed, 29 insertions(+)
- create mode 100644 expanded-keywords
- create mode 100644 expanded-keywords-crlf
- create mode 100644 test
- create mode 100644 test.i
- create mode 100644 test.t
-ok 3 - expanded_in_repo
-
-expecting success of 0021.4 'filter shell-escaped filenames': 
-	cat >argc.sh <<-EOF &&
-	#!$SHELL_PATH
-	cat >/dev/null
-	echo argc: \$# "\$@"
-	EOF
-	normal=name-no-magic &&
-	special="name  with 'sq' and \$x" &&
-	echo some test text >"$normal" &&
-	echo some test text >"$special" &&
-	git add "$normal" "$special" &&
-	git commit -q -m "add files" &&
-	echo "name* filter=argc" >.gitattributes &&
-
-	# delete the files and check them out again, using a smudge filter
-	# that will count the args and echo the command-line back to us
-	test_config filter.argc.smudge "sh ./argc.sh %f" &&
-	rm "$normal" "$special" &&
-	git checkout -- "$normal" "$special" &&
-
-	# make sure argc.sh counted the right number of args
-	echo "argc: 1 $normal" >expect &&
-	test_cmp expect "$normal" &&
-	echo "argc: 1 $special" >expect &&
-	test_cmp expect "$special" &&
-
-	# do the same thing, but with more args in the filter expression
-	test_config filter.argc.smudge "sh ./argc.sh %f --my-extra-arg" &&
-	rm "$normal" "$special" &&
-	git checkout -- "$normal" "$special" &&
-
-	# make sure argc.sh counted the right number of args
-	echo "argc: 2 $normal --my-extra-arg" >expect &&
-	test_cmp expect "$normal" &&
-	echo "argc: 2 $special --my-extra-arg" >expect &&
-	test_cmp expect "$special" &&
-	:
-
-ok 4 - filter shell-escaped filenames
-
-expecting success of 0021.5 'required filter should filter data': 
-	test_config filter.required.smudge ./rot13.sh &&
-	test_config filter.required.clean ./rot13.sh &&
-	test_config filter.required.required true &&
-
-	echo "*.r filter=required" >.gitattributes &&
-
-	cat test.o >test.r &&
-	git add test.r &&
-
-	rm -f test.r &&
-	git checkout -- test.r &&
-	test_cmp test.o test.r &&
-
-	./rot13.sh <test.o >expected &&
-	git cat-file blob :test.r >actual &&
-	test_cmp expected actual
-
-ok 5 - required filter should filter data
-
-expecting success of 0021.6 'required filter smudge failure': 
-	test_config filter.failsmudge.smudge false &&
-	test_config filter.failsmudge.clean cat &&
-	test_config filter.failsmudge.required true &&
-
-	echo "*.fs filter=failsmudge" >.gitattributes &&
-
-	echo test >test.fs &&
-	git add test.fs &&
-	rm -f test.fs &&
-	test_must_fail git checkout -- test.fs
-
-error: external filter 'false' failed 1
-error: external filter 'false' failed
-fatal: test.fs: smudge filter failsmudge failed
-ok 6 - required filter smudge failure
-
-expecting success of 0021.7 'required filter clean failure': 
-	test_config filter.failclean.smudge cat &&
-	test_config filter.failclean.clean false &&
-	test_config filter.failclean.required true &&
-
-	echo "*.fc filter=failclean" >.gitattributes &&
-
-	echo test >test.fc &&
-	test_must_fail git add test.fc
-
-error: external filter 'false' failed 1
-error: external filter 'false' failed
-fatal: test.fc: clean filter 'failclean' failed
-ok 7 - required filter clean failure
-
-expecting success of 0021.8 'required filter with absent clean field': 
-	test_config filter.absentclean.smudge cat &&
-	test_config filter.absentclean.required true &&
-
-	echo "*.ac filter=absentclean" >.gitattributes &&
-
-	echo test >test.ac &&
-	test_must_fail git add test.ac 2>stderr &&
-	test_grep "fatal: test.ac: clean filter .absentclean. failed" stderr
-
-fatal: test.ac: clean filter 'absentclean' failed
-ok 8 - required filter with absent clean field
-
-expecting success of 0021.9 'required filter with absent smudge field': 
-	test_config filter.absentsmudge.clean cat &&
-	test_config filter.absentsmudge.required true &&
-
-	echo "*.as filter=absentsmudge" >.gitattributes &&
-
-	echo test >test.as &&
-	git add test.as &&
-	rm -f test.as &&
-	test_must_fail git checkout -- test.as 2>stderr &&
-	test_grep "fatal: test.as: smudge filter absentsmudge failed" stderr
-
-fatal: test.as: smudge filter absentsmudge failed
-ok 9 - required filter with absent smudge field
-
-expecting success of 0021.10 'filtering large input to small output should use little memory': 
-	test_config filter.devnull.clean "cat >/dev/null" &&
-	test_config filter.devnull.required true &&
-	test_seq -f "%1048576d" 1 30 >30MB &&
-	echo "30MB filter=devnull" >.gitattributes &&
-	GIT_MMAP_LIMIT=1m GIT_ALLOC_LIMIT=1m git add 30MB
-
-ok 10 - filtering large input to small output should use little memory
-
-expecting success of 0021.11 'filter that does not read is fine': 
-	test-tool genrandom foo $((128 * 1024 + 1)) >big &&
-	echo "big filter=epipe" >.gitattributes &&
-	test_config filter.epipe.clean "echo xyzzy" &&
-	git add big &&
-	git cat-file blob :big >actual &&
-	echo xyzzy >expect &&
-	test_cmp expect actual
-
-ok 11 - filter that does not read is fine
-
-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 12 # skip filter large file (missing EXPENSIVE)
-
-expecting success of 0021.13 'filter: clean empty file': 
-	test_config filter.in-repo-header.clean  "echo cleaned && cat" &&
-	test_config filter.in-repo-header.smudge "sed 1d" &&
-
-	echo "empty-in-worktree    filter=in-repo-header" >>.gitattributes &&
-	>empty-in-worktree &&
-
-	echo cleaned >expected &&
-	git add empty-in-worktree &&
-	git show :empty-in-worktree >actual &&
-	test_cmp expected actual
-
-ok 13 - filter: clean empty file
-
-expecting success of 0021.14 'filter: smudge empty file': 
-	test_config filter.empty-in-repo.clean "cat >/dev/null" &&
-	test_config filter.empty-in-repo.smudge "echo smudged && cat" &&
-
-	echo "empty-in-repo filter=empty-in-repo" >>.gitattributes &&
-	echo dead data walking >empty-in-repo &&
-	git add empty-in-repo &&
-
-	echo smudged >expected &&
-	git checkout-index --prefix=filtered- empty-in-repo &&
-	test_cmp expected filtered-empty-in-repo
-
-ok 14 - filter: smudge empty file
-
-expecting success of 0021.15 'disable filter with empty override': 
-	test_config_global filter.disable.smudge false &&
-	test_config_global filter.disable.clean false &&
-	test_config filter.disable.smudge false &&
-	test_config filter.disable.clean false &&
-
-	echo "*.disable filter=disable" >.gitattributes &&
-
-	echo test >test.disable &&
-	git -c filter.disable.clean= add test.disable 2>err &&
-	test_must_be_empty err &&
-	rm -f test.disable &&
-	git -c filter.disable.smudge= checkout -- test.disable 2>err &&
-	test_must_be_empty err
-
-ok 15 - disable filter with empty override
-
-expecting success of 0021.16 'diff does not reuse worktree files that need cleaning': 
-	test_config filter.counter.clean "echo . >>count; sed s/^/clean:/" &&
-	echo "file filter=counter" >.gitattributes &&
-	test_commit one file &&
-	test_commit two file &&
-
-	>count &&
-	git diff-tree -p HEAD &&
-	test_line_count = 0 count
-
-[main 2e1b3a0] one
- Author: A U Thor <author@example.com>
- 9 files changed, 9 insertions(+)
- create mode 100644 30MB
- create mode 100644 big
- create mode 100644 empty-in-repo
- create mode 100644 empty-in-worktree
- create mode 100644 file
- create mode 100644 test.as
- create mode 100644 test.disable
- create mode 100644 test.fs
- create mode 100644 test.r
-[main 5763447] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-57634479428deffd4cbb8230d4ff66a3801fc1be
-diff --git a/file b/file
-index e4a1655..0c54b7b 100644
---- a/file
-+++ b/file
-@@ -1 +1 @@
--clean:one
-+clean:two
-ok 16 - diff does not reuse worktree files that need cleaning
-
-expecting success of 0021.17 'required process filter should filter data': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	test_config_global filter.protocol.required true &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-		git add . &&
-		git commit -m "test commit 1" &&
-		git branch empty-branch &&
-
-		cp "$TEST_ROOT/test.o" test.r &&
-		cp "$TEST_ROOT/test2.o" test2.r &&
-		mkdir testsubdir &&
-		cp "$TEST_ROOT/test3 'sq',\$x=.o" "testsubdir/test3 'sq',\$x=.r" &&
-		>test4-empty.r &&
-
-		S=$(test_file_size test.r) &&
-		S2=$(test_file_size test2.r) &&
-		S3=$(test_file_size "testsubdir/test3 'sq',\$x=.r") &&
-		M=$(git hash-object test.r) &&
-		M2=$(git hash-object test2.r) &&
-		M3=$(git hash-object "testsubdir/test3 'sq',\$x=.r") &&
-		EMPTY=$(git hash-object /dev/null) &&
-
-		filter_git add . &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: clean test.r $S [OK] -- OUT: $S . [OK]
-			IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK]
-			IN: clean test4-empty.r 0 [OK] -- OUT: 0  [OK]
-			IN: clean testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_count expected.log debug.log &&
-
-		git commit -m "test commit 2" &&
-		MAIN=$(git rev-parse --verify main) &&
-		META="ref=refs/heads/main treeish=$MAIN" &&
-		rm -f test2.r "testsubdir/test3 'sq',\$x=.r" &&
-
-		filter_git checkout --quiet --no-progress . &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		# Make sure that the file appears dirty, so checkout below has to
-		# run the configured filter.
-		touch test.r &&
-		filter_git checkout --quiet --no-progress empty-branch &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: clean test.r $S [OK] -- OUT: $S . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		filter_git checkout --quiet --no-progress main &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test3 'sq',\$x=.o" "testsubdir/test3 'sq',\$x=.r"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
-[main (root-commit) 56d459b] test commit 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 .gitattributes
-[main 9ea74df] test commit 2
- Author: A U Thor <author@example.com>
- 4 files changed, 5 insertions(+)
- create mode 100644 test.r
- create mode 100644 test2.r
- create mode 100644 test4-empty.r
- create mode 100644 testsubdir/test3 'sq',$x=.r
-ok 17 - required process filter should filter data
-
-expecting success of 0021.18 'required process filter should filter data for various subcommands': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	test_config_global filter.protocol.required true &&
-	(
-		cd repo &&
-
-		S=$(test_file_size test.r) &&
-		S2=$(test_file_size test2.r) &&
-		S3=$(test_file_size "testsubdir/test3 'sq',\$x=.r") &&
-		M=$(git hash-object test.r) &&
-		M2=$(git hash-object test2.r) &&
-		M3=$(git hash-object "testsubdir/test3 'sq',\$x=.r") &&
-		EMPTY=$(git hash-object /dev/null) &&
-
-		MAIN=$(git rev-parse --verify main) &&
-
-		cp "$TEST_ROOT/test.o" test5.r &&
-		git add test5.r &&
-		git commit -m "test commit 3" &&
-		git checkout empty-branch &&
-		filter_git rebase --onto empty-branch main^^ main &&
-		MAIN2=$(git rev-parse --verify main) &&
-		META="ref=refs/heads/main treeish=$MAIN2" &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		git reset --hard empty-branch &&
-		filter_git reset --hard $MAIN &&
-		META="treeish=$MAIN" &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		git branch old-main $MAIN &&
-		git reset --hard empty-branch &&
-		filter_git reset --hard old-main &&
-		META="ref=refs/heads/old-main treeish=$MAIN" &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		git checkout -b merge empty-branch &&
-		git branch -f main $MAIN2 &&
-		filter_git merge main &&
-		META="treeish=$MAIN2" &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		filter_git archive main >/dev/null &&
-		META="ref=refs/heads/main treeish=$MAIN2" &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		TREE="$(git rev-parse $MAIN2^{tree})" &&
-		filter_git archive $TREE >/dev/null &&
-		META="treeish=$TREE" &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log
-	)
-
-[main 07631f7] test commit 3
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 test5.r
-Switched to branch 'empty-branch'
-Current branch main is up to date.
-HEAD is now at 56d459b test commit 1
-HEAD is now at 9ea74df test commit 2
-HEAD is now at 56d459b test commit 1
-HEAD is now at 9ea74df test commit 2
-Switched to a new branch 'merge'
-Updating 56d459b..07631f7
-Fast-forward
- test.r                      | 3 +++
- test2.r                     | 1 +
- test4-empty.r               | 0
- test5.r                     | 3 +++
- testsubdir/test3 'sq',$x=.r | 1 +
- 5 files changed, 8 insertions(+)
- create mode 100644 test.r
- create mode 100644 test2.r
- create mode 100644 test4-empty.r
- create mode 100644 test5.r
- create mode 100644 testsubdir/test3 'sq',$x=.r
-ok 18 - required process filter should filter data for various subcommands
-
-expecting success of 0021.19 'required process filter takes precedence': 
-	test_config_global filter.protocol.clean false &&
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean" &&
-	test_config_global filter.protocol.required true &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-		cp "$TEST_ROOT/test.o" test.r &&
-		S=$(test_file_size test.r) &&
-
-		# Check that the process filter is invoked here
-		filter_git add . &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: clean test.r $S [OK] -- OUT: $S . [OK]
-			STOP
-		EOF
-		test_cmp_count expected.log debug.log
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
-ok 19 - required process filter takes precedence
-
-expecting success of 0021.20 'required process filter should be used only for "clean" operation only': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean" &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-		cp "$TEST_ROOT/test.o" test.r &&
-		S=$(test_file_size test.r) &&
-
-		filter_git add . &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: clean test.r $S [OK] -- OUT: $S . [OK]
-			STOP
-		EOF
-		test_cmp_count expected.log debug.log &&
-
-		rm test.r &&
-
-		filter_git checkout --quiet --no-progress . &&
-		# If the filter would be used for "smudge", too, we would see
-		# "IN: smudge test.r 57 [OK] -- OUT: 57 . [OK]" here
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
-ok 20 - required process filter should be used only for "clean" operation only
-
-expecting success of 0021.21 'required process filter should process multiple packets': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	test_config_global filter.protocol.required true &&
-
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		# Generate data requiring 1, 2, 3 packets
-		S=65516 && # PKTLINE_DATA_MAXLEN -> Maximal size of a packet
-		generate_random_characters $(($S    )) 1pkt_1__.file &&
-		generate_random_characters $(($S  +1)) 2pkt_1+1.file &&
-		generate_random_characters $(($S*2-1)) 2pkt_2-1.file &&
-		generate_random_characters $(($S*2  )) 2pkt_2__.file &&
-		generate_random_characters $(($S*2+1)) 3pkt_2+1.file &&
-
-		for FILE in "$TEST_ROOT"/*.file
-		do
-			cp "$FILE" . &&
-			rot13.sh <"$FILE" >"$FILE.rot13" || return 1
-		done &&
-
-		echo "*.file filter=protocol" >.gitattributes &&
-		filter_git add *.file .gitattributes &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: clean 1pkt_1__.file $(($S    )) [OK] -- OUT: $(($S    )) . [OK]
-			IN: clean 2pkt_1+1.file $(($S  +1)) [OK] -- OUT: $(($S  +1)) .. [OK]
-			IN: clean 2pkt_2-1.file $(($S*2-1)) [OK] -- OUT: $(($S*2-1)) .. [OK]
-			IN: clean 2pkt_2__.file $(($S*2  )) [OK] -- OUT: $(($S*2  )) .. [OK]
-			IN: clean 3pkt_2+1.file $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK]
-			STOP
-		EOF
-		test_cmp_count expected.log debug.log &&
-
-		M1="blob=$(git hash-object 1pkt_1__.file)" &&
-		M2="blob=$(git hash-object 2pkt_1+1.file)" &&
-		M3="blob=$(git hash-object 2pkt_2-1.file)" &&
-		M4="blob=$(git hash-object 2pkt_2__.file)" &&
-		M5="blob=$(git hash-object 3pkt_2+1.file)" &&
-		rm -f *.file debug.log &&
-
-		filter_git checkout --quiet --no-progress -- *.file &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge 1pkt_1__.file $M1 $(($S    )) [OK] -- OUT: $(($S    )) . [OK]
-			IN: smudge 2pkt_1+1.file $M2 $(($S  +1)) [OK] -- OUT: $(($S  +1)) .. [OK]
-			IN: smudge 2pkt_2-1.file $M3 $(($S*2-1)) [OK] -- OUT: $(($S*2-1)) .. [OK]
-			IN: smudge 2pkt_2__.file $M4 $(($S*2  )) [OK] -- OUT: $(($S*2  )) .. [OK]
-			IN: smudge 3pkt_2+1.file $M5 $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		for FILE in *.file
-		do
-			test_cmp_committed_rot13 "$TEST_ROOT/$FILE" $FILE || return 1
-		done
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
-ok 21 - required process filter should process multiple packets
-
-expecting success of 0021.22 'required process filter with clean error should fail': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	test_config_global filter.protocol.required true &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-
-		cp "$TEST_ROOT/test.o" test.r &&
-		echo "this is going to fail" >clean-write-fail.r &&
-		echo "content-test3-subdir" >test3.r &&
-
-		test_must_fail git add .
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
-fatal: clean write error
-error: external filter 'test-tool rot13-filter --log=debug.log clean smudge' failed
-fatal: clean-write-fail.r: clean filter 'protocol' failed
-ok 22 - required process filter with clean error should fail
-
-expecting success of 0021.23 'process filter should restart after unexpected write failure': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-
-		cp "$TEST_ROOT/test.o" test.r &&
-		cp "$TEST_ROOT/test2.o" test2.r &&
-		echo "this is going to fail" >smudge-write-fail.o &&
-		cp smudge-write-fail.o smudge-write-fail.r &&
-
-		S=$(test_file_size test.r) &&
-		S2=$(test_file_size test2.r) &&
-		SF=$(test_file_size smudge-write-fail.r) &&
-		M=$(git hash-object test.r) &&
-		M2=$(git hash-object test2.r) &&
-		MF=$(git hash-object smudge-write-fail.r) &&
-		rm -f debug.log &&
-
-		git add . &&
-		rm -f *.r &&
-
-		rm -f debug.log &&
-		git checkout --quiet --no-progress . 2>git-stderr.log &&
-
-		grep "smudge write error" git-stderr.log &&
-		test_grep "error: external filter" git-stderr.log &&
-
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge smudge-write-fail.r blob=$MF $SF [OK] -- [WRITE FAIL]
-			START
-			init handshake complete
-			IN: smudge test.r blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r &&
-
-		# Smudge failed
-		! test_cmp smudge-write-fail.o smudge-write-fail.r &&
-		rot13.sh <smudge-write-fail.o >expected &&
-		git cat-file blob :smudge-write-fail.r >actual &&
-		test_cmp expected actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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	2025-08-27 08:19:50.911209750 +0000
-+++ smudge-write-fail.r	2025-08-27 08:19:51.027210515 +0000
-@@ -1 +1 @@
--this is going to fail
-+guvf vf tbvat gb snvy
-ok 23 - process filter should restart after unexpected write failure
-
-expecting success of 0021.24 'process filter should not be restarted if it signals an error': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-
-		cp "$TEST_ROOT/test.o" test.r &&
-		cp "$TEST_ROOT/test2.o" test2.r &&
-		echo "this will cause an error" >error.o &&
-		cp error.o error.r &&
-
-		S=$(test_file_size test.r) &&
-		S2=$(test_file_size test2.r) &&
-		SE=$(test_file_size error.r) &&
-		M=$(git hash-object test.r) &&
-		M2=$(git hash-object test2.r) &&
-		ME=$(git hash-object error.r) &&
-		rm -f debug.log &&
-
-		git add . &&
-		rm -f *.r &&
-
-		filter_git checkout --quiet --no-progress . &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge error.r blob=$ME $SE [OK] -- [ERROR]
-			IN: smudge test.r blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r &&
-		test_cmp error.o error.r
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
-ok 24 - process filter should not be restarted if it signals an error
-
-expecting success of 0021.25 'process filter abort stops processing of all further files': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-
-		cp "$TEST_ROOT/test.o" test.r &&
-		cp "$TEST_ROOT/test2.o" test2.r &&
-		echo "error this blob and all future blobs" >abort.o &&
-		cp abort.o abort.r &&
-
-		M="blob=$(git hash-object abort.r)" &&
-		rm -f debug.log &&
-		SA=$(test_file_size abort.r) &&
-
-		git add . &&
-		rm -f *.r &&
-
-
-		# Note: This test assumes that Git filters files in alphabetical
-		# order ("abort.r" before "test.r").
-		filter_git checkout --quiet --no-progress . &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge abort.r $M $SA [OK] -- [ABORT]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		test_cmp "$TEST_ROOT/test.o" test.r &&
-		test_cmp "$TEST_ROOT/test2.o" test2.r &&
-		test_cmp abort.o abort.r
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
-ok 25 - process filter abort stops processing of all further files
-
-expecting success of 0021.26 'invalid process filter must fail (and not hang!)': 
-	test_config_global filter.protocol.process cat &&
-	test_config_global filter.protocol.required true &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-
-		cp "$TEST_ROOT/test.o" test.r &&
-		test_must_fail git add . 2>git-stderr.log &&
-		grep "expected git-filter-server" git-stderr.log
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
-error: Unexpected line 'git-filter-client', expected git-filter-server
-ok 26 - invalid process filter must fail (and not hang!)
-
-expecting success of 0021.27 'delayed checkout in process filter': 
-	test_config_global filter.a.process "test-tool rot13-filter --log=a.log clean smudge delay" &&
-	test_config_global filter.a.required true &&
-	test_config_global filter.b.process "test-tool rot13-filter --log=b.log clean smudge delay" &&
-	test_config_global filter.b.required true &&
-
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		echo "*.a filter=a" >.gitattributes &&
-		echo "*.b filter=b" >>.gitattributes &&
-		cp "$TEST_ROOT/test.o" test.a &&
-		cp "$TEST_ROOT/test.o" test-delay10.a &&
-		cp "$TEST_ROOT/test.o" test-delay11.a &&
-		cp "$TEST_ROOT/test.o" test-delay20.a &&
-		cp "$TEST_ROOT/test.o" test-delay10.b &&
-		git add . &&
-		git commit -m "test commit"
-	) &&
-
-	S=$(test_file_size "$TEST_ROOT/test.o") &&
-	PM="ref=refs/heads/main treeish=$(git -C repo rev-parse --verify main) " &&
-	M="${PM}blob=$(git -C repo rev-parse --verify main:test.a)" &&
-	cat >a.exp <<-EOF &&
-		START
-		init handshake complete
-		IN: smudge test.a $M $S [OK] -- OUT: $S . [OK]
-		IN: smudge test-delay10.a $M $S [OK] -- [DELAYED]
-		IN: smudge test-delay11.a $M $S [OK] -- [DELAYED]
-		IN: smudge test-delay20.a $M $S [OK] -- [DELAYED]
-		IN: list_available_blobs test-delay10.a test-delay11.a [OK]
-		IN: smudge test-delay10.a $M 0 [OK] -- OUT: $S . [OK]
-		IN: smudge test-delay11.a $M 0 [OK] -- OUT: $S . [OK]
-		IN: list_available_blobs test-delay20.a [OK]
-		IN: smudge test-delay20.a $M 0 [OK] -- OUT: $S . [OK]
-		IN: list_available_blobs [OK]
-		STOP
-	EOF
-	cat >b.exp <<-EOF &&
-		START
-		init handshake complete
-		IN: smudge test-delay10.b $M $S [OK] -- [DELAYED]
-		IN: list_available_blobs test-delay10.b [OK]
-		IN: smudge test-delay10.b $M 0 [OK] -- OUT: $S . [OK]
-		IN: list_available_blobs [OK]
-		STOP
-	EOF
-
-	rm -rf repo-cloned &&
-	filter_git clone repo repo-cloned &&
-	test_cmp_count a.exp repo-cloned/a.log &&
-	test_cmp_count b.exp repo-cloned/b.log &&
-
-	(
-		cd repo-cloned &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay11.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay20.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.b &&
-
-		rm *.a *.b &&
-		filter_git checkout . &&
-		# We are not checking out a ref here, so filter out ref metadata.
-		sed -e "s!$PM!!" ../a.exp >a.exp.filtered &&
-		sed -e "s!$PM!!" ../b.exp >b.exp.filtered &&
-		test_cmp_count a.exp.filtered a.log &&
-		test_cmp_count b.exp.filtered b.log &&
-
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay11.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay20.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.b
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
-[main (root-commit) 27d7fe8] test commit
- Author: A U Thor <author@example.com>
- 6 files changed, 17 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 test-delay10.a
- create mode 100644 test-delay10.b
- create mode 100644 test-delay11.a
- create mode 100644 test-delay20.a
- create mode 100644 test.a
-Cloning into 'repo-cloned'...
-done.
-Updated 5 paths from the index
-ok 27 - delayed checkout in process filter
-
-expecting success of 0021.28 'missing file in delayed checkout': 
-	test_config_global filter.bug.process "test-tool rot13-filter --log=bug.log clean smudge delay" &&
-	test_config_global filter.bug.required true &&
-
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		echo "*.a filter=bug" >.gitattributes &&
-		cp "$TEST_ROOT/test.o" missing-delay.a &&
-		git add . &&
-		git commit -m "test commit"
-	) &&
-
-	rm -rf repo-cloned &&
-	test_must_fail git clone repo repo-cloned 2>git-stderr.log &&
-	grep "error: .missing-delay\.a. was not filtered properly" git-stderr.log
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
-[main (root-commit) 5567259] test commit
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 missing-delay.a
-error: 'missing-delay.a' was not filtered properly
-ok 28 - missing file in delayed checkout
-
-expecting success of 0021.29 'invalid file in delayed checkout': 
-	test_config_global filter.bug.process "test-tool rot13-filter --log=bug.log clean smudge delay" &&
-	test_config_global filter.bug.required true &&
-
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		echo "*.a filter=bug" >.gitattributes &&
-		cp "$TEST_ROOT/test.o" invalid-delay.a &&
-		cp "$TEST_ROOT/test.o" unfiltered &&
-		git add . &&
-		git commit -m "test commit"
-	) &&
-
-	rm -rf repo-cloned &&
-	test_must_fail git clone repo repo-cloned 2>git-stderr.log &&
-	grep "error: external filter .* signaled that .unfiltered. is now available although it has not been delayed earlier" git-stderr.log
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
-[main (root-commit) 636012f] test commit
- Author: A U Thor <author@example.com>
- 3 files changed, 7 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 invalid-delay.a
- create mode 100644 unfiltered
-error: external filter 'test-tool rot13-filter --log=bug.log clean smudge delay' signaled that 'unfiltered' is now available although it has not been delayed earlier
-ok 29 - invalid file in delayed checkout
-
-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: 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 30 # skip delayed checkout with case-collision don't write to the wrong place (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
-
-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
-ok 31 # skip delayed checkout with utf-8-collision don't write to the wrong place (missing UTF8_NFD_TO_NFC of SYMLINKS,UTF8_NFD_TO_NFC)
-
-ok 32 # skip delayed checkout with submodule collision don't write to the wrong place (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
-
-expecting success of 0021.33 'setup for progress tests': 
-	git init progress &&
-	(
-		cd progress &&
-		git config filter.delay.process "test-tool rot13-filter --log=delay-progress.log clean smudge delay" &&
-		git config filter.delay.required true &&
-
-		echo "*.a filter=delay" >.gitattributes &&
-		touch test-delay10.a &&
-		git add . &&
-		git commit -m files
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/progress/.git/
-[main (root-commit) 36dc8bf] files
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 .gitattributes
- create mode 100644 test-delay10.a
-ok 33 - setup for progress tests
-
-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 0021.34 'delayed checkout shows progress by default on tty (pathspec checkout)': 
-		test_delayed_checkout_progress test_terminal git checkout $opt
-	
-IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
-ok 34 - delayed checkout shows progress by default on tty (pathspec checkout)
-
-expecting success of 0021.35 'delayed checkout omits progress on non-tty (pathspec checkout)': 
-		test_delayed_checkout_progress ! git checkout $opt
-	
-IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-ok 35 - delayed checkout omits progress on non-tty (pathspec checkout)
-
-expecting success of 0021.36 'delayed checkout omits progress with --quiet (pathspec checkout)': 
-		test_delayed_checkout_progress ! test_terminal git checkout --quiet $opt
-	
-IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-ok 36 - delayed checkout omits progress with --quiet (pathspec checkout)
-
-expecting success of 0021.37 'delayed checkout honors --[no]-progress (pathspec checkout)': 
-		test_delayed_checkout_progress ! test_terminal git checkout --no-progress $opt &&
-		test_delayed_checkout_progress test_terminal git checkout --quiet --progress $opt
-	
-IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
-ok 37 - delayed checkout honors --[no]-progress (pathspec checkout)
-
-expecting success of 0021.38 'delayed checkout shows progress by default on tty (branch checkout)': 
-		test_delayed_checkout_progress test_terminal git checkout $opt
-	
-IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
-ok 38 - delayed checkout shows progress by default on tty (branch checkout)
-
-expecting success of 0021.39 'delayed checkout omits progress on non-tty (branch checkout)': 
-		test_delayed_checkout_progress ! git checkout $opt
-	
-IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-ok 39 - delayed checkout omits progress on non-tty (branch checkout)
-
-expecting success of 0021.40 'delayed checkout omits progress with --quiet (branch checkout)': 
-		test_delayed_checkout_progress ! test_terminal git checkout --quiet $opt
-	
-IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-ok 40 - delayed checkout omits progress with --quiet (branch checkout)
-
-expecting success of 0021.41 'delayed checkout honors --[no]-progress (branch checkout)': 
-		test_delayed_checkout_progress ! test_terminal git checkout --no-progress $opt &&
-		test_delayed_checkout_progress test_terminal git checkout --quiet --progress $opt
-	
-IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
-ok 41 - delayed checkout honors --[no]-progress (branch checkout)
-
-expecting success of 0021.42 'delayed checkout correctly reports the number of updated entries': 
-	rm -rf repo &&
-	git init repo &&
-	(
-		cd repo &&
-		git config filter.delay.process "test-tool rot13-filter --log=delayed.log clean smudge delay" &&
-		git config filter.delay.required true &&
-
-		echo "*.a filter=delay" >.gitattributes &&
-		echo a >test-delay10.a &&
-		echo a >test-delay11.a &&
-		git add . &&
-		git commit -m files &&
-
-		rm *.a &&
-		git checkout . 2>err &&
-		grep "IN: smudge test-delay10.a .* \\[DELAYED\\]" delayed.log &&
-		grep "IN: smudge test-delay11.a .* \\[DELAYED\\]" delayed.log &&
-		grep "Updated 2 paths from the index" err
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0021-conversion/repo/.git/
-[main (root-commit) 6d52fcb] files
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 test-delay10.a
- create mode 100644 test-delay11.a
-IN: smudge test-delay10.a blob=8ba3a16384aacc37d01564b28401755ce8053f51 2 [OK] -- [DELAYED]
-IN: smudge test-delay11.a blob=8ba3a16384aacc37d01564b28401755ce8053f51 2 [OK] -- [DELAYED]
-Updated 2 paths from the index
-ok 42 - delayed checkout correctly reports the number of updated entries
-
-# passed all 42 test(s)
-1..42
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0500-progress-display.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0500-progress-display/.git/
-expecting success of 0500.1 'simple progress display': 
-	cat >expect <<-\EOF &&
-	Working hard: 1<CR>
-	Working hard: 2<CR>
-	Working hard: 5<CR>
-	Working hard: 5, done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 0
-	update
-	progress 1
-	update
-	progress 2
-	progress 3
-	progress 4
-	update
-	progress 5
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 1 - simple progress display
-
-expecting success of 0500.2 'progress display with total': 
-	cat >expect <<-\EOF &&
-	Working hard:  33% (1/3)<CR>
-	Working hard:  66% (2/3)<CR>
-	Working hard: 100% (3/3)<CR>
-	Working hard: 100% (3/3), done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 3
-	progress 1
-	progress 2
-	progress 3
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 2 - progress display with total
-
-expecting success of 0500.3 'progress display breaks long lines #1': 
-	sed -e "s/Z$//" >expect <<\EOF &&
-Working hard.......2.........3.........4.........5.........6:   0% (100/100000)<CR>
-Working hard.......2.........3.........4.........5.........6:   1% (1000/100000)<CR>
-Working hard.......2.........3.........4.........5.........6:                   Z
-   10% (10000/100000)<CR>
-  100% (100000/100000)<CR>
-  100% (100000/100000), done.
-EOF
-
-	cat >in <<-\EOF &&
-	start 100000 Working hard.......2.........3.........4.........5.........6
-	progress 100
-	progress 1000
-	progress 10000
-	progress 100000
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 3 - progress display breaks long lines #1
-
-expecting success of 0500.4 'progress display breaks long lines #2': 
-	# Note: we do not need that many spaces after the title to cover up
-	# the last line before breaking the progress line.
-	sed -e "s/Z$//" >expect <<\EOF &&
-Working hard.......2.........3.........4.........5.........6:   0% (1/100000)<CR>
-Working hard.......2.........3.........4.........5.........6:   0% (2/100000)<CR>
-Working hard.......2.........3.........4.........5.........6:                   Z
-   10% (10000/100000)<CR>
-  100% (100000/100000)<CR>
-  100% (100000/100000), done.
-EOF
-
-	cat >in <<-\EOF &&
-	start 100000 Working hard.......2.........3.........4.........5.........6
-	update
-	progress 1
-	update
-	progress 2
-	progress 10000
-	progress 100000
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 4 - progress display breaks long lines #2
-
-expecting success of 0500.5 'progress display breaks long lines #3 - even the first is too long': 
-	# Note: we do not actually need any spaces at the end of the title
-	# line, because there is no previous progress line to cover up.
-	sed -e "s/Z$//" >expect <<\EOF &&
-Working hard.......2.........3.........4.........5.........6:                   Z
-   25% (25000/100000)<CR>
-   50% (50000/100000)<CR>
-   75% (75000/100000)<CR>
-  100% (100000/100000)<CR>
-  100% (100000/100000), done.
-EOF
-
-	cat >in <<-\EOF &&
-	start 100000 Working hard.......2.........3.........4.........5.........6
-	progress 25000
-	progress 50000
-	progress 75000
-	progress 100000
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 5 - progress display breaks long lines #3 - even the first is too long
-
-expecting success of 0500.6 'progress display breaks long lines #4 - title line matches terminal width': 
-	cat >expect <<\EOF &&
-Working hard.......2.........3.........4.........5.........6.........7.........:
-   25% (25000/100000)<CR>
-   50% (50000/100000)<CR>
-   75% (75000/100000)<CR>
-  100% (100000/100000)<CR>
-  100% (100000/100000), done.
-EOF
-
-	cat >in <<-\EOF &&
-	start 100000 Working hard.......2.........3.........4.........5.........6.........7.........
-	progress 25000
-	progress 50000
-	progress 75000
-	progress 100000
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 6 - progress display breaks long lines #4 - title line matches terminal width
-
-expecting success of 0500.7 'progress shortens - crazy caller': 
-	cat >expect <<-\EOF &&
-	Working hard:  10% (100/1000)<CR>
-	Working hard:  20% (200/1000)<CR>
-	Working hard:   0% (1/1000)  <CR>
-	Working hard: 100% (1000/1000)<CR>
-	Working hard: 100% (1000/1000), done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 1000
-	progress 100
-	progress 200
-	progress 1
-	progress 1000
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 7 - progress shortens - crazy caller
-
-expecting success of 0500.8 'progress display with throughput': 
-	cat >expect <<-\EOF &&
-	Working hard: 10<CR>
-	Working hard: 20, 200.00 KiB | 100.00 KiB/s<CR>
-	Working hard: 30, 300.00 KiB | 100.00 KiB/s<CR>
-	Working hard: 40, 400.00 KiB | 100.00 KiB/s<CR>
-	Working hard: 40, 400.00 KiB | 100.00 KiB/s, done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 0
-	throughput 102400 1000
-	update
-	progress 10
-	throughput 204800 2000
-	update
-	progress 20
-	throughput 307200 3000
-	update
-	progress 30
-	throughput 409600 4000
-	update
-	progress 40
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 8 - progress display with throughput
-
-expecting success of 0500.9 'progress display with throughput and total': 
-	cat >expect <<-\EOF &&
-	Working hard:  25% (10/40)<CR>
-	Working hard:  50% (20/40), 200.00 KiB | 100.00 KiB/s<CR>
-	Working hard:  75% (30/40), 300.00 KiB | 100.00 KiB/s<CR>
-	Working hard: 100% (40/40), 400.00 KiB | 100.00 KiB/s<CR>
-	Working hard: 100% (40/40), 400.00 KiB | 100.00 KiB/s, done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 40
-	throughput 102400 1000
-	progress 10
-	throughput 204800 2000
-	progress 20
-	throughput 307200 3000
-	progress 30
-	throughput 409600 4000
-	progress 40
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 9 - progress display with throughput and total
-
-expecting success of 0500.10 'cover up after throughput shortens': 
-	cat >expect <<-\EOF &&
-	Working hard: 1<CR>
-	Working hard: 2, 800.00 KiB | 400.00 KiB/s<CR>
-	Working hard: 3, 1.17 MiB | 400.00 KiB/s  <CR>
-	Working hard: 4, 1.56 MiB | 400.00 KiB/s<CR>
-	Working hard: 4, 1.56 MiB | 400.00 KiB/s, done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 0
-	throughput 409600 1000
-	update
-	progress 1
-	throughput 819200 2000
-	update
-	progress 2
-	throughput 1228800 3000
-	update
-	progress 3
-	throughput 1638400 4000
-	update
-	progress 4
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 10 - cover up after throughput shortens
-
-expecting success of 0500.11 'cover up after throughput shortens a lot': 
-	cat >expect <<-\EOF &&
-	Working hard: 1<CR>
-	Working hard: 2, 1000.00 KiB | 1000.00 KiB/s<CR>
-	Working hard: 3, 3.00 MiB | 1.50 MiB/s      <CR>
-	Working hard: 3, 3.00 MiB | 1024.00 KiB/s, done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 0
-	throughput 1 1000
-	update
-	progress 1
-	throughput 1024000 2000
-	update
-	progress 2
-	throughput 3145728 3000
-	update
-	progress 3
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 11 - cover up after throughput shortens a lot
-
-expecting success of 0500.12 'progress generates traces': 
-	cat >in <<-\EOF &&
-	start 40
-	throughput 102400 1000
-	update
-	progress 10
-	throughput 204800 2000
-	update
-	progress 20
-	throughput 307200 3000
-	update
-	progress 30
-	throughput 409600 4000
-	update
-	progress 40
-	stop
-	EOF
-
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool progress \
-		<in 2>stderr &&
-
-	# t0212/parse_events.perl intentionally omits regions and data.
-	test_region progress "Working hard" trace.event &&
-	grep "\"key\":\"total_objects\",\"value\":\"40\"" trace.event &&
-	grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event
-
-{"event":"region_enter","sid":"20250827T081954.158983Z-Hcf858c9d-P00059de1","thread":"main","time":"2025-08-27T08:19:54.159373Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"region_leave","sid":"20250827T081954.158983Z-Hcf858c9d-P00059de1","thread":"main","time":"2025-08-27T08:19:54.159415Z","file":"progress.c","line":357,"repo":0,"t_rel":0.000042,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"data","sid":"20250827T081954.158983Z-Hcf858c9d-P00059de1","thread":"main","time":"2025-08-27T08:19:54.159401Z","file":"progress.c","line":350,"repo":0,"t_abs":0.000598,"t_rel":0.000028,"nesting":2,"category":"progress","key":"total_objects","value":"40"}
-{"event":"data","sid":"20250827T081954.158983Z-Hcf858c9d-P00059de1","thread":"main","time":"2025-08-27T08:19:54.159410Z","file":"progress.c","line":354,"repo":0,"t_abs":0.000607,"t_rel":0.000037,"nesting":2,"category":"progress","key":"total_bytes","value":"409600"}
-ok 12 - progress generates traces
-
-expecting success of 0500.13 'progress generates traces: stop / start': 
-	cat >in <<-\EOF &&
-	start 0
-	stop
-	EOF
-
-	GIT_TRACE2_EVENT="$PWD/trace-startstop.event" test-tool progress \
-		<in 2>stderr &&
-	test_region progress "Working hard" trace-startstop.event
-
-{"event":"region_enter","sid":"20250827T081954.183908Z-Hcf858c9d-P00059e35","thread":"main","time":"2025-08-27T08:19:54.184278Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"region_leave","sid":"20250827T081954.183908Z-Hcf858c9d-P00059e35","thread":"main","time":"2025-08-27T08:19:54.184292Z","file":"progress.c","line":357,"repo":0,"t_rel":0.000014,"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': 
-	cat >in <<-\EOF &&
-	start 0
-	EOF
-
-	GIT_TRACE2_EVENT="$PWD/trace-start.event" \
-	LSAN_OPTIONS=detect_leaks=0 \
-	test-tool progress \
-		<in 2>stderr &&
-	grep region_enter.*progress trace-start.event &&
-	! grep region_leave.*progress trace-start.event
-
-{"event":"region_enter","sid":"20250827T081954.205087Z-Hcf858c9d-P00059e5b","thread":"main","time":"2025-08-27T08:19:54.205502Z","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': 
-	cat >in <<-\EOF &&
-	stop
-	EOF
-
-	GIT_TRACE2_EVENT="$PWD/trace-stop.event" test-tool progress \
-		<in 2>stderr &&
-	! grep region_enter.*progress trace-stop.event &&
-	! grep region_leave.*progress trace-stop.event
-
-ok 15 - progress generates traces: stop without start
-
-expecting success of 0500.16 'progress generates traces: start with active progress bar (no stops)': 
-	cat >in <<-\EOF &&
-	start 0 One
-	start 0 Two
-	EOF
-
-	GIT_TRACE2_EVENT="$PWD/trace-2start.event" \
-	LSAN_OPTIONS=detect_leaks=0 \
-	test-tool progress \
-		<in 2>stderr &&
-	grep region_enter.*progress.*One trace-2start.event &&
-	grep region_enter.*progress.*Two trace-2start.event &&
-	! grep region_leave trace-2start.event
-
-{"event":"region_enter","sid":"20250827T081954.235831Z-Hcf858c9d-P00059eb3","thread":"main","time":"2025-08-27T08:19:54.236213Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"One"}
-{"event":"region_enter","sid":"20250827T081954.235831Z-Hcf858c9d-P00059eb3","thread":"main","time":"2025-08-27T08:19:54.236217Z","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)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0300-credentials.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0300-credentials/.git/
 expecting success of 0300.1 'setup helper scripts': 
@@ -33325,492 +34262,6 @@
 1..56
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0303-credential-external.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0303-credential-external/.git/
-expecting success of 0303.1 '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 1 - helper (store) has no existing data
-
-expecting success of 0303.2 'helper (store) stores password': 
-		check approve $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=store-user
-		password=store-pass
-		EOF
-	
-ok 2 - helper (store) stores password
-
-expecting success of 0303.3 '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 3 - helper (store) can retrieve password
-
-expecting success of 0303.4 '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 4 - helper (store) requires matching protocol
-
-expecting success of 0303.5 '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 5 - helper (store) requires matching host
-
-expecting success of 0303.6 '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 6 - helper (store) requires matching username
-
-expecting success of 0303.7 '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 7 - helper (store) requires matching path
-
-expecting success of 0303.8 '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 8 - helper (store) overwrites on store
-
-expecting success of 0303.9 '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 9 - helper (store) can forget host
-
-expecting success of 0303.10 '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 10 - helper (store) can store multiple users
-
-expecting success of 0303.11 '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 11 - helper (store) does not erase a password distinct from input
-
-expecting success of 0303.12 '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 12 - helper (store) can forget user
-
-expecting success of 0303.13 '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 13 - helper (store) remembers other user
-
-expecting success of 0303.14 '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 14 - helper (store) can store empty username
-
-expecting success of 0303.15 '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 15 - helper (store) erases all matching credentials
-
-expecting success of 0303.16 '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 16 - helper (store) not confused by long header
-
-expecting success of 0303.17 'helper (store) 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 (store) stores password_expiry_utc
-
-expecting success of 0303.18 'helper (store) 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 (store) gets password_expiry_utc
-
-expecting success of 0303.19 'helper (store) 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 (store) overwrites when password_expiry_utc changes
-
-expecting success of 0303.20 'helper (store) 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 (store) stores oauth_refresh_token
-
-expecting success of 0303.21 'helper (store) 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 (store) gets oauth_refresh_token
-
-expecting success of 0303.22 'helper (store) 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 22 - helper (store) times out
-
-expecting success of 0303.23 'test cleanup removes everything': 
-		test_must_be_empty "$HOME/.git-credentials"
-	
-ok 23 - test cleanup removes everything
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0302-credential-store.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0302-credential-store/.git/
 expecting success of 0302.1 'helper (store) has no existing data': 
@@ -35162,14 +35613,14 @@
 	jgit --version
 
 )
-t0612-reftable-jgit-compatibility.sh: 7: eval: jgit: not found
+./test-lib.sh: line 1006: 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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0301-credential-cache.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0301-credential-cache/.git/
-expecting success of 0301.1 'helper (cache) has no existing data': 
+*** t0303-credential-external.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0303-credential-external/.git/
+expecting success of 0303.1 'helper (store) has no existing data': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35183,9 +35634,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 0303.2 'helper (store) stores password': 
 		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35193,9 +35644,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 0303.3 'helper (store) can retrieve password': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35207,9 +35658,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 0303.4 'helper (store) requires matching protocol': 
 		check fill $HELPER <<-\EOF
 		protocol=http
 		host=example.com
@@ -35223,9 +35674,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 0303.5 'helper (store) requires matching host': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=other.tld
@@ -35239,9 +35690,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 0303.6 'helper (store) requires matching username': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35255,9 +35706,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 0303.7 'helper (store) requires matching path': 
 		test_config credential.usehttppath true &&
 		check approve $HELPER <<-\EOF &&
 		protocol=http
@@ -35281,9 +35732,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 0303.8 'helper (store) overwrites on store': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35325,9 +35776,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 0303.9 'helper (store) can forget host': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35345,9 +35796,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 0303.10 'helper (store) can store multiple users': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35381,9 +35832,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 0303.11 'helper (store) does not erase a password distinct from input': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35407,9 +35858,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 0303.12 'helper (store) can forget user': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35428,9 +35879,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 0303.13 'helper (store) remembers other user': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35442,9 +35893,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 0303.14 'helper (store) can store empty username': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=sso.tld
@@ -35461,9 +35912,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 0303.15 'helper (store) erases all matching credentials': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35493,9 +35944,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 0303.16 'helper (store) not confused by long header': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=victim.example.com
@@ -35518,9 +35969,9 @@
 		askpass: Password for 'https://askpass-username@badguy.example.com':
 		EOF
 	
-ok 16 - helper (cache) not confused by long header
+ok 16 - helper (store) not confused by long header
 
-expecting success of 0301.17 'helper (cache) stores password_expiry_utc': 
+expecting success of 0303.17 'helper (store) stores password_expiry_utc': 
 		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35529,9 +35980,9 @@
 		password_expiry_utc=9999999999
 		EOF
 	
-ok 17 - helper (cache) stores password_expiry_utc
+ok 17 - helper (store) stores password_expiry_utc
 
-expecting success of 0301.18 'helper (cache) gets password_expiry_utc': 
+expecting success of 0303.18 'helper (store) gets password_expiry_utc': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35545,9 +35996,9 @@
 		--
 		EOF
 	
-ok 18 - helper (cache) gets password_expiry_utc
+ok 18 - helper (store) gets password_expiry_utc
 
-expecting success of 0301.19 'helper (cache) overwrites when password_expiry_utc changes': 
+expecting success of 0303.19 'helper (store) overwrites when password_expiry_utc changes': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35592,9 +36043,9 @@
 		askpass: Password for 'https://user-expiry-overwrite@example.com':
 		EOF
 	
-ok 19 - helper (cache) overwrites when password_expiry_utc changes
+ok 19 - helper (store) overwrites when password_expiry_utc changes
 
-expecting success of 0301.20 'helper (cache) stores oauth_refresh_token': 
+expecting success of 0303.20 'helper (store) stores oauth_refresh_token': 
 		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35603,9 +36054,9 @@
 		oauth_refresh_token=xyzzy
 		EOF
 	
-ok 20 - helper (cache) stores oauth_refresh_token
+ok 20 - helper (store) stores oauth_refresh_token
 
-expecting success of 0301.21 'helper (cache) gets oauth_refresh_token': 
+expecting success of 0303.21 'helper (store) gets oauth_refresh_token': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35619,1679 +36070,146 @@
 		--
 		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
+ok 21 - helper (store) gets oauth_refresh_token
 
-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
+expecting success of 0303.22 'helper (store) times out': 
+		check approve "$HELPER" <<-\EOF &&
 		protocol=https
-		host=git.example.com
-		--
+		host=timeout.tld
+		username=user
+		password=pass
 		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
+		sleep 2 &&
+		check fill "$HELPER" <<-\EOF
 		protocol=https
-		host=git.example.com
+		host=timeout.tld
 		--
 		protocol=https
-		host=git.example.com
+		host=timeout.tld
 		username=askpass-username
 		password=askpass-password
 		--
-		askpass: Username for 'https://git.example.com':
-		askpass: Password for 'https://askpass-username@git.example.com':
+		askpass: Username for 'https://timeout.tld':
+		askpass: Password for 'https://askpass-username@timeout.tld':
 		EOF
 	
-ok 24 - helper (cache) gets authtype and credential only if request has authtype capability
+ok 22 - helper (store) times out
 
-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
+expecting success of 0303.23 'test cleanup removes everything': 
+		test_must_be_empty "$HOME/.git-credentials"
 	
-ok 25 - helper (cache) stores authtype and credential with username
+ok 23 - test cleanup removes everything
 
-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
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0602-reffiles-fsck.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0602-reffiles-fsck/.git/
+expecting success of 0602.1 'ref name should be checked': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	branch_dir_prefix=.git/refs/heads &&
+	tag_dir_prefix=.git/refs/tags &&
+	(
+		cd repo &&
 
-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
+		git commit --allow-empty -m initial &&
+		git checkout -b default-branch &&
+		git tag default-tag &&
+		git tag multi_hierarchy/default-tag &&
 
-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
+		cp $branch_dir_prefix/default-branch $branch_dir_prefix/@ &&
+		git refs verify 2>err &&
+		test_must_be_empty err &&
+		rm $branch_dir_prefix/@ &&
 
-		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
+		cp $tag_dir_prefix/default-tag $tag_dir_prefix/tag-1.lock &&
+		git refs verify 2>err &&
+		rm $tag_dir_prefix/tag-1.lock &&
+		test_must_be_empty err &&
 
-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
+		cp $tag_dir_prefix/default-tag $tag_dir_prefix/.lock &&
+		test_must_fail git refs verify 2>err &&
+		cat >expect <<-EOF &&
+		error: refs/tags/.lock: badRefName: invalid refname format
 		EOF
+		rm $tag_dir_prefix/.lock &&
+		test_cmp expect err &&
 
-		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
+		for refname in ".refname-starts-with-dot" "~refname-has-stride"
+		do
+			cp $branch_dir_prefix/default-branch "$branch_dir_prefix/$refname" &&
+			test_must_fail git refs verify 2>err &&
+			cat >expect <<-EOF &&
+			error: refs/heads/$refname: badRefName: invalid refname format
+			EOF
+			rm "$branch_dir_prefix/$refname" &&
+			test_cmp expect err || return 1
+		done &&
 
-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"
+		for refname in ".refname-starts-with-dot" "~refname-has-stride"
+		do
+			cp $tag_dir_prefix/default-tag "$tag_dir_prefix/$refname" &&
+			test_must_fail git refs verify 2>err &&
+			cat >expect <<-EOF &&
+			error: refs/tags/$refname: badRefName: invalid refname format
+			EOF
+			rm "$tag_dir_prefix/$refname" &&
+			test_cmp expect err || return 1
+		done &&
 
-ok 30 - socket defaults to ~/.cache/git/credential/socket
+		for refname in ".refname-starts-with-dot" "~refname-has-stride"
+		do
+			cp $tag_dir_prefix/multi_hierarchy/default-tag "$tag_dir_prefix/multi_hierarchy/$refname" &&
+			test_must_fail git refs verify 2>err &&
+			cat >expect <<-EOF &&
+			error: refs/tags/multi_hierarchy/$refname: badRefName: invalid refname format
+			EOF
+			rm "$tag_dir_prefix/multi_hierarchy/$refname" &&
+			test_cmp expect err || return 1
+		done &&
 
-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
+		for refname in ".refname-starts-with-dot" "~refname-has-stride"
+		do
+			mkdir "$branch_dir_prefix/$refname" &&
+			cp $branch_dir_prefix/default-branch "$branch_dir_prefix/$refname/default-branch" &&
+			test_must_fail git refs verify 2>err &&
+			cat >expect <<-EOF &&
+			error: refs/heads/$refname/default-branch: badRefName: invalid refname format
+			EOF
+			rm -r "$branch_dir_prefix/$refname" &&
+			test_cmp expect err || return 1
+		done
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0602-reffiles-fsck/repo/.git/
+[main (root-commit) 8b2b4f6] initial
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'default-branch'
+ok 1 - ref name should be checked
 
-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 0602.2 'ref name check should be adapted into fsck messages': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	branch_dir_prefix=.git/refs/heads &&
+	(
+		cd repo &&
+		git commit --allow-empty -m initial &&
+		git checkout -b branch-1 &&
 
-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':
+		cp $branch_dir_prefix/branch-1 $branch_dir_prefix/.branch-1 &&
+		git -c fsck.badRefName=warn refs verify 2>err &&
+		cat >expect <<-EOF &&
+		warning: refs/heads/.branch-1: badRefName: invalid refname format
 		EOF
-	
-ok 34 - helper (cache) requires matching protocol
+		rm $branch_dir_prefix/.branch-1 &&
+		test_cmp expect err &&
 
-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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0613-reftable-write-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/.git/
-expecting success of 0613.1 'default write options': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit initial &&
-		git pack-refs &&
-		cat >expect <<-EOF &&
-		header:
-		  block_size: 4096
-		ref:
-		  - length: 129
-		    restarts: 2
-		log:
-		  - length: 262
-		    restarts: 2
-		EOF
-		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 1 - default write options
-
-expecting success of 0613.2 'disabled reflog writes no log blocks': 
-	test_config_global core.logAllRefUpdates false &&
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit initial &&
-		git pack-refs &&
-		cat >expect <<-EOF &&
-		header:
-		  block_size: 4096
-		ref:
-		  - length: 129
-		    restarts: 2
-		EOF
-		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 2 - disabled reflog writes no log blocks
-
-expecting success of 0613.3 'many refs results in multiple blocks': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit initial &&
-		test_seq -f "update refs/heads/branch-%d HEAD" 200 >input &&
-		git update-ref --stdin <input &&
-		git pack-refs &&
-
-		cat >expect <<-EOF &&
-		header:
-		  block_size: 4096
-		ref:
-		  - length: 4049
-		    restarts: 11
-		  - length: 1136
-		    restarts: 3
-		log:
-		  - length: 4041
-		    restarts: 4
-		  - length: 4015
-		    restarts: 3
-		  - length: 4014
-		    restarts: 3
-		  - length: 4012
-		    restarts: 3
-		  - length: 3289
-		    restarts: 3
-		idx:
-		  - length: 103
-		    restarts: 1
-		EOF
-		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 3 - many refs results in multiple blocks
-
-expecting success of 0613.4 'tiny block size leads to error': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit initial &&
-		cat >expect <<-EOF &&
-		error: unable to compact stack: entry too large
-		EOF
-		test_must_fail git -c reftable.blockSize=50 pack-refs 2>err &&
-		test_cmp expect err
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 4 - tiny block size leads to error
-
-expecting success of 0613.5 'small block size leads to multiple ref blocks': 
-	test_config_global core.logAllRefUpdates false &&
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		test_commit B &&
-		git -c reftable.blockSize=100 pack-refs &&
-
-		cat >expect <<-EOF &&
-		header:
-		  block_size: 100
-		ref:
-		  - length: 53
-		    restarts: 1
-		  - length: 74
-		    restarts: 1
-		  - length: 38
-		    restarts: 1
-		EOF
-		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.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
-ok 5 - small block size leads to multiple ref blocks
-
-expecting success of 0613.6 'small block size fails with large reflog message': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		test-tool genzeros 500 | tr "\000" "a" >logmsg &&
-		cat >expect <<-EOF &&
-		fatal: update_ref failed for ref ${SQ}refs/heads/logme${SQ}: reftable: transaction failure: entry too large
-		EOF
-		test_must_fail git -c reftable.blockSize=100 \
-			update-ref -m "$(cat logmsg)" refs/heads/logme HEAD 2>err &&
-		test_cmp expect err
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
-[master (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 6 - small block size fails with large reflog message
-
-expecting success of 0613.7 'block size exceeding maximum supported size': 
-	test_config_global core.logAllRefUpdates false &&
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		test_commit B &&
-		cat >expect <<-EOF &&
-		fatal: reftable block size cannot exceed 16MB
-		EOF
-		test_must_fail git -c reftable.blockSize=16777216 pack-refs 2>err &&
-		test_cmp expect err
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.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
-ok 7 - block size exceeding maximum supported size
-
-expecting success of 0613.8 'restart interval at every single record': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit initial &&
-		test_seq -f "update refs/heads/branch-%d HEAD" 10 >input &&
-		git update-ref --stdin <input &&
-		git -c reftable.restartInterval=1 pack-refs &&
-
-		cat >expect <<-EOF &&
-		header:
-		  block_size: 4096
-		ref:
-		  - length: 566
-		    restarts: 13
-		log:
-		  - length: 1393
-		    restarts: 12
-		EOF
-		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 8 - restart interval at every single record
-
-expecting success of 0613.9 'restart interval exceeding maximum supported interval': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit initial &&
-		cat >expect <<-EOF &&
-		fatal: reftable block size cannot exceed 65535
-		EOF
-		test_must_fail git -c reftable.restartInterval=65536 pack-refs 2>err &&
-		test_cmp expect err
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 9 - restart interval exceeding maximum supported interval
-
-expecting success of 0613.10 'object index gets written by default with ref index': 
-	test_config_global core.logAllRefUpdates false &&
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit initial &&
-		test_seq -f "update refs/heads/branch-%d HEAD" 5 >input &&
-		git update-ref --stdin <input &&
-		git -c reftable.blockSize=100 pack-refs &&
-
-		cat >expect <<-EOF &&
-		header:
-		  block_size: 100
-		ref:
-		  - length: 53
-		    restarts: 1
-		  - length: 95
-		    restarts: 1
-		  - length: 71
-		    restarts: 1
-		  - length: 80
-		    restarts: 1
-		idx:
-		  - length: 55
-		    restarts: 2
-		obj:
-		  - length: 11
-		    restarts: 1
-		EOF
-		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 10 - object index gets written by default with ref index
-
-expecting success of 0613.11 'object index can be disabled': 
-	test_config_global core.logAllRefUpdates false &&
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit initial &&
-		test_seq -f "update refs/heads/branch-%d HEAD" 5 >input &&
-		git update-ref --stdin <input &&
-		git -c reftable.blockSize=100 -c reftable.indexObjects=false pack-refs &&
-
-		cat >expect <<-EOF &&
-		header:
-		  block_size: 100
-		ref:
-		  - length: 53
-		    restarts: 1
-		  - length: 95
-		    restarts: 1
-		  - length: 71
-		    restarts: 1
-		  - length: 80
-		    restarts: 1
-		idx:
-		  - length: 55
-		    restarts: 2
-		EOF
-		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 11 - object index can be disabled
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0600-reffiles-backend.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t0600-reffiles-backend/subdir/
---- subdir.dir	2025-08-27 08:19:57.303251905 +0000
-+++ our.dir	2025-08-27 08:19:57.307251932 +0000
-@@ -1 +1 @@
--/build/reproducible-path/git-2.51.0/t/trash directory.t0600-reffiles-backend/subdir
-+/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0602-reffiles-fsck.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0602-reffiles-fsck/.git/
-expecting success of 0602.1 'ref name should be checked': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	branch_dir_prefix=.git/refs/heads &&
-	tag_dir_prefix=.git/refs/tags &&
-	(
-		cd repo &&
-
-		git commit --allow-empty -m initial &&
-		git checkout -b default-branch &&
-		git tag default-tag &&
-		git tag multi_hierarchy/default-tag &&
-
-		cp $branch_dir_prefix/default-branch $branch_dir_prefix/@ &&
-		git refs verify 2>err &&
-		test_must_be_empty err &&
-		rm $branch_dir_prefix/@ &&
-
-		cp $tag_dir_prefix/default-tag $tag_dir_prefix/tag-1.lock &&
-		git refs verify 2>err &&
-		rm $tag_dir_prefix/tag-1.lock &&
-		test_must_be_empty err &&
-
-		cp $tag_dir_prefix/default-tag $tag_dir_prefix/.lock &&
-		test_must_fail git refs verify 2>err &&
-		cat >expect <<-EOF &&
-		error: refs/tags/.lock: badRefName: invalid refname format
-		EOF
-		rm $tag_dir_prefix/.lock &&
-		test_cmp expect err &&
-
-		for refname in ".refname-starts-with-dot" "~refname-has-stride"
-		do
-			cp $branch_dir_prefix/default-branch "$branch_dir_prefix/$refname" &&
-			test_must_fail git refs verify 2>err &&
-			cat >expect <<-EOF &&
-			error: refs/heads/$refname: badRefName: invalid refname format
-			EOF
-			rm "$branch_dir_prefix/$refname" &&
-			test_cmp expect err || return 1
-		done &&
-
-		for refname in ".refname-starts-with-dot" "~refname-has-stride"
-		do
-			cp $tag_dir_prefix/default-tag "$tag_dir_prefix/$refname" &&
-			test_must_fail git refs verify 2>err &&
-			cat >expect <<-EOF &&
-			error: refs/tags/$refname: badRefName: invalid refname format
-			EOF
-			rm "$tag_dir_prefix/$refname" &&
-			test_cmp expect err || return 1
-		done &&
-
-		for refname in ".refname-starts-with-dot" "~refname-has-stride"
-		do
-			cp $tag_dir_prefix/multi_hierarchy/default-tag "$tag_dir_prefix/multi_hierarchy/$refname" &&
-			test_must_fail git refs verify 2>err &&
-			cat >expect <<-EOF &&
-			error: refs/tags/multi_hierarchy/$refname: badRefName: invalid refname format
-			EOF
-			rm "$tag_dir_prefix/multi_hierarchy/$refname" &&
-			test_cmp expect err || return 1
-		done &&
-
-		for refname in ".refname-starts-with-dot" "~refname-has-stride"
-		do
-			mkdir "$branch_dir_prefix/$refname" &&
-			cp $branch_dir_prefix/default-branch "$branch_dir_prefix/$refname/default-branch" &&
-			test_must_fail git refs verify 2>err &&
-			cat >expect <<-EOF &&
-			error: refs/heads/$refname/default-branch: badRefName: invalid refname format
-			EOF
-			rm -r "$branch_dir_prefix/$refname" &&
-			test_cmp expect err || return 1
-		done
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0602-reffiles-fsck/repo/.git/
-[main (root-commit) 8b2b4f6] initial
- Author: A U Thor <author@example.com>
-Switched to a new branch 'default-branch'
-ok 1 - ref name should be checked
-
-expecting success of 0602.2 'ref name check should be adapted into fsck messages': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	branch_dir_prefix=.git/refs/heads &&
-	(
-		cd repo &&
-		git commit --allow-empty -m initial &&
-		git checkout -b branch-1 &&
-
-		cp $branch_dir_prefix/branch-1 $branch_dir_prefix/.branch-1 &&
-		git -c fsck.badRefName=warn refs verify 2>err &&
-		cat >expect <<-EOF &&
-		warning: refs/heads/.branch-1: badRefName: invalid refname format
-		EOF
-		rm $branch_dir_prefix/.branch-1 &&
-		test_cmp expect err &&
-
-		cp $branch_dir_prefix/branch-1 $branch_dir_prefix/.branch-1 &&
-		git -c fsck.badRefName=ignore refs verify 2>err &&
-		test_must_be_empty err
-	)
+		cp $branch_dir_prefix/branch-1 $branch_dir_prefix/.branch-1 &&
+		git -c fsck.badRefName=ignore refs verify 2>err &&
+		test_must_be_empty err
+	)
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0602-reffiles-fsck/repo/.git/
 [main (root-commit) 8b2b4f6] initial
@@ -38247,395 +37165,1364 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1003-read-tree-prefix.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t0613-reftable-write-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/.git/
+expecting success of 0613.1 'default write options': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit initial &&
+		git pack-refs &&
+		cat >expect <<-EOF &&
+		header:
+		  block_size: 4096
+		ref:
+		  - length: 129
+		    restarts: 2
+		log:
+		  - length: 262
+		    restarts: 2
+		EOF
+		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
+		test_cmp expect actual
+	)
 
-tree is 700196ec4e5b1c75e9f5481e5b545d78533ff917
-ok 1 - setup
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 1 - default write options
 
-expecting success of 1003.2 'read-tree --prefix': 
-	git read-tree --prefix=two/ $tree &&
-	git ls-files >actual &&
-	cmp expect actual
+expecting success of 0613.2 'disabled reflog writes no log blocks': 
+	test_config_global core.logAllRefUpdates false &&
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit initial &&
+		git pack-refs &&
+		cat >expect <<-EOF &&
+		header:
+		  block_size: 4096
+		ref:
+		  - length: 129
+		    restarts: 2
+		EOF
+		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
+		test_cmp expect actual
+	)
 
-ok 2 - read-tree --prefix
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 2 - disabled reflog writes no log blocks
 
-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 &&
+expecting success of 0613.3 'many refs results in multiple blocks': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit initial &&
+		test_seq -f "update refs/heads/branch-%d HEAD" 200 >input &&
+		git update-ref --stdin <input &&
+		git pack-refs &&
 
-	git rm -rf . &&
-	test_must_fail git read-tree --prefix=/ $tree &&
-	git read-tree --prefix= $tree
+		cat >expect <<-EOF &&
+		header:
+		  block_size: 4096
+		ref:
+		  - length: 4049
+		    restarts: 11
+		  - length: 1136
+		    restarts: 3
+		log:
+		  - length: 4041
+		    restarts: 4
+		  - length: 4015
+		    restarts: 3
+		  - length: 4014
+		    restarts: 3
+		  - length: 4012
+		    restarts: 3
+		  - length: 3289
+		    restarts: 3
+		idx:
+		  - length: 103
+		    restarts: 1
+		EOF
+		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
+		test_cmp expect actual
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 3 - many refs results in multiple blocks
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0601-reffiles-pack-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0601-reffiles-pack-refs/.git/
-expecting success of 0601.1 'enable reflogs': 
-	git config core.logallrefupdates true
+expecting success of 0613.4 'tiny block size leads to error': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit initial &&
+		cat >expect <<-EOF &&
+		error: unable to compact stack: entry too large
+		EOF
+		test_must_fail git -c reftable.blockSize=50 pack-refs 2>err &&
+		test_cmp expect err
+	)
 
-ok 1 - enable reflogs
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 4 - tiny block size leads to error
 
-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)
+expecting success of 0613.5 'small block size leads to multiple ref blocks': 
+	test_config_global core.logAllRefUpdates false &&
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		test_commit B &&
+		git -c reftable.blockSize=100 pack-refs &&
 
-[main (root-commit) 2daebe9] Initial commit.
+		cat >expect <<-EOF &&
+		header:
+		  block_size: 100
+		ref:
+		  - length: 53
+		    restarts: 1
+		  - length: 74
+		    restarts: 1
+		  - length: 38
+		    restarts: 1
+		EOF
+		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
+[master (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A
-ok 2 - prepare a trivial repository
+ 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
+ok 5 - small block size leads to multiple ref blocks
 
-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 &&
+expecting success of 0613.6 'small block size fails with large reflog message': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		test-tool genzeros 500 | tr "\000" "a" >logmsg &&
+		cat >expect <<-EOF &&
+		fatal: update_ref failed for ref ${SQ}refs/heads/logme${SQ}: reftable: transaction failure: entry too large
+		EOF
+		test_must_fail git -c reftable.blockSize=100 \
+			update-ref -m "$(cat logmsg)" refs/heads/logme HEAD 2>err &&
+		test_cmp expect err
+	)
 
-	git pack-refs --prune --all &&
-	test_path_is_file .git/packed-refs &&
-	N=$(find .git/refs -type f) &&
-	test -z "$N"
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
+[master (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 6 - small block size fails with large reflog message
 
-ok 3 - pack-refs --prune --all
+expecting success of 0613.7 'block size exceeding maximum supported size': 
+	test_config_global core.logAllRefUpdates false &&
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		test_commit B &&
+		cat >expect <<-EOF &&
+		fatal: reftable block size cannot exceed 16MB
+		EOF
+		test_must_fail git -c reftable.blockSize=16777216 pack-refs 2>err &&
+		test_cmp expect err
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.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
+ok 7 - block size exceeding maximum supported size
 
-ok 4 - see if git show-ref works as expected
+expecting success of 0613.8 'restart interval at every single record': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit initial &&
+		test_seq -f "update refs/heads/branch-%d HEAD" 10 >input &&
+		git update-ref --stdin <input &&
+		git -c reftable.restartInterval=1 pack-refs &&
 
-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
+		cat >expect <<-EOF &&
+		header:
+		  block_size: 4096
+		ref:
+		  - length: 566
+		    restarts: 13
+		log:
+		  - length: 1393
+		    restarts: 12
+		EOF
+		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
+		test_cmp expect actual
+	)
 
-ok 5 - see if a branch still exists when packed
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 8 - restart interval at every single record
 
-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
+expecting success of 0613.9 'restart interval exceeding maximum supported interval': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit initial &&
+		cat >expect <<-EOF &&
+		fatal: reftable block size cannot exceed 65535
+		EOF
+		test_must_fail git -c reftable.restartInterval=65536 pack-refs 2>err &&
+		test_cmp expect err
+	)
 
-fatal: 'refs/heads/c' exists; cannot create 'refs/heads/c/d'
-ok 6 - git branch c/d should barf if branch c exists
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 9 - restart interval exceeding maximum supported interval
 
-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
+expecting success of 0613.10 'object index gets written by default with ref index': 
+	test_config_global core.logAllRefUpdates false &&
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit initial &&
+		test_seq -f "update refs/heads/branch-%d HEAD" 5 >input &&
+		git update-ref --stdin <input &&
+		git -c reftable.blockSize=100 pack-refs &&
 
-ok 7 - see if a branch still exists after git pack-refs --prune
+		cat >expect <<-EOF &&
+		header:
+		  block_size: 100
+		ref:
+		  - length: 53
+		    restarts: 1
+		  - length: 95
+		    restarts: 1
+		  - length: 71
+		    restarts: 1
+		  - length: 80
+		    restarts: 1
+		idx:
+		  - length: 55
+		    restarts: 2
+		obj:
+		  - length: 11
+		    restarts: 1
+		EOF
+		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
+		test_cmp expect actual
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 10 - object index gets written by default with ref index
 
-ok 8 - see if git pack-refs --prune remove ref files
+expecting success of 0613.11 'object index can be disabled': 
+	test_config_global core.logAllRefUpdates false &&
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit initial &&
+		test_seq -f "update refs/heads/branch-%d HEAD" 5 >input &&
+		git update-ref --stdin <input &&
+		git -c reftable.blockSize=100 -c reftable.indexObjects=false pack-refs &&
 
-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
+		cat >expect <<-EOF &&
+		header:
+		  block_size: 100
+		ref:
+		  - length: 53
+		    restarts: 1
+		  - length: 95
+		    restarts: 1
+		  - length: 71
+		    restarts: 1
+		  - length: 80
+		    restarts: 1
+		idx:
+		  - length: 55
+		    restarts: 2
+		EOF
+		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
+		test_cmp expect actual
+	)
 
-ok 9 - see if git pack-refs --prune removes empty dirs
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0613-reftable-write-options/repo/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 11 - object index can be disabled
 
-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
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0301-credential-cache.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-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 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 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
+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
 
-fatal: '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 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 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
+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
 
-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 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 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
+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
 
-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 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 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 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 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 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 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 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 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 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 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 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 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
+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
 
-ok 19 - see if up-to-date packed refs are preserved
+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 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
+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
 
-ok 20 - pack, prune and repack
+		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 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
+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
 
-[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 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 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
+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
 
-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 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 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
+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
 
-[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 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 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
+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
 
-2daebe96d7fd03d28875d852f87c06a18f4a6639 refs/top
-ok 24 - pack ref directly below refs/
+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 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
+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
 
-ok 25 - do not pack ref in refs/bisect
+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 0601.26 'disable reflogs': 
-	git config core.logallrefupdates false &&
-	rm -rf .git/logs
+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
 
-ok 26 - disable reflogs
+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
 
-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
+		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 27 - create packed foo/bar/baz branch
+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 0601.28 'notice d/f conflict with existing directory': 
-	test_must_fail git branch foo &&
-	test_must_fail git branch foo/bar
+		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
 
-fatal: 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo'
-fatal: 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar'
-ok 28 - notice d/f conflict with existing directory
+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 0601.29 'existing directory reports concrete ref': 
-	test_must_fail git branch foo 2>stderr &&
-	test_grep refs/heads/foo/bar/baz stderr
+ok 30 - socket defaults to ~/.cache/git/credential/socket
 
-fatal: 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo'
-ok 29 - existing directory reports concrete ref
+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 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
+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
 
-fatal: 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar/baz/extra'
-fatal: '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 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 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
+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
 
-ok 31 - reject packed-refs with unterminated line
+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 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
+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
 
-ok 32 - reject packed-refs containing junk
+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 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
+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
 
-ok 33 - reject packed-refs with a short SHA-1
+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 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
+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
 
-fatal: Unable to create '/build/reproducible-path/git-2.51.0/t/trash directory.t0601-reffiles-pack-refs/.git/packed-refs.lock': File exists.
+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
 
-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 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 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
+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
 
-ok 35 - retry acquiring packed-refs.lock
+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
 
@@ -38647,1652 +38534,652 @@
 
 )
 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:
+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"
 
-  git switch -c <new-branch-name>
+ok 51 - use user socket if user directory is a symlink to a directory
 
-Or undo this operation with:
+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
 
-  git switch -
+# passed all 52 test(s)
+1..52
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1003-read-tree-prefix.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+tree is 700196ec4e5b1c75e9f5481e5b545d78533ff917
+ok 1 - setup
 
-HEAD is now at 68c0c7f initial
-ok 37 - refs/worktree must not be packed
+expecting success of 1003.2 'read-tree --prefix': 
+	git read-tree --prefix=two/ $tree &&
+	git ls-files >actual &&
+	cmp expect actual
 
-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
+ok 2 - read-tree --prefix
 
-[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 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 &&
 
-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
+	git rm -rf . &&
+	test_must_fail git read-tree --prefix=/ $tree &&
+	git read-tree --prefix= $tree
 
-ok 39 - pack-refs does not silently delete broken packed ref
+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
 
-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
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0000-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0000-basic/.git/
+expecting success of 0000.1 'verify that the running shell supports "local"': 
+	x="notlocal" &&
+	y="alsonotlocal" &&
+	echo "local alsolocal" >expected1 &&
+	try_local_xy >actual1 &&
+	test_cmp expected1 actual1 &&
+	echo "notlocal alsonotlocal" >expected2 &&
+	echo "$x $y" >actual2 &&
+	test_cmp expected2 actual2
 
-ok 40 - pack-refs does not drop broken refs during deletion
+ok 1 - verify that the running shell supports "local"
 
-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" &&
+expecting success of 0000.2 '.git/objects should be empty after git init in an empty repo': 
+	find .git/objects -type f -print >should-be-empty &&
+	test_line_count = 0 should-be-empty
 
-			# 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 &&
+ok 2 - .git/objects should be empty after git init in an empty repo
 
-			# 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.51.0/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 0000.3 '.git/objects should have 3 subdirectories': 
+	find .git/objects -type d -print >full-of-directories &&
+	test_line_count = 3 full-of-directories
 
-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" &&
+ok 3 - .git/objects should have 3 subdirectories
 
-			git pack-refs --all &&
-			test_line_count = 2 .git/packed-refs &&
+expecting success of 0000.4 'success is reported like this': 
+	:
 
-			# 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 &&
+ok 4 - success is reported like this
 
-			# 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.51.0/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 0000.5 'subtest: 3 passing tests': 
+	write_and_run_sub_test_lib_test full-pass <<-\EOF &&
+	for i in 1 2 3
+	do
+		test_expect_success "passing test #$i" "true"
+	done
+	test_done
+	EOF
+	check_sub_test_lib_test full-pass <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 - passing test #3
+	> # passed all 3 test(s)
+	> 1..3
+	EOF
 
-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" &&
+ok 5 - subtest: 3 passing tests
 
-			# 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 &&
+expecting success of 0000.6 'subtest: 2/3 tests passing': 
+	write_and_run_sub_test_lib_test_err partial-pass <<-\EOF &&
+	test_expect_success "passing test #1" "true"
+	test_expect_success "failing test #2" "false"
+	test_expect_success "passing test #3" "true"
+	test_done
+	EOF
+	check_sub_test_lib_test partial-pass <<-\EOF
+	> ok 1 - passing test #1
+	> not ok 2 - failing test #2
+	#	false
+	> ok 3 - passing test #3
+	> # failed 1 among 3 test(s)
+	> 1..3
+	EOF
 
-			# 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 &&
+ok 6 - subtest: 2/3 tests passing
 
-			# 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.51.0/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 0000.7 'subtest: --immediate': 
+	run_sub_test_lib_test_err partial-pass \
+		--immediate &&
+	check_sub_test_lib_test_err partial-pass \
+		<<-\EOF_OUT 3<<-EOF_ERR
+	> ok 1 - passing test #1
+	> not ok 2 - failing test #2
+	> #	false
+	> 1..2
+	EOF_OUT
+	EOF_ERR
 
-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" &&
+ok 7 - subtest: --immediate
 
-			# 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 &&
+expecting success of 0000.8 'subtest: a failing TODO test': 
+	write_and_run_sub_test_lib_test failing-todo <<-\EOF &&
+	test_expect_success "passing test" "true"
+	test_expect_failure "pretend we have a known breakage" "false"
+	test_done
+	EOF
+	check_sub_test_lib_test failing-todo <<-\EOF
+	> ok 1 - passing test
+	> not ok 2 - pretend we have a known breakage # TODO known breakage
+	> # still have 1 known breakage(s)
+	> # passed all remaining 1 test(s)
+	> 1..2
+	EOF
 
-			# 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.51.0/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
+ok 8 - subtest: a failing TODO test
 
-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" &&
+expecting success of 0000.9 'subtest: a passing TODO test': 
+	write_and_run_sub_test_lib_test_err passing-todo <<-\EOF &&
+	test_expect_failure "pretend we have fixed a known breakage" "true"
+	test_done
+	EOF
+	check_sub_test_lib_test passing-todo <<-\EOF
+	> ok 1 - pretend we have fixed a known breakage # TODO known breakage vanished
+	> # 1 known breakage(s) vanished; please update test(s)
+	> 1..1
+	EOF
 
-			git pack-refs --all &&
-			test_line_count = 2 .git/packed-refs &&
+ok 9 - subtest: a passing TODO test
 
-			# 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 &&
+expecting success of 0000.10 'subtest: 2 TODO tests, one passin': 
+	write_and_run_sub_test_lib_test_err partially-passing-todos <<-\EOF &&
+	test_expect_failure "pretend we have a known breakage" "false"
+	test_expect_success "pretend we have a passing test" "true"
+	test_expect_failure "pretend we have fixed another known breakage" "true"
+	test_done
+	EOF
+	check_sub_test_lib_test partially-passing-todos <<-\EOF
+	> not ok 1 - pretend we have a known breakage # TODO known breakage
+	> ok 2 - pretend we have a passing test
+	> ok 3 - pretend we have fixed another known breakage # TODO known breakage vanished
+	> # 1 known breakage(s) vanished; please update test(s)
+	> # still have 1 known breakage(s)
+	> # passed all remaining 1 test(s)
+	> 1..3
+	EOF
 
-			# 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.51.0/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
+ok 10 - subtest: 2 TODO tests, one passin
 
-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" &&
+expecting success of 0000.11 'subtest: mixed results: pass, failure and a TODO test': 
+	write_and_run_sub_test_lib_test_err mixed-results1 <<-\EOF &&
+	test_expect_success "passing test" "true"
+	test_expect_success "failing test" "false"
+	test_expect_failure "pretend we have a known breakage" "false"
+	test_done
+	EOF
+	check_sub_test_lib_test mixed-results1 <<-\EOF
+	> ok 1 - passing test
+	> not ok 2 - failing test
+	> #	false
+	> not ok 3 - pretend we have a known breakage # TODO known breakage
+	> # still have 1 known breakage(s)
+	> # failed 1 among remaining 2 test(s)
+	> 1..3
+	EOF
 
-			# 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 &&
+ok 11 - subtest: mixed results: pass, failure and a TODO test
 
-			# 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 &&
+expecting success of 0000.12 'subtest: mixed results: a mixture of all possible results': 
+	write_and_run_sub_test_lib_test_err mixed-results2 <<-\EOF &&
+	test_expect_success "passing test" "true"
+	test_expect_success "passing test" "true"
+	test_expect_success "passing test" "true"
+	test_expect_success "passing test" "true"
+	test_expect_success "failing test" "false"
+	test_expect_success "failing test" "false"
+	test_expect_success "failing test" "false"
+	test_expect_failure "pretend we have a known breakage" "false"
+	test_expect_failure "pretend we have a known breakage" "false"
+	test_expect_failure "pretend we have fixed a known breakage" "true"
+	test_done
+	EOF
+	check_sub_test_lib_test mixed-results2 <<-\EOF
+	> ok 1 - passing test
+	> ok 2 - passing test
+	> ok 3 - passing test
+	> ok 4 - passing test
+	> not ok 5 - failing test
+	> #	false
+	> not ok 6 - failing test
+	> #	false
+	> not ok 7 - failing test
+	> #	false
+	> not ok 8 - pretend we have a known breakage # TODO known breakage
+	> not ok 9 - pretend we have a known breakage # TODO known breakage
+	> ok 10 - pretend we have fixed a known breakage # TODO known breakage vanished
+	> # 1 known breakage(s) vanished; please update test(s)
+	> # still have 2 known breakage(s)
+	> # failed 3 among remaining 7 test(s)
+	> 1..10
+	EOF
 
-			# 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.51.0/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
+ok 12 - subtest: mixed results: a mixture of all possible results
 
-# passed all 46 test(s)
-1..46
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1005-read-tree-reset.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1005-read-tree-reset/.git/
-expecting success of 1005.1 'setup': 
-	git init &&
-	mkdir df &&
-	echo content >df/file &&
-	git add df/file &&
-	git commit -m one &&
-	git ls-files >expect &&
-	rm -rf df &&
-	echo content >df &&
-	git add df &&
-	echo content >new &&
-	git add new &&
-	git commit -m two
+expecting success of 0000.13 'subtest: --verbose option': 
+	write_and_run_sub_test_lib_test_err t1234-verbose --verbose <<-\EOF &&
+	test_expect_success "passing test" true
+	test_expect_success "test with output" "echo foo"
+	test_expect_success "failing test" false
+	test_done
+	EOF
+	mv t1234-verbose/err t1234-verbose/err+ &&
+	grep -v "^Initialized empty" t1234-verbose/err+ >t1234-verbose/err &&
+	check_sub_test_lib_test_err t1234-verbose \
+		<<-\EOF_OUT 3<<-\EOF_ERR
+	> ok 1 - passing test
+	> ok 2 - test with output
+	> not ok 3 - failing test
+	> #	false
+	> # failed 1 among 3 test(s)
+	> 1..3
+	EOF_OUT
+	> expecting success of 1234.1 'passing test': true
+	> Z
+	> expecting success of 1234.2 'test with output': echo foo
+	> foo
+	> Z
+	> expecting success of 1234.3 'failing test': false
+	> Z
+	EOF_ERR
 
-Reinitialized existing Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1005-read-tree-reset/.git/
-[master (root-commit) 92e0c46] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 df/file
-[master 12f5e11] two
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename df/file => df (100%)
- create mode 100644 new
-ok 1 - setup
+ok 13 - subtest: --verbose option
 
-expecting success of 1005.2 'reset should work': 
-	read_tree_u_must_succeed -u --reset HEAD^ &&
-	git ls-files >actual &&
-	test_cmp expect actual
+expecting success of 0000.14 'subtest: --verbose-only option': 
+	run_sub_test_lib_test_err \
+		t1234-verbose \
+		--verbose-only=2 &&
+	check_sub_test_lib_test_err t1234-verbose <<-\EOF_OUT 3<<-\EOF_ERR
+	> ok 1 - passing test
+	> ok 2 - test with output
+	> not ok 3 - failing test
+	> #	false
+	> # failed 1 among 3 test(s)
+	> 1..3
+	EOF_OUT
+	> Z
+	> expecting success of 1234.2 'test with output': echo foo
+	> foo
+	> Z
+	EOF_ERR
 
-ok 2 - reset should work
+ok 14 - subtest: --verbose-only option
 
-expecting success of 1005.3 'reset should remove remnants from a failed merge': 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
+expecting success of 0000.15 'subtest: skip one with GIT_SKIP_TESTS': 
 	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >actual &&
-	! test -f old &&
-	test_cmp expect actual
+		run_sub_test_lib_test full-pass \
+			--skip="full.2" &&
+		check_sub_test_lib_test full-pass <<-\EOF
+		> ok 1 - passing test #1
+		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
+		> ok 3 - passing test #3
+		> # passed all 3 test(s)
+		> 1..3
+		EOF
+	)
 
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-ok 3 - reset should remove remnants from a failed merge
+ok 15 - subtest: skip one with GIT_SKIP_TESTS
 
-expecting success of 1005.4 'two-way reset should remove remnants too': 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
+expecting success of 0000.16 'subtest: skip several with GIT_SKIP_TESTS': 
 	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	read_tree_u_must_succeed --reset -u HEAD HEAD &&
-	git ls-files -s >actual &&
-	! test -f old &&
-	test_cmp expect actual
+		write_and_run_sub_test_lib_test git-skip-tests-several \
+			--skip="git.2 git.5" <<-\EOF &&
+		for i in 1 2 3 4 5 6
+		do
+			test_expect_success "passing test #$i" "true"
+		done
+		test_done
+		EOF
+		check_sub_test_lib_test git-skip-tests-several <<-\EOF
+		> ok 1 - passing test #1
+		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
+		> ok 3 - passing test #3
+		> ok 4 - passing test #4
+		> ok 5 # skip passing test #5 (GIT_SKIP_TESTS)
+		> ok 6 - passing test #6
+		> # passed all 6 test(s)
+		> 1..6
+		EOF
+	)
 
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-ok 4 - two-way reset should remove remnants too
+ok 16 - subtest: skip several with GIT_SKIP_TESTS
 
-expecting success of 1005.5 'Porcelain reset should remove remnants too': 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
+expecting success of 0000.17 'subtest: sh pattern skipping with GIT_SKIP_TESTS': 
 	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	git reset --hard &&
-	git ls-files -s >actual &&
-	! test -f old &&
-	test_cmp expect actual
+		run_sub_test_lib_test git-skip-tests-several \
+			--skip="git.[2-5]" &&
+		check_sub_test_lib_test git-skip-tests-several <<-\EOF
+		> ok 1 - passing test #1
+		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
+		> ok 3 # skip passing test #3 (GIT_SKIP_TESTS)
+		> ok 4 # skip passing test #4 (GIT_SKIP_TESTS)
+		> ok 5 # skip passing test #5 (GIT_SKIP_TESTS)
+		> ok 6 - passing test #6
+		> # passed all 6 test(s)
+		> 1..6
+		EOF
+	)
 
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-HEAD is now at 12f5e11 two
-ok 5 - Porcelain reset should remove remnants too
+ok 17 - subtest: sh pattern skipping with GIT_SKIP_TESTS
 
-expecting success of 1005.6 'Porcelain checkout -f should remove remnants too': 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
+expecting success of 0000.18 'subtest: skip entire test suite with GIT_SKIP_TESTS': 
 	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	git checkout -f &&
-	git ls-files -s >actual &&
-	! test -f old &&
-	test_cmp expect actual
+		GIT_SKIP_TESTS="git" && export GIT_SKIP_TESTS &&
+		run_sub_test_lib_test git-skip-tests-several \
+			--skip="git" &&
+		check_sub_test_lib_test git-skip-tests-several <<-\EOF
+		> 1..0 # SKIP skip all tests in git
+		EOF
+	)
 
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-ok 6 - Porcelain checkout -f should remove remnants too
+ok 18 - subtest: skip entire test suite with GIT_SKIP_TESTS
 
-expecting success of 1005.7 'Porcelain checkout -f HEAD should remove remnants too': 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
+expecting success of 0000.19 'subtest: GIT_SKIP_TESTS does not skip unmatched suite': 
 	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	git checkout -f HEAD &&
-	git ls-files -s >actual &&
-	! test -f old &&
-	test_cmp expect actual
+		GIT_SKIP_TESTS="notgit" && export GIT_SKIP_TESTS &&
+		run_sub_test_lib_test full-pass \
+			--skip="notfull" &&
+		check_sub_test_lib_test full-pass <<-\EOF
+		> ok 1 - passing test #1
+		> ok 2 - passing test #2
+		> ok 3 - passing test #3
+		> # passed all 3 test(s)
+		> 1..3
+		EOF
+	)
 
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-ok 7 - Porcelain checkout -f HEAD should remove remnants too
+ok 19 - subtest: GIT_SKIP_TESTS does not skip unmatched suite
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1000-read-tree-m-3way.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1000-read-tree-m-3way/.git/
-expecting success of 1000.1 'adding test file NN and Z/NN': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 1 - adding test file NN and Z/NN
+expecting success of 0000.20 'subtest: --run basic': 
+	run_sub_test_lib_test git-skip-tests-several --run="1,3,5" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 # skip passing test #2 (--run)
+	> ok 3 - passing test #3
+	> ok 4 # skip passing test #4 (--run)
+	> ok 5 - passing test #5
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
 
-expecting success of 1000.2 'adding test file ND and Z/ND': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 2 - adding test file ND and Z/ND
+ok 20 - subtest: --run basic
 
-expecting success of 1000.3 'adding test file NM and Z/NM': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 3 - adding test file NM and Z/NM
+expecting success of 0000.21 'subtest: --run with a range': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="1-3" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 - passing test #3
+	> ok 4 # skip passing test #4 (--run)
+	> ok 5 # skip passing test #5 (--run)
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
 
-expecting success of 1000.4 'adding test file DN and Z/DN': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 4 - adding test file DN and Z/DN
+ok 21 - subtest: --run with a range
 
-expecting success of 1000.5 'adding test file DD and Z/DD': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 5 - adding test file DD and Z/DD
+expecting success of 0000.22 'subtest: --run with two ranges': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="1-2,5-6" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 # skip passing test #4 (--run)
+	> ok 5 - passing test #5
+	> ok 6 - passing test #6
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
 
-expecting success of 1000.6 'adding test file DM and Z/DM': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 6 - adding test file DM and Z/DM
+ok 22 - subtest: --run with two ranges
 
-expecting success of 1000.7 'adding test file MN and Z/MN': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 7 - adding test file MN and Z/MN
+expecting success of 0000.23 'subtest: --run with a left open range': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="-3" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 - passing test #3
+	> ok 4 # skip passing test #4 (--run)
+	> ok 5 # skip passing test #5 (--run)
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
 
-expecting success of 1000.8 'adding test file MD and Z/MD': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 8 - adding test file MD and Z/MD
+ok 23 - subtest: --run with a left open range
 
-expecting success of 1000.9 'adding test file MM and Z/MM': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 9 - adding test file MM and Z/MM
+expecting success of 0000.24 'subtest: --run with a right open range': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="4-" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 # skip passing test #1 (--run)
+	> ok 2 # skip passing test #2 (--run)
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 - passing test #4
+	> ok 5 - passing test #5
+	> ok 6 - passing test #6
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
 
-expecting success of 1000.10 'adding test file SS': 
-	git update-index --add SS
+ok 24 - subtest: --run with a right open range
 
-ok 10 - adding test file SS
+expecting success of 0000.25 'subtest: --run with basic negation': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="!3" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 - passing test #4
+	> ok 5 - passing test #5
+	> ok 6 - passing test #6
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
 
-expecting success of 1000.11 'adding test file TT': 
-	git update-index --add TT
+ok 25 - subtest: --run with basic negation
 
-ok 11 - adding test file TT
+expecting success of 0000.26 'subtest: --run with two negations': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="!3,!6" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 - passing test #4
+	> ok 5 - passing test #5
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
 
-expecting success of 1000.12 'prepare initial tree': 
-	tree_O=$(git write-tree)
+ok 26 - subtest: --run with two negations
 
-ok 12 - prepare initial tree
+expecting success of 0000.27 'subtest: --run a range and negation': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="-4,!2" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 # skip passing test #2 (--run)
+	> ok 3 - passing test #3
+	> ok 4 - passing test #4
+	> ok 5 # skip passing test #5 (--run)
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
 
-expecting success of 1000.13 'change in branch A (removal)': 
-	git update-index --remove $to_remove
+ok 27 - subtest: --run a range and negation
 
-ok 13 - change in branch A (removal)
+expecting success of 0000.28 'subtest: --run range negation': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="!1-3" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 # skip passing test #1 (--run)
+	> ok 2 # skip passing test #2 (--run)
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 - passing test #4
+	> ok 5 - passing test #5
+	> ok 6 - passing test #6
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
 
-expecting success of 1000.14 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 14 - change in branch A (modification)
+ok 28 - subtest: --run range negation
 
-expecting success of 1000.15 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 15 - change in branch A (modification)
+expecting success of 0000.29 'subtest: --run include, exclude and include': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="1-5,!1-3,2" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 # skip passing test #1 (--run)
+	> ok 2 - passing test #2
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 - passing test #4
+	> ok 5 - passing test #5
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
 
-expecting success of 1000.16 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 16 - change in branch A (modification)
+ok 29 - subtest: --run include, exclude and include
 
-expecting success of 1000.17 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 17 - change in branch A (modification)
+expecting success of 0000.30 'subtest: --run include, exclude and include, comma separated': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run=1-5,!1-3,2 &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 # skip passing test #1 (--run)
+	> ok 2 - passing test #2
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 - passing test #4
+	> ok 5 - passing test #5
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
 
-expecting success of 1000.18 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 18 - change in branch A (modification)
+ok 30 - subtest: --run include, exclude and include, comma separated
 
-expecting success of 1000.19 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 19 - change in branch A (modification)
+expecting success of 0000.31 'subtest: --run exclude and include': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="!3-,5" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 # skip passing test #4 (--run)
+	> ok 5 - passing test #5
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
 
-expecting success of 1000.20 'change in branch A (addition)': 
-		git update-index --add $p
-	
-ok 20 - change in branch A (addition)
+ok 31 - subtest: --run exclude and include
 
-expecting success of 1000.21 'change in branch A (addition)': 
-		git update-index --add $p
-	
-ok 21 - change in branch A (addition)
+expecting success of 0000.32 'subtest: --run empty selectors': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="1,,3,,,5" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 # skip passing test #2 (--run)
+	> ok 3 - passing test #3
+	> ok 4 # skip passing test #4 (--run)
+	> ok 5 - passing test #5
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
 
-expecting success of 1000.22 'change in branch A (addition)': 
-		git update-index --add $p
-	
-ok 22 - change in branch A (addition)
+ok 32 - subtest: --run empty selectors
 
-expecting success of 1000.23 'change in branch A (addition)': 
-		git update-index --add $p
-	
-ok 23 - change in branch A (addition)
+expecting success of 0000.33 'subtest: --run substring selector': 
+	write_and_run_sub_test_lib_test run-substring-selector \
+		--run="relevant" <<-\EOF &&
+	test_expect_success "relevant test" "true"
+	for i in 1 2 3 4 5 6
+	do
+		test_expect_success "other test #$i" "true"
+	done
+	test_done
+	EOF
+	check_sub_test_lib_test run-substring-selector <<-\EOF
+	> ok 1 - relevant test
+	> ok 2 # skip other test #1 (--run)
+	> ok 3 # skip other test #2 (--run)
+	> ok 4 # skip other test #3 (--run)
+	> ok 5 # skip other test #4 (--run)
+	> ok 6 # skip other test #5 (--run)
+	> ok 7 # skip other test #6 (--run)
+	> # passed all 7 test(s)
+	> 1..7
+	EOF
 
-expecting success of 1000.24 'change in branch A (addition)': 
-	git update-index --add LL &&
-	git update-index SS
+ok 33 - subtest: --run substring selector
 
-ok 24 - change in branch A (addition)
+expecting success of 0000.34 'subtest: --run keyword selection': 
+	write_and_run_sub_test_lib_test_err run-inv-range-start \
+		--run="a-5" <<-\EOF &&
+	test_expect_success "passing test #1" "true"
+	test_done
+	EOF
+	check_sub_test_lib_test_err run-inv-range-start \
+		<<-\EOF_OUT 3<<-EOF_ERR
+	> FATAL: Unexpected exit with code 1
+	EOF_OUT
+	> error: --run: invalid non-numeric in range start: ${SQ}a-5${SQ}
+	EOF_ERR
 
-expecting success of 1000.25 'change in branch A (edit)': 
-	git update-index TT
-
-ok 25 - change in branch A (edit)
-
-expecting success of 1000.26 'change in branch A (change file to directory)': 
-	git update-index --add DF/DF
-
-ok 26 - change in branch A (change file to directory)
-
-expecting success of 1000.27 'recording branch A tree': 
-	tree_A=$(git write-tree)
-
-ok 27 - recording branch A tree
-
-expecting success of 1000.28 'reading original tree and checking out': 
-	git read-tree $tree_O &&
-	git checkout-index -a
-
-ok 28 - reading original tree and checking out
-
-expecting success of 1000.29 'change in branch B (removal)': 
-	git update-index --remove $to_remove
-
-ok 29 - change in branch B (removal)
-
-expecting success of 1000.30 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 30 - change in branch B (modification)
-
-expecting success of 1000.31 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 31 - change in branch B (modification)
-
-expecting success of 1000.32 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 32 - change in branch B (modification)
-
-expecting success of 1000.33 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 33 - change in branch B (modification)
-
-expecting success of 1000.34 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 34 - change in branch B (modification)
-
-expecting success of 1000.35 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 35 - change in branch B (modification)
-
-expecting success of 1000.36 'change in branch B (addition)': 
-		git update-index --add $p
-	
-ok 36 - change in branch B (addition)
-
-expecting success of 1000.37 'change in branch B (addition)': 
-		git update-index --add $p
-	
-ok 37 - change in branch B (addition)
-
-expecting success of 1000.38 'change in branch B (addition)': 
-		git update-index --add $p
-	
-ok 38 - change in branch B (addition)
-
-expecting success of 1000.39 'change in branch B (addition)': 
-		git update-index --add $p
-	
-ok 39 - change in branch B (addition)
-
-expecting success of 1000.40 'change in branch B (addition and modification)': 
-	git update-index --add LL &&
-	git update-index SS
-
-ok 40 - change in branch B (addition and modification)
-
-expecting success of 1000.41 'change in branch B (modification)': 
-	git update-index TT
-
-ok 41 - change in branch B (modification)
-
-expecting success of 1000.42 'change in branch B (addition of a file to conflict with directory)': 
-	git update-index --add DF
-
-ok 42 - change in branch B (addition of a file to conflict with directory)
-
-expecting success of 1000.43 'recording branch B tree': 
-	tree_B=$(git write-tree)
-
-ok 43 - recording branch B tree
-
-expecting success of 1000.44 'keep contents of 3 trees for easy access': 
-	rm -f .git/index &&
-	git read-tree $tree_O &&
-	mkdir .orig-O &&
-	git checkout-index --prefix=.orig-O/ -f -q -a &&
-	rm -f .git/index &&
-	git read-tree $tree_A &&
-	mkdir .orig-A &&
-	git checkout-index --prefix=.orig-A/ -f -q -a &&
-	rm -f .git/index &&
-	git read-tree $tree_B &&
-	mkdir .orig-B &&
-	git checkout-index --prefix=.orig-B/ -f -q -a
-
-ok 44 - keep contents of 3 trees for easy access
-
-expecting success of 1000.45 '3-way merge with git read-tree -m, empty cache': 
-	rm -fr [NDMALTS][NDMALTSF] Z &&
-	rm .git/index &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 45 - 3-way merge with git read-tree -m, empty cache
-
-expecting success of 1000.46 '3-way merge with git read-tree -m, match H': 
-	rm -fr [NDMALTS][NDMALTSF] Z &&
-	rm .git/index &&
-	read_tree_must_succeed $tree_A &&
-	git checkout-index -f -u -a &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 46 - 3-way merge with git read-tree -m, match H
-
-expecting success of 1000.47 '1 - must not have an entry not in A.': 
-	rm -f .git/index XX &&
-	echo XX >XX &&
-	git update-index --add XX &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'XX' would be overwritten by merge. Cannot merge.
-error: Entry 'XX' would be overwritten by merge. Cannot merge.
-ok 47 - 1 - must not have an entry not in A.
-
-expecting success of 1000.48 '2 - must match B in !O && !A && B case.': 
-	rm -f .git/index NA &&
-	cp .orig-B/NA NA &&
-	git update-index --add NA &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B
-
-ok 48 - 2 - must match B in !O && !A && B case.
-
-expecting success of 1000.49 '2 - matching B alone is OK in !O && !A && B case.': 
-	rm -f .git/index NA &&
-	cp .orig-B/NA NA &&
-	git update-index --add NA &&
-	echo extra >>NA &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B
-
-ok 49 - 2 - matching B alone is OK in !O && !A && B case.
-
-expecting success of 1000.50 '3 - must match A in !O && A && !B case.': 
-	rm -f .git/index AN &&
-	cp .orig-A/AN AN &&
-	git update-index --add AN &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 50 - 3 - must match A in !O && A && !B case.
-
-expecting success of 1000.51 '3 - matching A alone is OK in !O && A && !B case.': 
-	rm -f .git/index AN &&
-	cp .orig-A/AN AN &&
-	git update-index --add AN &&
-	echo extra >>AN &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B
-
-ok 51 - 3 - matching A alone is OK in !O && A && !B case.
-
-expecting success of 1000.52 '3 (fail) - must match A in !O && A && !B case.': 
-	rm -f .git/index AN &&
-	cp .orig-A/AN AN &&
-	echo extra >>AN &&
-	git update-index --add AN &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'AN' would be overwritten by merge. Cannot merge.
-error: Entry 'AN' would be overwritten by merge. Cannot merge.
-ok 52 - 3 (fail) - must match A in !O && A && !B case.
-
-expecting success of 1000.53 '4 - must match and be up-to-date in !O && A && B && A!=B case.': 
-	rm -f .git/index AA &&
-	cp .orig-A/AA AA &&
-	git update-index --add AA &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 53 - 4 - must match and be up-to-date in !O && A && B && A!=B case.
-
-expecting success of 1000.54 '4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.': 
-	rm -f .git/index AA &&
-	cp .orig-A/AA AA &&
-	git update-index --add AA &&
-	echo extra >>AA &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'AA' not uptodate. Cannot merge.
-error: Entry 'AA' not uptodate. Cannot merge.
-ok 54 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
-
-expecting success of 1000.55 '4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.': 
-	rm -f .git/index AA &&
-	cp .orig-A/AA AA &&
-	echo extra >>AA &&
-	git update-index --add AA &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'AA' would be overwritten by merge. Cannot merge.
-error: Entry 'AA' would be overwritten by merge. Cannot merge.
-ok 55 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
-
-expecting success of 1000.56 '5 - must match in !O && A && B && A==B case.': 
-	rm -f .git/index LL &&
-	cp .orig-A/LL LL &&
-	git update-index --add LL &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 56 - 5 - must match in !O && A && B && A==B case.
-
-expecting success of 1000.57 '5 - must match in !O && A && B && A==B case.': 
-	rm -f .git/index LL &&
-	cp .orig-A/LL LL &&
-	git update-index --add LL &&
-	echo extra >>LL &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 57 - 5 - must match in !O && A && B && A==B case.
-
-expecting success of 1000.58 '5 (fail) - must match A in !O && A && B && A==B case.': 
-	rm -f .git/index LL &&
-	cp .orig-A/LL LL &&
-	echo extra >>LL &&
-	git update-index --add LL &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'LL' would be overwritten by merge. Cannot merge.
-error: Entry 'LL' would be overwritten by merge. Cannot merge.
-ok 58 - 5 (fail) - must match A in !O && A && B && A==B case.
-
-expecting success of 1000.59 '6 - must not exist in O && !A && !B case': 
-	rm -f .git/index DD &&
-	echo DD >DD &&
-	git update-index --add DD &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'DD' would be overwritten by merge. Cannot merge.
-error: Entry 'DD' would be overwritten by merge. Cannot merge.
-ok 59 - 6 - must not exist in O && !A && !B case
-
-expecting success of 1000.60 '7 - must not exist in O && !A && B && O!=B case': 
-	rm -f .git/index DM &&
-	cp .orig-B/DM DM &&
-	git update-index --add DM &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'DM' would be overwritten by merge. Cannot merge.
-error: Entry 'DM' would be overwritten by merge. Cannot merge.
-ok 60 - 7 - must not exist in O && !A && B && O!=B case
-
-expecting success of 1000.61 '8 - must not exist in O && !A && B && O==B case': 
-	rm -f .git/index DN &&
-	cp .orig-B/DN DN &&
-	git update-index --add DN &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'DN' would be overwritten by merge. Cannot merge.
-error: Entry 'DN' would be overwritten by merge. Cannot merge.
-ok 61 - 8 - must not exist in O && !A && B && O==B case
-
-expecting success of 1000.62 '9 - must match and be up-to-date in O && A && !B && O!=A case': 
-	rm -f .git/index MD &&
-	cp .orig-A/MD MD &&
-	git update-index --add MD &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 62 - 9 - must match and be up-to-date in O && A && !B && O!=A case
-
-expecting success of 1000.63 '9 (fail) - must match and be up-to-date in O && A && !B && O!=A case': 
-	rm -f .git/index MD &&
-	cp .orig-A/MD MD &&
-	git update-index --add MD &&
-	echo extra >>MD &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'MD' not uptodate. Cannot merge.
-error: Entry 'MD' not uptodate. Cannot merge.
-ok 63 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
-
-expecting success of 1000.64 '9 (fail) - must match and be up-to-date in O && A && !B && O!=A case': 
-	rm -f .git/index MD &&
-	cp .orig-A/MD MD &&
-	echo extra >>MD &&
-	git update-index --add MD &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'MD' would be overwritten by merge. Cannot merge.
-error: Entry 'MD' would be overwritten by merge. Cannot merge.
-ok 64 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
-
-expecting success of 1000.65 '10 - must match and be up-to-date in O && A && !B && O==A case': 
-	rm -f .git/index ND &&
-	cp .orig-A/ND ND &&
-	git update-index --add ND &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 65 - 10 - must match and be up-to-date in O && A && !B && O==A case
-
-expecting success of 1000.66 '10 (fail) - must match and be up-to-date in O && A && !B && O==A case': 
-	rm -f .git/index ND &&
-	cp .orig-A/ND ND &&
-	git update-index --add ND &&
-	echo extra >>ND &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'ND' not uptodate. Cannot merge.
-error: Entry 'ND' not uptodate. Cannot merge.
-ok 66 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
-
-expecting success of 1000.67 '10 (fail) - must match and be up-to-date in O && A && !B && O==A case': 
-	rm -f .git/index ND &&
-	cp .orig-A/ND ND &&
-	echo extra >>ND &&
-	git update-index --add ND &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'ND' would be overwritten by merge. Cannot merge.
-error: Entry 'ND' would be overwritten by merge. Cannot merge.
-ok 67 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
-
-expecting success of 1000.68 '11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case': 
-	rm -f .git/index MM &&
-	cp .orig-A/MM MM &&
-	git update-index --add MM &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 68 - 11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
-
-expecting success of 1000.69 '11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case': 
-	rm -f .git/index MM &&
-	cp .orig-A/MM MM &&
-	git update-index --add MM &&
-	echo extra >>MM &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'MM' not uptodate. Cannot merge.
-error: Entry 'MM' not uptodate. Cannot merge.
-ok 69 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
-
-expecting success of 1000.70 '11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case': 
-	rm -f .git/index MM &&
-	cp .orig-A/MM MM &&
-	echo extra >>MM &&
-	git update-index --add MM &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'MM' would be overwritten by merge. Cannot merge.
-error: Entry 'MM' would be overwritten by merge. Cannot merge.
-ok 70 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
-
-expecting success of 1000.71 '12 - must match A in O && A && B && O!=A && A==B case': 
-	rm -f .git/index SS &&
-	cp .orig-A/SS SS &&
-	git update-index --add SS &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 71 - 12 - must match A in O && A && B && O!=A && A==B case
-
-expecting success of 1000.72 '12 - must match A in O && A && B && O!=A && A==B case': 
-	rm -f .git/index SS &&
-	cp .orig-A/SS SS &&
-	git update-index --add SS &&
-	echo extra >>SS &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 72 - 12 - must match A in O && A && B && O!=A && A==B case
-
-expecting success of 1000.73 '12 (fail) - must match A in O && A && B && O!=A && A==B case': 
-	rm -f .git/index SS &&
-	cp .orig-A/SS SS &&
-	echo extra >>SS &&
-	git update-index --add SS &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'SS' would be overwritten by merge. Cannot merge.
-error: Entry 'SS' would be overwritten by merge. Cannot merge.
-ok 73 - 12 (fail) - must match A in O && A && B && O!=A && A==B case
-
-expecting success of 1000.74 '13 - must match A in O && A && B && O!=A && O==B case': 
-	rm -f .git/index MN &&
-	cp .orig-A/MN MN &&
-	git update-index --add MN &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 74 - 13 - must match A in O && A && B && O!=A && O==B case
-
-expecting success of 1000.75 '13 - must match A in O && A && B && O!=A && O==B case': 
-	rm -f .git/index MN &&
-	cp .orig-A/MN MN &&
-	git update-index --add MN &&
-	echo extra >>MN &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 75 - 13 - must match A in O && A && B && O!=A && O==B case
-
-expecting success of 1000.76 '14 - must match and be up-to-date in O && A && B && O==A && O!=B case': 
-	rm -f .git/index NM &&
-	cp .orig-A/NM NM &&
-	git update-index --add NM &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 76 - 14 - must match and be up-to-date in O && A && B && O==A && O!=B case
-
-expecting success of 1000.77 '14 - may match B in O && A && B && O==A && O!=B case': 
-	rm -f .git/index NM &&
-	cp .orig-B/NM NM &&
-	git update-index --add NM &&
-	echo extra >>NM &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 77 - 14 - may match B in O && A && B && O==A && O!=B case
-
-expecting success of 1000.78 '14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case': 
-	rm -f .git/index NM &&
-	cp .orig-A/NM NM &&
-	git update-index --add NM &&
-	echo extra >>NM &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'NM' not uptodate. Cannot merge.
-error: Entry 'NM' not uptodate. Cannot merge.
-ok 78 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
-
-expecting success of 1000.79 '14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case': 
-	rm -f .git/index NM &&
-	cp .orig-A/NM NM &&
-	echo extra >>NM &&
-	git update-index --add NM &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'NM' would be overwritten by merge. Cannot merge.
-error: Entry 'NM' would be overwritten by merge. Cannot merge.
-ok 79 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
-
-expecting success of 1000.80 '15 - must match A in O && A && B && O==A && O==B case': 
-	rm -f .git/index NN &&
-	cp .orig-A/NN NN &&
-	git update-index --add NN &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 80 - 15 - must match A in O && A && B && O==A && O==B case
-
-expecting success of 1000.81 '15 - must match A in O && A && B && O==A && O==B case': 
-	rm -f .git/index NN &&
-	cp .orig-A/NN NN &&
-	git update-index --add NN &&
-	echo extra >>NN &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 81 - 15 - must match A in O && A && B && O==A && O==B case
-
-expecting success of 1000.82 '15 (fail) - must match A in O && A && B && O==A && O==B case': 
-	rm -f .git/index NN &&
-	cp .orig-A/NN NN &&
-	echo extra >>NN &&
-	git update-index --add NN &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'NN' would be overwritten by merge. Cannot merge.
-error: Entry 'NN' would be overwritten by merge. Cannot merge.
-ok 82 - 15 (fail) - must match A in O && A && B && O==A && O==B case
-
-expecting success of 1000.83 '16 - A matches in one and B matches in another.': 
-	rm -f .git/index F16 &&
-	echo F16 >F16 &&
-	git update-index --add F16 &&
-	tree0=$(git write-tree) &&
-	echo E16 >F16 &&
-	git update-index F16 &&
-	tree1=$(git write-tree) &&
-	read_tree_must_succeed -m $tree0 $tree1 $tree1 $tree0 &&
-	git ls-files --stage
-
-100644 ecbec6db011caa3ae26739812f092f76875fe6b6 2	F16
-100644 bcf4afda2c30299bf6538240d40bcb8fb3857691 3	F16
-ok 83 - 16 - A matches in one and B matches in another.
-
-# passed all 83 test(s)
-1..83
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0000-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0000-basic/.git/
-expecting success of 0000.1 'verify that the running shell supports "local"': 
-	x="notlocal" &&
-	y="alsonotlocal" &&
-	echo "local alsolocal" >expected1 &&
-	try_local_xy >actual1 &&
-	test_cmp expected1 actual1 &&
-	echo "notlocal alsonotlocal" >expected2 &&
-	echo "$x $y" >actual2 &&
-	test_cmp expected2 actual2
-
-ok 1 - verify that the running shell supports "local"
-
-expecting success of 0000.2 '.git/objects should be empty after git init in an empty repo': 
-	find .git/objects -type f -print >should-be-empty &&
-	test_line_count = 0 should-be-empty
-
-ok 2 - .git/objects should be empty after git init in an empty repo
-
-expecting success of 0000.3 '.git/objects should have 3 subdirectories': 
-	find .git/objects -type d -print >full-of-directories &&
-	test_line_count = 3 full-of-directories
-
-ok 3 - .git/objects should have 3 subdirectories
-
-expecting success of 0000.4 'success is reported like this': 
-	:
-
-ok 4 - success is reported like this
-
-expecting success of 0000.5 'subtest: 3 passing tests': 
-	write_and_run_sub_test_lib_test full-pass <<-\EOF &&
-	for i in 1 2 3
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test full-pass <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 - passing test #3
-	> # passed all 3 test(s)
-	> 1..3
-	EOF
-
-ok 5 - subtest: 3 passing tests
-
-expecting success of 0000.6 'subtest: 2/3 tests passing': 
-	write_and_run_sub_test_lib_test_err partial-pass <<-\EOF &&
-	test_expect_success "passing test #1" "true"
-	test_expect_success "failing test #2" "false"
-	test_expect_success "passing test #3" "true"
-	test_done
-	EOF
-	check_sub_test_lib_test partial-pass <<-\EOF
-	> ok 1 - passing test #1
-	> not ok 2 - failing test #2
-	#	false
-	> ok 3 - passing test #3
-	> # failed 1 among 3 test(s)
-	> 1..3
-	EOF
-
-ok 6 - subtest: 2/3 tests passing
-
-expecting success of 0000.7 'subtest: --immediate': 
-	run_sub_test_lib_test_err partial-pass \
-		--immediate &&
-	check_sub_test_lib_test_err partial-pass \
-		<<-\EOF_OUT 3<<-EOF_ERR
-	> ok 1 - passing test #1
-	> not ok 2 - failing test #2
-	> #	false
-	> 1..2
-	EOF_OUT
-	EOF_ERR
-
-ok 7 - subtest: --immediate
-
-expecting success of 0000.8 'subtest: a failing TODO test': 
-	write_and_run_sub_test_lib_test failing-todo <<-\EOF &&
-	test_expect_success "passing test" "true"
-	test_expect_failure "pretend we have a known breakage" "false"
-	test_done
-	EOF
-	check_sub_test_lib_test failing-todo <<-\EOF
-	> ok 1 - passing test
-	> not ok 2 - pretend we have a known breakage # TODO known breakage
-	> # still have 1 known breakage(s)
-	> # passed all remaining 1 test(s)
-	> 1..2
-	EOF
-
-ok 8 - subtest: a failing TODO test
-
-expecting success of 0000.9 'subtest: a passing TODO test': 
-	write_and_run_sub_test_lib_test_err passing-todo <<-\EOF &&
-	test_expect_failure "pretend we have fixed a known breakage" "true"
-	test_done
-	EOF
-	check_sub_test_lib_test passing-todo <<-\EOF
-	> ok 1 - pretend we have fixed a known breakage # TODO known breakage vanished
-	> # 1 known breakage(s) vanished; please update test(s)
-	> 1..1
-	EOF
-
-ok 9 - subtest: a passing TODO test
-
-expecting success of 0000.10 'subtest: 2 TODO tests, one passin': 
-	write_and_run_sub_test_lib_test_err partially-passing-todos <<-\EOF &&
-	test_expect_failure "pretend we have a known breakage" "false"
-	test_expect_success "pretend we have a passing test" "true"
-	test_expect_failure "pretend we have fixed another known breakage" "true"
-	test_done
-	EOF
-	check_sub_test_lib_test partially-passing-todos <<-\EOF
-	> not ok 1 - pretend we have a known breakage # TODO known breakage
-	> ok 2 - pretend we have a passing test
-	> ok 3 - pretend we have fixed another known breakage # TODO known breakage vanished
-	> # 1 known breakage(s) vanished; please update test(s)
-	> # still have 1 known breakage(s)
-	> # passed all remaining 1 test(s)
-	> 1..3
-	EOF
-
-ok 10 - subtest: 2 TODO tests, one passin
-
-expecting success of 0000.11 'subtest: mixed results: pass, failure and a TODO test': 
-	write_and_run_sub_test_lib_test_err mixed-results1 <<-\EOF &&
-	test_expect_success "passing test" "true"
-	test_expect_success "failing test" "false"
-	test_expect_failure "pretend we have a known breakage" "false"
-	test_done
-	EOF
-	check_sub_test_lib_test mixed-results1 <<-\EOF
-	> ok 1 - passing test
-	> not ok 2 - failing test
-	> #	false
-	> not ok 3 - pretend we have a known breakage # TODO known breakage
-	> # still have 1 known breakage(s)
-	> # failed 1 among remaining 2 test(s)
-	> 1..3
-	EOF
-
-ok 11 - subtest: mixed results: pass, failure and a TODO test
-
-expecting success of 0000.12 'subtest: mixed results: a mixture of all possible results': 
-	write_and_run_sub_test_lib_test_err mixed-results2 <<-\EOF &&
-	test_expect_success "passing test" "true"
-	test_expect_success "passing test" "true"
-	test_expect_success "passing test" "true"
-	test_expect_success "passing test" "true"
-	test_expect_success "failing test" "false"
-	test_expect_success "failing test" "false"
-	test_expect_success "failing test" "false"
-	test_expect_failure "pretend we have a known breakage" "false"
-	test_expect_failure "pretend we have a known breakage" "false"
-	test_expect_failure "pretend we have fixed a known breakage" "true"
-	test_done
-	EOF
-	check_sub_test_lib_test mixed-results2 <<-\EOF
-	> ok 1 - passing test
-	> ok 2 - passing test
-	> ok 3 - passing test
-	> ok 4 - passing test
-	> not ok 5 - failing test
-	> #	false
-	> not ok 6 - failing test
-	> #	false
-	> not ok 7 - failing test
-	> #	false
-	> not ok 8 - pretend we have a known breakage # TODO known breakage
-	> not ok 9 - pretend we have a known breakage # TODO known breakage
-	> ok 10 - pretend we have fixed a known breakage # TODO known breakage vanished
-	> # 1 known breakage(s) vanished; please update test(s)
-	> # still have 2 known breakage(s)
-	> # failed 3 among remaining 7 test(s)
-	> 1..10
-	EOF
-
-ok 12 - subtest: mixed results: a mixture of all possible results
-
-expecting success of 0000.13 'subtest: --verbose option': 
-	write_and_run_sub_test_lib_test_err t1234-verbose --verbose <<-\EOF &&
-	test_expect_success "passing test" true
-	test_expect_success "test with output" "echo foo"
-	test_expect_success "failing test" false
-	test_done
-	EOF
-	mv t1234-verbose/err t1234-verbose/err+ &&
-	grep -v "^Initialized empty" t1234-verbose/err+ >t1234-verbose/err &&
-	check_sub_test_lib_test_err t1234-verbose \
-		<<-\EOF_OUT 3<<-\EOF_ERR
-	> ok 1 - passing test
-	> ok 2 - test with output
-	> not ok 3 - failing test
-	> #	false
-	> # failed 1 among 3 test(s)
-	> 1..3
-	EOF_OUT
-	> expecting success of 1234.1 'passing test': true
-	> Z
-	> expecting success of 1234.2 'test with output': echo foo
-	> foo
-	> Z
-	> expecting success of 1234.3 'failing test': false
-	> Z
-	EOF_ERR
-
-ok 13 - subtest: --verbose option
-
-expecting success of 0000.14 'subtest: --verbose-only option': 
-	run_sub_test_lib_test_err \
-		t1234-verbose \
-		--verbose-only=2 &&
-	check_sub_test_lib_test_err t1234-verbose <<-\EOF_OUT 3<<-\EOF_ERR
-	> ok 1 - passing test
-	> ok 2 - test with output
-	> not ok 3 - failing test
-	> #	false
-	> # failed 1 among 3 test(s)
-	> 1..3
-	EOF_OUT
-	> Z
-	> expecting success of 1234.2 'test with output': echo foo
-	> foo
-	> Z
-	EOF_ERR
-
-ok 14 - subtest: --verbose-only option
-
-expecting success of 0000.15 'subtest: skip one with GIT_SKIP_TESTS': 
-	(
-		run_sub_test_lib_test full-pass \
-			--skip="full.2" &&
-		check_sub_test_lib_test full-pass <<-\EOF
-		> ok 1 - passing test #1
-		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
-		> ok 3 - passing test #3
-		> # passed all 3 test(s)
-		> 1..3
-		EOF
-	)
-
-ok 15 - subtest: skip one with GIT_SKIP_TESTS
-
-expecting success of 0000.16 'subtest: skip several with GIT_SKIP_TESTS': 
-	(
-		write_and_run_sub_test_lib_test git-skip-tests-several \
-			--skip="git.2 git.5" <<-\EOF &&
-		for i in 1 2 3 4 5 6
-		do
-			test_expect_success "passing test #$i" "true"
-		done
-		test_done
-		EOF
-		check_sub_test_lib_test git-skip-tests-several <<-\EOF
-		> ok 1 - passing test #1
-		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
-		> ok 3 - passing test #3
-		> ok 4 - passing test #4
-		> ok 5 # skip passing test #5 (GIT_SKIP_TESTS)
-		> ok 6 - passing test #6
-		> # passed all 6 test(s)
-		> 1..6
-		EOF
-	)
-
-ok 16 - subtest: skip several with GIT_SKIP_TESTS
-
-expecting success of 0000.17 'subtest: sh pattern skipping with GIT_SKIP_TESTS': 
-	(
-		run_sub_test_lib_test git-skip-tests-several \
-			--skip="git.[2-5]" &&
-		check_sub_test_lib_test git-skip-tests-several <<-\EOF
-		> ok 1 - passing test #1
-		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
-		> ok 3 # skip passing test #3 (GIT_SKIP_TESTS)
-		> ok 4 # skip passing test #4 (GIT_SKIP_TESTS)
-		> ok 5 # skip passing test #5 (GIT_SKIP_TESTS)
-		> ok 6 - passing test #6
-		> # passed all 6 test(s)
-		> 1..6
-		EOF
-	)
-
-ok 17 - subtest: sh pattern skipping with GIT_SKIP_TESTS
-
-expecting success of 0000.18 'subtest: skip entire test suite with GIT_SKIP_TESTS': 
-	(
-		GIT_SKIP_TESTS="git" && export GIT_SKIP_TESTS &&
-		run_sub_test_lib_test git-skip-tests-several \
-			--skip="git" &&
-		check_sub_test_lib_test git-skip-tests-several <<-\EOF
-		> 1..0 # SKIP skip all tests in git
-		EOF
-	)
-
-ok 18 - subtest: skip entire test suite with GIT_SKIP_TESTS
-
-expecting success of 0000.19 'subtest: GIT_SKIP_TESTS does not skip unmatched suite': 
-	(
-		GIT_SKIP_TESTS="notgit" && export GIT_SKIP_TESTS &&
-		run_sub_test_lib_test full-pass \
-			--skip="notfull" &&
-		check_sub_test_lib_test full-pass <<-\EOF
-		> ok 1 - passing test #1
-		> ok 2 - passing test #2
-		> ok 3 - passing test #3
-		> # passed all 3 test(s)
-		> 1..3
-		EOF
-	)
-
-ok 19 - subtest: GIT_SKIP_TESTS does not skip unmatched suite
-
-expecting success of 0000.20 'subtest: --run basic': 
-	run_sub_test_lib_test git-skip-tests-several --run="1,3,5" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 # skip passing test #2 (--run)
-	> ok 3 - passing test #3
-	> ok 4 # skip passing test #4 (--run)
-	> ok 5 - passing test #5
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
-
-ok 20 - subtest: --run basic
-
-expecting success of 0000.21 'subtest: --run with a range': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="1-3" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 - passing test #3
-	> ok 4 # skip passing test #4 (--run)
-	> ok 5 # skip passing test #5 (--run)
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
-
-ok 21 - subtest: --run with a range
-
-expecting success of 0000.22 'subtest: --run with two ranges': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="1-2,5-6" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 # skip passing test #4 (--run)
-	> ok 5 - passing test #5
-	> ok 6 - passing test #6
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
-
-ok 22 - subtest: --run with two ranges
-
-expecting success of 0000.23 'subtest: --run with a left open range': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="-3" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 - passing test #3
-	> ok 4 # skip passing test #4 (--run)
-	> ok 5 # skip passing test #5 (--run)
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
-
-ok 23 - subtest: --run with a left open range
-
-expecting success of 0000.24 'subtest: --run with a right open range': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="4-" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 # skip passing test #1 (--run)
-	> ok 2 # skip passing test #2 (--run)
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 - passing test #4
-	> ok 5 - passing test #5
-	> ok 6 - passing test #6
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
-
-ok 24 - subtest: --run with a right open range
-
-expecting success of 0000.25 'subtest: --run with basic negation': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="!3" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 - passing test #4
-	> ok 5 - passing test #5
-	> ok 6 - passing test #6
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
-
-ok 25 - subtest: --run with basic negation
-
-expecting success of 0000.26 'subtest: --run with two negations': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="!3,!6" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 - passing test #4
-	> ok 5 - passing test #5
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
-
-ok 26 - subtest: --run with two negations
-
-expecting success of 0000.27 'subtest: --run a range and negation': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="-4,!2" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 # skip passing test #2 (--run)
-	> ok 3 - passing test #3
-	> ok 4 - passing test #4
-	> ok 5 # skip passing test #5 (--run)
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
-
-ok 27 - subtest: --run a range and negation
-
-expecting success of 0000.28 'subtest: --run range negation': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="!1-3" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 # skip passing test #1 (--run)
-	> ok 2 # skip passing test #2 (--run)
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 - passing test #4
-	> ok 5 - passing test #5
-	> ok 6 - passing test #6
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
-
-ok 28 - subtest: --run range negation
-
-expecting success of 0000.29 'subtest: --run include, exclude and include': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="1-5,!1-3,2" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 # skip passing test #1 (--run)
-	> ok 2 - passing test #2
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 - passing test #4
-	> ok 5 - passing test #5
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
-
-ok 29 - subtest: --run include, exclude and include
-
-expecting success of 0000.30 'subtest: --run include, exclude and include, comma separated': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run=1-5,!1-3,2 &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 # skip passing test #1 (--run)
-	> ok 2 - passing test #2
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 - passing test #4
-	> ok 5 - passing test #5
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
-
-ok 30 - subtest: --run include, exclude and include, comma separated
-
-expecting success of 0000.31 'subtest: --run exclude and include': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="!3-,5" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 # skip passing test #4 (--run)
-	> ok 5 - passing test #5
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
-
-ok 31 - subtest: --run exclude and include
-
-expecting success of 0000.32 'subtest: --run empty selectors': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="1,,3,,,5" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 # skip passing test #2 (--run)
-	> ok 3 - passing test #3
-	> ok 4 # skip passing test #4 (--run)
-	> ok 5 - passing test #5
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
-
-ok 32 - subtest: --run empty selectors
-
-expecting success of 0000.33 'subtest: --run substring selector': 
-	write_and_run_sub_test_lib_test run-substring-selector \
-		--run="relevant" <<-\EOF &&
-	test_expect_success "relevant test" "true"
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "other test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-substring-selector <<-\EOF
-	> ok 1 - relevant test
-	> ok 2 # skip other test #1 (--run)
-	> ok 3 # skip other test #2 (--run)
-	> ok 4 # skip other test #3 (--run)
-	> ok 5 # skip other test #4 (--run)
-	> ok 6 # skip other test #5 (--run)
-	> ok 7 # skip other test #6 (--run)
-	> # passed all 7 test(s)
-	> 1..7
-	EOF
-
-ok 33 - subtest: --run substring selector
-
-expecting success of 0000.34 'subtest: --run keyword selection': 
-	write_and_run_sub_test_lib_test_err run-inv-range-start \
-		--run="a-5" <<-\EOF &&
-	test_expect_success "passing test #1" "true"
-	test_done
-	EOF
-	check_sub_test_lib_test_err run-inv-range-start \
-		<<-\EOF_OUT 3<<-EOF_ERR
-	> FATAL: Unexpected exit with code 1
-	EOF_OUT
-	> error: --run: invalid non-numeric in range start: ${SQ}a-5${SQ}
-	EOF_ERR
-
-ok 34 - subtest: --run keyword selection
+ok 34 - subtest: --run keyword selection
 
 expecting success of 0000.35 'subtest: --run invalid range end': 
 	run_sub_test_lib_test_err run-inv-range-start \
@@ -40479,7 +39366,7 @@
 	grep "echo trace" lazy-prereq-and-tracing/err
 
 expecting success of lazy.1 'lazy': test_have_prereq LAZY && echo trace
-+ 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': 
@@ -41029,236 +39916,390 @@
 1..92
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1004-read-tree-m-u-wf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1004-read-tree-m-u-wf/.git/
-expecting success of 1004.1 'two-way setup': 
+*** t0600-reffiles-backend.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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)
 
-	mkdir subdir &&
-	echo >file1 file one &&
-	echo >file2 file two &&
-	echo >subdir/file1 file one in subdirectory &&
-	echo >subdir/file2 file two in subdirectory &&
-	git update-index --add file1 file2 subdir/file1 subdir/file2 &&
-	git commit -m initial &&
+[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
 
-	git branch side &&
-	git tag -f branch-point &&
+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
 
-	echo file2 is not tracked on the main branch anymore &&
-	rm -f file2 subdir/file2 &&
-	git update-index --remove file2 subdir/file2 &&
-	git commit -a -m "main removes file2 and subdir/file2"
+ok 2 - empty directory should not fool rev-parse
 
-[main (root-commit) eb5336a] initial
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
- create mode 100644 subdir/file1
- create mode 100644 subdir/file2
-file2 is not tracked on the main branch anymore
-[main dbb6421] main removes file2 and subdir/file2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 deletions(-)
- delete mode 100644 file2
- delete mode 100644 subdir/file2
-ok 1 - two-way setup
+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
 
-expecting success of 1004.2 'two-way not clobbering': 
+ok 3 - empty directory should not fool for-each-ref
 
-	echo >file2 main creates untracked file2 &&
-	echo >subdir/file2 main creates untracked subdir/file2 &&
-	if err=$(read_tree_u_must_succeed -m -u main side 2>&1)
-	then
-		echo should have complained
-		false
-	else
-		echo "happy to see $err"
-	fi
+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
 
-happy to see error: Untracked working tree file 'file2' would be overwritten by merge.
-ok 2 - two-way not clobbering
+ok 4 - empty directory should not fool create
 
-expecting success of 1004.3 'two-way with incorrect --exclude-per-directory (1)': 
+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
 
-	if err=$(read_tree_u_must_succeed -m --exclude-per-directory=.gitignore main side 2>&1)
-	then
-		echo should have complained
-		false
-	else
-		echo "happy to see $err"
-	fi
+ok 5 - empty directory should not fool verify
 
-happy to see fatal: --exclude-per-directory is meaningless unless -u
-ok 3 - two-way with incorrect --exclude-per-directory (1)
+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
 
-expecting success of 1004.4 'two-way with incorrect --exclude-per-directory (2)': 
+ok 6 - empty directory should not fool 1-arg update
 
-	if err=$(read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore main side 2>&1)
-	then
-		echo should have complained
-		false
-	else
-		echo "happy to see $err"
-	fi
+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
 
-happy to see fatal: --exclude-per-directory argument must be .gitignore
-ok 4 - two-way with incorrect --exclude-per-directory (2)
+ok 7 - empty directory should not fool 2-arg update
 
-expecting success of 1004.5 'two-way clobbering a ignored file': 
+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
 
-	read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore main side
+ok 8 - empty directory should not fool 0-arg delete
 
-ok 5 - two-way clobbering a ignored file
+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
 
-expecting success of 1004.6 'three-way not complaining on an untracked path in both': 
+ok 9 - empty directory should not fool 1-arg delete
 
-	rm -f file2 subdir/file2 &&
-	git checkout side &&
-	echo >file3 file three &&
-	echo >subdir/file3 file three &&
-	git update-index --add file3 subdir/file3 &&
-	git commit -a -m "side adds file3 and removes file2" &&
+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
 
-	git checkout main &&
-	echo >file2 file two is untracked on the main side &&
-	echo >subdir/file2 file two is untracked on the main side &&
+ok 10 - non-empty directory blocks create
 
-	read_tree_u_must_succeed -m -u branch-point main side
+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
 
-Switched to branch 'side'
-D	file2
-D	subdir/file2
-[side 4be225f] side adds file3 and removes file2
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+), 2 deletions(-)
- delete mode 100644 file2
- create mode 100644 file3
- delete mode 100644 subdir/file2
- create mode 100644 subdir/file3
-Switched to branch 'main'
-ok 6 - three-way not complaining on an untracked path in both
+ok 11 - broken reference blocks create
 
-expecting success of 1004.7 'three-way not clobbering a working tree file': 
+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
 
-	git reset --hard &&
-	rm -f file2 subdir/file2 file3 subdir/file3 &&
-	git checkout main &&
-	echo >file3 file three created in main, untracked &&
-	echo >subdir/file3 file three created in main, untracked &&
-	if err=$(read_tree_u_must_succeed -m -u branch-point main side 2>&1)
-	then
-		echo should have complained
-		false
-	else
-		echo "happy to see $err"
-	fi
+ok 12 - non-empty directory blocks indirect create
 
-HEAD is now at dbb6421 main removes file2 and subdir/file2
-Already on 'main'
-happy to see error: Untracked working tree file 'file3' would be overwritten by merge.
-ok 7 - three-way not clobbering a working tree file
+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
 
-expecting success of 1004.8 'three-way not complaining on an untracked file': 
+ok 13 - broken reference blocks indirect create
 
-	git reset --hard &&
-	rm -f file2 subdir/file2 file3 subdir/file3 &&
-	git checkout main &&
-	echo >file3 file three created in main, untracked &&
-	echo >subdir/file3 file three created in main, untracked &&
+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
 
-	read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore branch-point main side
+ok 14 - no bogus intermediate values during delete
 
-HEAD is now at dbb6421 main removes file2 and subdir/file2
-Already on 'main'
-ok 8 - three-way not complaining on an untracked file
+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
 
-expecting success of 1004.9 '3-way not overwriting local changes (setup)': 
+error: Unable to create '/build/reproducible-path/git-2.51.0/t/trash directory.t0600-reffiles-backend/.git/packed-refs.lock': File exists.
+ok 15 - delete fails cleanly if packed-refs file is locked
 
-	git reset --hard &&
-	git checkout -b side-a branch-point &&
-	echo >>file1 "new line to be kept in the merge result" &&
-	git commit -a -m "side-a changes file1" &&
-	git checkout -b side-b branch-point &&
-	echo >>file2 "new line to be kept in the merge result" &&
-	git commit -a -m "side-b changes file2" &&
-	git checkout side-a
+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.51.0/t/trash directory.t0600-reffiles-backend/.git/packed-refs.new: File exists
+ok 16 - delete fails cleanly if packed-refs.new write fails
 
-HEAD is now at dbb6421 main removes file2 and subdir/file2
-Switched to a new branch 'side-a'
-[side-a 67c0594] side-a changes file1
+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(+)
-Switched to a new branch 'side-b'
-[side-b 3ad988a] side-b changes file2
+ 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(+)
-Switched to branch 'side-a'
-ok 9 - 3-way not overwriting local changes (setup)
-
-expecting success of 1004.10 '3-way not overwriting local changes (our side)': 
-
-	# At this point, file1 from side-a should be kept as side-b
-	# did not touch it.
-
-	git reset --hard &&
-
-	echo >>file1 "local changes" &&
-	read_tree_u_must_succeed -m -u branch-point side-a side-b &&
-	grep "new line to be kept" file1 &&
-	grep "local changes" file1
-
+ create mode 100644 second.t
+ok 17 - setup worktree
 
-HEAD is now at 67c0594 side-a changes file1
-new line to be kept in the merge result
-local changes
-ok 10 - 3-way not overwriting local changes (our side)
+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 &&
 
-expecting success of 1004.11 '3-way not overwriting local changes (their side)': 
+	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 &&
 
-	# At this point, file2 from side-b should be taken as side-a
-	# did not touch it.
+	$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 &&
 
-	git reset --hard &&
+	$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
 
-	echo >>file2 "local changes" &&
-	read_tree_u_must_fail -m -u branch-point side-a side-b &&
-	! grep "new line to be kept" file2 &&
-	grep "local changes" file2
+ok 18 - for_each_reflog()
 
+checking prerequisite: SHA1
 
-HEAD is now at 67c0594 side-a changes file1
-error: Entry 'file2' not uptodate. Cannot merge.
-error: Entry 'file2' not uptodate. Cannot merge.
-local changes
-ok 11 - 3-way not overwriting local changes (their side)
+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
 
-expecting success of 1004.12 'funny symlink in work tree': 
+)
+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
 
-	git reset --hard &&
-	git checkout -b sym-b side-b &&
-	mkdir -p a &&
-	>a/b &&
-	git add a/b &&
-	git commit -m "side adds a/b" &&
+Switched to a new branch 'reflogskip'
+ok 19 - parsing reverse reflogs at BUFSIZ boundaries
 
-	rm -fr a &&
-	git checkout -b sym-a side-a &&
-	mkdir -p a &&
-	test_ln_s_add ../b a/b &&
-	git commit -m "we add a/b" &&
+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
 
-	read_tree_u_must_succeed -m -u sym-a sym-a sym-b
+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
 
-HEAD is now at 67c0594 side-a changes file1
-Switched to a new branch 'sym-b'
-[sym-b b05f19b] side adds a/b
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0600-reffiles-backend/empty/.git/
+[main (root-commit) 508df12] A
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/b
-Switched to a new branch 'sym-a'
+ 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" &&
@@ -41269,1483 +40310,214 @@
 
 )
 prerequisite SYMLINKS ok
-[sym-a c4bc40b] we add a/b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 a/b
-ok 12 - funny symlink in work tree
-
-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 1004.13 'funny symlink in work tree, un-unlink-able': 
-
-	test_when_finished "chmod u+w a 2>/dev/null; rm -fr a b" &&
-
-	rm -fr a b &&
-	git reset --hard &&
-
-	git checkout sym-a &&
-	chmod a-w a &&
-	test_must_fail git read-tree -m -u sym-a sym-a sym-b
-
-
-HEAD is now at c4bc40b we add a/b
-Already on 'sym-a'
-error: unable to unlink old 'a/b': Permission denied
-ok 13 - funny symlink in work tree, un-unlink-able
-
-expecting success of 1004.14 'D/F setup': 
-
-	git reset --hard &&
-
-	git checkout side-a &&
-	rm -f subdir/file2 &&
-	mkdir subdir/file2 &&
-	echo qfwfq >subdir/file2/another &&
-	git add subdir/file2/another &&
-	test_tick &&
-	git commit -m "side-a changes file2 to directory"
-
-
-HEAD is now at c4bc40b we add a/b
-Switched to branch 'side-a'
-[side-a d094fd2] side-a changes file2 to directory
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 subdir/file2
- create mode 100644 subdir/file2/another
-ok 14 - D/F setup
-
-expecting success of 1004.15 'D/F': 
-
-	git checkout side-b &&
-	read_tree_u_must_succeed -m -u branch-point side-b side-a &&
-	git ls-files -u >actual &&
-	(
-		a=$(git rev-parse branch-point:subdir/file2) &&
-		b=$(git rev-parse side-a:subdir/file2/another) &&
-		echo "100644 $a 1	subdir/file2" &&
-		echo "100644 $a 2	subdir/file2" &&
-		echo "100644 $b 3	subdir/file2/another"
-	) >expect &&
-	test_cmp expect actual
-
-
-Switched to branch 'side-b'
-ok 15 - D/F
-
-expecting success of 1004.16 'D/F resolve': 
-
-	git reset --hard &&
-	git checkout side-b &&
-	git merge-resolve branch-point -- side-b side-a
-
-
-HEAD is now at 3ad988a side-b changes file2
-Already on 'side-b'
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Adding subdir/file2/another
-ok 16 - D/F resolve
-
-expecting success of 1004.17 'D/F recursive': 
-
-	git reset --hard &&
-	git checkout side-b &&
-	git merge-recursive branch-point -- side-b side-a
-
-
-HEAD is now at 3ad988a side-b changes file2
-Already on 'side-b'
-Merging side-b with side-a
-ok 17 - D/F recursive
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1001-read-tree-m-2way.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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
 
-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
+fatal: Needed a single revision
+ok 22 - ref resolution not confused by broken symlinks
 
-error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
-ok 12 - 13 - unmatching local changes being removed.
+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
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0600-reffiles-backend/empty/.git/
+fatal: your current branch appears to be broken
+ok 23 - log diagnoses bogus HEAD hash
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
-nitfol: clean
-ok 13 - 14 - unchanged in two heads.
+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
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
-nitfol: dirty
-ok 14 - 15 - unchanged in two heads.
+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
 
-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
+Deleted branch d1/d2/r1 (was 89a3a1d).
+ok 25 - empty directory removal
 
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 15 - 16 - conflicting local change.
+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
 
-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
+Switched to branch 'e1/e2/r1'
+Switched to branch 'main'
+ok 26 - symref empty directory removal
 
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 16 - 17 - conflicting local change.
+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
 
-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
+ok 27 - directory not created deleting packed ref
 
-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 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
 
-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
+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
 
-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 0600.29 'git branch -m with symlinked .git/refs': 
+	test_when_finished "rm -rf subdir" &&
+	git init --bare subdir &&
 
-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
+	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 &&
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-bozbar: dirty
-ok 19 - 20 - no local change, use new tree.
+	git -C subdir rev-parse --absolute-git-dir >subdir.dir &&
+	git rev-parse --absolute-git-dir >our.dir &&
+	! test_cmp subdir.dir our.dir &&
 
-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
+	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
 
-error: Entry 'bozbar' not uptodate. Cannot merge.
-ok 20 - 21 - no local change, dirty cache.
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0600-reffiles-backend/subdir/
+--- subdir.dir	2026-09-29 14:51:42.066548970 +0000
++++ our.dir	2026-09-29 14:51:42.070548970 +0000
+@@ -1 +1 @@
+-/build/reproducible-path/git-2.51.0/t/trash directory.t0600-reffiles-backend/subdir
++/build/reproducible-path/git-2.51.0/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
 
-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
+    first
 
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 21 - 22 - local change cache updated.
+commit c2327cb6b086a944f739ef59ddcffd3d45998884
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-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 &&
+    Third
 
-	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
+commit e6940ad615916edba236dd73cb432b3598c8537f
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-treeDF 6bf22db9043f2b5821c019d0ce0f2605421affcb
-100644 blob 052efc3abbc31348f7abd34535b1953d38273257	DF
-treeDFDF c38e296263d024b0f48c4a728d293232ac6c5443
-040000 tree 90bbead36f4d6a7c325fd450e6cfbcc7479d421a	DF
-ok 22 - DF vs DF/DF case setup.
+    Second
 
-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 &&
-	:
+commit d31adcd248e1f85d12741183d231fa5260dcfd5e
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-100644 b90ea14b2dd74b6f377c10870b3757344bbe077c 0	DF/DF
-DF/DF: dirty
-ok 23 - DF vs DF/DF case test.
+    Initial
+Deleted branch rename-dest (was 89a3a1d).
+ok 29 - git branch -m with symlinked .git/refs
 
-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 &&
+checking prerequisite: SYMLINKS_WINDOWS
 
-	rm -f a &&
-	git update-index --remove a &&
-	mkdir a &&
-	: >a/b &&
-	treeH=$(git write-tree) &&
-	echo treeH $treeH &&
-	git ls-tree $treeH
+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
 
-treeM 496d6428b9cf92981dc9495211e6e1120fb6f2ba
-100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391	a
-treeH 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 24 - a/b (untracked) vs a case setup.
+)
+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 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_path_is_file a/b
+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
 
-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.
+ok 31 - git reflog expire honors core.sharedRepository
 
-expecting success of 1001.26 'read-tree supports the super-prefix': 
-	cat <<-EOF >expect &&
-		error: Updating 'fictional/a' would lose untracked files in it
+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
-	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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1008-read-tree-overlay.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1009-read-tree-new-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+	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
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1007-hash-object.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+start: ok
+prepare: ok
+commit: ok
+ok 32 - symref transaction supports symlinks
 
-	example sha1:ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	example sha256:b44fe1fe65589848253737db859bd490453510719d7424daab03daf0767b85ae
+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
-
-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
-
-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
-
-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
-
-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
-
-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
-
-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 complains about non-standard types': 
-	test_must_fail git hash-object -t bogus --literally --stdin
-
-fatal: invalid object type "bogus"
-ok 39 - --literally complains about non-standard types
-
-expecting success of 1007.40 '--stdin outside of repository (uses default hash)': 
-	nongit git hash-object --stdin <hello >actual &&
-	echo "$(test_oid --hash=builtin hello)" >expect &&
+	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
 
-ok 40 - --stdin outside of repository (uses default hash)
-
-# passed all 40 test(s)
-1..40
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1010-mktree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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)': 
-	sort -r <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)': 
-	sort -r <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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1002-read-tree-m-u-2way.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.
+start: ok
+prepare: ok
+commit: ok
+ok 33 - symref transaction supports false symlink config
 
-# passed all 22 test(s)
-1..22
+# passed all 33 test(s)
+1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0410-partial-clone.sh ***
@@ -43945,7 +41717,7 @@
 
 Cloning into 'repo'...
 foo
-Receiving objects: 100% (1/1)
Receiving objects: 100% (1/1), 45 bytes | 9.00 KiB/s, done.
+Receiving objects: 100% (1/1)
Receiving objects: 100% (1/1), 45 bytes | 45.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': 
@@ -43991,625 +41763,3789 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1014-read-tree-confusing.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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})
+*** t1000-read-tree-m-3way.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1000-read-tree-m-3way/.git/
+expecting success of 1000.1 'adding test file NN and Z/NN': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 1 - adding test file NN and Z/NN
 
-[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 1000.2 'adding test file ND and Z/ND': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 2 - adding test file ND and Z/ND
 
-expecting success of 1014.2 'enable core.protectHFS for rejection tests': 
-	git config core.protectHFS true
+expecting success of 1000.3 'adding test file NM and Z/NM': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 3 - adding test file NM and Z/NM
 
-ok 2 - enable core.protectHFS for rejection tests
+expecting success of 1000.4 'adding test file DN and Z/DN': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 4 - adding test file DN and Z/DN
 
-expecting success of 1014.3 'enable core.protectNTFS for rejection tests': 
-	git config core.protectNTFS true
+expecting success of 1000.5 'adding test file DD and Z/DD': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 5 - adding test file DD and Z/DD
 
-ok 3 - enable core.protectNTFS for rejection tests
+expecting success of 1000.6 'adding test file DM and Z/DM': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 6 - adding test file DM and Z/DM
 
-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 1000.7 'adding test file MN and Z/MN': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 7 - adding test file MN and Z/MN
 
-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 1000.8 'adding test file MD and Z/MD': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 8 - adding test file MD and Z/MD
 
-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 1000.9 'adding test file MM and Z/MM': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 9 - adding test file MM and Z/MM
 
-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 1000.10 'adding test file SS': 
+	git update-index --add SS
 
-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
+ok 10 - adding test file SS
+
+expecting success of 1000.11 'adding test file TT': 
+	git update-index --add TT
+
+ok 11 - adding test file TT
+
+expecting success of 1000.12 'prepare initial tree': 
+	tree_O=$(git write-tree)
+
+ok 12 - prepare initial tree
+
+expecting success of 1000.13 'change in branch A (removal)': 
+	git update-index --remove $to_remove
+
+ok 13 - change in branch A (removal)
+
+expecting success of 1000.14 'change in branch A (modification)': 
+		git update-index $p
 	
-error: invalid path '.git'
-ok 8 - reject .git at end of path
+ok 14 - change in branch A (modification)
 
-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
+expecting success of 1000.15 'change in branch A (modification)': 
+		git update-index $p
 	
-error: invalid path '.git/file'
-ok 9 - reject .git as subtree
+ok 15 - change in branch A (modification)
 
-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
+expecting success of 1000.16 'change in branch A (modification)': 
+		git update-index $p
 	
-error: invalid path '.GIT'
-ok 10 - reject .GIT at end of path
+ok 16 - change in branch A (modification)
 
-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
+expecting success of 1000.17 'change in branch A (modification)': 
+		git update-index $p
 	
-error: invalid path '.GIT/file'
-ok 11 - reject .GIT as subtree
+ok 17 - change in branch A (modification)
 
-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
+expecting success of 1000.18 'change in branch A (modification)': 
+		git update-index $p
 	
-error: invalid path '‌.Git'
-ok 12 - reject {u200c}.Git at end of path
+ok 18 - change in branch A (modification)
 
-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
+expecting success of 1000.19 'change in branch A (modification)': 
+		git update-index $p
 	
-error: invalid path '‌.Git/file'
-ok 13 - reject {u200c}.Git as subtree
+ok 19 - change in branch A (modification)
 
-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
+expecting success of 1000.20 'change in branch A (addition)': 
+		git update-index --add $p
 	
-error: invalid path '.gI‌T'
-ok 14 - reject .gI{u200c}T at end of path
+ok 20 - change in branch A (addition)
 
-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
+expecting success of 1000.21 'change in branch A (addition)': 
+		git update-index --add $p
 	
-error: invalid path '.gI‌T/file'
-ok 15 - reject .gI{u200c}T as subtree
+ok 21 - change in branch A (addition)
 
-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
+expecting success of 1000.22 'change in branch A (addition)': 
+		git update-index --add $p
 	
-error: invalid path '.GiT‌'
-ok 16 - reject .GiT{u200c} at end of path
+ok 22 - change in branch A (addition)
 
-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
+expecting success of 1000.23 'change in branch A (addition)': 
+		git update-index --add $p
 	
-error: invalid path '.GiT‌/file'
-ok 17 - reject .GiT{u200c} as subtree
+ok 23 - change in branch A (addition)
 
-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
+expecting success of 1000.24 'change in branch A (addition)': 
+	git update-index --add LL &&
+	git update-index SS
+
+ok 24 - change in branch A (addition)
+
+expecting success of 1000.25 'change in branch A (edit)': 
+	git update-index TT
+
+ok 25 - change in branch A (edit)
+
+expecting success of 1000.26 'change in branch A (change file to directory)': 
+	git update-index --add DF/DF
+
+ok 26 - change in branch A (change file to directory)
+
+expecting success of 1000.27 'recording branch A tree': 
+	tree_A=$(git write-tree)
+
+ok 27 - recording branch A tree
+
+expecting success of 1000.28 'reading original tree and checking out': 
+	git read-tree $tree_O &&
+	git checkout-index -a
+
+ok 28 - reading original tree and checking out
+
+expecting success of 1000.29 'change in branch B (removal)': 
+	git update-index --remove $to_remove
+
+ok 29 - change in branch B (removal)
+
+expecting success of 1000.30 'change in branch B (modification)': 
+		git update-index $p
 	
-error: invalid path 'git~1'
-ok 18 - reject git~1 at end of path
+ok 30 - change in branch B (modification)
 
-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
+expecting success of 1000.31 'change in branch B (modification)': 
+		git update-index $p
 	
-error: invalid path 'git~1/file'
-ok 19 - reject git~1 as subtree
+ok 31 - change in branch B (modification)
 
-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
+expecting success of 1000.32 'change in branch B (modification)': 
+		git update-index $p
 	
-error: invalid path '.git. '
-ok 20 - reject .git.{space} at end of path
+ok 32 - change in branch B (modification)
 
-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
+expecting success of 1000.33 'change in branch B (modification)': 
+		git update-index $p
 	
-error: invalid path '.git. /file'
-ok 21 - reject .git.{space} as subtree
+ok 33 - change in branch B (modification)
 
-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
+expecting success of 1000.34 'change in branch B (modification)': 
+		git update-index $p
 	
-error: invalid path '.\.GIT\foobar'
-ok 22 - reject backslashes at end of path
+ok 34 - change in branch B (modification)
 
-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
+expecting success of 1000.35 'change in branch B (modification)': 
+		git update-index $p
 	
-error: invalid path '.\.GIT\foobar/file'
-ok 23 - reject backslashes as subtree
+ok 35 - change in branch B (modification)
 
-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
+expecting success of 1000.36 'change in branch B (addition)': 
+		git update-index --add $p
 	
-error: invalid path '.git\foobar'
-ok 24 - reject backslashes2 at end of path
+ok 36 - change in branch B (addition)
 
-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
+expecting success of 1000.37 'change in branch B (addition)': 
+		git update-index --add $p
 	
-error: invalid path '.git\foobar/file'
-ok 25 - reject backslashes2 as subtree
+ok 37 - change in branch B (addition)
 
-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
+expecting success of 1000.38 'change in branch B (addition)': 
+		git update-index --add $p
 	
-error: invalid path '.git...:alternate-stream'
-ok 26 - reject .git...:alternate-stream at end of path
+ok 38 - change in branch B (addition)
 
-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
+expecting success of 1000.39 'change in branch B (addition)': 
+		git update-index --add $p
 	
-error: invalid path '.git...:alternate-stream/file'
-ok 27 - reject .git...:alternate-stream as subtree
+ok 39 - change in branch B (addition)
 
-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
+expecting success of 1000.40 'change in branch B (addition and modification)': 
+	git update-index --add LL &&
+	git update-index SS
 
-ok 28 - utf-8 paths allowed with core.protectHFS off
+ok 40 - change in branch B (addition and modification)
 
-# passed all 28 test(s)
-1..28
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1015-read-index-unmerged.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1015-read-index-unmerged/.git/
-expecting success of 1015.1 'setup modify/delete + directory/file conflict': 
-	test_create_repo df_plus_modify_delete &&
-	(
-		cd df_plus_modify_delete &&
+expecting success of 1000.41 'change in branch B (modification)': 
+	git update-index TT
 
-		test_write_lines a b c d e f g h >letters &&
-		git add letters &&
-		git commit -m initial &&
+ok 41 - change in branch B (modification)
 
-		git checkout -b modify &&
-		# Throw in letters.txt for sorting order fun
-		# ("letters.txt" sorts between "letters" and "letters/file")
-		echo i >>letters &&
-		echo "version 2" >letters.txt &&
-		git add letters letters.txt &&
-		git commit -m modified &&
+expecting success of 1000.42 'change in branch B (addition of a file to conflict with directory)': 
+	git update-index --add DF
 
-		git checkout -b delete HEAD^ &&
-		git rm letters &&
-		mkdir letters &&
-		>letters/file &&
-		echo "version 1" >letters.txt &&
-		git add letters letters.txt &&
-		git commit -m deleted
-	)
+ok 42 - change in branch B (addition of a file to conflict with directory)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1015-read-index-unmerged/df_plus_modify_delete/.git/
-[master (root-commit) 461649b] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 letters
-Switched to a new branch 'modify'
-[modify 4e26d91] modified
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 letters.txt
-Switched to a new branch 'delete'
-rm 'letters'
-[delete 380ce95] deleted
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 8 deletions(-)
- delete mode 100644 letters
- create mode 100644 letters.txt
- create mode 100644 letters/file
-ok 1 - setup modify/delete + directory/file conflict
+expecting success of 1000.43 'recording branch B tree': 
+	tree_B=$(git write-tree)
 
-expecting success of 1015.2 'read-tree --reset cleans unmerged entries': 
-	test_when_finished "git -C df_plus_modify_delete clean -f" &&
-	test_when_finished "git -C df_plus_modify_delete reset --hard" &&
-	(
-		cd df_plus_modify_delete &&
+ok 43 - recording branch B tree
 
-		git checkout delete^0 &&
-		test_must_fail git merge modify &&
+expecting success of 1000.44 'keep contents of 3 trees for easy access': 
+	rm -f .git/index &&
+	git read-tree $tree_O &&
+	mkdir .orig-O &&
+	git checkout-index --prefix=.orig-O/ -f -q -a &&
+	rm -f .git/index &&
+	git read-tree $tree_A &&
+	mkdir .orig-A &&
+	git checkout-index --prefix=.orig-A/ -f -q -a &&
+	rm -f .git/index &&
+	git read-tree $tree_B &&
+	mkdir .orig-B &&
+	git checkout-index --prefix=.orig-B/ -f -q -a
 
-		git read-tree --reset HEAD &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
+ok 44 - keep contents of 3 trees for easy access
 
-Note: switching to 'delete^0'.
+expecting success of 1000.45 '3-way merge with git read-tree -m, empty cache': 
+	rm -fr [NDMALTS][NDMALTSF] Z &&
+	rm .git/index &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_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 45 - 3-way merge with git read-tree -m, empty cache
 
-If you want to 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 1000.46 '3-way merge with git read-tree -m, match H': 
+	rm -fr [NDMALTS][NDMALTSF] Z &&
+	rm .git/index &&
+	read_tree_must_succeed $tree_A &&
+	git checkout-index -f -u -a &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-  git switch -c <new-branch-name>
+ok 46 - 3-way merge with git read-tree -m, match H
 
-Or undo this operation with:
+expecting success of 1000.47 '1 - must not have an entry not in A.': 
+	rm -f .git/index XX &&
+	echo XX >XX &&
+	git update-index --add XX &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-  git switch -
+error: Entry 'XX' would be overwritten by merge. Cannot merge.
+error: Entry 'XX' would be overwritten by merge. Cannot merge.
+ok 47 - 1 - must not have an entry not in A.
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 1000.48 '2 - must match B in !O && !A && B case.': 
+	rm -f .git/index NA &&
+	cp .orig-B/NA NA &&
+	git update-index --add NA &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B
 
-HEAD is now at 380ce95 deleted
-Auto-merging letters.txt
-CONFLICT (add/add): Merge conflict in letters.txt
-CONFLICT (file/directory): directory in the way of letters from modify; moving it to letters~modify instead.
-CONFLICT (modify/delete): letters~modify deleted in HEAD and modified in modify.  Version modify of letters~modify left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 380ce95 deleted
-Removing conflicts
-Removing letters~modify
-ok 2 - read-tree --reset cleans unmerged entries
+ok 48 - 2 - must match B in !O && !A && B case.
 
-expecting success of 1015.3 'One reset --hard cleans unmerged entries': 
-	test_when_finished "git -C df_plus_modify_delete clean -f" &&
-	test_when_finished "git -C df_plus_modify_delete reset --hard" &&
-	(
-		cd df_plus_modify_delete &&
+expecting success of 1000.49 '2 - matching B alone is OK in !O && !A && B case.': 
+	rm -f .git/index NA &&
+	cp .orig-B/NA NA &&
+	git update-index --add NA &&
+	echo extra >>NA &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B
 
-		git checkout delete^0 &&
-		test_must_fail git merge modify &&
+ok 49 - 2 - matching B alone is OK in !O && !A && B case.
 
-		git reset --hard &&
-		test_path_is_missing .git/MERGE_HEAD &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
+expecting success of 1000.50 '3 - must match A in !O && A && !B case.': 
+	rm -f .git/index AN &&
+	cp .orig-A/AN AN &&
+	git update-index --add AN &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-HEAD is now at 380ce95 deleted
-Auto-merging letters.txt
-CONFLICT (add/add): Merge conflict in letters.txt
-CONFLICT (file/directory): directory in the way of letters from modify; moving it to letters~modify instead.
-CONFLICT (modify/delete): letters~modify deleted in HEAD and modified in modify.  Version modify of letters~modify left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 380ce95 deleted
-HEAD is now at 380ce95 deleted
-Removing conflicts
-ok 3 - One reset --hard cleans unmerged entries
+ok 50 - 3 - must match A in !O && A && !B case.
 
-expecting success of 1015.4 'setup directory/file conflict + simple edit/edit': 
-	test_create_repo df_plus_edit_edit &&
-	(
-		cd df_plus_edit_edit &&
+expecting success of 1000.51 '3 - matching A alone is OK in !O && A && !B case.': 
+	rm -f .git/index AN &&
+	cp .orig-A/AN AN &&
+	git update-index --add AN &&
+	echo extra >>AN &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B
 
-		test_seq 1 10 >numbers &&
-		git add numbers &&
-		git commit -m initial &&
+ok 51 - 3 - matching A alone is OK in !O && A && !B case.
 
-		git checkout -b d-edit &&
-		mkdir foo &&
-		echo content >foo/bar &&
-		git add foo &&
-		echo 11 >>numbers &&
-		git add numbers &&
-		git commit -m "directory and edit" &&
+expecting success of 1000.52 '3 (fail) - must match A in !O && A && !B case.': 
+	rm -f .git/index AN &&
+	cp .orig-A/AN AN &&
+	echo extra >>AN &&
+	git update-index --add AN &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-		git checkout -b f-edit d-edit^1 &&
-		echo content >foo &&
-		git add foo &&
-		echo eleven >>numbers &&
-		git add numbers &&
-		git commit -m "file and edit"
-	)
+error: Entry 'AN' would be overwritten by merge. Cannot merge.
+error: Entry 'AN' would be overwritten by merge. Cannot merge.
+ok 52 - 3 (fail) - must match A in !O && A && !B case.
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1015-read-index-unmerged/df_plus_edit_edit/.git/
-[master (root-commit) e5e228a] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 numbers
-Switched to a new branch 'd-edit'
-[d-edit 1997ecb] directory and edit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 foo/bar
-Switched to a new branch 'f-edit'
-[f-edit ea28ef2] file and edit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 foo
-ok 4 - setup directory/file conflict + simple edit/edit
+expecting success of 1000.53 '4 - must match and be up-to-date in !O && A && B && A!=B case.': 
+	rm -f .git/index AA &&
+	cp .orig-A/AA AA &&
+	git update-index --add AA &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-expecting success of 1015.5 'git merge --abort succeeds despite D/F conflict': 
-	test_when_finished "git -C df_plus_edit_edit clean -f" &&
-	test_when_finished "git -C df_plus_edit_edit reset --hard" &&
-	(
-		cd df_plus_edit_edit &&
+ok 53 - 4 - must match and be up-to-date in !O && A && B && A!=B case.
 
-		git checkout f-edit^0 &&
-		test_must_fail git merge d-edit^0 &&
+expecting success of 1000.54 '4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.': 
+	rm -f .git/index AA &&
+	cp .orig-A/AA AA &&
+	git update-index --add AA &&
+	echo extra >>AA &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-		git merge --abort &&
-		test_path_is_missing .git/MERGE_HEAD &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
+error: Entry 'AA' not uptodate. Cannot merge.
+error: Entry 'AA' not uptodate. Cannot merge.
+ok 54 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
 
-Note: switching to 'f-edit^0'.
+expecting success of 1000.55 '4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.': 
+	rm -f .git/index AA &&
+	cp .orig-A/AA AA &&
+	echo extra >>AA &&
+	git update-index --add AA &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_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.
+error: Entry 'AA' would be overwritten by merge. Cannot merge.
+error: Entry 'AA' would be overwritten by merge. Cannot merge.
+ok 55 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B 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 1000.56 '5 - must match in !O && A && B && A==B case.': 
+	rm -f .git/index LL &&
+	cp .orig-A/LL LL &&
+	git update-index --add LL &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-  git switch -c <new-branch-name>
+ok 56 - 5 - must match in !O && A && B && A==B case.
 
-Or undo this operation with:
+expecting success of 1000.57 '5 - must match in !O && A && B && A==B case.': 
+	rm -f .git/index LL &&
+	cp .orig-A/LL LL &&
+	git update-index --add LL &&
+	echo extra >>LL &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-  git switch -
+ok 57 - 5 - must match in !O && A && B && A==B case.
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 1000.58 '5 (fail) - must match A in !O && A && B && A==B case.': 
+	rm -f .git/index LL &&
+	cp .orig-A/LL LL &&
+	echo extra >>LL &&
+	git update-index --add LL &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-HEAD is now at ea28ef2 file and edit
-CONFLICT (file/directory): directory in the way of foo from HEAD; moving it to foo~HEAD instead.
-Auto-merging numbers
-CONFLICT (content): Merge conflict in numbers
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at ea28ef2 file and edit
-Removing conflicts
-ok 5 - git merge --abort succeeds despite D/F conflict
+error: Entry 'LL' would be overwritten by merge. Cannot merge.
+error: Entry 'LL' would be overwritten by merge. Cannot merge.
+ok 58 - 5 (fail) - must match A in !O && A && B && A==B case.
 
-expecting success of 1015.6 'git am --skip succeeds despite D/F conflict': 
-	test_when_finished "git -C df_plus_edit_edit clean -f" &&
-	test_when_finished "git -C df_plus_edit_edit reset --hard" &&
-	(
-		cd df_plus_edit_edit &&
+expecting success of 1000.59 '6 - must not exist in O && !A && !B case': 
+	rm -f .git/index DD &&
+	echo DD >DD &&
+	git update-index --add DD &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-		git checkout f-edit^0 &&
-		git format-patch -1 d-edit &&
-		test_must_fail git am -3 0001*.patch &&
+error: Entry 'DD' would be overwritten by merge. Cannot merge.
+error: Entry 'DD' would be overwritten by merge. Cannot merge.
+ok 59 - 6 - must not exist in O && !A && !B case
 
-		git am --skip &&
-		test_path_is_missing .git/rebase-apply &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
+expecting success of 1000.60 '7 - must not exist in O && !A && B && O!=B case': 
+	rm -f .git/index DM &&
+	cp .orig-B/DM DM &&
+	git update-index --add DM &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-HEAD is now at ea28ef2 file and edit
-0001-directory-and-edit.patch
-Applying: directory and edit
-Using index info to reconstruct a base tree...
-M	numbers
-Falling back to patching base and 3-way merge...
-CONFLICT (file/directory): directory in the way of foo from HEAD; moving it to foo~HEAD instead.
-Auto-merging numbers
-CONFLICT (content): Merge conflict in numbers
-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 directory and edit
-HEAD is now at ea28ef2 file and edit
-Removing 0001-directory-and-edit.patch
-Removing conflicts
-ok 6 - git am --skip succeeds despite D/F conflict
+error: Entry 'DM' would be overwritten by merge. Cannot merge.
+error: Entry 'DM' would be overwritten by merge. Cannot merge.
+ok 60 - 7 - must not exist in O && !A && B && O!=B case
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1012-read-tree-df.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
+expecting success of 1000.61 '8 - must not exist in O && !A && B && O==B case': 
+	rm -f .git/index DN &&
+	cp .orig-B/DN DN &&
+	git update-index --add DN &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-	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: &&
+error: Entry 'DN' would be overwritten by merge. Cannot merge.
+error: Entry 'DN' would be overwritten by merge. Cannot merge.
+ok 61 - 8 - must not exist in O && !A && B && O==B case
 
-	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 1000.62 '9 - must match and be up-to-date in O && A && !B && O!=A case': 
+	rm -f .git/index MD &&
+	cp .orig-A/MD MD &&
+	git update-index --add MD &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-ok 1 - setup
+ok 62 - 9 - must match and be up-to-date in O && A && !B && O!=A case
 
-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 1000.63 '9 (fail) - must match and be up-to-date in O && A && !B && O!=A case': 
+	rm -f .git/index MD &&
+	cp .orig-A/MD MD &&
+	git update-index --add MD &&
+	echo extra >>MD &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-ok 2 - 3-way (1)
+error: Entry 'MD' not uptodate. Cannot merge.
+error: Entry 'MD' not uptodate. Cannot merge.
+ok 63 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
 
-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 1000.64 '9 (fail) - must match and be up-to-date in O && A && !B && O!=A case': 
+	rm -f .git/index MD &&
+	cp .orig-A/MD MD &&
+	echo extra >>MD &&
+	git update-index --add MD &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-ok 3 - 3-way (2)
+error: Entry 'MD' would be overwritten by merge. Cannot merge.
+error: Entry 'MD' would be overwritten by merge. Cannot merge.
+ok 64 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
 
-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 1000.65 '10 - must match and be up-to-date in O && A && !B && O==A case': 
+	rm -f .git/index ND &&
+	cp .orig-A/ND ND &&
+	git update-index --add ND &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-ok 4 - 3-way (3)
+ok 65 - 10 - must match and be up-to-date in O && A && !B && O==A case
 
-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 1000.66 '10 (fail) - must match and be up-to-date in O && A && !B && O==A case': 
+	rm -f .git/index ND &&
+	cp .orig-A/ND ND &&
+	git update-index --add ND &&
+	echo extra >>ND &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-ok 5 - 2-way (1)
+error: Entry 'ND' not uptodate. Cannot merge.
+error: Entry 'ND' not uptodate. Cannot merge.
+ok 66 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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" &&
+expecting success of 1000.67 '10 (fail) - must match and be up-to-date in O && A && !B && O==A case': 
+	rm -f .git/index ND &&
+	cp .orig-A/ND ND &&
+	echo extra >>ND &&
+	git update-index --add ND &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-	git init server &&
-	echo foo >server/one &&
-	echo bar >server/two &&
-	git -C server add one two &&
-	git -C server commit -m "initial commit" &&
-	TREE=$(git -C server rev-parse HEAD^{tree}) &&
+error: Entry 'ND' would be overwritten by merge. Cannot merge.
+error: Entry 'ND' would be overwritten by merge. Cannot merge.
+ok 67 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
 
-	git -C server config uploadpack.allowfilter 1 &&
-	git -C server config uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:none "file://$(pwd)/server" client &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client read-tree $TREE $TREE &&
+expecting success of 1000.68 '11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case': 
+	rm -f .git/index MM &&
+	cp .orig-A/MM MM &&
+	git update-index --add MM &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-	# "done" marks the end of negotiation (once per fetch). Expect that
-	# only one fetch occurs.
-	grep "fetch> done" trace >donelines &&
-	test_line_count = 1 donelines
+ok 68 - 11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1022-read-tree-partial-clone/server/.git/
-[master (root-commit) a6fa93e] initial commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one
- create mode 100644 two
-Cloning into bare repository 'client'...
-ok 1 - read-tree in partial clone prefetches in one batch
+expecting success of 1000.69 '11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case': 
+	rm -f .git/index MM &&
+	cp .orig-A/MM MM &&
+	git update-index --add MM &&
+	echo extra >>MM &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1020-subdirectory.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1020-subdirectory/.git/
-expecting success of 1020.1 'setup': 
-	long="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" &&
-	test_write_lines $long >one &&
-	mkdir dir &&
-	test_write_lines x y z $long a b c >dir/two &&
-	cp one original.one &&
-	cp dir/two original.two
+error: Entry 'MM' not uptodate. Cannot merge.
+error: Entry 'MM' not uptodate. Cannot merge.
+ok 69 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
 
-ok 1 - setup
+expecting success of 1000.70 '11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case': 
+	rm -f .git/index MM &&
+	cp .orig-A/MM MM &&
+	echo extra >>MM &&
+	git update-index --add MM &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-expecting success of 1020.2 'update-index and ls-files': 
-	git update-index --add one &&
-	case "$(git ls-files)" in
-	one) echo pass one ;;
-	*) echo bad one; return 1 ;;
-	esac &&
-	(
-		cd dir &&
-		git update-index --add two &&
-		case "$(git ls-files)" in
-		two) echo pass two ;;
-		*) echo bad two; exit 1 ;;
-		esac
-	) &&
-	case "$(git ls-files)" in
-	dir/two"$LF"one) echo pass both ;;
-	*) echo bad; return 1 ;;
-	esac
+error: Entry 'MM' would be overwritten by merge. Cannot merge.
+error: Entry 'MM' would be overwritten by merge. Cannot merge.
+ok 70 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
 
-pass one
-pass two
-pass both
-ok 2 - update-index and ls-files
+expecting success of 1000.71 '12 - must match A in O && A && B && O!=A && A==B case': 
+	rm -f .git/index SS &&
+	cp .orig-A/SS SS &&
+	git update-index --add SS &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-expecting success of 1020.3 'cat-file': 
-	two=$(git ls-files -s dir/two) &&
-	two=$(expr "$two" : "[0-7]* \\([0-9a-f]*\\)") &&
-	echo "$two" &&
-	git cat-file -p "$two" >actual &&
+ok 71 - 12 - must match A in O && A && B && O!=A && A==B case
+
+expecting success of 1000.72 '12 - must match A in O && A && B && O!=A && A==B case': 
+	rm -f .git/index SS &&
+	cp .orig-A/SS SS &&
+	git update-index --add SS &&
+	echo extra >>SS &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
+
+ok 72 - 12 - must match A in O && A && B && O!=A && A==B case
+
+expecting success of 1000.73 '12 (fail) - must match A in O && A && B && O!=A && A==B case': 
+	rm -f .git/index SS &&
+	cp .orig-A/SS SS &&
+	echo extra >>SS &&
+	git update-index --add SS &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
+
+error: Entry 'SS' would be overwritten by merge. Cannot merge.
+error: Entry 'SS' would be overwritten by merge. Cannot merge.
+ok 73 - 12 (fail) - must match A in O && A && B && O!=A && A==B case
+
+expecting success of 1000.74 '13 - must match A in O && A && B && O!=A && O==B case': 
+	rm -f .git/index MN &&
+	cp .orig-A/MN MN &&
+	git update-index --add MN &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
+
+ok 74 - 13 - must match A in O && A && B && O!=A && O==B case
+
+expecting success of 1000.75 '13 - must match A in O && A && B && O!=A && O==B case': 
+	rm -f .git/index MN &&
+	cp .orig-A/MN MN &&
+	git update-index --add MN &&
+	echo extra >>MN &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
+
+ok 75 - 13 - must match A in O && A && B && O!=A && O==B case
+
+expecting success of 1000.76 '14 - must match and be up-to-date in O && A && B && O==A && O!=B case': 
+	rm -f .git/index NM &&
+	cp .orig-A/NM NM &&
+	git update-index --add NM &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
+
+ok 76 - 14 - must match and be up-to-date in O && A && B && O==A && O!=B case
+
+expecting success of 1000.77 '14 - may match B in O && A && B && O==A && O!=B case': 
+	rm -f .git/index NM &&
+	cp .orig-B/NM NM &&
+	git update-index --add NM &&
+	echo extra >>NM &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
+
+ok 77 - 14 - may match B in O && A && B && O==A && O!=B case
+
+expecting success of 1000.78 '14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case': 
+	rm -f .git/index NM &&
+	cp .orig-A/NM NM &&
+	git update-index --add NM &&
+	echo extra >>NM &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
+
+error: Entry 'NM' not uptodate. Cannot merge.
+error: Entry 'NM' not uptodate. Cannot merge.
+ok 78 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
+
+expecting success of 1000.79 '14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case': 
+	rm -f .git/index NM &&
+	cp .orig-A/NM NM &&
+	echo extra >>NM &&
+	git update-index --add NM &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
+
+error: Entry 'NM' would be overwritten by merge. Cannot merge.
+error: Entry 'NM' would be overwritten by merge. Cannot merge.
+ok 79 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
+
+expecting success of 1000.80 '15 - must match A in O && A && B && O==A && O==B case': 
+	rm -f .git/index NN &&
+	cp .orig-A/NN NN &&
+	git update-index --add NN &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
+
+ok 80 - 15 - must match A in O && A && B && O==A && O==B case
+
+expecting success of 1000.81 '15 - must match A in O && A && B && O==A && O==B case': 
+	rm -f .git/index NN &&
+	cp .orig-A/NN NN &&
+	git update-index --add NN &&
+	echo extra >>NN &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
+
+ok 81 - 15 - must match A in O && A && B && O==A && O==B case
+
+expecting success of 1000.82 '15 (fail) - must match A in O && A && B && O==A && O==B case': 
+	rm -f .git/index NN &&
+	cp .orig-A/NN NN &&
+	echo extra >>NN &&
+	git update-index --add NN &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
+
+error: Entry 'NN' would be overwritten by merge. Cannot merge.
+error: Entry 'NN' would be overwritten by merge. Cannot merge.
+ok 82 - 15 (fail) - must match A in O && A && B && O==A && O==B case
+
+expecting success of 1000.83 '16 - A matches in one and B matches in another.': 
+	rm -f .git/index F16 &&
+	echo F16 >F16 &&
+	git update-index --add F16 &&
+	tree0=$(git write-tree) &&
+	echo E16 >F16 &&
+	git update-index F16 &&
+	tree1=$(git write-tree) &&
+	read_tree_must_succeed -m $tree0 $tree1 $tree1 $tree0 &&
+	git ls-files --stage
+
+100644 ecbec6db011caa3ae26739812f092f76875fe6b6 2	F16
+100644 bcf4afda2c30299bf6538240d40bcb8fb3857691 3	F16
+ok 83 - 16 - A matches in one and B matches in another.
+
+# passed all 83 test(s)
+1..83
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1001-read-tree-m-2way.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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_path_is_file 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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1004-read-tree-m-u-wf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1004-read-tree-m-u-wf/.git/
+expecting success of 1004.1 'two-way setup': 
+
+	mkdir subdir &&
+	echo >file1 file one &&
+	echo >file2 file two &&
+	echo >subdir/file1 file one in subdirectory &&
+	echo >subdir/file2 file two in subdirectory &&
+	git update-index --add file1 file2 subdir/file1 subdir/file2 &&
+	git commit -m initial &&
+
+	git branch side &&
+	git tag -f branch-point &&
+
+	echo file2 is not tracked on the main branch anymore &&
+	rm -f file2 subdir/file2 &&
+	git update-index --remove file2 subdir/file2 &&
+	git commit -a -m "main removes file2 and subdir/file2"
+
+[main (root-commit) eb5336a] initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+ create mode 100644 subdir/file1
+ create mode 100644 subdir/file2
+file2 is not tracked on the main branch anymore
+[main dbb6421] main removes file2 and subdir/file2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 deletions(-)
+ delete mode 100644 file2
+ delete mode 100644 subdir/file2
+ok 1 - two-way setup
+
+expecting success of 1004.2 'two-way not clobbering': 
+
+	echo >file2 main creates untracked file2 &&
+	echo >subdir/file2 main creates untracked subdir/file2 &&
+	if err=$(read_tree_u_must_succeed -m -u main side 2>&1)
+	then
+		echo should have complained
+		false
+	else
+		echo "happy to see $err"
+	fi
+
+happy to see error: Untracked working tree file 'file2' would be overwritten by merge.
+ok 2 - two-way not clobbering
+
+expecting success of 1004.3 'two-way with incorrect --exclude-per-directory (1)': 
+
+	if err=$(read_tree_u_must_succeed -m --exclude-per-directory=.gitignore main side 2>&1)
+	then
+		echo should have complained
+		false
+	else
+		echo "happy to see $err"
+	fi
+
+happy to see fatal: --exclude-per-directory is meaningless unless -u
+ok 3 - two-way with incorrect --exclude-per-directory (1)
+
+expecting success of 1004.4 'two-way with incorrect --exclude-per-directory (2)': 
+
+	if err=$(read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore main side 2>&1)
+	then
+		echo should have complained
+		false
+	else
+		echo "happy to see $err"
+	fi
+
+happy to see fatal: --exclude-per-directory argument must be .gitignore
+ok 4 - two-way with incorrect --exclude-per-directory (2)
+
+expecting success of 1004.5 'two-way clobbering a ignored file': 
+
+	read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore main side
+
+ok 5 - two-way clobbering a ignored file
+
+expecting success of 1004.6 'three-way not complaining on an untracked path in both': 
+
+	rm -f file2 subdir/file2 &&
+	git checkout side &&
+	echo >file3 file three &&
+	echo >subdir/file3 file three &&
+	git update-index --add file3 subdir/file3 &&
+	git commit -a -m "side adds file3 and removes file2" &&
+
+	git checkout main &&
+	echo >file2 file two is untracked on the main side &&
+	echo >subdir/file2 file two is untracked on the main side &&
+
+	read_tree_u_must_succeed -m -u branch-point main side
+
+Switched to branch 'side'
+D	file2
+D	subdir/file2
+[side 4be225f] side adds file3 and removes file2
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+), 2 deletions(-)
+ delete mode 100644 file2
+ create mode 100644 file3
+ delete mode 100644 subdir/file2
+ create mode 100644 subdir/file3
+Switched to branch 'main'
+ok 6 - three-way not complaining on an untracked path in both
+
+expecting success of 1004.7 'three-way not clobbering a working tree file': 
+
+	git reset --hard &&
+	rm -f file2 subdir/file2 file3 subdir/file3 &&
+	git checkout main &&
+	echo >file3 file three created in main, untracked &&
+	echo >subdir/file3 file three created in main, untracked &&
+	if err=$(read_tree_u_must_succeed -m -u branch-point main side 2>&1)
+	then
+		echo should have complained
+		false
+	else
+		echo "happy to see $err"
+	fi
+
+HEAD is now at dbb6421 main removes file2 and subdir/file2
+Already on 'main'
+happy to see error: Untracked working tree file 'file3' would be overwritten by merge.
+ok 7 - three-way not clobbering a working tree file
+
+expecting success of 1004.8 'three-way not complaining on an untracked file': 
+
+	git reset --hard &&
+	rm -f file2 subdir/file2 file3 subdir/file3 &&
+	git checkout main &&
+	echo >file3 file three created in main, untracked &&
+	echo >subdir/file3 file three created in main, untracked &&
+
+	read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore branch-point main side
+
+HEAD is now at dbb6421 main removes file2 and subdir/file2
+Already on 'main'
+ok 8 - three-way not complaining on an untracked file
+
+expecting success of 1004.9 '3-way not overwriting local changes (setup)': 
+
+	git reset --hard &&
+	git checkout -b side-a branch-point &&
+	echo >>file1 "new line to be kept in the merge result" &&
+	git commit -a -m "side-a changes file1" &&
+	git checkout -b side-b branch-point &&
+	echo >>file2 "new line to be kept in the merge result" &&
+	git commit -a -m "side-b changes file2" &&
+	git checkout side-a
+
+
+HEAD is now at dbb6421 main removes file2 and subdir/file2
+Switched to a new branch 'side-a'
+[side-a 67c0594] side-a changes file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'side-b'
+[side-b 3ad988a] side-b changes file2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'side-a'
+ok 9 - 3-way not overwriting local changes (setup)
+
+expecting success of 1004.10 '3-way not overwriting local changes (our side)': 
+
+	# At this point, file1 from side-a should be kept as side-b
+	# did not touch it.
+
+	git reset --hard &&
+
+	echo >>file1 "local changes" &&
+	read_tree_u_must_succeed -m -u branch-point side-a side-b &&
+	grep "new line to be kept" file1 &&
+	grep "local changes" file1
+
+
+HEAD is now at 67c0594 side-a changes file1
+new line to be kept in the merge result
+local changes
+ok 10 - 3-way not overwriting local changes (our side)
+
+expecting success of 1004.11 '3-way not overwriting local changes (their side)': 
+
+	# At this point, file2 from side-b should be taken as side-a
+	# did not touch it.
+
+	git reset --hard &&
+
+	echo >>file2 "local changes" &&
+	read_tree_u_must_fail -m -u branch-point side-a side-b &&
+	! grep "new line to be kept" file2 &&
+	grep "local changes" file2
+
+
+HEAD is now at 67c0594 side-a changes file1
+error: Entry 'file2' not uptodate. Cannot merge.
+error: Entry 'file2' not uptodate. Cannot merge.
+local changes
+ok 11 - 3-way not overwriting local changes (their side)
+
+expecting success of 1004.12 'funny symlink in work tree': 
+
+	git reset --hard &&
+	git checkout -b sym-b side-b &&
+	mkdir -p a &&
+	>a/b &&
+	git add a/b &&
+	git commit -m "side adds a/b" &&
+
+	rm -fr a &&
+	git checkout -b sym-a side-a &&
+	mkdir -p a &&
+	test_ln_s_add ../b a/b &&
+	git commit -m "we add a/b" &&
+
+	read_tree_u_must_succeed -m -u sym-a sym-a sym-b
+
+
+HEAD is now at 67c0594 side-a changes file1
+Switched to a new branch 'sym-b'
+[sym-b b05f19b] side adds a/b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/b
+Switched to a new branch 'sym-a'
+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
+[sym-a c4bc40b] we add a/b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 a/b
+ok 12 - funny symlink in work tree
+
+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 1004.13 'funny symlink in work tree, un-unlink-able': 
+
+	test_when_finished "chmod u+w a 2>/dev/null; rm -fr a b" &&
+
+	rm -fr a b &&
+	git reset --hard &&
+
+	git checkout sym-a &&
+	chmod a-w a &&
+	test_must_fail git read-tree -m -u sym-a sym-a sym-b
+
+
+HEAD is now at c4bc40b we add a/b
+Already on 'sym-a'
+error: unable to unlink old 'a/b': Permission denied
+ok 13 - funny symlink in work tree, un-unlink-able
+
+expecting success of 1004.14 'D/F setup': 
+
+	git reset --hard &&
+
+	git checkout side-a &&
+	rm -f subdir/file2 &&
+	mkdir subdir/file2 &&
+	echo qfwfq >subdir/file2/another &&
+	git add subdir/file2/another &&
+	test_tick &&
+	git commit -m "side-a changes file2 to directory"
+
+
+HEAD is now at c4bc40b we add a/b
+Switched to branch 'side-a'
+[side-a d094fd2] side-a changes file2 to directory
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 subdir/file2
+ create mode 100644 subdir/file2/another
+ok 14 - D/F setup
+
+expecting success of 1004.15 'D/F': 
+
+	git checkout side-b &&
+	read_tree_u_must_succeed -m -u branch-point side-b side-a &&
+	git ls-files -u >actual &&
+	(
+		a=$(git rev-parse branch-point:subdir/file2) &&
+		b=$(git rev-parse side-a:subdir/file2/another) &&
+		echo "100644 $a 1	subdir/file2" &&
+		echo "100644 $a 2	subdir/file2" &&
+		echo "100644 $b 3	subdir/file2/another"
+	) >expect &&
+	test_cmp expect actual
+
+
+Switched to branch 'side-b'
+ok 15 - D/F
+
+expecting success of 1004.16 'D/F resolve': 
+
+	git reset --hard &&
+	git checkout side-b &&
+	git merge-resolve branch-point -- side-b side-a
+
+
+HEAD is now at 3ad988a side-b changes file2
+Already on 'side-b'
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Adding subdir/file2/another
+ok 16 - D/F resolve
+
+expecting success of 1004.17 'D/F recursive': 
+
+	git reset --hard &&
+	git checkout side-b &&
+	git merge-recursive branch-point -- side-b side-a
+
+
+HEAD is now at 3ad988a side-b changes file2
+Already on 'side-b'
+Merging side-b with side-a
+ok 17 - D/F recursive
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1005-read-tree-reset.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1005-read-tree-reset/.git/
+expecting success of 1005.1 'setup': 
+	git init &&
+	mkdir df &&
+	echo content >df/file &&
+	git add df/file &&
+	git commit -m one &&
+	git ls-files >expect &&
+	rm -rf df &&
+	echo content >df &&
+	git add df &&
+	echo content >new &&
+	git add new &&
+	git commit -m two
+
+Reinitialized existing Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1005-read-tree-reset/.git/
+[master (root-commit) 92e0c46] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 df/file
+[master 12f5e11] two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename df/file => df (100%)
+ create mode 100644 new
+ok 1 - setup
+
+expecting success of 1005.2 'reset should work': 
+	read_tree_u_must_succeed -u --reset HEAD^ &&
+	git ls-files >actual &&
+	test_cmp expect actual
+
+ok 2 - reset should work
+
+expecting success of 1005.3 'reset should remove remnants from a failed merge': 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >actual &&
+	! test -f old &&
+	test_cmp expect actual
+
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+ok 3 - reset should remove remnants from a failed merge
+
+expecting success of 1005.4 'two-way reset should remove remnants too': 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	read_tree_u_must_succeed --reset -u HEAD HEAD &&
+	git ls-files -s >actual &&
+	! test -f old &&
+	test_cmp expect actual
+
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+ok 4 - two-way reset should remove remnants too
+
+expecting success of 1005.5 'Porcelain reset should remove remnants too': 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	git reset --hard &&
+	git ls-files -s >actual &&
+	! test -f old &&
+	test_cmp expect actual
+
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+HEAD is now at 12f5e11 two
+ok 5 - Porcelain reset should remove remnants too
+
+expecting success of 1005.6 'Porcelain checkout -f should remove remnants too': 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	git checkout -f &&
+	git ls-files -s >actual &&
+	! test -f old &&
+	test_cmp expect actual
+
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+ok 6 - Porcelain checkout -f should remove remnants too
+
+expecting success of 1005.7 'Porcelain checkout -f HEAD should remove remnants too': 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	git checkout -f HEAD &&
+	git ls-files -s >actual &&
+	! test -f old &&
+	test_cmp expect actual
+
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+ok 7 - Porcelain checkout -f HEAD should remove remnants too
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t0601-reffiles-pack-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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: '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: '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: 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo'
+fatal: '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: '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: 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar/baz/extra'
+fatal: '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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1009-read-tree-new-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1008-read-tree-overlay.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1010-mktree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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)': 
+	sort -r <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)': 
+	sort -r <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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1002-read-tree-m-u-2way.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1007-hash-object.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+
+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
+
+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
+
+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
+
+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
+
+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 complains about non-standard types': 
+	test_must_fail git hash-object -t bogus --literally --stdin
+
+fatal: invalid object type "bogus"
+ok 39 - --literally complains about non-standard types
+
+expecting success of 1007.40 '--stdin outside of repository (uses default hash)': 
+	nongit git hash-object --stdin <hello >actual &&
+	echo "$(test_oid --hash=builtin hello)" >expect &&
+	test_cmp expect actual
+
+ok 40 - --stdin outside of repository (uses default hash)
+
+# passed all 40 test(s)
+1..40
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1014-read-tree-confusing.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1015-read-index-unmerged.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1015-read-index-unmerged/.git/
+expecting success of 1015.1 'setup modify/delete + directory/file conflict': 
+	test_create_repo df_plus_modify_delete &&
+	(
+		cd df_plus_modify_delete &&
+
+		test_write_lines a b c d e f g h >letters &&
+		git add letters &&
+		git commit -m initial &&
+
+		git checkout -b modify &&
+		# Throw in letters.txt for sorting order fun
+		# ("letters.txt" sorts between "letters" and "letters/file")
+		echo i >>letters &&
+		echo "version 2" >letters.txt &&
+		git add letters letters.txt &&
+		git commit -m modified &&
+
+		git checkout -b delete HEAD^ &&
+		git rm letters &&
+		mkdir letters &&
+		>letters/file &&
+		echo "version 1" >letters.txt &&
+		git add letters letters.txt &&
+		git commit -m deleted
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1015-read-index-unmerged/df_plus_modify_delete/.git/
+[master (root-commit) 461649b] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 letters
+Switched to a new branch 'modify'
+[modify 4e26d91] modified
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 letters.txt
+Switched to a new branch 'delete'
+rm 'letters'
+[delete 380ce95] deleted
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 8 deletions(-)
+ delete mode 100644 letters
+ create mode 100644 letters.txt
+ create mode 100644 letters/file
+ok 1 - setup modify/delete + directory/file conflict
+
+expecting success of 1015.2 'read-tree --reset cleans unmerged entries': 
+	test_when_finished "git -C df_plus_modify_delete clean -f" &&
+	test_when_finished "git -C df_plus_modify_delete reset --hard" &&
+	(
+		cd df_plus_modify_delete &&
+
+		git checkout delete^0 &&
+		test_must_fail git merge modify &&
+
+		git read-tree --reset HEAD &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
+
+Note: switching to 'delete^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 380ce95 deleted
+Auto-merging letters.txt
+CONFLICT (add/add): Merge conflict in letters.txt
+CONFLICT (file/directory): directory in the way of letters from modify; moving it to letters~modify instead.
+CONFLICT (modify/delete): letters~modify deleted in HEAD and modified in modify.  Version modify of letters~modify left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 380ce95 deleted
+Removing conflicts
+Removing letters~modify
+ok 2 - read-tree --reset cleans unmerged entries
+
+expecting success of 1015.3 'One reset --hard cleans unmerged entries': 
+	test_when_finished "git -C df_plus_modify_delete clean -f" &&
+	test_when_finished "git -C df_plus_modify_delete reset --hard" &&
+	(
+		cd df_plus_modify_delete &&
+
+		git checkout delete^0 &&
+		test_must_fail git merge modify &&
+
+		git reset --hard &&
+		test_path_is_missing .git/MERGE_HEAD &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
+
+HEAD is now at 380ce95 deleted
+Auto-merging letters.txt
+CONFLICT (add/add): Merge conflict in letters.txt
+CONFLICT (file/directory): directory in the way of letters from modify; moving it to letters~modify instead.
+CONFLICT (modify/delete): letters~modify deleted in HEAD and modified in modify.  Version modify of letters~modify left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 380ce95 deleted
+HEAD is now at 380ce95 deleted
+Removing conflicts
+ok 3 - One reset --hard cleans unmerged entries
+
+expecting success of 1015.4 'setup directory/file conflict + simple edit/edit': 
+	test_create_repo df_plus_edit_edit &&
+	(
+		cd df_plus_edit_edit &&
+
+		test_seq 1 10 >numbers &&
+		git add numbers &&
+		git commit -m initial &&
+
+		git checkout -b d-edit &&
+		mkdir foo &&
+		echo content >foo/bar &&
+		git add foo &&
+		echo 11 >>numbers &&
+		git add numbers &&
+		git commit -m "directory and edit" &&
+
+		git checkout -b f-edit d-edit^1 &&
+		echo content >foo &&
+		git add foo &&
+		echo eleven >>numbers &&
+		git add numbers &&
+		git commit -m "file and edit"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1015-read-index-unmerged/df_plus_edit_edit/.git/
+[master (root-commit) e5e228a] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 numbers
+Switched to a new branch 'd-edit'
+[d-edit 1997ecb] directory and edit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 foo/bar
+Switched to a new branch 'f-edit'
+[f-edit ea28ef2] file and edit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 foo
+ok 4 - setup directory/file conflict + simple edit/edit
+
+expecting success of 1015.5 'git merge --abort succeeds despite D/F conflict': 
+	test_when_finished "git -C df_plus_edit_edit clean -f" &&
+	test_when_finished "git -C df_plus_edit_edit reset --hard" &&
+	(
+		cd df_plus_edit_edit &&
+
+		git checkout f-edit^0 &&
+		test_must_fail git merge d-edit^0 &&
+
+		git merge --abort &&
+		test_path_is_missing .git/MERGE_HEAD &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
+
+Note: switching to 'f-edit^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 ea28ef2 file and edit
+CONFLICT (file/directory): directory in the way of foo from HEAD; moving it to foo~HEAD instead.
+Auto-merging numbers
+CONFLICT (content): Merge conflict in numbers
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at ea28ef2 file and edit
+Removing conflicts
+ok 5 - git merge --abort succeeds despite D/F conflict
+
+expecting success of 1015.6 'git am --skip succeeds despite D/F conflict': 
+	test_when_finished "git -C df_plus_edit_edit clean -f" &&
+	test_when_finished "git -C df_plus_edit_edit reset --hard" &&
+	(
+		cd df_plus_edit_edit &&
+
+		git checkout f-edit^0 &&
+		git format-patch -1 d-edit &&
+		test_must_fail git am -3 0001*.patch &&
+
+		git am --skip &&
+		test_path_is_missing .git/rebase-apply &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
+
+HEAD is now at ea28ef2 file and edit
+0001-directory-and-edit.patch
+Applying: directory and edit
+Using index info to reconstruct a base tree...
+M	numbers
+Falling back to patching base and 3-way merge...
+CONFLICT (file/directory): directory in the way of foo from HEAD; moving it to foo~HEAD instead.
+Auto-merging numbers
+CONFLICT (content): Merge conflict in numbers
+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 directory and edit
+HEAD is now at ea28ef2 file and edit
+Removing 0001-directory-and-edit.patch
+Removing conflicts
+ok 6 - git am --skip succeeds despite D/F conflict
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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" &&
+
+	git init server &&
+	echo foo >server/one &&
+	echo bar >server/two &&
+	git -C server add one two &&
+	git -C server commit -m "initial commit" &&
+	TREE=$(git -C server rev-parse HEAD^{tree}) &&
+
+	git -C server config uploadpack.allowfilter 1 &&
+	git -C server config uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:none "file://$(pwd)/server" client &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client read-tree $TREE $TREE &&
+
+	# "done" marks the end of negotiation (once per fetch). Expect that
+	# only one fetch occurs.
+	grep "fetch> done" trace >donelines &&
+	test_line_count = 1 donelines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1022-read-tree-partial-clone/server/.git/
+[master (root-commit) a6fa93e] initial commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 one
+ create mode 100644 two
+Cloning into bare repository 'client'...
+ok 1 - read-tree in partial clone prefetches in one batch
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1012-read-tree-df.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1020-subdirectory.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1020-subdirectory/.git/
+expecting success of 1020.1 'setup': 
+	long="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" &&
+	test_write_lines $long >one &&
+	mkdir dir &&
+	test_write_lines x y z $long a b c >dir/two &&
+	cp one original.one &&
+	cp dir/two original.two
+
+ok 1 - setup
+
+expecting success of 1020.2 'update-index and ls-files': 
+	git update-index --add one &&
+	case "$(git ls-files)" in
+	one) echo pass one ;;
+	*) echo bad one; return 1 ;;
+	esac &&
+	(
+		cd dir &&
+		git update-index --add two &&
+		case "$(git ls-files)" in
+		two) echo pass two ;;
+		*) echo bad two; exit 1 ;;
+		esac
+	) &&
+	case "$(git ls-files)" in
+	dir/two"$LF"one) echo pass both ;;
+	*) echo bad; return 1 ;;
+	esac
+
+pass one
+pass two
+pass both
+ok 2 - update-index and ls-files
+
+expecting success of 1020.3 'cat-file': 
+	two=$(git ls-files -s dir/two) &&
+	two=$(expr "$two" : "[0-7]* \\([0-9a-f]*\\)") &&
+	echo "$two" &&
+	git cat-file -p "$two" >actual &&
 	cmp dir/two actual &&
 	(
 		cd dir &&
@@ -45241,100 +46177,6 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0052-simple-ipc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0052-simple-ipc/.git/
-expecting success of 0052.1 'start simple command server': 
-	test_atexit stop_simple_IPC_server &&
-	test-tool simple-ipc start-daemon --threads=8 &&
-	test-tool simple-ipc is-active
-
-ok 1 - start simple command server
-
-expecting success of 0052.2 'simple command server': 
-	test-tool simple-ipc send --token=ping >actual &&
-	echo pong >expect &&
-	test_cmp expect actual
-
-ok 2 - simple command server
-
-expecting success of 0052.3 'servers cannot share the same path': 
-	test_must_fail test-tool simple-ipc run-daemon &&
-	test-tool simple-ipc is-active
-
-error: socket/pipe already in use: 'ipc-test'
-ok 3 - servers cannot share the same path
-
-expecting success of 0052.4 'big response': 
-	test-tool simple-ipc send --token=big >actual &&
-	test_line_count -ge 10000 actual &&
-	grep -q "big: [0]*9999\$" actual
-
-ok 4 - big response
-
-expecting success of 0052.5 'chunk response': 
-	test-tool simple-ipc send --token=chunk >actual &&
-	test_line_count -ge 10000 actual &&
-	grep -q "big: [0]*9999\$" actual
-
-ok 5 - chunk response
-
-expecting success of 0052.6 'slow response': 
-	test-tool simple-ipc send --token=slow >actual &&
-	test_line_count -ge 100 actual &&
-	grep -q "big: [0]*99\$" actual
-
-ok 6 - slow response
-
-expecting success of 0052.7 'sendbytes': 
-	test-tool simple-ipc sendbytes --bytecount=100000 --byte=A >actual &&
-	grep "sent:A00100000 rcvd:A00100000" actual
-
-sent:A00100000 rcvd:A00100000
-ok 7 - sendbytes
-
-expecting success of 0052.8 'stress test threads': 
-	test-tool simple-ipc multiple \
-		--threads=7 \
-		--bytecount=19 \
-		--batchsize=13 \
-		>actual &&
-	test_line_count = 92 actual &&
-	grep "good 91" actual &&
-	grep "sent:A" <actual >actual_a &&
-	cat >expect_a <<-EOF &&
-		sent:A00000019 rcvd:A00000019
-		sent:A00000020 rcvd:A00000020
-		sent:A00000021 rcvd:A00000021
-		sent:A00000022 rcvd:A00000022
-		sent:A00000023 rcvd:A00000023
-		sent:A00000024 rcvd:A00000024
-		sent:A00000025 rcvd:A00000025
-		sent:A00000026 rcvd:A00000026
-		sent:A00000027 rcvd:A00000027
-		sent:A00000028 rcvd:A00000028
-		sent:A00000029 rcvd:A00000029
-		sent:A00000030 rcvd:A00000030
-		sent:A00000031 rcvd:A00000031
-	EOF
-	test_cmp expect_a actual_a
-
-client (good 91) (join 0), (errors 0)
-ok 8 - stress test threads
-
-expecting success of 0052.9 'stop-daemon works': 
-	test-tool simple-ipc stop-daemon &&
-	test_must_fail test-tool simple-ipc is-active &&
-	test_must_fail test-tool simple-ipc send --token=ping
-
-error: no server listening at 'ipc-test'
-error: no server listening at 'ipc-test'
-ok 9 - stop-daemon works
-
-error: no server listening at 'ipc-test'
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1051-large-conversion.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1051-large-conversion/.git/
 expecting success of 1051.1 'setup input tests': 
@@ -45629,7 +46471,7 @@
  create mode 100644 content.t
 1+0 records in
 1+0 records out
-1 byte copied, 3.5841e-05 s, 27.9 kB/s
+1 byte copied, 3.464e-05 s, 28.9 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1060-object-corruption/no-bit-error/.git/
 [master (root-commit) f374eba] content
  Author: A U Thor <author@example.com>
@@ -45732,9 +46574,9 @@
 remote: fatal: loose object d95f3ad14dee633a758d2e331151e950dd13e4ed (stored in ./objects/d9/5f3ad14dee633a758d2e331151e950dd13e4ed) is corrupt        
 error: git upload-pack: git-pack-objects died with error.
 remote: aborting due to possible repository corruption on the remote side.
-fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
 fatal: early EOF
 fatal: fetch-pack: invalid index-pack output
+fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
 ok 8 - clone --no-local --bare detects corruption
 
 expecting success of 1060.9 'clone --no-local --bare detects missing object': 
@@ -45882,230 +46724,322 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1302-repo-version.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t1302-repo-version/test/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t1050-large.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1050-large/.git/
+expecting success of 1050.1 'core.bigFileThreshold must be non-negative': 
+	: >input &&
+	test_must_fail git -c core.bigFileThreshold=-1 hash-object input >out 2>err &&
+	grep "bad numeric config value" err &&
+	test_must_be_empty out
 
-)
-prerequisite SHA1 ok
-prerequisite DEFAULT_REPO_FORMAT ok
-ok 2 - gitdir selection on normal repos
+fatal: bad numeric config value '-1' for 'core.bigfilethreshold': invalid unit
+ok 1 - core.bigFileThreshold must be non-negative
 
-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
+expecting success of 1050.2 'setup': 
+	# clone does not allow us to pass core.bigfilethreshold to
+	# new repos, so set core.bigfilethreshold globally
+	git config --global core.bigfilethreshold 200k &&
+	printf "%2000000s" X >large1 &&
+	cp large1 large2 &&
+	cp large1 large3 &&
+	printf "%2500000s" Y >huge &&
+	GIT_ALLOC_LIMIT=1500k &&
+	export GIT_ALLOC_LIMIT
 
-warning: Expected git repo version <= 1, found 99
-ok 3 - gitdir selection on unsupported repo
+ok 2 - setup
 
-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
+expecting success of 1050.3 'enter "large" codepath, with small core.bigFileThreshold': 
+	test_when_finished "rm -rf repo" &&
 
- 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
+	git init --bare repo &&
+	echo large | git -C repo hash-object -w --stdin &&
+	git -C repo -c core.bigfilethreshold=4 fsck
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1050-large/repo/
+f60ccf3732fd547d393fe12095261c4d49cc94be
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling blob f60ccf3732fd547d393fe12095261c4d49cc94be
+ok 3 - enter "large" codepath, with small core.bigFileThreshold
 
-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 1050.4 'add with -c core.compression=0': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+ok 4 - add with -c core.compression=0
 
-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
-		)
+expecting success of 1050.5 'add with -c core.compression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1302-repo-version/extensions/.git/
-ok 6 - allow version=0 
+ok 5 - add with -c core.compression=9
 
-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
-		)
+expecting success of 1050.6 'add with -c core.compression=0 -c pack.compression=0': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1302-repo-version/extensions/.git/
-ok 7 - allow version=1 
+ok 6 - add with -c core.compression=0 -c pack.compression=0
 
-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
-		)
+expecting success of 1050.7 'add with -c core.compression=9 -c pack.compression=0': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1302-repo-version/extensions/.git/
-ok 8 - allow version=1 noop
+ok 7 - add with -c core.compression=9 -c pack.compression=0
 
-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
-		)
+expecting success of 1050.8 'add with -c core.compression=0 -c pack.compression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1302-repo-version/extensions/.git/
-fatal: unknown repository extension found:
-	no-such-extension
-ok 9 - abort version=1 no-such-extension
+ok 8 - add with -c core.compression=0 -c pack.compression=9
 
-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
-		)
+expecting success of 1050.9 'add with -c core.compression=9 -c pack.compression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1302-repo-version/extensions/.git/
-ok 10 - allow version=0 no-such-extension
+ok 9 - add with -c core.compression=9 -c pack.compression=9
 
-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
-		)
+expecting success of 1050.10 'add with -c pack.compression=0': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1302-repo-version/extensions/.git/
-ok 11 - allow version=0 noop
+ok 10 - add with -c pack.compression=0
 
-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
-		)
+expecting success of 1050.11 'add with -c pack.compression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+ok 11 - add with -c pack.compression=9
+
+expecting success of 1050.12 'add a large file or two': 
+	git add large1 huge large2 &&
+	# make sure we got a single packfile and no loose objects
+	count=0 idx= &&
+	for p in .git/objects/pack/pack-*.pack
+	do
+		count=$(( $count + 1 )) &&
+		test_path_is_file "$p" &&
+		idx=${p%.pack}.idx &&
+		test_path_is_file "$idx" || return 1
+	done &&
+	test $count = 1 &&
+	cnt=$(git show-index <"$idx" | wc -l) &&
+	test $cnt = 2 &&
+	for l in .git/objects/$OIDPATH_REGEX
+	do
+		test_path_is_missing "$l" || return 1
+	done &&
+
+	# attempt to add another copy of the same
+	git add large3 &&
+	bad= count=0 &&
+	for p in .git/objects/pack/pack-*.pack
+	do
+		count=$(( $count + 1 )) &&
+		test_path_is_file "$p" &&
+		idx=${p%.pack}.idx &&
+		test_path_is_file "$idx" || return 1
+	done &&
+	test $count = 1
+
+ok 12 - add a large file or two
+
+expecting success of 1050.13 'checkout a large file': 
+	large1=$(git rev-parse :large1) &&
+	git update-index --add --cacheinfo 100644 $large1 another &&
+	git checkout another &&
+	test_cmp large1 another
+
+Updated 1 path from the index
+ok 13 - checkout a large file
+
+expecting success of 1050.14 'packsize limit': 
+	test_create_repo mid &&
+	(
+		cd mid &&
+		git config core.bigfilethreshold 64k &&
+		git config pack.packsizelimit 256k &&
+
+		# mid1 and mid2 will fit within 256k limit but
+		# appending mid3 will bust the limit and will
+		# result in a separate packfile.
+		test-tool genrandom "a" $(( 66 * 1024 )) >mid1 &&
+		test-tool genrandom "b" $(( 80 * 1024 )) >mid2 &&
+		test-tool genrandom "c" $(( 128 * 1024 )) >mid3 &&
+		git add mid1 mid2 mid3 &&
+
+		count=0 &&
+		for pi in .git/objects/pack/pack-*.idx
+		do
+			test_path_is_file "$pi" && count=$(( $count + 1 )) || return 1
+		done &&
+		test $count = 2 &&
 
-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.51.0/t/trash directory.t1302-repo-version/extensions/.git/
-ok 13 - allow version=1 noop-v1
+			git hash-object --stdin <mid1 &&
+			git hash-object --stdin <mid2 &&
+			git hash-object --stdin <mid3
+		) |
+		sort >expect &&
 
-expecting success of 1302.14 'precious-objects allowed': 
-	git config core.repositoryFormatVersion 1 &&
-	git config extensions.preciousObjects 1 &&
-	check_allow
+		for pi in .git/objects/pack/pack-*.idx
+		do
+			git show-index <"$pi" || return 1
+		done |
+		sed -e "s/^[0-9]* \([0-9a-f]*\) .*/\1/" |
+		sort >actual &&
 
-ok 14 - precious-objects allowed
+		test_cmp expect actual
+	)
 
-expecting success of 1302.15 'precious-objects blocks destructive repack': 
-	test_must_fail git repack -ad
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1050-large/mid/.git/
+ok 14 - packsize limit
 
-fatal: cannot delete packs in a precious-objects repo
-ok 15 - precious-objects blocks destructive repack
+expecting success of 1050.15 'diff --raw': 
+	git commit -q -m initial &&
+	echo modified >>large1 &&
+	git add large1 &&
+	git commit -q -m modified &&
+	git diff --raw HEAD^
 
-expecting success of 1302.16 'other repacks are OK': 
-	test_commit foo &&
-	git repack
+:100644 100644 6cef6d8 171a2cf M	large1
+ok 15 - diff --raw
 
-[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 1050.16 'diff --stat': 
+	git diff --stat HEAD^ HEAD
 
-expecting success of 1302.17 'precious-objects blocks prune': 
-	test_must_fail git prune
+ large1 | Bin 2000000 -> 2000009 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 16 - diff --stat
 
-fatal: cannot prune in a precious-objects repo
-ok 17 - precious-objects blocks prune
+expecting success of 1050.17 'diff': 
+	git diff HEAD^ HEAD >actual &&
+	grep "Binary files.*differ" actual
 
-expecting success of 1302.18 'gc runs without complaint': 
-	git gc
+Binary files a/large1 and b/large1 differ
+ok 17 - diff
 
-ok 18 - gc runs without complaint
+expecting success of 1050.18 'diff --cached': 
+	git diff --cached HEAD^ >actual &&
+	grep "Binary files.*differ" actual
 
-# passed all 18 test(s)
-1..18
+Binary files a/large1 and b/large1 differ
+ok 18 - diff --cached
+
+expecting success of 1050.19 'hash-object': 
+	git hash-object large1
+
+171a2cf5cd75bd8d405266c986591716925e9712
+ok 19 - hash-object
+
+expecting success of 1050.20 'cat-file a large file': 
+	git cat-file blob :large1 >/dev/null
+
+ok 20 - cat-file a large file
+
+expecting success of 1050.21 'cat-file a large file from a tag': 
+	git tag -m largefile largefiletag :large1 &&
+	git cat-file blob largefiletag >/dev/null
+
+ok 21 - cat-file a large file from a tag
+
+expecting success of 1050.22 'git-show a large file': 
+	git show :large1 >/dev/null
+
+
+ok 22 - git-show a large file
+
+expecting success of 1050.23 'index-pack': 
+	git clone file://"$(pwd)"/.git foo &&
+	GIT_DIR=non-existent git index-pack --object-format=$(test_oid algo) \
+		--strict --verify foo/.git/objects/pack/*.pack
+
+Cloning into 'foo'...
+ok 23 - index-pack
+
+expecting success of 1050.24 'repack': 
+	git repack -ad
+
+ok 24 - repack
+
+expecting success of 1050.25 'pack-objects with large loose object': 
+	SHA1=$(git hash-object huge) &&
+	test_create_repo loose &&
+	echo $SHA1 | git pack-objects --stdout |
+		GIT_ALLOC_LIMIT=0 GIT_DIR=loose/.git git unpack-objects &&
+	echo $SHA1 | GIT_DIR=loose/.git git pack-objects pack &&
+	test_create_repo packed &&
+	mv pack-* packed/.git/objects/pack &&
+	GIT_DIR=packed/.git git cat-file blob $SHA1 >actual &&
+	test_cmp huge actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1050-large/loose/.git/
+dc5b4c5413c9a2a6ca4f121474e1c9c8ea086153
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1050-large/packed/.git/
+ok 25 - pack-objects with large loose object
+
+expecting success of 1050.26 'tar archiving': 
+	git archive --format=tar HEAD >/dev/null
+
+ok 26 - tar archiving
+
+expecting success of 1050.27 'zip archiving, store only': 
+	git archive --format=zip -0 HEAD >/dev/null
+
+ok 27 - zip archiving, store only
+
+expecting success of 1050.28 'zip archiving, deflate': 
+	git archive --format=zip HEAD >/dev/null
+
+ok 28 - zip archiving, deflate
+
+expecting success of 1050.29 'fsck large blobs': 
+	git fsck 2>err &&
+	test_must_be_empty err
+
+ok 29 - fsck large blobs
+
+# passed all 29 test(s)
+1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1301-shared-repo.sh ***
@@ -46425,586 +47359,144 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1304-default-acl.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t1016-compatObjectFormat.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1016-compatObjectFormat/.git/
+expecting success of 1016.1 'setup sha1 repository': 
+		git init --object-format=$hash &&
+		git config core.repositoryformatversion 1 &&
+		git config extensions.objectformat $hash &&
+		git config extensions.compatobjectformat $(compat_hash $hash) &&
+		test_config gpg.program $TEST_DIRECTORY/t1016/gpg &&
+		echo "Hello World!" >hello &&
+		eval hello_${hash}_oid=$(git hash-object hello) &&
+		git update-index --add hello &&
+		git commit -m "Initial commit" &&
+		eval commit_${hash}_oid=$(git rev-parse HEAD) &&
+		eval tree_${hash}_oid=$(git rev-parse HEAD^{tree})
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1016-compatObjectFormat/repo-sha1/.git/
+[master (root-commit) 0f0d9f0] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello
+ok 1 - setup sha1 repository
 
-t1304-default-acl.sh: 4: eval: setfacl: not found
-ok 1 - checking for a working acl setup
+expecting success of 1016.2 'create a sha1  tagged blob': 
+		git tag --no-sign -m "This is a tag" hellotag $(hello_oid $hash) &&
+		eval hellotag_${hash}_oid=$(git rev-parse hellotag)
+	
+ok 2 - create a sha1  tagged blob
 
-ok 2 # skip Setup test repo (missing SETFACL)
+expecting success of 1016.3 'create a sha1 tagged tree': 
+		git tag --no-sign -m "This is a tag" treetag $(tree_oid $hash) &&
+		eval treetag_${hash}_oid=$(git rev-parse treetag)
+	
+ok 3 - create a sha1 tagged tree
 
-ok 3 # skip Objects creation does not break ACLs with restrictive umask (missing SETFACL)
+expecting success of 1016.4 'create a sha1 tagged commit': 
+		git tag --no-sign -m "This is a tag" committag $(commit_oid $hash) &&
+		eval committag_${hash}_oid=$(git rev-parse committag)
+	
+ok 4 - create a sha1 tagged commit
 
-ok 4 # skip git gc does not break ACLs with restrictive umask (missing SETFACL)
+checking prerequisite: GPG2
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1050-large.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1050-large/.git/
-expecting success of 1050.1 'core.bigFileThreshold must be non-negative': 
-	: >input &&
-	test_must_fail git -c core.bigFileThreshold=-1 hash-object input >out 2>err &&
-	grep "bad numeric config value" err &&
-	test_must_be_empty out
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG2" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG2" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
 
-fatal: bad numeric config value '-1' for 'core.bigfilethreshold': invalid unit
-ok 1 - core.bigFileThreshold must be non-negative
+	case "$gpg_version" in
+	"gpg (GnuPG) "[01].*)
+		say "This test requires a GPG version >= v2.0.0"
+		exit 1
+		;;
+	*)
+		(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}" </dev/null >/dev/null \
+			--sign -u committer@example.com
+		;;
+	esac
 
-expecting success of 1050.2 'setup': 
-	# clone does not allow us to pass core.bigfilethreshold to
-	# new repos, so set core.bigfilethreshold globally
-	git config --global core.bigfilethreshold 200k &&
-	printf "%2000000s" X >large1 &&
-	cp large1 large2 &&
-	cp large1 large3 &&
-	printf "%2500000s" Y >huge &&
-	GIT_ALLOC_LIMIT=1500k &&
-	export GIT_ALLOC_LIMIT
+)
+prerequisite GPG2 not satisfied
+ok 5 # skip create a sha1 signed commit (missing GPG2)
 
-ok 2 - setup
+ok 6 # skip create a sha1 signed tag (missing GPG2)
 
-expecting success of 1050.3 'enter "large" codepath, with small core.bigFileThreshold': 
-	test_when_finished "rm -rf repo" &&
+expecting success of 1016.7 'create a sha1 branch': 
+		git checkout -b branch $(commit_oid $hash) &&
+		echo "More more more give me more!" >more &&
+		eval more_${hash}_oid=$(git hash-object more) &&
+		echo "Another and another and another" >another &&
+		eval another_${hash}_oid=$(git hash-object another) &&
+		git update-index --add more another &&
+		git commit -m "Add more files!" &&
+		eval commit2_${hash}_oid=$(git rev-parse HEAD) &&
+		eval tree2_${hash}_oid=$(git rev-parse HEAD^{tree})
+	
+Switched to a new branch 'branch'
+[branch f94d4a8] Add more files!
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 another
+ create mode 100644 more
+ok 7 - create a sha1 branch
 
-	git init --bare repo &&
-	echo large | git -C repo hash-object -w --stdin &&
-	git -C repo -c core.bigfilethreshold=4 fsck
+ok 8 # skip create another sha1 signed tag (missing GPG2)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1050-large/repo/
-f60ccf3732fd547d393fe12095261c4d49cc94be
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling blob f60ccf3732fd547d393fe12095261c4d49cc94be
-ok 3 - enter "large" codepath, with small core.bigFileThreshold
+ok 9 # skip merge the sha1 branches together (missing GPG2)
 
-expecting success of 1050.4 'add with -c core.compression=0': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-ok 4 - add with -c core.compression=0
+ok 10 # skip create additional sha1 signed commits (missing GPG2)
 
-expecting success of 1050.5 'add with -c core.compression=9': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-ok 5 - add with -c core.compression=9
+ok 11 # skip create additional sha1 signed tags (missing GPG2)
 
-expecting success of 1050.6 'add with -c core.compression=0 -c pack.compression=0': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
+expecting success of 1016.12 'setup sha256 repository': 
+		git init --object-format=$hash &&
+		git config core.repositoryformatversion 1 &&
+		git config extensions.objectformat $hash &&
+		git config extensions.compatobjectformat $(compat_hash $hash) &&
+		test_config gpg.program $TEST_DIRECTORY/t1016/gpg &&
+		echo "Hello World!" >hello &&
+		eval hello_${hash}_oid=$(git hash-object hello) &&
+		git update-index --add hello &&
+		git commit -m "Initial commit" &&
+		eval commit_${hash}_oid=$(git rev-parse HEAD) &&
+		eval tree_${hash}_oid=$(git rev-parse HEAD^{tree})
 	
-ok 6 - add with -c core.compression=0 -c pack.compression=0
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1016-compatObjectFormat/repo-sha256/.git/
+[master (root-commit) 8c32aa7] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello
+ok 12 - setup sha256 repository
 
-expecting success of 1050.7 'add with -c core.compression=9 -c pack.compression=0': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
+expecting success of 1016.13 'create a sha256  tagged blob': 
+		git tag --no-sign -m "This is a tag" hellotag $(hello_oid $hash) &&
+		eval hellotag_${hash}_oid=$(git rev-parse hellotag)
 	
-ok 7 - add with -c core.compression=9 -c pack.compression=0
+ok 13 - create a sha256  tagged blob
 
-expecting success of 1050.8 'add with -c core.compression=0 -c pack.compression=9': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
+expecting success of 1016.14 'create a sha256 tagged tree': 
+		git tag --no-sign -m "This is a tag" treetag $(tree_oid $hash) &&
+		eval treetag_${hash}_oid=$(git rev-parse treetag)
 	
-ok 8 - add with -c core.compression=0 -c pack.compression=9
+ok 14 - create a sha256 tagged tree
 
-expecting success of 1050.9 'add with -c core.compression=9 -c pack.compression=9': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
+expecting success of 1016.15 'create a sha256 tagged commit': 
+		git tag --no-sign -m "This is a tag" committag $(commit_oid $hash) &&
+		eval committag_${hash}_oid=$(git rev-parse committag)
 	
-ok 9 - add with -c core.compression=9 -c pack.compression=9
+ok 15 - create a sha256 tagged commit
 
-expecting success of 1050.10 'add with -c pack.compression=0': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-ok 10 - add with -c pack.compression=0
+ok 16 # skip create a sha256 signed commit (missing GPG2)
 
-expecting success of 1050.11 'add with -c pack.compression=9': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-ok 11 - add with -c pack.compression=9
-
-expecting success of 1050.12 'add a large file or two': 
-	git add large1 huge large2 &&
-	# make sure we got a single packfile and no loose objects
-	count=0 idx= &&
-	for p in .git/objects/pack/pack-*.pack
-	do
-		count=$(( $count + 1 )) &&
-		test_path_is_file "$p" &&
-		idx=${p%.pack}.idx &&
-		test_path_is_file "$idx" || return 1
-	done &&
-	test $count = 1 &&
-	cnt=$(git show-index <"$idx" | wc -l) &&
-	test $cnt = 2 &&
-	for l in .git/objects/$OIDPATH_REGEX
-	do
-		test_path_is_missing "$l" || return 1
-	done &&
-
-	# attempt to add another copy of the same
-	git add large3 &&
-	bad= count=0 &&
-	for p in .git/objects/pack/pack-*.pack
-	do
-		count=$(( $count + 1 )) &&
-		test_path_is_file "$p" &&
-		idx=${p%.pack}.idx &&
-		test_path_is_file "$idx" || return 1
-	done &&
-	test $count = 1
-
-ok 12 - add a large file or two
-
-expecting success of 1050.13 'checkout a large file': 
-	large1=$(git rev-parse :large1) &&
-	git update-index --add --cacheinfo 100644 $large1 another &&
-	git checkout another &&
-	test_cmp large1 another
-
-Updated 1 path from the index
-ok 13 - checkout a large file
-
-expecting success of 1050.14 'packsize limit': 
-	test_create_repo mid &&
-	(
-		cd mid &&
-		git config core.bigfilethreshold 64k &&
-		git config pack.packsizelimit 256k &&
-
-		# mid1 and mid2 will fit within 256k limit but
-		# appending mid3 will bust the limit and will
-		# result in a separate packfile.
-		test-tool genrandom "a" $(( 66 * 1024 )) >mid1 &&
-		test-tool genrandom "b" $(( 80 * 1024 )) >mid2 &&
-		test-tool genrandom "c" $(( 128 * 1024 )) >mid3 &&
-		git add mid1 mid2 mid3 &&
-
-		count=0 &&
-		for pi in .git/objects/pack/pack-*.idx
-		do
-			test_path_is_file "$pi" && count=$(( $count + 1 )) || return 1
-		done &&
-		test $count = 2 &&
-
-		(
-			git hash-object --stdin <mid1 &&
-			git hash-object --stdin <mid2 &&
-			git hash-object --stdin <mid3
-		) |
-		sort >expect &&
-
-		for pi in .git/objects/pack/pack-*.idx
-		do
-			git show-index <"$pi" || return 1
-		done |
-		sed -e "s/^[0-9]* \([0-9a-f]*\) .*/\1/" |
-		sort >actual &&
-
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1050-large/mid/.git/
-ok 14 - packsize limit
-
-expecting success of 1050.15 'diff --raw': 
-	git commit -q -m initial &&
-	echo modified >>large1 &&
-	git add large1 &&
-	git commit -q -m modified &&
-	git diff --raw HEAD^
-
-:100644 100644 6cef6d8 171a2cf M	large1
-ok 15 - diff --raw
-
-expecting success of 1050.16 'diff --stat': 
-	git diff --stat HEAD^ HEAD
-
- large1 | Bin 2000000 -> 2000009 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 16 - diff --stat
-
-expecting success of 1050.17 'diff': 
-	git diff HEAD^ HEAD >actual &&
-	grep "Binary files.*differ" actual
-
-Binary files a/large1 and b/large1 differ
-ok 17 - diff
-
-expecting success of 1050.18 'diff --cached': 
-	git diff --cached HEAD^ >actual &&
-	grep "Binary files.*differ" actual
-
-Binary files a/large1 and b/large1 differ
-ok 18 - diff --cached
-
-expecting success of 1050.19 'hash-object': 
-	git hash-object large1
-
-171a2cf5cd75bd8d405266c986591716925e9712
-ok 19 - hash-object
-
-expecting success of 1050.20 'cat-file a large file': 
-	git cat-file blob :large1 >/dev/null
-
-ok 20 - cat-file a large file
-
-expecting success of 1050.21 'cat-file a large file from a tag': 
-	git tag -m largefile largefiletag :large1 &&
-	git cat-file blob largefiletag >/dev/null
-
-ok 21 - cat-file a large file from a tag
-
-expecting success of 1050.22 'git-show a large file': 
-	git show :large1 >/dev/null
-
-
-ok 22 - git-show a large file
-
-expecting success of 1050.23 'index-pack': 
-	git clone file://"$(pwd)"/.git foo &&
-	GIT_DIR=non-existent git index-pack --object-format=$(test_oid algo) \
-		--strict --verify foo/.git/objects/pack/*.pack
-
-Cloning into 'foo'...
-ok 23 - index-pack
-
-expecting success of 1050.24 'repack': 
-	git repack -ad
-
-ok 24 - repack
-
-expecting success of 1050.25 'pack-objects with large loose object': 
-	SHA1=$(git hash-object huge) &&
-	test_create_repo loose &&
-	echo $SHA1 | git pack-objects --stdout |
-		GIT_ALLOC_LIMIT=0 GIT_DIR=loose/.git git unpack-objects &&
-	echo $SHA1 | GIT_DIR=loose/.git git pack-objects pack &&
-	test_create_repo packed &&
-	mv pack-* packed/.git/objects/pack &&
-	GIT_DIR=packed/.git git cat-file blob $SHA1 >actual &&
-	test_cmp huge actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1050-large/loose/.git/
-dc5b4c5413c9a2a6ca4f121474e1c9c8ea086153
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1050-large/packed/.git/
-ok 25 - pack-objects with large loose object
-
-expecting success of 1050.26 'tar archiving': 
-	git archive --format=tar HEAD >/dev/null
-
-ok 26 - tar archiving
-
-expecting success of 1050.27 'zip archiving, store only': 
-	git archive --format=zip -0 HEAD >/dev/null
-
-ok 27 - zip archiving, store only
-
-expecting success of 1050.28 'zip archiving, deflate': 
-	git archive --format=zip HEAD >/dev/null
-
-ok 28 - zip archiving, deflate
-
-expecting success of 1050.29 'fsck large blobs': 
-	git fsck 2>err &&
-	test_must_be_empty err
-
-ok 29 - fsck large blobs
-
-# passed all 29 test(s)
-1..29
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1303-wacky-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1303-wacky-config/.git/
-expecting success of 1303.1 'modify same key': 
-	setup &&
-	git config section.key bar &&
-	check section.key bar
-
-ok 1 - modify same key
-
-expecting success of 1303.2 'add key in same section': 
-	setup &&
-	git config section.other bar &&
-	check section.key foo &&
-	check section.other bar
-
-ok 2 - add key in same section
-
-expecting success of 1303.3 'add key in different section': 
-	setup &&
-	git config section2.key bar &&
-	check section.key foo &&
-	check section2.key bar
-
-ok 3 - add key in different section
-
-expecting success of 1303.4 'make sure git config escapes section names properly': 
-	git config "$SECTION" bar &&
-	check "$SECTION" bar
-
-ok 4 - make sure git config escapes section names properly
-
-expecting success of 1303.5 'do not crash on special long config line': 
-	setup &&
-	git config section.key "$LONG_VALUE" &&
-	check section.key "$LONG_VALUE"
-
-ok 5 - do not crash on special long config line
-
-expecting success of 1303.6 'get many entries': 
-	setup_many &&
-	git config --get-all section.key >actual &&
-	test_line_count = 3126 actual
-
-ok 6 - get many entries
-
-expecting success of 1303.7 'get many entries by regex': 
-	setup_many &&
-	git config --get-regexp "sec.*ke." >actual &&
-	test_line_count = 3126 actual
-
-ok 7 - get many entries by regex
-
-expecting success of 1303.8 'add and replace one of many entries': 
-	setup_many &&
-	git config --add section.key bar &&
-	check_regex section.key "b.*r" bar &&
-	git config section.key beer "b.*r" &&
-	check_regex section.key "b.*r" beer
-
-ok 8 - add and replace one of many entries
-
-expecting success of 1303.9 'replace many entries': 
-	setup_many &&
-	git config --replace-all section.key bar &&
-	check section.key bar
-
-ok 9 - replace many entries
-
-expecting success of 1303.10 'unset many entries': 
-	setup_many &&
-	git config --unset-all section.key &&
-	test_must_fail git config section.key
-
-ok 10 - unset many entries
-
-expecting success of 1303.11 '--add appends new value after existing empty value': 
-	cat >expect <<-\EOF &&
-
-
-	fool
-	roll
-	EOF
-	cp .git/config .git/config.old &&
-	test_when_finished "mv .git/config.old .git/config" &&
-	cat >.git/config <<-\EOF &&
-	[foo]
-		baz
-		baz =
-		baz = fool
-	EOF
-	git config --add foo.baz roll &&
-	git config --get-all foo.baz >output &&
-	test_cmp expect output
-
-ok 11 - --add appends new value after existing empty value
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1016-compatObjectFormat.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1016-compatObjectFormat/.git/
-expecting success of 1016.1 'setup sha1 repository': 
-		git init --object-format=$hash &&
-		git config core.repositoryformatversion 1 &&
-		git config extensions.objectformat $hash &&
-		git config extensions.compatobjectformat $(compat_hash $hash) &&
-		test_config gpg.program $TEST_DIRECTORY/t1016/gpg &&
-		echo "Hello World!" >hello &&
-		eval hello_${hash}_oid=$(git hash-object hello) &&
-		git update-index --add hello &&
-		git commit -m "Initial commit" &&
-		eval commit_${hash}_oid=$(git rev-parse HEAD) &&
-		eval tree_${hash}_oid=$(git rev-parse HEAD^{tree})
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1016-compatObjectFormat/repo-sha1/.git/
-[master (root-commit) 0f0d9f0] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello
-ok 1 - setup sha1 repository
-
-expecting success of 1016.2 'create a sha1  tagged blob': 
-		git tag --no-sign -m "This is a tag" hellotag $(hello_oid $hash) &&
-		eval hellotag_${hash}_oid=$(git rev-parse hellotag)
-	
-ok 2 - create a sha1  tagged blob
-
-expecting success of 1016.3 'create a sha1 tagged tree': 
-		git tag --no-sign -m "This is a tag" treetag $(tree_oid $hash) &&
-		eval treetag_${hash}_oid=$(git rev-parse treetag)
-	
-ok 3 - create a sha1 tagged tree
-
-expecting success of 1016.4 'create a sha1 tagged commit': 
-		git tag --no-sign -m "This is a tag" committag $(commit_oid $hash) &&
-		eval committag_${hash}_oid=$(git rev-parse committag)
-	
-ok 4 - create a sha1 tagged commit
-
-checking prerequisite: GPG2
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG2" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG2" &&
-	gpg_version=$(gpg --version 2>&1)
-	test $? != 127 || exit 1
-
-	case "$gpg_version" in
-	"gpg (GnuPG) "[01].*)
-		say "This test requires a GPG version >= v2.0.0"
-		exit 1
-		;;
-	*)
-		(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}" </dev/null >/dev/null \
-			--sign -u committer@example.com
-		;;
-	esac
-
-)
-prerequisite GPG2 not satisfied
-ok 5 # skip create a sha1 signed commit (missing GPG2)
-
-ok 6 # skip create a sha1 signed tag (missing GPG2)
-
-expecting success of 1016.7 'create a sha1 branch': 
-		git checkout -b branch $(commit_oid $hash) &&
-		echo "More more more give me more!" >more &&
-		eval more_${hash}_oid=$(git hash-object more) &&
-		echo "Another and another and another" >another &&
-		eval another_${hash}_oid=$(git hash-object another) &&
-		git update-index --add more another &&
-		git commit -m "Add more files!" &&
-		eval commit2_${hash}_oid=$(git rev-parse HEAD) &&
-		eval tree2_${hash}_oid=$(git rev-parse HEAD^{tree})
-	
-Switched to a new branch 'branch'
-[branch f94d4a8] Add more files!
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 another
- create mode 100644 more
-ok 7 - create a sha1 branch
-
-ok 8 # skip create another sha1 signed tag (missing GPG2)
-
-ok 9 # skip merge the sha1 branches together (missing GPG2)
-
-ok 10 # skip create additional sha1 signed commits (missing GPG2)
-
-ok 11 # skip create additional sha1 signed tags (missing GPG2)
-
-expecting success of 1016.12 'setup sha256 repository': 
-		git init --object-format=$hash &&
-		git config core.repositoryformatversion 1 &&
-		git config extensions.objectformat $hash &&
-		git config extensions.compatobjectformat $(compat_hash $hash) &&
-		test_config gpg.program $TEST_DIRECTORY/t1016/gpg &&
-		echo "Hello World!" >hello &&
-		eval hello_${hash}_oid=$(git hash-object hello) &&
-		git update-index --add hello &&
-		git commit -m "Initial commit" &&
-		eval commit_${hash}_oid=$(git rev-parse HEAD) &&
-		eval tree_${hash}_oid=$(git rev-parse HEAD^{tree})
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1016-compatObjectFormat/repo-sha256/.git/
-[master (root-commit) 8c32aa7] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello
-ok 12 - setup sha256 repository
-
-expecting success of 1016.13 'create a sha256  tagged blob': 
-		git tag --no-sign -m "This is a tag" hellotag $(hello_oid $hash) &&
-		eval hellotag_${hash}_oid=$(git rev-parse hellotag)
-	
-ok 13 - create a sha256  tagged blob
-
-expecting success of 1016.14 'create a sha256 tagged tree': 
-		git tag --no-sign -m "This is a tag" treetag $(tree_oid $hash) &&
-		eval treetag_${hash}_oid=$(git rev-parse treetag)
-	
-ok 14 - create a sha256 tagged tree
-
-expecting success of 1016.15 'create a sha256 tagged commit': 
-		git tag --no-sign -m "This is a tag" committag $(commit_oid $hash) &&
-		eval committag_${hash}_oid=$(git rev-parse committag)
-	
-ok 15 - create a sha256 tagged commit
-
-ok 16 # skip create a sha256 signed commit (missing GPG2)
-
-ok 17 # skip create a sha256 signed tag (missing GPG2)
+ok 17 # skip create a sha256 signed tag (missing GPG2)
 
 expecting success of 1016.18 'create a sha256 branch': 
 		git checkout -b branch $(commit_oid $hash) &&
@@ -47897,6 +48389,356 @@
 1..202
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1302-repo-version.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t1302-repo-version/test/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1303-wacky-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1303-wacky-config/.git/
+expecting success of 1303.1 'modify same key': 
+	setup &&
+	git config section.key bar &&
+	check section.key bar
+
+ok 1 - modify same key
+
+expecting success of 1303.2 'add key in same section': 
+	setup &&
+	git config section.other bar &&
+	check section.key foo &&
+	check section.other bar
+
+ok 2 - add key in same section
+
+expecting success of 1303.3 'add key in different section': 
+	setup &&
+	git config section2.key bar &&
+	check section.key foo &&
+	check section2.key bar
+
+ok 3 - add key in different section
+
+expecting success of 1303.4 'make sure git config escapes section names properly': 
+	git config "$SECTION" bar &&
+	check "$SECTION" bar
+
+ok 4 - make sure git config escapes section names properly
+
+expecting success of 1303.5 'do not crash on special long config line': 
+	setup &&
+	git config section.key "$LONG_VALUE" &&
+	check section.key "$LONG_VALUE"
+
+ok 5 - do not crash on special long config line
+
+expecting success of 1303.6 'get many entries': 
+	setup_many &&
+	git config --get-all section.key >actual &&
+	test_line_count = 3126 actual
+
+ok 6 - get many entries
+
+expecting success of 1303.7 'get many entries by regex': 
+	setup_many &&
+	git config --get-regexp "sec.*ke." >actual &&
+	test_line_count = 3126 actual
+
+ok 7 - get many entries by regex
+
+expecting success of 1303.8 'add and replace one of many entries': 
+	setup_many &&
+	git config --add section.key bar &&
+	check_regex section.key "b.*r" bar &&
+	git config section.key beer "b.*r" &&
+	check_regex section.key "b.*r" beer
+
+ok 8 - add and replace one of many entries
+
+expecting success of 1303.9 'replace many entries': 
+	setup_many &&
+	git config --replace-all section.key bar &&
+	check section.key bar
+
+ok 9 - replace many entries
+
+expecting success of 1303.10 'unset many entries': 
+	setup_many &&
+	git config --unset-all section.key &&
+	test_must_fail git config section.key
+
+ok 10 - unset many entries
+
+expecting success of 1303.11 '--add appends new value after existing empty value': 
+	cat >expect <<-\EOF &&
+
+
+	fool
+	roll
+	EOF
+	cp .git/config .git/config.old &&
+	test_when_finished "mv .git/config.old .git/config" &&
+	cat >.git/config <<-\EOF &&
+	[foo]
+		baz
+		baz =
+		baz = fool
+	EOF
+	git config --add foo.baz roll &&
+	git config --get-all foo.baz >output &&
+	test_cmp expect output
+
+ok 11 - --add appends new value after existing empty value
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1304-default-acl.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 1003: 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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1307-config-blob.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1307-config-blob/.git/
 expecting success of 1307.1 'create config blob': 
@@ -48223,1297 +49065,1354 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1310-config-default.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t0052-simple-ipc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0052-simple-ipc/.git/
+expecting success of 0052.1 'start simple command server': 
+	test_atexit stop_simple_IPC_server &&
+	test-tool simple-ipc start-daemon --threads=8 &&
+	test-tool simple-ipc is-active
 
-ok 1 - uses --default when entry missing
+ok 1 - start simple command server
 
-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 &&
+expecting success of 0052.2 'simple command server': 
+	test-tool simple-ipc send --token=ping >actual &&
+	echo pong >expect &&
 	test_cmp expect actual
 
-ok 2 - does not use --default when entry present
+ok 2 - simple command server
 
-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
+expecting success of 0052.3 'servers cannot share the same path': 
+	test_must_fail test-tool simple-ipc run-daemon &&
+	test-tool simple-ipc is-active
 
-ok 3 - canonicalizes --default with appropriate type
+error: socket/pipe already in use: 'ipc-test'
+ok 3 - servers cannot share the same path
 
-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
+expecting success of 0052.4 'big response': 
+	test-tool simple-ipc send --token=big >actual &&
+	test_line_count -ge 10000 actual &&
+	grep -q "big: [0]*9999\$" actual
 
-fatal: failed to format default config value: x
-ok 4 - dies when --default cannot be parsed
+ok 4 - big response
 
-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
+expecting success of 0052.5 'chunk response': 
+	test-tool simple-ipc send --token=chunk >actual &&
+	test_line_count -ge 10000 actual &&
+	grep -q "big: [0]*9999\$" actual
 
-error: --default is only applicable to --get
-ok 5 - does not allow --default without --get
+ok 5 - chunk response
 
-# passed all 5 test(s)
-1..5
+expecting success of 0052.6 'slow response': 
+	test-tool simple-ipc send --token=slow >actual &&
+	test_line_count -ge 100 actual &&
+	grep -q "big: [0]*99\$" actual
+
+ok 6 - slow response
+
+expecting success of 0052.7 'sendbytes': 
+	test-tool simple-ipc sendbytes --bytecount=100000 --byte=A >actual &&
+	grep "sent:A00100000 rcvd:A00100000" actual
+
+sent:A00100000 rcvd:A00100000
+ok 7 - sendbytes
+
+expecting success of 0052.8 'stress test threads': 
+	test-tool simple-ipc multiple \
+		--threads=7 \
+		--bytecount=19 \
+		--batchsize=13 \
+		>actual &&
+	test_line_count = 92 actual &&
+	grep "good 91" actual &&
+	grep "sent:A" <actual >actual_a &&
+	cat >expect_a <<-EOF &&
+		sent:A00000019 rcvd:A00000019
+		sent:A00000020 rcvd:A00000020
+		sent:A00000021 rcvd:A00000021
+		sent:A00000022 rcvd:A00000022
+		sent:A00000023 rcvd:A00000023
+		sent:A00000024 rcvd:A00000024
+		sent:A00000025 rcvd:A00000025
+		sent:A00000026 rcvd:A00000026
+		sent:A00000027 rcvd:A00000027
+		sent:A00000028 rcvd:A00000028
+		sent:A00000029 rcvd:A00000029
+		sent:A00000030 rcvd:A00000030
+		sent:A00000031 rcvd:A00000031
+	EOF
+	test_cmp expect_a actual_a
+
+client (good 91) (join 0), (errors 0)
+ok 8 - stress test threads
+
+expecting success of 0052.9 'stop-daemon works': 
+	test-tool simple-ipc stop-daemon &&
+	test_must_fail test-tool simple-ipc is-active &&
+	test_must_fail test-tool simple-ipc send --token=ping
+
+error: no server listening at 'ipc-test'
+error: no server listening at 'ipc-test'
+ok 9 - stop-daemon works
+
+error: no server listening at 'ipc-test'
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1305-config-include.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/.git/
-expecting success of 1305.1 'include file by absolute path': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = \"$(pwd)/one\"" >.gitconfig &&
-	echo 1 >expect &&
-	git config test.one >actual &&
-	test_cmp expect actual
+*** t1091-sparse-checkout-builtin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/.git/
+expecting success of 1091.1 'setup': 
+	git init repo &&
+	(
+		cd repo &&
+		echo "initial" >a &&
+		mkdir folder1 folder2 deep &&
+		mkdir deep/deeper1 deep/deeper2 &&
+		mkdir deep/deeper1/deepest &&
+		cp a folder1 &&
+		cp a folder2 &&
+		cp a deep &&
+		cp a deep/deeper1 &&
+		cp a deep/deeper2 &&
+		cp a deep/deeper1/deepest &&
+		git add . &&
+		git commit -m "initial commit"
+	)
 
-ok 1 - include file by absolute path
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/repo/.git/
+[main (root-commit) ebf8b57] initial commit
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+)
+ create mode 100644 a
+ create mode 100644 deep/a
+ create mode 100644 deep/deeper1/a
+ create mode 100644 deep/deeper1/deepest/a
+ create mode 100644 deep/deeper2/a
+ create mode 100644 folder1/a
+ create mode 100644 folder2/a
+ok 1 - setup
 
-expecting success of 1305.2 'include file by relative path': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	echo 1 >expect &&
-	git config test.one >actual &&
-	test_cmp expect actual
+expecting success of 1091.2 'git sparse-checkout list (not sparse)': 
+	test_must_fail git -C repo sparse-checkout list >list 2>err &&
+	test_must_be_empty list &&
+	test_grep "this worktree is not sparse" err
 
-ok 2 - include file by relative path
+fatal: this worktree is not sparse
+ok 2 - git sparse-checkout list (not sparse)
 
-expecting success of 1305.3 'chained relative paths': 
-	mkdir subdir &&
-	echo "[test]three = 3" >subdir/three &&
-	echo "[include]path = three" >subdir/two &&
-	echo "[include]path = subdir/two" >.gitconfig &&
-	echo 3 >expect &&
-	git config test.three >actual &&
-	test_cmp expect actual
+expecting success of 1091.3 'git sparse-checkout list (not sparse)': 
+	git -C repo sparse-checkout set &&
+	rm repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout list >list 2>err &&
+	test_must_be_empty list &&
+	test_grep "this worktree is not sparse (sparse-checkout file may not exist)" err
 
-ok 3 - chained relative paths
+warning: this worktree is not sparse (sparse-checkout file may not exist)
+ok 3 - git sparse-checkout list (not sparse)
 
-expecting success of 1305.4 'include paths get tilde-expansion': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = ~/one" >.gitconfig &&
-	echo 1 >expect &&
-	git config test.one >actual &&
-	test_cmp expect actual
+expecting success of 1091.4 'git sparse-checkout list (populated)': 
+	test_when_finished rm -f repo/.git/info/sparse-checkout &&
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/folder1/*
+	/deep/
+	**/a
+	!*bin*
+	EOF
+	cp repo/.git/info/sparse-checkout expect &&
+	git -C repo sparse-checkout list >list &&
+	test_cmp expect list
 
-ok 4 - include paths get tilde-expansion
+warning: unrecognized pattern: '/folder1/*'
+warning: disabling cone pattern matching
+ok 4 - git sparse-checkout list (populated)
 
-expecting success of 1305.5 'include options can still be examined': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	echo one >expect &&
-	git config include.path >actual &&
-	test_cmp expect actual
+expecting success of 1091.5 'git sparse-checkout init': 
+	git -C repo sparse-checkout init --no-cone &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	test_cmp_config -C repo true core.sparsecheckout &&
+	check_files repo a
 
-ok 5 - include options can still be examined
+ok 5 - git sparse-checkout init
 
-expecting success of 1305.6 'listing includes option and expansion': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
+expecting success of 1091.6 'git sparse-checkout init in empty repo': 
+	test_when_finished rm -rf empty-repo blank-template &&
+	git init --template= empty-repo &&
+	git -C empty-repo sparse-checkout init
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/empty-repo/.git/
+ok 6 - git sparse-checkout init in empty repo
+
+expecting success of 1091.7 'git sparse-checkout list after init': 
+	git -C repo sparse-checkout list >actual &&
 	cat >expect <<-\EOF &&
-	include.path=one
-	test.one=1
+	/*
+	!/*/
 	EOF
-	git config --list >actual.full &&
-	grep -v -e ^core -e ^extensions actual.full >actual &&
 	test_cmp expect actual
 
-ok 6 - listing includes option and expansion
+ok 7 - git sparse-checkout list after init
 
-expecting success of 1305.7 'single file lookup does not expand includes by default': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	test_must_fail git config -f .gitconfig test.one &&
-	test_must_fail git config --global test.one &&
-	echo 1 >expect &&
-	git config --includes -f .gitconfig test.one >actual &&
-	test_cmp expect actual
+expecting success of 1091.8 'init with existing sparse-checkout': 
+	echo "*folder*" >> repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout init &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	*folder*
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a folder1 folder2
 
-ok 7 - single file lookup does not expand includes by default
+ok 8 - init with existing sparse-checkout
 
-expecting success of 1305.8 'single file list does not expand includes by default': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	echo "include.path=one" >expect &&
-	git config -f .gitconfig --list >actual &&
-	test_cmp expect actual
+expecting success of 1091.9 'clone --sparse': 
+	git clone --sparse "file://$(pwd)/repo" clone &&
+	git -C clone sparse-checkout reapply --no-cone &&
+	git -C clone sparse-checkout list >actual &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	EOF
+	test_cmp expect actual &&
+	check_files clone a
 
-ok 8 - single file list does not expand includes by default
+Cloning into 'clone'...
+ok 9 - clone --sparse
 
-expecting success of 1305.9 'writing config file does not expand includes': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	git config test.two 2 &&
-	echo 2 >expect &&
-	git config --no-includes test.two >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config --no-includes test.one
+expecting success of 1091.10 'switching to cone mode with non-cone mode patterns': 
+	git init bad-patterns &&
+	(
+		cd bad-patterns &&
+		git sparse-checkout init --no-cone &&
+		git sparse-checkout add dir &&
+		git config --worktree core.sparseCheckoutCone true &&
+		test_must_fail git sparse-checkout add dir 2>err &&
+		grep "existing sparse-checkout patterns do not use cone mode" err
+	)
 
-ok 9 - writing config file does not expand includes
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/bad-patterns/.git/
+fatal: existing sparse-checkout patterns do not use cone mode
+ok 10 - switching to cone mode with non-cone mode patterns
 
-expecting success of 1305.10 'config modification does not affect includes': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	git config test.one 2 &&
-	echo 1 >expect &&
-	git config -f one test.one >actual &&
+expecting success of 1091.11 'interaction with clone --no-checkout (unborn index)': 
+	git clone --no-checkout "file://$(pwd)/repo" clone_no_checkout &&
+	git -C clone_no_checkout sparse-checkout init --cone &&
+	git -C clone_no_checkout sparse-checkout set folder1 &&
+
+	git -C clone_no_checkout sparse-checkout list >actual &&
+	cat >expect <<-\EOF &&
+	folder1
+	EOF
 	test_cmp expect actual &&
+
+	# nothing checked out, expect "No such file or directory"
+	! ls clone_no_checkout/* >actual &&
+	test_must_be_empty actual &&
+	test_path_is_missing clone_no_checkout/.git/index &&
+
+	# No branch is checked out until we manually switch to one
+	git -C clone_no_checkout switch main &&
+	test_path_is_file clone_no_checkout/.git/index &&
+	check_files clone_no_checkout a folder1
+
+Cloning into 'clone_no_checkout'...
+ls: cannot access 'clone_no_checkout/*': No such file or directory
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+ok 11 - interaction with clone --no-checkout (unborn index)
+
+expecting success of 1091.12 'set enables config': 
+	git init worktree-config &&
+	(
+		cd worktree-config &&
+		test_commit test file &&
+		test_path_is_missing .git/config.worktree &&
+		git sparse-checkout set nothing &&
+		test_path_is_file .git/config.worktree &&
+		test_cmp_config true core.sparseCheckout
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/worktree-config/.git/
+[main (root-commit) 236e830] test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 12 - set enables config
+
+expecting success of 1091.13 'set sparse-checkout using builtin': 
+	git -C repo sparse-checkout set "/*" "!/*/" "*folder*" &&
 	cat >expect <<-\EOF &&
-	1
-	2
+	/*
+	!/*/
+	*folder*
 	EOF
-	git config --get-all test.one >actual &&
-	test_cmp expect actual
+	git -C repo sparse-checkout list >actual &&
+	test_cmp expect actual &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a folder1 folder2
 
-ok 10 - config modification does not affect includes
+ok 13 - set sparse-checkout using builtin
 
-expecting success of 1305.11 'missing include files are ignored': 
-	cat >.gitconfig <<-\EOF &&
-	[include]path = non-existent
-	[test]value = yes
+expecting success of 1091.14 'set sparse-checkout using --stdin': 
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/folder1/
+	/folder2/
 	EOF
-	echo yes >expect &&
-	git config test.value >actual &&
-	test_cmp expect actual
+	git -C repo sparse-checkout set --stdin <expect &&
+	git -C repo sparse-checkout list >actual &&
+	test_cmp expect actual &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo "a folder1 folder2"
 
-ok 11 - missing include files are ignored
+ok 14 - set sparse-checkout using --stdin
 
-expecting success of 1305.12 'absolute includes from command line work': 
-	echo "[test]one = 1" >one &&
-	echo 1 >expect &&
-	git -c include.path="$(pwd)/one" config test.one >actual &&
-	test_cmp expect actual
+expecting success of 1091.15 'add to sparse-checkout': 
+	cat repo/.git/info/sparse-checkout >old &&
+	test_when_finished cp old repo/.git/info/sparse-checkout &&
+	cat >add <<-\EOF &&
+	pattern1
+	/folder1/
+	pattern2
+	EOF
+	cat old >expect &&
+	cat add >>expect &&
+	git -C repo sparse-checkout add --stdin <add &&
+	git -C repo sparse-checkout list >actual &&
+	test_cmp expect actual &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo "a folder1 folder2"
 
-ok 12 - absolute includes from command line work
+ok 15 - add to sparse-checkout
 
-expecting success of 1305.13 'relative includes from command line fail': 
-	echo "[test]one = 1" >one &&
-	test_must_fail git -c include.path=one config test.one
+expecting success of 1091.16 'worktree: add copies sparse-checkout patterns': 
+	cat repo/.git/info/sparse-checkout >old &&
+	test_when_finished cp old repo/.git/info/sparse-checkout &&
+	test_when_finished git -C repo worktree remove ../worktree &&
+	git -C repo sparse-checkout set --no-cone "/*" &&
+	git -C repo worktree add --quiet ../worktree 2>err &&
+	test_must_be_empty err &&
+	new="$(git -C worktree rev-parse --git-path info/sparse-checkout)" &&
+	test_path_is_file "$new" &&
+	test_cmp repo/.git/info/sparse-checkout "$new" &&
+	git -C worktree sparse-checkout set --cone &&
+	test_cmp_config -C worktree true core.sparseCheckoutCone &&
+	test_must_fail git -C repo core.sparseCheckoutCone
 
-error: relative config includes must come from files
-fatal: unable to parse command-line config
-ok 13 - relative includes from command line fail
+git: 'core.sparseCheckoutCone' is not a git command. See 'git --help'.
+ok 16 - worktree: add copies sparse-checkout patterns
 
-expecting success of 1305.14 'absolute includes from blobs work': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path=$(pwd)/one" >blob &&
-	blob=$(git hash-object -w blob) &&
-	echo 1 >expect &&
-	git config --blob=$blob test.one >actual &&
-	test_cmp expect actual
+expecting success of 1091.17 'cone mode: match patterns': 
+	git -C repo config --worktree core.sparseCheckoutCone true &&
+	rm -rf repo/a repo/folder1 repo/folder2 &&
+	git -C repo read-tree -mu HEAD 2>err &&
+	test_grep ! "disabling cone patterns" err &&
+	git -C repo reset --hard &&
+	check_files repo a folder1 folder2
 
-ok 14 - absolute includes from blobs work
+HEAD is now at ebf8b57 initial commit
+ok 17 - cone mode: match patterns
 
-expecting success of 1305.15 'relative includes from blobs fail': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path=one" >blob &&
-	blob=$(git hash-object -w blob) &&
-	test_must_fail git config --blob=$blob test.one
+expecting success of 1091.18 'cone mode: warn on bad pattern': 
+	test_when_finished mv sparse-checkout repo/.git/info/ &&
+	cp repo/.git/info/sparse-checkout . &&
+	echo "!/deep/deeper/*/" >>repo/.git/info/sparse-checkout &&
+	git -C repo read-tree -mu HEAD 2>err &&
+	test_grep "unrecognized negative pattern" err
 
-error: relative config includes must come from files
-error: bad config line 1 in blob d085876092eb24c144128bcd5db5d26e665f4f8a
-ok 15 - relative includes from blobs fail
+warning: unrecognized negative pattern: '/deep/deeper/*'
+warning: unrecognized negative pattern: '/deep/deeper/*'
+ok 18 - cone mode: warn on bad pattern
 
-expecting success of 1305.16 'absolute includes from stdin work': 
-	echo "[test]one = 1" >one &&
-	echo 1 >expect &&
-	echo "[include]path=\"$(pwd)/one\"" |
-	git config --file - test.one >actual &&
-	test_cmp expect actual
+expecting success of 1091.19 'sparse-checkout disable': 
+	test_when_finished rm -rf repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout disable &&
+	test_path_is_file repo/.git/info/sparse-checkout &&
+	git -C repo config --list >config &&
+	test_must_fail git config core.sparseCheckout &&
+	check_files repo a deep folder1 folder2
 
-ok 16 - absolute includes from stdin work
+ok 19 - sparse-checkout disable
 
-expecting success of 1305.17 'relative includes from stdin line fail': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path=one" |
-	test_must_fail git config --file - test.one
+expecting success of 1091.20 'sparse-index enabled and disabled': 
+	git -C repo sparse-checkout init --cone --sparse-index &&
+	test_cmp_config -C repo true index.sparse &&
+	git -C repo ls-files --sparse >sparse &&
+	git -C repo sparse-checkout disable &&
+	git -C repo ls-files --sparse >full &&
 
-error: relative config includes must come from files
-fatal: bad config line 1 in standard input
-ok 17 - relative includes from stdin line fail
+	cat >expect <<-\EOF &&
+	@@ -1,4 +1,7 @@
+	 a
+	-deep/
+	-folder1/
+	-folder2/
+	+deep/a
+	+deep/deeper1/a
+	+deep/deeper1/deepest/a
+	+deep/deeper2/a
+	+folder1/a
+	+folder2/a
+	EOF
 
-expecting success of 1305.18 'conditional include, both unanchored': 
-	git init foo &&
-	(
-		cd foo &&
-		echo "[includeIf \"gitdir:foo/\"]path=bar" >>.git/config &&
-		echo "[test]one=1" >.git/bar &&
-		echo 1 >expect &&
-		git config test.one >actual &&
-		test_cmp expect actual
-	)
+	diff -u sparse full | tail -n +3 >actual &&
+	test_cmp expect actual &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/foo/.git/
-ok 18 - conditional include, both unanchored
+	git -C repo config --list >config &&
+	test_cmp_config -C repo false index.sparse
 
-expecting success of 1305.19 'conditional include, $HOME expansion': 
-	(
-		cd foo &&
-		echo "[includeIf \"gitdir:~/foo/\"]path=bar2" >>.git/config &&
-		echo "[test]two=2" >.git/bar2 &&
-		echo 2 >expect &&
-		git config test.two >actual &&
-		test_cmp expect actual
-	)
+ok 20 - sparse-index enabled and disabled
 
-ok 19 - conditional include, $HOME expansion
+expecting success of 1091.21 'cone mode: init and set': 
+	git -C repo sparse-checkout init --cone &&
+	git -C repo config --list >config &&
+	test_grep "core.sparsecheckoutcone=true" config &&
+	list_files repo >dir  &&
+	echo a >expect &&
+	test_cmp expect dir &&
+	git -C repo sparse-checkout set deep/deeper1/deepest/ 2>err &&
+	test_must_be_empty err &&
+	check_files repo a deep &&
+	check_files repo/deep a deeper1 &&
+	check_files repo/deep/deeper1 a deepest &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	!/deep/*/
+	/deep/deeper1/
+	!/deep/deeper1/*/
+	/deep/deeper1/deepest/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout set --stdin 2>err <<-\EOF &&
+	folder1
+	folder2
+	EOF
+	test_must_be_empty err &&
+	check_files repo a folder1 folder2
 
-expecting success of 1305.20 'conditional include, full pattern': 
-	(
-		cd foo &&
-		echo "[includeIf \"gitdir:**/foo/**\"]path=bar3" >>.git/config &&
-		echo "[test]three=3" >.git/bar3 &&
-		echo 3 >expect &&
-		git config test.three >actual &&
-		test_cmp expect actual
-	)
+core.sparsecheckoutcone=true
+ok 21 - cone mode: init and set
 
-ok 20 - conditional include, full pattern
+expecting success of 1091.22 'cone mode: list': 
+	cat >expect <<-\EOF &&
+	folder1
+	folder2
+	EOF
+	git -C repo sparse-checkout set --stdin <expect &&
+	git -C repo sparse-checkout list >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp expect actual
 
-expecting success of 1305.21 'conditional include, relative path': 
-	echo "[includeIf \"gitdir:./foo/.git\"]path=bar4" >>.gitconfig &&
-	echo "[test]four=4" >bar4 &&
-	(
-		cd foo &&
-		echo 4 >expect &&
-		git config test.four >actual &&
-		test_cmp expect actual
-	)
+ok 22 - cone mode: list
 
-ok 21 - conditional include, relative path
+expecting success of 1091.23 'cone mode: set with nested folders': 
+	git -C repo sparse-checkout set deep deep/deeper1/deepest 2>err &&
+	test_line_count = 0 err &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	EOF
+	test_cmp repo/.git/info/sparse-checkout expect
 
-expecting success of 1305.22 'conditional include, both unanchored, icase': 
-	(
-		cd foo &&
-		echo "[includeIf \"gitdir/i:FOO/\"]path=bar5" >>.git/config &&
-		echo "[test]five=5" >.git/bar5 &&
-		echo 5 >expect &&
-		git config test.five >actual &&
-		test_cmp expect actual
-	)
+ok 23 - cone mode: set with nested folders
 
-ok 22 - conditional include, both unanchored, icase
+expecting success of 1091.24 'cone mode: add independent path': 
+	git -C repo sparse-checkout set deep/deeper1 &&
+	git -C repo sparse-checkout add --end-of-options folder1 &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	!/deep/*/
+	/deep/deeper1/
+	/folder1/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep folder1
 
-expecting success of 1305.23 'conditional include, early config reading': 
-	(
-		cd foo &&
-		echo "[includeIf \"gitdir:foo/\"]path=bar6" >>.git/config &&
-		echo "[test]six=6" >.git/bar6 &&
-		echo 6 >expect &&
-		test-tool config read_early_config test.six >actual &&
-		test_cmp expect actual
-	)
+ok 24 - cone mode: add independent path
 
-ok 23 - conditional include, early config reading
+expecting success of 1091.25 'cone mode: add sibling path': 
+	git -C repo sparse-checkout set deep/deeper1 &&
+	git -C repo sparse-checkout add deep/deeper2 &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	!/deep/*/
+	/deep/deeper1/
+	/deep/deeper2/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep
 
-expecting success of 1305.24 'conditional include with /**/': 
-	REPO=foo/bar/repo &&
-	git init $REPO &&
-	cat >>$REPO/.git/config <<-\EOF &&
-	[includeIf "gitdir:**/foo/**/bar/**"]
-	path=bar7
+ok 25 - cone mode: add sibling path
+
+expecting success of 1091.26 'cone mode: add parent path': 
+	git -C repo sparse-checkout set deep/deeper1 folder1 &&
+	git -C repo sparse-checkout add deep &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	/folder1/
 	EOF
-	echo "[test]seven=7" >$REPO/.git/bar7 &&
-	echo 7 >expect &&
-	git -C $REPO config test.seven >actual &&
-	test_cmp expect actual
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep folder1
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/foo/bar/repo/.git/
-ok 24 - conditional include with /**/
+ok 26 - cone mode: add parent path
 
-checking prerequisite: SYMLINKS
+expecting success of 1091.27 'not-up-to-date does not block rest of sparsification': 
+	test_when_finished git -C repo sparse-checkout disable &&
+	test_when_finished git -C repo reset --hard &&
+	git -C repo sparse-checkout set deep &&
 
-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
+	echo update >repo/deep/deeper2/a &&
+	cp repo/.git/info/sparse-checkout expect &&
+	test_write_lines "!/deep/*/" "/deep/deeper1/" >>expect &&
 
-)
-prerequisite SYMLINKS ok
-expecting success of 1305.25 'conditional include, set up symlinked $HOME': 
-	mkdir real-home &&
-	ln -s real-home home &&
-	(
-		HOME="$TRASH_DIRECTORY/home" &&
-		export HOME &&
-		cd "$HOME" &&
+	git -C repo sparse-checkout set deep/deeper1 2>err &&
 
-		git init foo &&
-		cd foo &&
-		mkdir sub
-	)
+	test_grep "The following paths are not up to date" err &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo/deep a deeper1 deeper2 &&
+	check_files repo/deep/deeper1 a deepest &&
+	check_files repo/deep/deeper1/deepest a &&
+	check_files repo/deep/deeper2 a
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/real-home/foo/.git/
-ok 25 - conditional include, set up symlinked $HOME
+warning: The following paths are not up to date and were left despite sparse patterns:
+HEAD is now at ebf8b57 initial commit
+ok 27 - not-up-to-date does not block rest of sparsification
 
-expecting success of 1305.26 'conditional include, $HOME expansion with symlinks': 
+expecting success of 1091.28 'revert to old sparse-checkout on empty update': 
+	git init empty-test &&
 	(
-		HOME="$TRASH_DIRECTORY/home" &&
-		export HOME &&
-		cd "$HOME"/foo &&
-
-		echo "[includeIf \"gitdir:~/foo/\"]path=bar2" >>.git/config &&
-		echo "[test]two=2" >.git/bar2 &&
-		echo 2 >expect &&
-		force_setup_explicit_git_dir &&
-		git -C sub config test.two >actual &&
-		test_cmp expect actual
+		echo >file &&
+		git add file &&
+		git commit -m "test" &&
+		git sparse-checkout set nothing 2>err &&
+		test_grep ! "Sparse checkout leaves no entry on working directory" err &&
+		test_grep ! ".git/index.lock" err &&
+		git sparse-checkout set --no-cone file
 	)
 
-ok 26 - conditional include, $HOME expansion with symlinks
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/empty-test/.git/
+[main (root-commit) d402fe2] test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+warning: pass a leading slash before paths such as 'file' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+ok 28 - revert to old sparse-checkout on empty update
 
-expecting success of 1305.27 'conditional include, relative path with symlinks': 
-	echo "[includeIf \"gitdir:./foo/.git\"]path=bar4" >home/.gitconfig &&
-	echo "[test]four=4" >home/bar4 &&
-	(
-		HOME="$TRASH_DIRECTORY/home" &&
-		export HOME &&
-		cd "$HOME"/foo &&
+expecting success of 1091.29 'fail when lock is taken': 
+	test_when_finished rm -rf repo/.git/info/sparse-checkout.lock &&
+	touch repo/.git/info/sparse-checkout.lock &&
+	test_must_fail git -C repo sparse-checkout set deep 2>err &&
+	test_grep "Unable to create .*\.lock" err
 
-		echo 4 >expect &&
-		force_setup_explicit_git_dir &&
-		git -C sub config test.four >actual &&
-		test_cmp expect actual
-	)
+fatal: Unable to create '/build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/repo/.git/info/sparse-checkout.lock': File exists.
+ok 29 - fail when lock is taken
 
-ok 27 - conditional include, relative path with symlinks
+expecting success of 1091.30 '.gitignore should not warn about cone mode': 
+	git -C repo config --worktree core.sparseCheckoutCone true &&
+	echo "**/bin/*" >repo/.gitignore &&
+	git -C repo reset --hard 2>err &&
+	test_grep ! "disabling cone patterns" err
 
-expecting success of 1305.28 'conditional include, gitdir matching symlink': 
-	ln -s foo bar &&
-	(
-		cd bar &&
-		echo "[includeIf \"gitdir:bar/\"]path=bar7" >>.git/config &&
-		echo "[test]seven=7" >.git/bar7 &&
-		echo 7 >expect &&
-		git config test.seven >actual &&
-		test_cmp expect actual
-	)
+HEAD is now at ebf8b57 initial commit
+ok 30 - .gitignore should not warn about cone mode
 
-ok 28 - conditional include, gitdir matching symlink
+expecting success of 1091.31 'sparse-checkout (init|set|disable) warns with dirty status': 
+	git clone repo dirty &&
+	echo dirty >dirty/folder1/a &&
 
-expecting success of 1305.29 'conditional include, gitdir matching symlink, icase': 
-	(
-		cd bar &&
-		echo "[includeIf \"gitdir/i:BAR/\"]path=bar8" >>.git/config &&
-		echo "[test]eight=8" >.git/bar8 &&
-		echo 8 >expect &&
-		git config test.eight >actual &&
-		test_cmp expect actual
-	)
+	git -C dirty sparse-checkout init --no-cone 2>err &&
+	test_grep "warning.*The following paths are not up to date" err &&
 
-ok 29 - conditional include, gitdir matching symlink, icase
+	git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&
+	test_grep "warning.*The following paths are not up to date" err &&
+	test_path_is_file dirty/folder1/a &&
 
-expecting success of 1305.30 'conditional include, onbranch': 
-	echo "[includeIf \"onbranch:foo-branch\"]path=bar9" >>.git/config &&
-	echo "[test]nine=9" >.git/bar9 &&
-	git checkout -b main &&
-	test_must_fail git config test.nine &&
-	git checkout -b foo-branch &&
-	echo 9 >expect &&
-	git config test.nine >actual &&
-	test_cmp expect actual
+	git -C dirty sparse-checkout disable 2>err &&
+	test_must_be_empty err &&
 
-Switched to a new branch 'main'
-Switched to a new branch 'foo-branch'
-ok 30 - conditional include, onbranch
+	git -C dirty reset --hard &&
+	git -C dirty sparse-checkout init --no-cone &&
+	git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* &&
+	test_path_is_missing dirty/folder1/a &&
+	git -C dirty sparse-checkout disable &&
+	test_path_is_file dirty/folder1/a
 
-expecting success of 1305.31 'conditional include, onbranch, wildcard': 
-	echo "[includeIf \"onbranch:?oo-*/**\"]path=bar10" >>.git/config &&
-	echo "[test]ten=10" >.git/bar10 &&
-	git checkout -b not-foo-branch/a &&
-	test_must_fail git config test.ten &&
+Cloning into 'dirty'...
+done.
+warning: The following paths are not up to date and were left despite sparse patterns:
+warning: The following paths are not up to date and were left despite sparse patterns:
+HEAD is now at ebf8b57 initial commit
+ok 31 - sparse-checkout (init|set|disable) warns with dirty status
 
-	echo 10 >expect &&
-	git checkout -b foo-branch/a/b/c &&
-	git config test.ten >actual &&
-	test_cmp expect actual &&
+expecting success of 1091.32 'sparse-checkout (init|set|disable) warns with unmerged status': 
+	git clone repo unmerged &&
 
-	git checkout -b moo-bar/a &&
-	git config test.ten >actual &&
-	test_cmp expect actual
+	cat >input <<-EOF &&
+	0 $ZERO_OID	folder1/a
+	100644 $(git -C unmerged rev-parse HEAD:folder1/a) 1	folder1/a
+	EOF
+	git -C unmerged update-index --index-info <input &&
 
-Switched to a new branch 'not-foo-branch/a'
-Switched to a new branch 'foo-branch/a/b/c'
-Switched to a new branch 'moo-bar/a'
-ok 31 - conditional include, onbranch, wildcard
+	git -C unmerged sparse-checkout init --no-cone 2>err &&
+	test_grep "warning.*The following paths are unmerged" err &&
 
-expecting success of 1305.32 'conditional include, onbranch, implicit /** for /': 
-	echo "[includeIf \"onbranch:foo-dir/\"]path=bar11" >>.git/config &&
-	echo "[test]eleven=11" >.git/bar11 &&
-	git checkout -b not-foo-dir/a &&
-	test_must_fail git config test.eleven &&
+	git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&
+	test_grep "warning.*The following paths are unmerged" err &&
+	test_path_is_file dirty/folder1/a &&
 
-	echo 11 >expect &&
-	git checkout -b foo-dir/a/b/c &&
-	git config test.eleven >actual &&
-	test_cmp expect actual
+	git -C unmerged sparse-checkout disable 2>err &&
+	test_grep "warning.*The following paths are unmerged" err &&
 
-Switched to a new branch 'not-foo-dir/a'
-Switched to a new branch 'foo-dir/a/b/c'
-ok 32 - conditional include, onbranch, implicit /** for /
+	git -C unmerged reset --hard &&
+	git -C unmerged sparse-checkout init --no-cone &&
+	git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* &&
+	git -C unmerged sparse-checkout disable
 
-expecting success of 1305.33 'include cycles are detected': 
-	git init --bare cycle &&
-	git -C cycle config include.path cycle &&
-	git config -f cycle/cycle include.path config &&
-	test_must_fail git -C cycle config --get-all test.value 2>stderr &&
-	grep "exceeded maximum include depth" stderr
+Cloning into 'unmerged'...
+done.
+warning: The following paths are unmerged and were left despite sparse patterns:
+warning: The following paths are unmerged and were left despite sparse patterns:
+warning: The following paths are unmerged and were left despite sparse patterns:
+HEAD is now at ebf8b57 initial commit
+ok 32 - sparse-checkout (init|set|disable) warns with unmerged status
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/cycle/
-fatal: exceeded maximum include depth (10) while including
-ok 33 - include cycles are detected
+checking known breakage of 1091.33 'sparse-checkout reapply': 
+	git clone repo tweak &&
 
-expecting success of 1305.34 'onbranch with unborn branch': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		git config set includeIf.onbranch:"*".path config.inc &&
-		git config set -f .git/config.inc foo.bar baz &&
-		git config get foo.bar
-	)
+	echo dirty >tweak/deep/deeper2/a &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/repo/.git/
-baz
-ok 34 - onbranch with unborn branch
+	cat >input <<-EOF &&
+	0 $ZERO_OID	folder1/a
+	100644 $(git -C tweak rev-parse HEAD:folder1/a) 1	folder1/a
+	EOF
+	git -C tweak update-index --index-info <input &&
 
-expecting success of 1305.35 'onbranch with detached HEAD': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		git config set "includeIf.onbranch:*.path" config.inc &&
-		git config set -f .git/config.inc foo.bar baz &&
-		test_commit initial &&
-		git switch --detach HEAD &&
-		test_must_fail git config get foo.bar
-	)
+	git -C tweak sparse-checkout init --cone 2>err &&
+	test_grep "warning.*The following paths are not up to date" err &&
+	test_grep "warning.*The following paths are unmerged" err &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/repo/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-HEAD is now at 24b24cf initial
-ok 35 - onbranch with detached HEAD
+	git -C tweak sparse-checkout set folder2 deep/deeper1 2>err &&
+	test_grep "warning.*The following paths are not up to date" err &&
+	test_grep "warning.*The following paths are unmerged" err &&
 
-expecting success of 1305.36 'onbranch without repository': 
-	test_when_finished "rm -f .gitconfig config.inc" &&
-	git config set -f .gitconfig "includeIf.onbranch:**.path" config.inc &&
-	git config set -f config.inc foo.bar baz &&
-	git config get foo.bar &&
-	test_must_fail nongit git config get foo.bar
+	git -C tweak sparse-checkout reapply 2>err &&
+	test_grep "warning.*The following paths are not up to date" err &&
+	test_path_is_file tweak/deep/deeper2/a &&
+	test_grep "warning.*The following paths are unmerged" err &&
+	test_path_is_file tweak/folder1/a &&
 
-baz
-ok 36 - onbranch without repository
+	git -C tweak checkout HEAD deep/deeper2/a &&
+	git -C tweak sparse-checkout reapply 2>err &&
+	test_grep ! "warning.*The following paths are not up to date" err &&
+	test_path_is_missing tweak/deep/deeper2/a &&
+	test_grep "warning.*The following paths are unmerged" err &&
+	test_path_is_file tweak/folder1/a &&
 
-expecting success of 1305.37 'onbranch without repository but explicit nonexistent Git directory': 
-	test_when_finished "rm -f .gitconfig config.inc" &&
-	git config set -f .gitconfig "includeIf.onbranch:**.path" config.inc &&
-	git config set -f config.inc foo.bar baz &&
-	git config get foo.bar &&
-	test_must_fail nongit git --git-dir=nonexistent config get foo.bar
+	# NEEDSWORK: We are asking to update a file outside of the
+	# sparse-checkout cone, but this is no longer allowed.
+	git -C tweak add folder1/a &&
+	git -C tweak sparse-checkout reapply 2>err &&
+	test_must_be_empty err &&
+	test_path_is_missing tweak/deep/deeper2/a &&
+	test_path_is_missing tweak/folder1/a &&
 
-baz
-ok 37 - onbranch without repository but explicit nonexistent Git directory
+	git -C tweak sparse-checkout disable
 
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1309-early-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1309-early-config/.git/
-expecting success of 1309.1 'read early config': 
-	test_config early.config correct &&
-	test-tool config read_early_config early.config >output &&
-	test correct = "$(cat output)"
+Cloning into 'tweak'...
+done.
+warning: The following paths are not up to date and were left despite sparse patterns:
+warning: The following paths are unmerged and were left despite sparse patterns:
+warning: The following paths are not up to date and were left despite sparse patterns:
+warning: The following paths are unmerged and were left despite sparse patterns:
+warning: The following paths are not up to date and were left despite sparse patterns:
+warning: The following paths are unmerged and were left despite sparse patterns:
+Updated 1 path from 5b6118d
+warning: The following paths are unmerged and were left despite sparse patterns:
+The following paths and/or pathspecs matched paths that exist
+outside of your sparse-checkout definition, so will not be
+updated in the index:
+folder1/a
+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"
+not ok 33 - sparse-checkout reapply # TODO known breakage
 
-ok 1 - read early config
+expecting success of 1091.34 'reapply can handle config options': 
+	git -C repo sparse-checkout init --cone --no-sparse-index &&
+	git -C repo config --worktree --list >actual &&
+	cat >expect <<-\EOF &&
+	core.sparsecheckout=true
+	core.sparsecheckoutcone=true
+	index.sparse=false
+	EOF
+	test_cmp expect actual &&
 
-expecting success of 1309.2 'in a sub-directory': 
-	test_config early.config sub &&
-	mkdir -p sub &&
-	(
-		cd sub &&
-		test-tool config read_early_config early.config
-	) >output &&
-	test sub = "$(cat output)"
+	git -C repo sparse-checkout reapply --no-cone --no-sparse-index &&
+	git -C repo config --worktree --list >actual &&
+	cat >expect <<-\EOF &&
+	core.sparsecheckout=true
+	core.sparsecheckoutcone=false
+	index.sparse=false
+	EOF
+	test_cmp expect actual &&
 
-ok 2 - in a sub-directory
+	git -C repo sparse-checkout reapply --cone --sparse-index &&
+	git -C repo config --worktree --list >actual &&
+	cat >expect <<-\EOF &&
+	core.sparsecheckout=true
+	core.sparsecheckoutcone=true
+	index.sparse=true
+	EOF
+	test_cmp expect actual &&
 
-expecting success of 1309.3 'ceiling': 
-	test_config early.config ceiling &&
-	mkdir -p sub &&
-	(
-		GIT_CEILING_DIRECTORIES="$PWD" &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd sub &&
-		test-tool config read_early_config early.config
-	) >output &&
-	test_must_be_empty output
+	git -C repo sparse-checkout disable
 
-ok 3 - ceiling
+ok 34 - reapply can handle config options
 
-expecting success of 1309.4 'ceiling #2': 
-	mkdir -p xdg/git &&
-	git config -f xdg/git/config early.config xdg &&
-	test_config early.config ceiling &&
-	mkdir -p sub &&
-	(
-		XDG_CONFIG_HOME="$PWD"/xdg &&
-		GIT_CEILING_DIRECTORIES="$PWD" &&
-		export GIT_CEILING_DIRECTORIES XDG_CONFIG_HOME &&
-		cd sub &&
-		test-tool config read_early_config early.config
-	) >output &&
-	test xdg = "$(cat output)"
+expecting success of 1091.35 'cone mode: set with core.ignoreCase=true': 
+	rm repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout init --cone &&
+	git -C repo -c core.ignoreCase=true sparse-checkout set folder1 &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/folder1/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a folder1
 
-ok 4 - ceiling #2
+ok 35 - cone mode: set with core.ignoreCase=true
 
-expecting success of 1309.5 'read config file in right order': 
-	echo "[test]source = home" >>.gitconfig &&
-	git init foo &&
+expecting success of 1091.36 'setup submodules': 
+	git clone repo super &&
 	(
-		cd foo &&
-		echo "[test]source = repo" >>.git/config &&
-		GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config \
-			read_early_config test.source >actual &&
-		cat >expected <<-\EOF &&
-		home
-		repo
-		cmdline
-		EOF
-		test_cmp expected actual
+		cd super &&
+		mkdir modules &&
+		git -c protocol.file.allow=always \
+			submodule add ../repo modules/child &&
+		git add . &&
+		git commit -m "add submodule" &&
+		git sparse-checkout init --cone &&
+		git sparse-checkout set folder1
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1309-early-config/foo/.git/
-ok 5 - read config file in right order
+Cloning into 'super'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/super/modules/child'...
+done.
+[main 7bdd197] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 modules/child
+warning: unable to rmdir 'modules/child': Directory not empty
+warning: unable to rmdir 'modules/child': Directory not empty
+ok 36 - setup submodules
 
-expecting success of 1309.6 'ignore .git/ with incompatible repository version': 
-	test_with_config "[core]repositoryformatversion = 999999" 2>err &&
-	test_grep "warning:.* Expected git repo version <= [1-9]" err
+expecting success of 1091.37 'interaction with submodules': 
+	check_files super a folder1 modules &&
+	check_files super/modules/child a deep folder1 folder2
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1309-early-config/throwaway/.git/
-warning: ignoring git dir '.git': Expected git repo version <= 1, found 999999
-ok 6 - ignore .git/ with incompatible repository version
+ok 37 - interaction with submodules
 
-checking known breakage of 1309.7 'ignore .git/ with invalid repository version': 
-	test_with_config "[core]repositoryformatversion = invalid"
+expecting success of 1091.38 'check-rules interaction with submodules': 
+	git -C super ls-tree --name-only -r HEAD >all-files &&
+	git -C super sparse-checkout check-rules >check-rules-matches <all-files &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1309-early-config/throwaway/.git/
-fatal: bad numeric config value 'invalid' for 'core.repositoryformatversion' in file .git/config: invalid unit
-not ok 7 - ignore .git/ with invalid repository version # TODO known breakage
+	test_grep ! "modules/" check-rules-matches &&
+	test_grep "folder1/" check-rules-matches
 
-checking known breakage of 1309.8 'ignore .git/ with invalid config': 
-	test_with_config "["
+folder1/a
+ok 38 - check-rules interaction with submodules
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1309-early-config/throwaway/.git/
-fatal: bad config line 1 in file .git/config
-not ok 8 - ignore .git/ with invalid config # TODO known breakage
+expecting success of 1091.39 'different sparse-checkouts with worktrees': 
+	git -C repo sparse-checkout set --cone deep folder1 &&
+	git -C repo worktree add --detach ../worktree &&
+	check_files worktree "a deep folder1" &&
+	git -C repo sparse-checkout set --cone folder1 &&
+	git -C worktree sparse-checkout set --cone deep/deeper1 &&
+	check_files repo "a folder1" &&
+	check_files worktree "a deep"
 
-expecting success of 1309.9 'early config and onbranch': 
-	echo "[broken" >broken &&
-	test_with_config "[includeif \"onbranch:topic\"]path=../broken"
+Preparing worktree (detached HEAD ebf8b57)
+HEAD is now at ebf8b57 initial commit
+ok 39 - different sparse-checkouts with worktrees
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1309-early-config/throwaway/.git/
-ok 9 - early config and onbranch
+expecting success of 1091.40 'set using filename keeps file on-disk': 
+	git -C repo sparse-checkout set --skip-checks a deep &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/a/
+	/deep/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep
 
-expecting success of 1309.10 'onbranch config outside of git repo': 
-	test_config_global includeIf.onbranch:topic.path non-existent &&
-	nongit git help
+ok 40 - set using filename keeps file on-disk
 
-usage: git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]
-           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
-           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch]
-           [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]
-           [--work-tree=<path>] [--namespace=<name>] [--config-env=<name>=<envvar>]
-           <command> [<args>]
+expecting success of 1091.41 'pattern-checks: /A/**': 
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/folder1/**
+	EOF
+	check_read_tree_errors repo "a folder1" "disabling cone pattern matching"
 
-These are common Git commands used in various situations:
+warning: disabling cone pattern matching
+warning: disabling cone pattern matching
+ok 41 - pattern-checks: /A/**
 
-start a working area (see also: git help tutorial)
-   clone      Clone a repository into a new directory
-   init       Create an empty Git repository or reinitialize an existing one
+expecting success of 1091.42 'pattern-checks: /A/**/B/': 
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/deep/**/deepest
+	EOF
+	check_read_tree_errors repo "a deep" "disabling cone pattern matching" &&
+	check_files repo/deep "deeper1" &&
+	check_files repo/deep/deeper1 "deepest"
 
-work on the current change (see also: git help everyday)
-   add        Add file contents to the index
-   mv         Move or rename a file, a directory, or a symlink
-   restore    Restore working tree files
-   rm         Remove files from the working tree and from the index
+warning: disabling cone pattern matching
+warning: disabling cone pattern matching
+ok 42 - pattern-checks: /A/**/B/
 
-examine the history and state (see also: git help revisions)
-   bisect     Use binary search to find the commit that introduced a bug
-   diff       Show changes between commits, commit and working tree, etc
-   grep       Print lines matching a pattern
-   log        Show commit logs
-   show       Show various types of objects
-   status     Show the working tree status
+expecting success of 1091.43 'pattern-checks: too short': 
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/
+	EOF
+	check_read_tree_errors repo "a" "disabling cone pattern matching"
 
-grow, mark and tweak your common history
-   backfill   Download missing objects in a partial clone
-   branch     List, create, or delete branches
-   commit     Record changes to the repository
-   merge      Join two or more development histories together
-   rebase     Reapply commits on top of another base tip
-   reset      Reset current HEAD to the specified state
-   switch     Switch branches
-   tag        Create, list, delete or verify a tag object signed with GPG
+warning: disabling cone pattern matching
+ok 43 - pattern-checks: too short
 
-collaborate (see also: git help workflows)
-   fetch      Download objects and refs from another repository
-   pull       Fetch from and integrate with another repository or a local branch
-   push       Update remote refs along with associated objects
+expecting success of 1091.44 'pattern-checks: not too short': 
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/b/
+	EOF
+	git -C repo read-tree -mu HEAD 2>err &&
+	test_must_be_empty err &&
+	check_files repo a
 
-'git help -a' and 'git help -g' list available subcommands and some
-concept guides. See 'git help <command>' or 'git help <concept>'
-to read about a specific subcommand or concept.
-See 'git help git' for an overview of the system.
-ok 10 - onbranch config outside of git repo
+ok 44 - pattern-checks: not too short
 
-# still have 2 known breakage(s)
-# passed all remaining 8 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1308-config-set.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1308-config-set/.git/
-expecting success of 1308.1 'setup default config': 
-	cat >.git/config <<-\EOF
-	[case]
-		penguin = very blue
-		Movie = BadPhysics
-		UPPERCASE = true
-		MixedCase = true
-		my =
-		foo
-		baz = sam
-	[Cores]
-		WhatEver = Second
-		baz = bar
-	[cores]
-		baz = bat
-	[CORES]
-		baz = ball
-	[my "Foo bAr"]
-		hi = mixed-case
-	[my "FOO BAR"]
-		hi = upper-case
-	[my "foo bar"]
-		hi = lower-case
-	[case]
-		baz = bat
-		baz = hask
-	[lamb]
-		chop = 65
-		head = none
-	[goat]
-		legs = 4
-		head = true
-		skin = false
-		nose = 1
-		horns
-	[value]
-		less
+expecting success of 1091.45 'pattern-checks: trailing "*"': 
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/a*
 	EOF
+	check_read_tree_errors repo "a" "disabling cone pattern matching"
 
-ok 1 - setup default config
+warning: disabling cone pattern matching
+ok 45 - pattern-checks: trailing "*"
 
-expecting success of 1308.2 'get value for a simple key': 
-	check_config get_value case.penguin "very blue"
+expecting success of 1091.46 'pattern-checks: starting "*"': 
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	*eep/
+	EOF
+	check_read_tree_errors repo "a deep" "disabling cone pattern matching"
 
-ok 2 - get value for a simple key
+warning: disabling cone pattern matching
+warning: disabling cone pattern matching
+ok 46 - pattern-checks: starting "*"
 
-expecting success of 1308.3 'get value for a key with value as an empty string': 
-	check_config get_value case.my ""
+expecting success of 1091.47 'pattern-checks: non directory pattern': 
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/deep/deeper1/a
+	EOF
+	check_read_tree_errors repo deep "disabling cone pattern matching" &&
+	check_files repo/deep deeper1 &&
+	check_files repo/deep/deeper1 a
 
-ok 3 - get value for a key with value as an empty string
+warning: disabling cone pattern matching
+warning: disabling cone pattern matching
+ok 47 - pattern-checks: non directory pattern
 
-expecting success of 1308.4 'get value for a key with value as NULL': 
-	check_config get_value case.foo "(NULL)"
+expecting success of 1091.48 'pattern-checks: contained glob characters': 
+	for c in "[a]" "\\" "?" "*"
+	do
+		cat >repo/.git/info/sparse-checkout <<-EOF &&
+		/*
+		!/*/
+		something$c-else/
+		EOF
+		check_read_tree_errors repo "a" "disabling cone pattern matching" || return 1
+	done
 
-ok 4 - get value for a key with value as NULL
+warning: disabling cone pattern matching
+warning: disabling cone pattern matching
+warning: disabling cone pattern matching
+warning: disabling cone pattern matching
+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 1308.5 'upper case key': 
-	check_config get_value case.UPPERCASE "true" &&
-	check_config get_value case.uppercase "true"
+expecting success of 1091.49 'pattern-checks: escaped characters': 
+	git clone repo escaped &&
+	TREEOID=$(git -C escaped rev-parse HEAD:folder1) &&
+	NEWTREE=$(git -C escaped mktree <<-EOF
+	$(git -C escaped ls-tree HEAD)
+	040000 tree $TREEOID	zbad\\dir
+	040000 tree $TREEOID	zdoes*exist
+	040000 tree $TREEOID	zglob[!a]?
+	EOF
+	) &&
+	COMMIT=$(git -C escaped commit-tree $NEWTREE -p HEAD) &&
+	git -C escaped reset --hard $COMMIT &&
+	check_files escaped "a deep folder1 folder2 zbad\\dir zdoes*exist" zglob[!a]? &&
+	git -C escaped sparse-checkout init --cone &&
+	git -C escaped sparse-checkout set --skip-checks zbad\\dir/bogus "zdoes*not*exist" "zdoes*exist" "zglob[!a]?" &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/zbad\\dir/
+	!/zbad\\dir/*/
+	/zbad\\dir/bogus/
+	/zdoes\*exist/
+	/zdoes\*not\*exist/
+	/zglob\[!a]\?/
+	EOF
+	test_cmp expect escaped/.git/info/sparse-checkout &&
+	check_read_tree_errors escaped "a zbad\\dir zdoes*exist zglob[!a]?" &&
+	git -C escaped ls-tree -d --name-only HEAD >list-expect &&
+	git -C escaped sparse-checkout set --stdin <list-expect &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	/folder1/
+	/folder2/
+	/zbad\\dir/
+	/zdoes\*exist/
+	/zglob\[!a]\?/
+	EOF
+	test_cmp expect escaped/.git/info/sparse-checkout &&
+	check_files escaped "a deep folder1 folder2 zbad\\dir zdoes*exist" zglob[!a]? &&
+	git -C escaped sparse-checkout list >list-actual &&
+	test_cmp list-expect list-actual
 
-ok 5 - upper case key
+Cloning into 'escaped'...
+done.
+HEAD is now at deac45b
+ok 49 - pattern-checks: escaped characters
 
-expecting success of 1308.6 'mixed case key': 
-	check_config get_value case.MixedCase "true" &&
-	check_config get_value case.MIXEDCASE "true" &&
-	check_config get_value case.mixedcase "true"
+ok 50 # skip cone mode replaces backslashes with slashes (missing MINGW)
 
-ok 6 - mixed case key
+expecting success of 1091.51 'cone mode clears ignored subdirectories': 
+	rm repo/.git/info/sparse-checkout &&
 
-expecting success of 1308.7 'key and value with mixed case': 
-	check_config get_value case.Movie "BadPhysics"
+	git -C repo sparse-checkout init --cone &&
+	git -C repo sparse-checkout set deep/deeper1 &&
 
-ok 7 - key and value with mixed case
+	cat >repo/.gitignore <<-\EOF &&
+	obj/
+	*.o
+	EOF
 
-expecting success of 1308.8 'key with case sensitive subsection': 
-	check_config get_value "my.Foo bAr.hi" "mixed-case" &&
-	check_config get_value "my.FOO BAR.hi" "upper-case" &&
-	check_config get_value "my.foo bar.hi" "lower-case"
+	git -C repo add .gitignore &&
+	git -C repo commit -m ".gitignore" &&
 
-ok 8 - key with case sensitive subsection
+	mkdir -p repo/obj repo/folder1/obj repo/deep/deeper2/obj &&
+	for file in folder1/obj/a obj/a folder1/file.o folder1.o \
+		    deep/deeper2/obj/a deep/deeper2/file.o file.o
+	do
+		echo ignored >repo/$file || return 1
+	done &&
 
-expecting success of 1308.9 'key with case insensitive section header': 
-	check_config get_value cores.baz "ball" &&
-	check_config get_value Cores.baz "ball" &&
-	check_config get_value CORES.baz "ball" &&
-	check_config get_value coreS.baz "ball"
+	git -C repo status --porcelain=v2 >out &&
+	test_must_be_empty out &&
 
-ok 9 - key with case insensitive section header
+	git -C repo sparse-checkout reapply &&
+	test_path_is_missing repo/folder1 &&
+	test_path_is_missing repo/deep/deeper2 &&
+	test_path_is_dir repo/obj &&
+	test_path_is_file repo/file.o &&
 
-expecting success of 1308.10 'key with case insensitive section header & variable': 
-	check_config get_value CORES.BAZ "ball" &&
-	check_config get_value cores.baz "ball" &&
-	check_config get_value cores.BaZ "ball" &&
-	check_config get_value cOreS.bAz "ball"
+	git -C repo status --porcelain=v2 >out &&
+	test_must_be_empty out &&
 
-ok 10 - key with case insensitive section header & variable
+	git -C repo sparse-checkout set deep/deeper2 &&
+	test_path_is_missing repo/deep/deeper1 &&
+	test_path_is_dir repo/deep/deeper2 &&
+	test_path_is_dir repo/obj &&
+	test_path_is_file repo/file.o &&
 
-expecting success of 1308.11 'find value with misspelled key': 
-	check_config expect_code 1 get_value "my.fOo Bar.hi" "Value not found for \"my.fOo Bar.hi\""
+	>repo/deep/deeper2/ignored.o &&
+	>repo/deep/deeper2/untracked &&
 
-ok 11 - find value with misspelled key
+	# When an untracked file is in the way, all untracked files
+	# (even ignored files) are preserved.
+	git -C repo sparse-checkout set folder1 2>err &&
+	grep "contains untracked files" err &&
+	test_path_is_file repo/deep/deeper2/ignored.o &&
+	test_path_is_file repo/deep/deeper2/untracked &&
 
-expecting success of 1308.12 'find value with the highest priority': 
-	check_config get_value case.baz "hask"
+	# The rest of the cone matches expectation
+	test_path_is_missing repo/deep/deeper1 &&
+	test_path_is_dir repo/obj &&
+	test_path_is_file repo/file.o &&
 
-ok 12 - find value with the highest priority
+	git -C repo status --porcelain=v2 >out &&
+	echo "? deep/deeper2/untracked" >expect &&
+	test_cmp expect out
 
-expecting success of 1308.13 'return value for an existing key': 
-	test-tool config get lamb.chop >out 2>err &&
-	test_must_be_empty out &&
-	test_must_be_empty err
+[main ab507a5] .gitignore
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 .gitignore
+warning: directory 'deep/' contains untracked files, but is not in the sparse-checkout cone
+ok 51 - cone mode clears ignored subdirectories
 
-ok 13 - return value for an existing key
+expecting success of 1091.52 'malformed cone-mode patterns': 
+	git -C repo sparse-checkout init --cone &&
+	mkdir -p repo/foo/bar &&
+	touch repo/foo/bar/x repo/foo/y &&
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/foo/
+	!/foo/*/
+	/foo/\*/
+	EOF
 
-expecting success of 1308.14 'return value for value-less key': 
-	test-tool config get value.less >out 2>err &&
-	test_must_be_empty out &&
-	test_must_be_empty err
+	# Listing the patterns will notice the duplicate pattern and
+	# emit a warning. It will list the patterns directly instead
+	# of using the cone-mode translation to a set of directories.
+	git -C repo sparse-checkout list >actual 2>err &&
+	test_cmp repo/.git/info/sparse-checkout actual &&
+	grep "warning: your sparse-checkout file may have issues: pattern .* is repeated" err &&
+	grep "warning: disabling cone pattern matching" err
 
-ok 14 - return value for value-less key
+warning: directory 'deep/' contains untracked files, but is not in the sparse-checkout cone
+warning: your sparse-checkout file may have issues: pattern '/foo/\*' is repeated
+warning: disabling cone pattern matching
+ok 52 - malformed cone-mode patterns
 
-expecting success of 1308.15 'return value for a missing key': 
-	cat >expect <<-\EOF &&
-	Value not found for "missing.key"
-	EOF
-	test_expect_code 1 test-tool config get missing.key >actual 2>err &&
-	test_cmp actual expect &&
-	test_must_be_empty err
+expecting success of 1091.53 'set from subdir pays attention to prefix': 
+	git -C repo sparse-checkout disable &&
+	git -C repo/deep sparse-checkout set --cone deeper2 ../folder1 &&
 
-ok 15 - return value for a missing key
+	git -C repo sparse-checkout list >actual &&
 
-expecting success of 1308.16 'return value for a bad key: CONFIG_INVALID_KEY': 
 	cat >expect <<-\EOF &&
-	Key "fails.iskeychar.-" is invalid
+	deep/deeper2
+	folder1
 	EOF
-	test_expect_code 1 test-tool config get fails.iskeychar.- >actual 2>err &&
-	test_cmp actual expect &&
-	test_must_be_empty out
+	test_cmp expect actual
 
-ok 16 - return value for a bad key: CONFIG_INVALID_KEY
+ok 53 - set from subdir pays attention to prefix
+
+expecting success of 1091.54 'add from subdir pays attention to prefix': 
+	git -C repo sparse-checkout set --cone deep/deeper2 &&
+	git -C repo/deep sparse-checkout add deeper1/deepest ../folder1 &&
+
+	git -C repo sparse-checkout list >actual &&
 
-expecting success of 1308.17 'return value for a bad key: CONFIG_NO_SECTION_OR_NAME': 
 	cat >expect <<-\EOF &&
-	Key "keynosection" has no section
+	deep/deeper1/deepest
+	deep/deeper2
+	folder1
 	EOF
-	test_expect_code 1 test-tool config get keynosection >actual 2>err &&
-	test_cmp actual expect &&
-	test_must_be_empty out
+	test_cmp expect actual
 
-ok 17 - return value for a bad key: CONFIG_NO_SECTION_OR_NAME
+ok 54 - add from subdir pays attention to prefix
 
-expecting success of 1308.18 'find integer value for a key': 
-	check_config get_int lamb.chop 65
+expecting success of 1091.55 'set from subdir in non-cone mode throws an error': 
+	git -C repo sparse-checkout disable &&
+	test_must_fail git -C repo/deep sparse-checkout set --no-cone deeper2 ../folder1 2>error &&
 
-ok 18 - find integer value for a key
+	grep "run from the toplevel directory in non-cone mode" error
 
-expecting success of 1308.19 'parse integer value during iteration': 
-	check_config git_config_int lamb.chop 65
+fatal: please run from the toplevel directory in non-cone mode
+ok 55 - set from subdir in non-cone mode throws an error
 
-ok 19 - parse integer value during iteration
+expecting success of 1091.56 'set from subdir in non-cone mode throws an error': 
+	git -C repo sparse-checkout set --no-cone deep/deeper2 &&
+	test_must_fail git -C repo/deep sparse-checkout add deeper1/deepest ../folder1 2>error &&
 
-expecting success of 1308.20 'find string value for a key': 
-	check_config get_string case.baz hask &&
-	check_config expect_code 1 get_string case.ba "Value not found for \"case.ba\""
+	grep "run from the toplevel directory in non-cone mode" error
 
-ok 20 - find string value for a key
+fatal: please run from the toplevel directory in non-cone mode
+ok 56 - set from subdir in non-cone mode throws an error
 
-expecting success of 1308.21 'check line error when NULL string is queried': 
-	test_expect_code 128 test-tool config get_string case.foo 2>result &&
-	test_grep "fatal: .*case\.foo.*\.git/config.*line 7" result
+expecting success of 1091.57 'by default, cone mode will error out when passed files': 
+	git -C repo sparse-checkout reapply --cone &&
+	test_must_fail git -C repo sparse-checkout add .gitignore 2>error &&
 
-fatal: bad config variable 'case.foo' in file '.git/config' at line 7
-ok 21 - check line error when NULL string is queried
+	grep ".gitignore.*is not a directory" error
 
-expecting success of 1308.22 'find integer if value is non parse-able': 
-	check_config expect_code 128 get_int lamb.head
+warning: unrecognized pattern: 'deep/deeper2'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'deep/deeper2'
+warning: disabling cone pattern matching
+fatal: '.gitignore' is not a directory; to treat it as a directory anyway, rerun with --skip-checks
+ok 57 - by default, cone mode will error out when passed files
 
-fatal: bad numeric config value 'none' for 'lamb.head' in file .git/config: invalid unit
-ok 22 - find integer if value is non parse-able
+expecting success of 1091.58 'error on mistyped command line options': 
+	test_must_fail git -C repo sparse-checkout add --sikp-checks .gitignore 2>error &&
 
-expecting success of 1308.23 'non parse-able integer value during iteration': 
-	check_config expect_code 128 git_config_int lamb.head 2>result &&
-	grep "fatal: bad numeric config value .* in file \.git/config" result
+	grep "unknown option.*sikp-checks" error
 
-fatal: bad numeric config value 'none' for 'none' in file .git/config: invalid unit
-ok 23 - non parse-able integer value during iteration
+error: unknown option `sikp-checks'
+ok 58 - error on mistyped command line options
 
-expecting success of 1308.24 'find bool value for the entered key': 
-	check_config get_bool goat.head 1 &&
-	check_config get_bool goat.skin 0 &&
-	check_config get_bool goat.nose 1 &&
-	check_config get_bool goat.horns 1 &&
-	check_config get_bool goat.legs 1
+expecting success of 1091.59 'by default, non-cone mode will warn on individual files': 
+	git -C repo sparse-checkout reapply --no-cone &&
+	git -C repo sparse-checkout add .gitignore 2>warning &&
 
-ok 24 - find bool value for the entered key
+	grep "pass a leading slash before paths.*if you want a single file" warning
 
-expecting success of 1308.25 'find multiple values': 
-	check_config get_value_multi case.baz sam bat hask
+warning: pass a leading slash before paths such as '.gitignore' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+ok 59 - by default, non-cone mode will warn on individual files
 
-ok 25 - find multiple values
+expecting success of 1091.60 'setup bare repo': 
+	git clone --bare "file://$(pwd)/repo" bare
 
-expecting success of 1308.26 'get_value_multi: NULL value in config': 
-		config="$file" &&
-		if test -z "$config"
-		then
-			config=.git/config &&
-			test_when_finished "mv $config.old $config" &&
-			mv "$config" "$config".old
-		fi &&
+Cloning into bare repository 'bare'...
+ok 60 - setup bare repo
 
-		# Value-less in the middle of a list
-		cat >"$config" <<-\EOF &&
-		[a]key=x
-		[a]key
-		[a]key=y
-		EOF
-		case "$op" in
-		*_multi)
-			cat >expect <<-\EOF
-			x
-			(NULL)
-			y
-			EOF
-			;;
-		*)
-			cat >expect <<-\EOF
-			y
-			EOF
-			;;
-		esac &&
-		test-tool config "$op" a.key $file >actual &&
-		test_cmp expect actual &&
+expecting success of 1091.61 'list fails outside work tree': 
+	test_must_fail git -C bare sparse-checkout list 2>err &&
+	test_grep "this operation must be run in a work tree" err
 
-		# Value-less at the end of a least
-		cat >"$config" <<-\EOF &&
-		[a]key=x
-		[a]key=y
-		[a]key
-		EOF
-		case "$op" in
-		*_multi)
-			cat >expect <<-\EOF
-			x
-			y
-			(NULL)
-			EOF
-			;;
-		*)
-			cat >expect <<-\EOF
-			(NULL)
-			EOF
-			;;
-		esac &&
-		test-tool config "$op" a.key $file >actual &&
-		test_cmp expect actual
-	
-ok 26 - get_value_multi: NULL value in config
+fatal: this operation must be run in a work tree
+ok 61 - list fails outside work tree
 
-expecting success of 1308.27 'configset_get_value: NULL value in config in my.config': 
-		config="$file" &&
-		if test -z "$config"
-		then
-			config=.git/config &&
-			test_when_finished "mv $config.old $config" &&
-			mv "$config" "$config".old
-		fi &&
+expecting success of 1091.62 'add fails outside work tree': 
+	test_must_fail git -C bare sparse-checkout add deeper 2>err &&
+	test_grep "this operation must be run in a work tree" err
 
-		# Value-less in the middle of a list
-		cat >"$config" <<-\EOF &&
-		[a]key=x
-		[a]key
-		[a]key=y
-		EOF
-		case "$op" in
-		*_multi)
-			cat >expect <<-\EOF
-			x
-			(NULL)
-			y
-			EOF
-			;;
-		*)
-			cat >expect <<-\EOF
-			y
-			EOF
-			;;
-		esac &&
-		test-tool config "$op" a.key $file >actual &&
-		test_cmp expect actual &&
+fatal: this operation must be run in a work tree
+ok 62 - add fails outside work tree
 
-		# Value-less at the end of a least
-		cat >"$config" <<-\EOF &&
-		[a]key=x
-		[a]key=y
-		[a]key
-		EOF
-		case "$op" in
-		*_multi)
-			cat >expect <<-\EOF
-			x
-			y
-			(NULL)
-			EOF
-			;;
-		*)
-			cat >expect <<-\EOF
-			(NULL)
-			EOF
-			;;
-		esac &&
-		test-tool config "$op" a.key $file >actual &&
-		test_cmp expect actual
-	
-ok 27 - configset_get_value: NULL value in config in my.config
+expecting success of 1091.63 'set fails outside work tree': 
+	test_must_fail git -C bare sparse-checkout set deeper 2>err &&
+	test_grep "this operation must be run in a work tree" err
 
-expecting success of 1308.28 'configset_get_value_multi: NULL value in config in my.config': 
-		config="$file" &&
-		if test -z "$config"
-		then
-			config=.git/config &&
-			test_when_finished "mv $config.old $config" &&
-			mv "$config" "$config".old
-		fi &&
+fatal: this operation must be run in a work tree
+ok 63 - set fails outside work tree
 
-		# Value-less in the middle of a list
-		cat >"$config" <<-\EOF &&
-		[a]key=x
-		[a]key
-		[a]key=y
-		EOF
-		case "$op" in
-		*_multi)
-			cat >expect <<-\EOF
-			x
-			(NULL)
-			y
-			EOF
-			;;
-		*)
-			cat >expect <<-\EOF
-			y
-			EOF
-			;;
-		esac &&
-		test-tool config "$op" a.key $file >actual &&
-		test_cmp expect actual &&
+expecting success of 1091.64 'init fails outside work tree': 
+	test_must_fail git -C bare sparse-checkout init 2>err &&
+	test_grep "this operation must be run in a work tree" err
 
-		# Value-less at the end of a least
-		cat >"$config" <<-\EOF &&
-		[a]key=x
-		[a]key=y
-		[a]key
-		EOF
-		case "$op" in
-		*_multi)
-			cat >expect <<-\EOF
-			x
-			y
-			(NULL)
-			EOF
-			;;
-		*)
-			cat >expect <<-\EOF
-			(NULL)
-			EOF
-			;;
-		esac &&
-		test-tool config "$op" a.key $file >actual &&
-		test_cmp expect actual
-	
-ok 28 - configset_get_value_multi: NULL value in config in my.config
+fatal: this operation must be run in a work tree
+ok 64 - init fails outside work tree
 
-expecting success of 1308.29 'find value from a configset': 
-	cat >config2 <<-\EOF &&
-	[case]
-		baz = lama
-	[my]
-		new = silk
-	[case]
-		baz = ball
-	EOF
-	echo silk >expect &&
-	test-tool config configset_get_value my.new config2 .git/config >actual &&
-	test_cmp expect actual
+expecting success of 1091.65 'reapply fails outside work tree': 
+	test_must_fail git -C bare sparse-checkout reapply 2>err &&
+	test_grep "this operation must be run in a work tree" err
 
-ok 29 - find value from a configset
+fatal: this operation must be run in a work tree
+ok 65 - reapply fails outside work tree
 
-expecting success of 1308.30 'find value with highest priority from a configset': 
-	echo hask >expect &&
-	test-tool config configset_get_value case.baz config2 .git/config >actual &&
-	test_cmp expect actual
+expecting success of 1091.66 'disable fails outside work tree': 
+	test_must_fail git -C bare sparse-checkout disable 2>err &&
+	test_grep "this operation must be run in a work tree" err
 
-ok 30 - find value with highest priority from a configset
+fatal: this operation must be run in a work tree
+ok 66 - disable fails outside work tree
 
-expecting success of 1308.31 'find value_list for a key from a configset': 
-	cat >expect <<-\EOF &&
-	lama
-	ball
-	sam
-	bat
-	hask
-	EOF
-	test-tool config configset_get_value_multi case.baz config2 .git/config >actual &&
-	test_cmp expect actual
+expecting success of 1091.67 'setup clean': 
+	git -C repo clean -fdx
 
-ok 31 - find value_list for a key from a configset
+Removing deep/deeper2/ignored.o
+Removing deep/deeper2/untracked
+Removing file.o
+Removing folder1.o
+Removing foo/
+Removing obj/
+ok 67 - setup clean
 
-expecting success of 1308.32 'proper error on non-existent files': 
-	echo "Error (-1) reading configuration file non-existent-file." >expect &&
-	test_expect_code 2 test-tool config configset_get_value foo.bar non-existent-file 2>actual &&
-	test_cmp expect actual
+expecting success of 1091.68 'check-rules cone mode': 
+	cat >rules <<-\EOF &&
+	folder1
+	deep/deeper1/deepest
+	EOF
 
-ok 32 - proper error on non-existent files
+	git -C bare ls-tree -r --name-only HEAD >all-files &&
+	git -C bare sparse-checkout check-rules --cone \
+		--rules-file ../rules >check-rules-file <all-files &&
 
-expecting success of 1308.33 'proper error on directory "files"': 
-	echo "Error (-1) reading configuration file a-directory." >expect &&
-	mkdir a-directory &&
-	test_expect_code 2 test-tool config configset_get_value foo.bar a-directory 2>output &&
-	grep "^warning:" output &&
-	grep "^Error" output >actual &&
-	test_cmp expect actual
+	git -C repo sparse-checkout set --cone --stdin <rules&&
+	git -C repo ls-files -t >out &&
+	sed -n "/^S /!s/^. //p" out >ls-files &&
 
-warning: unable to access 'a-directory': Is a directory
-ok 33 - proper error on directory "files"
+	git -C repo sparse-checkout check-rules >check-rules-default <all-files &&
 
-checking prerequisite: SANITY
+	test_grep "deep/deeper1/deepest/a" check-rules-file &&
+	test_grep ! "deep/deeper2" check-rules-file &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
+	test_cmp check-rules-file ls-files &&
+	test_cmp check-rules-file check-rules-default
 
-	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"
+deep/deeper1/deepest/a
+ok 68 - check-rules cone mode
 
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
+expecting success of 1091.69 'check-rules non-cone mode': 
+	cat >rules <<-\EOF &&
+	deep/deeper1/deepest/a
+	EOF
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
+	git -C bare ls-tree -r --name-only HEAD >all-files &&
+	git -C bare sparse-checkout check-rules --no-cone --rules-file ../rules\
+		>check-rules-file <all-files &&
 
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 1308.34 'proper error on non-accessible files': 
-	chmod -r .git/config &&
-	test_when_finished "chmod +r .git/config" &&
-	echo "Error (-1) reading configuration file .git/config." >expect &&
-	test_expect_code 2 test-tool config configset_get_value foo.bar .git/config 2>output &&
-	grep "^warning:" output &&
-	grep "^Error" output >actual &&
-	test_cmp expect actual
+	git -C repo sparse-checkout set --no-cone --stdin <rules &&
+	git -C repo ls-files -t >out &&
+	sed -n "/^S /!s/^. //p" out >ls-files &&
 
-warning: unable to access '.git/config': Permission denied
-warning: unable to access '.git/config': Permission denied
-ok 34 - proper error on non-accessible files
+	git -C repo sparse-checkout check-rules >check-rules-default <all-files &&
 
-expecting success of 1308.35 'proper error on error in default config files': 
-	cp .git/config .git/config.old &&
-	test_when_finished "mv .git/config.old .git/config" &&
-	echo "[" >>.git/config &&
-	echo "fatal: bad config line 36 in file .git/config" >expect &&
-	test_expect_code 128 test-tool config get_value foo.bar 2>actual &&
-	test_cmp expect actual
+	cat >expect <<-\EOF &&
+	deep/deeper1/deepest/a
+	EOF
 
-ok 35 - proper error on error in default config files
+	test_cmp expect check-rules-file &&
+	test_cmp check-rules-file ls-files &&
+	test_cmp check-rules-file check-rules-default
 
-expecting success of 1308.36 'proper error on error in custom config files': 
-	echo "[" >>syntax-error &&
-	echo "fatal: bad config line 1 in file syntax-error" >expect &&
-	test_expect_code 128 test-tool config configset_get_value foo.bar syntax-error 2>actual &&
-	test_cmp expect actual
+ok 69 - check-rules non-cone mode
 
-ok 36 - proper error on error in custom config files
+expecting success of 1091.70 'check-rules cone mode is default': 
+	cat >rules <<-\EOF &&
+	folder1
+	EOF
 
-expecting success of 1308.37 'check line errors for malformed values': 
-	mv .git/config .git/config.old &&
-	test_when_finished "mv .git/config.old .git/config" &&
-	cat >.git/config <<-\EOF &&
-	[alias]
-		br
+	cat >all-files <<-\EOF &&
+	toplevel
+	folder2/file
+	folder1/file
 	EOF
-	test_expect_code 128 git br 2>result &&
-	test_grep "missing value for .alias\.br" result &&
-	test_grep "fatal: .*\.git/config" result &&
-	test_grep "fatal: .*line 2" result
 
-error: missing value for 'alias.br'
-fatal: bad config line 2 in file .git/config
-fatal: bad config line 2 in file .git/config
-ok 37 - check line errors for malformed values
+	cat >expect <<-\EOF &&
+	toplevel
+	folder1/file
+	EOF
 
-expecting success of 1308.38 'error on modifying repo config without repo': 
-	nongit test_must_fail git config a.b c 2>err &&
-	test_grep "not in a git directory" err
+	git -C repo sparse-checkout set --no-cone &&
+	git -C repo sparse-checkout check-rules \
+		--rules-file ../rules >actual <all-files &&
 
-fatal: not in a git directory
-ok 38 - error on modifying repo config without repo
+	git -C bare sparse-checkout check-rules \
+		--rules-file ../rules >actual-bare <all-files &&
 
-expecting success of 1308.39 'iteration shows correct origins': 
-	printf "[ignore]\n\tthis = please\n[foo]bar = from-repo\n" >.git/config &&
-	printf "[foo]\n\tbar = from-home\n" >.gitconfig &&
-	if test_have_prereq MINGW
-	then
-		# Use Windows path (i.e. *not* $HOME)
-		HOME_GITCONFIG=$(pwd)/.gitconfig
-	else
-		# Do not get fooled by symbolic links, i.e. $HOME != $(pwd)
-		HOME_GITCONFIG=$HOME/.gitconfig
-	fi &&
+	test_cmp expect actual &&
+	test_cmp expect actual-bare
+
+ok 70 - check-rules cone mode is default
+
+expecting success of 1091.71 'check-rules quoting': 
+	cat >rules <<-EOF &&
+	"folder\" a"
+	EOF
+	cat >files <<-EOF &&
+	"folder\" a/file"
+	"folder\" b/file"
+	EOF
 	cat >expect <<-EOF &&
-	key=foo.bar
-	value=from-home
-	origin=file
-	name=$HOME_GITCONFIG
-	lno=2
-	scope=global
+	"folder\" a/file"
+	EOF
+	git sparse-checkout check-rules --cone \
+		--rules-file rules >actual <files &&
 
-	key=ignore.this
-	value=please
-	origin=file
-	name=.git/config
-	lno=2
-	scope=local
+	test_cmp expect actual
 
-	key=foo.bar
-	value=from-repo
-	origin=file
-	name=.git/config
-	lno=3
-	scope=local
+ok 71 - check-rules quoting
 
-	key=foo.bar
-	value=from-cmdline
-	origin=command line
-	name=
-	lno=-1
-	scope=command
+expecting success of 1091.72 'check-rules null termination': 
+	cat >rules <<-EOF &&
+	"folder\" a"
 	EOF
-	GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config iterate >actual &&
+
+	lf_to_nul >files <<-EOF &&
+	folder" a/a
+	folder" a/b
+	folder" b/fileQ
+	EOF
+
+	cat >expect <<-EOF &&
+	folder" a/aQfolder" a/bQ
+	EOF
+
+	git sparse-checkout check-rules --cone -z \
+		--rules-file rules >actual.nul <files &&
+	nul_to_q <actual.nul >actual &&
+	echo >>actual &&
+
 	test_cmp expect actual
 
-ok 39 - iteration shows correct origins
+ok 72 - check-rules null termination
 
-# passed all 39 test(s)
-1..39
+# still have 1 known breakage(s)
+# passed all remaining 71 test(s)
+1..72
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1350-config-hooks-path.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1350-config-hooks-path/.git/
-expecting success of 1350.1 'set up a pre-commit hook in core.hooksPath': 
-	>actual &&
-	mkdir -p .git/custom-hooks &&
-	write_script .git/custom-hooks/pre-commit <<-\EOF &&
-	echo CUSTOM >>actual
-	EOF
-	test_hook --setup pre-commit <<-\EOF
-	echo NORMAL >>actual
-	EOF
+*** t1310-config-default.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 - set up a pre-commit hook in core.hooksPath
+ok 1 - uses --default when entry missing
 
-expecting success of 1350.2 'Check that various forms of specifying core.hooksPath work': 
-	test_commit no_custom_hook &&
-	git config core.hooksPath .git/custom-hooks &&
-	test_commit have_custom_hook &&
-	git config core.hooksPath .git/custom-hooks/ &&
-	test_commit have_custom_hook_trailing_slash &&
-	git config core.hooksPath "$PWD/.git/custom-hooks" &&
-	test_commit have_custom_hook_abs_path &&
-	git config core.hooksPath "$PWD/.git/custom-hooks/" &&
-	test_commit have_custom_hook_abs_path_trailing_slash &&
-	cat >expect <<-\EOF &&
-	NORMAL
-	CUSTOM
-	CUSTOM
-	CUSTOM
-	CUSTOM
-	EOF
+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
 
-[master (root-commit) 51fec20] no_custom_hook
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 no_custom_hook.t
-[master d6f765a] have_custom_hook
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 have_custom_hook.t
-[master c8447a6] have_custom_hook_trailing_slash
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 have_custom_hook_trailing_slash.t
-[master acc1a92] have_custom_hook_abs_path
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 have_custom_hook_abs_path.t
-[master 3a47fb1] have_custom_hook_abs_path_trailing_slash
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 have_custom_hook_abs_path_trailing_slash.t
-ok 2 - Check that various forms of specifying core.hooksPath work
+ok 2 - does not use --default when entry present
 
-expecting success of 1350.3 'git rev-parse --git-path hooks': 
-	git config core.hooksPath .git/custom-hooks &&
-	git rev-parse --git-path hooks/abc >actual &&
-	test .git/custom-hooks/abc = "$(cat actual)"
+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 - git rev-parse --git-path hooks
+ok 3 - canonicalizes --default with appropriate type
 
-expecting success of 1350.4 'core.hooksPath=/dev/null': 
-	git clone -c core.hooksPath=/dev/null . no-templates &&
-	value="$(git -C no-templates config --local core.hooksPath)" &&
-	# The Bash used by Git for Windows rewrites `/dev/null` to `nul`
-	{ test /dev/null = "$value" || test nul = "$value"; }
+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
 
-Cloning into 'no-templates'...
-done.
-ok 4 - core.hooksPath=/dev/null
+fatal: failed to format default config value: x
+ok 4 - dies when --default cannot be parsed
 
-# passed all 4 test(s)
-1..4
+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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0610-reftable-basics.sh ***
@@ -51600,1218 +52499,1255 @@
 1..90
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1091-sparse-checkout-builtin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/.git/
-expecting success of 1091.1 'setup': 
-	git init repo &&
-	(
-		cd repo &&
-		echo "initial" >a &&
-		mkdir folder1 folder2 deep &&
-		mkdir deep/deeper1 deep/deeper2 &&
-		mkdir deep/deeper1/deepest &&
-		cp a folder1 &&
-		cp a folder2 &&
-		cp a deep &&
-		cp a deep/deeper1 &&
-		cp a deep/deeper2 &&
-		cp a deep/deeper1/deepest &&
-		git add . &&
-		git commit -m "initial commit"
-	)
+*** t1309-early-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1309-early-config/.git/
+expecting success of 1309.1 'read early config': 
+	test_config early.config correct &&
+	test-tool config read_early_config early.config >output &&
+	test correct = "$(cat output)"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/repo/.git/
-[main (root-commit) ebf8b57] initial commit
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+)
- create mode 100644 a
- create mode 100644 deep/a
- create mode 100644 deep/deeper1/a
- create mode 100644 deep/deeper1/deepest/a
- create mode 100644 deep/deeper2/a
- create mode 100644 folder1/a
- create mode 100644 folder2/a
-ok 1 - setup
+ok 1 - read early config
 
-expecting success of 1091.2 'git sparse-checkout list (not sparse)': 
-	test_must_fail git -C repo sparse-checkout list >list 2>err &&
-	test_must_be_empty list &&
-	test_grep "this worktree is not sparse" err
+expecting success of 1309.2 'in a sub-directory': 
+	test_config early.config sub &&
+	mkdir -p sub &&
+	(
+		cd sub &&
+		test-tool config read_early_config early.config
+	) >output &&
+	test sub = "$(cat output)"
 
-fatal: this worktree is not sparse
-ok 2 - git sparse-checkout list (not sparse)
+ok 2 - in a sub-directory
 
-expecting success of 1091.3 'git sparse-checkout list (not sparse)': 
-	git -C repo sparse-checkout set &&
-	rm repo/.git/info/sparse-checkout &&
-	git -C repo sparse-checkout list >list 2>err &&
-	test_must_be_empty list &&
-	test_grep "this worktree is not sparse (sparse-checkout file may not exist)" err
+expecting success of 1309.3 'ceiling': 
+	test_config early.config ceiling &&
+	mkdir -p sub &&
+	(
+		GIT_CEILING_DIRECTORIES="$PWD" &&
+		export GIT_CEILING_DIRECTORIES &&
+		cd sub &&
+		test-tool config read_early_config early.config
+	) >output &&
+	test_must_be_empty output
 
-warning: this worktree is not sparse (sparse-checkout file may not exist)
-ok 3 - git sparse-checkout list (not sparse)
+ok 3 - ceiling
 
-expecting success of 1091.4 'git sparse-checkout list (populated)': 
-	test_when_finished rm -f repo/.git/info/sparse-checkout &&
-	cat >repo/.git/info/sparse-checkout <<-\EOF &&
-	/folder1/*
-	/deep/
-	**/a
-	!*bin*
-	EOF
-	cp repo/.git/info/sparse-checkout expect &&
-	git -C repo sparse-checkout list >list &&
-	test_cmp expect list
+expecting success of 1309.4 'ceiling #2': 
+	mkdir -p xdg/git &&
+	git config -f xdg/git/config early.config xdg &&
+	test_config early.config ceiling &&
+	mkdir -p sub &&
+	(
+		XDG_CONFIG_HOME="$PWD"/xdg &&
+		GIT_CEILING_DIRECTORIES="$PWD" &&
+		export GIT_CEILING_DIRECTORIES XDG_CONFIG_HOME &&
+		cd sub &&
+		test-tool config read_early_config early.config
+	) >output &&
+	test xdg = "$(cat output)"
 
-warning: unrecognized pattern: '/folder1/*'
-warning: disabling cone pattern matching
-ok 4 - git sparse-checkout list (populated)
+ok 4 - ceiling #2
 
-expecting success of 1091.5 'git sparse-checkout init': 
-	git -C repo sparse-checkout init --no-cone &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	EOF
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	test_cmp_config -C repo true core.sparsecheckout &&
-	check_files repo a
+expecting success of 1309.5 'read config file in right order': 
+	echo "[test]source = home" >>.gitconfig &&
+	git init foo &&
+	(
+		cd foo &&
+		echo "[test]source = repo" >>.git/config &&
+		GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config \
+			read_early_config test.source >actual &&
+		cat >expected <<-\EOF &&
+		home
+		repo
+		cmdline
+		EOF
+		test_cmp expected actual
+	)
 
-ok 5 - git sparse-checkout init
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1309-early-config/foo/.git/
+ok 5 - read config file in right order
 
-expecting success of 1091.6 'git sparse-checkout init in empty repo': 
-	test_when_finished rm -rf empty-repo blank-template &&
-	git init --template= empty-repo &&
-	git -C empty-repo sparse-checkout init
+expecting success of 1309.6 'ignore .git/ with incompatible repository version': 
+	test_with_config "[core]repositoryformatversion = 999999" 2>err &&
+	test_grep "warning:.* Expected git repo version <= [1-9]" err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/empty-repo/.git/
-ok 6 - git sparse-checkout init in empty repo
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1309-early-config/throwaway/.git/
+warning: ignoring git dir '.git': Expected git repo version <= 1, found 999999
+ok 6 - ignore .git/ with incompatible repository version
 
-expecting success of 1091.7 'git sparse-checkout list after init': 
-	git -C repo sparse-checkout list >actual &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	EOF
-	test_cmp expect actual
+checking known breakage of 1309.7 'ignore .git/ with invalid repository version': 
+	test_with_config "[core]repositoryformatversion = invalid"
 
-ok 7 - git sparse-checkout list after init
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1309-early-config/throwaway/.git/
+fatal: bad numeric config value 'invalid' for 'core.repositoryformatversion' in file .git/config: invalid unit
+not ok 7 - ignore .git/ with invalid repository version # TODO known breakage
 
-expecting success of 1091.8 'init with existing sparse-checkout': 
-	echo "*folder*" >> repo/.git/info/sparse-checkout &&
-	git -C repo sparse-checkout init &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	*folder*
-	EOF
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo a folder1 folder2
+checking known breakage of 1309.8 'ignore .git/ with invalid config': 
+	test_with_config "["
 
-ok 8 - init with existing sparse-checkout
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1309-early-config/throwaway/.git/
+fatal: bad config line 1 in file .git/config
+not ok 8 - ignore .git/ with invalid config # TODO known breakage
 
-expecting success of 1091.9 'clone --sparse': 
-	git clone --sparse "file://$(pwd)/repo" clone &&
-	git -C clone sparse-checkout reapply --no-cone &&
-	git -C clone sparse-checkout list >actual &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	EOF
-	test_cmp expect actual &&
-	check_files clone a
+expecting success of 1309.9 'early config and onbranch': 
+	echo "[broken" >broken &&
+	test_with_config "[includeif \"onbranch:topic\"]path=../broken"
 
-Cloning into 'clone'...
-ok 9 - clone --sparse
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1309-early-config/throwaway/.git/
+ok 9 - early config and onbranch
 
-expecting success of 1091.10 'switching to cone mode with non-cone mode patterns': 
-	git init bad-patterns &&
-	(
-		cd bad-patterns &&
-		git sparse-checkout init --no-cone &&
-		git sparse-checkout add dir &&
-		git config --worktree core.sparseCheckoutCone true &&
-		test_must_fail git sparse-checkout add dir 2>err &&
-		grep "existing sparse-checkout patterns do not use cone mode" err
-	)
+expecting success of 1309.10 'onbranch config outside of git repo': 
+	test_config_global includeIf.onbranch:topic.path non-existent &&
+	nongit git help
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/bad-patterns/.git/
-fatal: existing sparse-checkout patterns do not use cone mode
-ok 10 - switching to cone mode with non-cone mode patterns
+usage: git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]
+           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
+           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch]
+           [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]
+           [--work-tree=<path>] [--namespace=<name>] [--config-env=<name>=<envvar>]
+           <command> [<args>]
 
-expecting success of 1091.11 'interaction with clone --no-checkout (unborn index)': 
-	git clone --no-checkout "file://$(pwd)/repo" clone_no_checkout &&
-	git -C clone_no_checkout sparse-checkout init --cone &&
-	git -C clone_no_checkout sparse-checkout set folder1 &&
+These are common Git commands used in various situations:
 
-	git -C clone_no_checkout sparse-checkout list >actual &&
-	cat >expect <<-\EOF &&
-	folder1
-	EOF
-	test_cmp expect actual &&
+start a working area (see also: git help tutorial)
+   clone      Clone a repository into a new directory
+   init       Create an empty Git repository or reinitialize an existing one
 
-	# nothing checked out, expect "No such file or directory"
-	! ls clone_no_checkout/* >actual &&
-	test_must_be_empty actual &&
-	test_path_is_missing clone_no_checkout/.git/index &&
+work on the current change (see also: git help everyday)
+   add        Add file contents to the index
+   mv         Move or rename a file, a directory, or a symlink
+   restore    Restore working tree files
+   rm         Remove files from the working tree and from the index
 
-	# No branch is checked out until we manually switch to one
-	git -C clone_no_checkout switch main &&
-	test_path_is_file clone_no_checkout/.git/index &&
-	check_files clone_no_checkout a folder1
+examine the history and state (see also: git help revisions)
+   bisect     Use binary search to find the commit that introduced a bug
+   diff       Show changes between commits, commit and working tree, etc
+   grep       Print lines matching a pattern
+   log        Show commit logs
+   show       Show various types of objects
+   status     Show the working tree status
 
-Cloning into 'clone_no_checkout'...
-ls: cannot access 'clone_no_checkout/*': No such file or directory
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-ok 11 - interaction with clone --no-checkout (unborn index)
+grow, mark and tweak your common history
+   backfill   Download missing objects in a partial clone
+   branch     List, create, or delete branches
+   commit     Record changes to the repository
+   merge      Join two or more development histories together
+   rebase     Reapply commits on top of another base tip
+   reset      Reset current HEAD to the specified state
+   switch     Switch branches
+   tag        Create, list, delete or verify a tag object signed with GPG
 
-expecting success of 1091.12 'set enables config': 
-	git init worktree-config &&
-	(
-		cd worktree-config &&
-		test_commit test file &&
-		test_path_is_missing .git/config.worktree &&
-		git sparse-checkout set nothing &&
-		test_path_is_file .git/config.worktree &&
-		test_cmp_config true core.sparseCheckout
-	)
+collaborate (see also: git help workflows)
+   fetch      Download objects and refs from another repository
+   pull       Fetch from and integrate with another repository or a local branch
+   push       Update remote refs along with associated objects
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/worktree-config/.git/
-[main (root-commit) 236e830] test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 12 - set enables config
+'git help -a' and 'git help -g' list available subcommands and some
+concept guides. See 'git help <command>' or 'git help <concept>'
+to read about a specific subcommand or concept.
+See 'git help git' for an overview of the system.
+ok 10 - onbranch config outside of git repo
 
-expecting success of 1091.13 'set sparse-checkout using builtin': 
-	git -C repo sparse-checkout set "/*" "!/*/" "*folder*" &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	*folder*
-	EOF
-	git -C repo sparse-checkout list >actual &&
-	test_cmp expect actual &&
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo a folder1 folder2
+# still have 2 known breakage(s)
+# passed all remaining 8 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1305-config-include.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/.git/
+expecting success of 1305.1 'include file by absolute path': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = \"$(pwd)/one\"" >.gitconfig &&
+	echo 1 >expect &&
+	git config test.one >actual &&
+	test_cmp expect actual
 
-ok 13 - set sparse-checkout using builtin
+ok 1 - include file by absolute path
 
-expecting success of 1091.14 'set sparse-checkout using --stdin': 
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/folder1/
-	/folder2/
-	EOF
-	git -C repo sparse-checkout set --stdin <expect &&
-	git -C repo sparse-checkout list >actual &&
-	test_cmp expect actual &&
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo "a folder1 folder2"
+expecting success of 1305.2 'include file by relative path': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	echo 1 >expect &&
+	git config test.one >actual &&
+	test_cmp expect actual
 
-ok 14 - set sparse-checkout using --stdin
+ok 2 - include file by relative path
 
-expecting success of 1091.15 'add to sparse-checkout': 
-	cat repo/.git/info/sparse-checkout >old &&
-	test_when_finished cp old repo/.git/info/sparse-checkout &&
-	cat >add <<-\EOF &&
-	pattern1
-	/folder1/
-	pattern2
-	EOF
-	cat old >expect &&
-	cat add >>expect &&
-	git -C repo sparse-checkout add --stdin <add &&
-	git -C repo sparse-checkout list >actual &&
-	test_cmp expect actual &&
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo "a folder1 folder2"
+expecting success of 1305.3 'chained relative paths': 
+	mkdir subdir &&
+	echo "[test]three = 3" >subdir/three &&
+	echo "[include]path = three" >subdir/two &&
+	echo "[include]path = subdir/two" >.gitconfig &&
+	echo 3 >expect &&
+	git config test.three >actual &&
+	test_cmp expect actual
 
-ok 15 - add to sparse-checkout
+ok 3 - chained relative paths
 
-expecting success of 1091.16 'worktree: add copies sparse-checkout patterns': 
-	cat repo/.git/info/sparse-checkout >old &&
-	test_when_finished cp old repo/.git/info/sparse-checkout &&
-	test_when_finished git -C repo worktree remove ../worktree &&
-	git -C repo sparse-checkout set --no-cone "/*" &&
-	git -C repo worktree add --quiet ../worktree 2>err &&
-	test_must_be_empty err &&
-	new="$(git -C worktree rev-parse --git-path info/sparse-checkout)" &&
-	test_path_is_file "$new" &&
-	test_cmp repo/.git/info/sparse-checkout "$new" &&
-	git -C worktree sparse-checkout set --cone &&
-	test_cmp_config -C worktree true core.sparseCheckoutCone &&
-	test_must_fail git -C repo core.sparseCheckoutCone
+expecting success of 1305.4 'include paths get tilde-expansion': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = ~/one" >.gitconfig &&
+	echo 1 >expect &&
+	git config test.one >actual &&
+	test_cmp expect actual
 
-git: 'core.sparseCheckoutCone' is not a git command. See 'git --help'.
-ok 16 - worktree: add copies sparse-checkout patterns
+ok 4 - include paths get tilde-expansion
 
-expecting success of 1091.17 'cone mode: match patterns': 
-	git -C repo config --worktree core.sparseCheckoutCone true &&
-	rm -rf repo/a repo/folder1 repo/folder2 &&
-	git -C repo read-tree -mu HEAD 2>err &&
-	test_grep ! "disabling cone patterns" err &&
-	git -C repo reset --hard &&
-	check_files repo a folder1 folder2
+expecting success of 1305.5 'include options can still be examined': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	echo one >expect &&
+	git config include.path >actual &&
+	test_cmp expect actual
 
-HEAD is now at ebf8b57 initial commit
-ok 17 - cone mode: match patterns
+ok 5 - include options can still be examined
 
-expecting success of 1091.18 'cone mode: warn on bad pattern': 
-	test_when_finished mv sparse-checkout repo/.git/info/ &&
-	cp repo/.git/info/sparse-checkout . &&
-	echo "!/deep/deeper/*/" >>repo/.git/info/sparse-checkout &&
-	git -C repo read-tree -mu HEAD 2>err &&
-	test_grep "unrecognized negative pattern" err
+expecting success of 1305.6 'listing includes option and expansion': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	cat >expect <<-\EOF &&
+	include.path=one
+	test.one=1
+	EOF
+	git config --list >actual.full &&
+	grep -v -e ^core -e ^extensions actual.full >actual &&
+	test_cmp expect actual
 
-warning: unrecognized negative pattern: '/deep/deeper/*'
-warning: unrecognized negative pattern: '/deep/deeper/*'
-ok 18 - cone mode: warn on bad pattern
+ok 6 - listing includes option and expansion
 
-expecting success of 1091.19 'sparse-checkout disable': 
-	test_when_finished rm -rf repo/.git/info/sparse-checkout &&
-	git -C repo sparse-checkout disable &&
-	test_path_is_file repo/.git/info/sparse-checkout &&
-	git -C repo config --list >config &&
-	test_must_fail git config core.sparseCheckout &&
-	check_files repo a deep folder1 folder2
+expecting success of 1305.7 'single file lookup does not expand includes by default': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	test_must_fail git config -f .gitconfig test.one &&
+	test_must_fail git config --global test.one &&
+	echo 1 >expect &&
+	git config --includes -f .gitconfig test.one >actual &&
+	test_cmp expect actual
 
-ok 19 - sparse-checkout disable
+ok 7 - single file lookup does not expand includes by default
 
-expecting success of 1091.20 'sparse-index enabled and disabled': 
-	git -C repo sparse-checkout init --cone --sparse-index &&
-	test_cmp_config -C repo true index.sparse &&
-	git -C repo ls-files --sparse >sparse &&
-	git -C repo sparse-checkout disable &&
-	git -C repo ls-files --sparse >full &&
+expecting success of 1305.8 'single file list does not expand includes by default': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	echo "include.path=one" >expect &&
+	git config -f .gitconfig --list >actual &&
+	test_cmp expect actual
 
-	cat >expect <<-\EOF &&
-	@@ -1,4 +1,7 @@
-	 a
-	-deep/
-	-folder1/
-	-folder2/
-	+deep/a
-	+deep/deeper1/a
-	+deep/deeper1/deepest/a
-	+deep/deeper2/a
-	+folder1/a
-	+folder2/a
-	EOF
+ok 8 - single file list does not expand includes by default
 
-	diff -u sparse full | tail -n +3 >actual &&
+expecting success of 1305.9 'writing config file does not expand includes': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	git config test.two 2 &&
+	echo 2 >expect &&
+	git config --no-includes test.two >actual &&
 	test_cmp expect actual &&
+	test_must_fail git config --no-includes test.one
 
-	git -C repo config --list >config &&
-	test_cmp_config -C repo false index.sparse
-
-ok 20 - sparse-index enabled and disabled
+ok 9 - writing config file does not expand includes
 
-expecting success of 1091.21 'cone mode: init and set': 
-	git -C repo sparse-checkout init --cone &&
-	git -C repo config --list >config &&
-	test_grep "core.sparsecheckoutcone=true" config &&
-	list_files repo >dir  &&
-	echo a >expect &&
-	test_cmp expect dir &&
-	git -C repo sparse-checkout set deep/deeper1/deepest/ 2>err &&
-	test_must_be_empty err &&
-	check_files repo a deep &&
-	check_files repo/deep a deeper1 &&
-	check_files repo/deep/deeper1 a deepest &&
+expecting success of 1305.10 'config modification does not affect includes': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	git config test.one 2 &&
+	echo 1 >expect &&
+	git config -f one test.one >actual &&
+	test_cmp expect actual &&
 	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/deep/
-	!/deep/*/
-	/deep/deeper1/
-	!/deep/deeper1/*/
-	/deep/deeper1/deepest/
-	EOF
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	git -C repo sparse-checkout set --stdin 2>err <<-\EOF &&
-	folder1
-	folder2
+	1
+	2
 	EOF
-	test_must_be_empty err &&
-	check_files repo a folder1 folder2
+	git config --get-all test.one >actual &&
+	test_cmp expect actual
 
-core.sparsecheckoutcone=true
-ok 21 - cone mode: init and set
+ok 10 - config modification does not affect includes
 
-expecting success of 1091.22 'cone mode: list': 
-	cat >expect <<-\EOF &&
-	folder1
-	folder2
+expecting success of 1305.11 'missing include files are ignored': 
+	cat >.gitconfig <<-\EOF &&
+	[include]path = non-existent
+	[test]value = yes
 	EOF
-	git -C repo sparse-checkout set --stdin <expect &&
-	git -C repo sparse-checkout list >actual 2>err &&
-	test_must_be_empty err &&
+	echo yes >expect &&
+	git config test.value >actual &&
 	test_cmp expect actual
 
-ok 22 - cone mode: list
+ok 11 - missing include files are ignored
 
-expecting success of 1091.23 'cone mode: set with nested folders': 
-	git -C repo sparse-checkout set deep deep/deeper1/deepest 2>err &&
-	test_line_count = 0 err &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/deep/
-	EOF
-	test_cmp repo/.git/info/sparse-checkout expect
+expecting success of 1305.12 'absolute includes from command line work': 
+	echo "[test]one = 1" >one &&
+	echo 1 >expect &&
+	git -c include.path="$(pwd)/one" config test.one >actual &&
+	test_cmp expect actual
 
-ok 23 - cone mode: set with nested folders
+ok 12 - absolute includes from command line work
 
-expecting success of 1091.24 'cone mode: add independent path': 
-	git -C repo sparse-checkout set deep/deeper1 &&
-	git -C repo sparse-checkout add --end-of-options folder1 &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/deep/
-	!/deep/*/
-	/deep/deeper1/
-	/folder1/
-	EOF
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo a deep folder1
+expecting success of 1305.13 'relative includes from command line fail': 
+	echo "[test]one = 1" >one &&
+	test_must_fail git -c include.path=one config test.one
 
-ok 24 - cone mode: add independent path
+error: relative config includes must come from files
+fatal: unable to parse command-line config
+ok 13 - relative includes from command line fail
 
-expecting success of 1091.25 'cone mode: add sibling path': 
-	git -C repo sparse-checkout set deep/deeper1 &&
-	git -C repo sparse-checkout add deep/deeper2 &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/deep/
-	!/deep/*/
-	/deep/deeper1/
-	/deep/deeper2/
-	EOF
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo a deep
+expecting success of 1305.14 'absolute includes from blobs work': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path=$(pwd)/one" >blob &&
+	blob=$(git hash-object -w blob) &&
+	echo 1 >expect &&
+	git config --blob=$blob test.one >actual &&
+	test_cmp expect actual
 
-ok 25 - cone mode: add sibling path
+ok 14 - absolute includes from blobs work
 
-expecting success of 1091.26 'cone mode: add parent path': 
-	git -C repo sparse-checkout set deep/deeper1 folder1 &&
-	git -C repo sparse-checkout add deep &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/deep/
-	/folder1/
-	EOF
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo a deep folder1
+expecting success of 1305.15 'relative includes from blobs fail': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path=one" >blob &&
+	blob=$(git hash-object -w blob) &&
+	test_must_fail git config --blob=$blob test.one
 
-ok 26 - cone mode: add parent path
+error: relative config includes must come from files
+error: bad config line 1 in blob d085876092eb24c144128bcd5db5d26e665f4f8a
+ok 15 - relative includes from blobs fail
 
-expecting success of 1091.27 'not-up-to-date does not block rest of sparsification': 
-	test_when_finished git -C repo sparse-checkout disable &&
-	test_when_finished git -C repo reset --hard &&
-	git -C repo sparse-checkout set deep &&
+expecting success of 1305.16 'absolute includes from stdin work': 
+	echo "[test]one = 1" >one &&
+	echo 1 >expect &&
+	echo "[include]path=\"$(pwd)/one\"" |
+	git config --file - test.one >actual &&
+	test_cmp expect actual
 
-	echo update >repo/deep/deeper2/a &&
-	cp repo/.git/info/sparse-checkout expect &&
-	test_write_lines "!/deep/*/" "/deep/deeper1/" >>expect &&
+ok 16 - absolute includes from stdin work
 
-	git -C repo sparse-checkout set deep/deeper1 2>err &&
+expecting success of 1305.17 'relative includes from stdin line fail': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path=one" |
+	test_must_fail git config --file - test.one
 
-	test_grep "The following paths are not up to date" err &&
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo/deep a deeper1 deeper2 &&
-	check_files repo/deep/deeper1 a deepest &&
-	check_files repo/deep/deeper1/deepest a &&
-	check_files repo/deep/deeper2 a
+error: relative config includes must come from files
+fatal: bad config line 1 in standard input
+ok 17 - relative includes from stdin line fail
 
-warning: The following paths are not up to date and were left despite sparse patterns:
-HEAD is now at ebf8b57 initial commit
-ok 27 - not-up-to-date does not block rest of sparsification
+expecting success of 1305.18 'conditional include, both unanchored': 
+	git init foo &&
+	(
+		cd foo &&
+		echo "[includeIf \"gitdir:foo/\"]path=bar" >>.git/config &&
+		echo "[test]one=1" >.git/bar &&
+		echo 1 >expect &&
+		git config test.one >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 1091.28 'revert to old sparse-checkout on empty update': 
-	git init empty-test &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/foo/.git/
+ok 18 - conditional include, both unanchored
+
+expecting success of 1305.19 'conditional include, $HOME expansion': 
 	(
-		echo >file &&
-		git add file &&
-		git commit -m "test" &&
-		git sparse-checkout set nothing 2>err &&
-		test_grep ! "Sparse checkout leaves no entry on working directory" err &&
-		test_grep ! ".git/index.lock" err &&
-		git sparse-checkout set --no-cone file
+		cd foo &&
+		echo "[includeIf \"gitdir:~/foo/\"]path=bar2" >>.git/config &&
+		echo "[test]two=2" >.git/bar2 &&
+		echo 2 >expect &&
+		git config test.two >actual &&
+		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/empty-test/.git/
-[main (root-commit) d402fe2] test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-warning: pass a leading slash before paths such as 'file' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-ok 28 - revert to old sparse-checkout on empty update
+ok 19 - conditional include, $HOME expansion
 
-expecting success of 1091.29 'fail when lock is taken': 
-	test_when_finished rm -rf repo/.git/info/sparse-checkout.lock &&
-	touch repo/.git/info/sparse-checkout.lock &&
-	test_must_fail git -C repo sparse-checkout set deep 2>err &&
-	test_grep "Unable to create .*\.lock" err
+expecting success of 1305.20 'conditional include, full pattern': 
+	(
+		cd foo &&
+		echo "[includeIf \"gitdir:**/foo/**\"]path=bar3" >>.git/config &&
+		echo "[test]three=3" >.git/bar3 &&
+		echo 3 >expect &&
+		git config test.three >actual &&
+		test_cmp expect actual
+	)
 
-fatal: Unable to create '/build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/repo/.git/info/sparse-checkout.lock': File exists.
-ok 29 - fail when lock is taken
+ok 20 - conditional include, full pattern
 
-expecting success of 1091.30 '.gitignore should not warn about cone mode': 
-	git -C repo config --worktree core.sparseCheckoutCone true &&
-	echo "**/bin/*" >repo/.gitignore &&
-	git -C repo reset --hard 2>err &&
-	test_grep ! "disabling cone patterns" err
+expecting success of 1305.21 'conditional include, relative path': 
+	echo "[includeIf \"gitdir:./foo/.git\"]path=bar4" >>.gitconfig &&
+	echo "[test]four=4" >bar4 &&
+	(
+		cd foo &&
+		echo 4 >expect &&
+		git config test.four >actual &&
+		test_cmp expect actual
+	)
 
-HEAD is now at ebf8b57 initial commit
-ok 30 - .gitignore should not warn about cone mode
+ok 21 - conditional include, relative path
 
-expecting success of 1091.31 'sparse-checkout (init|set|disable) warns with dirty status': 
-	git clone repo dirty &&
-	echo dirty >dirty/folder1/a &&
+expecting success of 1305.22 'conditional include, both unanchored, icase': 
+	(
+		cd foo &&
+		echo "[includeIf \"gitdir/i:FOO/\"]path=bar5" >>.git/config &&
+		echo "[test]five=5" >.git/bar5 &&
+		echo 5 >expect &&
+		git config test.five >actual &&
+		test_cmp expect actual
+	)
 
-	git -C dirty sparse-checkout init --no-cone 2>err &&
-	test_grep "warning.*The following paths are not up to date" err &&
+ok 22 - conditional include, both unanchored, icase
 
-	git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&
-	test_grep "warning.*The following paths are not up to date" err &&
-	test_path_is_file dirty/folder1/a &&
+expecting success of 1305.23 'conditional include, early config reading': 
+	(
+		cd foo &&
+		echo "[includeIf \"gitdir:foo/\"]path=bar6" >>.git/config &&
+		echo "[test]six=6" >.git/bar6 &&
+		echo 6 >expect &&
+		test-tool config read_early_config test.six >actual &&
+		test_cmp expect actual
+	)
 
-	git -C dirty sparse-checkout disable 2>err &&
-	test_must_be_empty err &&
+ok 23 - conditional include, early config reading
 
-	git -C dirty reset --hard &&
-	git -C dirty sparse-checkout init --no-cone &&
-	git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* &&
-	test_path_is_missing dirty/folder1/a &&
-	git -C dirty sparse-checkout disable &&
-	test_path_is_file dirty/folder1/a
+expecting success of 1305.24 'conditional include with /**/': 
+	REPO=foo/bar/repo &&
+	git init $REPO &&
+	cat >>$REPO/.git/config <<-\EOF &&
+	[includeIf "gitdir:**/foo/**/bar/**"]
+	path=bar7
+	EOF
+	echo "[test]seven=7" >$REPO/.git/bar7 &&
+	echo 7 >expect &&
+	git -C $REPO config test.seven >actual &&
+	test_cmp expect actual
 
-Cloning into 'dirty'...
-done.
-warning: The following paths are not up to date and were left despite sparse patterns:
-warning: The following paths are not up to date and were left despite sparse patterns:
-HEAD is now at ebf8b57 initial commit
-ok 31 - sparse-checkout (init|set|disable) warns with dirty status
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/foo/bar/repo/.git/
+ok 24 - conditional include with /**/
 
-expecting success of 1091.32 'sparse-checkout (init|set|disable) warns with unmerged status': 
-	git clone repo unmerged &&
+checking prerequisite: SYMLINKS
 
-	cat >input <<-EOF &&
-	0 $ZERO_OID	folder1/a
-	100644 $(git -C unmerged rev-parse HEAD:folder1/a) 1	folder1/a
-	EOF
-	git -C unmerged update-index --index-info <input &&
+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 -C unmerged sparse-checkout init --no-cone 2>err &&
-	test_grep "warning.*The following paths are unmerged" err &&
+)
+prerequisite SYMLINKS ok
+expecting success of 1305.25 'conditional include, set up symlinked $HOME': 
+	mkdir real-home &&
+	ln -s real-home home &&
+	(
+		HOME="$TRASH_DIRECTORY/home" &&
+		export HOME &&
+		cd "$HOME" &&
 
-	git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&
-	test_grep "warning.*The following paths are unmerged" err &&
-	test_path_is_file dirty/folder1/a &&
+		git init foo &&
+		cd foo &&
+		mkdir sub
+	)
 
-	git -C unmerged sparse-checkout disable 2>err &&
-	test_grep "warning.*The following paths are unmerged" err &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/real-home/foo/.git/
+ok 25 - conditional include, set up symlinked $HOME
 
-	git -C unmerged reset --hard &&
-	git -C unmerged sparse-checkout init --no-cone &&
-	git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* &&
-	git -C unmerged sparse-checkout disable
+expecting success of 1305.26 'conditional include, $HOME expansion with symlinks': 
+	(
+		HOME="$TRASH_DIRECTORY/home" &&
+		export HOME &&
+		cd "$HOME"/foo &&
 
-Cloning into 'unmerged'...
-done.
-warning: The following paths are unmerged and were left despite sparse patterns:
-warning: The following paths are unmerged and were left despite sparse patterns:
-warning: The following paths are unmerged and were left despite sparse patterns:
-HEAD is now at ebf8b57 initial commit
-ok 32 - sparse-checkout (init|set|disable) warns with unmerged status
+		echo "[includeIf \"gitdir:~/foo/\"]path=bar2" >>.git/config &&
+		echo "[test]two=2" >.git/bar2 &&
+		echo 2 >expect &&
+		force_setup_explicit_git_dir &&
+		git -C sub config test.two >actual &&
+		test_cmp expect actual
+	)
 
-checking known breakage of 1091.33 'sparse-checkout reapply': 
-	git clone repo tweak &&
+ok 26 - conditional include, $HOME expansion with symlinks
 
-	echo dirty >tweak/deep/deeper2/a &&
+expecting success of 1305.27 'conditional include, relative path with symlinks': 
+	echo "[includeIf \"gitdir:./foo/.git\"]path=bar4" >home/.gitconfig &&
+	echo "[test]four=4" >home/bar4 &&
+	(
+		HOME="$TRASH_DIRECTORY/home" &&
+		export HOME &&
+		cd "$HOME"/foo &&
 
-	cat >input <<-EOF &&
-	0 $ZERO_OID	folder1/a
-	100644 $(git -C tweak rev-parse HEAD:folder1/a) 1	folder1/a
-	EOF
-	git -C tweak update-index --index-info <input &&
+		echo 4 >expect &&
+		force_setup_explicit_git_dir &&
+		git -C sub config test.four >actual &&
+		test_cmp expect actual
+	)
 
-	git -C tweak sparse-checkout init --cone 2>err &&
-	test_grep "warning.*The following paths are not up to date" err &&
-	test_grep "warning.*The following paths are unmerged" err &&
+ok 27 - conditional include, relative path with symlinks
 
-	git -C tweak sparse-checkout set folder2 deep/deeper1 2>err &&
-	test_grep "warning.*The following paths are not up to date" err &&
-	test_grep "warning.*The following paths are unmerged" err &&
+expecting success of 1305.28 'conditional include, gitdir matching symlink': 
+	ln -s foo bar &&
+	(
+		cd bar &&
+		echo "[includeIf \"gitdir:bar/\"]path=bar7" >>.git/config &&
+		echo "[test]seven=7" >.git/bar7 &&
+		echo 7 >expect &&
+		git config test.seven >actual &&
+		test_cmp expect actual
+	)
 
-	git -C tweak sparse-checkout reapply 2>err &&
-	test_grep "warning.*The following paths are not up to date" err &&
-	test_path_is_file tweak/deep/deeper2/a &&
-	test_grep "warning.*The following paths are unmerged" err &&
-	test_path_is_file tweak/folder1/a &&
+ok 28 - conditional include, gitdir matching symlink
 
-	git -C tweak checkout HEAD deep/deeper2/a &&
-	git -C tweak sparse-checkout reapply 2>err &&
-	test_grep ! "warning.*The following paths are not up to date" err &&
-	test_path_is_missing tweak/deep/deeper2/a &&
-	test_grep "warning.*The following paths are unmerged" err &&
-	test_path_is_file tweak/folder1/a &&
+expecting success of 1305.29 'conditional include, gitdir matching symlink, icase': 
+	(
+		cd bar &&
+		echo "[includeIf \"gitdir/i:BAR/\"]path=bar8" >>.git/config &&
+		echo "[test]eight=8" >.git/bar8 &&
+		echo 8 >expect &&
+		git config test.eight >actual &&
+		test_cmp expect actual
+	)
 
-	# NEEDSWORK: We are asking to update a file outside of the
-	# sparse-checkout cone, but this is no longer allowed.
-	git -C tweak add folder1/a &&
-	git -C tweak sparse-checkout reapply 2>err &&
-	test_must_be_empty err &&
-	test_path_is_missing tweak/deep/deeper2/a &&
-	test_path_is_missing tweak/folder1/a &&
+ok 29 - conditional include, gitdir matching symlink, icase
 
-	git -C tweak sparse-checkout disable
+expecting success of 1305.30 'conditional include, onbranch': 
+	echo "[includeIf \"onbranch:foo-branch\"]path=bar9" >>.git/config &&
+	echo "[test]nine=9" >.git/bar9 &&
+	git checkout -b main &&
+	test_must_fail git config test.nine &&
+	git checkout -b foo-branch &&
+	echo 9 >expect &&
+	git config test.nine >actual &&
+	test_cmp expect actual
 
-Cloning into 'tweak'...
-done.
-warning: The following paths are not up to date and were left despite sparse patterns:
-warning: The following paths are unmerged and were left despite sparse patterns:
-warning: The following paths are not up to date and were left despite sparse patterns:
-warning: The following paths are unmerged and were left despite sparse patterns:
-warning: The following paths are not up to date and were left despite sparse patterns:
-warning: The following paths are unmerged and were left despite sparse patterns:
-Updated 1 path from 5b6118d
-warning: The following paths are unmerged and were left despite sparse patterns:
-The following paths and/or pathspecs matched paths that exist
-outside of your sparse-checkout definition, so will not be
-updated in the index:
-folder1/a
-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"
-not ok 33 - sparse-checkout reapply # TODO known breakage
+Switched to a new branch 'main'
+Switched to a new branch 'foo-branch'
+ok 30 - conditional include, onbranch
 
-expecting success of 1091.34 'reapply can handle config options': 
-	git -C repo sparse-checkout init --cone --no-sparse-index &&
-	git -C repo config --worktree --list >actual &&
-	cat >expect <<-\EOF &&
-	core.sparsecheckout=true
-	core.sparsecheckoutcone=true
-	index.sparse=false
-	EOF
-	test_cmp expect actual &&
+expecting success of 1305.31 'conditional include, onbranch, wildcard': 
+	echo "[includeIf \"onbranch:?oo-*/**\"]path=bar10" >>.git/config &&
+	echo "[test]ten=10" >.git/bar10 &&
+	git checkout -b not-foo-branch/a &&
+	test_must_fail git config test.ten &&
 
-	git -C repo sparse-checkout reapply --no-cone --no-sparse-index &&
-	git -C repo config --worktree --list >actual &&
-	cat >expect <<-\EOF &&
-	core.sparsecheckout=true
-	core.sparsecheckoutcone=false
-	index.sparse=false
-	EOF
+	echo 10 >expect &&
+	git checkout -b foo-branch/a/b/c &&
+	git config test.ten >actual &&
 	test_cmp expect actual &&
 
-	git -C repo sparse-checkout reapply --cone --sparse-index &&
-	git -C repo config --worktree --list >actual &&
-	cat >expect <<-\EOF &&
-	core.sparsecheckout=true
-	core.sparsecheckoutcone=true
-	index.sparse=true
-	EOF
-	test_cmp expect actual &&
+	git checkout -b moo-bar/a &&
+	git config test.ten >actual &&
+	test_cmp expect actual
 
-	git -C repo sparse-checkout disable
+Switched to a new branch 'not-foo-branch/a'
+Switched to a new branch 'foo-branch/a/b/c'
+Switched to a new branch 'moo-bar/a'
+ok 31 - conditional include, onbranch, wildcard
 
-ok 34 - reapply can handle config options
+expecting success of 1305.32 'conditional include, onbranch, implicit /** for /': 
+	echo "[includeIf \"onbranch:foo-dir/\"]path=bar11" >>.git/config &&
+	echo "[test]eleven=11" >.git/bar11 &&
+	git checkout -b not-foo-dir/a &&
+	test_must_fail git config test.eleven &&
 
-expecting success of 1091.35 'cone mode: set with core.ignoreCase=true': 
-	rm repo/.git/info/sparse-checkout &&
-	git -C repo sparse-checkout init --cone &&
-	git -C repo -c core.ignoreCase=true sparse-checkout set folder1 &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/folder1/
-	EOF
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo a folder1
+	echo 11 >expect &&
+	git checkout -b foo-dir/a/b/c &&
+	git config test.eleven >actual &&
+	test_cmp expect actual
 
-ok 35 - cone mode: set with core.ignoreCase=true
+Switched to a new branch 'not-foo-dir/a'
+Switched to a new branch 'foo-dir/a/b/c'
+ok 32 - conditional include, onbranch, implicit /** for /
 
-expecting success of 1091.36 'setup submodules': 
-	git clone repo super &&
+expecting success of 1305.33 'include cycles are detected': 
+	git init --bare cycle &&
+	git -C cycle config include.path cycle &&
+	git config -f cycle/cycle include.path config &&
+	test_must_fail git -C cycle config --get-all test.value 2>stderr &&
+	grep "exceeded maximum include depth" stderr
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/cycle/
+fatal: exceeded maximum include depth (10) while including
+ok 33 - include cycles are detected
+
+expecting success of 1305.34 'onbranch with unborn branch': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
 	(
-		cd super &&
-		mkdir modules &&
-		git -c protocol.file.allow=always \
-			submodule add ../repo modules/child &&
-		git add . &&
-		git commit -m "add submodule" &&
-		git sparse-checkout init --cone &&
-		git sparse-checkout set folder1
+		cd repo &&
+		git config set includeIf.onbranch:"*".path config.inc &&
+		git config set -f .git/config.inc foo.bar baz &&
+		git config get foo.bar
 	)
 
-Cloning into 'super'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1091-sparse-checkout-builtin/super/modules/child'...
-done.
-[main 7bdd197] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 modules/child
-warning: unable to rmdir 'modules/child': Directory not empty
-warning: unable to rmdir 'modules/child': Directory not empty
-ok 36 - setup submodules
-
-expecting success of 1091.37 'interaction with submodules': 
-	check_files super a folder1 modules &&
-	check_files super/modules/child a deep folder1 folder2
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/repo/.git/
+baz
+ok 34 - onbranch with unborn branch
 
-ok 37 - interaction with submodules
+expecting success of 1305.35 'onbranch with detached HEAD': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		git config set "includeIf.onbranch:*.path" config.inc &&
+		git config set -f .git/config.inc foo.bar baz &&
+		test_commit initial &&
+		git switch --detach HEAD &&
+		test_must_fail git config get foo.bar
+	)
 
-expecting success of 1091.38 'check-rules interaction with submodules': 
-	git -C super ls-tree --name-only -r HEAD >all-files &&
-	git -C super sparse-checkout check-rules >check-rules-matches <all-files &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1305-config-include/repo/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+HEAD is now at 24b24cf initial
+ok 35 - onbranch with detached HEAD
 
-	test_grep ! "modules/" check-rules-matches &&
-	test_grep "folder1/" check-rules-matches
+expecting success of 1305.36 'onbranch without repository': 
+	test_when_finished "rm -f .gitconfig config.inc" &&
+	git config set -f .gitconfig "includeIf.onbranch:**.path" config.inc &&
+	git config set -f config.inc foo.bar baz &&
+	git config get foo.bar &&
+	test_must_fail nongit git config get foo.bar
 
-folder1/a
-ok 38 - check-rules interaction with submodules
+baz
+ok 36 - onbranch without repository
 
-expecting success of 1091.39 'different sparse-checkouts with worktrees': 
-	git -C repo sparse-checkout set --cone deep folder1 &&
-	git -C repo worktree add --detach ../worktree &&
-	check_files worktree "a deep folder1" &&
-	git -C repo sparse-checkout set --cone folder1 &&
-	git -C worktree sparse-checkout set --cone deep/deeper1 &&
-	check_files repo "a folder1" &&
-	check_files worktree "a deep"
+expecting success of 1305.37 'onbranch without repository but explicit nonexistent Git directory': 
+	test_when_finished "rm -f .gitconfig config.inc" &&
+	git config set -f .gitconfig "includeIf.onbranch:**.path" config.inc &&
+	git config set -f config.inc foo.bar baz &&
+	git config get foo.bar &&
+	test_must_fail nongit git --git-dir=nonexistent config get foo.bar
 
-Preparing worktree (detached HEAD ebf8b57)
-HEAD is now at ebf8b57 initial commit
-ok 39 - different sparse-checkouts with worktrees
+baz
+ok 37 - onbranch without repository but explicit nonexistent Git directory
 
-expecting success of 1091.40 'set using filename keeps file on-disk': 
-	git -C repo sparse-checkout set --skip-checks a deep &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/a/
-	/deep/
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1350-config-hooks-path.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1350-config-hooks-path/.git/
+expecting success of 1350.1 'set up a pre-commit hook in core.hooksPath': 
+	>actual &&
+	mkdir -p .git/custom-hooks &&
+	write_script .git/custom-hooks/pre-commit <<-\EOF &&
+	echo CUSTOM >>actual
 	EOF
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo a deep
-
-ok 40 - set using filename keeps file on-disk
-
-expecting success of 1091.41 'pattern-checks: /A/**': 
-	cat >repo/.git/info/sparse-checkout <<-\EOF &&
-	/*
-	!/*/
-	/folder1/**
+	test_hook --setup pre-commit <<-\EOF
+	echo NORMAL >>actual
 	EOF
-	check_read_tree_errors repo "a folder1" "disabling cone pattern matching"
 
-warning: disabling cone pattern matching
-warning: disabling cone pattern matching
-ok 41 - pattern-checks: /A/**
+ok 1 - set up a pre-commit hook in core.hooksPath
 
-expecting success of 1091.42 'pattern-checks: /A/**/B/': 
-	cat >repo/.git/info/sparse-checkout <<-\EOF &&
-	/*
-	!/*/
-	/deep/**/deepest
+expecting success of 1350.2 'Check that various forms of specifying core.hooksPath work': 
+	test_commit no_custom_hook &&
+	git config core.hooksPath .git/custom-hooks &&
+	test_commit have_custom_hook &&
+	git config core.hooksPath .git/custom-hooks/ &&
+	test_commit have_custom_hook_trailing_slash &&
+	git config core.hooksPath "$PWD/.git/custom-hooks" &&
+	test_commit have_custom_hook_abs_path &&
+	git config core.hooksPath "$PWD/.git/custom-hooks/" &&
+	test_commit have_custom_hook_abs_path_trailing_slash &&
+	cat >expect <<-\EOF &&
+	NORMAL
+	CUSTOM
+	CUSTOM
+	CUSTOM
+	CUSTOM
 	EOF
-	check_read_tree_errors repo "a deep" "disabling cone pattern matching" &&
-	check_files repo/deep "deeper1" &&
-	check_files repo/deep/deeper1 "deepest"
+	test_cmp expect actual
 
-warning: disabling cone pattern matching
-warning: disabling cone pattern matching
-ok 42 - pattern-checks: /A/**/B/
+[master (root-commit) 51fec20] no_custom_hook
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 no_custom_hook.t
+[master d6f765a] have_custom_hook
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 have_custom_hook.t
+[master c8447a6] have_custom_hook_trailing_slash
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 have_custom_hook_trailing_slash.t
+[master acc1a92] have_custom_hook_abs_path
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 have_custom_hook_abs_path.t
+[master 3a47fb1] have_custom_hook_abs_path_trailing_slash
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 have_custom_hook_abs_path_trailing_slash.t
+ok 2 - Check that various forms of specifying core.hooksPath work
 
-expecting success of 1091.43 'pattern-checks: too short': 
-	cat >repo/.git/info/sparse-checkout <<-\EOF &&
-	/*
-	!/*/
-	/
-	EOF
-	check_read_tree_errors repo "a" "disabling cone pattern matching"
+expecting success of 1350.3 'git rev-parse --git-path hooks': 
+	git config core.hooksPath .git/custom-hooks &&
+	git rev-parse --git-path hooks/abc >actual &&
+	test .git/custom-hooks/abc = "$(cat actual)"
 
-warning: disabling cone pattern matching
-ok 43 - pattern-checks: too short
+ok 3 - git rev-parse --git-path hooks
 
-expecting success of 1091.44 'pattern-checks: not too short': 
-	cat >repo/.git/info/sparse-checkout <<-\EOF &&
-	/*
-	!/*/
-	/b/
-	EOF
-	git -C repo read-tree -mu HEAD 2>err &&
-	test_must_be_empty err &&
-	check_files repo a
-
-ok 44 - pattern-checks: not too short
-
-expecting success of 1091.45 'pattern-checks: trailing "*"': 
-	cat >repo/.git/info/sparse-checkout <<-\EOF &&
-	/*
-	!/*/
-	/a*
-	EOF
-	check_read_tree_errors repo "a" "disabling cone pattern matching"
+expecting success of 1350.4 'core.hooksPath=/dev/null': 
+	git clone -c core.hooksPath=/dev/null . no-templates &&
+	value="$(git -C no-templates config --local core.hooksPath)" &&
+	# The Bash used by Git for Windows rewrites `/dev/null` to `nul`
+	{ test /dev/null = "$value" || test nul = "$value"; }
 
-warning: disabling cone pattern matching
-ok 45 - pattern-checks: trailing "*"
+Cloning into 'no-templates'...
+done.
+ok 4 - core.hooksPath=/dev/null
 
-expecting success of 1091.46 'pattern-checks: starting "*"': 
-	cat >repo/.git/info/sparse-checkout <<-\EOF &&
-	/*
-	!/*/
-	*eep/
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1308-config-set.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1308-config-set/.git/
+expecting success of 1308.1 'setup default config': 
+	cat >.git/config <<-\EOF
+	[case]
+		penguin = very blue
+		Movie = BadPhysics
+		UPPERCASE = true
+		MixedCase = true
+		my =
+		foo
+		baz = sam
+	[Cores]
+		WhatEver = Second
+		baz = bar
+	[cores]
+		baz = bat
+	[CORES]
+		baz = ball
+	[my "Foo bAr"]
+		hi = mixed-case
+	[my "FOO BAR"]
+		hi = upper-case
+	[my "foo bar"]
+		hi = lower-case
+	[case]
+		baz = bat
+		baz = hask
+	[lamb]
+		chop = 65
+		head = none
+	[goat]
+		legs = 4
+		head = true
+		skin = false
+		nose = 1
+		horns
+	[value]
+		less
 	EOF
-	check_read_tree_errors repo "a deep" "disabling cone pattern matching"
 
-warning: disabling cone pattern matching
-warning: disabling cone pattern matching
-ok 46 - pattern-checks: starting "*"
+ok 1 - setup default config
 
-expecting success of 1091.47 'pattern-checks: non directory pattern': 
-	cat >repo/.git/info/sparse-checkout <<-\EOF &&
-	/deep/deeper1/a
-	EOF
-	check_read_tree_errors repo deep "disabling cone pattern matching" &&
-	check_files repo/deep deeper1 &&
-	check_files repo/deep/deeper1 a
+expecting success of 1308.2 'get value for a simple key': 
+	check_config get_value case.penguin "very blue"
 
-warning: disabling cone pattern matching
-warning: disabling cone pattern matching
-ok 47 - pattern-checks: non directory pattern
+ok 2 - get value for a simple key
 
-expecting success of 1091.48 'pattern-checks: contained glob characters': 
-	for c in "[a]" "\\" "?" "*"
-	do
-		cat >repo/.git/info/sparse-checkout <<-EOF &&
-		/*
-		!/*/
-		something$c-else/
-		EOF
-		check_read_tree_errors repo "a" "disabling cone pattern matching" || return 1
-	done
+expecting success of 1308.3 'get value for a key with value as an empty string': 
+	check_config get_value case.my ""
 
-warning: disabling cone pattern matching
-warning: disabling cone pattern matching
-warning: disabling cone pattern matching
-warning: disabling cone pattern matching
-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
+ok 3 - get value for a key with value as an empty string
 
-expecting success of 1091.49 'pattern-checks: escaped characters': 
-	git clone repo escaped &&
-	TREEOID=$(git -C escaped rev-parse HEAD:folder1) &&
-	NEWTREE=$(git -C escaped mktree <<-EOF
-	$(git -C escaped ls-tree HEAD)
-	040000 tree $TREEOID	zbad\\dir
-	040000 tree $TREEOID	zdoes*exist
-	040000 tree $TREEOID	zglob[!a]?
-	EOF
-	) &&
-	COMMIT=$(git -C escaped commit-tree $NEWTREE -p HEAD) &&
-	git -C escaped reset --hard $COMMIT &&
-	check_files escaped "a deep folder1 folder2 zbad\\dir zdoes*exist" zglob[!a]? &&
-	git -C escaped sparse-checkout init --cone &&
-	git -C escaped sparse-checkout set --skip-checks zbad\\dir/bogus "zdoes*not*exist" "zdoes*exist" "zglob[!a]?" &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/zbad\\dir/
-	!/zbad\\dir/*/
-	/zbad\\dir/bogus/
-	/zdoes\*exist/
-	/zdoes\*not\*exist/
-	/zglob\[!a]\?/
-	EOF
-	test_cmp expect escaped/.git/info/sparse-checkout &&
-	check_read_tree_errors escaped "a zbad\\dir zdoes*exist zglob[!a]?" &&
-	git -C escaped ls-tree -d --name-only HEAD >list-expect &&
-	git -C escaped sparse-checkout set --stdin <list-expect &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/deep/
-	/folder1/
-	/folder2/
-	/zbad\\dir/
-	/zdoes\*exist/
-	/zglob\[!a]\?/
-	EOF
-	test_cmp expect escaped/.git/info/sparse-checkout &&
-	check_files escaped "a deep folder1 folder2 zbad\\dir zdoes*exist" zglob[!a]? &&
-	git -C escaped sparse-checkout list >list-actual &&
-	test_cmp list-expect list-actual
+expecting success of 1308.4 'get value for a key with value as NULL': 
+	check_config get_value case.foo "(NULL)"
 
-Cloning into 'escaped'...
-done.
-HEAD is now at deac45b
-ok 49 - pattern-checks: escaped characters
+ok 4 - get value for a key with value as NULL
 
-ok 50 # skip cone mode replaces backslashes with slashes (missing MINGW)
+expecting success of 1308.5 'upper case key': 
+	check_config get_value case.UPPERCASE "true" &&
+	check_config get_value case.uppercase "true"
 
-expecting success of 1091.51 'cone mode clears ignored subdirectories': 
-	rm repo/.git/info/sparse-checkout &&
+ok 5 - upper case key
 
-	git -C repo sparse-checkout init --cone &&
-	git -C repo sparse-checkout set deep/deeper1 &&
+expecting success of 1308.6 'mixed case key': 
+	check_config get_value case.MixedCase "true" &&
+	check_config get_value case.MIXEDCASE "true" &&
+	check_config get_value case.mixedcase "true"
 
-	cat >repo/.gitignore <<-\EOF &&
-	obj/
-	*.o
-	EOF
+ok 6 - mixed case key
 
-	git -C repo add .gitignore &&
-	git -C repo commit -m ".gitignore" &&
+expecting success of 1308.7 'key and value with mixed case': 
+	check_config get_value case.Movie "BadPhysics"
 
-	mkdir -p repo/obj repo/folder1/obj repo/deep/deeper2/obj &&
-	for file in folder1/obj/a obj/a folder1/file.o folder1.o \
-		    deep/deeper2/obj/a deep/deeper2/file.o file.o
-	do
-		echo ignored >repo/$file || return 1
-	done &&
+ok 7 - key and value with mixed case
 
-	git -C repo status --porcelain=v2 >out &&
-	test_must_be_empty out &&
+expecting success of 1308.8 'key with case sensitive subsection': 
+	check_config get_value "my.Foo bAr.hi" "mixed-case" &&
+	check_config get_value "my.FOO BAR.hi" "upper-case" &&
+	check_config get_value "my.foo bar.hi" "lower-case"
 
-	git -C repo sparse-checkout reapply &&
-	test_path_is_missing repo/folder1 &&
-	test_path_is_missing repo/deep/deeper2 &&
-	test_path_is_dir repo/obj &&
-	test_path_is_file repo/file.o &&
+ok 8 - key with case sensitive subsection
 
-	git -C repo status --porcelain=v2 >out &&
-	test_must_be_empty out &&
+expecting success of 1308.9 'key with case insensitive section header': 
+	check_config get_value cores.baz "ball" &&
+	check_config get_value Cores.baz "ball" &&
+	check_config get_value CORES.baz "ball" &&
+	check_config get_value coreS.baz "ball"
 
-	git -C repo sparse-checkout set deep/deeper2 &&
-	test_path_is_missing repo/deep/deeper1 &&
-	test_path_is_dir repo/deep/deeper2 &&
-	test_path_is_dir repo/obj &&
-	test_path_is_file repo/file.o &&
+ok 9 - key with case insensitive section header
 
-	>repo/deep/deeper2/ignored.o &&
-	>repo/deep/deeper2/untracked &&
+expecting success of 1308.10 'key with case insensitive section header & variable': 
+	check_config get_value CORES.BAZ "ball" &&
+	check_config get_value cores.baz "ball" &&
+	check_config get_value cores.BaZ "ball" &&
+	check_config get_value cOreS.bAz "ball"
 
-	# When an untracked file is in the way, all untracked files
-	# (even ignored files) are preserved.
-	git -C repo sparse-checkout set folder1 2>err &&
-	grep "contains untracked files" err &&
-	test_path_is_file repo/deep/deeper2/ignored.o &&
-	test_path_is_file repo/deep/deeper2/untracked &&
+ok 10 - key with case insensitive section header & variable
 
-	# The rest of the cone matches expectation
-	test_path_is_missing repo/deep/deeper1 &&
-	test_path_is_dir repo/obj &&
-	test_path_is_file repo/file.o &&
+expecting success of 1308.11 'find value with misspelled key': 
+	check_config expect_code 1 get_value "my.fOo Bar.hi" "Value not found for \"my.fOo Bar.hi\""
 
-	git -C repo status --porcelain=v2 >out &&
-	echo "? deep/deeper2/untracked" >expect &&
-	test_cmp expect out
+ok 11 - find value with misspelled key
 
-[main ab507a5] .gitignore
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 .gitignore
-warning: directory 'deep/' contains untracked files, but is not in the sparse-checkout cone
-ok 51 - cone mode clears ignored subdirectories
+expecting success of 1308.12 'find value with the highest priority': 
+	check_config get_value case.baz "hask"
 
-expecting success of 1091.52 'malformed cone-mode patterns': 
-	git -C repo sparse-checkout init --cone &&
-	mkdir -p repo/foo/bar &&
-	touch repo/foo/bar/x repo/foo/y &&
-	cat >repo/.git/info/sparse-checkout <<-\EOF &&
-	/*
-	!/*/
-	/foo/
-	!/foo/*/
-	/foo/\*/
-	EOF
+ok 12 - find value with the highest priority
 
-	# Listing the patterns will notice the duplicate pattern and
-	# emit a warning. It will list the patterns directly instead
-	# of using the cone-mode translation to a set of directories.
-	git -C repo sparse-checkout list >actual 2>err &&
-	test_cmp repo/.git/info/sparse-checkout actual &&
-	grep "warning: your sparse-checkout file may have issues: pattern .* is repeated" err &&
-	grep "warning: disabling cone pattern matching" err
+expecting success of 1308.13 'return value for an existing key': 
+	test-tool config get lamb.chop >out 2>err &&
+	test_must_be_empty out &&
+	test_must_be_empty err
 
-warning: directory 'deep/' contains untracked files, but is not in the sparse-checkout cone
-warning: your sparse-checkout file may have issues: pattern '/foo/\*' is repeated
-warning: disabling cone pattern matching
-ok 52 - malformed cone-mode patterns
+ok 13 - return value for an existing key
 
-expecting success of 1091.53 'set from subdir pays attention to prefix': 
-	git -C repo sparse-checkout disable &&
-	git -C repo/deep sparse-checkout set --cone deeper2 ../folder1 &&
+expecting success of 1308.14 'return value for value-less key': 
+	test-tool config get value.less >out 2>err &&
+	test_must_be_empty out &&
+	test_must_be_empty err
 
-	git -C repo sparse-checkout list >actual &&
+ok 14 - return value for value-less key
 
+expecting success of 1308.15 'return value for a missing key': 
 	cat >expect <<-\EOF &&
-	deep/deeper2
-	folder1
+	Value not found for "missing.key"
 	EOF
-	test_cmp expect actual
-
-ok 53 - set from subdir pays attention to prefix
-
-expecting success of 1091.54 'add from subdir pays attention to prefix': 
-	git -C repo sparse-checkout set --cone deep/deeper2 &&
-	git -C repo/deep sparse-checkout add deeper1/deepest ../folder1 &&
+	test_expect_code 1 test-tool config get missing.key >actual 2>err &&
+	test_cmp actual expect &&
+	test_must_be_empty err
 
-	git -C repo sparse-checkout list >actual &&
+ok 15 - return value for a missing key
 
+expecting success of 1308.16 'return value for a bad key: CONFIG_INVALID_KEY': 
 	cat >expect <<-\EOF &&
-	deep/deeper1/deepest
-	deep/deeper2
-	folder1
+	Key "fails.iskeychar.-" is invalid
 	EOF
-	test_cmp expect actual
+	test_expect_code 1 test-tool config get fails.iskeychar.- >actual 2>err &&
+	test_cmp actual expect &&
+	test_must_be_empty out
 
-ok 54 - add from subdir pays attention to prefix
+ok 16 - return value for a bad key: CONFIG_INVALID_KEY
 
-expecting success of 1091.55 'set from subdir in non-cone mode throws an error': 
-	git -C repo sparse-checkout disable &&
-	test_must_fail git -C repo/deep sparse-checkout set --no-cone deeper2 ../folder1 2>error &&
+expecting success of 1308.17 'return value for a bad key: CONFIG_NO_SECTION_OR_NAME': 
+	cat >expect <<-\EOF &&
+	Key "keynosection" has no section
+	EOF
+	test_expect_code 1 test-tool config get keynosection >actual 2>err &&
+	test_cmp actual expect &&
+	test_must_be_empty out
 
-	grep "run from the toplevel directory in non-cone mode" error
+ok 17 - return value for a bad key: CONFIG_NO_SECTION_OR_NAME
 
-fatal: please run from the toplevel directory in non-cone mode
-ok 55 - set from subdir in non-cone mode throws an error
+expecting success of 1308.18 'find integer value for a key': 
+	check_config get_int lamb.chop 65
 
-expecting success of 1091.56 'set from subdir in non-cone mode throws an error': 
-	git -C repo sparse-checkout set --no-cone deep/deeper2 &&
-	test_must_fail git -C repo/deep sparse-checkout add deeper1/deepest ../folder1 2>error &&
+ok 18 - find integer value for a key
 
-	grep "run from the toplevel directory in non-cone mode" error
+expecting success of 1308.19 'parse integer value during iteration': 
+	check_config git_config_int lamb.chop 65
 
-fatal: please run from the toplevel directory in non-cone mode
-ok 56 - set from subdir in non-cone mode throws an error
+ok 19 - parse integer value during iteration
 
-expecting success of 1091.57 'by default, cone mode will error out when passed files': 
-	git -C repo sparse-checkout reapply --cone &&
-	test_must_fail git -C repo sparse-checkout add .gitignore 2>error &&
+expecting success of 1308.20 'find string value for a key': 
+	check_config get_string case.baz hask &&
+	check_config expect_code 1 get_string case.ba "Value not found for \"case.ba\""
 
-	grep ".gitignore.*is not a directory" error
+ok 20 - find string value for a key
 
-warning: unrecognized pattern: 'deep/deeper2'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'deep/deeper2'
-warning: disabling cone pattern matching
-fatal: '.gitignore' is not a directory; to treat it as a directory anyway, rerun with --skip-checks
-ok 57 - by default, cone mode will error out when passed files
+expecting success of 1308.21 'check line error when NULL string is queried': 
+	test_expect_code 128 test-tool config get_string case.foo 2>result &&
+	test_grep "fatal: .*case\.foo.*\.git/config.*line 7" result
 
-expecting success of 1091.58 'error on mistyped command line options': 
-	test_must_fail git -C repo sparse-checkout add --sikp-checks .gitignore 2>error &&
+fatal: bad config variable 'case.foo' in file '.git/config' at line 7
+ok 21 - check line error when NULL string is queried
 
-	grep "unknown option.*sikp-checks" error
+expecting success of 1308.22 'find integer if value is non parse-able': 
+	check_config expect_code 128 get_int lamb.head
 
-error: unknown option `sikp-checks'
-ok 58 - error on mistyped command line options
+fatal: bad numeric config value 'none' for 'lamb.head' in file .git/config: invalid unit
+ok 22 - find integer if value is non parse-able
 
-expecting success of 1091.59 'by default, non-cone mode will warn on individual files': 
-	git -C repo sparse-checkout reapply --no-cone &&
-	git -C repo sparse-checkout add .gitignore 2>warning &&
+expecting success of 1308.23 'non parse-able integer value during iteration': 
+	check_config expect_code 128 git_config_int lamb.head 2>result &&
+	grep "fatal: bad numeric config value .* in file \.git/config" result
 
-	grep "pass a leading slash before paths.*if you want a single file" warning
+fatal: bad numeric config value 'none' for 'none' in file .git/config: invalid unit
+ok 23 - non parse-able integer value during iteration
 
-warning: pass a leading slash before paths such as '.gitignore' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-ok 59 - by default, non-cone mode will warn on individual files
+expecting success of 1308.24 'find bool value for the entered key': 
+	check_config get_bool goat.head 1 &&
+	check_config get_bool goat.skin 0 &&
+	check_config get_bool goat.nose 1 &&
+	check_config get_bool goat.horns 1 &&
+	check_config get_bool goat.legs 1
 
-expecting success of 1091.60 'setup bare repo': 
-	git clone --bare "file://$(pwd)/repo" bare
+ok 24 - find bool value for the entered key
 
-Cloning into bare repository 'bare'...
-ok 60 - setup bare repo
+expecting success of 1308.25 'find multiple values': 
+	check_config get_value_multi case.baz sam bat hask
 
-expecting success of 1091.61 'list fails outside work tree': 
-	test_must_fail git -C bare sparse-checkout list 2>err &&
-	test_grep "this operation must be run in a work tree" err
+ok 25 - find multiple values
 
-fatal: this operation must be run in a work tree
-ok 61 - list fails outside work tree
+expecting success of 1308.26 'get_value_multi: NULL value in config': 
+		config="$file" &&
+		if test -z "$config"
+		then
+			config=.git/config &&
+			test_when_finished "mv $config.old $config" &&
+			mv "$config" "$config".old
+		fi &&
 
-expecting success of 1091.62 'add fails outside work tree': 
-	test_must_fail git -C bare sparse-checkout add deeper 2>err &&
-	test_grep "this operation must be run in a work tree" err
+		# Value-less in the middle of a list
+		cat >"$config" <<-\EOF &&
+		[a]key=x
+		[a]key
+		[a]key=y
+		EOF
+		case "$op" in
+		*_multi)
+			cat >expect <<-\EOF
+			x
+			(NULL)
+			y
+			EOF
+			;;
+		*)
+			cat >expect <<-\EOF
+			y
+			EOF
+			;;
+		esac &&
+		test-tool config "$op" a.key $file >actual &&
+		test_cmp expect actual &&
 
-fatal: this operation must be run in a work tree
-ok 62 - add fails outside work tree
+		# Value-less at the end of a least
+		cat >"$config" <<-\EOF &&
+		[a]key=x
+		[a]key=y
+		[a]key
+		EOF
+		case "$op" in
+		*_multi)
+			cat >expect <<-\EOF
+			x
+			y
+			(NULL)
+			EOF
+			;;
+		*)
+			cat >expect <<-\EOF
+			(NULL)
+			EOF
+			;;
+		esac &&
+		test-tool config "$op" a.key $file >actual &&
+		test_cmp expect actual
+	
+ok 26 - get_value_multi: NULL value in config
 
-expecting success of 1091.63 'set fails outside work tree': 
-	test_must_fail git -C bare sparse-checkout set deeper 2>err &&
-	test_grep "this operation must be run in a work tree" err
+expecting success of 1308.27 'configset_get_value: NULL value in config in my.config': 
+		config="$file" &&
+		if test -z "$config"
+		then
+			config=.git/config &&
+			test_when_finished "mv $config.old $config" &&
+			mv "$config" "$config".old
+		fi &&
 
-fatal: this operation must be run in a work tree
-ok 63 - set fails outside work tree
+		# Value-less in the middle of a list
+		cat >"$config" <<-\EOF &&
+		[a]key=x
+		[a]key
+		[a]key=y
+		EOF
+		case "$op" in
+		*_multi)
+			cat >expect <<-\EOF
+			x
+			(NULL)
+			y
+			EOF
+			;;
+		*)
+			cat >expect <<-\EOF
+			y
+			EOF
+			;;
+		esac &&
+		test-tool config "$op" a.key $file >actual &&
+		test_cmp expect actual &&
 
-expecting success of 1091.64 'init fails outside work tree': 
-	test_must_fail git -C bare sparse-checkout init 2>err &&
-	test_grep "this operation must be run in a work tree" err
+		# Value-less at the end of a least
+		cat >"$config" <<-\EOF &&
+		[a]key=x
+		[a]key=y
+		[a]key
+		EOF
+		case "$op" in
+		*_multi)
+			cat >expect <<-\EOF
+			x
+			y
+			(NULL)
+			EOF
+			;;
+		*)
+			cat >expect <<-\EOF
+			(NULL)
+			EOF
+			;;
+		esac &&
+		test-tool config "$op" a.key $file >actual &&
+		test_cmp expect actual
+	
+ok 27 - configset_get_value: NULL value in config in my.config
 
-fatal: this operation must be run in a work tree
-ok 64 - init fails outside work tree
+expecting success of 1308.28 'configset_get_value_multi: NULL value in config in my.config': 
+		config="$file" &&
+		if test -z "$config"
+		then
+			config=.git/config &&
+			test_when_finished "mv $config.old $config" &&
+			mv "$config" "$config".old
+		fi &&
 
-expecting success of 1091.65 'reapply fails outside work tree': 
-	test_must_fail git -C bare sparse-checkout reapply 2>err &&
-	test_grep "this operation must be run in a work tree" err
+		# Value-less in the middle of a list
+		cat >"$config" <<-\EOF &&
+		[a]key=x
+		[a]key
+		[a]key=y
+		EOF
+		case "$op" in
+		*_multi)
+			cat >expect <<-\EOF
+			x
+			(NULL)
+			y
+			EOF
+			;;
+		*)
+			cat >expect <<-\EOF
+			y
+			EOF
+			;;
+		esac &&
+		test-tool config "$op" a.key $file >actual &&
+		test_cmp expect actual &&
 
-fatal: this operation must be run in a work tree
-ok 65 - reapply fails outside work tree
+		# Value-less at the end of a least
+		cat >"$config" <<-\EOF &&
+		[a]key=x
+		[a]key=y
+		[a]key
+		EOF
+		case "$op" in
+		*_multi)
+			cat >expect <<-\EOF
+			x
+			y
+			(NULL)
+			EOF
+			;;
+		*)
+			cat >expect <<-\EOF
+			(NULL)
+			EOF
+			;;
+		esac &&
+		test-tool config "$op" a.key $file >actual &&
+		test_cmp expect actual
+	
+ok 28 - configset_get_value_multi: NULL value in config in my.config
 
-expecting success of 1091.66 'disable fails outside work tree': 
-	test_must_fail git -C bare sparse-checkout disable 2>err &&
-	test_grep "this operation must be run in a work tree" err
+expecting success of 1308.29 'find value from a configset': 
+	cat >config2 <<-\EOF &&
+	[case]
+		baz = lama
+	[my]
+		new = silk
+	[case]
+		baz = ball
+	EOF
+	echo silk >expect &&
+	test-tool config configset_get_value my.new config2 .git/config >actual &&
+	test_cmp expect actual
 
-fatal: this operation must be run in a work tree
-ok 66 - disable fails outside work tree
+ok 29 - find value from a configset
 
-expecting success of 1091.67 'setup clean': 
-	git -C repo clean -fdx
+expecting success of 1308.30 'find value with highest priority from a configset': 
+	echo hask >expect &&
+	test-tool config configset_get_value case.baz config2 .git/config >actual &&
+	test_cmp expect actual
 
-Removing deep/deeper2/ignored.o
-Removing deep/deeper2/untracked
-Removing file.o
-Removing folder1.o
-Removing foo/
-Removing obj/
-ok 67 - setup clean
+ok 30 - find value with highest priority from a configset
 
-expecting success of 1091.68 'check-rules cone mode': 
-	cat >rules <<-\EOF &&
-	folder1
-	deep/deeper1/deepest
+expecting success of 1308.31 'find value_list for a key from a configset': 
+	cat >expect <<-\EOF &&
+	lama
+	ball
+	sam
+	bat
+	hask
 	EOF
+	test-tool config configset_get_value_multi case.baz config2 .git/config >actual &&
+	test_cmp expect actual
 
-	git -C bare ls-tree -r --name-only HEAD >all-files &&
-	git -C bare sparse-checkout check-rules --cone \
-		--rules-file ../rules >check-rules-file <all-files &&
+ok 31 - find value_list for a key from a configset
 
-	git -C repo sparse-checkout set --cone --stdin <rules&&
-	git -C repo ls-files -t >out &&
-	sed -n "/^S /!s/^. //p" out >ls-files &&
+expecting success of 1308.32 'proper error on non-existent files': 
+	echo "Error (-1) reading configuration file non-existent-file." >expect &&
+	test_expect_code 2 test-tool config configset_get_value foo.bar non-existent-file 2>actual &&
+	test_cmp expect actual
 
-	git -C repo sparse-checkout check-rules >check-rules-default <all-files &&
+ok 32 - proper error on non-existent files
 
-	test_grep "deep/deeper1/deepest/a" check-rules-file &&
-	test_grep ! "deep/deeper2" check-rules-file &&
+expecting success of 1308.33 'proper error on directory "files"': 
+	echo "Error (-1) reading configuration file a-directory." >expect &&
+	mkdir a-directory &&
+	test_expect_code 2 test-tool config configset_get_value foo.bar a-directory 2>output &&
+	grep "^warning:" output &&
+	grep "^Error" output >actual &&
+	test_cmp expect actual
 
-	test_cmp check-rules-file ls-files &&
-	test_cmp check-rules-file check-rules-default
+warning: unable to access 'a-directory': Is a directory
+ok 33 - proper error on directory "files"
 
-deep/deeper1/deepest/a
-ok 68 - check-rules cone mode
+checking prerequisite: SANITY
 
-expecting success of 1091.69 'check-rules non-cone mode': 
-	cat >rules <<-\EOF &&
-	deep/deeper1/deepest/a
-	EOF
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-	git -C bare ls-tree -r --name-only HEAD >all-files &&
-	git -C bare sparse-checkout check-rules --no-cone --rules-file ../rules\
-		>check-rules-file <all-files &&
+	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 -C repo sparse-checkout set --no-cone --stdin <rules &&
-	git -C repo ls-files -t >out &&
-	sed -n "/^S /!s/^. //p" out >ls-files &&
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-	git -C repo sparse-checkout check-rules >check-rules-default <all-files &&
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-	cat >expect <<-\EOF &&
-	deep/deeper1/deepest/a
-	EOF
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 1308.34 'proper error on non-accessible files': 
+	chmod -r .git/config &&
+	test_when_finished "chmod +r .git/config" &&
+	echo "Error (-1) reading configuration file .git/config." >expect &&
+	test_expect_code 2 test-tool config configset_get_value foo.bar .git/config 2>output &&
+	grep "^warning:" output &&
+	grep "^Error" output >actual &&
+	test_cmp expect actual
 
-	test_cmp expect check-rules-file &&
-	test_cmp check-rules-file ls-files &&
-	test_cmp check-rules-file check-rules-default
+warning: unable to access '.git/config': Permission denied
+warning: unable to access '.git/config': Permission denied
+ok 34 - proper error on non-accessible files
 
-ok 69 - check-rules non-cone mode
+expecting success of 1308.35 'proper error on error in default config files': 
+	cp .git/config .git/config.old &&
+	test_when_finished "mv .git/config.old .git/config" &&
+	echo "[" >>.git/config &&
+	echo "fatal: bad config line 36 in file .git/config" >expect &&
+	test_expect_code 128 test-tool config get_value foo.bar 2>actual &&
+	test_cmp expect actual
 
-expecting success of 1091.70 'check-rules cone mode is default': 
-	cat >rules <<-\EOF &&
-	folder1
-	EOF
+ok 35 - proper error on error in default config files
 
-	cat >all-files <<-\EOF &&
-	toplevel
-	folder2/file
-	folder1/file
-	EOF
+expecting success of 1308.36 'proper error on error in custom config files': 
+	echo "[" >>syntax-error &&
+	echo "fatal: bad config line 1 in file syntax-error" >expect &&
+	test_expect_code 128 test-tool config configset_get_value foo.bar syntax-error 2>actual &&
+	test_cmp expect actual
 
-	cat >expect <<-\EOF &&
-	toplevel
-	folder1/file
-	EOF
+ok 36 - proper error on error in custom config files
 
-	git -C repo sparse-checkout set --no-cone &&
-	git -C repo sparse-checkout check-rules \
-		--rules-file ../rules >actual <all-files &&
+expecting success of 1308.37 'check line errors for malformed values': 
+	mv .git/config .git/config.old &&
+	test_when_finished "mv .git/config.old .git/config" &&
+	cat >.git/config <<-\EOF &&
+	[alias]
+		br
+	EOF
+	test_expect_code 128 git br 2>result &&
+	test_grep "missing value for .alias\.br" result &&
+	test_grep "fatal: .*\.git/config" result &&
+	test_grep "fatal: .*line 2" result
 
-	git -C bare sparse-checkout check-rules \
-		--rules-file ../rules >actual-bare <all-files &&
+error: missing value for 'alias.br'
+fatal: bad config line 2 in file .git/config
+fatal: bad config line 2 in file .git/config
+ok 37 - check line errors for malformed values
 
-	test_cmp expect actual &&
-	test_cmp expect actual-bare
+expecting success of 1308.38 'error on modifying repo config without repo': 
+	nongit test_must_fail git config a.b c 2>err &&
+	test_grep "not in a git directory" err
 
-ok 70 - check-rules cone mode is default
+fatal: not in a git directory
+ok 38 - error on modifying repo config without repo
 
-expecting success of 1091.71 'check-rules quoting': 
-	cat >rules <<-EOF &&
-	"folder\" a"
-	EOF
-	cat >files <<-EOF &&
-	"folder\" a/file"
-	"folder\" b/file"
-	EOF
+expecting success of 1308.39 'iteration shows correct origins': 
+	printf "[ignore]\n\tthis = please\n[foo]bar = from-repo\n" >.git/config &&
+	printf "[foo]\n\tbar = from-home\n" >.gitconfig &&
+	if test_have_prereq MINGW
+	then
+		# Use Windows path (i.e. *not* $HOME)
+		HOME_GITCONFIG=$(pwd)/.gitconfig
+	else
+		# Do not get fooled by symbolic links, i.e. $HOME != $(pwd)
+		HOME_GITCONFIG=$HOME/.gitconfig
+	fi &&
 	cat >expect <<-EOF &&
-	"folder\" a/file"
-	EOF
-	git sparse-checkout check-rules --cone \
-		--rules-file rules >actual <files &&
-
-	test_cmp expect actual
-
-ok 71 - check-rules quoting
+	key=foo.bar
+	value=from-home
+	origin=file
+	name=$HOME_GITCONFIG
+	lno=2
+	scope=global
 
-expecting success of 1091.72 'check-rules null termination': 
-	cat >rules <<-EOF &&
-	"folder\" a"
-	EOF
+	key=ignore.this
+	value=please
+	origin=file
+	name=.git/config
+	lno=2
+	scope=local
 
-	lf_to_nul >files <<-EOF &&
-	folder" a/a
-	folder" a/b
-	folder" b/fileQ
-	EOF
+	key=foo.bar
+	value=from-repo
+	origin=file
+	name=.git/config
+	lno=3
+	scope=local
 
-	cat >expect <<-EOF &&
-	folder" a/aQfolder" a/bQ
+	key=foo.bar
+	value=from-cmdline
+	origin=command line
+	name=
+	lno=-1
+	scope=command
 	EOF
-
-	git sparse-checkout check-rules --cone -z \
-		--rules-file rules >actual.nul <files &&
-	nul_to_q <actual.nul >actual &&
-	echo >>actual &&
-
+	GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config iterate >actual &&
 	test_cmp expect actual
 
-ok 72 - check-rules null termination
+ok 39 - iteration shows correct origins
 
-# still have 1 known breakage(s)
-# passed all remaining 71 test(s)
-1..72
+# passed all 39 test(s)
+1..39
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1401-symbolic-ref.sh ***
@@ -53247,6 +54183,362 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1403-show-ref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1403-show-ref/.git/
+expecting success of 1403.1 'setup': 
+	test_commit --annotate A &&
+	git checkout -b side &&
+	test_commit --annotate B &&
+	git checkout main &&
+	test_commit C &&
+	git branch B A^0
+
+[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 'side'
+[side 72702e6] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to branch 'main'
+[main b75428b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+ok 1 - setup
+
+expecting success of 1403.2 'show-ref': 
+	echo $(git rev-parse refs/tags/A) refs/tags/A >expect &&
+
+	git show-ref A >actual &&
+	test_cmp expect actual &&
+
+	git show-ref tags/A >actual &&
+	test_cmp expect actual &&
+
+	git show-ref refs/tags/A >actual &&
+	test_cmp expect actual &&
+
+	test_must_fail git show-ref D >actual &&
+	test_must_be_empty actual
+
+ok 2 - show-ref
+
+expecting success of 1403.3 'show-ref -q': 
+	git show-ref -q A >actual &&
+	test_must_be_empty actual &&
+
+	git show-ref -q tags/A >actual &&
+	test_must_be_empty actual &&
+
+	git show-ref -q refs/tags/A >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref -q D >actual &&
+	test_must_be_empty actual
+
+ok 3 - show-ref -q
+
+expecting success of 1403.4 'show-ref --verify': 
+	echo $(git rev-parse refs/tags/A) refs/tags/A >expect &&
+
+	git show-ref --verify refs/tags/A >actual &&
+	test_cmp expect actual &&
+
+	test_must_fail git show-ref --verify A >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref --verify tags/A >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref --verify D >actual &&
+	test_must_be_empty actual
+
+fatal: 'A' - not a valid ref
+fatal: 'tags/A' - not a valid ref
+fatal: 'D' - not a valid ref
+ok 4 - show-ref --verify
+
+expecting success of 1403.5 'show-ref --verify -q': 
+	git show-ref --verify -q refs/tags/A >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref --verify -q A >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref --verify -q tags/A >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref --verify -q D >actual &&
+	test_must_be_empty actual
+
+ok 5 - show-ref --verify -q
+
+expecting success of 1403.6 'show-ref -d': 
+	{
+		echo $(git rev-parse refs/tags/A) refs/tags/A &&
+		echo $(git rev-parse refs/tags/A^0) "refs/tags/A^{}" &&
+		echo $(git rev-parse refs/tags/C) refs/tags/C
+	} >expect &&
+	git show-ref -d A C >actual &&
+	test_cmp expect actual &&
+
+	git show-ref -d tags/A tags/C >actual &&
+	test_cmp expect actual &&
+
+	git show-ref -d refs/tags/A refs/tags/C >actual &&
+	test_cmp expect actual &&
+
+	git show-ref --verify -d refs/tags/A refs/tags/C >actual &&
+	test_cmp expect actual &&
+
+	echo $(git rev-parse refs/heads/main) refs/heads/main >expect &&
+	git show-ref -d main >actual &&
+	test_cmp expect actual &&
+
+	git show-ref -d heads/main >actual &&
+	test_cmp expect actual &&
+
+	git show-ref -d refs/heads/main >actual &&
+	test_cmp expect actual &&
+
+	git show-ref -d --verify refs/heads/main >actual &&
+	test_cmp expect actual &&
+
+	test_must_fail git show-ref -d --verify main >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref -d --verify heads/main >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref --verify -d A C >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref --verify -d tags/A tags/C >actual &&
+	test_must_be_empty actual
+
+
+fatal: 'main' - not a valid ref
+fatal: 'heads/main' - not a valid ref
+fatal: 'A' - not a valid ref
+fatal: 'tags/A' - not a valid ref
+ok 6 - show-ref -d
+
+expecting success of 1403.7 'show-ref --branches, --tags, --head, pattern': 
+	for branch in B main side
+	do
+		echo $(git rev-parse refs/heads/$branch) refs/heads/$branch || return 1
+	done >expect.branches &&
+	git show-ref --branches >actual &&
+	test_cmp expect.branches actual &&
+
+	for tag in A B C
+	do
+		echo $(git rev-parse refs/tags/$tag) refs/tags/$tag || return 1
+	done >expect.tags &&
+	git show-ref --tags >actual &&
+	test_cmp expect.tags actual &&
+
+	cat expect.branches expect.tags >expect &&
+	git show-ref --branches --tags >actual &&
+	test_cmp expect actual &&
+
+	{
+		echo $(git rev-parse HEAD) HEAD &&
+		cat expect.branches expect.tags
+	} >expect &&
+	git show-ref --branches --tags --head >actual &&
+	test_cmp expect actual &&
+
+	{
+		echo $(git rev-parse HEAD) HEAD &&
+		echo $(git rev-parse refs/heads/B) refs/heads/B &&
+		echo $(git rev-parse refs/tags/B) refs/tags/B
+	} >expect &&
+	git show-ref --head B >actual &&
+	test_cmp expect actual &&
+
+	{
+		echo $(git rev-parse HEAD) HEAD &&
+		echo $(git rev-parse refs/heads/B) refs/heads/B &&
+		echo $(git rev-parse refs/tags/B) refs/tags/B &&
+		echo $(git rev-parse refs/tags/B^0) "refs/tags/B^{}"
+	} >expect &&
+	git show-ref --head -d B >actual &&
+	test_cmp expect actual
+
+ok 7 - show-ref --branches, --tags, --head, pattern
+
+expecting success of 1403.8 'show-ref --heads is deprecated and hidden': 
+	test_expect_code 129 git show-ref -h >short-help &&
+	test_grep ! -e --heads short-help &&
+	git show-ref --heads >actual 2>warning &&
+	test_grep ! deprecated warning &&
+	test_cmp expect.branches actual
+
+ok 8 - show-ref --heads is deprecated and hidden
+
+expecting success of 1403.9 'show-ref --verify HEAD': 
+	echo $(git rev-parse HEAD) HEAD >expect &&
+	git show-ref --verify HEAD >actual &&
+	test_cmp expect actual &&
+
+	git show-ref --verify -q HEAD >actual &&
+	test_must_be_empty actual
+
+ok 9 - show-ref --verify HEAD
+
+expecting success of 1403.10 'show-ref --verify pseudorefs': 
+	git update-ref CHERRY_PICK_HEAD HEAD $ZERO_OID &&
+	test_when_finished "git update-ref -d CHERRY_PICK_HEAD" &&
+	git show-ref -s --verify HEAD >actual &&
+	git show-ref -s --verify CHERRY_PICK_HEAD >expect &&
+	test_cmp actual expect
+
+ok 10 - show-ref --verify pseudorefs
+
+expecting success of 1403.11 'show-ref --verify with dangling ref': 
+	sha1_file() {
+		echo "$*" | sed "s#..#.git/objects/&/#"
+	} &&
+
+	remove_object() {
+		file=$(sha1_file "$*") &&
+		test_path_is_file "$file" &&
+		rm -f "$file"
+	} &&
+
+	test_when_finished "rm -rf dangling" &&
+	(
+		git init dangling &&
+		cd dangling &&
+		test_commit dangling &&
+		sha=$(git rev-parse refs/tags/dangling) &&
+		remove_object $sha &&
+		test_must_fail git show-ref --verify refs/tags/dangling
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1403-show-ref/dangling/.git/
+[main (root-commit) 7b6c85a] dangling
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dangling.t
+fatal: git show-ref: bad ref refs/tags/dangling (7b6c85aed8ac906de9f4214d9c12b4d66316df20)
+ok 11 - show-ref --verify with dangling ref
+
+expecting success of 1403.12 'show-ref sub-modes are mutually exclusive': 
+	test_must_fail git show-ref --verify --exclude-existing 2>err &&
+	grep "verify" err &&
+	grep "exclude-existing" err &&
+	grep "cannot be used together" err &&
+
+	test_must_fail git show-ref --verify --exists 2>err &&
+	grep "verify" err &&
+	grep "exists" err &&
+	grep "cannot be used together" err &&
+
+	test_must_fail git show-ref --exclude-existing --exists 2>err &&
+	grep "exclude-existing" err &&
+	grep "exists" err &&
+	grep "cannot be used together" err
+
+fatal: options '--exclude-existing' and '--verify' cannot be used together
+fatal: options '--exclude-existing' and '--verify' cannot be used together
+fatal: options '--exclude-existing' and '--verify' cannot be used together
+fatal: options '--verify' and '--exists' cannot be used together
+fatal: options '--verify' and '--exists' cannot be used together
+fatal: options '--verify' and '--exists' cannot be used together
+fatal: options '--exclude-existing' and '--exists' cannot be used together
+fatal: options '--exclude-existing' and '--exists' cannot be used together
+fatal: options '--exclude-existing' and '--exists' cannot be used together
+ok 12 - show-ref sub-modes are mutually exclusive
+
+expecting success of 1403.13 '--exists with existing reference': 
+	git show-ref --exists refs/heads/$GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ok 13 - --exists with existing reference
+
+expecting success of 1403.14 '--exists with missing reference': 
+	test_expect_code 2 git show-ref --exists refs/heads/does-not-exist
+
+error: reference does not exist
+ok 14 - --exists with missing reference
+
+expecting success of 1403.15 '--exists does not use DWIM': 
+	test_expect_code 2 git show-ref --exists $GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME 2>err &&
+	grep "reference does not exist" err
+
+error: reference does not exist
+ok 15 - --exists does not use DWIM
+
+expecting success of 1403.16 '--exists with HEAD': 
+	git show-ref --exists HEAD
+
+ok 16 - --exists with HEAD
+
+expecting success of 1403.17 '--exists with bad reference name': 
+	test_when_finished "git update-ref -d refs/heads/bad...name" &&
+	new_oid=$(git rev-parse HEAD) &&
+	test-tool ref-store main update-ref msg refs/heads/bad...name $new_oid $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	git show-ref --exists refs/heads/bad...name
+
+ok 17 - --exists with bad reference name
+
+expecting success of 1403.18 '--exists with arbitrary symref': 
+	test_when_finished "git symbolic-ref -d refs/symref" &&
+	git symbolic-ref refs/symref refs/heads/$GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME &&
+	git show-ref --exists refs/symref
+
+ok 18 - --exists with arbitrary symref
+
+expecting success of 1403.19 '--exists with dangling symref': 
+	test_when_finished "git symbolic-ref -d refs/heads/dangling" &&
+	git symbolic-ref refs/heads/dangling refs/heads/does-not-exist &&
+	git show-ref --exists refs/heads/dangling
+
+ok 19 - --exists with dangling symref
+
+expecting success of 1403.20 '--exists with nonexistent object ID': 
+	test-tool ref-store main update-ref msg refs/heads/missing-oid $(test_oid 001) $ZERO_OID REF_SKIP_OID_VERIFICATION &&
+	git show-ref --exists refs/heads/missing-oid
+
+ok 20 - --exists with nonexistent object ID
+
+expecting success of 1403.21 '--exists with non-commit object': 
+	tree_oid=$(git rev-parse HEAD^{tree}) &&
+	test-tool ref-store main update-ref msg refs/heads/tree ${tree_oid} $ZERO_OID REF_SKIP_OID_VERIFICATION &&
+	git show-ref --exists refs/heads/tree
+
+ok 21 - --exists with non-commit object
+
+expecting success of 1403.22 '--exists with directory fails with generic error': 
+	cat >expect <<-EOF &&
+	error: reference does not exist
+	EOF
+	test_expect_code 2 git show-ref --exists refs/heads 2>err &&
+	test_cmp expect err
+
+ok 22 - --exists with directory fails with generic error
+
+expecting success of 1403.23 '--exists with non-existent special ref': 
+	test_expect_code 2 git show-ref --exists FETCH_HEAD
+
+error: reference does not exist
+ok 23 - --exists with non-existent special ref
+
+expecting success of 1403.24 '--exists with existing special ref': 
+	test_when_finished "rm .git/FETCH_HEAD" &&
+	git rev-parse HEAD >.git/FETCH_HEAD &&
+	git show-ref --exists FETCH_HEAD
+
+ok 24 - --exists with existing special ref
+
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1402-check-ref-format.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1402-check-ref-format/.git/
 expecting success of 1402.1 'ref name '' is invalid': 
@@ -53829,362 +55121,6 @@
 1..99
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1403-show-ref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1403-show-ref/.git/
-expecting success of 1403.1 'setup': 
-	test_commit --annotate A &&
-	git checkout -b side &&
-	test_commit --annotate B &&
-	git checkout main &&
-	test_commit C &&
-	git branch B A^0
-
-[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 'side'
-[side 72702e6] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to branch 'main'
-[main b75428b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-ok 1 - setup
-
-expecting success of 1403.2 'show-ref': 
-	echo $(git rev-parse refs/tags/A) refs/tags/A >expect &&
-
-	git show-ref A >actual &&
-	test_cmp expect actual &&
-
-	git show-ref tags/A >actual &&
-	test_cmp expect actual &&
-
-	git show-ref refs/tags/A >actual &&
-	test_cmp expect actual &&
-
-	test_must_fail git show-ref D >actual &&
-	test_must_be_empty actual
-
-ok 2 - show-ref
-
-expecting success of 1403.3 'show-ref -q': 
-	git show-ref -q A >actual &&
-	test_must_be_empty actual &&
-
-	git show-ref -q tags/A >actual &&
-	test_must_be_empty actual &&
-
-	git show-ref -q refs/tags/A >actual &&
-	test_must_be_empty actual &&
-
-	test_must_fail git show-ref -q D >actual &&
-	test_must_be_empty actual
-
-ok 3 - show-ref -q
-
-expecting success of 1403.4 'show-ref --verify': 
-	echo $(git rev-parse refs/tags/A) refs/tags/A >expect &&
-
-	git show-ref --verify refs/tags/A >actual &&
-	test_cmp expect actual &&
-
-	test_must_fail git show-ref --verify A >actual &&
-	test_must_be_empty actual &&
-
-	test_must_fail git show-ref --verify tags/A >actual &&
-	test_must_be_empty actual &&
-
-	test_must_fail git show-ref --verify D >actual &&
-	test_must_be_empty actual
-
-fatal: 'A' - not a valid ref
-fatal: 'tags/A' - not a valid ref
-fatal: 'D' - not a valid ref
-ok 4 - show-ref --verify
-
-expecting success of 1403.5 'show-ref --verify -q': 
-	git show-ref --verify -q refs/tags/A >actual &&
-	test_must_be_empty actual &&
-
-	test_must_fail git show-ref --verify -q A >actual &&
-	test_must_be_empty actual &&
-
-	test_must_fail git show-ref --verify -q tags/A >actual &&
-	test_must_be_empty actual &&
-
-	test_must_fail git show-ref --verify -q D >actual &&
-	test_must_be_empty actual
-
-ok 5 - show-ref --verify -q
-
-expecting success of 1403.6 'show-ref -d': 
-	{
-		echo $(git rev-parse refs/tags/A) refs/tags/A &&
-		echo $(git rev-parse refs/tags/A^0) "refs/tags/A^{}" &&
-		echo $(git rev-parse refs/tags/C) refs/tags/C
-	} >expect &&
-	git show-ref -d A C >actual &&
-	test_cmp expect actual &&
-
-	git show-ref -d tags/A tags/C >actual &&
-	test_cmp expect actual &&
-
-	git show-ref -d refs/tags/A refs/tags/C >actual &&
-	test_cmp expect actual &&
-
-	git show-ref --verify -d refs/tags/A refs/tags/C >actual &&
-	test_cmp expect actual &&
-
-	echo $(git rev-parse refs/heads/main) refs/heads/main >expect &&
-	git show-ref -d main >actual &&
-	test_cmp expect actual &&
-
-	git show-ref -d heads/main >actual &&
-	test_cmp expect actual &&
-
-	git show-ref -d refs/heads/main >actual &&
-	test_cmp expect actual &&
-
-	git show-ref -d --verify refs/heads/main >actual &&
-	test_cmp expect actual &&
-
-	test_must_fail git show-ref -d --verify main >actual &&
-	test_must_be_empty actual &&
-
-	test_must_fail git show-ref -d --verify heads/main >actual &&
-	test_must_be_empty actual &&
-
-	test_must_fail git show-ref --verify -d A C >actual &&
-	test_must_be_empty actual &&
-
-	test_must_fail git show-ref --verify -d tags/A tags/C >actual &&
-	test_must_be_empty actual
-
-
-fatal: 'main' - not a valid ref
-fatal: 'heads/main' - not a valid ref
-fatal: 'A' - not a valid ref
-fatal: 'tags/A' - not a valid ref
-ok 6 - show-ref -d
-
-expecting success of 1403.7 'show-ref --branches, --tags, --head, pattern': 
-	for branch in B main side
-	do
-		echo $(git rev-parse refs/heads/$branch) refs/heads/$branch || return 1
-	done >expect.branches &&
-	git show-ref --branches >actual &&
-	test_cmp expect.branches actual &&
-
-	for tag in A B C
-	do
-		echo $(git rev-parse refs/tags/$tag) refs/tags/$tag || return 1
-	done >expect.tags &&
-	git show-ref --tags >actual &&
-	test_cmp expect.tags actual &&
-
-	cat expect.branches expect.tags >expect &&
-	git show-ref --branches --tags >actual &&
-	test_cmp expect actual &&
-
-	{
-		echo $(git rev-parse HEAD) HEAD &&
-		cat expect.branches expect.tags
-	} >expect &&
-	git show-ref --branches --tags --head >actual &&
-	test_cmp expect actual &&
-
-	{
-		echo $(git rev-parse HEAD) HEAD &&
-		echo $(git rev-parse refs/heads/B) refs/heads/B &&
-		echo $(git rev-parse refs/tags/B) refs/tags/B
-	} >expect &&
-	git show-ref --head B >actual &&
-	test_cmp expect actual &&
-
-	{
-		echo $(git rev-parse HEAD) HEAD &&
-		echo $(git rev-parse refs/heads/B) refs/heads/B &&
-		echo $(git rev-parse refs/tags/B) refs/tags/B &&
-		echo $(git rev-parse refs/tags/B^0) "refs/tags/B^{}"
-	} >expect &&
-	git show-ref --head -d B >actual &&
-	test_cmp expect actual
-
-ok 7 - show-ref --branches, --tags, --head, pattern
-
-expecting success of 1403.8 'show-ref --heads is deprecated and hidden': 
-	test_expect_code 129 git show-ref -h >short-help &&
-	test_grep ! -e --heads short-help &&
-	git show-ref --heads >actual 2>warning &&
-	test_grep ! deprecated warning &&
-	test_cmp expect.branches actual
-
-ok 8 - show-ref --heads is deprecated and hidden
-
-expecting success of 1403.9 'show-ref --verify HEAD': 
-	echo $(git rev-parse HEAD) HEAD >expect &&
-	git show-ref --verify HEAD >actual &&
-	test_cmp expect actual &&
-
-	git show-ref --verify -q HEAD >actual &&
-	test_must_be_empty actual
-
-ok 9 - show-ref --verify HEAD
-
-expecting success of 1403.10 'show-ref --verify pseudorefs': 
-	git update-ref CHERRY_PICK_HEAD HEAD $ZERO_OID &&
-	test_when_finished "git update-ref -d CHERRY_PICK_HEAD" &&
-	git show-ref -s --verify HEAD >actual &&
-	git show-ref -s --verify CHERRY_PICK_HEAD >expect &&
-	test_cmp actual expect
-
-ok 10 - show-ref --verify pseudorefs
-
-expecting success of 1403.11 'show-ref --verify with dangling ref': 
-	sha1_file() {
-		echo "$*" | sed "s#..#.git/objects/&/#"
-	} &&
-
-	remove_object() {
-		file=$(sha1_file "$*") &&
-		test_path_is_file "$file" &&
-		rm -f "$file"
-	} &&
-
-	test_when_finished "rm -rf dangling" &&
-	(
-		git init dangling &&
-		cd dangling &&
-		test_commit dangling &&
-		sha=$(git rev-parse refs/tags/dangling) &&
-		remove_object $sha &&
-		test_must_fail git show-ref --verify refs/tags/dangling
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1403-show-ref/dangling/.git/
-[main (root-commit) 7b6c85a] dangling
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dangling.t
-fatal: git show-ref: bad ref refs/tags/dangling (7b6c85aed8ac906de9f4214d9c12b4d66316df20)
-ok 11 - show-ref --verify with dangling ref
-
-expecting success of 1403.12 'show-ref sub-modes are mutually exclusive': 
-	test_must_fail git show-ref --verify --exclude-existing 2>err &&
-	grep "verify" err &&
-	grep "exclude-existing" err &&
-	grep "cannot be used together" err &&
-
-	test_must_fail git show-ref --verify --exists 2>err &&
-	grep "verify" err &&
-	grep "exists" err &&
-	grep "cannot be used together" err &&
-
-	test_must_fail git show-ref --exclude-existing --exists 2>err &&
-	grep "exclude-existing" err &&
-	grep "exists" err &&
-	grep "cannot be used together" err
-
-fatal: options '--exclude-existing' and '--verify' cannot be used together
-fatal: options '--exclude-existing' and '--verify' cannot be used together
-fatal: options '--exclude-existing' and '--verify' cannot be used together
-fatal: options '--verify' and '--exists' cannot be used together
-fatal: options '--verify' and '--exists' cannot be used together
-fatal: options '--verify' and '--exists' cannot be used together
-fatal: options '--exclude-existing' and '--exists' cannot be used together
-fatal: options '--exclude-existing' and '--exists' cannot be used together
-fatal: options '--exclude-existing' and '--exists' cannot be used together
-ok 12 - show-ref sub-modes are mutually exclusive
-
-expecting success of 1403.13 '--exists with existing reference': 
-	git show-ref --exists refs/heads/$GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
-ok 13 - --exists with existing reference
-
-expecting success of 1403.14 '--exists with missing reference': 
-	test_expect_code 2 git show-ref --exists refs/heads/does-not-exist
-
-error: reference does not exist
-ok 14 - --exists with missing reference
-
-expecting success of 1403.15 '--exists does not use DWIM': 
-	test_expect_code 2 git show-ref --exists $GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME 2>err &&
-	grep "reference does not exist" err
-
-error: reference does not exist
-ok 15 - --exists does not use DWIM
-
-expecting success of 1403.16 '--exists with HEAD': 
-	git show-ref --exists HEAD
-
-ok 16 - --exists with HEAD
-
-expecting success of 1403.17 '--exists with bad reference name': 
-	test_when_finished "git update-ref -d refs/heads/bad...name" &&
-	new_oid=$(git rev-parse HEAD) &&
-	test-tool ref-store main update-ref msg refs/heads/bad...name $new_oid $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	git show-ref --exists refs/heads/bad...name
-
-ok 17 - --exists with bad reference name
-
-expecting success of 1403.18 '--exists with arbitrary symref': 
-	test_when_finished "git symbolic-ref -d refs/symref" &&
-	git symbolic-ref refs/symref refs/heads/$GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME &&
-	git show-ref --exists refs/symref
-
-ok 18 - --exists with arbitrary symref
-
-expecting success of 1403.19 '--exists with dangling symref': 
-	test_when_finished "git symbolic-ref -d refs/heads/dangling" &&
-	git symbolic-ref refs/heads/dangling refs/heads/does-not-exist &&
-	git show-ref --exists refs/heads/dangling
-
-ok 19 - --exists with dangling symref
-
-expecting success of 1403.20 '--exists with nonexistent object ID': 
-	test-tool ref-store main update-ref msg refs/heads/missing-oid $(test_oid 001) $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-	git show-ref --exists refs/heads/missing-oid
-
-ok 20 - --exists with nonexistent object ID
-
-expecting success of 1403.21 '--exists with non-commit object': 
-	tree_oid=$(git rev-parse HEAD^{tree}) &&
-	test-tool ref-store main update-ref msg refs/heads/tree ${tree_oid} $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-	git show-ref --exists refs/heads/tree
-
-ok 21 - --exists with non-commit object
-
-expecting success of 1403.22 '--exists with directory fails with generic error': 
-	cat >expect <<-EOF &&
-	error: reference does not exist
-	EOF
-	test_expect_code 2 git show-ref --exists refs/heads 2>err &&
-	test_cmp expect err
-
-ok 22 - --exists with directory fails with generic error
-
-expecting success of 1403.23 '--exists with non-existent special ref': 
-	test_expect_code 2 git show-ref --exists FETCH_HEAD
-
-error: reference does not exist
-ok 23 - --exists with non-existent special ref
-
-expecting success of 1403.24 '--exists with existing special ref': 
-	test_when_finished "rm .git/FETCH_HEAD" &&
-	git rev-parse HEAD >.git/FETCH_HEAD &&
-	git show-ref --exists FETCH_HEAD
-
-ok 24 - --exists with existing special ref
-
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1406-submodule-ref-store.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1406-submodule-ref-store/.git/
 expecting success of 1406.1 'setup': 
@@ -54441,125 +55377,192 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1409-avoid-packing-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1409-avoid-packing-refs/.git/
-expecting success of 1409.1 'setup': 
-	git commit --allow-empty -m "Commit A" &&
-	A=$(git rev-parse HEAD) &&
-	git commit --allow-empty -m "Commit B" &&
-	B=$(git rev-parse HEAD) &&
-	git commit --allow-empty -m "Commit C" &&
-	C=$(git rev-parse HEAD)
+*** t1411-reflog-show.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1411-reflog-show/.git/
+expecting success of 1411.1 'setup': 
+	echo content >file &&
+	git add file &&
+	test_tick &&
+	git commit -m one
 
-[master (root-commit) 8d09622] Commit A
- Author: A U Thor <author@example.com>
-[master 241b9d6] Commit B
- Author: A U Thor <author@example.com>
-[master 8d1dbac] Commit C
+[main (root-commit) e46513e] one
  Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
 ok 1 - setup
 
-expecting success of 1409.2 'do not create packed-refs file gratuitously': 
-	test_path_is_missing .git/packed-refs &&
-	git update-ref refs/heads/foo $A &&
-	test_path_is_missing .git/packed-refs &&
-	git update-ref refs/heads/foo $B &&
-	test_path_is_missing .git/packed-refs &&
-	git update-ref refs/heads/foo $C $B &&
-	test_path_is_missing .git/packed-refs &&
-	git update-ref -d refs/heads/foo &&
-	test_path_is_missing .git/packed-refs
+expecting success of 1411.2 'log -g shows reflog headers': 
+	git log -g -1 >tmp &&
+	grep ^Reflog <tmp >actual &&
+	test_cmp expect actual
 
-ok 2 - do not create packed-refs file gratuitously
+ok 2 - log -g shows reflog headers
 
-expecting success of 1409.3 'check that marking the packed-refs file works': 
-	git for-each-ref >expected &&
-	git pack-refs --all &&
-	mark_packed_refs &&
-	check_packed_refs_marked &&
-	git for-each-ref >actual &&
-	test_cmp expected actual &&
-	git pack-refs --all &&
-	! check_packed_refs_marked &&
-	git for-each-ref >actual2 &&
-	test_cmp expected actual2
+expecting success of 1411.3 'oneline reflog format': 
+	git log -g -1 --oneline >actual &&
+	test_cmp expect actual
 
-ok 3 - check that marking the packed-refs file works
+ok 3 - oneline reflog format
 
-expecting success of 1409.4 'leave packed-refs untouched on update of packed': 
-	git update-ref refs/heads/packed-update $A &&
-	git pack-refs --all &&
-	mark_packed_refs &&
-	git update-ref refs/heads/packed-update $B &&
-	check_packed_refs_marked
+expecting success of 1411.4 'reflog default format': 
+	git reflog -1 >actual &&
+	test_cmp expect actual
 
-ok 4 - leave packed-refs untouched on update of packed
+ok 4 - reflog default format
 
-expecting success of 1409.5 'leave packed-refs untouched on checked update of packed': 
-	git update-ref refs/heads/packed-checked-update $A &&
-	git pack-refs --all &&
-	mark_packed_refs &&
-	git update-ref refs/heads/packed-checked-update $B $A &&
-	check_packed_refs_marked
+expecting success of 1411.5 'override reflog default format': 
+	git reflog --format=short -1 >actual &&
+	test_cmp expect actual
 
-ok 5 - leave packed-refs untouched on checked update of packed
+ok 5 - override reflog default format
 
-expecting success of 1409.6 'leave packed-refs untouched on verify of packed': 
-	git update-ref refs/heads/packed-verify $A &&
-	git pack-refs --all &&
-	mark_packed_refs &&
-	echo "verify refs/heads/packed-verify $A" | git update-ref --stdin &&
-	check_packed_refs_marked
+expecting success of 1411.6 'using @{now} syntax shows reflog date (multiline)': 
+	git log -g -1 HEAD@{now} >tmp &&
+	grep ^Reflog <tmp >actual &&
+	test_cmp expect actual
 
-ok 6 - leave packed-refs untouched on verify of packed
+ok 6 - using @{now} syntax shows reflog date (multiline)
 
-expecting success of 1409.7 'touch packed-refs on delete of packed': 
-	git update-ref refs/heads/packed-delete $A &&
-	git pack-refs --all &&
-	mark_packed_refs &&
-	git update-ref -d refs/heads/packed-delete &&
-	! check_packed_refs_marked
+expecting success of 1411.7 'using @{now} syntax shows reflog date (oneline)': 
+	git log -g -1 --oneline HEAD@{now} >actual &&
+	test_cmp expect actual
 
-ok 7 - touch packed-refs on delete of packed
+ok 7 - using @{now} syntax shows reflog date (oneline)
 
-expecting success of 1409.8 'leave packed-refs untouched on update of loose': 
-	git pack-refs --all &&
-	git update-ref refs/heads/loose-update $A &&
-	mark_packed_refs &&
-	git update-ref refs/heads/loose-update $B &&
-	check_packed_refs_marked
+expecting success of 1411.8 'using @{now} syntax shows reflog date (format=%gd)': 
+	git log -g -1 --format=%gd HEAD@{now} >actual &&
+	test_cmp expect actual
 
-ok 8 - leave packed-refs untouched on update of loose
+ok 8 - using @{now} syntax shows reflog date (format=%gd)
 
-expecting success of 1409.9 'leave packed-refs untouched on checked update of loose': 
-	git pack-refs --all &&
-	git update-ref refs/heads/loose-checked-update $A &&
-	mark_packed_refs &&
-	git update-ref refs/heads/loose-checked-update $B $A &&
-	check_packed_refs_marked
+expecting success of 1411.9 'using --date= shows reflog date (multiline)': 
+	git log -g -1 --date=default >tmp &&
+	grep ^Reflog <tmp >actual &&
+	test_cmp expect actual
 
-ok 9 - leave packed-refs untouched on checked update of loose
+ok 9 - using --date= shows reflog date (multiline)
 
-expecting success of 1409.10 'leave packed-refs untouched on verify of loose': 
-	git pack-refs --all &&
-	git update-ref refs/heads/loose-verify $A &&
-	mark_packed_refs &&
-	echo "verify refs/heads/loose-verify $A" | git update-ref --stdin &&
-	check_packed_refs_marked
+expecting success of 1411.10 'using --date= shows reflog date (oneline)': 
+	git log -g -1 --oneline --date=default >actual &&
+	test_cmp expect actual
 
-ok 10 - leave packed-refs untouched on verify of loose
+ok 10 - using --date= shows reflog date (oneline)
 
-expecting success of 1409.11 'leave packed-refs untouched on delete of loose': 
-	git pack-refs --all &&
-	git update-ref refs/heads/loose-delete $A &&
-	mark_packed_refs &&
-	git update-ref -d refs/heads/loose-delete &&
-	check_packed_refs_marked
+expecting success of 1411.11 'using --date= shows reflog date (format=%gd)': 
+	git log -g -1 --format=%gd --date=raw >actual &&
+	test_cmp expect actual
 
-ok 11 - leave packed-refs untouched on delete of loose
+ok 11 - using --date= shows reflog date (format=%gd)
 
-# passed all 11 test(s)
-1..11
+expecting success of 1411.12 'log.date does not invoke "--date" magic (multiline)': 
+	test_config log.date raw &&
+	git log -g -1 >tmp &&
+	grep ^Reflog <tmp >actual &&
+	test_cmp expect actual
+
+ok 12 - log.date does not invoke "--date" magic (multiline)
+
+expecting success of 1411.13 'log.date does not invoke "--date" magic (oneline)': 
+	test_config log.date raw &&
+	git log -g -1 --oneline >actual &&
+	test_cmp expect actual
+
+ok 13 - log.date does not invoke "--date" magic (oneline)
+
+expecting success of 1411.14 'log.date does not invoke "--date" magic (format=%gd)': 
+	test_config log.date raw &&
+	git log -g -1 --format=%gd >actual &&
+	test_cmp expect actual
+
+ok 14 - log.date does not invoke "--date" magic (format=%gd)
+
+expecting success of 1411.15 '--date magic does not override explicit @{0} syntax': 
+	git log -g -1 --format=%gd --date=raw HEAD@{0} >actual &&
+	test_cmp expect actual
+
+ok 15 - --date magic does not override explicit @{0} syntax
+
+expecting success of 1411.16 'empty reflog file': 
+	git branch empty &&
+	git reflog expire --expire=all refs/heads/empty &&
+
+	git log -g empty >actual &&
+	test_must_be_empty actual
+
+ok 16 - empty reflog file
+
+expecting success of 1411.17 'git log -g -p shows diffs vs. parents': 
+	test_commit two &&
+	git branch flipflop &&
+	git update-ref refs/heads/flipflop -m flip1 HEAD^ &&
+	git update-ref refs/heads/flipflop -m flop1 HEAD &&
+	git update-ref refs/heads/flipflop -m flip2 HEAD^ &&
+	git log -g -p flipflop >reflog &&
+	grep -v ^Reflog reflog >actual &&
+	git log -1 -p HEAD^ >log.one &&
+	git log -1 -p HEAD >log.two &&
+	(
+		cat log.one && echo &&
+		cat log.two && echo &&
+		cat log.one && echo &&
+		cat log.two
+	) >expect &&
+	test_cmp expect actual
+
+[main fc3e0aa] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 17 - git log -g -p shows diffs vs. parents
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1412-reflog-loop.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1404-update-ref-errors.sh ***
@@ -54920,192 +55923,125 @@
 1..38
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1412-reflog-loop.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t1409-avoid-packing-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1409-avoid-packing-refs/.git/
+expecting success of 1409.1 'setup': 
+	git commit --allow-empty -m "Commit A" &&
+	A=$(git rev-parse HEAD) &&
+	git commit --allow-empty -m "Commit B" &&
+	B=$(git rev-parse HEAD) &&
+	git commit --allow-empty -m "Commit C" &&
+	C=$(git rev-parse HEAD)
 
-[master (root-commit) e46513e] one
+[master (root-commit) 8d09622] Commit A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 98995b2] two
+[master 241b9d6] Commit B
  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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1411-reflog-show.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1411-reflog-show/.git/
-expecting success of 1411.1 'setup': 
-	echo content >file &&
-	git add file &&
-	test_tick &&
-	git commit -m one
-
-[main (root-commit) e46513e] one
+[master 8d1dbac] Commit C
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
 ok 1 - setup
 
-expecting success of 1411.2 'log -g shows reflog headers': 
-	git log -g -1 >tmp &&
-	grep ^Reflog <tmp >actual &&
-	test_cmp expect actual
-
-ok 2 - log -g shows reflog headers
-
-expecting success of 1411.3 'oneline reflog format': 
-	git log -g -1 --oneline >actual &&
-	test_cmp expect actual
-
-ok 3 - oneline reflog format
-
-expecting success of 1411.4 'reflog default format': 
-	git reflog -1 >actual &&
-	test_cmp expect actual
-
-ok 4 - reflog default format
-
-expecting success of 1411.5 'override reflog default format': 
-	git reflog --format=short -1 >actual &&
-	test_cmp expect actual
-
-ok 5 - override reflog default format
-
-expecting success of 1411.6 'using @{now} syntax shows reflog date (multiline)': 
-	git log -g -1 HEAD@{now} >tmp &&
-	grep ^Reflog <tmp >actual &&
-	test_cmp expect actual
-
-ok 6 - using @{now} syntax shows reflog date (multiline)
-
-expecting success of 1411.7 'using @{now} syntax shows reflog date (oneline)': 
-	git log -g -1 --oneline HEAD@{now} >actual &&
-	test_cmp expect actual
-
-ok 7 - using @{now} syntax shows reflog date (oneline)
-
-expecting success of 1411.8 'using @{now} syntax shows reflog date (format=%gd)': 
-	git log -g -1 --format=%gd HEAD@{now} >actual &&
-	test_cmp expect actual
-
-ok 8 - using @{now} syntax shows reflog date (format=%gd)
+expecting success of 1409.2 'do not create packed-refs file gratuitously': 
+	test_path_is_missing .git/packed-refs &&
+	git update-ref refs/heads/foo $A &&
+	test_path_is_missing .git/packed-refs &&
+	git update-ref refs/heads/foo $B &&
+	test_path_is_missing .git/packed-refs &&
+	git update-ref refs/heads/foo $C $B &&
+	test_path_is_missing .git/packed-refs &&
+	git update-ref -d refs/heads/foo &&
+	test_path_is_missing .git/packed-refs
 
-expecting success of 1411.9 'using --date= shows reflog date (multiline)': 
-	git log -g -1 --date=default >tmp &&
-	grep ^Reflog <tmp >actual &&
-	test_cmp expect actual
+ok 2 - do not create packed-refs file gratuitously
 
-ok 9 - using --date= shows reflog date (multiline)
+expecting success of 1409.3 'check that marking the packed-refs file works': 
+	git for-each-ref >expected &&
+	git pack-refs --all &&
+	mark_packed_refs &&
+	check_packed_refs_marked &&
+	git for-each-ref >actual &&
+	test_cmp expected actual &&
+	git pack-refs --all &&
+	! check_packed_refs_marked &&
+	git for-each-ref >actual2 &&
+	test_cmp expected actual2
 
-expecting success of 1411.10 'using --date= shows reflog date (oneline)': 
-	git log -g -1 --oneline --date=default >actual &&
-	test_cmp expect actual
+ok 3 - check that marking the packed-refs file works
 
-ok 10 - using --date= shows reflog date (oneline)
+expecting success of 1409.4 'leave packed-refs untouched on update of packed': 
+	git update-ref refs/heads/packed-update $A &&
+	git pack-refs --all &&
+	mark_packed_refs &&
+	git update-ref refs/heads/packed-update $B &&
+	check_packed_refs_marked
 
-expecting success of 1411.11 'using --date= shows reflog date (format=%gd)': 
-	git log -g -1 --format=%gd --date=raw >actual &&
-	test_cmp expect actual
+ok 4 - leave packed-refs untouched on update of packed
 
-ok 11 - using --date= shows reflog date (format=%gd)
+expecting success of 1409.5 'leave packed-refs untouched on checked update of packed': 
+	git update-ref refs/heads/packed-checked-update $A &&
+	git pack-refs --all &&
+	mark_packed_refs &&
+	git update-ref refs/heads/packed-checked-update $B $A &&
+	check_packed_refs_marked
 
-expecting success of 1411.12 'log.date does not invoke "--date" magic (multiline)': 
-	test_config log.date raw &&
-	git log -g -1 >tmp &&
-	grep ^Reflog <tmp >actual &&
-	test_cmp expect actual
+ok 5 - leave packed-refs untouched on checked update of packed
 
-ok 12 - log.date does not invoke "--date" magic (multiline)
+expecting success of 1409.6 'leave packed-refs untouched on verify of packed': 
+	git update-ref refs/heads/packed-verify $A &&
+	git pack-refs --all &&
+	mark_packed_refs &&
+	echo "verify refs/heads/packed-verify $A" | git update-ref --stdin &&
+	check_packed_refs_marked
 
-expecting success of 1411.13 'log.date does not invoke "--date" magic (oneline)': 
-	test_config log.date raw &&
-	git log -g -1 --oneline >actual &&
-	test_cmp expect actual
+ok 6 - leave packed-refs untouched on verify of packed
 
-ok 13 - log.date does not invoke "--date" magic (oneline)
+expecting success of 1409.7 'touch packed-refs on delete of packed': 
+	git update-ref refs/heads/packed-delete $A &&
+	git pack-refs --all &&
+	mark_packed_refs &&
+	git update-ref -d refs/heads/packed-delete &&
+	! check_packed_refs_marked
 
-expecting success of 1411.14 'log.date does not invoke "--date" magic (format=%gd)': 
-	test_config log.date raw &&
-	git log -g -1 --format=%gd >actual &&
-	test_cmp expect actual
+ok 7 - touch packed-refs on delete of packed
 
-ok 14 - log.date does not invoke "--date" magic (format=%gd)
+expecting success of 1409.8 'leave packed-refs untouched on update of loose': 
+	git pack-refs --all &&
+	git update-ref refs/heads/loose-update $A &&
+	mark_packed_refs &&
+	git update-ref refs/heads/loose-update $B &&
+	check_packed_refs_marked
 
-expecting success of 1411.15 '--date magic does not override explicit @{0} syntax': 
-	git log -g -1 --format=%gd --date=raw HEAD@{0} >actual &&
-	test_cmp expect actual
+ok 8 - leave packed-refs untouched on update of loose
 
-ok 15 - --date magic does not override explicit @{0} syntax
+expecting success of 1409.9 'leave packed-refs untouched on checked update of loose': 
+	git pack-refs --all &&
+	git update-ref refs/heads/loose-checked-update $A &&
+	mark_packed_refs &&
+	git update-ref refs/heads/loose-checked-update $B $A &&
+	check_packed_refs_marked
 
-expecting success of 1411.16 'empty reflog file': 
-	git branch empty &&
-	git reflog expire --expire=all refs/heads/empty &&
+ok 9 - leave packed-refs untouched on checked update of loose
 
-	git log -g empty >actual &&
-	test_must_be_empty actual
+expecting success of 1409.10 'leave packed-refs untouched on verify of loose': 
+	git pack-refs --all &&
+	git update-ref refs/heads/loose-verify $A &&
+	mark_packed_refs &&
+	echo "verify refs/heads/loose-verify $A" | git update-ref --stdin &&
+	check_packed_refs_marked
 
-ok 16 - empty reflog file
+ok 10 - leave packed-refs untouched on verify of loose
 
-expecting success of 1411.17 'git log -g -p shows diffs vs. parents': 
-	test_commit two &&
-	git branch flipflop &&
-	git update-ref refs/heads/flipflop -m flip1 HEAD^ &&
-	git update-ref refs/heads/flipflop -m flop1 HEAD &&
-	git update-ref refs/heads/flipflop -m flip2 HEAD^ &&
-	git log -g -p flipflop >reflog &&
-	grep -v ^Reflog reflog >actual &&
-	git log -1 -p HEAD^ >log.one &&
-	git log -1 -p HEAD >log.two &&
-	(
-		cat log.one && echo &&
-		cat log.two && echo &&
-		cat log.one && echo &&
-		cat log.two
-	) >expect &&
-	test_cmp expect actual
+expecting success of 1409.11 'leave packed-refs untouched on delete of loose': 
+	git pack-refs --all &&
+	git update-ref refs/heads/loose-delete $A &&
+	mark_packed_refs &&
+	git update-ref -d refs/heads/loose-delete &&
+	check_packed_refs_marked
 
-[main fc3e0aa] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 17 - git log -g -p shows diffs vs. parents
+ok 11 - leave packed-refs untouched on delete of loose
 
-# passed all 17 test(s)
-1..17
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1006-cat-file.sh ***
@@ -56133,8 +57069,8 @@
 		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
 	test_cmp expect actual
     
---- expect	2025-08-27 08:20:00.279271532 +0000
-+++ actual	2025-08-27 08:20:00.287271585 +0000
+--- expect	2026-09-29 14:51:43.930548970 +0000
++++ actual	2026-09-29 14:51:43.938548970 +0000
 @@ -1 +1 @@
 -blob this is some extra content
 +c308ae01840d8e620ad554ee5d77fe114dc2d912:path missing
@@ -56216,8 +57152,8 @@
 		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
 	test_cmp expect actual
     
---- expect	2025-08-27 08:20:00.439272587 +0000
-+++ actual	2025-08-27 08:20:00.455272693 +0000
+--- expect	2026-09-29 14:51:44.046548970 +0000
++++ actual	2026-09-29 14:51:44.050548970 +0000
 @@ -1 +1 @@
 -blob this is some extra content
 +3625298bf5e7c464a7d0e38ea80c2a5b5904d9a3e5b2b025b67f360e09b68dc7:path missing
@@ -62082,57 +63018,6 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1418-reflog-exists.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1418-reflog-exists/.git/
-expecting success of 1418.1 'setup': 
-	test_commit A
-
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 1 - setup
-
-expecting success of 1418.2 'usage': 
-	test_expect_code 129 git reflog exists &&
-	test_expect_code 129 git reflog exists -h
-
-usage: git reflog exists <ref>
-
-usage: git reflog exists <ref>
-
-ok 2 - usage
-
-expecting success of 1418.3 'usage: unknown option': 
-	test_expect_code 129 git reflog exists --unknown-option
-
-error: unknown option `unknown-option'
-usage: git reflog exists <ref>
-
-ok 3 - usage: unknown option
-
-expecting success of 1418.4 'reflog exists works': 
-	git reflog exists refs/heads/main &&
-	test_must_fail git reflog exists refs/heads/nonexistent
-
-ok 4 - reflog exists works
-
-expecting success of 1418.5 'reflog exists works with a "--" delimiter': 
-	git reflog exists -- refs/heads/main &&
-	test_must_fail git reflog exists -- refs/heads/nonexistent
-
-ok 5 - reflog exists works with a "--" delimiter
-
-expecting success of 1418.6 'reflog exists works with a "--end-of-options" delimiter': 
-	git reflog exists --end-of-options refs/heads/main &&
-	test_must_fail git reflog exists --end-of-options refs/heads/nonexistent
-
-ok 6 - reflog exists works with a "--end-of-options" delimiter
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1416-ref-transaction-hooks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1416-ref-transaction-hooks/.git/
 expecting success of 1416.1 'setup': 
@@ -62370,6 +63255,57 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1418-reflog-exists.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1418-reflog-exists/.git/
+expecting success of 1418.1 'setup': 
+	test_commit A
+
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 1 - setup
+
+expecting success of 1418.2 'usage': 
+	test_expect_code 129 git reflog exists &&
+	test_expect_code 129 git reflog exists -h
+
+usage: git reflog exists <ref>
+
+usage: git reflog exists <ref>
+
+ok 2 - usage
+
+expecting success of 1418.3 'usage: unknown option': 
+	test_expect_code 129 git reflog exists --unknown-option
+
+error: unknown option `unknown-option'
+usage: git reflog exists <ref>
+
+ok 3 - usage: unknown option
+
+expecting success of 1418.4 'reflog exists works': 
+	git reflog exists refs/heads/main &&
+	test_must_fail git reflog exists refs/heads/nonexistent
+
+ok 4 - reflog exists works
+
+expecting success of 1418.5 'reflog exists works with a "--" delimiter': 
+	git reflog exists -- refs/heads/main &&
+	test_must_fail git reflog exists -- refs/heads/nonexistent
+
+ok 5 - reflog exists works with a "--" delimiter
+
+expecting success of 1418.6 'reflog exists works with a "--end-of-options" delimiter': 
+	git reflog exists --end-of-options refs/heads/main &&
+	test_must_fail git reflog exists --end-of-options refs/heads/nonexistent
+
+ok 6 - reflog exists works with a "--end-of-options" delimiter
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1415-worktree-refs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1415-worktree-refs/.git/
 expecting success of 1415.1 'setup': 
@@ -62580,4909 +63516,1433 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1419-exclude-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1419-exclude-refs/.git/
-expecting success of 1419.1 'setup': 
-	test_commit --no-tag base &&
-	base="$(git rev-parse HEAD)" &&
-
-	for name in foo bar baz quux
-	do
-		for i in 1 2 3
-		do
-			echo "create refs/heads/$name/$i $base" || return 1
-		done || return 1
-	done >in &&
-	for i in 5 6 7
-	do
-		echo "create refs/heads/bar/4/$i $base" || return 1
-	done >>in &&
-	echo "delete refs/heads/main" >>in &&
-
-	git update-ref --stdin <in &&
-	git pack-refs --all
-
-[main (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 1 - setup
+*** t0450-txt-doc-vs-help.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0450-txt-doc-vs-help/.git/
+expecting success of 0450.1 'setup: list of builtins': 
+	git --list-cmds=builtins >builtins
 
-expecting success of 1419.2 'excluded region in middle': 
-	for_each_ref__exclude refs/heads refs/heads/foo >actual 2>perf &&
-	for_each_ref refs/heads/bar refs/heads/baz refs/heads/quux >expect &&
+ok 1 - setup: list of builtins
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+expecting success of 0450.2 'list of adoc and help mismatches is sorted': 
+	sort -u "$TEST_DIRECTORY"/t0450/adoc-help-mismatches >expect &&
+	if ! test_cmp expect "$TEST_DIRECTORY"/t0450/adoc-help-mismatches
+	then
+		BUG "please keep the list of adoc and help mismatches sorted"
+	fi
 
-ok 2 - excluded region in middle
+ok 2 - list of adoc and help mismatches is sorted
 
-expecting success of 1419.3 'excluded region at beginning': 
-	for_each_ref__exclude refs/heads refs/heads/bar >actual 2>perf &&
-	for_each_ref refs/heads/baz refs/heads/foo refs/heads/quux >expect &&
+expecting success of 0450.3 'add -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 3 - add -h output has no \t
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+expecting success of 0450.4 'add -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 4 - add -h output has dashed labels
 
-ok 3 - excluded region at beginning
+expecting success of 0450.5 'add -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 5 - add -h output has consistent spacing
 
-expecting success of 1419.4 'excluded region at end': 
-	for_each_ref__exclude refs/heads refs/heads/quux >actual 2>perf &&
-	for_each_ref refs/heads/foo refs/heads/bar refs/heads/baz >expect &&
+expecting success of 0450.6 'add *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 6 - add *.adoc SYNOPSIS has dashed labels
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+checking known breakage of 0450.7 'add -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-ok 4 - excluded region at end
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
+	
+--- adoc	2026-09-29 14:51:38.622548970 +0000
++++ help	2026-09-29 14:51:38.634548970 +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]
+-        [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
+-        [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
+-        [--] [<pathspec>...]
++git add [<options>] [--] <pathspec>...
+not ok 7 - add -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1419.5 'disjoint excluded regions': 
-	for_each_ref__exclude refs/heads refs/heads/bar refs/heads/quux >actual 2>perf &&
-	for_each_ref refs/heads/baz refs/heads/foo >expect &&
+expecting success of 0450.8 'am -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 8 - am -h output has no \t
 
-	test_cmp expect actual &&
-	assert_jumps 2 perf
+expecting success of 0450.9 'am -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 9 - am -h output has dashed labels
 
-ok 5 - disjoint excluded regions
+expecting success of 0450.10 'am -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 10 - am -h output has consistent spacing
 
-expecting success of 1419.6 'adjacent, non-overlapping excluded regions': 
-	for_each_ref__exclude refs/heads refs/heads/bar refs/heads/baz >actual 2>perf &&
-	for_each_ref refs/heads/foo refs/heads/quux >expect &&
+expecting success of 0450.11 'am *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 11 - am *.adoc SYNOPSIS has dashed labels
 
-	test_cmp expect actual &&
-	case "$GIT_DEFAULT_REF_FORMAT" in
-	files)
-		assert_jumps 1 perf;;
-	reftable)
-		assert_jumps 2 perf;;
-	*)
-		BUG "unhandled ref format $GIT_DEFAULT_REF_FORMAT";;
-	esac
+checking known breakage of 0450.12 'am -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-ok 6 - adjacent, non-overlapping excluded regions
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
+	
+--- adoc	2026-09-29 14:51:38.702548970 +0000
++++ help	2026-09-29 14:51:38.710548970 +0000
+@@ -1,10 +1,2 @@
+-git am [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]
+-       [--[no-]3way] [--interactive] [--committer-date-is-author-date]
+-       [--ignore-date] [--ignore-space-change | --ignore-whitespace]
+-       [--whitespace=<action>] [-C<n>] [-p<n>] [--directory=<dir>]
+-       [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
+-       [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
+-       [--quoted-cr=<action>]
+-       [--empty=(stop|drop|keep)]
+-       [(<mbox> | <Maildir>)...]
+-git am (--continue | --skip | --abort | --quit | --retry | --show-current-patch[=(diff|raw)] | --allow-empty)
++git am [<options>] [(<mbox> | <Maildir>)...]
++git am [<options>] (--continue | --skip | --abort)
+not ok 12 - am -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1419.7 'non-directory excluded regions': 
-	for_each_ref__exclude refs/heads refs/heads/ba refs/heads/baz >actual 2>perf &&
-	for_each_ref refs/heads/bar refs/heads/foo refs/heads/quux >expect &&
+expecting success of 0450.13 'annotate -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 13 - annotate -h output has no \t
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+expecting success of 0450.14 'annotate -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 14 - annotate -h output has dashed labels
 
-ok 7 - non-directory excluded regions
+expecting success of 0450.15 'annotate -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 15 - annotate -h output has consistent spacing
 
-expecting success of 1419.8 'overlapping excluded regions': 
-	for_each_ref__exclude refs/heads refs/heads/bar refs/heads/bar/4 >actual 2>perf &&
-	for_each_ref refs/heads/baz refs/heads/foo refs/heads/quux >expect &&
+expecting success of 0450.16 'annotate *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 16 - annotate *.adoc SYNOPSIS has dashed labels
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+expecting success of 0450.17 'annotate -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-ok 8 - overlapping excluded regions
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
+	
+ok 17 - annotate -h output and SYNOPSIS agree
 
-expecting success of 1419.9 'several overlapping excluded regions': 
-	for_each_ref__exclude refs/heads \
-		refs/heads/bar refs/heads/baz refs/heads/foo >actual 2>perf &&
-	for_each_ref refs/heads/quux >expect &&
+expecting success of 0450.18 'apply -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 18 - apply -h output has no \t
 
-	test_cmp expect actual &&
-	case "$GIT_DEFAULT_REF_FORMAT" in
-	files)
-		assert_jumps 1 perf;;
-	reftable)
-		assert_jumps 3 perf;;
-	*)
-		BUG "unhandled ref format $GIT_DEFAULT_REF_FORMAT";;
-	esac
+expecting success of 0450.19 'apply -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 19 - apply -h output has dashed labels
 
-ok 9 - several overlapping excluded regions
+expecting success of 0450.20 'apply -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 20 - apply -h output has consistent spacing
 
-expecting success of 1419.10 'unordered excludes': 
-	for_each_ref__exclude refs/heads \
-		refs/heads/foo refs/heads/baz >actual 2>perf &&
-	for_each_ref refs/heads/bar refs/heads/quux >expect &&
+expecting success of 0450.21 'apply *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 21 - apply *.adoc SYNOPSIS has dashed labels
 
-	test_cmp expect actual &&
-	case "$GIT_DEFAULT_REF_FORMAT" in
-	files)
-		assert_jumps 1 perf;;
-	reftable)
-		assert_jumps 2 perf;;
-	*)
-		BUG "unhandled ref format $GIT_DEFAULT_REF_FORMAT";;
-	esac
+checking known breakage of 0450.22 'apply -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-ok 10 - unordered excludes
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
+	
+--- adoc	2026-09-29 14:51:38.858548970 +0000
++++ help	2026-09-29 14:51:38.866548970 +0000
+@@ -1,9 +1 @@
+-git apply [--stat] [--numstat] [--summary] [--check]
+-          [--index | --intent-to-add] [--3way] [--ours | --theirs | --union]
+-          [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
+-          [--allow-binary-replacement | --binary] [--reject] [-z]
+-          [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
+-          [--ignore-space-change | --ignore-whitespace]
+-          [--whitespace=(nowarn|warn|fix|error|error-all)]
+-          [--exclude=<path>] [--include=<path>] [--directory=<root>]
+-          [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]
++git apply [<options>] [<patch>...]
+not ok 22 - apply -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1419.11 'non-matching excluded section': 
-	for_each_ref__exclude refs/heads refs/heads/does/not/exist >actual 2>perf &&
-	for_each_ref >expect &&
+expecting success of 0450.23 'archive -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 23 - archive -h output has no \t
 
-	test_cmp expect actual &&
-	assert_no_jumps perf
+expecting success of 0450.24 'archive -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 24 - archive -h output has dashed labels
 
-ok 11 - non-matching excluded section
+expecting success of 0450.25 'archive -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 25 - archive -h output has consistent spacing
 
-expecting success of 1419.12 'meta-characters are discarded': 
-	for_each_ref__exclude refs/heads "refs/heads/ba*" >actual 2>perf &&
-	for_each_ref >expect &&
+expecting success of 0450.26 'archive *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 26 - archive *.adoc SYNOPSIS has dashed labels
 
-	test_cmp expect actual &&
-	assert_no_jumps perf
+checking known breakage of 0450.27 'archive -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-ok 12 - meta-characters are discarded
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
+	
+--- adoc	2026-09-29 14:51:38.934548970 +0000
++++ help	2026-09-29 14:51:38.946548970 +0000
+@@ -1,4 +1,4 @@
+-git archive [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
+-            [-o <file> | --output=<file>] [--worktree-attributes]
+-            [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
+-            [<path>...]
++git archive [<options>] <tree-ish> [<path>...]
++git archive --list
++git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]
++git archive --remote <repo> [--exec <cmd>] --list
+not ok 27 - archive -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1419.13 'empty string exclude pattern is ignored': 
-	git update-ref refs/heads/loose $(git rev-parse refs/heads/foo/1) &&
+expecting success of 0450.28 'backfill -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 28 - backfill -h output has no \t
 
-	for_each_ref__exclude refs/heads "" >actual 2>perf &&
-	for_each_ref >expect &&
+expecting success of 0450.29 'backfill -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 29 - backfill -h output has dashed labels
 
-	test_cmp expect actual &&
-	assert_no_jumps perf
+expecting success of 0450.30 'backfill -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 30 - backfill -h output has consistent spacing
 
-ok 13 - empty string exclude pattern is ignored
+expecting success of 0450.31 'backfill *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 31 - backfill *.adoc SYNOPSIS has dashed labels
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1417-reflog-updateref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1417-reflog-updateref/.git/
-expecting success of 1417.1 'setup': 
-	git init -b main repo &&
-	(
-		cd repo &&
+expecting success of 0450.32 'backfill -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-		test_commit A &&
-		test_commit B &&
-		test_commit C &&
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
+	
+ok 32 - backfill -h output and SYNOPSIS agree
 
-		git reflog HEAD >expect &&
-		git reset --hard HEAD~ &&
-		# Make sure that the reflog does not point to the same commit
-		# as HEAD.
-		git reflog delete HEAD@{0} &&
-		git reflog HEAD >actual &&
-		test_cmp expect actual
-	)
+expecting success of 0450.33 'bisect -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 33 - bisect -h output has no \t
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1417-reflog-updateref/repo/.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
-HEAD is now at d9df450 B
-ok 1 - setup
+expecting success of 0450.34 'bisect -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 34 - bisect -h output has dashed labels
 
-expecting success of 1417.2 'get 'B' with 'git reflog delete --updateref HEAD@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.35 'bisect -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 35 - bisect -h output has consistent spacing
 
-		(
-			cd copy &&
+expecting success of 0450.36 'bisect *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 36 - bisect *.adoc SYNOPSIS has dashed labels
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+checking known breakage of 0450.37 'bisect -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-			test_cmp expect actual
-		)
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
 	
-ok 2 - get 'B' with 'git reflog delete --updateref HEAD@{0}'
+--- adoc	2026-09-29 14:51:39.106548970 +0000
++++ help	2026-09-29 14:51:39.110548970 +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>...]
++git bisect (good|bad) [<rev>...]
++git bisect terms [--term-good | --term-bad]
++git bisect skip [(<rev>|<range>)...]
++git bisect next
++git bisect reset [<commit>]
++git bisect visualize
++git bisect replay <logfile>
++git bisect log
++git bisect run <cmd> [<arg>...]
+not ok 37 - bisect -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1417.3 'get 'B' with 'git reflog delete --updateref HEAD@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.38 'blame -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 38 - blame -h output has no \t
 
-		(
-			cd copy &&
+expecting success of 0450.39 'blame -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 39 - blame -h output has dashed labels
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.40 'blame -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 40 - blame -h output has consistent spacing
 
-			test_cmp expect actual
-		)
+expecting success of 0450.41 'blame *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
 	
-ok 3 - get 'B' with 'git reflog delete --updateref HEAD@{1}'
+ok 41 - blame *.adoc SYNOPSIS has dashed labels
 
-expecting success of 1417.4 'get 'C' with 'git reflog delete --updateref main@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+checking known breakage of 0450.42 'blame -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-		(
-			cd copy &&
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
+	
+--- adoc	2026-09-29 14:51:39.162548970 +0000
++++ help	2026-09-29 14:51:39.170548970 +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>]
+-          [--ignore-rev <rev>] [--ignore-revs-file <file>]
+-          [--color-lines] [--color-by-age] [--progress] [--abbrev=<n>]
+-          [ --contents <file> ] [<rev> | --reverse <rev>..<rev>] [--] <file>
++git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+not ok 42 - blame -h output and SYNOPSIS agree # TODO known breakage
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.43 'branch -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 43 - branch -h output has no \t
 
-			test_cmp expect actual
-		)
+expecting success of 0450.44 'branch -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 4 - get 'C' with 'git reflog delete --updateref main@{0}'
+ok 44 - branch -h output has dashed labels
 
-expecting success of 1417.5 'get 'B' with 'git reflog delete --updateref main@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.45 'branch -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 45 - branch -h output has consistent spacing
 
-		(
-			cd copy &&
+expecting success of 0450.46 'branch *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 46 - branch *.adoc SYNOPSIS has dashed labels
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+checking known breakage of 0450.47 'branch -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-			test_cmp expect actual
-		)
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
 	
-ok 5 - get 'B' with 'git reflog delete --updateref main@{1}'
+--- adoc	2026-09-29 14:51:39.266548970 +0000
++++ help	2026-09-29 14:51:39.274548970 +0000
+@@ -1,16 +1,8 @@
+-git branch [--color[=<when>] | --no-color] [--show-current]
+-           [-v [--abbrev=<n> | --no-abbrev]]
+-           [--column[=<options>] | --no-column] [--sort=<key>]
+-           [--merged [<commit>]] [--no-merged [<commit>]]
+-           [--contains [<commit>]] [--no-contains [<commit>]]
+-           [--points-at <object>] [--format=<format>]
+-           [(-r|--remotes) | (-a|--all)]
+-           [--list] [<pattern>...]
+-git branch [--track[=(direct|inherit)] | --no-track] [-f]
+-           [--recurse-submodules] <branch-name> [<start-point>]
+-git branch (--set-upstream-to=<upstream>|-u <upstream>) [<branch-name>]
+-git branch --unset-upstream [<branch-name>]
+-git branch (-m|-M) [<old-branch>] <new-branch>
+-git branch (-c|-C) [<old-branch>] <new-branch>
+-git branch (-d|-D) [-r] <branch-name>...
+-git branch --edit-description [<branch-name>]
++git branch [<options>] [-r | -a] [--merged] [--no-merged]
++git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
++git branch [<options>] [-l] [<pattern>...]
++git branch [<options>] [-r] (-d | -D) <branch-name>...
++git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
++git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
++git branch [<options>] [-r | -a] [--points-at]
++git branch [<options>] [-r | -a] [--format]
+not ok 47 - branch -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1417.6 'get 'B' with 'git reflog delete --updateref --rewrite HEAD@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.48 'bugreport -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 48 - bugreport -h output has no \t
 
-		(
-			cd copy &&
+expecting success of 0450.49 'bugreport -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 49 - bugreport -h output has dashed labels
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.50 'bugreport -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 50 - bugreport -h output has consistent spacing
 
-			test_cmp expect actual
-		)
+expecting success of 0450.51 'bugreport *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
 	
-ok 6 - get 'B' with 'git reflog delete --updateref --rewrite HEAD@{0}'
+ok 51 - bugreport *.adoc SYNOPSIS has dashed labels
 
-expecting success of 1417.7 'get 'B' with 'git reflog delete --updateref --rewrite HEAD@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.52 'bugreport -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-		(
-			cd copy &&
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
+	
+ok 52 - bugreport -h output and SYNOPSIS agree
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.53 'bundle -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 53 - bundle -h output has no \t
 
-			test_cmp expect actual
-		)
+expecting success of 0450.54 'bundle -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 7 - get 'B' with 'git reflog delete --updateref --rewrite HEAD@{1}'
+ok 54 - bundle -h output has dashed labels
 
-expecting success of 1417.8 'get 'C' with 'git reflog delete --updateref --rewrite main@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.55 'bundle -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 55 - bundle -h output has consistent spacing
 
-		(
-			cd copy &&
+expecting success of 0450.56 'bundle *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 56 - bundle *.adoc SYNOPSIS has dashed labels
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.57 'bundle -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-			test_cmp expect actual
-		)
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
 	
-ok 8 - get 'C' with 'git reflog delete --updateref --rewrite main@{0}'
+ok 57 - bundle -h output and SYNOPSIS agree
 
-expecting success of 1417.9 'get 'B' with 'git reflog delete --updateref --rewrite main@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.58 'cat-file -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 58 - cat-file -h output has no \t
 
-		(
-			cd copy &&
+expecting success of 0450.59 'cat-file -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 59 - cat-file -h output has dashed labels
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.60 'cat-file -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 60 - cat-file -h output has consistent spacing
 
-			test_cmp expect actual
-		)
+expecting success of 0450.61 'cat-file *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
 	
-ok 9 - get 'B' with 'git reflog delete --updateref --rewrite main@{1}'
+ok 61 - cat-file *.adoc SYNOPSIS has dashed labels
 
-expecting success of 1417.10 'get 'B' with 'test_must_fail git reflog expire HEAD@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.62 'cat-file -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-		(
-			cd copy &&
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
+	
+ok 62 - cat-file -h output and SYNOPSIS agree
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.63 'check-attr -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 63 - check-attr -h output has no \t
 
-			test_cmp expect actual
-		)
+expecting success of 0450.64 'check-attr -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-error: reflog could not be found: 'HEAD@{0}'
-ok 10 - get 'B' with 'test_must_fail git reflog expire HEAD@{0}'
+ok 64 - check-attr -h output has dashed labels
 
-expecting success of 1417.11 'get 'B' with 'test_must_fail git reflog expire HEAD@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.65 'check-attr -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 65 - check-attr -h output has consistent spacing
 
-		(
-			cd copy &&
+expecting success of 0450.66 'check-attr *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 66 - check-attr *.adoc SYNOPSIS has dashed labels
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.67 'check-attr -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-			test_cmp expect actual
-		)
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
 	
-error: reflog could not be found: 'HEAD@{1}'
-ok 11 - get 'B' with 'test_must_fail git reflog expire HEAD@{1}'
+ok 67 - check-attr -h output and SYNOPSIS agree
 
-expecting success of 1417.12 'get 'B' with 'test_must_fail git reflog expire main@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.68 'check-ignore -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 68 - check-ignore -h output has no \t
 
-		(
-			cd copy &&
+expecting success of 0450.69 'check-ignore -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 69 - check-ignore -h output has dashed labels
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.70 'check-ignore -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 70 - check-ignore -h output has consistent spacing
 
-			test_cmp expect actual
-		)
+expecting success of 0450.71 'check-ignore *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
 	
-error: reflog could not be found: 'main@{0}'
-ok 12 - get 'B' with 'test_must_fail git reflog expire main@{0}'
+ok 71 - check-ignore *.adoc SYNOPSIS has dashed labels
 
-expecting success of 1417.13 'get 'B' with 'test_must_fail git reflog expire main@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.72 'check-ignore -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-		(
-			cd copy &&
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
+	
+ok 72 - check-ignore -h output and SYNOPSIS agree
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.73 'check-mailmap -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 73 - check-mailmap -h output has no \t
 
-			test_cmp expect actual
-		)
+expecting success of 0450.74 'check-mailmap -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-error: reflog could not be found: 'main@{1}'
-ok 13 - get 'B' with 'test_must_fail git reflog expire main@{1}'
+ok 74 - check-mailmap -h output has dashed labels
 
-expecting success of 1417.14 'get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.75 'check-mailmap -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 75 - check-mailmap -h output has consistent spacing
 
-		(
-			cd copy &&
+expecting success of 0450.76 'check-mailmap *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 76 - check-mailmap *.adoc SYNOPSIS has dashed labels
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.77 'check-mailmap -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-			test_cmp expect actual
-		)
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
 	
-error: reflog could not be found: 'HEAD@{0}'
-ok 14 - get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{0}'
+ok 77 - check-mailmap -h output and SYNOPSIS agree
 
-expecting success of 1417.15 'get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.78 'check-ref-format -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 78 - check-ref-format -h output has no \t
 
-		(
-			cd copy &&
+expecting success of 0450.79 'check-ref-format -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 79 - check-ref-format -h output has dashed labels
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.80 'check-ref-format -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 80 - check-ref-format -h output has consistent spacing
 
-			test_cmp expect actual
-		)
+expecting success of 0450.81 'check-ref-format *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
 	
-error: reflog could not be found: 'HEAD@{1}'
-ok 15 - get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{1}'
+ok 81 - check-ref-format *.adoc SYNOPSIS has dashed labels
 
-expecting success of 1417.16 'get 'B' with 'test_must_fail git reflog expire --updateref main@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+checking known breakage of 0450.82 'check-ref-format -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-		(
-			cd copy &&
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
+	
+--- adoc	2026-09-29 14:51:39.778548970 +0000
++++ help	2026-09-29 14:51:39.790548970 +0000
+@@ -1,4 +1,2 @@
+-git check-ref-format [--normalize]
+-                     [--[no-]allow-onelevel] [--refspec-pattern]
+-                     <refname>
++git check-ref-format [--normalize] [<options>] <refname>
+ git check-ref-format --branch <branchname-shorthand>
+not ok 82 - check-ref-format -h output and SYNOPSIS agree # TODO known breakage
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.83 'checkout -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 83 - checkout -h output has no \t
 
-			test_cmp expect actual
-		)
+expecting success of 0450.84 'checkout -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-error: reflog could not be found: 'main@{0}'
-ok 16 - get 'B' with 'test_must_fail git reflog expire --updateref main@{0}'
+ok 84 - checkout -h output has dashed labels
 
-expecting success of 1417.17 'get 'B' with 'test_must_fail git reflog expire --updateref main@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.85 'checkout -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 85 - checkout -h output has consistent spacing
 
-		(
-			cd copy &&
+expecting success of 0450.86 'checkout *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 86 - checkout *.adoc SYNOPSIS has dashed labels
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+checking known breakage of 0450.87 'checkout -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-			test_cmp expect actual
-		)
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
 	
-error: reflog could not be found: 'main@{1}'
-ok 17 - get 'B' with 'test_must_fail git reflog expire --updateref main@{1}'
-
-expecting success of 1417.18 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+--- adoc	2026-09-29 14:51:39.854548970 +0000
++++ help	2026-09-29 14:51:39.862548970 +0000
+@@ -1,9 +1,2 @@
+-git checkout [-q] [-f] [-m] [<branch>]
+-git checkout [-q] [-f] [-m] --detach [<branch>]
+-git checkout [-q] [-f] [-m] [--detach] <commit>
+-git checkout [-q] [-f] [-m] [[-b|-B|--orphan] <new-branch>] [<start-point>]
+-git checkout [-f] <tree-ish> [--] <pathspec>...
+-git checkout [-f] <tree-ish> --pathspec-from-file=<file> [--pathspec-file-nul]
+-git checkout [-f|--ours|--theirs|-m|--conflict=<style>] [--] <pathspec>...
+-git checkout [-f|--ours|--theirs|-m|--conflict=<style>] --pathspec-from-file=<file> [--pathspec-file-nul]
+-git checkout (-p|--patch) [<tree-ish>] [--] [<pathspec>...]
++git checkout [<options>] <branch>
++git checkout [<options>] [<branch>] -- <file>...
+not ok 87 - checkout -h output and SYNOPSIS agree # TODO known breakage
 
-		(
-			cd copy &&
+expecting success of 0450.88 'checkout--worker -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 88 - checkout--worker -h output has no \t
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.89 'checkout--worker -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 89 - checkout--worker -h output has dashed labels
 
-			test_cmp expect actual
-		)
+expecting success of 0450.90 'checkout--worker -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-error: reflog could not be found: 'HEAD@{0}'
-ok 18 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{0}'
+ok 90 - checkout--worker -h output has consistent spacing
 
-expecting success of 1417.19 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+ok 91 # skip checkout--worker *.adoc SYNOPSIS has dashed labels (missing BUILTIN_ADOC_CHECKOUT__WORKER)
 
-		(
-			cd copy &&
+ok 92 # skip checkout--worker -h output and SYNOPSIS agree (missing BUILTIN_ADOC_CHECKOUT__WORKER)
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.93 'checkout-index -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 93 - checkout-index -h output has no \t
 
-			test_cmp expect actual
-		)
+expecting success of 0450.94 'checkout-index -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-error: reflog could not be found: 'HEAD@{1}'
-ok 19 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{1}'
+ok 94 - checkout-index -h output has dashed labels
 
-expecting success of 1417.20 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 0450.95 'checkout-index -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 95 - checkout-index -h output has consistent spacing
 
-		(
-			cd copy &&
+expecting success of 0450.96 'checkout-index *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 96 - checkout-index *.adoc SYNOPSIS has dashed labels
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+checking known breakage of 0450.97 'checkout-index -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-			test_cmp expect actual
-		)
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
 	
-error: reflog could not be found: 'main@{0}'
-ok 20 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{0}'
-
-expecting success of 1417.21 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+--- adoc	2026-09-29 14:51:39.974548970 +0000
++++ help	2026-09-29 14:51:39.982548970 +0000
+@@ -1,6 +1 @@
+-git checkout-index [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
+-                   [--stage=<number>|all]
+-                   [--temp]
+-                   [--ignore-skip-worktree-bits]
+-                   [-z] [--stdin]
+-                   [--] [<file>...]
++git checkout-index [<options>] [--] [<file>...]
+not ok 97 - checkout-index -h output and SYNOPSIS agree # TODO known breakage
 
-		(
-			cd copy &&
+expecting success of 0450.98 'cherry -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 98 - cherry -h output has no \t
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0450.99 'cherry -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 99 - cherry -h output has dashed labels
 
-			test_cmp expect actual
-		)
+expecting success of 0450.100 'cherry -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-error: reflog could not be found: 'main@{1}'
-ok 21 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{1}'
+ok 100 - cherry -h output has consistent spacing
 
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1451-fsck-buffer.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1451-fsck-buffer/.git/
-expecting success of 1451.1 'create valid objects': 
-	git commit --allow-empty -m foo &&
-	commit=$(git rev-parse --verify HEAD) &&
-	tree=$(git rev-parse --verify HEAD^{tree})
+expecting success of 0450.101 'cherry *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
+	
+ok 101 - cherry *.adoc SYNOPSIS has dashed labels
 
-[master (root-commit) 2093db0] foo
- Author: A U Thor <author@example.com>
-ok 1 - create valid objects
+expecting success of 0450.102 'cherry -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 1451.2 'reset input to empty': 
-		>base
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
 	
-ok 2 - reset input to empty
+ok 102 - cherry -h output and SYNOPSIS agree
 
-expecting success of 1451.3 'truncated commit (missingTree, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.103 'cherry-pick -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-error: object fails fsck: missingTree: invalid format - expected 'tree' line
-ok 3 - truncated commit (missingTree, "")
+ok 103 - cherry-pick -h output has no \t
 
-expecting success of 1451.4 'truncated commit (missingTree, "tr")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.104 'cherry-pick -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-error: object fails fsck: missingTree: invalid format - expected 'tree' line
-ok 4 - truncated commit (missingTree, "tr")
+ok 104 - cherry-pick -h output has dashed labels
 
-expecting success of 1451.5 'truncated commit (missingTree, "tree")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.105 'cherry-pick -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-error: object fails fsck: missingTree: invalid format - expected 'tree' line
-ok 5 - truncated commit (missingTree, "tree")
+ok 105 - cherry-pick -h output has consistent spacing
 
-expecting success of 1451.6 'truncated commit (badTreeSha1, "tree ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.106 'cherry-pick *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
 	
-error: object fails fsck: badTreeSha1: invalid 'tree' line format - bad sha1
-ok 6 - truncated commit (badTreeSha1, "tree ")
+ok 106 - cherry-pick *.adoc SYNOPSIS has dashed labels
 
-expecting success of 1451.7 'truncated commit (badTreeSha1, "tree 1234")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.107 'cherry-pick -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
 	
-error: object fails fsck: badTreeSha1: invalid 'tree' line format - bad sha1
-ok 7 - truncated commit (badTreeSha1, "tree 1234")
+ok 107 - cherry-pick -h output and SYNOPSIS agree
 
-expecting success of 1451.8 'add tree line': 
-		echo "$content" >>base
+expecting success of 0450.108 'clean -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 8 - add tree line
+ok 108 - clean -h output has no \t
 
-expecting success of 1451.9 'truncated commit (missingAuthor, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.109 'clean -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 9 - truncated commit (missingAuthor, "")
+ok 109 - clean -h output has dashed labels
 
-expecting success of 1451.10 'truncated commit (missingAuthor, "par")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.110 'clean -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 10 - truncated commit (missingAuthor, "par")
+ok 110 - clean -h output has consistent spacing
 
-expecting success of 1451.11 'truncated commit (missingAuthor, "parent")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.111 'clean *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 11 - truncated commit (missingAuthor, "parent")
+ok 111 - clean *.adoc SYNOPSIS has dashed labels
 
-expecting success of 1451.12 'truncated commit (badParentSha1, "parent ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.112 'clean -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
 	
-error: object fails fsck: badParentSha1: invalid 'parent' line format - bad sha1
-ok 12 - truncated commit (badParentSha1, "parent ")
+ok 112 - clean -h output and SYNOPSIS agree
 
-expecting success of 1451.13 'truncated commit (badParentSha1, "parent 1234")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.113 'clone -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-error: object fails fsck: badParentSha1: invalid 'parent' line format - bad sha1
-ok 13 - truncated commit (badParentSha1, "parent 1234")
+ok 113 - clone -h output has no \t
 
-expecting success of 1451.14 'add parent line': 
-		echo "$content" >>base
+expecting success of 0450.114 'clone -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 14 - add parent line
+ok 114 - clone -h output has dashed labels
 
-expecting success of 1451.15 'truncated commit (missingAuthor, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.115 'clone -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 15 - truncated commit (missingAuthor, "")
+ok 115 - clone -h output has consistent spacing
 
-expecting success of 1451.16 'truncated commit (missingAuthor, "au")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.116 'clone *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 16 - truncated commit (missingAuthor, "au")
+ok 116 - clone *.adoc SYNOPSIS has dashed labels
 
-expecting success of 1451.17 'truncated commit (missingAuthor, "author")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+checking known breakage of 0450.117 'clone -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 17 - truncated commit (missingAuthor, "author")
+--- adoc	2026-09-29 14:51:40.246548970 +0000
++++ help	2026-09-29 14:51:40.250548970 +0000
+@@ -1,9 +1 @@
+-git clone [--template=<template-directory>]
+-          [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
+-          [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
+-          [--dissociate] [--separate-git-dir <git-dir>]
+-          [--depth <depth>] [--[no-]single-branch] [--[no-]tags]
+-          [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
+-          [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]
+-          [--filter=<filter-spec>] [--also-filter-submodules]] [--] <repository>
+-          [<directory>]
++git clone [<options>] [--] <repo> [<dir>]
+not ok 117 - clone -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1451.18 'truncated commit (missingEmail, "author ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.118 'column -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 18 - truncated commit (missingEmail, "author ")
+ok 118 - column -h output has no \t
 
-expecting success of 1451.19 'truncated commit (missingEmail, "author name")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.119 'column -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 19 - truncated commit (missingEmail, "author name")
+ok 119 - column -h output has dashed labels
 
-expecting success of 1451.20 'truncated commit (badEmail, "author name <")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.120 'column -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 20 - truncated commit (badEmail, "author name <")
+ok 120 - column -h output has consistent spacing
 
-expecting success of 1451.21 'truncated commit (badEmail, "author name <email")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.121 'column *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
 	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 21 - truncated commit (badEmail, "author name <email")
+ok 121 - column *.adoc SYNOPSIS has dashed labels
 
-expecting success of 1451.22 'truncated commit (missingSpaceBeforeDate, "author name <email>")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+checking known breakage of 0450.122 'column -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
 	
-error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
-ok 22 - truncated commit (missingSpaceBeforeDate, "author name <email>")
+--- adoc	2026-09-29 14:51:40.310548970 +0000
++++ help	2026-09-29 14:51:40.318548970 +0000
+@@ -1,2 +1 @@
+-git column [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>]
+-           [--indent=<string>] [--nl=<string>] [--padding=<n>]
++git column [<options>]
+not ok 122 - column -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1451.23 'truncated commit (badDate, "author name <email> ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.123 'commit -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 23 - truncated commit (badDate, "author name <email> ")
+ok 123 - commit -h output has no \t
 
-expecting success of 1451.24 'truncated commit (badDate, "author name <email> 1234")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.124 'commit -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 24 - truncated commit (badDate, "author name <email> 1234")
+ok 124 - commit -h output has dashed labels
 
-expecting success of 1451.25 'truncated commit (badTimezone, "author name <email> 1234 ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.125 'commit -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 25 - truncated commit (badTimezone, "author name <email> 1234 ")
+ok 125 - commit -h output has consistent spacing
 
-expecting success of 1451.26 'truncated commit (badTimezone, "author name <email> 1234 +")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.126 'commit *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
 	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 26 - truncated commit (badTimezone, "author name <email> 1234 +")
+ok 126 - commit *.adoc SYNOPSIS has dashed labels
 
-expecting success of 1451.27 'add author line': 
-		echo "$content" >>base
+expecting success of 0450.127 'commit -h output and SYNOPSIS agree': 
+		t2s="$(adoc_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.adoc and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >adoc &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp adoc help
 	
-ok 27 - add author line
+ok 127 - commit -h output and SYNOPSIS agree
 
-expecting success of 1451.28 'truncated commit (missingCommitter, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.128 'commit-graph -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
-ok 28 - truncated commit (missingCommitter, "")
+ok 128 - commit-graph -h output has no \t
 
-expecting success of 1451.29 'truncated commit (missingCommitter, "co")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.129 'commit-graph -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
-ok 29 - truncated commit (missingCommitter, "co")
+ok 129 - commit-graph -h output has dashed labels
 
-expecting success of 1451.30 'truncated commit (missingCommitter, "committer")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.130 'commit-graph -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
-ok 30 - truncated commit (missingCommitter, "committer")
+ok 130 - commit-graph -h output has consistent spacing
 
-expecting success of 1451.31 'truncated commit (missingEmail, "committer ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 0450.131 'commit-graph *.adoc SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
 	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 31 - truncated commit (missingEmail, "committer ")
-
-expecting success of 1451.32 'truncated commit (missingEmail, "committer name")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 32 - truncated commit (missingEmail, "committer name")
-
-expecting success of 1451.33 'truncated commit (badEmail, "committer name <")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 33 - truncated commit (badEmail, "committer name <")
-
-expecting success of 1451.34 'truncated commit (badEmail, "committer name <email")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 34 - truncated commit (badEmail, "committer name <email")
-
-expecting success of 1451.35 'truncated commit (missingSpaceBeforeDate, "committer name <email>")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
-ok 35 - truncated commit (missingSpaceBeforeDate, "committer name <email>")
-
-expecting success of 1451.36 'truncated commit (badDate, "committer name <email> ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 36 - truncated commit (badDate, "committer name <email> ")
-
-expecting success of 1451.37 'truncated commit (badDate, "committer name <email> 1234")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 37 - truncated commit (badDate, "committer name <email> 1234")
-
-expecting success of 1451.38 'truncated commit (badTimezone, "committer name <email> 1234 ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 38 - truncated commit (badTimezone, "committer name <email> 1234 ")
-
-expecting success of 1451.39 'truncated commit (badTimezone, "committer name <email> 1234 +")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 39 - truncated commit (badTimezone, "committer name <email> 1234 +")
-
-expecting success of 1451.40 'add committer line': 
-		echo "$content" >>base
-	
-ok 40 - add committer line
-
-expecting success of 1451.41 'reset input to empty': 
-		>base
-	
-ok 41 - reset input to empty
-
-expecting success of 1451.42 'truncated tag (missingObject, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingObject: invalid format - expected 'object' line
-ok 42 - truncated tag (missingObject, "")
-
-expecting success of 1451.43 'truncated tag (missingObject, "obj")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingObject: invalid format - expected 'object' line
-ok 43 - truncated tag (missingObject, "obj")
-
-expecting success of 1451.44 'truncated tag (missingObject, "object")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingObject: invalid format - expected 'object' line
-ok 44 - truncated tag (missingObject, "object")
-
-expecting success of 1451.45 'truncated tag (badObjectSha1, "object ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badObjectSha1: invalid 'object' line format - bad sha1
-ok 45 - truncated tag (badObjectSha1, "object ")
-
-expecting success of 1451.46 'truncated tag (badObjectSha1, "object 1234")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badObjectSha1: invalid 'object' line format - bad sha1
-ok 46 - truncated tag (badObjectSha1, "object 1234")
-
-expecting success of 1451.47 'add object line': 
-		echo "$content" >>base
-	
-ok 47 - add object line
-
-expecting success of 1451.48 'truncated tag (missingType, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
-ok 48 - truncated tag (missingType, "")
-
-expecting success of 1451.49 'truncated tag (missingType, "ty")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
-ok 49 - truncated tag (missingType, "ty")
-
-expecting success of 1451.50 'truncated tag (missingType, "type")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
-ok 50 - truncated tag (missingType, "type")
-
-expecting success of 1451.51 'truncated tag (badType, "type ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badType: invalid 'type' value
-ok 51 - truncated tag (badType, "type ")
-
-expecting success of 1451.52 'truncated tag (badType, "type com")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badType: invalid 'type' value
-ok 52 - truncated tag (badType, "type com")
-
-expecting success of 1451.53 'add type line': 
-		echo "$content" >>base
-	
-ok 53 - add type line
-
-expecting success of 1451.54 'truncated tag (missingTagEntry, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
-ok 54 - truncated tag (missingTagEntry, "")
-
-expecting success of 1451.55 'truncated tag (missingTagEntry, "ta")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
-ok 55 - truncated tag (missingTagEntry, "ta")
-
-expecting success of 1451.56 'truncated tag (missingTagEntry, "tag")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
-ok 56 - truncated tag (missingTagEntry, "tag")
-
-expecting success of 1451.57 'truncated tag (badTagName, "tag ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTagName: invalid 'tag' name: 
-ok 57 - truncated tag (badTagName, "tag ")
-
-expecting success of 1451.58 'add tag line': 
-		echo "$content" >>base
-	
-ok 58 - add tag line
-
-expecting success of 1451.59 'truncated tag (missingTagger, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 59 - truncated tag (missingTagger, "")
-
-expecting success of 1451.60 'truncated tag (missingTagger, "ta")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 60 - truncated tag (missingTagger, "ta")
-
-expecting success of 1451.61 'truncated tag (missingTagger, "tagger")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 61 - truncated tag (missingTagger, "tagger")
-
-expecting success of 1451.62 'truncated tag (missingEmail, "tagger ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 62 - truncated tag (missingEmail, "tagger ")
-
-expecting success of 1451.63 'truncated tag (missingEmail, "tagger name")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 63 - truncated tag (missingEmail, "tagger name")
-
-expecting success of 1451.64 'truncated tag (badEmail, "tagger name <")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 64 - truncated tag (badEmail, "tagger name <")
-
-expecting success of 1451.65 'truncated tag (badEmail, "tagger name <email")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 65 - truncated tag (badEmail, "tagger name <email")
-
-expecting success of 1451.66 'truncated tag (missingSpaceBeforeDate, "tagger name <email>")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
-ok 66 - truncated tag (missingSpaceBeforeDate, "tagger name <email>")
-
-expecting success of 1451.67 'truncated tag (badDate, "tagger name <email> ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 67 - truncated tag (badDate, "tagger name <email> ")
-
-expecting success of 1451.68 'truncated tag (badDate, "tagger name <email> 1234")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 68 - truncated tag (badDate, "tagger name <email> 1234")
-
-expecting success of 1451.69 'truncated tag (badTimezone, "tagger name <email> 1234 ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 69 - truncated tag (badTimezone, "tagger name <email> 1234 ")
-
-expecting success of 1451.70 'truncated tag (badTimezone, "tagger name <email> 1234 +")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 70 - truncated tag (badTimezone, "tagger name <email> 1234 +")
-
-expecting success of 1451.71 'truncated tree (short hash)': 
-	printf "100644 foo\0\1\1\1\1" >input &&
-	test_must_fail git hash-object -t tree input 2>err &&
-	grep badTree err
-
-error: object fails fsck: badTree: cannot be parsed as a tree
-ok 71 - truncated tree (short hash)
-
-expecting success of 1451.72 'truncated tree (missing nul)': 
-	# these two things are indistinguishable to the parser. The important
-	# thing about this is example is that there are enough bytes to
-	# make up a hash, and that there is no NUL (and we confirm that the
-	# parser does not walk past the end of the buffer).
-	printf "100644 a long filename, or a hash with missing nul?" >input &&
-	test_must_fail git hash-object -t tree input 2>err &&
-	grep badTree err
-
-error: object fails fsck: badTree: cannot be parsed as a tree
-ok 72 - truncated tree (missing nul)
-
-# passed all 72 test(s)
-1..72
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1430-bad-ref-name.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1430-bad-ref-name/.git/
-expecting success of 1430.1 'setup': 
-	test_commit one &&
-	test_commit two &&
-	main_sha1=$(git rev-parse refs/heads/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
-ok 1 - setup
-
-expecting success of 1430.2 'fast-import: fail on invalid branch name ".badbranchname"': 
-	test_when_finished "rm -f .git/objects/pack_* .git/objects/index_*" &&
-	cat >input <<-INPUT_END &&
-		commit .badbranchname
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		corrupt
-		COMMIT
-
-		from refs/heads/main
-
-	INPUT_END
-	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_405673
-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"': 
-	test_when_finished "rm -f .git/objects/pack_* .git/objects/index_*" &&
-	cat >input <<-INPUT_END &&
-		commit bad[branch]name
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		corrupt
-		COMMIT
-
-		from refs/heads/main
-
-	INPUT_END
-	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_405741
-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': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git branch >output 2>error &&
-	test_grep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
-
-warning: ignoring ref with broken name refs/heads/broken...ref
-ok 4 - git branch shows badly named ref as warning
-
-expecting success of 1430.5 'branch -d can delete badly named ref': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git branch -d broken...ref &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
-
-Deleted branch broken...ref (was broken).
-ok 5 - branch -d can delete badly named ref
-
-expecting success of 1430.6 'branch -D can delete badly named ref': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git branch -D broken...ref &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
-
-Deleted branch broken...ref (was broken).
-ok 6 - branch -D can delete badly named ref
-
-expecting success of 1430.7 'branch -D cannot delete non-ref in .git dir': 
-	echo precious >.git/my-private-file &&
-	echo precious >expect &&
-	test_must_fail git branch -D ../../my-private-file &&
-	test_cmp expect .git/my-private-file
-
-error: branch '../../my-private-file' not found
-ok 7 - branch -D cannot delete non-ref in .git dir
-
-expecting success of 1430.8 'branch -D cannot delete ref in .git dir': 
-	git rev-parse HEAD >.git/my-private-file &&
-	git rev-parse HEAD >expect &&
-	git branch foo/legit &&
-	test_must_fail git branch -D foo////./././../../../my-private-file &&
-	test_cmp expect .git/my-private-file
-
-error: branch 'foo////./././../../../my-private-file' not found
-ok 8 - branch -D cannot delete ref in .git dir
-
-expecting success of 1430.9 'branch -D cannot delete absolute path': 
-	git branch -f extra &&
-	test_must_fail git branch -D "$(pwd)/.git/refs/heads/extra" &&
-	test_cmp_rev HEAD extra
-
-error: branch '/build/reproducible-path/git-2.51.0/t/trash directory.t1430-bad-ref-name/.git/refs/heads/extra' not found
-ok 9 - branch -D cannot delete absolute path
-
-expecting success of 1430.10 'git branch cannot create a badly named ref': 
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test_must_fail git branch broken...ref &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
-
-fatal: 'broken...ref' 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 cannot create a badly named ref
-
-expecting success of 1430.11 'branch -m cannot rename to a bad ref name': 
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test_might_fail git branch -D goodref &&
-	git branch goodref &&
-	test_must_fail git branch -m goodref broken...ref &&
-	test_cmp_rev main goodref &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
-
-error: branch 'goodref' not found
-fatal: 'broken...ref' 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 11 - branch -m cannot rename to a bad ref name
-
-checking known breakage of 1430.12 'branch -m can rename from a bad ref name': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git branch -m broken...ref renamed &&
-	test_cmp_rev main renamed &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
-
-fatal: invalid branch name: 'broken...ref'
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config set advice.refSyntax false"
-not ok 12 - branch -m can rename from a bad ref name # TODO known breakage
-
-expecting success of 1430.13 'push cannot create a badly named ref': 
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test_must_fail git push "file://$(pwd)" HEAD:refs/heads/broken...ref &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
-
-fatal: invalid refspec 'HEAD:refs/heads/broken...ref'
-ok 13 - push cannot create a badly named ref
-
-checking known breakage of 1430.14 'push --mirror can delete badly named ref': 
-	top=$(pwd) &&
-	git init src &&
-	git init dest &&
-
-	(
-		cd src &&
-		test_commit one
-	) &&
-	(
-		cd dest &&
-		test_commit two &&
-		git checkout --detach &&
-		test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION
-	) &&
-	git -C src push --mirror "file://$top/dest" &&
-	git -C dest branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1430-bad-ref-name/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1430-bad-ref-name/dest/.git/
-[main (root-commit) 4331c28] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main (root-commit) 9db02ea] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-HEAD is now at 9db02ea two
-fatal: update_ref failed for ref 'refs/heads/broken...ref': cannot update ref 'refs/heads/broken...ref': trying to write ref 'refs/heads/broken...ref' with nonexistent object 139b20d8e6c5b496de61f033f642d0e3dbff528d
-not ok 14 - push --mirror can delete badly named ref # TODO known breakage
-
-expecting success of 1430.15 'rev-parse skips symref pointing to broken name': 
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git branch shadow one &&
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test-tool ref-store main create-symref refs/tags/shadow refs/heads/broken...ref msg &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/tags/shadow" &&
-	git rev-parse --verify one >expect &&
-	git rev-parse --verify shadow >actual 2>err &&
-	test_cmp expect actual &&
-	test_grep "ignoring dangling symref refs/tags/shadow" err
-
-warning: ignoring dangling symref refs/tags/shadow
-ok 15 - rev-parse skips symref pointing to broken name
-
-expecting success of 1430.16 'for-each-ref emits warnings for broken names': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
-	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/main &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
-	git for-each-ref >output 2>error &&
-	! grep -e "broken\.\.\.ref" output &&
-	! grep -e "badname" output &&
-	! grep -e "broken\.\.\.symref" output &&
-	test_grep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
-	test_grep ! "ignoring broken ref refs/heads/badname" error &&
-	test_grep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error
-
-warning: ignoring ref with broken name refs/heads/broken...ref
-warning: ignoring ref with broken name refs/heads/broken...symref
-ok 16 - for-each-ref emits warnings for broken names
-
-expecting success of 1430.17 'update-ref -d can delete broken name': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git update-ref -d refs/heads/broken...ref >output 2>error &&
-	test_must_be_empty output &&
-	test_must_be_empty error &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
-
-ok 17 - update-ref -d can delete broken name
-
-expecting success of 1430.18 'branch -d can delete broken name': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git branch -d broken...ref >output 2>error &&
-	test_grep "Deleted branch broken...ref (was broken)" output &&
-	test_must_be_empty error &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
-
-Deleted branch broken...ref (was broken).
-ok 18 - branch -d can delete broken name
-
-expecting success of 1430.19 'update-ref --no-deref -d can delete symref to broken name': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
-	test_ref_exists refs/heads/badname &&
-	git update-ref --no-deref -d refs/heads/badname >output 2>error &&
-	test_ref_missing refs/heads/badname &&
-	test_must_be_empty output &&
-	test_must_be_empty error
-
-error: reference does not exist
-ok 19 - update-ref --no-deref -d can delete symref to broken name
-
-expecting success of 1430.20 'branch -d can delete symref to broken name': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
-	test_ref_exists refs/heads/badname &&
-	git branch -d badname >output 2>error &&
-	test_ref_missing refs/heads/badname &&
-	test_grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
-	test_must_be_empty error
-
-error: reference does not exist
-Deleted branch badname (was refs/heads/broken...ref).
-ok 20 - branch -d can delete symref to broken name
-
-expecting success of 1430.21 'update-ref --no-deref -d can delete dangling symref to broken name': 
-	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
-	test_ref_exists refs/heads/badname &&
-	git update-ref --no-deref -d refs/heads/badname >output 2>error &&
-	test_ref_missing refs/heads/badname &&
-	test_must_be_empty output &&
-	test_must_be_empty error
-
-error: reference does not exist
-ok 21 - update-ref --no-deref -d can delete dangling symref to broken name
-
-expecting success of 1430.22 'branch -d can delete dangling symref to broken name': 
-	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
-	test_ref_exists refs/heads/badname &&
-	git branch -d badname >output 2>error &&
-	test_ref_missing refs/heads/badname &&
-	test_grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
-	test_must_be_empty error
-
-error: reference does not exist
-Deleted branch badname (was refs/heads/broken...ref).
-ok 22 - branch -d can delete dangling symref to broken name
-
-expecting success of 1430.23 'update-ref -d can delete broken name through symref': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
-	test_ref_exists refs/heads/broken...ref &&
-	git update-ref -d refs/heads/badname >output 2>error &&
-	test_ref_missing refs/heads/broken...ref &&
-	test_must_be_empty output &&
-	test_must_be_empty error
-
-error: reference does not exist
-ok 23 - update-ref -d can delete broken name through symref
-
-expecting success of 1430.24 'update-ref --no-deref -d can delete symref with broken name': 
-	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/main &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
-	test_ref_exists refs/heads/broken...symref &&
-	git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
-	test_ref_missing refs/heads/broken...symref &&
-	test_must_be_empty output &&
-	test_must_be_empty error
-
-error: reference does not exist
-ok 24 - update-ref --no-deref -d can delete symref with broken name
-
-expecting success of 1430.25 'branch -d can delete symref with broken name': 
-	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/main &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
-	test_ref_exists refs/heads/broken...symref &&
-	git branch -d broken...symref >output 2>error &&
-	test_ref_missing refs/heads/broken...symref &&
-	test_grep "Deleted branch broken...symref (was refs/heads/main)" output &&
-	test_must_be_empty error
-
-error: reference does not exist
-Deleted branch broken...symref (was refs/heads/main).
-ok 25 - branch -d can delete symref with broken name
-
-expecting success of 1430.26 'update-ref --no-deref -d can delete dangling symref with broken name': 
-	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/idonotexist &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
-	test_ref_exists refs/heads/broken...symref &&
-	git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
-	test_ref_missing refs/heads/broken...symref &&
-	test_must_be_empty output &&
-	test_must_be_empty error
-
-error: reference does not exist
-ok 26 - update-ref --no-deref -d can delete dangling symref with broken name
-
-expecting success of 1430.27 'branch -d can delete dangling symref with broken name': 
-	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/idonotexist &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
-	test_ref_exists refs/heads/broken...symref &&
-	git branch -d broken...symref >output 2>error &&
-	test_ref_missing refs/heads/broken...symref &&
-	test_grep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&
-	test_must_be_empty error
-
-error: reference does not exist
-Deleted branch broken...symref (was refs/heads/idonotexist).
-ok 27 - branch -d can delete dangling symref with broken name
-
-expecting success of 1430.28 'update-ref -d cannot delete non-ref in .git dir': 
-	echo precious >.git/my-private-file &&
-	echo precious >expect &&
-	test_must_fail git update-ref -d my-private-file >output 2>error &&
-	test_must_be_empty output &&
-	test_grep -e "refusing to update ref with bad name" error &&
-	test_cmp expect .git/my-private-file
-
-error: refusing to update ref with bad name 'my-private-file'
-ok 28 - update-ref -d cannot delete non-ref in .git dir
-
-expecting success of 1430.29 'update-ref -d cannot delete absolute path': 
-	git branch -f extra &&
-	test_must_fail git update-ref -d "$(pwd)/.git/refs/heads/extra" &&
-	test_cmp_rev HEAD extra
-
-error: refusing to update ref with bad name '/build/reproducible-path/git-2.51.0/t/trash directory.t1430-bad-ref-name/.git/refs/heads/extra'
-ok 29 - update-ref -d cannot delete absolute path
-
-expecting success of 1430.30 'update-ref --stdin fails create with bad ref name': 
-	echo "create ~a refs/heads/main" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: invalid ref format: ~a" err
-
-fatal: invalid ref format: ~a
-ok 30 - update-ref --stdin fails create with bad ref name
-
-expecting success of 1430.31 'update-ref --stdin fails update with bad ref name': 
-	echo "update ~a refs/heads/main" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: invalid ref format: ~a" err
-
-fatal: invalid ref format: ~a
-ok 31 - update-ref --stdin fails update with bad ref name
-
-expecting success of 1430.32 'update-ref --stdin fails delete with bad ref name': 
-	echo "delete ~a refs/heads/main" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: invalid ref format: ~a" err
-
-fatal: invalid ref format: ~a
-ok 32 - update-ref --stdin fails delete with bad ref name
-
-expecting success of 1430.33 'update-ref --stdin -z fails create with bad ref name': 
-	printf "%s\0" "create ~a " refs/heads/main >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: invalid ref format: ~a " err
-
-fatal: invalid ref format: ~a 
-ok 33 - update-ref --stdin -z fails create with bad ref name
-
-expecting success of 1430.34 'update-ref --stdin -z fails update with bad ref name': 
-	printf "%s\0" "update ~a" refs/heads/main "" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: invalid ref format: ~a" err
-
-fatal: invalid ref format: ~a
-ok 34 - update-ref --stdin -z fails update with bad ref name
-
-expecting success of 1430.35 'update-ref --stdin -z fails delete with bad ref name': 
-	printf "%s\0" "delete ~a" refs/heads/main >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: invalid ref format: ~a" err
-
-fatal: invalid ref format: ~a
-ok 35 - update-ref --stdin -z fails delete with bad ref name
-
-expecting success of 1430.36 'branch rejects HEAD as a branch name': 
-	test_must_fail git branch HEAD HEAD^ &&
-	test_must_fail git show-ref refs/heads/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 36 - branch rejects HEAD as a branch name
-
-expecting success of 1430.37 'checkout -b rejects HEAD as a branch name': 
-	test_must_fail git checkout -B HEAD HEAD^ &&
-	test_must_fail git show-ref refs/heads/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 37 - checkout -b rejects HEAD as a branch name
-
-expecting success of 1430.38 'update-ref can operate on refs/heads/HEAD': 
-	git update-ref refs/heads/HEAD HEAD^ &&
-	git show-ref refs/heads/HEAD &&
-	git update-ref -d refs/heads/HEAD &&
-	test_must_fail git show-ref refs/heads/HEAD
-
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/HEAD
-ok 38 - update-ref can operate on refs/heads/HEAD
-
-expecting success of 1430.39 'branch -d can remove refs/heads/HEAD': 
-	git update-ref refs/heads/HEAD HEAD^ &&
-	git branch -d HEAD &&
-	test_must_fail git show-ref refs/heads/HEAD
-
-Deleted branch HEAD (was d79ce16).
-ok 39 - branch -d can remove refs/heads/HEAD
-
-expecting success of 1430.40 'branch -m can rename refs/heads/HEAD': 
-	git update-ref refs/heads/HEAD HEAD^ &&
-	git branch -m HEAD tail &&
-	test_must_fail git show-ref refs/heads/HEAD &&
-	git show-ref refs/heads/tail
-
-warning: renamed a misnamed branch 'HEAD' away
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/tail
-ok 40 - branch -m can rename refs/heads/HEAD
-
-expecting success of 1430.41 'branch -d can remove refs/heads/-dash': 
-	git update-ref refs/heads/-dash HEAD^ &&
-	git branch -d -- -dash &&
-	test_must_fail git show-ref refs/heads/-dash
-
-Deleted branch -dash (was d79ce16).
-ok 41 - branch -d can remove refs/heads/-dash
-
-expecting success of 1430.42 'branch -m can rename refs/heads/-dash': 
-	git update-ref refs/heads/-dash HEAD^ &&
-	git branch -m -- -dash dash &&
-	test_must_fail git show-ref refs/heads/-dash &&
-	git show-ref refs/heads/dash
-
-warning: renamed a misnamed branch '-dash' away
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/dash
-ok 42 - branch -m can rename refs/heads/-dash
-
-# still have 2 known breakage(s)
-# passed all remaining 40 test(s)
-1..42
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1410-reflog.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/.git/
-expecting success of 1410.1 'setup': 
-	mkdir -p A/B &&
-	echo rat >C &&
-	echo ox >A/D &&
-	echo tiger >A/B/E &&
-	git add . &&
-
-	test_tick && git commit -m rabbit &&
-	H=$(git rev-parse --verify HEAD) &&
-	A=$(git rev-parse --verify HEAD:A) &&
-	B=$(git rev-parse --verify HEAD:A/B) &&
-	C=$(git rev-parse --verify HEAD:C) &&
-	D=$(git rev-parse --verify HEAD:A/D) &&
-	E=$(git rev-parse --verify HEAD:A/B/E) &&
-	check_fsck &&
-
-	test_chmod +x C &&
-	git add C &&
-	test_tick && git commit -m dragon &&
-	L=$(git rev-parse --verify HEAD) &&
-	check_fsck &&
-
-	rm -f C A/B/E &&
-	echo snake >F &&
-	echo horse >A/G &&
-	git add F A/G &&
-	test_tick && git commit -a -m sheep &&
-	F=$(git rev-parse --verify HEAD:F) &&
-	G=$(git rev-parse --verify HEAD:A/G) &&
-	I=$(git rev-parse --verify HEAD:A) &&
-	J=$(git rev-parse --verify HEAD) &&
-	check_fsck &&
-
-	rm -f A/G &&
-	test_tick && git commit -a -m monkey &&
-	K=$(git rev-parse --verify HEAD) &&
-	check_fsck &&
-
-	check_have A B C D E F G H I J K L &&
-
-	git prune &&
-
-	check_have A B C D E F G H I J K L &&
-
-	check_fsck &&
-
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
-
-[main (root-commit) 07fcc4f] rabbit
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 A/B/E
- create mode 100644 A/D
- create mode 100644 C
-[main 7d1a0b8] dragon
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 C
-[main 15ab5f0] sheep
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+), 2 deletions(-)
- delete mode 100644 A/B/E
- create mode 100644 A/G
- delete mode 100755 C
- create mode 100644 F
-[main 3ac530f] monkey
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 A/G
-tree
-tree
-blob
-blob
-blob
-blob
-blob
-commit
-tree
-commit
-commit
-commit
-tree
-tree
-blob
-blob
-blob
-blob
-blob
-commit
-tree
-commit
-commit
-commit
-ok 1 - setup
-
-expecting success of 1410.2 'correct usage on sub-command -h': 
-	test_expect_code 129 git reflog expire -h >err &&
-	grep "git reflog expire" err
-
-usage: git reflog expire [--expire=<time>] [--expire-unreachable=<time>]
-ok 2 - correct usage on sub-command -h
-
-expecting success of 1410.3 'correct usage on "git reflog show -h"': 
-	test_expect_code 129 git reflog show -h >err &&
-	grep -F "git reflog [show]" err
-
-usage: git reflog [show] [<log-options>] [<ref>]
-ok 3 - correct usage on "git reflog show -h"
-
-expecting success of 1410.4 'pass through -- to sub-command': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo message --a-file contents dash-tag &&
-
-	git -C repo reflog show -- --does-not-exist >out &&
-	test_must_be_empty out &&
-	git -C repo reflog show >expect &&
-	git -C repo reflog show -- --a-file >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) 85b7e86] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 --a-file
-ok 4 - pass through -- to sub-command
-
-expecting success of 1410.5 'rewind': 
-	test_tick && git reset --hard HEAD~2 &&
-	test -f C &&
-	test -f A/B/E &&
-	! test -f F &&
-	! test -f A/G &&
-
-	check_have A B C D E F G H I J K L &&
-
-	git prune &&
-
-	check_have A B C D E F G H I J K L &&
-
-	git reflog refs/heads/main >output &&
-	test_line_count = 5 output
-
-HEAD is now at 7d1a0b8 dragon
-tree
-tree
-blob
-blob
-blob
-blob
-blob
-commit
-tree
-commit
-commit
-commit
-tree
-tree
-blob
-blob
-blob
-blob
-blob
-commit
-tree
-commit
-commit
-commit
-ok 5 - rewind
-
-expecting success of 1410.6 'reflog expire should not barf on an annotated tag': 
-	test_when_finished "git tag -d v0.tag || :" &&
-	git -c core.logAllRefUpdates=always \
-		tag -a -m "tag name" v0.tag main &&
-	git reflog expire --dry-run refs/tags/v0.tag 2>err &&
-	test_grep ! "error: [Oo]bject .* not a commit" err
-
-Deleted tag 'v0.tag' (was dec1896)
-ok 6 - reflog expire should not barf on an annotated tag
-
-expecting success of 1410.7 'corrupt and check': 
-
-	corrupt $F &&
-	check_fsck "missing blob $F"
-
-
-missing blob 9ae84adb2704cbd49549e52169b4043871e13432
-ok 7 - corrupt and check
-
-expecting success of 1410.8 'reflog expire --dry-run should not touch reflog': 
-
-	git reflog expire --dry-run \
-		--expire=$(($test_tick - 10000)) \
-		--expire-unreachable=$(($test_tick - 10000)) \
-		--stale-fix \
-		--all &&
-
-	git reflog refs/heads/main >output &&
-	test_line_count = 5 output &&
-
-	check_fsck "missing blob $F"
-
-missing blob 9ae84adb2704cbd49549e52169b4043871e13432
-ok 8 - reflog expire --dry-run should not touch reflog
-
-expecting success of 1410.9 'reflog expire': 
-
-	git reflog expire --verbose \
-		--expire=$(($test_tick - 10000)) \
-		--expire-unreachable=$(($test_tick - 10000)) \
-		--stale-fix \
-		--all &&
-
-	git reflog refs/heads/main >output &&
-	test_line_count = 2 output &&
-
-	check_fsck "dangling commit $K"
-
-Marking reachable objects...
-keep commit (initial): rabbit
-keep commit: dragon
-prune commit: sheep
-prune commit: monkey
-prune reset: moving to HEAD~2
-keep commit (initial): rabbit
-keep commit: dragon
-prune commit: sheep
-prune commit: monkey
-prune reset: moving to HEAD~2
-dangling commit 3ac530f2f6c3a45206a6b2d455baf89d1c8f672d
-ok 9 - reflog expire
-
-expecting success of 1410.10 '--stale-fix handles missing objects generously': 
-	git -c core.logAllRefUpdates=false fast-import --date-format=now <<-EOS &&
-	commit refs/heads/stale-fix
-	mark :1
-	committer Author <a@uth.or> now
-	data <<EOF
-	start stale fix
-	EOF
-	M 100644 inline file
-	data <<EOF
-	contents
-	EOF
-	commit refs/heads/stale-fix
-	committer Author <a@uth.or> now
-	data <<EOF
-	stale fix branch tip
-	EOF
-	from :1
-	EOS
-
-	parent_oid=$(git rev-parse stale-fix^) &&
-	test_when_finished "recover $parent_oid" &&
-	corrupt $parent_oid &&
-	git reflog expire --stale-fix
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            4 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 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 (         1 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
----------------------------------------------------------------------
-
-ok 10 - --stale-fix handles missing objects generously
-
-expecting success of 1410.11 'prune and fsck': 
-
-	git prune &&
-	check_fsck &&
-
-	check_have A B C D E H L &&
-	check_dont_have F G I J K
-
-
-tree
-tree
-blob
-blob
-blob
-commit
-commit
-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
-fatal: git cat-file: could not get object info
-fatal: git cat-file: could not get object info
-ok 11 - prune and fsck
-
-expecting success of 1410.12 'recover and check': 
-
-	recover $F &&
-	check_fsck "dangling blob $F"
-
-
-dangling blob 9ae84adb2704cbd49549e52169b4043871e13432
-ok 12 - recover and check
-
-expecting success of 1410.13 'delete': 
-	echo 1 > C &&
-	test_tick &&
-	git commit -m rat C &&
-
-	echo 2 > C &&
-	test_tick &&
-	git commit -m ox C &&
-
-	echo 3 > C &&
-	test_tick &&
-	git commit -m tiger C &&
-
-	HEAD_entry_count=$(git reflog | wc -l) &&
-	main_entry_count=$(git reflog show main | wc -l) &&
-
-	test $HEAD_entry_count = 5 &&
-	test $main_entry_count = 5 &&
-
-
-	git reflog delete main@{1} &&
-	git reflog show main > output &&
-	test_line_count = $(($main_entry_count - 1)) output &&
-	test $HEAD_entry_count = $(git reflog | wc -l) &&
-	! grep ox < output &&
-
-	main_entry_count=$(wc -l < output) &&
-
-	git reflog delete HEAD@{1} &&
-	test $(($HEAD_entry_count -1)) = $(git reflog | wc -l) &&
-	test $main_entry_count = $(git reflog show main | wc -l) &&
-
-	HEAD_entry_count=$(git reflog | wc -l) &&
-
-	git reflog delete main@{07.04.2005.15:15:00.-0700} &&
-	git reflog show main > output &&
-	test_line_count = $(($main_entry_count - 1)) output &&
-	! grep dragon < output
-
-
-[main f392752] rat
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 7e525ff] ox
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 3740c00] tiger
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 13 - delete
-
-expecting success of 1410.14 'rewind2': 
-
-	test_tick && git reset --hard HEAD~2 &&
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
-
-HEAD is now at f392752 rat
-ok 14 - rewind2
-
-expecting success of 1410.15 '--expire=never': 
-
-	git reflog expire --verbose \
-		--expire=never \
-		--expire-unreachable=never \
-		--all &&
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
-
-keep commit (initial): rabbit
-keep commit: dragon
-keep commit: rat
-keep commit: tiger
-keep reset: moving to HEAD~2
-keep commit (initial): rabbit
-keep commit: rat
-keep commit: tiger
-keep reset: moving to HEAD~2
-ok 15 - --expire=never
-
-expecting success of 1410.16 'gc.reflogexpire=never': 
-	test_config gc.reflogexpire never &&
-	test_config gc.reflogexpireunreachable never &&
-
-	git reflog expire --verbose --all >output &&
-	test_line_count = 9 output &&
-
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
-
-ok 16 - gc.reflogexpire=never
-
-expecting success of 1410.17 'gc.reflogexpire=false': 
-	test_config gc.reflogexpire false &&
-	test_config gc.reflogexpireunreachable false &&
-
-	git reflog expire --verbose --all &&
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
-
-
-keep commit (initial): rabbit
-keep commit: dragon
-keep commit: rat
-keep commit: tiger
-keep reset: moving to HEAD~2
-keep commit (initial): rabbit
-keep commit: rat
-keep commit: tiger
-keep reset: moving to HEAD~2
-ok 17 - gc.reflogexpire=false
-
-expecting success of 1410.18 'git reflog expire unknown reference': 
-	test_config gc.reflogexpire never &&
-	test_config gc.reflogexpireunreachable never &&
-
-	test_must_fail git reflog expire main@{123} 2>stderr &&
-	test_grep "error: reflog could not be found: ${SQ}main@{123}${SQ}" stderr &&
-	test_must_fail git reflog expire does-not-exist 2>stderr &&
-	test_grep "error: reflog could not be found: ${SQ}does-not-exist${SQ}" stderr
-
-error: reflog could not be found: 'main@{123}'
-error: reflog could not be found: 'does-not-exist'
-ok 18 - git reflog expire unknown reference
-
-expecting success of 1410.19 'checkout should not delete log for packed ref': 
-	test $(git reflog main | wc -l) = 4 &&
-	git branch foo &&
-	git pack-refs --all &&
-	git checkout foo &&
-	test $(git reflog main | wc -l) = 4
-
-Switched to branch 'foo'
-ok 19 - checkout should not delete log for packed ref
-
-expecting success of 1410.20 'stale dirs do not cause d/f conflicts (reflogs on)': 
-	test_when_finished "git branch -d one || git branch -d one/two" &&
-
-	git branch one/two main &&
-	echo "one/two@{0} branch: Created from main" >expect &&
-	git log -g --format="%gd %gs" one/two >actual &&
-	test_cmp expect actual &&
-	git branch -d one/two &&
-
-	# now logs/refs/heads/one is a stale directory, but
-	# we should move it out of the way to create "one" reflog
-	git branch one main &&
-	echo "one@{0} branch: Created from main" >expect &&
-	git log -g --format="%gd %gs" one >actual &&
-	test_cmp expect actual
-
-Deleted branch one/two (was f392752).
-Deleted branch one (was f392752).
-ok 20 - stale dirs do not cause d/f conflicts (reflogs on)
-
-expecting success of 1410.21 'stale dirs do not cause d/f conflicts (reflogs off)': 
-	test_when_finished "git branch -d one || git branch -d one/two" &&
-
-	git branch one/two main &&
-	echo "one/two@{0} branch: Created from main" >expect &&
-	git log -g --format="%gd %gs" one/two >actual &&
-	test_cmp expect actual &&
-	git branch -d one/two &&
-
-	# same as before, but we only create a reflog for "one" if
-	# it already exists, which it does not
-	git -c core.logallrefupdates=false branch one main &&
-	git log -g --format="%gd %gs" one >actual &&
-	test_must_be_empty actual
-
-Deleted branch one/two (was f392752).
-Deleted branch one (was f392752).
-ok 21 - stale dirs do not cause d/f conflicts (reflogs off)
-
-expecting success of 1410.22 'no segfaults for reflog containing non-commit sha1s': 
-	git update-ref --create-reflog -m "Creating ref" \
-		refs/tests/tree-in-reflog HEAD &&
-	git update-ref -m "Forcing tree" refs/tests/tree-in-reflog HEAD^{tree} &&
-	git update-ref -m "Restoring to commit" refs/tests/tree-in-reflog HEAD &&
-	git reflog refs/tests/tree-in-reflog
-
-f392752 refs/tests/tree-in-reflog@{0}: Restoring to commit
-f392752 refs/tests/tree-in-reflog@{2}: Creating ref
-ok 22 - no segfaults for reflog containing non-commit sha1s
-
-checking known breakage of 1410.23 'reflog with non-commit entries displays all entries': 
-	git reflog refs/tests/tree-in-reflog >actual &&
-	test_line_count = 3 actual
-
-test_line_count: line count for actual != 3
-f392752 refs/tests/tree-in-reflog@{0}: Restoring to commit
-f392752 refs/tests/tree-in-reflog@{2}: Creating ref
-not ok 23 - reflog with non-commit entries displays all entries # TODO known breakage
-
-expecting success of 1410.24 'continue walking past root commits': 
-	git init orphanage &&
-	(
-		cd orphanage &&
-		cat >expect <<-\EOF &&
-		HEAD@{0} commit (initial): orphan2-1
-		HEAD@{1} commit: orphan1-2
-		HEAD@{2} commit (initial): orphan1-1
-		HEAD@{3} commit (initial): initial
-		EOF
-		test_commit initial &&
-		git checkout --orphan orphan1 &&
-		test_commit orphan1-1 &&
-		test_commit orphan1-2 &&
-		git checkout --orphan orphan2 &&
-		test_commit orphan2-1 &&
-		git log -g --format="%gd %gs" >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/orphanage/.git/
-[main (root-commit) 3805046] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'orphan1'
-[orphan1 (root-commit) 5906753] orphan1-1
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 initial.t
- create mode 100644 orphan1-1.t
-[orphan1 4e641d7] orphan1-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 orphan1-2.t
-Switched to a new branch 'orphan2'
-[orphan2 (root-commit) 593a89b] orphan2-1
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 initial.t
- create mode 100644 orphan1-1.t
- create mode 100644 orphan1-2.t
- create mode 100644 orphan2-1.t
-ok 24 - continue walking past root commits
-
-expecting success of 1410.25 'expire with multiple worktrees': 
-	git init main-wt &&
-	(
-		cd main-wt &&
-		test_tick &&
-		test_commit foo &&
-		git  worktree add link-wt &&
-		test_tick &&
-		test_commit -C link-wt foobar &&
-		test_tick &&
-		git reflog expire --verbose --all --expire=$test_tick &&
-		test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD >actual &&
-		test_must_be_empty actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/main-wt/.git/
-[main (root-commit) 7745948] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Preparing worktree (new branch 'link-wt')
-HEAD is now at 7745948 foo
-[link-wt 25ae450] foobar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foobar.t
-prune commit (initial): foo
-prune branch: Created from HEAD
-prune commit: foobar
-prune commit (initial): foo
-prune 
-prune reset: moving to HEAD
-prune commit: foobar
-ok 25 - expire with multiple worktrees
-
-expecting success of 1410.26 'expire one of multiple worktrees': 
-	git init main-wt2 &&
-	(
-		cd main-wt2 &&
-		test_tick &&
-		test_commit foo &&
-		git worktree add link-wt &&
-		test_tick &&
-		test_commit -C link-wt foobar &&
-		test_tick &&
-		test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD \
-			>expect-link-wt &&
-		git reflog expire --verbose --all --expire=$test_tick \
-			--single-worktree &&
-		test-tool ref-store worktree:main for-each-reflog-ent HEAD \
-			>actual-main &&
-		test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD \
-			>actual-link-wt &&
-		test_must_be_empty actual-main &&
-		test_cmp expect-link-wt actual-link-wt
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/main-wt2/.git/
-[main (root-commit) 7745948] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Preparing worktree (new branch 'link-wt')
-HEAD is now at 7745948 foo
-[link-wt 25ae450] foobar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foobar.t
-prune commit (initial): foo
-prune branch: Created from HEAD
-prune commit: foobar
-prune commit (initial): foo
-ok 26 - expire one of multiple worktrees
-
-expecting success of 1410.27 'empty reflog': 
-	test_when_finished "rm -rf empty" &&
-	git init empty &&
-	test_commit -C empty A &&
-	test-tool ref-store main create-reflog 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.51.0/t/trash directory.t1410-reflog/empty/.git/
-[main (root-commit) d4404d5] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 27 - empty reflog
-
-expecting success of 1410.28 'list reflogs': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		git reflog list >actual &&
-		test_must_be_empty actual &&
-
-		test_commit A &&
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/main
-		EOF
-		git reflog list >actual &&
-		test_cmp expect actual &&
-
-		git branch b &&
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/b
-		refs/heads/main
-		EOF
-		git reflog list >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 28 - list reflogs
-
-expecting success of 1410.29 'list reflogs with worktree': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-
-		test_commit A &&
-		git worktree add wt &&
-		git -c core.logAllRefUpdates=always \
-			update-ref refs/worktree/main HEAD &&
-		git -c core.logAllRefUpdates=always \
-			update-ref refs/worktree/per-worktree HEAD &&
-		git -c core.logAllRefUpdates=always -C wt \
-			update-ref refs/worktree/per-worktree HEAD &&
-		git -c core.logAllRefUpdates=always -C wt \
-			update-ref refs/worktree/worktree HEAD &&
-
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/main
-		refs/heads/wt
-		refs/worktree/main
-		refs/worktree/per-worktree
-		EOF
-		git reflog list >actual &&
-		test_cmp expect actual &&
-
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/main
-		refs/heads/wt
-		refs/worktree/per-worktree
-		refs/worktree/worktree
-		EOF
-		git -C wt reflog list >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Preparing worktree (new branch 'wt')
-HEAD is now at fa70208 A
-ok 29 - list reflogs with worktree
-
-expecting success of 1410.30 'reflog list returns error with additional args': 
-	cat >expect <<-EOF &&
-	error: list does not accept arguments: ${SQ}bogus${SQ}
-	EOF
-	test_must_fail git reflog list bogus 2>err &&
-	test_cmp expect err
-
-ok 30 - reflog list returns error with additional args
-
-expecting success of 1410.31 'reflog for symref with unborn target can be listed': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		git symbolic-ref HEAD refs/heads/unborn &&
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/main
-		EOF
-		git reflog list >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 31 - reflog for symref with unborn target can be listed
-
-expecting success of 1410.32 'reflog with invalid object ID can be listed': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		test-tool ref-store main update-ref msg refs/heads/missing \
-			$(test_oid deadbeef) "$ZERO_OID" REF_SKIP_OID_VERIFICATION &&
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/main
-		refs/heads/missing
-		EOF
-		git reflog list >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 32 - reflog with invalid object ID can be listed
-
-expecting success of 1410.33 'reflog drop non-existent ref': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_must_fail git reflog exists refs/heads/non-existent &&
-		test_must_fail git reflog drop refs/heads/non-existent 2>stderr &&
-		test_grep "error: reflog could not be found: ${SQ}refs/heads/non-existent${SQ}" stderr
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
-error: reflog could not be found: 'refs/heads/non-existent'
-ok 33 - reflog drop non-existent ref
-
-expecting success of 1410.34 'reflog drop': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		test_commit_bulk --ref=refs/heads/branch 1 &&
-		git reflog exists refs/heads/main &&
-		git reflog exists refs/heads/branch &&
-		git reflog drop refs/heads/main &&
-		test_must_fail git reflog exists refs/heads/main &&
-		git reflog exists refs/heads/branch
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-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
----------------------------------------------------------------------
-
-ok 34 - reflog drop
-
-expecting success of 1410.35 'reflog drop multiple references': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		test_commit_bulk --ref=refs/heads/branch 1 &&
-		git reflog exists refs/heads/main &&
-		git reflog exists refs/heads/branch &&
-		git reflog drop refs/heads/main refs/heads/branch &&
-		test_must_fail git reflog exists refs/heads/main &&
-		test_must_fail git reflog exists refs/heads/branch
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-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
----------------------------------------------------------------------
-
-ok 35 - reflog drop multiple references
-
-expecting success of 1410.36 'reflog drop multiple references some non-existent': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		test_commit_bulk --ref=refs/heads/branch 1 &&
-		git reflog exists refs/heads/main &&
-		git reflog exists refs/heads/branch &&
-		test_must_fail git reflog exists refs/heads/non-existent &&
-		test_must_fail git reflog drop refs/heads/main refs/heads/non-existent refs/heads/branch 2>stderr &&
-		test_must_fail git reflog exists refs/heads/main &&
-		test_must_fail git reflog exists refs/heads/branch &&
-		test_must_fail git reflog exists refs/heads/non-existent &&
-		test_grep "error: reflog could not be found: ${SQ}refs/heads/non-existent${SQ}" stderr
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-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
----------------------------------------------------------------------
-
-error: reflog could not be found: 'refs/heads/non-existent'
-ok 36 - reflog drop multiple references some non-existent
-
-expecting success of 1410.37 'reflog drop --all': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		test_commit_bulk --ref=refs/heads/branch 1 &&
-		git reflog exists refs/heads/main &&
-		git reflog exists refs/heads/branch &&
-		git reflog drop --all &&
-		test_must_fail git reflog exists refs/heads/main &&
-		test_must_fail git reflog exists refs/heads/branch
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-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
----------------------------------------------------------------------
-
-ok 37 - reflog drop --all
-
-expecting success of 1410.38 'reflog drop --all multiple worktrees': 
-	test_when_finished "rm -rf repo" &&
-	test_when_finished "rm -rf wt" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		git worktree add ../wt &&
-		test_commit_bulk -C ../wt --ref=refs/heads/branch 1 &&
-		git reflog exists refs/heads/main &&
-		git reflog exists refs/heads/branch &&
-		git reflog drop --all &&
-		test_must_fail git reflog exists refs/heads/main &&
-		test_must_fail git reflog exists refs/heads/branch
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Preparing worktree (new branch 'wt')
-HEAD is now at fa70208 A
-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
----------------------------------------------------------------------
-
-ok 38 - reflog drop --all multiple worktrees
-
-expecting success of 1410.39 'reflog drop --all --single-worktree': 
-	test_when_finished "rm -rf repo" &&
-	test_when_finished "rm -rf wt" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		git worktree add ../wt &&
-		test_commit -C ../wt foobar &&
-		git reflog exists refs/heads/main &&
-		git reflog exists refs/heads/wt &&
-		test-tool ref-store worktree:wt reflog-exists HEAD &&
-		git reflog drop --all --single-worktree &&
-		test_must_fail git reflog exists refs/heads/main &&
-		test_must_fail git reflog exists refs/heads/wt &&
-		test_must_fail test-tool ref-store worktree:main reflog-exists HEAD &&
-		test-tool ref-store worktree:wt reflog-exists HEAD
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Preparing worktree (new branch 'wt')
-HEAD is now at fa70208 A
-[wt d79f02a] foobar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foobar.t
-ok 39 - reflog drop --all --single-worktree
-
-expecting success of 1410.40 'reflog drop --all with reference': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		test_must_fail git reflog drop --all refs/heads/main 2>stderr &&
-		test_grep "usage: references specified along with --all" stderr
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-usage: references specified along with --all
-ok 40 - reflog drop --all with reference
-
-expecting success of 1410.41 'expire with pattern config': 
-	# Split refs/heads/ into two roots so we can apply config to each. Make
-	# two branches per root to verify that config is applied correctly
-	# multiple times.
-	git branch root1/branch1 &&
-	git branch root1/branch2 &&
-	git branch root2/branch1 &&
-	git branch root2/branch2 &&
-
-	test_config "gc.reflogexpire" "never" &&
-	test_config "gc.refs/heads/root2/*.reflogExpire" "now" &&
-	git reflog expire \
-		root1/branch1 root1/branch2 \
-		root2/branch1 root2/branch2 &&
-
-	cat >expect <<-\EOF &&
-	root1/branch1@{0}
-	root1/branch2@{0}
-	EOF
-	git log -g --branches="root*" --format=%gD >actual.raw &&
-	# The sole reflog entry of each branch points to the same commit, so
-	# the order in which they are shown is nondeterministic. We just care
-	# about the what was expired (and what was not), so sort to get a known
-	# order.
-	sort <actual.raw >actual.sorted &&
-	test_cmp expect actual.sorted
-
-ok 41 - expire with pattern config
-
-# still have 1 known breakage(s)
-# passed all remaining 40 test(s)
-1..41
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1502-rev-parse-parseopt.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1502-rev-parse-parseopt/.git/
-expecting success of 1502.1 'setup optionspec': 
-	sed -e "s/^|//" >optionspec <<\EOF
-|some-command [options] <args>...
-|
-|some-command does foo and bar!
-|--
-|h,help!   show the help
-|
-|foo       some nifty option --foo
-|bar=      some cool option --bar with an argument
-|b,baz     a short and long option
-|
-| An option group Header
-|C?        option C with an optional argument
-|d,data?   short and long option with an optional argument
-|
-| Argument hints
-|B=arg     short option required argument
-|bar2=arg  long option required argument
-|e,fuz=with-space  short and long option required argument
-|s?some    short option optional argument
-|long?data long option optional argument
-|g,fluf?path     short and long option optional argument
-|longest=very-long-argument-hint  a very long argument hint
-|pair=key=value  with an equals sign in the hint
-|aswitch help te=t contains? fl*g characters!`
-|bswitch=hint	 hint has trailing tab character
-|cswitch	 switch has trailing tab character
-|short-hint=a    with a one symbol hint
-|
-|Extras
-|extra1    line above used to cause a segfault but no longer does
-EOF
-
-ok 1 - setup optionspec
-
-expecting success of 1502.2 'setup optionspec-no-switches': 
-	sed -e "s/^|//" >optionspec_no_switches <<\EOF
-|some-command [options] <args>...
-|
-|some-command does foo and bar!
-|--
-EOF
-
-ok 2 - setup optionspec-no-switches
-
-expecting success of 1502.3 'setup optionspec-only-hidden-switches': 
-	sed -e "s/^|//" >optionspec_only_hidden_switches <<\EOF
-|some-command [options] <args>...
-|
-|some-command does foo and bar!
-|--
-|hidden1* A hidden switch
-EOF
-
-ok 3 - setup optionspec-only-hidden-switches
-
-expecting success of 1502.4 'test --parseopt help output': 
-	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec &&
-	test_cmp "$TEST_DIRECTORY/t1502/optionspec.help" output
-
-ok 4 - test --parseopt help output
-
-expecting success of 1502.5 'test --parseopt help output no switches': 
-	sed -e "s/^|//" >expect <<\END_EXPECT &&
-|cat <<\EOF
-|usage: some-command [options] <args>...
-|
-|    some-command does foo and bar!
-|
-|EOF
-END_EXPECT
-	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_no_switches &&
-	test_cmp expect output
-
-ok 5 - test --parseopt help output no switches
-
-expecting success of 1502.6 'test --parseopt help output hidden switches': 
-	sed -e "s/^|//" >expect <<\END_EXPECT &&
-|cat <<\EOF
-|usage: some-command [options] <args>...
-|
-|    some-command does foo and bar!
-|
-|EOF
-END_EXPECT
-	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_only_hidden_switches &&
-	test_cmp expect output
-
-ok 6 - test --parseopt help output hidden switches
-
-expecting success of 1502.7 'test --parseopt help-all output hidden switches': 
-	sed -e "s/^|//" >expect <<\END_EXPECT &&
-|cat <<\EOF
-|usage: some-command [options] <args>...
-|
-|    some-command does foo and bar!
-|
-|    --[no-]hidden1        A hidden switch
-|
-|EOF
-END_EXPECT
-	test_expect_code 129 git rev-parse --parseopt -- --help-all > output < optionspec_only_hidden_switches &&
-	test_cmp expect output
-
-ok 7 - test --parseopt help-all output hidden switches
-
-expecting success of 1502.8 'test --parseopt invalid switch help output': 
-	{
-		cat <<-\EOF &&
-		error: unknown option `does-not-exist'
-		EOF
-		sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/optionspec.help"
-	} >expect &&
-	test_expect_code 129 git rev-parse --parseopt -- --does-not-exist 1>/dev/null 2>output < optionspec &&
-	test_cmp expect output
-
-ok 8 - test --parseopt invalid switch help output
-
-expecting success of 1502.9 'setup expect.1': 
-	cat > expect <<EOF
-set -- --foo --bar 'ham' -b --aswitch -- 'arg'
-EOF
-
-ok 9 - setup expect.1
-
-expecting success of 1502.10 'test --parseopt': 
-	git rev-parse --parseopt -- --foo --bar=ham --baz --aswitch arg < optionspec > output &&
-	test_cmp expect output
-
-ok 10 - test --parseopt
-
-expecting success of 1502.11 'test --parseopt with mixed options and arguments': 
-	git rev-parse --parseopt -- --foo arg --bar=ham --baz --aswitch < optionspec > output &&
-	test_cmp expect output
-
-ok 11 - test --parseopt with mixed options and arguments
-
-expecting success of 1502.12 'setup expect.2': 
-	cat > expect <<EOF
-set -- --foo -- 'arg' '--bar=ham'
-EOF
-
-ok 12 - setup expect.2
-
-expecting success of 1502.13 'test --parseopt with --': 
-	git rev-parse --parseopt -- --foo -- arg --bar=ham < optionspec > output &&
-	test_cmp expect output
-
-ok 13 - test --parseopt with --
-
-expecting success of 1502.14 'test --parseopt --stop-at-non-option': 
-	git rev-parse --parseopt --stop-at-non-option -- --foo arg --bar=ham < optionspec > output &&
-	test_cmp expect output
-
-ok 14 - test --parseopt --stop-at-non-option
-
-expecting success of 1502.15 'setup expect.3': 
-	cat > expect <<EOF
-set -- --foo -- '--' 'arg' '--bar=ham'
-EOF
-
-ok 15 - setup expect.3
-
-expecting success of 1502.16 'test --parseopt --keep-dashdash': 
-	git rev-parse --parseopt --keep-dashdash -- --foo -- arg --bar=ham < optionspec > output &&
-	test_cmp expect output
-
-ok 16 - test --parseopt --keep-dashdash
-
-expecting success of 1502.17 'setup expect.4': 
-	cat >expect <<EOF
-set -- --foo -- '--' 'arg' '--spam=ham'
-EOF
-
-ok 17 - setup expect.4
-
-expecting success of 1502.18 'test --parseopt --keep-dashdash --stop-at-non-option with --': 
-	git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo -- arg --spam=ham <optionspec >output &&
-	test_cmp expect output
-
-ok 18 - test --parseopt --keep-dashdash --stop-at-non-option with --
-
-expecting success of 1502.19 'setup expect.5': 
-	cat > expect <<EOF
-set -- --foo -- 'arg' '--spam=ham'
-EOF
-
-ok 19 - setup expect.5
-
-expecting success of 1502.20 'test --parseopt --keep-dashdash --stop-at-non-option without --': 
-	git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo arg --spam=ham <optionspec >output &&
-	test_cmp expect output
-
-ok 20 - test --parseopt --keep-dashdash --stop-at-non-option without --
-
-expecting success of 1502.21 'setup expect.6': 
-	cat > expect <<EOF
-set -- --foo --bar='z' --baz -C'Z' --data='A' -- 'arg'
-EOF
-
-ok 21 - setup expect.6
-
-expecting success of 1502.22 'test --parseopt --stuck-long': 
-	git rev-parse --parseopt --stuck-long -- --foo --bar=z -b arg -CZ -dA <optionspec >output &&
-	test_cmp expect output
-
-ok 22 - test --parseopt --stuck-long
-
-expecting success of 1502.23 'setup expect.7': 
-	cat > expect <<EOF
-set -- --data='' -C --baz -- 'arg'
-EOF
-
-ok 23 - setup expect.7
-
-expecting success of 1502.24 'test --parseopt --stuck-long and empty optional argument': 
-	git rev-parse --parseopt --stuck-long -- --data= arg -C -b <optionspec >output &&
-	test_cmp expect output
-
-ok 24 - test --parseopt --stuck-long and empty optional argument
-
-expecting success of 1502.25 'setup expect.8': 
-	cat > expect <<EOF
-set -- --data --baz -- 'arg'
-EOF
-
-ok 25 - setup expect.8
-
-expecting success of 1502.26 'test --parseopt --stuck-long and long option with unset optional argument': 
-	git rev-parse --parseopt --stuck-long -- --data arg -b <optionspec >output &&
-	test_cmp expect output
-
-ok 26 - test --parseopt --stuck-long and long option with unset optional argument
-
-expecting success of 1502.27 'test --parseopt --stuck-long and short option with unset optional argument': 
-	git rev-parse --parseopt --stuck-long -- -d arg -b <optionspec >output &&
-	test_cmp expect output
-
-ok 27 - test --parseopt --stuck-long and short option with unset optional argument
-
-expecting success of 1502.28 'test --parseopt help output: "wrapped" options normal "or:" lines': 
-	sed -e "s/^|//" >spec <<-\EOF &&
-	|cmd [--some-option]
-	|    [--another-option]
-	|cmd [--yet-another-option]
-	|--
-	|h,help!   show the help
-	EOF
-
-	sed -e "s/^|//" >expect <<-\END_EXPECT &&
-	|cat <<\EOF
-	|usage: cmd [--some-option]
-	|   or:     [--another-option]
-	|   or: cmd [--yet-another-option]
-	|
-	|    -h, --help            show the help
-	|
-	|EOF
-	END_EXPECT
-
-	test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
-	test_cmp expect actual
-
-ok 28 - test --parseopt help output: "wrapped" options normal "or:" lines
-
-expecting success of 1502.29 'test --parseopt invalid opt-spec': 
-	test_write_lines x -- "=, x" >spec &&
-	echo "fatal: missing opt-spec before option flags" >expect &&
-	test_must_fail git rev-parse --parseopt -- <spec 2>err &&
-	test_cmp expect err
-
-ok 29 - test --parseopt invalid opt-spec
-
-expecting success of 1502.30 'test --parseopt help output: multi-line blurb after empty line': 
-	sed -e "s/^|//" >spec <<-\EOF &&
-	|cmd [--some-option]
-	|    [--another-option]
-	|
-	|multi
-	|line
-	|blurb
-	|--
-	|h,help!   show the help
-	EOF
-
-	sed -e "s/^|//" >expect <<-\END_EXPECT &&
-	|cat <<\EOF
-	|usage: cmd [--some-option]
-	|   or:     [--another-option]
-	|
-	|    multi
-	|    line
-	|    blurb
-	|
-	|    -h, --help            show the help
-	|
-	|EOF
-	END_EXPECT
-
-	test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
-	test_cmp expect actual
-
-ok 30 - test --parseopt help output: multi-line blurb after empty line
-
-expecting success of 1502.31 'test --parseopt help output for optionspec-neg': 
-	test_expect_code 129 git rev-parse --parseopt -- \
-		-h >output <"$TEST_DIRECTORY/t1502/optionspec-neg" &&
-	test_cmp "$TEST_DIRECTORY/t1502/optionspec-neg.help" output
-
-ok 31 - test --parseopt help output for optionspec-neg
-
-expecting success of 1502.32 'test --parseopt valid options for optionspec-neg': 
-	cat >expect <<-\EOF &&
-	set -- --foo --no-foo --no-bar --positive-only --no-negative --
-	EOF
-	git rev-parse --parseopt -- <"$TEST_DIRECTORY/t1502/optionspec-neg" >output \
-	       --foo --no-foo --no-bar --positive-only --no-negative &&
-	test_cmp expect output
-
-ok 32 - test --parseopt valid options for optionspec-neg
-
-expecting success of 1502.33 'test --parseopt positivated option for optionspec-neg': 
-	cat >expect <<-\EOF &&
-	set -- --no-no-bar --no-no-bar --
-	EOF
-	git rev-parse --parseopt -- <"$TEST_DIRECTORY/t1502/optionspec-neg" >output \
-	       --no-no-bar --bar &&
-	test_cmp expect output
-
-ok 33 - test --parseopt positivated option for optionspec-neg
-
-expecting success of 1502.34 'test --parseopt invalid switch --no-positive-only help output for optionspec-neg': 
-		{
-			cat <<-\EOF &&
-			error: unknown option `no-positive-only'
-			EOF
-			sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/$spec.help"
-		} >expect &&
-		test_expect_code 129 git rev-parse --parseopt -- $opt \
-			2>output <"$TEST_DIRECTORY/t1502/$spec" &&
-		test_cmp expect output
-	
-ok 34 - test --parseopt invalid switch --no-positive-only help output for optionspec-neg
-
-expecting success of 1502.35 'test --parseopt invalid switch --negative help output for optionspec-neg': 
-		{
-			cat <<-\EOF &&
-			error: unknown option `negative'
-			EOF
-			sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/$spec.help"
-		} >expect &&
-		test_expect_code 129 git rev-parse --parseopt -- $opt \
-			2>output <"$TEST_DIRECTORY/t1502/$spec" &&
-		test_cmp expect output
-	
-ok 35 - test --parseopt invalid switch --negative help output for optionspec-neg
-
-expecting success of 1502.36 'test --parseopt invalid switch --no-no-negative help output for optionspec-neg': 
-		{
-			cat <<-\EOF &&
-			error: unknown option `no-no-negative'
-			EOF
-			sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/$spec.help"
-		} >expect &&
-		test_expect_code 129 git rev-parse --parseopt -- $opt \
-			2>output <"$TEST_DIRECTORY/t1502/$spec" &&
-		test_cmp expect output
-	
-ok 36 - test --parseopt invalid switch --no-no-negative help output for optionspec-neg
-
-expecting success of 1502.37 'ambiguous: --no matches both --noble and --no-noble': 
-	cat >spec <<-\EOF &&
-	some-command [options]
-	--
-	noble The feudal switch.
-	EOF
-	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	git rev-parse --parseopt -- <spec 2>err --no &&
-	grep "error: ambiguous option: no (could be --noble or --no-noble)" err
-
-cat <<\EOF
-usage: some-command [options]
-
-    --[no-]noble          The feudal switch.
-
-EOF
-error: ambiguous option: no (could be --noble or --no-noble)
-ok 37 - ambiguous: --no matches both --noble and --no-noble
-
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t0450-txt-doc-vs-help.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0450-txt-doc-vs-help/.git/
-expecting success of 0450.1 'setup: list of builtins': 
-	git --list-cmds=builtins >builtins
-
-ok 1 - setup: list of builtins
-
-expecting success of 0450.2 'list of adoc and help mismatches is sorted': 
-	sort -u "$TEST_DIRECTORY"/t0450/adoc-help-mismatches >expect &&
-	if ! test_cmp expect "$TEST_DIRECTORY"/t0450/adoc-help-mismatches
-	then
-		BUG "please keep the list of adoc and help mismatches sorted"
-	fi
-
-ok 2 - list of adoc and help mismatches is sorted
-
-expecting success of 0450.3 'add -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 3 - add -h output has no \t
-
-expecting success of 0450.4 'add -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 4 - add -h output has dashed labels
-
-expecting success of 0450.5 'add -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 5 - add -h output has consistent spacing
-
-expecting success of 0450.6 'add *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 6 - add *.adoc SYNOPSIS has dashed labels
-
-checking known breakage of 0450.7 'add -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
---- adoc	2025-08-27 08:19:53.775228638 +0000
-+++ help	2025-08-27 08:19:53.783228691 +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]
--        [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
--        [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
--        [--] [<pathspec>...]
-+git add [<options>] [--] <pathspec>...
-not ok 7 - add -h output and SYNOPSIS agree # TODO known breakage
-
-expecting success of 0450.8 'am -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 8 - am -h output has no \t
-
-expecting success of 0450.9 'am -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 9 - am -h output has dashed labels
-
-expecting success of 0450.10 'am -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 10 - am -h output has consistent spacing
-
-expecting success of 0450.11 'am *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 11 - am *.adoc SYNOPSIS has dashed labels
-
-checking known breakage of 0450.12 'am -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
---- adoc	2025-08-27 08:19:53.899229456 +0000
-+++ help	2025-08-27 08:19:53.907229509 +0000
-@@ -1,10 +1,2 @@
--git am [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]
--       [--[no-]3way] [--interactive] [--committer-date-is-author-date]
--       [--ignore-date] [--ignore-space-change | --ignore-whitespace]
--       [--whitespace=<action>] [-C<n>] [-p<n>] [--directory=<dir>]
--       [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
--       [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
--       [--quoted-cr=<action>]
--       [--empty=(stop|drop|keep)]
--       [(<mbox> | <Maildir>)...]
--git am (--continue | --skip | --abort | --quit | --retry | --show-current-patch[=(diff|raw)] | --allow-empty)
-+git am [<options>] [(<mbox> | <Maildir>)...]
-+git am [<options>] (--continue | --skip | --abort)
-not ok 12 - am -h output and SYNOPSIS agree # TODO known breakage
-
-expecting success of 0450.13 'annotate -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 13 - annotate -h output has no \t
-
-expecting success of 0450.14 'annotate -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 14 - annotate -h output has dashed labels
-
-expecting success of 0450.15 'annotate -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 15 - annotate -h output has consistent spacing
-
-expecting success of 0450.16 'annotate *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 16 - annotate *.adoc SYNOPSIS has dashed labels
-
-expecting success of 0450.17 'annotate -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
-ok 17 - annotate -h output and SYNOPSIS agree
-
-expecting success of 0450.18 'apply -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 18 - apply -h output has no \t
-
-expecting success of 0450.19 'apply -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 19 - apply -h output has dashed labels
-
-expecting success of 0450.20 'apply -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 20 - apply -h output has consistent spacing
-
-expecting success of 0450.21 'apply *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 21 - apply *.adoc SYNOPSIS has dashed labels
-
-checking known breakage of 0450.22 'apply -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
---- adoc	2025-08-27 08:19:54.147231092 +0000
-+++ help	2025-08-27 08:19:54.163231197 +0000
-@@ -1,9 +1 @@
--git apply [--stat] [--numstat] [--summary] [--check]
--          [--index | --intent-to-add] [--3way] [--ours | --theirs | --union]
--          [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
--          [--allow-binary-replacement | --binary] [--reject] [-z]
--          [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
--          [--ignore-space-change | --ignore-whitespace]
--          [--whitespace=(nowarn|warn|fix|error|error-all)]
--          [--exclude=<path>] [--include=<path>] [--directory=<root>]
--          [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]
-+git apply [<options>] [<patch>...]
-not ok 22 - apply -h output and SYNOPSIS agree # TODO known breakage
-
-expecting success of 0450.23 'archive -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 23 - archive -h output has no \t
-
-expecting success of 0450.24 'archive -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 24 - archive -h output has dashed labels
-
-expecting success of 0450.25 'archive -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 25 - archive -h output has consistent spacing
-
-expecting success of 0450.26 'archive *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 26 - archive *.adoc SYNOPSIS has dashed labels
-
-checking known breakage of 0450.27 'archive -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
---- adoc	2025-08-27 08:19:54.263231857 +0000
-+++ help	2025-08-27 08:19:54.271231909 +0000
-@@ -1,4 +1,4 @@
--git archive [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
--            [-o <file> | --output=<file>] [--worktree-attributes]
--            [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
--            [<path>...]
-+git archive [<options>] <tree-ish> [<path>...]
-+git archive --list
-+git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]
-+git archive --remote <repo> [--exec <cmd>] --list
-not ok 27 - archive -h output and SYNOPSIS agree # TODO known breakage
-
-expecting success of 0450.28 'backfill -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 28 - backfill -h output has no \t
-
-expecting success of 0450.29 'backfill -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 29 - backfill -h output has dashed labels
-
-expecting success of 0450.30 'backfill -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 30 - backfill -h output has consistent spacing
-
-expecting success of 0450.31 'backfill *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 31 - backfill *.adoc SYNOPSIS has dashed labels
-
-expecting success of 0450.32 'backfill -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
-ok 32 - backfill -h output and SYNOPSIS agree
-
-expecting success of 0450.33 'bisect -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 33 - bisect -h output has no \t
-
-expecting success of 0450.34 'bisect -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 34 - bisect -h output has dashed labels
-
-expecting success of 0450.35 'bisect -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 35 - bisect -h output has consistent spacing
-
-expecting success of 0450.36 'bisect *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 36 - bisect *.adoc SYNOPSIS has dashed labels
-
-checking known breakage of 0450.37 'bisect -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
---- adoc	2025-08-27 08:19:54.483233308 +0000
-+++ help	2025-08-27 08:19:54.499233413 +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>...]
-+git bisect (good|bad) [<rev>...]
-+git bisect terms [--term-good | --term-bad]
-+git bisect skip [(<rev>|<range>)...]
-+git bisect next
-+git bisect reset [<commit>]
-+git bisect visualize
-+git bisect replay <logfile>
-+git bisect log
-+git bisect run <cmd> [<arg>...]
-not ok 37 - bisect -h output and SYNOPSIS agree # TODO known breakage
-
-expecting success of 0450.38 'blame -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 38 - blame -h output has no \t
-
-expecting success of 0450.39 'blame -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 39 - blame -h output has dashed labels
-
-expecting success of 0450.40 'blame -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 40 - blame -h output has consistent spacing
-
-expecting success of 0450.41 'blame *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 41 - blame *.adoc SYNOPSIS has dashed labels
-
-checking known breakage of 0450.42 'blame -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
---- adoc	2025-08-27 08:19:54.599234073 +0000
-+++ help	2025-08-27 08:19:54.611234152 +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>]
--          [--ignore-rev <rev>] [--ignore-revs-file <file>]
--          [--color-lines] [--color-by-age] [--progress] [--abbrev=<n>]
--          [ --contents <file> ] [<rev> | --reverse <rev>..<rev>] [--] <file>
-+git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-not ok 42 - blame -h output and SYNOPSIS agree # TODO known breakage
-
-expecting success of 0450.43 'branch -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 43 - branch -h output has no \t
-
-expecting success of 0450.44 'branch -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 44 - branch -h output has dashed labels
-
-expecting success of 0450.45 'branch -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 45 - branch -h output has consistent spacing
-
-expecting success of 0450.46 'branch *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 46 - branch *.adoc SYNOPSIS has dashed labels
-
-checking known breakage of 0450.47 'branch -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
---- adoc	2025-08-27 08:19:54.727234917 +0000
-+++ help	2025-08-27 08:19:54.739234996 +0000
-@@ -1,16 +1,8 @@
--git branch [--color[=<when>] | --no-color] [--show-current]
--           [-v [--abbrev=<n> | --no-abbrev]]
--           [--column[=<options>] | --no-column] [--sort=<key>]
--           [--merged [<commit>]] [--no-merged [<commit>]]
--           [--contains [<commit>]] [--no-contains [<commit>]]
--           [--points-at <object>] [--format=<format>]
--           [(-r|--remotes) | (-a|--all)]
--           [--list] [<pattern>...]
--git branch [--track[=(direct|inherit)] | --no-track] [-f]
--           [--recurse-submodules] <branch-name> [<start-point>]
--git branch (--set-upstream-to=<upstream>|-u <upstream>) [<branch-name>]
--git branch --unset-upstream [<branch-name>]
--git branch (-m|-M) [<old-branch>] <new-branch>
--git branch (-c|-C) [<old-branch>] <new-branch>
--git branch (-d|-D) [-r] <branch-name>...
--git branch --edit-description [<branch-name>]
-+git branch [<options>] [-r | -a] [--merged] [--no-merged]
-+git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
-+git branch [<options>] [-l] [<pattern>...]
-+git branch [<options>] [-r] (-d | -D) <branch-name>...
-+git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
-+git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
-+git branch [<options>] [-r | -a] [--points-at]
-+git branch [<options>] [-r | -a] [--format]
-not ok 47 - branch -h output and SYNOPSIS agree # TODO known breakage
-
-expecting success of 0450.48 'bugreport -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 48 - bugreport -h output has no \t
-
-expecting success of 0450.49 'bugreport -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 49 - bugreport -h output has dashed labels
-
-expecting success of 0450.50 'bugreport -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 50 - bugreport -h output has consistent spacing
-
-expecting success of 0450.51 'bugreport *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 51 - bugreport *.adoc SYNOPSIS has dashed labels
-
-expecting success of 0450.52 'bugreport -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
-ok 52 - bugreport -h output and SYNOPSIS agree
-
-expecting success of 0450.53 'bundle -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 53 - bundle -h output has no \t
-
-expecting success of 0450.54 'bundle -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 54 - bundle -h output has dashed labels
-
-expecting success of 0450.55 'bundle -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 55 - bundle -h output has consistent spacing
-
-expecting success of 0450.56 'bundle *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 56 - bundle *.adoc SYNOPSIS has dashed labels
-
-expecting success of 0450.57 'bundle -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
-ok 57 - bundle -h output and SYNOPSIS agree
-
-expecting success of 0450.58 'cat-file -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 58 - cat-file -h output has no \t
-
-expecting success of 0450.59 'cat-file -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 59 - cat-file -h output has dashed labels
-
-expecting success of 0450.60 'cat-file -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 60 - cat-file -h output has consistent spacing
-
-expecting success of 0450.61 'cat-file *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 61 - cat-file *.adoc SYNOPSIS has dashed labels
-
-expecting success of 0450.62 'cat-file -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
-ok 62 - cat-file -h output and SYNOPSIS agree
-
-expecting success of 0450.63 'check-attr -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 63 - check-attr -h output has no \t
-
-expecting success of 0450.64 'check-attr -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 64 - check-attr -h output has dashed labels
-
-expecting success of 0450.65 'check-attr -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 65 - check-attr -h output has consistent spacing
-
-expecting success of 0450.66 'check-attr *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 66 - check-attr *.adoc SYNOPSIS has dashed labels
-
-expecting success of 0450.67 'check-attr -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
-ok 67 - check-attr -h output and SYNOPSIS agree
-
-expecting success of 0450.68 'check-ignore -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 68 - check-ignore -h output has no \t
-
-expecting success of 0450.69 'check-ignore -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 69 - check-ignore -h output has dashed labels
-
-expecting success of 0450.70 'check-ignore -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 70 - check-ignore -h output has consistent spacing
-
-expecting success of 0450.71 'check-ignore *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 71 - check-ignore *.adoc SYNOPSIS has dashed labels
-
-expecting success of 0450.72 'check-ignore -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
-ok 72 - check-ignore -h output and SYNOPSIS agree
-
-expecting success of 0450.73 'check-mailmap -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 73 - check-mailmap -h output has no \t
-
-expecting success of 0450.74 'check-mailmap -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 74 - check-mailmap -h output has dashed labels
-
-expecting success of 0450.75 'check-mailmap -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 75 - check-mailmap -h output has consistent spacing
-
-expecting success of 0450.76 'check-mailmap *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 76 - check-mailmap *.adoc SYNOPSIS has dashed labels
-
-expecting success of 0450.77 'check-mailmap -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
-ok 77 - check-mailmap -h output and SYNOPSIS agree
-
-expecting success of 0450.78 'check-ref-format -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 78 - check-ref-format -h output has no \t
-
-expecting success of 0450.79 'check-ref-format -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 79 - check-ref-format -h output has dashed labels
-
-expecting success of 0450.80 'check-ref-format -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 80 - check-ref-format -h output has consistent spacing
-
-expecting success of 0450.81 'check-ref-format *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 81 - check-ref-format *.adoc SYNOPSIS has dashed labels
-
-checking known breakage of 0450.82 'check-ref-format -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
---- adoc	2025-08-27 08:19:55.475239850 +0000
-+++ help	2025-08-27 08:19:55.487239929 +0000
-@@ -1,4 +1,2 @@
--git check-ref-format [--normalize]
--                     [--[no-]allow-onelevel] [--refspec-pattern]
--                     <refname>
-+git check-ref-format [--normalize] [<options>] <refname>
- git check-ref-format --branch <branchname-shorthand>
-not ok 82 - check-ref-format -h output and SYNOPSIS agree # TODO known breakage
-
-expecting success of 0450.83 'checkout -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 83 - checkout -h output has no \t
-
-expecting success of 0450.84 'checkout -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 84 - checkout -h output has dashed labels
-
-expecting success of 0450.85 'checkout -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 85 - checkout -h output has consistent spacing
-
-expecting success of 0450.86 'checkout *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 86 - checkout *.adoc SYNOPSIS has dashed labels
-
-checking known breakage of 0450.87 'checkout -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
---- adoc	2025-08-27 08:19:55.591240615 +0000
-+++ help	2025-08-27 08:19:55.611240747 +0000
-@@ -1,9 +1,2 @@
--git checkout [-q] [-f] [-m] [<branch>]
--git checkout [-q] [-f] [-m] --detach [<branch>]
--git checkout [-q] [-f] [-m] [--detach] <commit>
--git checkout [-q] [-f] [-m] [[-b|-B|--orphan] <new-branch>] [<start-point>]
--git checkout [-f] <tree-ish> [--] <pathspec>...
--git checkout [-f] <tree-ish> --pathspec-from-file=<file> [--pathspec-file-nul]
--git checkout [-f|--ours|--theirs|-m|--conflict=<style>] [--] <pathspec>...
--git checkout [-f|--ours|--theirs|-m|--conflict=<style>] --pathspec-from-file=<file> [--pathspec-file-nul]
--git checkout (-p|--patch) [<tree-ish>] [--] [<pathspec>...]
-+git checkout [<options>] <branch>
-+git checkout [<options>] [<branch>] -- <file>...
-not ok 87 - checkout -h output and SYNOPSIS agree # TODO known breakage
-
-expecting success of 0450.88 'checkout--worker -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 88 - checkout--worker -h output has no \t
-
-expecting success of 0450.89 'checkout--worker -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 89 - checkout--worker -h output has dashed labels
-
-expecting success of 0450.90 'checkout--worker -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 90 - checkout--worker -h output has consistent spacing
-
-ok 91 # skip checkout--worker *.adoc SYNOPSIS has dashed labels (missing BUILTIN_ADOC_CHECKOUT__WORKER)
-
-ok 92 # skip checkout--worker -h output and SYNOPSIS agree (missing BUILTIN_ADOC_CHECKOUT__WORKER)
-
-expecting success of 0450.93 'checkout-index -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 93 - checkout-index -h output has no \t
-
-expecting success of 0450.94 'checkout-index -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 94 - checkout-index -h output has dashed labels
-
-expecting success of 0450.95 'checkout-index -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 95 - checkout-index -h output has consistent spacing
-
-expecting success of 0450.96 'checkout-index *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 96 - checkout-index *.adoc SYNOPSIS has dashed labels
-
-checking known breakage of 0450.97 'checkout-index -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
---- adoc	2025-08-27 08:19:55.747241644 +0000
-+++ help	2025-08-27 08:19:55.759241723 +0000
-@@ -1,6 +1 @@
--git checkout-index [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
--                   [--stage=<number>|all]
--                   [--temp]
--                   [--ignore-skip-worktree-bits]
--                   [-z] [--stdin]
--                   [--] [<file>...]
-+git checkout-index [<options>] [--] [<file>...]
-not ok 97 - checkout-index -h output and SYNOPSIS agree # TODO known breakage
-
-expecting success of 0450.98 'cherry -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 98 - cherry -h output has no \t
-
-expecting success of 0450.99 'cherry -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 99 - cherry -h output has dashed labels
-
-expecting success of 0450.100 'cherry -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 100 - cherry -h output has consistent spacing
-
-expecting success of 0450.101 'cherry *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 101 - cherry *.adoc SYNOPSIS has dashed labels
-
-expecting success of 0450.102 'cherry -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
-ok 102 - cherry -h output and SYNOPSIS agree
-
-expecting success of 0450.103 'cherry-pick -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 103 - cherry-pick -h output has no \t
-
-expecting success of 0450.104 'cherry-pick -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 104 - cherry-pick -h output has dashed labels
-
-expecting success of 0450.105 'cherry-pick -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 105 - cherry-pick -h output has consistent spacing
-
-expecting success of 0450.106 'cherry-pick *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 106 - cherry-pick *.adoc SYNOPSIS has dashed labels
-
-expecting success of 0450.107 'cherry-pick -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
-ok 107 - cherry-pick -h output and SYNOPSIS agree
-
-expecting success of 0450.108 'clean -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 108 - clean -h output has no \t
-
-expecting success of 0450.109 'clean -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 109 - clean -h output has dashed labels
-
-expecting success of 0450.110 'clean -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 110 - clean -h output has consistent spacing
-
-expecting success of 0450.111 'clean *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 111 - clean *.adoc SYNOPSIS has dashed labels
-
-expecting success of 0450.112 'clean -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
-ok 112 - clean -h output and SYNOPSIS agree
-
-expecting success of 0450.113 'clone -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 113 - clone -h output has no \t
-
-expecting success of 0450.114 'clone -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 114 - clone -h output has dashed labels
-
-expecting success of 0450.115 'clone -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 115 - clone -h output has consistent spacing
-
-expecting success of 0450.116 'clone *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 116 - clone *.adoc SYNOPSIS has dashed labels
-
-checking known breakage of 0450.117 'clone -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
---- adoc	2025-08-27 08:19:56.111244044 +0000
-+++ help	2025-08-27 08:19:56.123244123 +0000
-@@ -1,9 +1 @@
--git clone [--template=<template-directory>]
--          [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
--          [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
--          [--dissociate] [--separate-git-dir <git-dir>]
--          [--depth <depth>] [--[no-]single-branch] [--[no-]tags]
--          [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
--          [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]
--          [--filter=<filter-spec>] [--also-filter-submodules]] [--] <repository>
--          [<directory>]
-+git clone [<options>] [--] <repo> [<dir>]
-not ok 117 - clone -h output and SYNOPSIS agree # TODO known breakage
-
-expecting success of 0450.118 'column -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 118 - column -h output has no \t
-
-expecting success of 0450.119 'column -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 119 - column -h output has dashed labels
-
-expecting success of 0450.120 'column -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 120 - column -h output has consistent spacing
-
-expecting success of 0450.121 'column *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 121 - column *.adoc SYNOPSIS has dashed labels
-
-checking known breakage of 0450.122 'column -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
---- adoc	2025-08-27 08:19:56.235244862 +0000
-+++ help	2025-08-27 08:19:56.251244967 +0000
-@@ -1,2 +1 @@
--git column [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>]
--           [--indent=<string>] [--nl=<string>] [--padding=<n>]
-+git column [<options>]
-not ok 122 - column -h output and SYNOPSIS agree # TODO known breakage
-
-expecting success of 0450.123 'commit -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 123 - commit -h output has no \t
-
-expecting success of 0450.124 'commit -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 124 - commit -h output has dashed labels
-
-expecting success of 0450.125 'commit -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 125 - commit -h output has consistent spacing
-
-expecting success of 0450.126 'commit *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 126 - commit *.adoc SYNOPSIS has dashed labels
-
-expecting success of 0450.127 'commit -h output and SYNOPSIS agree': 
-		t2s="$(adoc_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.adoc and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >adoc &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp adoc help
-	
-ok 127 - commit -h output and SYNOPSIS agree
-
-expecting success of 0450.128 'commit-graph -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 128 - commit-graph -h output has no \t
-
-expecting success of 0450.129 'commit-graph -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 129 - commit-graph -h output has dashed labels
-
-expecting success of 0450.130 'commit-graph -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 130 - commit-graph -h output has consistent spacing
-
-expecting success of 0450.131 'commit-graph *.adoc SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(adoc_to_synopsis "$builtin")"
-	
-ok 131 - commit-graph *.adoc SYNOPSIS has dashed labels
+ok 131 - commit-graph *.adoc SYNOPSIS has dashed labels
 
 expecting success of 0450.132 'commit-graph -h output and SYNOPSIS agree': 
 		t2s="$(adoc_to_synopsis "$builtin")" &&
@@ -67700,8 +65160,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:19:57.003249927 +0000
-+++ help	2025-08-27 08:19:57.015250006 +0000
+--- adoc	2026-09-29 14:51:40.698548970 +0000
++++ help	2026-09-29 14:51:40.710548970 +0000
 @@ -0,0 +1 @@
 +git credential (fill|approve|reject)
 not ok 152 - credential -h output and SYNOPSIS agree # TODO known breakage
@@ -67754,8 +65214,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:19:57.103250586 +0000
-+++ help	2025-08-27 08:19:57.115250666 +0000
+--- adoc	2026-09-29 14:51:40.766548970 +0000
++++ help	2026-09-29 14:51:40.778548970 +0000
 @@ -0,0 +1 @@
 +git credential-cache [<options>] <action>
 not ok 157 - credential-cache -h output and SYNOPSIS agree # TODO known breakage
@@ -67858,8 +65318,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:19:57.343252169 +0000
-+++ help	2025-08-27 08:19:57.359252275 +0000
+--- adoc	2026-09-29 14:51:40.902548970 +0000
++++ help	2026-09-29 14:51:40.914548970 +0000
 @@ -0,0 +1 @@
 +git credential-store [<options>] <action>
 not ok 167 - credential-store -h output and SYNOPSIS agree # TODO known breakage
@@ -68312,8 +65772,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:19:58.275258316 +0000
-+++ help	2025-08-27 08:19:58.291258421 +0000
+--- adoc	2026-09-29 14:51:41.498548970 +0000
++++ help	2026-09-29 14:51:41.502548970 +0000
 @@ -1 +1 @@
 -git fast-export [<options>] | git fast-import
 +git fast-export [<rev-list-opts>]
@@ -68367,8 +65827,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:19:58.395259107 +0000
-+++ help	2025-08-27 08:19:58.403259160 +0000
+--- adoc	2026-09-29 14:51:41.562548970 +0000
++++ help	2026-09-29 14:51:41.570548970 +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>]
@@ -68472,8 +65932,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:19:58.611260532 +0000
-+++ help	2025-08-27 08:19:58.631260664 +0000
+--- adoc	2026-09-29 14:51:41.698548970 +0000
++++ help	2026-09-29 14:51:41.702548970 +0000
 @@ -1,4 +1 @@
 -git fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]
 -               [--upload-pack=<git-upload-pack>]
@@ -68530,8 +65990,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:19:58.711261191 +0000
-+++ help	2025-08-27 08:19:58.723261270 +0000
+--- adoc	2026-09-29 14:51:41.774548970 +0000
++++ help	2026-09-29 14:51:41.782548970 +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>
@@ -68586,8 +66046,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:19:58.795261745 +0000
-+++ help	2025-08-27 08:19:58.803261798 +0000
+--- adoc	2026-09-29 14:51:41.838548970 +0000
++++ help	2026-09-29 14:51:41.846548970 +0000
 @@ -1,7 +1,5 @@
 -git for-each-ref [--count=<count>] [--shell|--perl|--python|--tcl]
 -                 [(--sort=<key>)...] [--format=<format>]
@@ -68701,8 +66161,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:19:59.003263117 +0000
-+++ help	2025-08-27 08:19:59.015263196 +0000
+--- adoc	2026-09-29 14:51:41.966548970 +0000
++++ help	2026-09-29 14:51:41.970548970 +0000
 @@ -1,23 +1 @@
 -git format-patch [-k] [(-o|--output-directory) <dir> | --stdout]
 -                 [--no-thread | --thread[=<style>]]
@@ -68828,8 +66288,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:19:59.219264541 +0000
-+++ help	2025-08-27 08:19:59.231264621 +0000
+--- adoc	2026-09-29 14:51:42.114548970 +0000
++++ help	2026-09-29 14:51:42.118548970 +0000
 @@ -1 +1,4 @@
 -git fsck-objects ...
 +git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
@@ -68886,8 +66346,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:19:59.327265254 +0000
-+++ help	2025-08-27 08:19:59.335265306 +0000
+--- adoc	2026-09-29 14:51:42.178548970 +0000
++++ help	2026-09-29 14:51:42.186548970 +0000
 @@ -1,4 +1,4 @@
 -git fsmonitor--daemon start
 -git fsmonitor--daemon run
@@ -68945,8 +66405,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:19:59.411265808 +0000
-+++ help	2025-08-27 08:19:59.427265913 +0000
+--- adoc	2026-09-29 14:51:42.250548970 +0000
++++ help	2026-09-29 14:51:42.258548970 +0000
 @@ -1 +1 @@
 -git gc [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]
 +git gc [<options>]
@@ -69050,8 +66510,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:19:59.619267179 +0000
-+++ help	2025-08-27 08:19:59.627267232 +0000
+--- adoc	2026-09-29 14:51:42.382548970 +0000
++++ help	2026-09-29 14:51:42.390548970 +0000
 @@ -1,21 +1 @@
 -git grep [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]
 -         [-v | --invert-match] [-h|-H] [--full-name]
@@ -69275,8 +66735,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:00.079270213 +0000
-+++ help	2025-08-27 08:20:00.091270292 +0000
+--- adoc	2026-09-29 14:51:42.746548970 +0000
++++ help	2026-09-29 14:51:42.750548970 +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>]
@@ -69382,8 +66842,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:00.307271717 +0000
-+++ help	2025-08-27 08:20:00.319271796 +0000
+--- adoc	2026-09-29 14:51:42.882548970 +0000
++++ help	2026-09-29 14:51:42.886548970 +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>]
@@ -69491,8 +66951,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:00.531273194 +0000
-+++ help	2025-08-27 08:20:00.539273247 +0000
+--- adoc	2026-09-29 14:51:43.018548970 +0000
++++ help	2026-09-29 14:51:43.026548970 +0000
 @@ -1 +1,2 @@
  git log [<options>] [<revision-range>] [[--] <path>...]
 +git show [<options>] <object>...
@@ -69546,8 +67006,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:00.635273880 +0000
-+++ help	2025-08-27 08:20:00.647273959 +0000
+--- adoc	2026-09-29 14:51:43.082548970 +0000
++++ help	2026-09-29 14:51:43.086548970 +0000
 @@ -1,13 +1 @@
 -git ls-files [-z] [-t] [-v] [-f]
 -             [-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]
@@ -69663,8 +67123,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:00.807275014 +0000
-+++ help	2025-08-27 08:20:00.819275094 +0000
+--- adoc	2026-09-29 14:51:43.218548970 +0000
++++ help	2026-09-29 14:51:43.222548970 +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>]
@@ -69720,8 +67180,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:00.895275595 +0000
-+++ help	2025-08-27 08:20:00.907275674 +0000
+--- adoc	2026-09-29 14:51:43.302548970 +0000
++++ help	2026-09-29 14:51:43.322548970 +0000
 @@ -1,3 +1 @@
 -git mailinfo [-k|-b] [-u | --encoding=<encoding> | -n]
 -             [--[no-]scissors] [--quoted-cr=<action>]
@@ -69777,8 +67237,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:00.995276254 +0000
-+++ help	2025-08-27 08:20:01.003276307 +0000
+--- adoc	2026-09-29 14:51:43.410548970 +0000
++++ help	2026-09-29 14:51:43.414548970 +0000
 @@ -1,2 +1 @@
 -git mailsplit [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]
 -              -o<directory> [--] [(<mbox>|<Maildir>)...]
@@ -69833,8 +67293,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:01.131277151 +0000
-+++ help	2025-08-27 08:20:01.139277204 +0000
+--- adoc	2026-09-29 14:51:43.474548970 +0000
++++ help	2026-09-29 14:51:43.478548970 +0000
 @@ -1,3 +1 @@
 -git maintenance run [<options>]
 -git maintenance start [--scheduler=<scheduler>]
@@ -69890,8 +67350,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:01.223277758 +0000
-+++ help	2025-08-27 08:20:01.231277811 +0000
+--- adoc	2026-09-29 14:51:43.538548970 +0000
++++ help	2026-09-29 14:51:43.546548970 +0000
 @@ -1,6 +1,3 @@
 -git merge [-n] [--stat] [--compact-summary] [--no-commit] [--squash] [--[no-]edit]
 -          [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
@@ -70002,8 +67462,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:01.419279051 +0000
-+++ help	2025-08-27 08:20:01.431279130 +0000
+--- adoc	2026-09-29 14:51:43.662548970 +0000
++++ help	2026-09-29 14:51:43.670548970 +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>]
@@ -70059,8 +67519,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:01.527279763 +0000
-+++ help	2025-08-27 08:20:01.535279816 +0000
+--- adoc	2026-09-29 14:51:43.722548970 +0000
++++ help	2026-09-29 14:51:43.730548970 +0000
 @@ -1 +1 @@
 -git merge-index [-o] [-q] <merge-program> (-a | ( [--] <file>...) )
 +git merge-index [-o] [-q] <merge-program> (-a | [--] [<filename>...])
@@ -70419,8 +67879,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:02.479286041 +0000
-+++ help	2025-08-27 08:20:02.487286094 +0000
+--- adoc	2026-09-29 14:51:44.294548970 +0000
++++ help	2026-09-29 14:51:44.302548970 +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>]
@@ -70527,8 +67987,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:02.751287835 +0000
-+++ help	2025-08-27 08:20:02.759287888 +0000
+--- adoc	2026-09-29 14:51:44.502548970 +0000
++++ help	2026-09-29 14:51:44.510548970 +0000
 @@ -1,2 +1,3 @@
 -git name-rev [--tags] [--refs=<pattern>]
 -             ( --all | --annotate-stdin | <commit-ish>... )
@@ -70585,8 +68045,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:02.887288732 +0000
-+++ help	2025-08-27 08:20:02.911288890 +0000
+--- adoc	2026-09-29 14:51:44.566548970 +0000
++++ help	2026-09-29 14:51:44.574548970 +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>]
@@ -71041,8 +68501,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:03.883295301 +0000
-+++ help	2025-08-27 08:20:03.895295380 +0000
+--- adoc	2026-09-29 14:51:45.178548970 +0000
++++ help	2026-09-29 14:51:45.182548970 +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]
@@ -71101,8 +68561,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:03.955295776 +0000
-+++ help	2025-08-27 08:20:03.963295828 +0000
+--- adoc	2026-09-29 14:51:45.242548970 +0000
++++ help	2026-09-29 14:51:45.250548970 +0000
 @@ -1,6 +1,3 @@
 -git range-diff [--color=[<when>]] [--no-color] [<diff-options>]
 -               [--no-dual-color] [--creation-factor=<factor>]
@@ -71213,8 +68673,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:04.167297174 +0000
-+++ help	2025-08-27 08:20:04.187297306 +0000
+--- adoc	2026-09-29 14:51:45.394548970 +0000
++++ help	2026-09-29 14:51:45.406548970 +0000
 @@ -1,5 +1,3 @@
 -git rebase [-i | --interactive] [<options>] [--exec <cmd>]
 -           [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
@@ -71424,8 +68884,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:04.595299997 +0000
-+++ help	2025-08-27 08:20:04.599300023 +0000
+--- adoc	2026-09-29 14:51:45.742548970 +0000
++++ help	2026-09-29 14:51:45.746548970 +0000
 @@ -1,13 +1,13 @@
  git remote [-v | --verbose]
 -git remote add [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>
@@ -71496,8 +68956,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:04.679300551 +0000
-+++ help	2025-08-27 08:20:04.683300577 +0000
+--- adoc	2026-09-29 14:51:45.850548970 +0000
++++ help	2026-09-29 14:51:45.862548970 +0000
 @@ -1 +1 @@
 -git remote add <nick> "ext::<command>[ <arguments>...]"
 +git remote-ext <remote> <url>
@@ -71551,8 +69011,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:04.791301289 +0000
-+++ help	2025-08-27 08:20:04.803301368 +0000
+--- adoc	2026-09-29 14:51:45.934548970 +0000
++++ help	2026-09-29 14:51:45.950548970 +0000
 @@ -0,0 +1 @@
 +git remote-fd <remote> <url>
 not ok 517 - remote-fd -h output and SYNOPSIS agree # TODO known breakage
@@ -71805,8 +69265,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:05.279304508 +0000
-+++ help	2025-08-27 08:20:05.287304560 +0000
+--- adoc	2026-09-29 14:51:46.326548970 +0000
++++ help	2026-09-29 14:51:46.334548970 +0000
 @@ -1,4 +1,4 @@
 +git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
  git reset [-q] [<tree-ish>] [--] <pathspec>...
@@ -71865,8 +69325,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:05.371305114 +0000
-+++ help	2025-08-27 08:20:05.379305167 +0000
+--- adoc	2026-09-29 14:51:46.430548970 +0000
++++ help	2026-09-29 14:51:46.442548970 +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]
@@ -71972,8 +69432,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:05.595306592 +0000
-+++ help	2025-08-27 08:20:05.599306618 +0000
+--- adoc	2026-09-29 14:51:46.586548970 +0000
++++ help	2026-09-29 14:51:46.598548970 +0000
 @@ -1 +1,3 @@
 -git rev-parse [<options>] <arg>...
 +git rev-parse --parseopt [<options>] -- [<args>...]
@@ -72229,8 +69689,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:06.223310733 +0000
-+++ help	2025-08-27 08:20:06.243310865 +0000
+--- adoc	2026-09-29 14:51:47.026548970 +0000
++++ help	2026-09-29 14:51:47.030548970 +0000
 @@ -1 +1,2 @@
 -git show [<options>] [<object>...]
 +git log [<options>] [<revision-range>] [[--] <path>...]
@@ -72485,8 +69945,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:06.827314717 +0000
-+++ help	2025-08-27 08:20:06.835314770 +0000
+--- adoc	2026-09-29 14:51:47.430548970 +0000
++++ help	2026-09-29 14:51:47.438548970 +0000
 @@ -1 +1 @@
 -git stage <arg>...
 +git add [<options>] [--] <pathspec>...
@@ -72721,8 +70181,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:07.383318384 +0000
-+++ help	2025-08-27 08:20:07.391318436 +0000
+--- adoc	2026-09-29 14:51:47.766548970 +0000
++++ help	2026-09-29 14:51:47.774548970 +0000
 @@ -1,4 +1 @@
 -git switch [<options>] [--no-guess] <branch>
 -git switch [<options>] --detach [<start-point>]
@@ -72979,8 +70439,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:07.923321945 +0000
-+++ help	2025-08-27 08:20:07.943322077 +0000
+--- adoc	2026-09-29 14:51:48.206548970 +0000
++++ help	2026-09-29 14:51:48.210548970 +0000
 @@ -1,19 +1 @@
 -git update-index
 -                 [--add] [--remove | --force-remove] [--replace]
@@ -73052,8 +70512,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:08.007322499 +0000
-+++ help	2025-08-27 08:20:08.015322552 +0000
+--- adoc	2026-09-29 14:51:48.278548970 +0000
++++ help	2026-09-29 14:51:48.290548970 +0000
 @@ -1,3 +1,3 @@
 -git update-ref [-m <reason>] [--no-deref] -d <ref> [<old-oid>]
 -git update-ref [-m <reason>] [--no-deref] [--create-reflog] <ref> <new-oid> [<old-oid>]
@@ -73542,8 +71002,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2025-08-27 08:20:09.055329411 +0000
-+++ help	2025-08-27 08:20:09.063329464 +0000
+--- adoc	2026-09-29 14:51:49.170548970 +0000
++++ help	2026-09-29 14:51:49.182548970 +0000
 @@ -1 +1,2 @@
 -git whatchanged <option>...
 +git log [<options>] [<revision-range>] [[--] <path>...]
@@ -73655,116 +71115,2084 @@
 1..722
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1501-work-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1501-work-tree/.git/
-expecting success of 1501.1 'setup': 
-	EMPTY_TREE=$(git write-tree) &&
-	EMPTY_BLOB=$(git hash-object -t blob --stdin </dev/null) &&
-	CHANGED_BLOB=$(echo changed | git hash-object -t blob --stdin) &&
-	EMPTY_BLOB7=$(echo $EMPTY_BLOB | sed "s/\(.......\).*/\1/") &&
-	CHANGED_BLOB7=$(echo $CHANGED_BLOB | sed "s/\(.......\).*/\1/") &&
+*** t1419-exclude-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1419-exclude-refs/.git/
+expecting success of 1419.1 'setup': 
+	test_commit --no-tag base &&
+	base="$(git rev-parse HEAD)" &&
 
-	mkdir -p work/sub/dir &&
-	mkdir -p work2 &&
-	mv .git repo.git
+	for name in foo bar baz quux
+	do
+		for i in 1 2 3
+		do
+			echo "create refs/heads/$name/$i $base" || return 1
+		done || return 1
+	done >in &&
+	for i in 5 6 7
+	do
+		echo "create refs/heads/bar/4/$i $base" || return 1
+	done >>in &&
+	echo "delete refs/heads/main" >>in &&
+
+	git update-ref --stdin <in &&
+	git pack-refs --all
 
+[main (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
 ok 1 - setup
 
-expecting success of 1501.2 'setup: helper for testing rev-parse': 
-	test_rev_parse() {
-		echo $1 >expected.bare &&
-		echo $2 >expected.inside-git &&
-		echo $3 >expected.inside-worktree &&
-		if test $# -ge 4
-		then
-			echo $4 >expected.prefix
-		fi &&
+expecting success of 1419.2 'excluded region in middle': 
+	for_each_ref__exclude refs/heads refs/heads/foo >actual 2>perf &&
+	for_each_ref refs/heads/bar refs/heads/baz refs/heads/quux >expect &&
 
-		git rev-parse --is-bare-repository >actual.bare &&
-		git rev-parse --is-inside-git-dir >actual.inside-git &&
-		git rev-parse --is-inside-work-tree >actual.inside-worktree &&
-		if test $# -ge 4
-		then
-			git rev-parse --show-prefix >actual.prefix
-		fi &&
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-		test_cmp expected.bare actual.bare &&
-		test_cmp expected.inside-git actual.inside-git &&
-		test_cmp expected.inside-worktree actual.inside-worktree &&
-		if test $# -ge 4
-		then
-			# rev-parse --show-prefix should output
-			# a single newline when at the top of the work tree,
-			# but we test for that separately.
-			test -z "$4" && test_must_be_empty actual.prefix ||
-			test_cmp expected.prefix actual.prefix
-		fi
-	}
+ok 2 - excluded region in middle
 
-ok 2 - setup: helper for testing rev-parse
+expecting success of 1419.3 'excluded region at beginning': 
+	for_each_ref__exclude refs/heads refs/heads/bar >actual 2>perf &&
+	for_each_ref refs/heads/baz refs/heads/foo refs/heads/quux >expect &&
 
-expecting success of 1501.3 'setup: core.worktree = relative path': 
-	sane_unset GIT_WORK_TREE &&
-	GIT_DIR=repo.git &&
-	GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
-	export GIT_DIR GIT_CONFIG &&
-	git config core.worktree ../work
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-ok 3 - setup: core.worktree = relative path
+ok 3 - excluded region at beginning
 
-expecting success of 1501.4 'outside': 
-	test_rev_parse false false false
+expecting success of 1419.4 'excluded region at end': 
+	for_each_ref__exclude refs/heads refs/heads/quux >actual 2>perf &&
+	for_each_ref refs/heads/foo refs/heads/bar refs/heads/baz >expect &&
 
-ok 4 - outside
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-expecting success of 1501.5 'inside work tree': 
-	(
-		cd work &&
-		GIT_DIR=../repo.git &&
-		GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
-		test_rev_parse false false true ""
-	)
+ok 4 - excluded region at end
 
-'actual.prefix' is not empty, it contains:
+expecting success of 1419.5 'disjoint excluded regions': 
+	for_each_ref__exclude refs/heads refs/heads/bar refs/heads/quux >actual 2>perf &&
+	for_each_ref refs/heads/baz refs/heads/foo >expect &&
 
-ok 5 - inside work tree
+	test_cmp expect actual &&
+	assert_jumps 2 perf
 
-expecting success of 1501.6 'empty prefix is actually written out': 
-	echo >expected &&
-	(
-		cd work &&
-		GIT_DIR=../repo.git &&
-		GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
-		git rev-parse --show-prefix >../actual
-	) &&
-	test_cmp expected actual
+ok 5 - disjoint excluded regions
 
-ok 6 - empty prefix is actually written out
+expecting success of 1419.6 'adjacent, non-overlapping excluded regions': 
+	for_each_ref__exclude refs/heads refs/heads/bar refs/heads/baz >actual 2>perf &&
+	for_each_ref refs/heads/foo refs/heads/quux >expect &&
 
-expecting success of 1501.7 'subdir of work tree': 
-	(
-		cd work/sub/dir &&
-		GIT_DIR=../../../repo.git &&
-		GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
-		test_rev_parse false false true sub/dir/
-	)
+	test_cmp expect actual &&
+	case "$GIT_DEFAULT_REF_FORMAT" in
+	files)
+		assert_jumps 1 perf;;
+	reftable)
+		assert_jumps 2 perf;;
+	*)
+		BUG "unhandled ref format $GIT_DEFAULT_REF_FORMAT";;
+	esac
 
-ok 7 - subdir of work tree
+ok 6 - adjacent, non-overlapping excluded regions
 
-expecting success of 1501.8 'setup: core.worktree = absolute path': 
-	sane_unset GIT_WORK_TREE &&
-	GIT_DIR=$(pwd)/repo.git &&
-	GIT_CONFIG=$GIT_DIR/config &&
-	export GIT_DIR GIT_CONFIG &&
-	git config core.worktree "$(pwd)/work"
+expecting success of 1419.7 'non-directory excluded regions': 
+	for_each_ref__exclude refs/heads refs/heads/ba refs/heads/baz >actual 2>perf &&
+	for_each_ref refs/heads/bar refs/heads/foo refs/heads/quux >expect &&
 
-ok 8 - setup: core.worktree = absolute path
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-expecting success of 1501.9 'outside': 
-	test_rev_parse false false false &&
-	(
-		cd work2 &&
-		test_rev_parse false false false
+ok 7 - non-directory excluded regions
+
+expecting success of 1419.8 'overlapping excluded regions': 
+	for_each_ref__exclude refs/heads refs/heads/bar refs/heads/bar/4 >actual 2>perf &&
+	for_each_ref refs/heads/baz refs/heads/foo refs/heads/quux >expect &&
+
+	test_cmp expect actual &&
+	assert_jumps 1 perf
+
+ok 8 - overlapping excluded regions
+
+expecting success of 1419.9 'several overlapping excluded regions': 
+	for_each_ref__exclude refs/heads \
+		refs/heads/bar refs/heads/baz refs/heads/foo >actual 2>perf &&
+	for_each_ref refs/heads/quux >expect &&
+
+	test_cmp expect actual &&
+	case "$GIT_DEFAULT_REF_FORMAT" in
+	files)
+		assert_jumps 1 perf;;
+	reftable)
+		assert_jumps 3 perf;;
+	*)
+		BUG "unhandled ref format $GIT_DEFAULT_REF_FORMAT";;
+	esac
+
+ok 9 - several overlapping excluded regions
+
+expecting success of 1419.10 'unordered excludes': 
+	for_each_ref__exclude refs/heads \
+		refs/heads/foo refs/heads/baz >actual 2>perf &&
+	for_each_ref refs/heads/bar refs/heads/quux >expect &&
+
+	test_cmp expect actual &&
+	case "$GIT_DEFAULT_REF_FORMAT" in
+	files)
+		assert_jumps 1 perf;;
+	reftable)
+		assert_jumps 2 perf;;
+	*)
+		BUG "unhandled ref format $GIT_DEFAULT_REF_FORMAT";;
+	esac
+
+ok 10 - unordered excludes
+
+expecting success of 1419.11 'non-matching excluded section': 
+	for_each_ref__exclude refs/heads refs/heads/does/not/exist >actual 2>perf &&
+	for_each_ref >expect &&
+
+	test_cmp expect actual &&
+	assert_no_jumps perf
+
+ok 11 - non-matching excluded section
+
+expecting success of 1419.12 'meta-characters are discarded': 
+	for_each_ref__exclude refs/heads "refs/heads/ba*" >actual 2>perf &&
+	for_each_ref >expect &&
+
+	test_cmp expect actual &&
+	assert_no_jumps perf
+
+ok 12 - meta-characters are discarded
+
+expecting success of 1419.13 'empty string exclude pattern is ignored': 
+	git update-ref refs/heads/loose $(git rev-parse refs/heads/foo/1) &&
+
+	for_each_ref__exclude refs/heads "" >actual 2>perf &&
+	for_each_ref >expect &&
+
+	test_cmp expect actual &&
+	assert_no_jumps perf
+
+ok 13 - empty string exclude pattern is ignored
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1417-reflog-updateref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1417-reflog-updateref/.git/
+expecting success of 1417.1 'setup': 
+	git init -b main repo &&
+	(
+		cd repo &&
+
+		test_commit A &&
+		test_commit B &&
+		test_commit C &&
+
+		git reflog HEAD >expect &&
+		git reset --hard HEAD~ &&
+		# Make sure that the reflog does not point to the same commit
+		# as HEAD.
+		git reflog delete HEAD@{0} &&
+		git reflog HEAD >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1417-reflog-updateref/repo/.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
+HEAD is now at d9df450 B
+ok 1 - setup
+
+expecting success of 1417.2 'get 'B' with 'git reflog delete --updateref HEAD@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+ok 2 - get 'B' with 'git reflog delete --updateref HEAD@{0}'
+
+expecting success of 1417.3 'get 'B' with 'git reflog delete --updateref HEAD@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+ok 3 - get 'B' with 'git reflog delete --updateref HEAD@{1}'
+
+expecting success of 1417.4 'get 'C' with 'git reflog delete --updateref main@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+ok 4 - get 'C' with 'git reflog delete --updateref main@{0}'
+
+expecting success of 1417.5 'get 'B' with 'git reflog delete --updateref main@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+ok 5 - get 'B' with 'git reflog delete --updateref main@{1}'
+
+expecting success of 1417.6 'get 'B' with 'git reflog delete --updateref --rewrite HEAD@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+ok 6 - get 'B' with 'git reflog delete --updateref --rewrite HEAD@{0}'
+
+expecting success of 1417.7 'get 'B' with 'git reflog delete --updateref --rewrite HEAD@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+ok 7 - get 'B' with 'git reflog delete --updateref --rewrite HEAD@{1}'
+
+expecting success of 1417.8 'get 'C' with 'git reflog delete --updateref --rewrite main@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+ok 8 - get 'C' with 'git reflog delete --updateref --rewrite main@{0}'
+
+expecting success of 1417.9 'get 'B' with 'git reflog delete --updateref --rewrite main@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+ok 9 - get 'B' with 'git reflog delete --updateref --rewrite main@{1}'
+
+expecting success of 1417.10 'get 'B' with 'test_must_fail git reflog expire HEAD@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+error: reflog could not be found: 'HEAD@{0}'
+ok 10 - get 'B' with 'test_must_fail git reflog expire HEAD@{0}'
+
+expecting success of 1417.11 'get 'B' with 'test_must_fail git reflog expire HEAD@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+error: reflog could not be found: 'HEAD@{1}'
+ok 11 - get 'B' with 'test_must_fail git reflog expire HEAD@{1}'
+
+expecting success of 1417.12 'get 'B' with 'test_must_fail git reflog expire main@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+error: reflog could not be found: 'main@{0}'
+ok 12 - get 'B' with 'test_must_fail git reflog expire main@{0}'
+
+expecting success of 1417.13 'get 'B' with 'test_must_fail git reflog expire main@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+error: reflog could not be found: 'main@{1}'
+ok 13 - get 'B' with 'test_must_fail git reflog expire main@{1}'
+
+expecting success of 1417.14 'get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+error: reflog could not be found: 'HEAD@{0}'
+ok 14 - get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{0}'
+
+expecting success of 1417.15 'get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+error: reflog could not be found: 'HEAD@{1}'
+ok 15 - get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{1}'
+
+expecting success of 1417.16 'get 'B' with 'test_must_fail git reflog expire --updateref main@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+error: reflog could not be found: 'main@{0}'
+ok 16 - get 'B' with 'test_must_fail git reflog expire --updateref main@{0}'
+
+expecting success of 1417.17 'get 'B' with 'test_must_fail git reflog expire --updateref main@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+error: reflog could not be found: 'main@{1}'
+ok 17 - get 'B' with 'test_must_fail git reflog expire --updateref main@{1}'
+
+expecting success of 1417.18 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+error: reflog could not be found: 'HEAD@{0}'
+ok 18 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{0}'
+
+expecting success of 1417.19 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+error: reflog could not be found: 'HEAD@{1}'
+ok 19 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{1}'
+
+expecting success of 1417.20 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+error: reflog could not be found: 'main@{0}'
+ok 20 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{0}'
+
+expecting success of 1417.21 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	
+error: reflog could not be found: 'main@{1}'
+ok 21 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{1}'
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1451-fsck-buffer.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1451-fsck-buffer/.git/
+expecting success of 1451.1 'create valid objects': 
+	git commit --allow-empty -m foo &&
+	commit=$(git rev-parse --verify HEAD) &&
+	tree=$(git rev-parse --verify HEAD^{tree})
+
+[master (root-commit) 2093db0] foo
+ Author: A U Thor <author@example.com>
+ok 1 - create valid objects
+
+expecting success of 1451.2 'reset input to empty': 
+		>base
+	
+ok 2 - reset input to empty
+
+expecting success of 1451.3 'truncated commit (missingTree, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingTree: invalid format - expected 'tree' line
+ok 3 - truncated commit (missingTree, "")
+
+expecting success of 1451.4 'truncated commit (missingTree, "tr")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingTree: invalid format - expected 'tree' line
+ok 4 - truncated commit (missingTree, "tr")
+
+expecting success of 1451.5 'truncated commit (missingTree, "tree")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingTree: invalid format - expected 'tree' line
+ok 5 - truncated commit (missingTree, "tree")
+
+expecting success of 1451.6 'truncated commit (badTreeSha1, "tree ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badTreeSha1: invalid 'tree' line format - bad sha1
+ok 6 - truncated commit (badTreeSha1, "tree ")
+
+expecting success of 1451.7 'truncated commit (badTreeSha1, "tree 1234")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badTreeSha1: invalid 'tree' line format - bad sha1
+ok 7 - truncated commit (badTreeSha1, "tree 1234")
+
+expecting success of 1451.8 'add tree line': 
+		echo "$content" >>base
+	
+ok 8 - add tree line
+
+expecting success of 1451.9 'truncated commit (missingAuthor, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 9 - truncated commit (missingAuthor, "")
+
+expecting success of 1451.10 'truncated commit (missingAuthor, "par")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 10 - truncated commit (missingAuthor, "par")
+
+expecting success of 1451.11 'truncated commit (missingAuthor, "parent")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 11 - truncated commit (missingAuthor, "parent")
+
+expecting success of 1451.12 'truncated commit (badParentSha1, "parent ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badParentSha1: invalid 'parent' line format - bad sha1
+ok 12 - truncated commit (badParentSha1, "parent ")
+
+expecting success of 1451.13 'truncated commit (badParentSha1, "parent 1234")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badParentSha1: invalid 'parent' line format - bad sha1
+ok 13 - truncated commit (badParentSha1, "parent 1234")
+
+expecting success of 1451.14 'add parent line': 
+		echo "$content" >>base
+	
+ok 14 - add parent line
+
+expecting success of 1451.15 'truncated commit (missingAuthor, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 15 - truncated commit (missingAuthor, "")
+
+expecting success of 1451.16 'truncated commit (missingAuthor, "au")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 16 - truncated commit (missingAuthor, "au")
+
+expecting success of 1451.17 'truncated commit (missingAuthor, "author")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 17 - truncated commit (missingAuthor, "author")
+
+expecting success of 1451.18 'truncated commit (missingEmail, "author ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 18 - truncated commit (missingEmail, "author ")
+
+expecting success of 1451.19 'truncated commit (missingEmail, "author name")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 19 - truncated commit (missingEmail, "author name")
+
+expecting success of 1451.20 'truncated commit (badEmail, "author name <")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 20 - truncated commit (badEmail, "author name <")
+
+expecting success of 1451.21 'truncated commit (badEmail, "author name <email")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 21 - truncated commit (badEmail, "author name <email")
+
+expecting success of 1451.22 'truncated commit (missingSpaceBeforeDate, "author name <email>")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
+ok 22 - truncated commit (missingSpaceBeforeDate, "author name <email>")
+
+expecting success of 1451.23 'truncated commit (badDate, "author name <email> ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 23 - truncated commit (badDate, "author name <email> ")
+
+expecting success of 1451.24 'truncated commit (badDate, "author name <email> 1234")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 24 - truncated commit (badDate, "author name <email> 1234")
+
+expecting success of 1451.25 'truncated commit (badTimezone, "author name <email> 1234 ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 25 - truncated commit (badTimezone, "author name <email> 1234 ")
+
+expecting success of 1451.26 'truncated commit (badTimezone, "author name <email> 1234 +")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 26 - truncated commit (badTimezone, "author name <email> 1234 +")
+
+expecting success of 1451.27 'add author line': 
+		echo "$content" >>base
+	
+ok 27 - add author line
+
+expecting success of 1451.28 'truncated commit (missingCommitter, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
+ok 28 - truncated commit (missingCommitter, "")
+
+expecting success of 1451.29 'truncated commit (missingCommitter, "co")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
+ok 29 - truncated commit (missingCommitter, "co")
+
+expecting success of 1451.30 'truncated commit (missingCommitter, "committer")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
+ok 30 - truncated commit (missingCommitter, "committer")
+
+expecting success of 1451.31 'truncated commit (missingEmail, "committer ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 31 - truncated commit (missingEmail, "committer ")
+
+expecting success of 1451.32 'truncated commit (missingEmail, "committer name")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 32 - truncated commit (missingEmail, "committer name")
+
+expecting success of 1451.33 'truncated commit (badEmail, "committer name <")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 33 - truncated commit (badEmail, "committer name <")
+
+expecting success of 1451.34 'truncated commit (badEmail, "committer name <email")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 34 - truncated commit (badEmail, "committer name <email")
+
+expecting success of 1451.35 'truncated commit (missingSpaceBeforeDate, "committer name <email>")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
+ok 35 - truncated commit (missingSpaceBeforeDate, "committer name <email>")
+
+expecting success of 1451.36 'truncated commit (badDate, "committer name <email> ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 36 - truncated commit (badDate, "committer name <email> ")
+
+expecting success of 1451.37 'truncated commit (badDate, "committer name <email> 1234")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 37 - truncated commit (badDate, "committer name <email> 1234")
+
+expecting success of 1451.38 'truncated commit (badTimezone, "committer name <email> 1234 ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 38 - truncated commit (badTimezone, "committer name <email> 1234 ")
+
+expecting success of 1451.39 'truncated commit (badTimezone, "committer name <email> 1234 +")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 39 - truncated commit (badTimezone, "committer name <email> 1234 +")
+
+expecting success of 1451.40 'add committer line': 
+		echo "$content" >>base
+	
+ok 40 - add committer line
+
+expecting success of 1451.41 'reset input to empty': 
+		>base
+	
+ok 41 - reset input to empty
+
+expecting success of 1451.42 'truncated tag (missingObject, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingObject: invalid format - expected 'object' line
+ok 42 - truncated tag (missingObject, "")
+
+expecting success of 1451.43 'truncated tag (missingObject, "obj")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingObject: invalid format - expected 'object' line
+ok 43 - truncated tag (missingObject, "obj")
+
+expecting success of 1451.44 'truncated tag (missingObject, "object")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingObject: invalid format - expected 'object' line
+ok 44 - truncated tag (missingObject, "object")
+
+expecting success of 1451.45 'truncated tag (badObjectSha1, "object ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badObjectSha1: invalid 'object' line format - bad sha1
+ok 45 - truncated tag (badObjectSha1, "object ")
+
+expecting success of 1451.46 'truncated tag (badObjectSha1, "object 1234")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badObjectSha1: invalid 'object' line format - bad sha1
+ok 46 - truncated tag (badObjectSha1, "object 1234")
+
+expecting success of 1451.47 'add object line': 
+		echo "$content" >>base
+	
+ok 47 - add object line
+
+expecting success of 1451.48 'truncated tag (missingType, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
+ok 48 - truncated tag (missingType, "")
+
+expecting success of 1451.49 'truncated tag (missingType, "ty")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
+ok 49 - truncated tag (missingType, "ty")
+
+expecting success of 1451.50 'truncated tag (missingType, "type")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
+ok 50 - truncated tag (missingType, "type")
+
+expecting success of 1451.51 'truncated tag (badType, "type ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badType: invalid 'type' value
+ok 51 - truncated tag (badType, "type ")
+
+expecting success of 1451.52 'truncated tag (badType, "type com")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badType: invalid 'type' value
+ok 52 - truncated tag (badType, "type com")
+
+expecting success of 1451.53 'add type line': 
+		echo "$content" >>base
+	
+ok 53 - add type line
+
+expecting success of 1451.54 'truncated tag (missingTagEntry, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
+ok 54 - truncated tag (missingTagEntry, "")
+
+expecting success of 1451.55 'truncated tag (missingTagEntry, "ta")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
+ok 55 - truncated tag (missingTagEntry, "ta")
+
+expecting success of 1451.56 'truncated tag (missingTagEntry, "tag")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
+ok 56 - truncated tag (missingTagEntry, "tag")
+
+expecting success of 1451.57 'truncated tag (badTagName, "tag ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badTagName: invalid 'tag' name: 
+ok 57 - truncated tag (badTagName, "tag ")
+
+expecting success of 1451.58 'add tag line': 
+		echo "$content" >>base
+	
+ok 58 - add tag line
+
+expecting success of 1451.59 'truncated tag (missingTagger, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 59 - truncated tag (missingTagger, "")
+
+expecting success of 1451.60 'truncated tag (missingTagger, "ta")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 60 - truncated tag (missingTagger, "ta")
+
+expecting success of 1451.61 'truncated tag (missingTagger, "tagger")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 61 - truncated tag (missingTagger, "tagger")
+
+expecting success of 1451.62 'truncated tag (missingEmail, "tagger ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 62 - truncated tag (missingEmail, "tagger ")
+
+expecting success of 1451.63 'truncated tag (missingEmail, "tagger name")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 63 - truncated tag (missingEmail, "tagger name")
+
+expecting success of 1451.64 'truncated tag (badEmail, "tagger name <")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 64 - truncated tag (badEmail, "tagger name <")
+
+expecting success of 1451.65 'truncated tag (badEmail, "tagger name <email")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 65 - truncated tag (badEmail, "tagger name <email")
+
+expecting success of 1451.66 'truncated tag (missingSpaceBeforeDate, "tagger name <email>")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
+ok 66 - truncated tag (missingSpaceBeforeDate, "tagger name <email>")
+
+expecting success of 1451.67 'truncated tag (badDate, "tagger name <email> ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 67 - truncated tag (badDate, "tagger name <email> ")
+
+expecting success of 1451.68 'truncated tag (badDate, "tagger name <email> 1234")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 68 - truncated tag (badDate, "tagger name <email> 1234")
+
+expecting success of 1451.69 'truncated tag (badTimezone, "tagger name <email> 1234 ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 69 - truncated tag (badTimezone, "tagger name <email> 1234 ")
+
+expecting success of 1451.70 'truncated tag (badTimezone, "tagger name <email> 1234 +")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
+	
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 70 - truncated tag (badTimezone, "tagger name <email> 1234 +")
+
+expecting success of 1451.71 'truncated tree (short hash)': 
+	printf "100644 foo\0\1\1\1\1" >input &&
+	test_must_fail git hash-object -t tree input 2>err &&
+	grep badTree err
+
+error: object fails fsck: badTree: cannot be parsed as a tree
+ok 71 - truncated tree (short hash)
+
+expecting success of 1451.72 'truncated tree (missing nul)': 
+	# these two things are indistinguishable to the parser. The important
+	# thing about this is example is that there are enough bytes to
+	# make up a hash, and that there is no NUL (and we confirm that the
+	# parser does not walk past the end of the buffer).
+	printf "100644 a long filename, or a hash with missing nul?" >input &&
+	test_must_fail git hash-object -t tree input 2>err &&
+	grep badTree err
+
+error: object fails fsck: badTree: cannot be parsed as a tree
+ok 72 - truncated tree (missing nul)
+
+# passed all 72 test(s)
+1..72
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1430-bad-ref-name.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1430-bad-ref-name/.git/
+expecting success of 1430.1 'setup': 
+	test_commit one &&
+	test_commit two &&
+	main_sha1=$(git rev-parse refs/heads/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
+ok 1 - setup
+
+expecting success of 1430.2 'fast-import: fail on invalid branch name ".badbranchname"': 
+	test_when_finished "rm -f .git/objects/pack_* .git/objects/index_*" &&
+	cat >input <<-INPUT_END &&
+		commit .badbranchname
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		corrupt
+		COMMIT
+
+		from refs/heads/main
+
+	INPUT_END
+	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_2061569
+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"': 
+	test_when_finished "rm -f .git/objects/pack_* .git/objects/index_*" &&
+	cat >input <<-INPUT_END &&
+		commit bad[branch]name
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		corrupt
+		COMMIT
+
+		from refs/heads/main
+
+	INPUT_END
+	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_2061625
+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': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git branch >output 2>error &&
+	test_grep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
+
+warning: ignoring ref with broken name refs/heads/broken...ref
+ok 4 - git branch shows badly named ref as warning
+
+expecting success of 1430.5 'branch -d can delete badly named ref': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git branch -d broken...ref &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
+
+Deleted branch broken...ref (was broken).
+ok 5 - branch -d can delete badly named ref
+
+expecting success of 1430.6 'branch -D can delete badly named ref': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git branch -D broken...ref &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
+
+Deleted branch broken...ref (was broken).
+ok 6 - branch -D can delete badly named ref
+
+expecting success of 1430.7 'branch -D cannot delete non-ref in .git dir': 
+	echo precious >.git/my-private-file &&
+	echo precious >expect &&
+	test_must_fail git branch -D ../../my-private-file &&
+	test_cmp expect .git/my-private-file
+
+error: branch '../../my-private-file' not found
+ok 7 - branch -D cannot delete non-ref in .git dir
+
+expecting success of 1430.8 'branch -D cannot delete ref in .git dir': 
+	git rev-parse HEAD >.git/my-private-file &&
+	git rev-parse HEAD >expect &&
+	git branch foo/legit &&
+	test_must_fail git branch -D foo////./././../../../my-private-file &&
+	test_cmp expect .git/my-private-file
+
+error: branch 'foo////./././../../../my-private-file' not found
+ok 8 - branch -D cannot delete ref in .git dir
+
+expecting success of 1430.9 'branch -D cannot delete absolute path': 
+	git branch -f extra &&
+	test_must_fail git branch -D "$(pwd)/.git/refs/heads/extra" &&
+	test_cmp_rev HEAD extra
+
+error: branch '/build/reproducible-path/git-2.51.0/t/trash directory.t1430-bad-ref-name/.git/refs/heads/extra' not found
+ok 9 - branch -D cannot delete absolute path
+
+expecting success of 1430.10 'git branch cannot create a badly named ref': 
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test_must_fail git branch broken...ref &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
+
+fatal: 'broken...ref' 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 cannot create a badly named ref
+
+expecting success of 1430.11 'branch -m cannot rename to a bad ref name': 
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test_might_fail git branch -D goodref &&
+	git branch goodref &&
+	test_must_fail git branch -m goodref broken...ref &&
+	test_cmp_rev main goodref &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
+
+error: branch 'goodref' not found
+fatal: 'broken...ref' 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 11 - branch -m cannot rename to a bad ref name
+
+checking known breakage of 1430.12 'branch -m can rename from a bad ref name': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git branch -m broken...ref renamed &&
+	test_cmp_rev main renamed &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
+
+fatal: invalid branch name: 'broken...ref'
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config set advice.refSyntax false"
+not ok 12 - branch -m can rename from a bad ref name # TODO known breakage
+
+expecting success of 1430.13 'push cannot create a badly named ref': 
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test_must_fail git push "file://$(pwd)" HEAD:refs/heads/broken...ref &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
+
+fatal: invalid refspec 'HEAD:refs/heads/broken...ref'
+ok 13 - push cannot create a badly named ref
+
+checking known breakage of 1430.14 'push --mirror can delete badly named ref': 
+	top=$(pwd) &&
+	git init src &&
+	git init dest &&
+
+	(
+		cd src &&
+		test_commit one
+	) &&
+	(
+		cd dest &&
+		test_commit two &&
+		git checkout --detach &&
+		test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION
+	) &&
+	git -C src push --mirror "file://$top/dest" &&
+	git -C dest branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1430-bad-ref-name/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1430-bad-ref-name/dest/.git/
+[main (root-commit) 4331c28] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main (root-commit) 9db02ea] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+HEAD is now at 9db02ea two
+fatal: update_ref failed for ref 'refs/heads/broken...ref': cannot update ref 'refs/heads/broken...ref': trying to write ref 'refs/heads/broken...ref' with nonexistent object 139b20d8e6c5b496de61f033f642d0e3dbff528d
+not ok 14 - push --mirror can delete badly named ref # TODO known breakage
+
+expecting success of 1430.15 'rev-parse skips symref pointing to broken name': 
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git branch shadow one &&
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test-tool ref-store main create-symref refs/tags/shadow refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/tags/shadow" &&
+	git rev-parse --verify one >expect &&
+	git rev-parse --verify shadow >actual 2>err &&
+	test_cmp expect actual &&
+	test_grep "ignoring dangling symref refs/tags/shadow" err
+
+warning: ignoring dangling symref refs/tags/shadow
+ok 15 - rev-parse skips symref pointing to broken name
+
+expecting success of 1430.16 'for-each-ref emits warnings for broken names': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
+	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/main &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
+	git for-each-ref >output 2>error &&
+	! grep -e "broken\.\.\.ref" output &&
+	! grep -e "badname" output &&
+	! grep -e "broken\.\.\.symref" output &&
+	test_grep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
+	test_grep ! "ignoring broken ref refs/heads/badname" error &&
+	test_grep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error
+
+warning: ignoring ref with broken name refs/heads/broken...ref
+warning: ignoring ref with broken name refs/heads/broken...symref
+ok 16 - for-each-ref emits warnings for broken names
+
+expecting success of 1430.17 'update-ref -d can delete broken name': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git update-ref -d refs/heads/broken...ref >output 2>error &&
+	test_must_be_empty output &&
+	test_must_be_empty error &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
+
+ok 17 - update-ref -d can delete broken name
+
+expecting success of 1430.18 'branch -d can delete broken name': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git branch -d broken...ref >output 2>error &&
+	test_grep "Deleted branch broken...ref (was broken)" output &&
+	test_must_be_empty error &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
+
+Deleted branch broken...ref (was broken).
+ok 18 - branch -d can delete broken name
+
+expecting success of 1430.19 'update-ref --no-deref -d can delete symref to broken name': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
+	test_ref_exists refs/heads/badname &&
+	git update-ref --no-deref -d refs/heads/badname >output 2>error &&
+	test_ref_missing refs/heads/badname &&
+	test_must_be_empty output &&
+	test_must_be_empty error
+
+error: reference does not exist
+ok 19 - update-ref --no-deref -d can delete symref to broken name
+
+expecting success of 1430.20 'branch -d can delete symref to broken name': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
+	test_ref_exists refs/heads/badname &&
+	git branch -d badname >output 2>error &&
+	test_ref_missing refs/heads/badname &&
+	test_grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
+	test_must_be_empty error
+
+error: reference does not exist
+Deleted branch badname (was refs/heads/broken...ref).
+ok 20 - branch -d can delete symref to broken name
+
+expecting success of 1430.21 'update-ref --no-deref -d can delete dangling symref to broken name': 
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
+	test_ref_exists refs/heads/badname &&
+	git update-ref --no-deref -d refs/heads/badname >output 2>error &&
+	test_ref_missing refs/heads/badname &&
+	test_must_be_empty output &&
+	test_must_be_empty error
+
+error: reference does not exist
+ok 21 - update-ref --no-deref -d can delete dangling symref to broken name
+
+expecting success of 1430.22 'branch -d can delete dangling symref to broken name': 
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
+	test_ref_exists refs/heads/badname &&
+	git branch -d badname >output 2>error &&
+	test_ref_missing refs/heads/badname &&
+	test_grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
+	test_must_be_empty error
+
+error: reference does not exist
+Deleted branch badname (was refs/heads/broken...ref).
+ok 22 - branch -d can delete dangling symref to broken name
+
+expecting success of 1430.23 'update-ref -d can delete broken name through symref': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
+	test_ref_exists refs/heads/broken...ref &&
+	git update-ref -d refs/heads/badname >output 2>error &&
+	test_ref_missing refs/heads/broken...ref &&
+	test_must_be_empty output &&
+	test_must_be_empty error
+
+error: reference does not exist
+ok 23 - update-ref -d can delete broken name through symref
+
+expecting success of 1430.24 'update-ref --no-deref -d can delete symref with broken name': 
+	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/main &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
+	test_ref_exists refs/heads/broken...symref &&
+	git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
+	test_ref_missing refs/heads/broken...symref &&
+	test_must_be_empty output &&
+	test_must_be_empty error
+
+error: reference does not exist
+ok 24 - update-ref --no-deref -d can delete symref with broken name
+
+expecting success of 1430.25 'branch -d can delete symref with broken name': 
+	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/main &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
+	test_ref_exists refs/heads/broken...symref &&
+	git branch -d broken...symref >output 2>error &&
+	test_ref_missing refs/heads/broken...symref &&
+	test_grep "Deleted branch broken...symref (was refs/heads/main)" output &&
+	test_must_be_empty error
+
+error: reference does not exist
+Deleted branch broken...symref (was refs/heads/main).
+ok 25 - branch -d can delete symref with broken name
+
+expecting success of 1430.26 'update-ref --no-deref -d can delete dangling symref with broken name': 
+	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/idonotexist &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
+	test_ref_exists refs/heads/broken...symref &&
+	git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
+	test_ref_missing refs/heads/broken...symref &&
+	test_must_be_empty output &&
+	test_must_be_empty error
+
+error: reference does not exist
+ok 26 - update-ref --no-deref -d can delete dangling symref with broken name
+
+expecting success of 1430.27 'branch -d can delete dangling symref with broken name': 
+	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/idonotexist &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
+	test_ref_exists refs/heads/broken...symref &&
+	git branch -d broken...symref >output 2>error &&
+	test_ref_missing refs/heads/broken...symref &&
+	test_grep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&
+	test_must_be_empty error
+
+error: reference does not exist
+Deleted branch broken...symref (was refs/heads/idonotexist).
+ok 27 - branch -d can delete dangling symref with broken name
+
+expecting success of 1430.28 'update-ref -d cannot delete non-ref in .git dir': 
+	echo precious >.git/my-private-file &&
+	echo precious >expect &&
+	test_must_fail git update-ref -d my-private-file >output 2>error &&
+	test_must_be_empty output &&
+	test_grep -e "refusing to update ref with bad name" error &&
+	test_cmp expect .git/my-private-file
+
+error: refusing to update ref with bad name 'my-private-file'
+ok 28 - update-ref -d cannot delete non-ref in .git dir
+
+expecting success of 1430.29 'update-ref -d cannot delete absolute path': 
+	git branch -f extra &&
+	test_must_fail git update-ref -d "$(pwd)/.git/refs/heads/extra" &&
+	test_cmp_rev HEAD extra
+
+error: refusing to update ref with bad name '/build/reproducible-path/git-2.51.0/t/trash directory.t1430-bad-ref-name/.git/refs/heads/extra'
+ok 29 - update-ref -d cannot delete absolute path
+
+expecting success of 1430.30 'update-ref --stdin fails create with bad ref name': 
+	echo "create ~a refs/heads/main" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: invalid ref format: ~a" err
+
+fatal: invalid ref format: ~a
+ok 30 - update-ref --stdin fails create with bad ref name
+
+expecting success of 1430.31 'update-ref --stdin fails update with bad ref name': 
+	echo "update ~a refs/heads/main" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: invalid ref format: ~a" err
+
+fatal: invalid ref format: ~a
+ok 31 - update-ref --stdin fails update with bad ref name
+
+expecting success of 1430.32 'update-ref --stdin fails delete with bad ref name': 
+	echo "delete ~a refs/heads/main" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: invalid ref format: ~a" err
+
+fatal: invalid ref format: ~a
+ok 32 - update-ref --stdin fails delete with bad ref name
+
+expecting success of 1430.33 'update-ref --stdin -z fails create with bad ref name': 
+	printf "%s\0" "create ~a " refs/heads/main >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: invalid ref format: ~a " err
+
+fatal: invalid ref format: ~a 
+ok 33 - update-ref --stdin -z fails create with bad ref name
+
+expecting success of 1430.34 'update-ref --stdin -z fails update with bad ref name': 
+	printf "%s\0" "update ~a" refs/heads/main "" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: invalid ref format: ~a" err
+
+fatal: invalid ref format: ~a
+ok 34 - update-ref --stdin -z fails update with bad ref name
+
+expecting success of 1430.35 'update-ref --stdin -z fails delete with bad ref name': 
+	printf "%s\0" "delete ~a" refs/heads/main >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: invalid ref format: ~a" err
+
+fatal: invalid ref format: ~a
+ok 35 - update-ref --stdin -z fails delete with bad ref name
+
+expecting success of 1430.36 'branch rejects HEAD as a branch name': 
+	test_must_fail git branch HEAD HEAD^ &&
+	test_must_fail git show-ref refs/heads/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 36 - branch rejects HEAD as a branch name
+
+expecting success of 1430.37 'checkout -b rejects HEAD as a branch name': 
+	test_must_fail git checkout -B HEAD HEAD^ &&
+	test_must_fail git show-ref refs/heads/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 37 - checkout -b rejects HEAD as a branch name
+
+expecting success of 1430.38 'update-ref can operate on refs/heads/HEAD': 
+	git update-ref refs/heads/HEAD HEAD^ &&
+	git show-ref refs/heads/HEAD &&
+	git update-ref -d refs/heads/HEAD &&
+	test_must_fail git show-ref refs/heads/HEAD
+
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/HEAD
+ok 38 - update-ref can operate on refs/heads/HEAD
+
+expecting success of 1430.39 'branch -d can remove refs/heads/HEAD': 
+	git update-ref refs/heads/HEAD HEAD^ &&
+	git branch -d HEAD &&
+	test_must_fail git show-ref refs/heads/HEAD
+
+Deleted branch HEAD (was d79ce16).
+ok 39 - branch -d can remove refs/heads/HEAD
+
+expecting success of 1430.40 'branch -m can rename refs/heads/HEAD': 
+	git update-ref refs/heads/HEAD HEAD^ &&
+	git branch -m HEAD tail &&
+	test_must_fail git show-ref refs/heads/HEAD &&
+	git show-ref refs/heads/tail
+
+warning: renamed a misnamed branch 'HEAD' away
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/tail
+ok 40 - branch -m can rename refs/heads/HEAD
+
+expecting success of 1430.41 'branch -d can remove refs/heads/-dash': 
+	git update-ref refs/heads/-dash HEAD^ &&
+	git branch -d -- -dash &&
+	test_must_fail git show-ref refs/heads/-dash
+
+Deleted branch -dash (was d79ce16).
+ok 41 - branch -d can remove refs/heads/-dash
+
+expecting success of 1430.42 'branch -m can rename refs/heads/-dash': 
+	git update-ref refs/heads/-dash HEAD^ &&
+	git branch -m -- -dash dash &&
+	test_must_fail git show-ref refs/heads/-dash &&
+	git show-ref refs/heads/dash
+
+warning: renamed a misnamed branch '-dash' away
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/dash
+ok 42 - branch -m can rename refs/heads/-dash
+
+# still have 2 known breakage(s)
+# passed all remaining 40 test(s)
+1..42
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1501-work-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1501-work-tree/.git/
+expecting success of 1501.1 'setup': 
+	EMPTY_TREE=$(git write-tree) &&
+	EMPTY_BLOB=$(git hash-object -t blob --stdin </dev/null) &&
+	CHANGED_BLOB=$(echo changed | git hash-object -t blob --stdin) &&
+	EMPTY_BLOB7=$(echo $EMPTY_BLOB | sed "s/\(.......\).*/\1/") &&
+	CHANGED_BLOB7=$(echo $CHANGED_BLOB | sed "s/\(.......\).*/\1/") &&
+
+	mkdir -p work/sub/dir &&
+	mkdir -p work2 &&
+	mv .git repo.git
+
+ok 1 - setup
+
+expecting success of 1501.2 'setup: helper for testing rev-parse': 
+	test_rev_parse() {
+		echo $1 >expected.bare &&
+		echo $2 >expected.inside-git &&
+		echo $3 >expected.inside-worktree &&
+		if test $# -ge 4
+		then
+			echo $4 >expected.prefix
+		fi &&
+
+		git rev-parse --is-bare-repository >actual.bare &&
+		git rev-parse --is-inside-git-dir >actual.inside-git &&
+		git rev-parse --is-inside-work-tree >actual.inside-worktree &&
+		if test $# -ge 4
+		then
+			git rev-parse --show-prefix >actual.prefix
+		fi &&
+
+		test_cmp expected.bare actual.bare &&
+		test_cmp expected.inside-git actual.inside-git &&
+		test_cmp expected.inside-worktree actual.inside-worktree &&
+		if test $# -ge 4
+		then
+			# rev-parse --show-prefix should output
+			# a single newline when at the top of the work tree,
+			# but we test for that separately.
+			test -z "$4" && test_must_be_empty actual.prefix ||
+			test_cmp expected.prefix actual.prefix
+		fi
+	}
+
+ok 2 - setup: helper for testing rev-parse
+
+expecting success of 1501.3 'setup: core.worktree = relative path': 
+	sane_unset GIT_WORK_TREE &&
+	GIT_DIR=repo.git &&
+	GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
+	export GIT_DIR GIT_CONFIG &&
+	git config core.worktree ../work
+
+ok 3 - setup: core.worktree = relative path
+
+expecting success of 1501.4 'outside': 
+	test_rev_parse false false false
+
+ok 4 - outside
+
+expecting success of 1501.5 'inside work tree': 
+	(
+		cd work &&
+		GIT_DIR=../repo.git &&
+		GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
+		test_rev_parse false false true ""
+	)
+
+'actual.prefix' is not empty, it contains:
+
+ok 5 - inside work tree
+
+expecting success of 1501.6 'empty prefix is actually written out': 
+	echo >expected &&
+	(
+		cd work &&
+		GIT_DIR=../repo.git &&
+		GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
+		git rev-parse --show-prefix >../actual
+	) &&
+	test_cmp expected actual
+
+ok 6 - empty prefix is actually written out
+
+expecting success of 1501.7 'subdir of work tree': 
+	(
+		cd work/sub/dir &&
+		GIT_DIR=../../../repo.git &&
+		GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
+		test_rev_parse false false true sub/dir/
+	)
+
+ok 7 - subdir of work tree
+
+expecting success of 1501.8 'setup: core.worktree = absolute path': 
+	sane_unset GIT_WORK_TREE &&
+	GIT_DIR=$(pwd)/repo.git &&
+	GIT_CONFIG=$GIT_DIR/config &&
+	export GIT_DIR GIT_CONFIG &&
+	git config core.worktree "$(pwd)/work"
+
+ok 8 - setup: core.worktree = absolute path
+
+expecting success of 1501.9 'outside': 
+	test_rev_parse false false false &&
+	(
+		cd work2 &&
+		test_rev_parse false false false
 	)
 
 ok 9 - outside
@@ -74168,6 +73596,402 @@
 1..39
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1502-rev-parse-parseopt.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1502-rev-parse-parseopt/.git/
+expecting success of 1502.1 'setup optionspec': 
+	sed -e "s/^|//" >optionspec <<\EOF
+|some-command [options] <args>...
+|
+|some-command does foo and bar!
+|--
+|h,help!   show the help
+|
+|foo       some nifty option --foo
+|bar=      some cool option --bar with an argument
+|b,baz     a short and long option
+|
+| An option group Header
+|C?        option C with an optional argument
+|d,data?   short and long option with an optional argument
+|
+| Argument hints
+|B=arg     short option required argument
+|bar2=arg  long option required argument
+|e,fuz=with-space  short and long option required argument
+|s?some    short option optional argument
+|long?data long option optional argument
+|g,fluf?path     short and long option optional argument
+|longest=very-long-argument-hint  a very long argument hint
+|pair=key=value  with an equals sign in the hint
+|aswitch help te=t contains? fl*g characters!`
+|bswitch=hint	 hint has trailing tab character
+|cswitch	 switch has trailing tab character
+|short-hint=a    with a one symbol hint
+|
+|Extras
+|extra1    line above used to cause a segfault but no longer does
+EOF
+
+ok 1 - setup optionspec
+
+expecting success of 1502.2 'setup optionspec-no-switches': 
+	sed -e "s/^|//" >optionspec_no_switches <<\EOF
+|some-command [options] <args>...
+|
+|some-command does foo and bar!
+|--
+EOF
+
+ok 2 - setup optionspec-no-switches
+
+expecting success of 1502.3 'setup optionspec-only-hidden-switches': 
+	sed -e "s/^|//" >optionspec_only_hidden_switches <<\EOF
+|some-command [options] <args>...
+|
+|some-command does foo and bar!
+|--
+|hidden1* A hidden switch
+EOF
+
+ok 3 - setup optionspec-only-hidden-switches
+
+expecting success of 1502.4 'test --parseopt help output': 
+	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec &&
+	test_cmp "$TEST_DIRECTORY/t1502/optionspec.help" output
+
+ok 4 - test --parseopt help output
+
+expecting success of 1502.5 'test --parseopt help output no switches': 
+	sed -e "s/^|//" >expect <<\END_EXPECT &&
+|cat <<\EOF
+|usage: some-command [options] <args>...
+|
+|    some-command does foo and bar!
+|
+|EOF
+END_EXPECT
+	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_no_switches &&
+	test_cmp expect output
+
+ok 5 - test --parseopt help output no switches
+
+expecting success of 1502.6 'test --parseopt help output hidden switches': 
+	sed -e "s/^|//" >expect <<\END_EXPECT &&
+|cat <<\EOF
+|usage: some-command [options] <args>...
+|
+|    some-command does foo and bar!
+|
+|EOF
+END_EXPECT
+	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_only_hidden_switches &&
+	test_cmp expect output
+
+ok 6 - test --parseopt help output hidden switches
+
+expecting success of 1502.7 'test --parseopt help-all output hidden switches': 
+	sed -e "s/^|//" >expect <<\END_EXPECT &&
+|cat <<\EOF
+|usage: some-command [options] <args>...
+|
+|    some-command does foo and bar!
+|
+|    --[no-]hidden1        A hidden switch
+|
+|EOF
+END_EXPECT
+	test_expect_code 129 git rev-parse --parseopt -- --help-all > output < optionspec_only_hidden_switches &&
+	test_cmp expect output
+
+ok 7 - test --parseopt help-all output hidden switches
+
+expecting success of 1502.8 'test --parseopt invalid switch help output': 
+	{
+		cat <<-\EOF &&
+		error: unknown option `does-not-exist'
+		EOF
+		sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/optionspec.help"
+	} >expect &&
+	test_expect_code 129 git rev-parse --parseopt -- --does-not-exist 1>/dev/null 2>output < optionspec &&
+	test_cmp expect output
+
+ok 8 - test --parseopt invalid switch help output
+
+expecting success of 1502.9 'setup expect.1': 
+	cat > expect <<EOF
+set -- --foo --bar 'ham' -b --aswitch -- 'arg'
+EOF
+
+ok 9 - setup expect.1
+
+expecting success of 1502.10 'test --parseopt': 
+	git rev-parse --parseopt -- --foo --bar=ham --baz --aswitch arg < optionspec > output &&
+	test_cmp expect output
+
+ok 10 - test --parseopt
+
+expecting success of 1502.11 'test --parseopt with mixed options and arguments': 
+	git rev-parse --parseopt -- --foo arg --bar=ham --baz --aswitch < optionspec > output &&
+	test_cmp expect output
+
+ok 11 - test --parseopt with mixed options and arguments
+
+expecting success of 1502.12 'setup expect.2': 
+	cat > expect <<EOF
+set -- --foo -- 'arg' '--bar=ham'
+EOF
+
+ok 12 - setup expect.2
+
+expecting success of 1502.13 'test --parseopt with --': 
+	git rev-parse --parseopt -- --foo -- arg --bar=ham < optionspec > output &&
+	test_cmp expect output
+
+ok 13 - test --parseopt with --
+
+expecting success of 1502.14 'test --parseopt --stop-at-non-option': 
+	git rev-parse --parseopt --stop-at-non-option -- --foo arg --bar=ham < optionspec > output &&
+	test_cmp expect output
+
+ok 14 - test --parseopt --stop-at-non-option
+
+expecting success of 1502.15 'setup expect.3': 
+	cat > expect <<EOF
+set -- --foo -- '--' 'arg' '--bar=ham'
+EOF
+
+ok 15 - setup expect.3
+
+expecting success of 1502.16 'test --parseopt --keep-dashdash': 
+	git rev-parse --parseopt --keep-dashdash -- --foo -- arg --bar=ham < optionspec > output &&
+	test_cmp expect output
+
+ok 16 - test --parseopt --keep-dashdash
+
+expecting success of 1502.17 'setup expect.4': 
+	cat >expect <<EOF
+set -- --foo -- '--' 'arg' '--spam=ham'
+EOF
+
+ok 17 - setup expect.4
+
+expecting success of 1502.18 'test --parseopt --keep-dashdash --stop-at-non-option with --': 
+	git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo -- arg --spam=ham <optionspec >output &&
+	test_cmp expect output
+
+ok 18 - test --parseopt --keep-dashdash --stop-at-non-option with --
+
+expecting success of 1502.19 'setup expect.5': 
+	cat > expect <<EOF
+set -- --foo -- 'arg' '--spam=ham'
+EOF
+
+ok 19 - setup expect.5
+
+expecting success of 1502.20 'test --parseopt --keep-dashdash --stop-at-non-option without --': 
+	git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo arg --spam=ham <optionspec >output &&
+	test_cmp expect output
+
+ok 20 - test --parseopt --keep-dashdash --stop-at-non-option without --
+
+expecting success of 1502.21 'setup expect.6': 
+	cat > expect <<EOF
+set -- --foo --bar='z' --baz -C'Z' --data='A' -- 'arg'
+EOF
+
+ok 21 - setup expect.6
+
+expecting success of 1502.22 'test --parseopt --stuck-long': 
+	git rev-parse --parseopt --stuck-long -- --foo --bar=z -b arg -CZ -dA <optionspec >output &&
+	test_cmp expect output
+
+ok 22 - test --parseopt --stuck-long
+
+expecting success of 1502.23 'setup expect.7': 
+	cat > expect <<EOF
+set -- --data='' -C --baz -- 'arg'
+EOF
+
+ok 23 - setup expect.7
+
+expecting success of 1502.24 'test --parseopt --stuck-long and empty optional argument': 
+	git rev-parse --parseopt --stuck-long -- --data= arg -C -b <optionspec >output &&
+	test_cmp expect output
+
+ok 24 - test --parseopt --stuck-long and empty optional argument
+
+expecting success of 1502.25 'setup expect.8': 
+	cat > expect <<EOF
+set -- --data --baz -- 'arg'
+EOF
+
+ok 25 - setup expect.8
+
+expecting success of 1502.26 'test --parseopt --stuck-long and long option with unset optional argument': 
+	git rev-parse --parseopt --stuck-long -- --data arg -b <optionspec >output &&
+	test_cmp expect output
+
+ok 26 - test --parseopt --stuck-long and long option with unset optional argument
+
+expecting success of 1502.27 'test --parseopt --stuck-long and short option with unset optional argument': 
+	git rev-parse --parseopt --stuck-long -- -d arg -b <optionspec >output &&
+	test_cmp expect output
+
+ok 27 - test --parseopt --stuck-long and short option with unset optional argument
+
+expecting success of 1502.28 'test --parseopt help output: "wrapped" options normal "or:" lines': 
+	sed -e "s/^|//" >spec <<-\EOF &&
+	|cmd [--some-option]
+	|    [--another-option]
+	|cmd [--yet-another-option]
+	|--
+	|h,help!   show the help
+	EOF
+
+	sed -e "s/^|//" >expect <<-\END_EXPECT &&
+	|cat <<\EOF
+	|usage: cmd [--some-option]
+	|   or:     [--another-option]
+	|   or: cmd [--yet-another-option]
+	|
+	|    -h, --help            show the help
+	|
+	|EOF
+	END_EXPECT
+
+	test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
+	test_cmp expect actual
+
+ok 28 - test --parseopt help output: "wrapped" options normal "or:" lines
+
+expecting success of 1502.29 'test --parseopt invalid opt-spec': 
+	test_write_lines x -- "=, x" >spec &&
+	echo "fatal: missing opt-spec before option flags" >expect &&
+	test_must_fail git rev-parse --parseopt -- <spec 2>err &&
+	test_cmp expect err
+
+ok 29 - test --parseopt invalid opt-spec
+
+expecting success of 1502.30 'test --parseopt help output: multi-line blurb after empty line': 
+	sed -e "s/^|//" >spec <<-\EOF &&
+	|cmd [--some-option]
+	|    [--another-option]
+	|
+	|multi
+	|line
+	|blurb
+	|--
+	|h,help!   show the help
+	EOF
+
+	sed -e "s/^|//" >expect <<-\END_EXPECT &&
+	|cat <<\EOF
+	|usage: cmd [--some-option]
+	|   or:     [--another-option]
+	|
+	|    multi
+	|    line
+	|    blurb
+	|
+	|    -h, --help            show the help
+	|
+	|EOF
+	END_EXPECT
+
+	test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
+	test_cmp expect actual
+
+ok 30 - test --parseopt help output: multi-line blurb after empty line
+
+expecting success of 1502.31 'test --parseopt help output for optionspec-neg': 
+	test_expect_code 129 git rev-parse --parseopt -- \
+		-h >output <"$TEST_DIRECTORY/t1502/optionspec-neg" &&
+	test_cmp "$TEST_DIRECTORY/t1502/optionspec-neg.help" output
+
+ok 31 - test --parseopt help output for optionspec-neg
+
+expecting success of 1502.32 'test --parseopt valid options for optionspec-neg': 
+	cat >expect <<-\EOF &&
+	set -- --foo --no-foo --no-bar --positive-only --no-negative --
+	EOF
+	git rev-parse --parseopt -- <"$TEST_DIRECTORY/t1502/optionspec-neg" >output \
+	       --foo --no-foo --no-bar --positive-only --no-negative &&
+	test_cmp expect output
+
+ok 32 - test --parseopt valid options for optionspec-neg
+
+expecting success of 1502.33 'test --parseopt positivated option for optionspec-neg': 
+	cat >expect <<-\EOF &&
+	set -- --no-no-bar --no-no-bar --
+	EOF
+	git rev-parse --parseopt -- <"$TEST_DIRECTORY/t1502/optionspec-neg" >output \
+	       --no-no-bar --bar &&
+	test_cmp expect output
+
+ok 33 - test --parseopt positivated option for optionspec-neg
+
+expecting success of 1502.34 'test --parseopt invalid switch --no-positive-only help output for optionspec-neg': 
+		{
+			cat <<-\EOF &&
+			error: unknown option `no-positive-only'
+			EOF
+			sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/$spec.help"
+		} >expect &&
+		test_expect_code 129 git rev-parse --parseopt -- $opt \
+			2>output <"$TEST_DIRECTORY/t1502/$spec" &&
+		test_cmp expect output
+	
+ok 34 - test --parseopt invalid switch --no-positive-only help output for optionspec-neg
+
+expecting success of 1502.35 'test --parseopt invalid switch --negative help output for optionspec-neg': 
+		{
+			cat <<-\EOF &&
+			error: unknown option `negative'
+			EOF
+			sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/$spec.help"
+		} >expect &&
+		test_expect_code 129 git rev-parse --parseopt -- $opt \
+			2>output <"$TEST_DIRECTORY/t1502/$spec" &&
+		test_cmp expect output
+	
+ok 35 - test --parseopt invalid switch --negative help output for optionspec-neg
+
+expecting success of 1502.36 'test --parseopt invalid switch --no-no-negative help output for optionspec-neg': 
+		{
+			cat <<-\EOF &&
+			error: unknown option `no-no-negative'
+			EOF
+			sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/$spec.help"
+		} >expect &&
+		test_expect_code 129 git rev-parse --parseopt -- $opt \
+			2>output <"$TEST_DIRECTORY/t1502/$spec" &&
+		test_cmp expect output
+	
+ok 36 - test --parseopt invalid switch --no-no-negative help output for optionspec-neg
+
+expecting success of 1502.37 'ambiguous: --no matches both --noble and --no-noble': 
+	cat >spec <<-\EOF &&
+	some-command [options]
+	--
+	noble The feudal switch.
+	EOF
+	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	git rev-parse --parseopt -- <spec 2>err --no &&
+	grep "error: ambiguous option: no (could be --noble or --no-noble)" err
+
+cat <<\EOF
+usage: some-command [options]
+
+    --[no-]noble          The feudal switch.
+
+EOF
+error: ambiguous option: no (could be --noble or --no-noble)
+ok 37 - ambiguous: --no matches both --noble and --no-noble
+
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1503-rev-parse-verify.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1503-rev-parse-verify/.git/
 expecting success of 1503.1 'set up basic repo with 1 file (hello) and 4 commits': 
@@ -74333,6 +74157,1196 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1410-reflog.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/.git/
+expecting success of 1410.1 'setup': 
+	mkdir -p A/B &&
+	echo rat >C &&
+	echo ox >A/D &&
+	echo tiger >A/B/E &&
+	git add . &&
+
+	test_tick && git commit -m rabbit &&
+	H=$(git rev-parse --verify HEAD) &&
+	A=$(git rev-parse --verify HEAD:A) &&
+	B=$(git rev-parse --verify HEAD:A/B) &&
+	C=$(git rev-parse --verify HEAD:C) &&
+	D=$(git rev-parse --verify HEAD:A/D) &&
+	E=$(git rev-parse --verify HEAD:A/B/E) &&
+	check_fsck &&
+
+	test_chmod +x C &&
+	git add C &&
+	test_tick && git commit -m dragon &&
+	L=$(git rev-parse --verify HEAD) &&
+	check_fsck &&
+
+	rm -f C A/B/E &&
+	echo snake >F &&
+	echo horse >A/G &&
+	git add F A/G &&
+	test_tick && git commit -a -m sheep &&
+	F=$(git rev-parse --verify HEAD:F) &&
+	G=$(git rev-parse --verify HEAD:A/G) &&
+	I=$(git rev-parse --verify HEAD:A) &&
+	J=$(git rev-parse --verify HEAD) &&
+	check_fsck &&
+
+	rm -f A/G &&
+	test_tick && git commit -a -m monkey &&
+	K=$(git rev-parse --verify HEAD) &&
+	check_fsck &&
+
+	check_have A B C D E F G H I J K L &&
+
+	git prune &&
+
+	check_have A B C D E F G H I J K L &&
+
+	check_fsck &&
+
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
+
+[main (root-commit) 07fcc4f] rabbit
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 A/B/E
+ create mode 100644 A/D
+ create mode 100644 C
+[main 7d1a0b8] dragon
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 C
+[main 15ab5f0] sheep
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+), 2 deletions(-)
+ delete mode 100644 A/B/E
+ create mode 100644 A/G
+ delete mode 100755 C
+ create mode 100644 F
+[main 3ac530f] monkey
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 A/G
+tree
+tree
+blob
+blob
+blob
+blob
+blob
+commit
+tree
+commit
+commit
+commit
+tree
+tree
+blob
+blob
+blob
+blob
+blob
+commit
+tree
+commit
+commit
+commit
+ok 1 - setup
+
+expecting success of 1410.2 'correct usage on sub-command -h': 
+	test_expect_code 129 git reflog expire -h >err &&
+	grep "git reflog expire" err
+
+usage: git reflog expire [--expire=<time>] [--expire-unreachable=<time>]
+ok 2 - correct usage on sub-command -h
+
+expecting success of 1410.3 'correct usage on "git reflog show -h"': 
+	test_expect_code 129 git reflog show -h >err &&
+	grep -F "git reflog [show]" err
+
+usage: git reflog [show] [<log-options>] [<ref>]
+ok 3 - correct usage on "git reflog show -h"
+
+expecting success of 1410.4 'pass through -- to sub-command': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo message --a-file contents dash-tag &&
+
+	git -C repo reflog show -- --does-not-exist >out &&
+	test_must_be_empty out &&
+	git -C repo reflog show >expect &&
+	git -C repo reflog show -- --a-file >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) 85b7e86] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 --a-file
+ok 4 - pass through -- to sub-command
+
+expecting success of 1410.5 'rewind': 
+	test_tick && git reset --hard HEAD~2 &&
+	test -f C &&
+	test -f A/B/E &&
+	! test -f F &&
+	! test -f A/G &&
+
+	check_have A B C D E F G H I J K L &&
+
+	git prune &&
+
+	check_have A B C D E F G H I J K L &&
+
+	git reflog refs/heads/main >output &&
+	test_line_count = 5 output
+
+HEAD is now at 7d1a0b8 dragon
+tree
+tree
+blob
+blob
+blob
+blob
+blob
+commit
+tree
+commit
+commit
+commit
+tree
+tree
+blob
+blob
+blob
+blob
+blob
+commit
+tree
+commit
+commit
+commit
+ok 5 - rewind
+
+expecting success of 1410.6 'reflog expire should not barf on an annotated tag': 
+	test_when_finished "git tag -d v0.tag || :" &&
+	git -c core.logAllRefUpdates=always \
+		tag -a -m "tag name" v0.tag main &&
+	git reflog expire --dry-run refs/tags/v0.tag 2>err &&
+	test_grep ! "error: [Oo]bject .* not a commit" err
+
+Deleted tag 'v0.tag' (was dec1896)
+ok 6 - reflog expire should not barf on an annotated tag
+
+expecting success of 1410.7 'corrupt and check': 
+
+	corrupt $F &&
+	check_fsck "missing blob $F"
+
+
+missing blob 9ae84adb2704cbd49549e52169b4043871e13432
+ok 7 - corrupt and check
+
+expecting success of 1410.8 'reflog expire --dry-run should not touch reflog': 
+
+	git reflog expire --dry-run \
+		--expire=$(($test_tick - 10000)) \
+		--expire-unreachable=$(($test_tick - 10000)) \
+		--stale-fix \
+		--all &&
+
+	git reflog refs/heads/main >output &&
+	test_line_count = 5 output &&
+
+	check_fsck "missing blob $F"
+
+missing blob 9ae84adb2704cbd49549e52169b4043871e13432
+ok 8 - reflog expire --dry-run should not touch reflog
+
+expecting success of 1410.9 'reflog expire': 
+
+	git reflog expire --verbose \
+		--expire=$(($test_tick - 10000)) \
+		--expire-unreachable=$(($test_tick - 10000)) \
+		--stale-fix \
+		--all &&
+
+	git reflog refs/heads/main >output &&
+	test_line_count = 2 output &&
+
+	check_fsck "dangling commit $K"
+
+Marking reachable objects...
+keep commit (initial): rabbit
+keep commit: dragon
+prune commit: sheep
+prune commit: monkey
+prune reset: moving to HEAD~2
+keep commit (initial): rabbit
+keep commit: dragon
+prune commit: sheep
+prune commit: monkey
+prune reset: moving to HEAD~2
+dangling commit 3ac530f2f6c3a45206a6b2d455baf89d1c8f672d
+ok 9 - reflog expire
+
+expecting success of 1410.10 '--stale-fix handles missing objects generously': 
+	git -c core.logAllRefUpdates=false fast-import --date-format=now <<-EOS &&
+	commit refs/heads/stale-fix
+	mark :1
+	committer Author <a@uth.or> now
+	data <<EOF
+	start stale fix
+	EOF
+	M 100644 inline file
+	data <<EOF
+	contents
+	EOF
+	commit refs/heads/stale-fix
+	committer Author <a@uth.or> now
+	data <<EOF
+	stale fix branch tip
+	EOF
+	from :1
+	EOS
+
+	parent_oid=$(git rev-parse stale-fix^) &&
+	test_when_finished "recover $parent_oid" &&
+	corrupt $parent_oid &&
+	git reflog expire --stale-fix
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            4 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 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 (         1 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
+---------------------------------------------------------------------
+
+ok 10 - --stale-fix handles missing objects generously
+
+expecting success of 1410.11 'prune and fsck': 
+
+	git prune &&
+	check_fsck &&
+
+	check_have A B C D E H L &&
+	check_dont_have F G I J K
+
+
+tree
+tree
+blob
+blob
+blob
+commit
+commit
+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
+fatal: git cat-file: could not get object info
+fatal: git cat-file: could not get object info
+ok 11 - prune and fsck
+
+expecting success of 1410.12 'recover and check': 
+
+	recover $F &&
+	check_fsck "dangling blob $F"
+
+
+dangling blob 9ae84adb2704cbd49549e52169b4043871e13432
+ok 12 - recover and check
+
+expecting success of 1410.13 'delete': 
+	echo 1 > C &&
+	test_tick &&
+	git commit -m rat C &&
+
+	echo 2 > C &&
+	test_tick &&
+	git commit -m ox C &&
+
+	echo 3 > C &&
+	test_tick &&
+	git commit -m tiger C &&
+
+	HEAD_entry_count=$(git reflog | wc -l) &&
+	main_entry_count=$(git reflog show main | wc -l) &&
+
+	test $HEAD_entry_count = 5 &&
+	test $main_entry_count = 5 &&
+
+
+	git reflog delete main@{1} &&
+	git reflog show main > output &&
+	test_line_count = $(($main_entry_count - 1)) output &&
+	test $HEAD_entry_count = $(git reflog | wc -l) &&
+	! grep ox < output &&
+
+	main_entry_count=$(wc -l < output) &&
+
+	git reflog delete HEAD@{1} &&
+	test $(($HEAD_entry_count -1)) = $(git reflog | wc -l) &&
+	test $main_entry_count = $(git reflog show main | wc -l) &&
+
+	HEAD_entry_count=$(git reflog | wc -l) &&
+
+	git reflog delete main@{07.04.2005.15:15:00.-0700} &&
+	git reflog show main > output &&
+	test_line_count = $(($main_entry_count - 1)) output &&
+	! grep dragon < output
+
+
+[main f392752] rat
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 7e525ff] ox
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 3740c00] tiger
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 13 - delete
+
+expecting success of 1410.14 'rewind2': 
+
+	test_tick && git reset --hard HEAD~2 &&
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
+
+HEAD is now at f392752 rat
+ok 14 - rewind2
+
+expecting success of 1410.15 '--expire=never': 
+
+	git reflog expire --verbose \
+		--expire=never \
+		--expire-unreachable=never \
+		--all &&
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
+
+keep commit (initial): rabbit
+keep commit: dragon
+keep commit: rat
+keep commit: tiger
+keep reset: moving to HEAD~2
+keep commit (initial): rabbit
+keep commit: rat
+keep commit: tiger
+keep reset: moving to HEAD~2
+ok 15 - --expire=never
+
+expecting success of 1410.16 'gc.reflogexpire=never': 
+	test_config gc.reflogexpire never &&
+	test_config gc.reflogexpireunreachable never &&
+
+	git reflog expire --verbose --all >output &&
+	test_line_count = 9 output &&
+
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
+
+ok 16 - gc.reflogexpire=never
+
+expecting success of 1410.17 'gc.reflogexpire=false': 
+	test_config gc.reflogexpire false &&
+	test_config gc.reflogexpireunreachable false &&
+
+	git reflog expire --verbose --all &&
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
+
+
+keep commit (initial): rabbit
+keep commit: dragon
+keep commit: rat
+keep commit: tiger
+keep reset: moving to HEAD~2
+keep commit (initial): rabbit
+keep commit: rat
+keep commit: tiger
+keep reset: moving to HEAD~2
+ok 17 - gc.reflogexpire=false
+
+expecting success of 1410.18 'git reflog expire unknown reference': 
+	test_config gc.reflogexpire never &&
+	test_config gc.reflogexpireunreachable never &&
+
+	test_must_fail git reflog expire main@{123} 2>stderr &&
+	test_grep "error: reflog could not be found: ${SQ}main@{123}${SQ}" stderr &&
+	test_must_fail git reflog expire does-not-exist 2>stderr &&
+	test_grep "error: reflog could not be found: ${SQ}does-not-exist${SQ}" stderr
+
+error: reflog could not be found: 'main@{123}'
+error: reflog could not be found: 'does-not-exist'
+ok 18 - git reflog expire unknown reference
+
+expecting success of 1410.19 'checkout should not delete log for packed ref': 
+	test $(git reflog main | wc -l) = 4 &&
+	git branch foo &&
+	git pack-refs --all &&
+	git checkout foo &&
+	test $(git reflog main | wc -l) = 4
+
+Switched to branch 'foo'
+ok 19 - checkout should not delete log for packed ref
+
+expecting success of 1410.20 'stale dirs do not cause d/f conflicts (reflogs on)': 
+	test_when_finished "git branch -d one || git branch -d one/two" &&
+
+	git branch one/two main &&
+	echo "one/two@{0} branch: Created from main" >expect &&
+	git log -g --format="%gd %gs" one/two >actual &&
+	test_cmp expect actual &&
+	git branch -d one/two &&
+
+	# now logs/refs/heads/one is a stale directory, but
+	# we should move it out of the way to create "one" reflog
+	git branch one main &&
+	echo "one@{0} branch: Created from main" >expect &&
+	git log -g --format="%gd %gs" one >actual &&
+	test_cmp expect actual
+
+Deleted branch one/two (was f392752).
+Deleted branch one (was f392752).
+ok 20 - stale dirs do not cause d/f conflicts (reflogs on)
+
+expecting success of 1410.21 'stale dirs do not cause d/f conflicts (reflogs off)': 
+	test_when_finished "git branch -d one || git branch -d one/two" &&
+
+	git branch one/two main &&
+	echo "one/two@{0} branch: Created from main" >expect &&
+	git log -g --format="%gd %gs" one/two >actual &&
+	test_cmp expect actual &&
+	git branch -d one/two &&
+
+	# same as before, but we only create a reflog for "one" if
+	# it already exists, which it does not
+	git -c core.logallrefupdates=false branch one main &&
+	git log -g --format="%gd %gs" one >actual &&
+	test_must_be_empty actual
+
+Deleted branch one/two (was f392752).
+Deleted branch one (was f392752).
+ok 21 - stale dirs do not cause d/f conflicts (reflogs off)
+
+expecting success of 1410.22 'no segfaults for reflog containing non-commit sha1s': 
+	git update-ref --create-reflog -m "Creating ref" \
+		refs/tests/tree-in-reflog HEAD &&
+	git update-ref -m "Forcing tree" refs/tests/tree-in-reflog HEAD^{tree} &&
+	git update-ref -m "Restoring to commit" refs/tests/tree-in-reflog HEAD &&
+	git reflog refs/tests/tree-in-reflog
+
+f392752 refs/tests/tree-in-reflog@{0}: Restoring to commit
+f392752 refs/tests/tree-in-reflog@{2}: Creating ref
+ok 22 - no segfaults for reflog containing non-commit sha1s
+
+checking known breakage of 1410.23 'reflog with non-commit entries displays all entries': 
+	git reflog refs/tests/tree-in-reflog >actual &&
+	test_line_count = 3 actual
+
+test_line_count: line count for actual != 3
+f392752 refs/tests/tree-in-reflog@{0}: Restoring to commit
+f392752 refs/tests/tree-in-reflog@{2}: Creating ref
+not ok 23 - reflog with non-commit entries displays all entries # TODO known breakage
+
+expecting success of 1410.24 'continue walking past root commits': 
+	git init orphanage &&
+	(
+		cd orphanage &&
+		cat >expect <<-\EOF &&
+		HEAD@{0} commit (initial): orphan2-1
+		HEAD@{1} commit: orphan1-2
+		HEAD@{2} commit (initial): orphan1-1
+		HEAD@{3} commit (initial): initial
+		EOF
+		test_commit initial &&
+		git checkout --orphan orphan1 &&
+		test_commit orphan1-1 &&
+		test_commit orphan1-2 &&
+		git checkout --orphan orphan2 &&
+		test_commit orphan2-1 &&
+		git log -g --format="%gd %gs" >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/orphanage/.git/
+[main (root-commit) 3805046] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch 'orphan1'
+[orphan1 (root-commit) 5906753] orphan1-1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 initial.t
+ create mode 100644 orphan1-1.t
+[orphan1 4e641d7] orphan1-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 orphan1-2.t
+Switched to a new branch 'orphan2'
+[orphan2 (root-commit) 593a89b] orphan2-1
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 initial.t
+ create mode 100644 orphan1-1.t
+ create mode 100644 orphan1-2.t
+ create mode 100644 orphan2-1.t
+ok 24 - continue walking past root commits
+
+expecting success of 1410.25 'expire with multiple worktrees': 
+	git init main-wt &&
+	(
+		cd main-wt &&
+		test_tick &&
+		test_commit foo &&
+		git  worktree add link-wt &&
+		test_tick &&
+		test_commit -C link-wt foobar &&
+		test_tick &&
+		git reflog expire --verbose --all --expire=$test_tick &&
+		test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD >actual &&
+		test_must_be_empty actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/main-wt/.git/
+[main (root-commit) 7745948] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Preparing worktree (new branch 'link-wt')
+HEAD is now at 7745948 foo
+[link-wt 25ae450] foobar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foobar.t
+prune commit (initial): foo
+prune branch: Created from HEAD
+prune commit: foobar
+prune commit (initial): foo
+prune 
+prune reset: moving to HEAD
+prune commit: foobar
+ok 25 - expire with multiple worktrees
+
+expecting success of 1410.26 'expire one of multiple worktrees': 
+	git init main-wt2 &&
+	(
+		cd main-wt2 &&
+		test_tick &&
+		test_commit foo &&
+		git worktree add link-wt &&
+		test_tick &&
+		test_commit -C link-wt foobar &&
+		test_tick &&
+		test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD \
+			>expect-link-wt &&
+		git reflog expire --verbose --all --expire=$test_tick \
+			--single-worktree &&
+		test-tool ref-store worktree:main for-each-reflog-ent HEAD \
+			>actual-main &&
+		test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD \
+			>actual-link-wt &&
+		test_must_be_empty actual-main &&
+		test_cmp expect-link-wt actual-link-wt
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/main-wt2/.git/
+[main (root-commit) 7745948] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Preparing worktree (new branch 'link-wt')
+HEAD is now at 7745948 foo
+[link-wt 25ae450] foobar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foobar.t
+prune commit (initial): foo
+prune branch: Created from HEAD
+prune commit: foobar
+prune commit (initial): foo
+ok 26 - expire one of multiple worktrees
+
+expecting success of 1410.27 'empty reflog': 
+	test_when_finished "rm -rf empty" &&
+	git init empty &&
+	test_commit -C empty A &&
+	test-tool ref-store main create-reflog 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.51.0/t/trash directory.t1410-reflog/empty/.git/
+[main (root-commit) d4404d5] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 27 - empty reflog
+
+expecting success of 1410.28 'list reflogs': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		git reflog list >actual &&
+		test_must_be_empty actual &&
+
+		test_commit A &&
+		cat >expect <<-EOF &&
+		HEAD
+		refs/heads/main
+		EOF
+		git reflog list >actual &&
+		test_cmp expect actual &&
+
+		git branch b &&
+		cat >expect <<-EOF &&
+		HEAD
+		refs/heads/b
+		refs/heads/main
+		EOF
+		git reflog list >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 28 - list reflogs
+
+expecting success of 1410.29 'list reflogs with worktree': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+
+		test_commit A &&
+		git worktree add wt &&
+		git -c core.logAllRefUpdates=always \
+			update-ref refs/worktree/main HEAD &&
+		git -c core.logAllRefUpdates=always \
+			update-ref refs/worktree/per-worktree HEAD &&
+		git -c core.logAllRefUpdates=always -C wt \
+			update-ref refs/worktree/per-worktree HEAD &&
+		git -c core.logAllRefUpdates=always -C wt \
+			update-ref refs/worktree/worktree HEAD &&
+
+		cat >expect <<-EOF &&
+		HEAD
+		refs/heads/main
+		refs/heads/wt
+		refs/worktree/main
+		refs/worktree/per-worktree
+		EOF
+		git reflog list >actual &&
+		test_cmp expect actual &&
+
+		cat >expect <<-EOF &&
+		HEAD
+		refs/heads/main
+		refs/heads/wt
+		refs/worktree/per-worktree
+		refs/worktree/worktree
+		EOF
+		git -C wt reflog list >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Preparing worktree (new branch 'wt')
+HEAD is now at fa70208 A
+ok 29 - list reflogs with worktree
+
+expecting success of 1410.30 'reflog list returns error with additional args': 
+	cat >expect <<-EOF &&
+	error: list does not accept arguments: ${SQ}bogus${SQ}
+	EOF
+	test_must_fail git reflog list bogus 2>err &&
+	test_cmp expect err
+
+ok 30 - reflog list returns error with additional args
+
+expecting success of 1410.31 'reflog for symref with unborn target can be listed': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		git symbolic-ref HEAD refs/heads/unborn &&
+		cat >expect <<-EOF &&
+		HEAD
+		refs/heads/main
+		EOF
+		git reflog list >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 31 - reflog for symref with unborn target can be listed
+
+expecting success of 1410.32 'reflog with invalid object ID can be listed': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		test-tool ref-store main update-ref msg refs/heads/missing \
+			$(test_oid deadbeef) "$ZERO_OID" REF_SKIP_OID_VERIFICATION &&
+		cat >expect <<-EOF &&
+		HEAD
+		refs/heads/main
+		refs/heads/missing
+		EOF
+		git reflog list >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 32 - reflog with invalid object ID can be listed
+
+expecting success of 1410.33 'reflog drop non-existent ref': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_must_fail git reflog exists refs/heads/non-existent &&
+		test_must_fail git reflog drop refs/heads/non-existent 2>stderr &&
+		test_grep "error: reflog could not be found: ${SQ}refs/heads/non-existent${SQ}" stderr
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
+error: reflog could not be found: 'refs/heads/non-existent'
+ok 33 - reflog drop non-existent ref
+
+expecting success of 1410.34 'reflog drop': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		test_commit_bulk --ref=refs/heads/branch 1 &&
+		git reflog exists refs/heads/main &&
+		git reflog exists refs/heads/branch &&
+		git reflog drop refs/heads/main &&
+		test_must_fail git reflog exists refs/heads/main &&
+		git reflog exists refs/heads/branch
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+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
+---------------------------------------------------------------------
+
+ok 34 - reflog drop
+
+expecting success of 1410.35 'reflog drop multiple references': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		test_commit_bulk --ref=refs/heads/branch 1 &&
+		git reflog exists refs/heads/main &&
+		git reflog exists refs/heads/branch &&
+		git reflog drop refs/heads/main refs/heads/branch &&
+		test_must_fail git reflog exists refs/heads/main &&
+		test_must_fail git reflog exists refs/heads/branch
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+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
+---------------------------------------------------------------------
+
+ok 35 - reflog drop multiple references
+
+expecting success of 1410.36 'reflog drop multiple references some non-existent': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		test_commit_bulk --ref=refs/heads/branch 1 &&
+		git reflog exists refs/heads/main &&
+		git reflog exists refs/heads/branch &&
+		test_must_fail git reflog exists refs/heads/non-existent &&
+		test_must_fail git reflog drop refs/heads/main refs/heads/non-existent refs/heads/branch 2>stderr &&
+		test_must_fail git reflog exists refs/heads/main &&
+		test_must_fail git reflog exists refs/heads/branch &&
+		test_must_fail git reflog exists refs/heads/non-existent &&
+		test_grep "error: reflog could not be found: ${SQ}refs/heads/non-existent${SQ}" stderr
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+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
+---------------------------------------------------------------------
+
+error: reflog could not be found: 'refs/heads/non-existent'
+ok 36 - reflog drop multiple references some non-existent
+
+expecting success of 1410.37 'reflog drop --all': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		test_commit_bulk --ref=refs/heads/branch 1 &&
+		git reflog exists refs/heads/main &&
+		git reflog exists refs/heads/branch &&
+		git reflog drop --all &&
+		test_must_fail git reflog exists refs/heads/main &&
+		test_must_fail git reflog exists refs/heads/branch
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+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
+---------------------------------------------------------------------
+
+ok 37 - reflog drop --all
+
+expecting success of 1410.38 'reflog drop --all multiple worktrees': 
+	test_when_finished "rm -rf repo" &&
+	test_when_finished "rm -rf wt" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		git worktree add ../wt &&
+		test_commit_bulk -C ../wt --ref=refs/heads/branch 1 &&
+		git reflog exists refs/heads/main &&
+		git reflog exists refs/heads/branch &&
+		git reflog drop --all &&
+		test_must_fail git reflog exists refs/heads/main &&
+		test_must_fail git reflog exists refs/heads/branch
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Preparing worktree (new branch 'wt')
+HEAD is now at fa70208 A
+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
+---------------------------------------------------------------------
+
+ok 38 - reflog drop --all multiple worktrees
+
+expecting success of 1410.39 'reflog drop --all --single-worktree': 
+	test_when_finished "rm -rf repo" &&
+	test_when_finished "rm -rf wt" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		git worktree add ../wt &&
+		test_commit -C ../wt foobar &&
+		git reflog exists refs/heads/main &&
+		git reflog exists refs/heads/wt &&
+		test-tool ref-store worktree:wt reflog-exists HEAD &&
+		git reflog drop --all --single-worktree &&
+		test_must_fail git reflog exists refs/heads/main &&
+		test_must_fail git reflog exists refs/heads/wt &&
+		test_must_fail test-tool ref-store worktree:main reflog-exists HEAD &&
+		test-tool ref-store worktree:wt reflog-exists HEAD
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Preparing worktree (new branch 'wt')
+HEAD is now at fa70208 A
+[wt d79f02a] foobar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foobar.t
+ok 39 - reflog drop --all --single-worktree
+
+expecting success of 1410.40 'reflog drop --all with reference': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		test_must_fail git reflog drop --all refs/heads/main 2>stderr &&
+		test_grep "usage: references specified along with --all" stderr
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+usage: references specified along with --all
+ok 40 - reflog drop --all with reference
+
+expecting success of 1410.41 'expire with pattern config': 
+	# Split refs/heads/ into two roots so we can apply config to each. Make
+	# two branches per root to verify that config is applied correctly
+	# multiple times.
+	git branch root1/branch1 &&
+	git branch root1/branch2 &&
+	git branch root2/branch1 &&
+	git branch root2/branch2 &&
+
+	test_config "gc.reflogexpire" "never" &&
+	test_config "gc.refs/heads/root2/*.reflogExpire" "now" &&
+	git reflog expire \
+		root1/branch1 root1/branch2 \
+		root2/branch1 root2/branch2 &&
+
+	cat >expect <<-\EOF &&
+	root1/branch1@{0}
+	root1/branch2@{0}
+	EOF
+	git log -g --branches="root*" --format=%gD >actual.raw &&
+	# The sole reflog entry of each branch points to the same commit, so
+	# the order in which they are shown is nondeterministic. We just care
+	# about the what was expired (and what was not), so sort to get a known
+	# order.
+	sort <actual.raw >actual.sorted &&
+	test_cmp expect actual.sorted
+
+ok 41 - expire with pattern config
+
+# still have 1 known breakage(s)
+# passed all remaining 40 test(s)
+1..41
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1505-rev-parse-last.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1505-rev-parse-last/.git/
+expecting success of 1505.1 'setup': 
+
+	make_commit 1 &&
+	git branch side &&
+	make_commit 2 &&
+	make_commit 3 &&
+	git checkout side &&
+	make_commit 4 &&
+	git merge main &&
+	git checkout main
+
+
+[main (root-commit) c11cd10] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1
+[main ba98451] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2
+[main aefd701] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3
+Switched to branch 'side'
+[side 1d4df77] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4
+Merge made by the 'ort' strategy.
+ 2 | 1 +
+ 3 | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 2
+ create mode 100644 3
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 1505.2 '@{-1} works': 
+	test_cmp_rev side @{-1}
+
+ok 2 - @{-1} works
+
+expecting success of 1505.3 '@{-1}~2 works': 
+	test_cmp_rev side~2 @{-1}~2
+
+ok 3 - @{-1}~2 works
+
+expecting success of 1505.4 '@{-1}^2 works': 
+	test_cmp_rev side^2 @{-1}^2
+
+ok 4 - @{-1}^2 works
+
+expecting success of 1505.5 '@{-1}@{1} works': 
+	test_cmp_rev side@{1} @{-1}@{1}
+
+ok 5 - @{-1}@{1} works
+
+expecting success of 1505.6 '@{-2} works': 
+	test_cmp_rev main @{-2}
+
+ok 6 - @{-2} works
+
+expecting success of 1505.7 '@{-3} fails': 
+	test_must_fail git rev-parse @{-3}
+
+fatal: ambiguous argument '@{-3}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+@{-3}
+ok 7 - @{-3} fails
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1504-ceiling-dirs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1504-ceiling-dirs/.git/
 expecting success of 1504.1 'no_ceil: git rev-parse --show-prefix is ''': 
@@ -74644,6 +75658,11 @@
 1..44
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1509-root-work-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1500-rev-parse.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1500-rev-parse/.git/
 expecting success of 1500.1 'setup': 
@@ -76172,89 +77191,6 @@
 1..80
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1505-rev-parse-last.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1505-rev-parse-last/.git/
-expecting success of 1505.1 'setup': 
-
-	make_commit 1 &&
-	git branch side &&
-	make_commit 2 &&
-	make_commit 3 &&
-	git checkout side &&
-	make_commit 4 &&
-	git merge main &&
-	git checkout main
-
-
-[main (root-commit) c11cd10] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1
-[main ba98451] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2
-[main aefd701] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3
-Switched to branch 'side'
-[side 1d4df77] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4
-Merge made by the 'ort' strategy.
- 2 | 1 +
- 3 | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 2
- create mode 100644 3
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 1505.2 '@{-1} works': 
-	test_cmp_rev side @{-1}
-
-ok 2 - @{-1} works
-
-expecting success of 1505.3 '@{-1}~2 works': 
-	test_cmp_rev side~2 @{-1}~2
-
-ok 3 - @{-1}~2 works
-
-expecting success of 1505.4 '@{-1}^2 works': 
-	test_cmp_rev side^2 @{-1}^2
-
-ok 4 - @{-1}^2 works
-
-expecting success of 1505.5 '@{-1}@{1} works': 
-	test_cmp_rev side@{1} @{-1}@{1}
-
-ok 5 - @{-1}@{1} works
-
-expecting success of 1505.6 '@{-2} works': 
-	test_cmp_rev main @{-2}
-
-ok 6 - @{-2} works
-
-expecting success of 1505.7 '@{-3} fails': 
-	test_must_fail git rev-parse @{-3}
-
-fatal: ambiguous argument '@{-3}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-@{-3}
-ok 7 - @{-3} fails
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1509-root-work-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1506-rev-parse-diagnosis.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1506-rev-parse-diagnosis/.git/
 expecting success of 1506.1 'set up basic repo': 
@@ -77736,6 +78672,50 @@
 1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1515-rev-parse-outside-repo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1515-rev-parse-outside-repo/.git/
+expecting success of 1515.1 'set up non-repo directory': 
+	GIT_CEILING_DIRECTORIES=$(pwd) &&
+	export GIT_CEILING_DIRECTORIES &&
+	mkdir non-repo &&
+	cd non-repo &&
+	# confirm that git does not find a repo
+	test_must_fail git rev-parse --git-dir
+
+fatal: not a git repository (or any of the parent directories): .git
+ok 1 - set up non-repo directory
+
+expecting success of 1515.2 'rev-parse --sq-quote': 
+	dump_args "$tricky" easy >expect &&
+	eval "dump_args $(git rev-parse --sq-quote "$tricky" easy)" >actual &&
+	test_cmp expect actual
+
+ok 2 - rev-parse --sq-quote
+
+expecting success of 1515.3 'rev-parse --local-env-vars': 
+	git rev-parse --local-env-vars >actual &&
+	# we do not want to depend on the complete list here,
+	# so just look for something plausible
+	grep ^GIT_DIR actual
+
+GIT_DIR
+ok 3 - rev-parse --local-env-vars
+
+expecting success of 1515.4 'rev-parse --resolve-git-dir': 
+	git init --separate-git-dir repo dir &&
+	test_must_fail git rev-parse --resolve-git-dir . &&
+	echo "$(pwd)/repo" >expect &&
+	git rev-parse --resolve-git-dir dir/.git >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1515-rev-parse-outside-repo/non-repo/repo/
+fatal: not a gitdir '.'
+ok 4 - rev-parse --resolve-git-dir
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1513-rev-parse-prefix.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1513-rev-parse-prefix/.git/
 expecting success of 1513.1 'setup': 
@@ -77848,50 +78828,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1515-rev-parse-outside-repo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1515-rev-parse-outside-repo/.git/
-expecting success of 1515.1 'set up non-repo directory': 
-	GIT_CEILING_DIRECTORIES=$(pwd) &&
-	export GIT_CEILING_DIRECTORIES &&
-	mkdir non-repo &&
-	cd non-repo &&
-	# confirm that git does not find a repo
-	test_must_fail git rev-parse --git-dir
-
-fatal: not a git repository (or any of the parent directories): .git
-ok 1 - set up non-repo directory
-
-expecting success of 1515.2 'rev-parse --sq-quote': 
-	dump_args "$tricky" easy >expect &&
-	eval "dump_args $(git rev-parse --sq-quote "$tricky" easy)" >actual &&
-	test_cmp expect actual
-
-ok 2 - rev-parse --sq-quote
-
-expecting success of 1515.3 'rev-parse --local-env-vars': 
-	git rev-parse --local-env-vars >actual &&
-	# we do not want to depend on the complete list here,
-	# so just look for something plausible
-	grep ^GIT_DIR actual
-
-GIT_DIR
-ok 3 - rev-parse --local-env-vars
-
-expecting success of 1515.4 'rev-parse --resolve-git-dir': 
-	git init --separate-git-dir repo dir &&
-	test_must_fail git rev-parse --resolve-git-dir . &&
-	echo "$(pwd)/repo" >expect &&
-	git rev-parse --resolve-git-dir dir/.git >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1515-rev-parse-outside-repo/non-repo/repo/
-fatal: not a gitdir '.'
-ok 4 - rev-parse --resolve-git-dir
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1514-rev-parse-push.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1514-rev-parse-push/.git/
 expecting success of 1514.1 'setup': 
@@ -78010,6 +78946,179 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1517-outside-repo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1517-outside-repo/.git/
+expecting success of 1517.1 'set up a non-repo directory and test file': 
+	GIT_CEILING_DIRECTORIES=$(pwd) &&
+	export GIT_CEILING_DIRECTORIES &&
+	mkdir non-repo &&
+	(
+		cd non-repo &&
+		# confirm that git does not find a repo
+		test_must_fail git rev-parse --git-dir
+	) &&
+	test_write_lines one two three four >nums &&
+	git add nums &&
+	cp nums nums.old &&
+	test_write_lines five >>nums &&
+	git diff >sample.patch
+
+fatal: not a git repository (or any of the parent directories): .git
+ok 1 - set up a non-repo directory and test file
+
+expecting success of 1517.2 'compute a patch-id outside repository (uses SHA-1)': 
+	nongit env GIT_DEFAULT_HASH=sha1 \
+		git patch-id <sample.patch >patch-id.expect &&
+	nongit \
+		git patch-id <sample.patch >patch-id.actual &&
+	test_cmp patch-id.expect patch-id.actual
+
+ok 2 - compute a patch-id outside repository (uses SHA-1)
+
+expecting success of 1517.3 'hash-object outside repository (uses SHA-1)': 
+	nongit env GIT_DEFAULT_HASH=sha1 \
+		git hash-object --stdin <sample.patch >hash.expect &&
+	nongit \
+		git hash-object --stdin <sample.patch >hash.actual &&
+	test_cmp hash.expect hash.actual
+
+ok 3 - hash-object outside repository (uses SHA-1)
+
+expecting success of 1517.4 'apply a patch outside repository': 
+	(
+		cd non-repo &&
+		cp ../nums.old nums &&
+		git apply ../sample.patch
+	) &&
+	test_cmp nums non-repo/nums
+
+ok 4 - apply a patch outside repository
+
+expecting success of 1517.5 'grep outside repository': 
+	git grep --cached two >expect &&
+	(
+		cd non-repo &&
+		cp ../nums.old nums &&
+		git grep --no-index two >../actual
+	) &&
+	test_cmp expect actual
+
+ok 5 - grep outside repository
+
+expecting success of 1517.6 'imap-send outside repository': 
+	test_config_global imap.host imaps://localhost &&
+	test_config_global imap.folder Drafts &&
+
+	echo nothing to send >expect &&
+	test_must_fail git imap-send -v </dev/null 2>actual &&
+	test_cmp expect actual &&
+
+	(
+		cd non-repo &&
+		test_must_fail git imap-send -v </dev/null 2>../actual
+	) &&
+	test_cmp expect actual
+
+ok 6 - imap-send outside repository
+
+expecting success of 1517.7 'check-ref-format outside repository': 
+	git check-ref-format --branch refs/heads/xyzzy >expect &&
+	nongit git check-ref-format --branch refs/heads/xyzzy >actual &&
+	test_cmp expect actual
+
+ok 7 - check-ref-format outside repository
+
+expecting success of 1517.8 'diff outside repository': 
+	echo one >one &&
+	echo two >two &&
+	test_must_fail git diff --no-index one two >expect.raw &&
+	(
+		cd non-repo &&
+		cp ../one . &&
+		cp ../two . &&
+		test_must_fail git diff one two >../actual.raw
+	) &&
+	# outside repository diff falls back to SHA-1 but
+	# GIT_DEFAULT_HASH may be set to sha256 on the in-repo side.
+	sed -e "/^index /d" expect.raw >expect &&
+	sed -e "/^index /d" actual.raw >actual &&
+	test_cmp expect actual
+
+ok 8 - diff outside repository
+
+expecting success of 1517.9 'stripspace outside repository': 
+	nongit git stripspace -s </dev/null
+
+ok 9 - stripspace outside repository
+
+expecting success of 1517.10 'remote-http outside repository': 
+	test_must_fail git remote-http 2>actual &&
+	test_grep "^error: remote-curl" actual &&
+	(
+		cd non-repo &&
+		test_must_fail git remote-http 2>../actual
+	) &&
+	test_grep "^error: remote-curl" actual
+
+error: remote-curl: usage: git remote-curl <remote> [<url>]
+error: remote-curl: usage: git remote-curl <remote> [<url>]
+ok 10 - remote-http outside repository
+
+expecting success of 1517.11 'update-server-info does not crash with -h': 
+	test_expect_code 129 git update-server-info -h >usage &&
+	test_grep "[Uu]sage: git update-server-info " usage &&
+	test_expect_code 129 nongit git update-server-info -h >usage &&
+	test_grep "[Uu]sage: git update-server-info " usage
+
+usage: git update-server-info [-f | --force]
+usage: git update-server-info [-f | --force]
+ok 11 - update-server-info does not crash with -h
+
+expecting success of 1517.12 'prune does not crash with -h': 
+	test_expect_code 129 git prune -h >usage &&
+	test_grep "[Uu]sage: git prune " usage &&
+	test_expect_code 129 nongit git prune -h >usage &&
+	test_grep "[Uu]sage: git prune " usage
+
+usage: git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]
+usage: git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]
+ok 12 - prune does not crash with -h
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1601-index-bogus.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1601-index-bogus/.git/
+expecting success of 1601.1 'create tree with null sha1': 
+	tree=$(printf "160000 commit $ZERO_OID\\tbroken\\n" | git mktree)
+
+ok 1 - create tree with null sha1
+
+expecting success of 1601.2 'read-tree refuses to read null sha1': 
+	test_must_fail git read-tree $tree
+
+error: cache entry has null sha1: broken
+fatal: unable to write new index file
+ok 2 - read-tree refuses to read null sha1
+
+expecting success of 1601.3 'GIT_ALLOW_NULL_SHA1 overrides refusal': 
+	GIT_ALLOW_NULL_SHA1=1 git read-tree $tree
+
+warning: cache entry has null sha1: broken
+ok 3 - GIT_ALLOW_NULL_SHA1 overrides refusal
+
+expecting success of 1601.4 'git write-tree refuses to write null sha1': 
+	test_must_fail git write-tree
+
+error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
+fatal: git-write-tree: error building trees
+ok 4 - git write-tree refuses to write null sha1
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1512-rev-parse-disambiguation.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1512-rev-parse-disambiguation/.git/
 expecting success of 1512.1 'ambiguous blob output': 
@@ -78747,177 +79856,133 @@
 1..38
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1517-outside-repo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1517-outside-repo/.git/
-expecting success of 1517.1 'set up a non-repo directory and test file': 
-	GIT_CEILING_DIRECTORIES=$(pwd) &&
-	export GIT_CEILING_DIRECTORIES &&
-	mkdir non-repo &&
-	(
-		cd non-repo &&
-		# confirm that git does not find a repo
-		test_must_fail git rev-parse --git-dir
-	) &&
-	test_write_lines one two three four >nums &&
-	git add nums &&
-	cp nums nums.old &&
-	test_write_lines five >>nums &&
-	git diff >sample.patch
+*** t1600-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1600-index/.git/
+expecting success of 1600.1 'setup': 
+	echo 1 >a
 
-fatal: not a git repository (or any of the parent directories): .git
-ok 1 - set up a non-repo directory and test file
+ok 1 - setup
 
-expecting success of 1517.2 'compute a patch-id outside repository (uses SHA-1)': 
-	nongit env GIT_DEFAULT_HASH=sha1 \
-		git patch-id <sample.patch >patch-id.expect &&
-	nongit \
-		git patch-id <sample.patch >patch-id.actual &&
-	test_cmp patch-id.expect patch-id.actual
+expecting success of 1600.2 'bogus GIT_INDEX_VERSION issues warning': 
+	(
+		rm -f .git/index &&
+		GIT_INDEX_VERSION=2bogus &&
+		export GIT_INDEX_VERSION &&
+		git add a 2>err &&
+		sed "s/[0-9]//" err >actual.err &&
+		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
+			warning: GIT_INDEX_VERSION set, but the value is invalid.
+			Using version Z
+		EOF
+		test_cmp expect.err actual.err
+	)
 
-ok 2 - compute a patch-id outside repository (uses SHA-1)
+ok 2 - bogus GIT_INDEX_VERSION issues warning
 
-expecting success of 1517.3 'hash-object outside repository (uses SHA-1)': 
-	nongit env GIT_DEFAULT_HASH=sha1 \
-		git hash-object --stdin <sample.patch >hash.expect &&
-	nongit \
-		git hash-object --stdin <sample.patch >hash.actual &&
-	test_cmp hash.expect hash.actual
+expecting success of 1600.3 'out of bounds GIT_INDEX_VERSION issues warning': 
+	(
+		rm -f .git/index &&
+		GIT_INDEX_VERSION=1 &&
+		export GIT_INDEX_VERSION &&
+		git add a 2>err &&
+		sed "s/[0-9]//" err >actual.err &&
+		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
+			warning: GIT_INDEX_VERSION set, but the value is invalid.
+			Using version Z
+		EOF
+		test_cmp expect.err actual.err
+	)
 
-ok 3 - hash-object outside repository (uses SHA-1)
+ok 3 - out of bounds GIT_INDEX_VERSION issues warning
 
-expecting success of 1517.4 'apply a patch outside repository': 
+expecting success of 1600.4 'no warning with bogus GIT_INDEX_VERSION and existing index': 
 	(
-		cd non-repo &&
-		cp ../nums.old nums &&
-		git apply ../sample.patch
-	) &&
-	test_cmp nums non-repo/nums
+		GIT_INDEX_VERSION=1 &&
+		export GIT_INDEX_VERSION &&
+		git add a 2>actual.err &&
+		test_must_be_empty actual.err
+	)
 
-ok 4 - apply a patch outside repository
+ok 4 - no warning with bogus GIT_INDEX_VERSION and existing index
 
-expecting success of 1517.5 'grep outside repository': 
-	git grep --cached two >expect &&
+expecting success of 1600.5 'out of bounds index.version issues warning': 
 	(
-		cd non-repo &&
-		cp ../nums.old nums &&
-		git grep --no-index two >../actual
-	) &&
-	test_cmp expect actual
+		sane_unset GIT_INDEX_VERSION &&
+		rm -f .git/index &&
+		git config --add index.version 1 &&
+		git add a 2>err &&
+		sed "s/[0-9]//" err >actual.err &&
+		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
+			warning: index.version set, but the value is invalid.
+			Using version Z
+		EOF
+		test_cmp expect.err actual.err
+	)
 
-ok 5 - grep outside repository
+ok 5 - out of bounds index.version issues warning
 
-expecting success of 1517.6 'imap-send outside repository': 
-	test_config_global imap.host imaps://localhost &&
-	test_config_global imap.folder Drafts &&
+expecting success of 1600.6 'index.skipHash config option': 
+	rm -f .git/index &&
+	git -c index.skipHash=true add a &&
+	test_trailing_hash .git/index >hash &&
+	echo $(test_oid zero) >expect &&
+	test_cmp expect hash &&
+	git fsck &&
 
-	echo nothing to send >expect &&
-	test_must_fail git imap-send -v </dev/null 2>actual &&
-	test_cmp expect actual &&
+	rm -f .git/index &&
+	git -c feature.manyFiles=true add a &&
+	test_trailing_hash .git/index >hash &&
+	cmp expect hash &&
 
-	(
-		cd non-repo &&
-		test_must_fail git imap-send -v </dev/null 2>../actual
-	) &&
-	test_cmp expect actual
+	rm -f .git/index &&
+	git -c feature.manyFiles=true \
+	    -c index.skipHash=false add a &&
+	test_trailing_hash .git/index >hash &&
+	! cmp expect hash &&
 
-ok 6 - imap-send outside repository
+	test_commit start &&
+	git -c protocol.file.allow=always submodule add ./ sub &&
+	git config index.skipHash false &&
+	git -C sub config index.skipHash true &&
+	rm -f .git/modules/sub/index &&
+	>sub/file &&
+	git -C sub add a &&
+	test_trailing_hash .git/modules/sub/index >hash &&
+	test_cmp expect hash &&
+	git -C sub fsck
 
-expecting success of 1517.7 'check-ref-format outside repository': 
-	git check-ref-format --branch refs/heads/xyzzy >expect &&
-	nongit git check-ref-format --branch refs/heads/xyzzy >actual &&
-	test_cmp expect actual
+warning: index.version set, but the value is invalid.
+Using version 3
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+warning: index.version set, but the value is invalid.
+Using version 3
+warning: index.version set, but the value is invalid.
+Using version 3
+expect hash differ: char 1, line 1
+[master (root-commit) 6d6aa2c] start
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 start.t
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1600-index/sub'...
+done.
+ok 6 - index.skipHash config option
 
-ok 7 - check-ref-format outside repository
+expecting success of 1600.7 'index version config precedence': 
+	test_index_version 0 false 0 2 &&
+	test_index_version 2 false 0 2 &&
+	test_index_version 3 false 0 2 &&
+	test_index_version 4 false 0 4 &&
+	test_index_version 2 false 4 4 &&
+	test_index_version 2 true 0 2 &&
+	test_index_version 0 true 0 4 &&
+	test_index_version 0 true 2 2
 
-expecting success of 1517.8 'diff outside repository': 
-	echo one >one &&
-	echo two >two &&
-	test_must_fail git diff --no-index one two >expect.raw &&
-	(
-		cd non-repo &&
-		cp ../one . &&
-		cp ../two . &&
-		test_must_fail git diff one two >../actual.raw
-	) &&
-	# outside repository diff falls back to SHA-1 but
-	# GIT_DEFAULT_HASH may be set to sha256 on the in-repo side.
-	sed -e "/^index /d" expect.raw >expect &&
-	sed -e "/^index /d" actual.raw >actual &&
-	test_cmp expect actual
-
-ok 8 - diff outside repository
-
-expecting success of 1517.9 'stripspace outside repository': 
-	nongit git stripspace -s </dev/null
-
-ok 9 - stripspace outside repository
-
-expecting success of 1517.10 'remote-http outside repository': 
-	test_must_fail git remote-http 2>actual &&
-	test_grep "^error: remote-curl" actual &&
-	(
-		cd non-repo &&
-		test_must_fail git remote-http 2>../actual
-	) &&
-	test_grep "^error: remote-curl" actual
-
-error: remote-curl: usage: git remote-curl <remote> [<url>]
-error: remote-curl: usage: git remote-curl <remote> [<url>]
-ok 10 - remote-http outside repository
-
-expecting success of 1517.11 'update-server-info does not crash with -h': 
-	test_expect_code 129 git update-server-info -h >usage &&
-	test_grep "[Uu]sage: git update-server-info " usage &&
-	test_expect_code 129 nongit git update-server-info -h >usage &&
-	test_grep "[Uu]sage: git update-server-info " usage
-
-usage: git update-server-info [-f | --force]
-usage: git update-server-info [-f | --force]
-ok 11 - update-server-info does not crash with -h
-
-expecting success of 1517.12 'prune does not crash with -h': 
-	test_expect_code 129 git prune -h >usage &&
-	test_grep "[Uu]sage: git prune " usage &&
-	test_expect_code 129 nongit git prune -h >usage &&
-	test_grep "[Uu]sage: git prune " usage
-
-usage: git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]
-usage: git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]
-ok 12 - prune does not crash with -h
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1601-index-bogus.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1601-index-bogus/.git/
-expecting success of 1601.1 'create tree with null sha1': 
-	tree=$(printf "160000 commit $ZERO_OID\\tbroken\\n" | git mktree)
-
-ok 1 - create tree with null sha1
-
-expecting success of 1601.2 'read-tree refuses to read null sha1': 
-	test_must_fail git read-tree $tree
-
-error: cache entry has null sha1: broken
-fatal: unable to write new index file
-ok 2 - read-tree refuses to read null sha1
-
-expecting success of 1601.3 'GIT_ALLOW_NULL_SHA1 overrides refusal': 
-	GIT_ALLOW_NULL_SHA1=1 git read-tree $tree
-
-warning: cache entry has null sha1: broken
-ok 3 - GIT_ALLOW_NULL_SHA1 overrides refusal
-
-expecting success of 1601.4 'git write-tree refuses to write null sha1': 
-	test_must_fail git write-tree
-
-error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
-fatal: git-write-tree: error building trees
-ok 4 - git write-tree refuses to write null sha1
+ok 7 - index version config precedence
 
-# passed all 4 test(s)
-1..4
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1300-config.sh ***
@@ -84627,135 +85692,6 @@
 1..481
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1600-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1600-index/.git/
-expecting success of 1600.1 'setup': 
-	echo 1 >a
-
-ok 1 - setup
-
-expecting success of 1600.2 'bogus GIT_INDEX_VERSION issues warning': 
-	(
-		rm -f .git/index &&
-		GIT_INDEX_VERSION=2bogus &&
-		export GIT_INDEX_VERSION &&
-		git add a 2>err &&
-		sed "s/[0-9]//" err >actual.err &&
-		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
-			warning: GIT_INDEX_VERSION set, but the value is invalid.
-			Using version Z
-		EOF
-		test_cmp expect.err actual.err
-	)
-
-ok 2 - bogus GIT_INDEX_VERSION issues warning
-
-expecting success of 1600.3 'out of bounds GIT_INDEX_VERSION issues warning': 
-	(
-		rm -f .git/index &&
-		GIT_INDEX_VERSION=1 &&
-		export GIT_INDEX_VERSION &&
-		git add a 2>err &&
-		sed "s/[0-9]//" err >actual.err &&
-		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
-			warning: GIT_INDEX_VERSION set, but the value is invalid.
-			Using version Z
-		EOF
-		test_cmp expect.err actual.err
-	)
-
-ok 3 - out of bounds GIT_INDEX_VERSION issues warning
-
-expecting success of 1600.4 'no warning with bogus GIT_INDEX_VERSION and existing index': 
-	(
-		GIT_INDEX_VERSION=1 &&
-		export GIT_INDEX_VERSION &&
-		git add a 2>actual.err &&
-		test_must_be_empty actual.err
-	)
-
-ok 4 - no warning with bogus GIT_INDEX_VERSION and existing index
-
-expecting success of 1600.5 'out of bounds index.version issues warning': 
-	(
-		sane_unset GIT_INDEX_VERSION &&
-		rm -f .git/index &&
-		git config --add index.version 1 &&
-		git add a 2>err &&
-		sed "s/[0-9]//" err >actual.err &&
-		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
-			warning: index.version set, but the value is invalid.
-			Using version Z
-		EOF
-		test_cmp expect.err actual.err
-	)
-
-ok 5 - out of bounds index.version issues warning
-
-expecting success of 1600.6 'index.skipHash config option': 
-	rm -f .git/index &&
-	git -c index.skipHash=true add a &&
-	test_trailing_hash .git/index >hash &&
-	echo $(test_oid zero) >expect &&
-	test_cmp expect hash &&
-	git fsck &&
-
-	rm -f .git/index &&
-	git -c feature.manyFiles=true add a &&
-	test_trailing_hash .git/index >hash &&
-	cmp expect hash &&
-
-	rm -f .git/index &&
-	git -c feature.manyFiles=true \
-	    -c index.skipHash=false add a &&
-	test_trailing_hash .git/index >hash &&
-	! cmp expect hash &&
-
-	test_commit start &&
-	git -c protocol.file.allow=always submodule add ./ sub &&
-	git config index.skipHash false &&
-	git -C sub config index.skipHash true &&
-	rm -f .git/modules/sub/index &&
-	>sub/file &&
-	git -C sub add a &&
-	test_trailing_hash .git/modules/sub/index >hash &&
-	test_cmp expect hash &&
-	git -C sub fsck
-
-warning: index.version set, but the value is invalid.
-Using version 3
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-warning: index.version set, but the value is invalid.
-Using version 3
-warning: index.version set, but the value is invalid.
-Using version 3
-expect hash differ: char 1, line 1
-[master (root-commit) 6d6aa2c] start
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 start.t
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1600-index/sub'...
-done.
-ok 6 - index.skipHash config option
-
-expecting success of 1600.7 'index version config precedence': 
-	test_index_version 0 false 0 2 &&
-	test_index_version 2 false 0 2 &&
-	test_index_version 3 false 0 2 &&
-	test_index_version 4 false 0 4 &&
-	test_index_version 2 false 4 4 &&
-	test_index_version 2 true 0 2 &&
-	test_index_version 0 true 0 4 &&
-	test_index_version 0 true 2 2
-
-ok 7 - index version config precedence
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2000-conflict-when-checking-files-out.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2000-conflict-when-checking-files-out/.git/
 expecting success of 2000.1 'git update-index --add various paths.': git update-index --add path0 path1/file1
@@ -85284,6 +86220,217 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2006-checkout-index-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2006-checkout-index-basic/.git/
+expecting success of 2006.1 'checkout-index --gobbledegook': 
+	test_expect_code 129 git checkout-index --gobbledegook 2>err &&
+	test_grep "[Uu]sage" err
+
+usage: git checkout-index [<options>] [--] [<file>...]
+ok 1 - checkout-index --gobbledegook
+
+expecting success of 2006.2 'checkout-index -h in broken repository': 
+	mkdir broken &&
+	(
+		cd broken &&
+		git init &&
+		>.git/index &&
+		test_expect_code 129 git checkout-index -h >usage 2>&1
+	) &&
+	test_grep "[Uu]sage" broken/usage
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2006-checkout-index-basic/broken/.git/
+usage: git checkout-index [<options>] [--] [<file>...]
+ok 2 - checkout-index -h in broken repository
+
+expecting success of 2006.3 'checkout-index does not crash with -h': 
+	test_expect_code 129 git checkout-index -h >usage &&
+	test_grep "[Uu]sage: git checkout-index " usage &&
+	test_expect_code 129 nongit git checkout-index -h >usage &&
+	test_grep "[Uu]sage: git checkout-index " usage
+
+usage: git checkout-index [<options>] [--] [<file>...]
+usage: git checkout-index [<options>] [--] [<file>...]
+ok 3 - checkout-index does not crash with -h
+
+expecting success of 2006.4 'checkout-index reports errors (cmdline)': 
+	test_must_fail git checkout-index -- does-not-exist 2>stderr &&
+	test_grep not.in.the.cache stderr
+
+git checkout-index: does-not-exist is not in the cache
+ok 4 - checkout-index reports errors (cmdline)
+
+expecting success of 2006.5 'checkout-index reports errors (stdin)': 
+	echo does-not-exist |
+	test_must_fail git checkout-index --stdin 2>stderr &&
+	test_grep not.in.the.cache stderr
+
+git checkout-index: does-not-exist is not in the cache
+ok 5 - checkout-index reports errors (stdin)
+
+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: 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 6 # skip checkout-index with case-collision don't write to the wrong place (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
+
+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
+ok 7 # skip checkout-index with utf-8-collision don't write to the wrong place (missing UTF8_NFD_TO_NFC of SYMLINKS,UTF8_NFD_TO_NFC)
+
+expecting success of 2006.8 'checkout-index --temp correctly reports error on missing blobs': 
+	test_when_finished git reset --hard &&
+	missing_blob=$(echo "no such blob here" | git hash-object --stdin) &&
+	cat >objs <<-EOF &&
+	100644 $missing_blob	file
+	120000 $missing_blob	symlink
+	EOF
+	git update-index --index-info <objs &&
+
+	test_must_fail git checkout-index --temp symlink file 2>stderr &&
+	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_HlMdn8	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
+
+expecting success of 2006.9 'checkout-index --temp correctly reports error for submodules': 
+	git init sub &&
+	test_commit -C sub file &&
+	git submodule add ./sub &&
+	git commit -m sub &&
+	test_must_fail git checkout-index --temp sub 2>stderr &&
+	test_grep "cannot create temporary submodule sub" stderr
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2006-checkout-index-basic/sub/.git/
+[master (root-commit) 4c1911f] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+Adding existing repo at 'sub' to the index
+[master (root-commit) c4df02a] sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+error: cannot create temporary submodule sub
+ok 9 - checkout-index --temp correctly reports error for submodules
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2007-checkout-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2007-checkout-symlink/.git/
+expecting success of 2007.1 'setup': 
+
+	mkdir frotz &&
+	echo hello >frotz/filfre &&
+	git add frotz/filfre &&
+	test_tick &&
+	git commit -m "main has file frotz/filfre" &&
+
+	git branch side &&
+
+	echo goodbye >nitfol &&
+	git add nitfol &&
+	test_tick &&
+	git commit -m "main adds file nitfol" &&
+
+	git checkout side &&
+
+	git rm --cached frotz/filfre &&
+	mv frotz xyzzy &&
+	test_ln_s_add xyzzy frotz &&
+	git add xyzzy/filfre &&
+	test_tick &&
+	git commit -m "side moves frotz/ to xyzzy/ and adds frotz->xyzzy/"
+
+
+[main (root-commit) 608bc3a] main has file frotz/filfre
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 frotz/filfre
+[main f539081] main adds file nitfol
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 nitfol
+Switched to branch 'side'
+rm 'frotz/filfre'
+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
+[side dc669bf] side moves frotz/ to xyzzy/ and adds frotz->xyzzy/
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 120000 frotz
+ rename {frotz => xyzzy}/filfre (100%)
+ok 1 - setup
+
+expecting success of 2007.2 'switch from symlink to dir': 
+
+	git checkout main
+
+
+Switched to branch 'main'
+ok 2 - switch from symlink to dir
+
+expecting success of 2007.3 'Remove temporary directories & switch to main': 
+	rm -fr frotz xyzzy nitfol &&
+	git checkout -f main
+
+Already on 'main'
+ok 3 - Remove temporary directories & switch to main
+
+expecting success of 2007.4 'switch from dir to symlink': 
+
+	git checkout side
+
+
+Switched to branch 'side'
+ok 4 - switch from dir to symlink
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2004-checkout-cache-temp.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2004-checkout-cache-temp/.git/
 expecting success of 2004.1 'setup': 
@@ -85407,7 +86554,7 @@
 	git checkout-index --stage=all -- path1 &&
 	test_path_is_missing path1
 
-.merge_file_7IPAA3 .merge_file_GbOnLH .merge_file_NfpJXD	path1
+.merge_file_tu630y .merge_file_TVJKX4 .merge_file_JKJq5D	path1
 ok 10 - --stage=all implies --temp
 
 expecting success of 2004.11 'overriding --stage=all resets implied --temp': 
@@ -86222,285 +87369,6 @@
 1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2006-checkout-index-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2006-checkout-index-basic/.git/
-expecting success of 2006.1 'checkout-index --gobbledegook': 
-	test_expect_code 129 git checkout-index --gobbledegook 2>err &&
-	test_grep "[Uu]sage" err
-
-usage: git checkout-index [<options>] [--] [<file>...]
-ok 1 - checkout-index --gobbledegook
-
-expecting success of 2006.2 'checkout-index -h in broken repository': 
-	mkdir broken &&
-	(
-		cd broken &&
-		git init &&
-		>.git/index &&
-		test_expect_code 129 git checkout-index -h >usage 2>&1
-	) &&
-	test_grep "[Uu]sage" broken/usage
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2006-checkout-index-basic/broken/.git/
-usage: git checkout-index [<options>] [--] [<file>...]
-ok 2 - checkout-index -h in broken repository
-
-expecting success of 2006.3 'checkout-index does not crash with -h': 
-	test_expect_code 129 git checkout-index -h >usage &&
-	test_grep "[Uu]sage: git checkout-index " usage &&
-	test_expect_code 129 nongit git checkout-index -h >usage &&
-	test_grep "[Uu]sage: git checkout-index " usage
-
-usage: git checkout-index [<options>] [--] [<file>...]
-usage: git checkout-index [<options>] [--] [<file>...]
-ok 3 - checkout-index does not crash with -h
-
-expecting success of 2006.4 'checkout-index reports errors (cmdline)': 
-	test_must_fail git checkout-index -- does-not-exist 2>stderr &&
-	test_grep not.in.the.cache stderr
-
-git checkout-index: does-not-exist is not in the cache
-ok 4 - checkout-index reports errors (cmdline)
-
-expecting success of 2006.5 'checkout-index reports errors (stdin)': 
-	echo does-not-exist |
-	test_must_fail git checkout-index --stdin 2>stderr &&
-	test_grep not.in.the.cache stderr
-
-git checkout-index: does-not-exist is not in the cache
-ok 5 - checkout-index reports errors (stdin)
-
-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: 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 6 # skip checkout-index with case-collision don't write to the wrong place (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
-
-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
-ok 7 # skip checkout-index with utf-8-collision don't write to the wrong place (missing UTF8_NFD_TO_NFC of SYMLINKS,UTF8_NFD_TO_NFC)
-
-expecting success of 2006.8 'checkout-index --temp correctly reports error on missing blobs': 
-	test_when_finished git reset --hard &&
-	missing_blob=$(echo "no such blob here" | git hash-object --stdin) &&
-	cat >objs <<-EOF &&
-	100644 $missing_blob	file
-	120000 $missing_blob	symlink
-	EOF
-	git update-index --index-info <objs &&
-
-	test_must_fail git checkout-index --temp symlink file 2>stderr &&
-	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_MoCNtt	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
-
-expecting success of 2006.9 'checkout-index --temp correctly reports error for submodules': 
-	git init sub &&
-	test_commit -C sub file &&
-	git submodule add ./sub &&
-	git commit -m sub &&
-	test_must_fail git checkout-index --temp sub 2>stderr &&
-	test_grep "cannot create temporary submodule sub" stderr
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2006-checkout-index-basic/sub/.git/
-[master (root-commit) 4c1911f] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-Adding existing repo at 'sub' to the index
-[master (root-commit) c4df02a] sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-error: cannot create temporary submodule sub
-ok 9 - checkout-index --temp correctly reports error for submodules
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2007-checkout-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2007-checkout-symlink/.git/
-expecting success of 2007.1 'setup': 
-
-	mkdir frotz &&
-	echo hello >frotz/filfre &&
-	git add frotz/filfre &&
-	test_tick &&
-	git commit -m "main has file frotz/filfre" &&
-
-	git branch side &&
-
-	echo goodbye >nitfol &&
-	git add nitfol &&
-	test_tick &&
-	git commit -m "main adds file nitfol" &&
-
-	git checkout side &&
-
-	git rm --cached frotz/filfre &&
-	mv frotz xyzzy &&
-	test_ln_s_add xyzzy frotz &&
-	git add xyzzy/filfre &&
-	test_tick &&
-	git commit -m "side moves frotz/ to xyzzy/ and adds frotz->xyzzy/"
-
-
-[main (root-commit) 608bc3a] main has file frotz/filfre
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 frotz/filfre
-[main f539081] main adds file nitfol
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 nitfol
-Switched to branch 'side'
-rm 'frotz/filfre'
-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
-[side dc669bf] side moves frotz/ to xyzzy/ and adds frotz->xyzzy/
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 120000 frotz
- rename {frotz => xyzzy}/filfre (100%)
-ok 1 - setup
-
-expecting success of 2007.2 'switch from symlink to dir': 
-
-	git checkout main
-
-
-Switched to branch 'main'
-ok 2 - switch from symlink to dir
-
-expecting success of 2007.3 'Remove temporary directories & switch to main': 
-	rm -fr frotz xyzzy nitfol &&
-	git checkout -f main
-
-Already on 'main'
-ok 3 - Remove temporary directories & switch to main
-
-expecting success of 2007.4 'switch from dir to symlink': 
-
-	git checkout side
-
-
-Switched to branch 'side'
-ok 4 - switch from dir to symlink
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2009-checkout-statinfo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2009-checkout-statinfo/.git/
-expecting success of 2009.1 'setup': 
-
-	echo hello >world &&
-	git update-index --add world &&
-	git commit -m initial &&
-	git branch side &&
-	echo goodbye >world &&
-	git update-index --add world &&
-	git commit -m second
-
-
-[main (root-commit) b8cd0f7] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world
-[main 5892dcd] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 2009.2 'branch switching': 
-
-	git reset --hard &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout main &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout side &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout main &&
-	test "$(git diff-files --raw)" = ""
-
-
-HEAD is now at 5892dcd second
-Already on 'main'
-Switched to branch 'side'
-Switched to branch 'main'
-ok 2 - branch switching
-
-expecting success of 2009.3 'path checkout': 
-
-	git reset --hard &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout main world &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout side world &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout main world &&
-	test "$(git diff-files --raw)" = ""
-
-
-HEAD is now at 5892dcd second
-Updated 0 paths from c356a2a
-Updated 1 path from dbd05ee
-Updated 1 path from c356a2a
-ok 3 - path checkout
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2008-checkout-subdir.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2008-checkout-subdir/.git/
 expecting success of 2008.1 'setup': 
@@ -86595,6 +87463,74 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2009-checkout-statinfo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2009-checkout-statinfo/.git/
+expecting success of 2009.1 'setup': 
+
+	echo hello >world &&
+	git update-index --add world &&
+	git commit -m initial &&
+	git branch side &&
+	echo goodbye >world &&
+	git update-index --add world &&
+	git commit -m second
+
+
+[main (root-commit) b8cd0f7] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 world
+[main 5892dcd] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 2009.2 'branch switching': 
+
+	git reset --hard &&
+	test "$(git diff-files --raw)" = "" &&
+
+	git checkout main &&
+	test "$(git diff-files --raw)" = "" &&
+
+	git checkout side &&
+	test "$(git diff-files --raw)" = "" &&
+
+	git checkout main &&
+	test "$(git diff-files --raw)" = ""
+
+
+HEAD is now at 5892dcd second
+Already on 'main'
+Switched to branch 'side'
+Switched to branch 'main'
+ok 2 - branch switching
+
+expecting success of 2009.3 'path checkout': 
+
+	git reset --hard &&
+	test "$(git diff-files --raw)" = "" &&
+
+	git checkout main world &&
+	test "$(git diff-files --raw)" = "" &&
+
+	git checkout side world &&
+	test "$(git diff-files --raw)" = "" &&
+
+	git checkout main world &&
+	test "$(git diff-files --raw)" = ""
+
+
+HEAD is now at 5892dcd second
+Updated 0 paths from c356a2a
+Updated 1 path from dbd05ee
+Updated 1 path from c356a2a
+ok 3 - path checkout
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2010-checkout-ambiguous.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2010-checkout-ambiguous/.git/
 expecting success of 2010.1 'setup': 
@@ -86813,6 +87749,306 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2015-checkout-unborn.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2017-checkout-orphan.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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)"
+
+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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1400-update-ref.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1400-update-ref/.git/
 expecting success of 1400.1 'setup': 
@@ -88511,8 +89747,8 @@
 Use '--' to separate paths from revisions, like this:
 'git <command> [<revision>...] -- [<file>...]'
 refs/bisect/something
---- main-head	2025-08-27 08:20:08.463325506 +0000
-+++ worktree-head	2025-08-27 08:20:08.411325164 +0000
+--- main-head	2026-09-29 14:51:50.982548970 +0000
++++ worktree-head	2026-09-29 14:51:50.958548970 +0000
 @@ -1 +1 @@
 -58a052250c09f010b95ad9bfe32f35d704eda1a0
 +b62e0cb4990da3244885da90fe7d493334cca9f5
@@ -90630,306 +91866,6 @@
 1..307
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2015-checkout-unborn.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2017-checkout-orphan.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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)"
-
-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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2012-checkout-last.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2012-checkout-last/.git/
 expecting success of 2012.1 'setup': 
@@ -91334,88 +92270,6 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2019-checkout-ambiguous-ref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2016-checkout-patch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2016-checkout-patch/.git/
 expecting success of 2016.1 'setup': 
@@ -91746,402 +92600,86 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2018-checkout-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2018-checkout-branch/.git/
-expecting success of 2018.1 'setup': 
-	test_commit initial file1 &&
-	HEAD1=$(git rev-parse --verify HEAD) &&
-
-	test_commit change1 file1 &&
-	HEAD2=$(git rev-parse --verify HEAD) &&
-
-	git branch -m branch1
+*** t2019-checkout-ambiguous-ref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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) ee02a18] initial
+[master (root-commit) c291a6e] branch
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file1
-[master 5be17a9] change1
+ create mode 100644 file
+[master a40f7cf] tag
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 2018.2 'checkout a branch without refs/heads/* prefix': 
-	git clone --no-tags . repo-odd-prefix &&
-	(
-		cd repo-odd-prefix &&
-
-		origin=$(git symbolic-ref refs/remotes/origin/HEAD) &&
-		git symbolic-ref refs/heads/a-branch "$origin" &&
-
-		git checkout -f a-branch &&
-		git checkout -f a-branch
-	)
-
-Cloning into 'repo-odd-prefix'...
-done.
-Switched to branch 'a-branch'
-Switched to branch 'a-branch'
-ok 2 - checkout a branch without refs/heads/* prefix
-
-expecting success of 2018.3 'checkout -b to a new branch, set to HEAD': 
-	test_when_finished "
-		git checkout branch1 &&
-		test_might_fail git branch -D branch2" &&
-	do_checkout branch2
-
-Switched to a new branch 'branch2'
-Switched to branch 'branch1'
-Deleted branch branch2 (was 5be17a9).
-ok 3 - checkout -b to a new branch, set to HEAD
-
-expecting success of 2018.4 'checkout -b to a merge base': 
-	test_when_finished "
-		git checkout branch1 &&
-		test_might_fail git branch -D branch2" &&
-	git checkout -b branch2 branch1...
-
-Switched to a new branch 'branch2'
-Switched to branch 'branch1'
-Deleted branch branch2 (was 5be17a9).
-ok 4 - checkout -b to a merge base
-
-expecting success of 2018.5 'checkout -b to a new branch, set to an explicit ref': 
-	test_when_finished "
-		git checkout branch1 &&
-		test_might_fail git branch -D branch2" &&
-	do_checkout branch2 $HEAD1
-
-Switched to a new branch 'branch2'
-Switched to branch 'branch1'
-Deleted branch branch2 (was ee02a18).
-ok 5 - checkout -b to a new branch, set to an explicit ref
-
-expecting success of 2018.6 'checkout -b to a new branch with unmergeable changes fails': 
-	setup_dirty_unmergeable &&
-	do_checkout ! branch2 $HEAD1 &&
-	test_dirty_unmergeable
-
-error: Your local changes to the following files would be overwritten by checkout:
-	file1
-Please commit your changes or stash them before you switch branches.
-Aborting
-diff --git a/file1 b/file1
-index 5be4a41..1725fe9 100644
---- a/file1
-+++ b/file1
-@@ -1 +1,2 @@
- change1
-+change2
-ok 6 - checkout -b to a new branch with unmergeable changes fails
-
-expecting success of 2018.7 'checkout -f -b to a new branch with unmergeable changes discards changes': 
-	test_when_finished "
-		git checkout branch1 &&
-		test_might_fail git branch -D branch2" &&
-
-	# still dirty and on branch1
-	do_checkout branch2 $HEAD1 "-f -b" &&
-	test_dirty_unmergeable_discards_changes
-
-Switched to a new branch 'branch2'
-Switched to branch 'branch1'
-Deleted branch branch2 (was ee02a18).
-ok 7 - checkout -f -b to a new branch with unmergeable changes discards changes
-
-expecting success of 2018.8 'checkout -b to a new branch preserves mergeable changes': 
-	test_when_finished "
-		git reset --hard &&
-		git checkout branch1 &&
-		test_might_fail git branch -D branch2" &&
-
-	setup_dirty_mergeable &&
-	do_checkout branch2 $HEAD1 &&
-	test_dirty_mergeable
-
-Switched to a new branch 'branch2'
-A	file2
-diff --git a/file2 b/file2
-new file mode 100644
-index 0000000..6c493ff
---- /dev/null
-+++ b/file2
-@@ -0,0 +1 @@
-+file2
-HEAD is now at ee02a18 initial
-Switched to branch 'branch1'
-Deleted branch branch2 (was ee02a18).
-ok 8 - checkout -b to a new branch preserves mergeable changes
-
-expecting success of 2018.9 'checkout -f -b to a new branch with mergeable changes discards changes': 
-	test_when_finished git reset --hard HEAD &&
-	setup_dirty_mergeable &&
-	do_checkout branch2 $HEAD1 "-f -b" &&
-	test_dirty_mergeable_discards_changes
-
-Switched to a new branch 'branch2'
-HEAD is now at ee02a18 initial
-ok 9 - checkout -f -b to a new branch with mergeable changes discards changes
-
-expecting success of 2018.10 'checkout -b to an existing branch fails': 
-	test_when_finished git reset --hard HEAD &&
-	do_checkout ! branch2 $HEAD2
-
-fatal: a branch named 'branch2' already exists
-HEAD is now at ee02a18 initial
-ok 10 - checkout -b to an existing branch fails
-
-expecting success of 2018.11 'checkout -b to @{-1} fails with the right branch name': 
-	git checkout branch1 &&
-	git checkout branch2 &&
-	echo  >expect "fatal: a branch named 'branch1' already exists" &&
-	test_must_fail git checkout -b @{-1} 2>actual &&
-	test_cmp expect actual
-
-Switched to branch 'branch1'
-Switched to branch 'branch2'
-ok 11 - checkout -b to @{-1} fails with the right branch name
-
-expecting success of 2018.12 'checkout -B to an existing branch resets branch to HEAD': 
-	git checkout branch1 &&
-
-	do_checkout branch2 "" -B
-
-Switched to branch 'branch1'
-Switched to and reset branch 'branch2'
-ok 12 - checkout -B to an existing branch resets branch to HEAD
-
-expecting success of 2018.13 'checkout -B to a merge base': 
-	git checkout branch1 &&
-
-	git checkout -B branch2 branch1...
-
-Switched to branch 'branch1'
-Switched to and reset branch 'branch2'
-ok 13 - checkout -B to a merge base
-
-expecting success of 2018.14 'checkout -B to an existing branch from detached HEAD resets branch to HEAD': 
-	head=$(git rev-parse --verify HEAD) &&
-	git checkout "$head" &&
-
-	do_checkout branch2 "" -B
-
-Note: switching to '5be17a9503605cbff49376bccdc74acb1ebd9160'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5be17a9 change1
-Switched to and reset branch 'branch2'
-ok 14 - checkout -B to an existing branch from detached HEAD resets branch to HEAD
-
-expecting success of 2018.15 'checkout -B to an existing branch with an explicit ref resets branch to that ref': 
-	git checkout branch1 &&
-
-	do_checkout branch2 $HEAD1 -B
-
-Switched to branch 'branch1'
-Switched to and reset branch 'branch2'
-ok 15 - checkout -B to an existing branch with an explicit ref resets branch to that ref
-
-expecting success of 2018.16 'checkout -B to an existing branch with unmergeable changes fails': 
-	git checkout branch1 &&
-
-	setup_dirty_unmergeable &&
-	do_checkout ! branch2 $HEAD1 -B &&
-	test_dirty_unmergeable
-
-Switched to branch 'branch1'
-error: Your local changes to the following files would be overwritten by checkout:
-	file1
-Please commit your changes or stash them before you switch branches.
-Aborting
-diff --git a/file1 b/file1
-index 5be4a41..1725fe9 100644
---- a/file1
-+++ b/file1
-@@ -1 +1,2 @@
- change1
-+change2
-ok 16 - checkout -B to an existing branch with unmergeable changes fails
-
-expecting success of 2018.17 'checkout -f -B to an existing branch with unmergeable changes discards changes': 
-	# still dirty and on branch1
-	do_checkout branch2 $HEAD1 "-f -B" &&
-	test_dirty_unmergeable_discards_changes
-
-Switched to and reset branch 'branch2'
-ok 17 - checkout -f -B to an existing branch with unmergeable changes discards changes
-
-expecting success of 2018.18 'checkout -B to an existing branch preserves mergeable changes': 
-	test_when_finished git reset --hard &&
-	git checkout branch1 &&
-
-	setup_dirty_mergeable &&
-	do_checkout branch2 $HEAD1 -B &&
-	test_dirty_mergeable
+[master 3b61e26] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup ambiguous refs
 
-Switched to branch 'branch1'
-Switched to and reset branch 'branch2'
-A	file2
-diff --git a/file2 b/file2
-new file mode 100644
-index 0000000..6c493ff
---- /dev/null
-+++ b/file2
-@@ -0,0 +1 @@
-+file2
-HEAD is now at ee02a18 initial
-ok 18 - checkout -B to an existing branch preserves mergeable changes
+expecting success of 2019.2 'checkout ambiguous ref succeeds': 
+	git checkout ambiguity 2>stderr
 
-expecting success of 2018.19 'checkout -f -B to an existing branch with mergeable changes discards changes': 
-	git checkout branch1 &&
+ok 2 - checkout ambiguous ref succeeds
 
-	setup_dirty_mergeable &&
-	do_checkout branch2 $HEAD1 "-f -B" &&
-	test_dirty_mergeable_discards_changes
+expecting success of 2019.3 'checkout produces ambiguity warning': 
+	grep "warning.*ambiguous" stderr
 
-Switched to branch 'branch1'
-Switched to and reset branch 'branch2'
-ok 19 - checkout -f -B to an existing branch with mergeable changes discards changes
+warning: refname 'ambiguity' is ambiguous.
+ok 3 - checkout produces ambiguity warning
 
-expecting success of 2018.20 'checkout -b <describe>': 
-	git tag -f -m "First commit" initial initial &&
-	git checkout -f change1 &&
-	name=$(git describe) &&
-	git checkout -b $name &&
-	git diff --exit-code change1 &&
-	echo "refs/heads/$name" >expect &&
+expecting success of 2019.4 'checkout chooses branch over tag': 
+	echo refs/heads/ambiguity >expect &&
 	git symbolic-ref HEAD >actual &&
-	test_cmp expect actual
-
-Updated tag 'initial' (was ee02a18)
-Note: switching to 'change1'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5be17a9 change1
-Switched to a new branch 'initial-1-g5be17a9'
-ok 20 - checkout -b <describe>
-
-expecting success of 2018.21 'checkout -B to the current branch works': 
-	git checkout branch1 &&
-	git checkout -B branch1-scratch &&
-
-	setup_dirty_mergeable &&
-	git checkout -B branch1-scratch initial &&
-	test_dirty_mergeable
-
-Switched to branch 'branch1'
-Switched to a new branch 'branch1-scratch'
-Reset branch 'branch1-scratch'
-A	file2
-diff --git a/file2 b/file2
-new file mode 100644
-index 0000000..6c493ff
---- /dev/null
-+++ b/file2
-@@ -0,0 +1 @@
-+file2
-ok 21 - checkout -B to the current branch works
-
-expecting success of 2018.22 'checkout -b after clone --no-checkout does a checkout of HEAD': 
-	git init src &&
-	test_commit -C src a &&
-	rev="$(git -C src rev-parse HEAD)" &&
-	git clone --no-checkout src dest &&
-	git -C dest checkout "$rev" -b branch &&
-	test_path_is_file dest/a.t
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2018-checkout-branch/src/.git/
-[master (root-commit) 7f0b538] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-Cloning into 'dest'...
-done.
-Switched to a new branch 'branch'
-ok 22 - checkout -b after clone --no-checkout does a checkout of HEAD
+	test_cmp expect actual &&
+	echo branch >expect &&
+	test_cmp expect file
 
-expecting success of 2018.23 'checkout -b to a new branch preserves mergeable changes despite sparse-checkout': 
-	test_when_finished "
-		git reset --hard &&
-		git checkout branch1-scratch &&
-		test_might_fail git branch -D branch3 &&
-		git config core.sparseCheckout false &&
-		rm -rf .git/info" &&
+ok 4 - checkout chooses branch over tag
 
-	test_commit file2 &&
+expecting success of 2019.5 'checkout reports switch to branch': 
+	test_grep "Switched to branch" stderr &&
+	test_grep ! "^HEAD is now at" stderr
 
-	echo stuff >>file1 &&
-	mkdir .git/info &&
-	echo file2 >.git/info/sparse-checkout &&
-	git config core.sparseCheckout true &&
+Switched to branch 'ambiguity'
+ok 5 - checkout reports switch to branch
 
-	CURHEAD=$(git rev-parse HEAD) &&
-	do_checkout branch3 $CURHEAD &&
+expecting success of 2019.6 'checkout vague ref succeeds': 
+	git checkout vagueness 2>stderr &&
+	test_set_prereq VAGUENESS_SUCCESS
 
-	echo file1 >expect &&
-	git diff --name-only >actual &&
-	test_cmp expect actual
+ok 6 - checkout vague ref succeeds
 
-[branch1-scratch b9d73e8] file2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file2
- create mode 100644 file2.t
-warning: The following paths are not up to date and were left despite sparse patterns:
-	file1
+expecting success of 2019.7 'checkout produces ambiguity warning': 
+	grep "warning.*ambiguous" stderr
 
-After fixing the above paths, you may want to run `git sparse-checkout reapply`.
-Switched to a new branch 'branch3'
-M	file1
-HEAD is now at b9d73e8 file2
-Switched to branch 'branch1-scratch'
-Deleted branch branch3 (was b9d73e8).
-ok 23 - checkout -b to a new branch preserves mergeable changes despite sparse-checkout
+warning: refname 'vagueness' is ambiguous.
+ok 7 - checkout produces ambiguity warning
 
-expecting success of 2018.24 'checkout -b rejects an invalid start point': 
-	test_must_fail git checkout -b branch4 file1 2>err &&
-	test_grep "is not a commit" err
+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
 
-fatal: 'file1' is not a commit and a branch 'branch4' cannot be created from it
-ok 24 - checkout -b rejects an invalid start point
+ok 8 - checkout chooses branch over tag
 
-expecting success of 2018.25 'checkout -b rejects an extra path argument': 
-	test_must_fail git checkout -b branch5 branch1 file1 2>err &&
-	test_grep "Cannot update paths and switch to branch" err
+expecting success of 2019.9 'checkout reports switch to branch': 
+	test_grep "Switched to branch" stderr &&
+	test_grep ! "^HEAD is now at" stderr
 
-fatal: Cannot update paths and switch to branch 'branch5' at the same time.
-ok 25 - checkout -b rejects an extra path argument
+Switched to branch 'vagueness'
+ok 9 - checkout reports switch to branch
 
-# passed all 25 test(s)
-1..25
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2021-checkout-overwrite.sh ***
@@ -92335,140 +92873,6 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2022-checkout-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t1450-fsck.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1450-fsck/.git/
 expecting success of 1450.1 'setup': 
@@ -94053,7 +94457,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.348e-05 s, 29.9 kB/s
+1 byte copied, 3.02e-05 s, 33.1 kB/s
 error: .git/objects/pack/pack-8be9f6a4139bcddd74c3d2ed343bb71e87863c4b.pack pack checksum mismatch
 ok 78 - fsck fails on corrupt packfile
 
@@ -94299,6 +94703,140 @@
 1..93
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2022-checkout-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2023-checkout-m.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2023-checkout-m/.git/
 expecting success of 2023.1 'setup': 
@@ -94405,6 +94943,404 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2018-checkout-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2018-checkout-branch/.git/
+expecting success of 2018.1 'setup': 
+	test_commit initial file1 &&
+	HEAD1=$(git rev-parse --verify HEAD) &&
+
+	test_commit change1 file1 &&
+	HEAD2=$(git rev-parse --verify HEAD) &&
+
+	git branch -m branch1
+
+[master (root-commit) ee02a18] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[master 5be17a9] change1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 2018.2 'checkout a branch without refs/heads/* prefix': 
+	git clone --no-tags . repo-odd-prefix &&
+	(
+		cd repo-odd-prefix &&
+
+		origin=$(git symbolic-ref refs/remotes/origin/HEAD) &&
+		git symbolic-ref refs/heads/a-branch "$origin" &&
+
+		git checkout -f a-branch &&
+		git checkout -f a-branch
+	)
+
+Cloning into 'repo-odd-prefix'...
+done.
+Switched to branch 'a-branch'
+Switched to branch 'a-branch'
+ok 2 - checkout a branch without refs/heads/* prefix
+
+expecting success of 2018.3 'checkout -b to a new branch, set to HEAD': 
+	test_when_finished "
+		git checkout branch1 &&
+		test_might_fail git branch -D branch2" &&
+	do_checkout branch2
+
+Switched to a new branch 'branch2'
+Switched to branch 'branch1'
+Deleted branch branch2 (was 5be17a9).
+ok 3 - checkout -b to a new branch, set to HEAD
+
+expecting success of 2018.4 'checkout -b to a merge base': 
+	test_when_finished "
+		git checkout branch1 &&
+		test_might_fail git branch -D branch2" &&
+	git checkout -b branch2 branch1...
+
+Switched to a new branch 'branch2'
+Switched to branch 'branch1'
+Deleted branch branch2 (was 5be17a9).
+ok 4 - checkout -b to a merge base
+
+expecting success of 2018.5 'checkout -b to a new branch, set to an explicit ref': 
+	test_when_finished "
+		git checkout branch1 &&
+		test_might_fail git branch -D branch2" &&
+	do_checkout branch2 $HEAD1
+
+Switched to a new branch 'branch2'
+Switched to branch 'branch1'
+Deleted branch branch2 (was ee02a18).
+ok 5 - checkout -b to a new branch, set to an explicit ref
+
+expecting success of 2018.6 'checkout -b to a new branch with unmergeable changes fails': 
+	setup_dirty_unmergeable &&
+	do_checkout ! branch2 $HEAD1 &&
+	test_dirty_unmergeable
+
+error: Your local changes to the following files would be overwritten by checkout:
+	file1
+Please commit your changes or stash them before you switch branches.
+Aborting
+diff --git a/file1 b/file1
+index 5be4a41..1725fe9 100644
+--- a/file1
++++ b/file1
+@@ -1 +1,2 @@
+ change1
++change2
+ok 6 - checkout -b to a new branch with unmergeable changes fails
+
+expecting success of 2018.7 'checkout -f -b to a new branch with unmergeable changes discards changes': 
+	test_when_finished "
+		git checkout branch1 &&
+		test_might_fail git branch -D branch2" &&
+
+	# still dirty and on branch1
+	do_checkout branch2 $HEAD1 "-f -b" &&
+	test_dirty_unmergeable_discards_changes
+
+Switched to a new branch 'branch2'
+Switched to branch 'branch1'
+Deleted branch branch2 (was ee02a18).
+ok 7 - checkout -f -b to a new branch with unmergeable changes discards changes
+
+expecting success of 2018.8 'checkout -b to a new branch preserves mergeable changes': 
+	test_when_finished "
+		git reset --hard &&
+		git checkout branch1 &&
+		test_might_fail git branch -D branch2" &&
+
+	setup_dirty_mergeable &&
+	do_checkout branch2 $HEAD1 &&
+	test_dirty_mergeable
+
+Switched to a new branch 'branch2'
+A	file2
+diff --git a/file2 b/file2
+new file mode 100644
+index 0000000..6c493ff
+--- /dev/null
++++ b/file2
+@@ -0,0 +1 @@
++file2
+HEAD is now at ee02a18 initial
+Switched to branch 'branch1'
+Deleted branch branch2 (was ee02a18).
+ok 8 - checkout -b to a new branch preserves mergeable changes
+
+expecting success of 2018.9 'checkout -f -b to a new branch with mergeable changes discards changes': 
+	test_when_finished git reset --hard HEAD &&
+	setup_dirty_mergeable &&
+	do_checkout branch2 $HEAD1 "-f -b" &&
+	test_dirty_mergeable_discards_changes
+
+Switched to a new branch 'branch2'
+HEAD is now at ee02a18 initial
+ok 9 - checkout -f -b to a new branch with mergeable changes discards changes
+
+expecting success of 2018.10 'checkout -b to an existing branch fails': 
+	test_when_finished git reset --hard HEAD &&
+	do_checkout ! branch2 $HEAD2
+
+fatal: a branch named 'branch2' already exists
+HEAD is now at ee02a18 initial
+ok 10 - checkout -b to an existing branch fails
+
+expecting success of 2018.11 'checkout -b to @{-1} fails with the right branch name': 
+	git checkout branch1 &&
+	git checkout branch2 &&
+	echo  >expect "fatal: a branch named 'branch1' already exists" &&
+	test_must_fail git checkout -b @{-1} 2>actual &&
+	test_cmp expect actual
+
+Switched to branch 'branch1'
+Switched to branch 'branch2'
+ok 11 - checkout -b to @{-1} fails with the right branch name
+
+expecting success of 2018.12 'checkout -B to an existing branch resets branch to HEAD': 
+	git checkout branch1 &&
+
+	do_checkout branch2 "" -B
+
+Switched to branch 'branch1'
+Switched to and reset branch 'branch2'
+ok 12 - checkout -B to an existing branch resets branch to HEAD
+
+expecting success of 2018.13 'checkout -B to a merge base': 
+	git checkout branch1 &&
+
+	git checkout -B branch2 branch1...
+
+Switched to branch 'branch1'
+Switched to and reset branch 'branch2'
+ok 13 - checkout -B to a merge base
+
+expecting success of 2018.14 'checkout -B to an existing branch from detached HEAD resets branch to HEAD': 
+	head=$(git rev-parse --verify HEAD) &&
+	git checkout "$head" &&
+
+	do_checkout branch2 "" -B
+
+Note: switching to '5be17a9503605cbff49376bccdc74acb1ebd9160'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 5be17a9 change1
+Switched to and reset branch 'branch2'
+ok 14 - checkout -B to an existing branch from detached HEAD resets branch to HEAD
+
+expecting success of 2018.15 'checkout -B to an existing branch with an explicit ref resets branch to that ref': 
+	git checkout branch1 &&
+
+	do_checkout branch2 $HEAD1 -B
+
+Switched to branch 'branch1'
+Switched to and reset branch 'branch2'
+ok 15 - checkout -B to an existing branch with an explicit ref resets branch to that ref
+
+expecting success of 2018.16 'checkout -B to an existing branch with unmergeable changes fails': 
+	git checkout branch1 &&
+
+	setup_dirty_unmergeable &&
+	do_checkout ! branch2 $HEAD1 -B &&
+	test_dirty_unmergeable
+
+Switched to branch 'branch1'
+error: Your local changes to the following files would be overwritten by checkout:
+	file1
+Please commit your changes or stash them before you switch branches.
+Aborting
+diff --git a/file1 b/file1
+index 5be4a41..1725fe9 100644
+--- a/file1
++++ b/file1
+@@ -1 +1,2 @@
+ change1
++change2
+ok 16 - checkout -B to an existing branch with unmergeable changes fails
+
+expecting success of 2018.17 'checkout -f -B to an existing branch with unmergeable changes discards changes': 
+	# still dirty and on branch1
+	do_checkout branch2 $HEAD1 "-f -B" &&
+	test_dirty_unmergeable_discards_changes
+
+Switched to and reset branch 'branch2'
+ok 17 - checkout -f -B to an existing branch with unmergeable changes discards changes
+
+expecting success of 2018.18 'checkout -B to an existing branch preserves mergeable changes': 
+	test_when_finished git reset --hard &&
+	git checkout branch1 &&
+
+	setup_dirty_mergeable &&
+	do_checkout branch2 $HEAD1 -B &&
+	test_dirty_mergeable
+
+Switched to branch 'branch1'
+Switched to and reset branch 'branch2'
+A	file2
+diff --git a/file2 b/file2
+new file mode 100644
+index 0000000..6c493ff
+--- /dev/null
++++ b/file2
+@@ -0,0 +1 @@
++file2
+HEAD is now at ee02a18 initial
+ok 18 - checkout -B to an existing branch preserves mergeable changes
+
+expecting success of 2018.19 'checkout -f -B to an existing branch with mergeable changes discards changes': 
+	git checkout branch1 &&
+
+	setup_dirty_mergeable &&
+	do_checkout branch2 $HEAD1 "-f -B" &&
+	test_dirty_mergeable_discards_changes
+
+Switched to branch 'branch1'
+Switched to and reset branch 'branch2'
+ok 19 - checkout -f -B to an existing branch with mergeable changes discards changes
+
+expecting success of 2018.20 'checkout -b <describe>': 
+	git tag -f -m "First commit" initial initial &&
+	git checkout -f change1 &&
+	name=$(git describe) &&
+	git checkout -b $name &&
+	git diff --exit-code change1 &&
+	echo "refs/heads/$name" >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual
+
+Updated tag 'initial' (was ee02a18)
+Note: switching to 'change1'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 5be17a9 change1
+Switched to a new branch 'initial-1-g5be17a9'
+ok 20 - checkout -b <describe>
+
+expecting success of 2018.21 'checkout -B to the current branch works': 
+	git checkout branch1 &&
+	git checkout -B branch1-scratch &&
+
+	setup_dirty_mergeable &&
+	git checkout -B branch1-scratch initial &&
+	test_dirty_mergeable
+
+Switched to branch 'branch1'
+Switched to a new branch 'branch1-scratch'
+Reset branch 'branch1-scratch'
+A	file2
+diff --git a/file2 b/file2
+new file mode 100644
+index 0000000..6c493ff
+--- /dev/null
++++ b/file2
+@@ -0,0 +1 @@
++file2
+ok 21 - checkout -B to the current branch works
+
+expecting success of 2018.22 'checkout -b after clone --no-checkout does a checkout of HEAD': 
+	git init src &&
+	test_commit -C src a &&
+	rev="$(git -C src rev-parse HEAD)" &&
+	git clone --no-checkout src dest &&
+	git -C dest checkout "$rev" -b branch &&
+	test_path_is_file dest/a.t
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2018-checkout-branch/src/.git/
+[master (root-commit) 7f0b538] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+Cloning into 'dest'...
+done.
+Switched to a new branch 'branch'
+ok 22 - checkout -b after clone --no-checkout does a checkout of HEAD
+
+expecting success of 2018.23 'checkout -b to a new branch preserves mergeable changes despite sparse-checkout': 
+	test_when_finished "
+		git reset --hard &&
+		git checkout branch1-scratch &&
+		test_might_fail git branch -D branch3 &&
+		git config core.sparseCheckout false &&
+		rm -rf .git/info" &&
+
+	test_commit file2 &&
+
+	echo stuff >>file1 &&
+	mkdir .git/info &&
+	echo file2 >.git/info/sparse-checkout &&
+	git config core.sparseCheckout true &&
+
+	CURHEAD=$(git rev-parse HEAD) &&
+	do_checkout branch3 $CURHEAD &&
+
+	echo file1 >expect &&
+	git diff --name-only >actual &&
+	test_cmp expect actual
+
+[branch1-scratch b9d73e8] file2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file2
+ create mode 100644 file2.t
+warning: The following paths are not up to date and were left despite sparse patterns:
+	file1
+
+After fixing the above paths, you may want to run `git sparse-checkout reapply`.
+Switched to a new branch 'branch3'
+M	file1
+HEAD is now at b9d73e8 file2
+Switched to branch 'branch1-scratch'
+Deleted branch branch3 (was b9d73e8).
+ok 23 - checkout -b to a new branch preserves mergeable changes despite sparse-checkout
+
+expecting success of 2018.24 'checkout -b rejects an invalid start point': 
+	test_must_fail git checkout -b branch4 file1 2>err &&
+	test_grep "is not a commit" err
+
+fatal: 'file1' is not a commit and a branch 'branch4' cannot be created from it
+ok 24 - checkout -b rejects an invalid start point
+
+expecting success of 2018.25 'checkout -b rejects an extra path argument': 
+	test_must_fail git checkout -b branch5 branch1 file1 2>err &&
+	test_grep "Cannot update paths and switch to branch" err
+
+fatal: Cannot update paths and switch to branch 'branch5' at the same time.
+ok 25 - checkout -b rejects an extra path argument
+
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2025-checkout-no-overlay.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2025-checkout-no-overlay/.git/
 expecting success of 2025.1 'setup': 
@@ -95060,6 +95996,75 @@
 1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2027-checkout-track.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2026-checkout-pathspec-file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2026-checkout-pathspec-file/.git/
 expecting success of 2026.1 'setup': 
@@ -95260,75 +96265,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2027-checkout-track.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2050-git-dir-relative.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2050-git-dir-relative/.git/
 expecting success of 2050.1 'Setting up post-commit hook': 
@@ -95598,7 +96534,7 @@
  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.WWMb2A'
+Finished dry-run migration of refs, the result can be found at '.git/ref_migration.YqQnhm'
 ok 15 - files -> reftable: dry-run migration does not modify repository
 
 expecting success of 1460.16 'files -> reftable: reflogs of symrefs with target deleted': 
@@ -95855,7 +96791,7 @@
  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.dEaXOQ'
+Finished dry-run migration of refs, the result can be found at '.git/ref_migration.Ucgb20'
 ok 30 - reftable -> files: dry-run migration does not modify repository
 
 expecting success of 1460.31 'reftable -> files: reflogs of symrefs with target deleted': 
@@ -96613,6 +97549,537 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2071-restore-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2081-parallel-checkout-collisions.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2072-restore-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2024-checkout-dwim.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2024-checkout-dwim/.git/
 expecting success of 2024.1 'setup': 
@@ -97191,537 +98658,6 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2081-parallel-checkout-collisions.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2071-restore-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2072-restore-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2100-update-cache-badpath.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2100-update-cache-badpath/.git/
 checking prerequisite: SYMLINKS
@@ -97889,230 +98825,1242 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1510-repo-setup.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/.git/
-expecting success of 1510.1 '#0: nonbare repo, no explicit configuration': 
-	try_repo 0 unset unset unset "" unset \
-		.git "$here/0" "$here/0" "(null)" \
-		.git "$here/0" "$here/0" sub/ 2>message &&
-	test_must_be_empty message
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/0/.git/
-ok 1 - #0: nonbare repo, no explicit configuration
+*** t2030-unresolve-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-expecting success of 1510.2 '#1: GIT_WORK_TREE without explicit GIT_DIR is accepted': 
-	try_repo 1 "$here" unset unset "" unset \
-		"$here/1/.git" "$here" "$here" 1/ \
-		"$here/1/.git" "$here" "$here" 1/sub/ 2>message &&
-	test_must_be_empty message
+[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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/1/.git/
-ok 2 - #1: GIT_WORK_TREE without explicit GIT_DIR is accepted
+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
 
-expecting success of 1510.3 '#2: worktree defaults to cwd with explicit GIT_DIR': 
-	try_repo 2 unset "$here/2/.git" unset "" unset \
-		"$here/2/.git" "$here/2" "$here/2" "(null)" \
-		"$here/2/.git" "$here/2/sub" "$here/2/sub" "(null)"
+HEAD is now at 9a00f99 second
+Note: switching to 'second^0'.
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/2/.git/
-ok 3 - #2: worktree defaults to cwd with explicit GIT_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 1510.4 '#2b: relative GIT_DIR': 
-	try_repo 2b unset ".git" unset "" unset \
-		".git" "$here/2b" "$here/2b" "(null)" \
-		"../.git" "$here/2b/sub" "$here/2b/sub" "(null)"
+If you want to 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.51.0/t/trash directory.t1510-repo-setup/2b/.git/
-ok 4 - #2b: relative GIT_DIR
+  git switch -c <new-branch-name>
 
-expecting success of 1510.5 '#3: setup': 
-	setup_repo 3 unset "" unset &&
-	mkdir -p 3/sub/sub 3/wt/sub
+Or undo this operation with:
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/3/.git/
-ok 5 - #3: setup
+  git switch -
 
-expecting success of 1510.6 '#3: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
-	
-ok 6 - #3: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 1510.7 '#3: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
-	
-ok 7 - #3: explicit GIT_WORK_TREE and GIT_DIR in subdir
+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:
 
-expecting success of 1510.8 '#3: explicit GIT_WORK_TREE from parent of worktree': 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
-	
-ok 8 - #3: explicit GIT_WORK_TREE from parent of worktree
+  b3a51df merged
 
-expecting success of 1510.9 '#3: explicit GIT_WORK_TREE from nephew of worktree': 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
-	
-ok 9 - #3: explicit GIT_WORK_TREE from nephew of worktree
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 1510.10 '#3: chdir_to_toplevel uses worktree, not git dir': 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
-	
-ok 10 - #3: chdir_to_toplevel uses worktree, not git dir
+ git branch <new-branch-name> b3a51df
 
-expecting success of 1510.11 '#3: chdir_to_toplevel uses worktree (from subdir)': 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
-	
-ok 11 - #3: chdir_to_toplevel uses worktree (from subdir)
+HEAD is now at 9a00f99 second
+switching clears
+ok 2 - add records switch clears
 
-expecting success of 1510.12 '#4: core.worktree without GIT_DIR set is accepted': 
-	setup_repo 4 ../sub "" unset &&
-	mkdir -p 4/sub sub &&
-	try_case 4 unset unset \
-		.git "$here/4/sub" "$here/4" "(null)" \
-		"$here/4/.git" "$here/4/sub" "$here/4/sub" "(null)" 2>message &&
-	test_must_be_empty message
+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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/4/.git/
-ok 12 - #4: core.worktree without GIT_DIR set is accepted
+	echo merge clears upfront &&
+	test_must_fail git merge fourth^0 &&
+	check_resolve_undo nuked &&
 
-expecting success of 1510.13 '#5: core.worktree + GIT_WORK_TREE is accepted': 
-	# or: you cannot intimidate away the lack of GIT_DIR setting
-	try_repo 5 "$here" unset "$here/5" "" unset \
-		"$here/5/.git" "$here" "$here" 5/ \
-		"$here/5/.git" "$here" "$here" 5/sub/ 2>message &&
-	try_repo 5a .. unset "$here/5a" "" unset \
-		"$here/5a/.git" "$here" "$here" 5a/ \
-		"$here/5a/.git" "$here/5a" "$here/5a" sub/ &&
-	test_must_be_empty message
+	git rm -f fi/le &&
+	echo resolving records &&
+	check_resolve_undo recorded fi/le initial:fi/le HEAD:fi/le fourth:fi/le &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/5/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/5a/.git/
-ok 13 - #5: core.worktree + GIT_WORK_TREE is accepted
+	git reset --hard &&
+	echo resetting discards &&
+	check_resolve_undo discarded
 
-expecting success of 1510.14 '#6: setting GIT_DIR brings core.worktree to life': 
-	setup_repo 6 "$here/6" "" unset &&
-	try_case 6 unset .git \
-		.git "$here/6" "$here/6" "(null)" &&
-	try_case 6 unset "$here/6/.git" \
-		"$here/6/.git" "$here/6" "$here/6" "(null)" &&
-	try_case 6/sub/sub unset ../../.git \
-		"$here/6/.git" "$here/6" "$here/6" sub/sub/ &&
-	try_case 6/sub/sub unset "$here/6/.git" \
-		"$here/6/.git" "$here/6" "$here/6" sub/sub/
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/6/.git/
-ok 14 - #6: setting GIT_DIR brings core.worktree to life
+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 1510.15 '#6b: GIT_DIR set, core.worktree relative': 
-	setup_repo 6b .. "" unset &&
-	try_case 6b unset .git \
-		.git "$here/6b" "$here/6b" "(null)" &&
-	try_case 6b unset "$here/6b/.git" \
-		"$here/6b/.git" "$here/6b" "$here/6b" "(null)" &&
-	try_case 6b/sub/sub unset ../../.git \
-		"$here/6b/.git" "$here/6b" "$here/6b" sub/sub/ &&
-	try_case 6b/sub/sub unset "$here/6b/.git" \
-		"$here/6b/.git" "$here/6b" "$here/6b" sub/sub/
+	echo plumbing clear &&
+	git update-index --clear-resolve-undo &&
+	check_resolve_undo cleared
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/6b/.git/
-ok 15 - #6b: GIT_DIR set, core.worktree relative
+HEAD is now at 70d285e merged
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 1510.16 '#6c: GIT_DIR set, core.worktree=../wt (absolute)': 
-	setup_repo 6c "$here/6c/wt" "" unset &&
-	mkdir -p 6c/wt/sub &&
+  70d285e merged
 
-	try_case 6c unset .git \
-		.git "$here/6c/wt" "$here/6c" "(null)" &&
-	try_case 6c unset "$here/6c/.git" \
-		"$here/6c/.git" "$here/6c/wt" "$here/6c" "(null)" &&
-	try_case 6c/sub/sub unset ../../.git \
-		../../.git "$here/6c/wt" "$here/6c/sub/sub" "(null)" &&
-	try_case 6c/sub/sub unset "$here/6c/.git" \
-		"$here/6c/.git" "$here/6c/wt" "$here/6c/sub/sub" "(null)"
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/6c/.git/
-ok 16 - #6c: GIT_DIR set, core.worktree=../wt (absolute)
+ git branch <new-branch-name> 70d285e
 
-expecting success of 1510.17 '#6d: GIT_DIR set, core.worktree=../wt (relative)': 
-	setup_repo 6d "$here/6d/wt" "" unset &&
-	mkdir -p 6d/wt/sub &&
+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 894de51] merged
+ Author: A U Thor <author@example.com>
+committing keeps
+plumbing clear
+ok 4 - plumbing clears
 
-	try_case 6d unset .git \
-		.git "$here/6d/wt" "$here/6d" "(null)" &&
-	try_case 6d unset "$here/6d/.git" \
-		"$here/6d/.git" "$here/6d/wt" "$here/6d" "(null)" &&
-	try_case 6d/sub/sub unset ../../.git \
-		../../.git "$here/6d/wt" "$here/6d/sub/sub" "(null)" &&
-	try_case 6d/sub/sub unset "$here/6d/.git" \
-		"$here/6d/.git" "$here/6d/wt" "$here/6d/sub/sub" "(null)"
+expecting success of 2030.5 'add records checkout -m undoes': 
+	prime_resolve_undo &&
+	git diff HEAD &&
+	git checkout --conflict=merge fi/le &&
+	echo checkout used the record and removed it &&
+	check_resolve_undo removed &&
+	echo the index and the work tree is unmerged again &&
+	git diff >actual &&
+	grep "^++<<<<<<<" actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/6d/.git/
-ok 17 - #6d: GIT_DIR set, core.worktree=../wt (relative)
+HEAD is now at 894de51 merged
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 1510.18 '#6e: GIT_DIR set, core.worktree=../.. (absolute)': 
-	setup_repo 6e "$here" "" unset &&
-	try_case 6e unset .git \
-		"$here/6e/.git" "$here" "$here" 6e/ &&
-	try_case 6e unset "$here/6e/.git" \
-		"$here/6e/.git" "$here" "$here" 6e/ &&
-	try_case 6e/sub/sub unset ../../.git \
-		"$here/6e/.git" "$here" "$here" 6e/sub/sub/ &&
-	try_case 6e/sub/sub unset "$here/6e/.git" \
-		"$here/6e/.git" "$here" "$here" 6e/sub/sub/
+  894de51 merged
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/6e/.git/
-ok 18 - #6e: GIT_DIR set, core.worktree=../.. (absolute)
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 1510.19 '#6f: GIT_DIR set, core.worktree=../.. (relative)': 
-	setup_repo 6f ../../ "" unset &&
-	try_case 6f unset .git \
-		"$here/6f/.git" "$here" "$here" 6f/ &&
-	try_case 6f unset "$here/6f/.git" \
-		"$here/6f/.git" "$here" "$here" 6f/ &&
-	try_case 6f/sub/sub unset ../../.git \
-		"$here/6f/.git" "$here" "$here" 6f/sub/sub/ &&
-	try_case 6f/sub/sub unset "$here/6f/.git" \
-		"$here/6f/.git" "$here" "$here" 6f/sub/sub/
+ git branch <new-branch-name> 894de51
+
+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.
+diff --git a/fi/le b/fi/le
+index e019be0..8dca2f8 100644
+--- a/fi/le
++++ b/fi/le
+@@ -1 +1 @@
+-second
++different
+Recreated 1 merge conflict
+checkout used the record and removed it
+the index and the work tree is unmerged again
+++<<<<<<< ours
+ok 5 - add records checkout -m undoes
+
+expecting success of 2030.6 'unmerge with plumbing': 
+	prime_resolve_undo &&
+	git update-index --unresolve fi/le &&
+	git ls-files --resolve-undo fi/le >actual &&
+	test_must_be_empty actual &&
+	git ls-files -u >actual &&
+	test_line_count = 3 actual
+
+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.
+ok 6 - unmerge with plumbing
+
+expecting success of 2030.7 'unmerge can be done even after committing': 
+	prime_resolve_undo &&
+	git commit -m "record to nuke MERGE_HEAD" &&
+	git update-index --unresolve fi/le &&
+	git ls-files --resolve-undo fi/le >actual &&
+	test_must_be_empty actual &&
+	git ls-files -u >actual &&
+	test_line_count = 3 actual
+
+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 739b00c] record to nuke MERGE_HEAD
+ Author: A U Thor <author@example.com>
+ok 7 - unmerge can be done even after committing
+
+expecting success of 2030.8 'unmerge removal': 
+	prime_resolve_undo remove &&
+	git update-index --unresolve fi/le &&
+	git ls-files --resolve-undo fi/le >actual &&
+	test_must_be_empty actual &&
+	git ls-files -u >actual &&
+	test_line_count = 3 actual
+
+HEAD is now at 739b00c record to nuke MERGE_HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  739b00c record to nuke MERGE_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> 739b00c
+
+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.
+rm 'fi/le'
+ok 8 - unmerge removal
+
+expecting success of 2030.9 'unmerge removal after committing': 
+	prime_resolve_undo remove &&
+	git commit -m "record to nuke MERGE_HEAD" &&
+	git update-index --unresolve fi/le &&
+	git ls-files --resolve-undo fi/le >actual &&
+	test_must_be_empty actual &&
+	git ls-files -u >actual &&
+	test_line_count = 3 actual
+
+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.
+rm 'fi/le'
+[detached HEAD 76cfeff] record to nuke MERGE_HEAD
+ Author: A U Thor <author@example.com>
+ok 9 - unmerge removal after committing
+
+expecting success of 2030.10 'rerere and rerere forget': 
+	mkdir .git/rr-cache &&
+	prime_resolve_undo &&
+	echo record the resolution &&
+	git rerere &&
+	rerere_id=$(cd .git/rr-cache && echo */postimage) &&
+	rerere_id=${rerere_id%/postimage} &&
+	test -f .git/rr-cache/$rerere_id/postimage &&
+	git checkout -m fi/le &&
+	echo resurrect the conflict &&
+	grep "^=======" fi/le &&
+	echo reresolve the conflict &&
+	git rerere &&
+	test "z$(cat fi/le)" = zdifferent &&
+	echo register the resolution again &&
+	git add fi/le &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+	test -z "$(git ls-files -u)" &&
+	git rerere forget fi/le &&
+	! test -f .git/rr-cache/$rerere_id/postimage &&
+	tr "\0" "\n" <.git/MERGE_RR >actual &&
+	echo "$rerere_id	fi/le" >expect &&
+	test_cmp expect actual
+
+HEAD is now at 76cfeff record to nuke MERGE_HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  76cfeff record to nuke MERGE_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> 76cfeff
+
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Recorded preimage for 'fi/le'
+Automatic merge failed; fix conflicts and then commit the result.
+record the resolution
+Recorded resolution for 'fi/le'.
+Recreated 1 merge conflict
+resurrect the conflict
+=======
+reresolve the conflict
+Resolved 'fi/le' using previous resolution.
+register the resolution again
+Updated preimage for 'fi/le'
+Forgot resolution for 'fi/le'
+ok 10 - rerere and rerere forget
+
+expecting success of 2030.11 'rerere and rerere forget (subdirectory)': 
+	rm -fr .git/rr-cache &&
+	mkdir .git/rr-cache &&
+	prime_resolve_undo &&
+	echo record the resolution &&
+	(cd fi && git rerere) &&
+	rerere_id=$(cd .git/rr-cache && echo */postimage) &&
+	rerere_id=${rerere_id%/postimage} &&
+	test -f .git/rr-cache/$rerere_id/postimage &&
+	(cd fi && git checkout -m le) &&
+	echo resurrect the conflict &&
+	grep "^=======" fi/le &&
+	echo reresolve the conflict &&
+	(cd fi && git rerere) &&
+	test "z$(cat fi/le)" = zdifferent &&
+	echo register the resolution again &&
+	(cd fi && git add le) &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+	test -z "$(git ls-files -u)" &&
+	(cd fi && git rerere forget le) &&
+	! test -f .git/rr-cache/$rerere_id/postimage &&
+	tr "\0" "\n" <.git/MERGE_RR >actual &&
+	echo "$rerere_id	fi/le" >expect &&
+	test_cmp expect actual
+
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Recorded preimage for 'fi/le'
+Automatic merge failed; fix conflicts and then commit the result.
+record the resolution
+Recorded resolution for 'fi/le'.
+Recreated 1 merge conflict
+resurrect the conflict
+=======
+reresolve the conflict
+Resolved 'fi/le' using previous resolution.
+register the resolution again
+Updated preimage for 'fi/le'
+Forgot resolution for 'fi/le'
+ok 11 - rerere and rerere forget (subdirectory)
+
+expecting success of 2030.12 'rerere forget (binary)': 
+	git checkout -f side &&
+	test_commit --printf binary binary "a\0c" &&
+	test_must_fail git merge second &&
+	git rerere forget binary
+
+Previous HEAD position was 9a00f99 second
+Switched to branch 'side'
+[side ebd12fa] binary
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+warning: Cannot merge binary files: binary (HEAD vs. second)
+Auto-merging binary
+CONFLICT (content): Merge conflict in binary
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Recorded preimage for 'fi/le'
+Automatic merge failed; fix conflicts and then commit the result.
+error: could not parse conflict hunks in 'binary'
+ok 12 - rerere forget (binary)
+
+expecting success of 2030.13 'rerere forget (add-add conflict)': 
+	git checkout -f main &&
+	echo main >add-differently &&
+	git add add-differently &&
+	git commit -m "add differently" &&
+	test_must_fail git merge fifth &&
+	git rerere forget add-differently 2>actual &&
+	test_grep "no remembered" actual
+
+Switched to branch 'main'
+[main d92f3b1] add differently
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 add-differently
+Auto-merging add-differently
+CONFLICT (add/add): Merge conflict in add-differently
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Recorded preimage for 'add-differently'
+Recorded preimage for 'fi/le'
+Automatic merge failed; fix conflicts and then commit the result.
+error: no remembered resolution for 'add-differently'
+ok 13 - rerere forget (add-add conflict)
+
+expecting success of 2030.14 'resolve-undo keeps blobs from gc': 
+	git checkout -f main &&
+
+	# First make sure we do not have any cruft left in the object store
+	git repack -a -d &&
+	git prune --expire=now &&
+	git prune-packed &&
+	git gc --prune=now &&
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
+
+	# Now add three otherwise unreferenced blob objects to the index
+	git reset --hard &&
+	B1=$(echo "resolve undo test data 1" | git hash-object -w --stdin) &&
+	B2=$(echo "resolve undo test data 2" | git hash-object -w --stdin) &&
+	B3=$(echo "resolve undo test data 3" | git hash-object -w --stdin) &&
+	git update-index --add --index-info <<-EOF &&
+	100644 $B1 1	frotz
+	100644 $B2 2	frotz
+	100644 $B3 3	frotz
+	EOF
+
+	# These three blob objects are reachable (only) from the index
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
+	# and they should be protected from GC
+	git gc --prune=now &&
+	git cat-file -e $B1 &&
+	git cat-file -e $B2 &&
+	git cat-file -e $B3 &&
+
+	# Now resolve the conflicted path
+	B0=$(echo "resolve undo test data 0" | git hash-object -w --stdin) &&
+	git update-index --add --cacheinfo 100644,$B0,frotz &&
+
+	# These three blob objects are now reachable only from the resolve-undo
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
+
+	# and they should survive GC
+	git gc --prune=now &&
+	git cat-file -e $B0 &&
+	git cat-file -e $B1 &&
+	git cat-file -e $B2 &&
+	git cat-file -e $B3 &&
+
+	# Now we switch away, which nukes resolve-undo, and
+	# blobs B0..B3 would become dangling.  fsck should
+	# notice that they are now unreachable.
+	git checkout -f side &&
+	git fsck --unreachable >cruft &&
+	sort cruft >actual &&
+	sort <<-EOF >expect &&
+	unreachable blob $B0
+	unreachable blob $B1
+	unreachable blob $B2
+	unreachable blob $B3
+	EOF
+	test_cmp expect actual &&
+
+	# And they should go away when gc runs.
+	git gc --prune=now &&
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
+
+	test_must_fail git cat-file -e $B0 &&
+	test_must_fail git cat-file -e $B1 &&
+	test_must_fail git cat-file -e $B2 &&
+	test_must_fail git cat-file -e $B3
+
+Already on 'main'
+HEAD is now at d92f3b1 add differently
+Switched to branch 'side'
+ok 14 - resolve-undo keeps blobs from gc
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2104-update-index-skip-worktree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2104-update-index-skip-worktree/.git/
+expecting success of 2104.1 'setup': 
+	cat >expect.full <<-\EOF &&
+	H 1
+	H 2
+	H sub/1
+	H sub/2
+	EOF
+
+	cat >expect.skip <<-\EOF &&
+	S 1
+	H 2
+	S sub/1
+	H sub/2
+	EOF
+
+	mkdir sub &&
+	touch ./1 ./2 sub/1 sub/2 &&
+	git add 1 2 sub/1 sub/2 &&
+	git ls-files -t | test_cmp expect.full -
+
+ok 1 - setup
+
+expecting success of 2104.2 'index is at version 2': 
+	test "$(git update-index --show-index-version)" = 2
+
+ok 2 - index is at version 2
+
+expecting success of 2104.3 'update-index --skip-worktree': 
+	git update-index --skip-worktree 1 sub/1 &&
+	git ls-files -t | test_cmp expect.skip -
+
+ok 3 - update-index --skip-worktree
+
+expecting success of 2104.4 'index is at version 3 after having some skip-worktree entries': 
+	test "$(git update-index --show-index-version)" = 3
+
+ok 4 - index is at version 3 after having some skip-worktree entries
+
+expecting success of 2104.5 'ls-files -t': 
+	git ls-files -t | test_cmp expect.skip -
+
+ok 5 - ls-files -t
+
+expecting success of 2104.6 'update-index --no-skip-worktree': 
+	git update-index --no-skip-worktree 1 sub/1 &&
+	git ls-files -t | test_cmp expect.full -
+
+ok 6 - update-index --no-skip-worktree
+
+expecting success of 2104.7 'index version is back to 2 when there is no skip-worktree entry': 
+	test "$(git update-index --show-index-version)" = 2
+
+ok 7 - index version is back to 2 when there is no skip-worktree entry
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2105-update-index-gitfile.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2103-update-index-ignore-missing.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2103-update-index-ignore-missing/.git/
+expecting success of 2103.1 'basics': 
+	>one &&
+	>two &&
+	>three &&
+
+	# need --add when adding
+	test_must_fail git update-index one &&
+	test -z "$(git ls-files)" &&
+	git update-index --add one &&
+	test zone = "z$(git ls-files)" &&
+
+	# update-index is atomic
+	echo 1 >one &&
+	test_must_fail git update-index one two &&
+	echo "M	one" >expect &&
+	git diff-files --name-status >actual &&
+	test_cmp expect actual &&
+
+	git update-index --add one two three &&
+	test_write_lines one three two >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual &&
+
+	test_tick &&
+	(
+		test_create_repo xyzzy &&
+		cd xyzzy &&
+		>file &&
+		git add file &&
+		git commit -m "sub initial"
+	) &&
+	git add xyzzy &&
+
+	test_tick &&
+	git commit -m initial &&
+	git tag initial
+
+error: one: cannot add to the index - missing --add option?
+fatal: Unable to process path one
+error: two: cannot add to the index - missing --add option?
+fatal: Unable to process path two
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2103-update-index-ignore-missing/xyzzy/.git/
+[master (root-commit) a40d181] sub initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+warning: adding embedded git repository: xyzzy
+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> xyzzy
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached xyzzy
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[master (root-commit) ce14d7f] initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ create mode 100644 one
+ create mode 100644 three
+ create mode 100644 two
+ create mode 160000 xyzzy
+ok 1 - basics
+
+expecting success of 2103.2 '--ignore-missing --refresh': 
+	git reset --hard initial &&
+	echo 2 >one &&
+	test_must_fail git update-index --refresh &&
+	echo 1 >one &&
+	git update-index --refresh &&
+	rm -f two &&
+	test_must_fail git update-index --refresh &&
+	git update-index --ignore-missing --refresh
+
+
+HEAD is now at ce14d7f initial
+one: needs update
+two: needs update
+ok 2 - --ignore-missing --refresh
+
+expecting success of 2103.3 '--unmerged --refresh': 
+	git reset --hard initial &&
+	info=$(git ls-files -s one | sed -e "s/ 0	/ 1	/") &&
+	git rm --cached one &&
+	echo "$info" | git update-index --index-info &&
+	test_must_fail git update-index --refresh &&
+	git update-index --unmerged --refresh &&
+	echo 2 >two &&
+	test_must_fail git update-index --unmerged --refresh >actual &&
+	grep two actual &&
+	! grep one actual &&
+	! grep three actual
+
+HEAD is now at ce14d7f initial
+rm 'one'
+one: needs merge
+two: needs update
+ok 3 - --unmerged --refresh
+
+expecting success of 2103.4 '--ignore-submodules --refresh (1)': 
+	git reset --hard initial &&
+	rm -f two &&
+	test_must_fail git update-index --ignore-submodules --refresh
+
+HEAD is now at ce14d7f initial
+two: needs update
+ok 4 - --ignore-submodules --refresh (1)
+
+expecting success of 2103.5 '--ignore-submodules --refresh (2)': 
+	git reset --hard initial &&
+	test_tick &&
+	(
+		cd xyzzy &&
+		git commit -m "sub second" --allow-empty
+	) &&
+	test_must_fail git update-index --refresh &&
+	test_must_fail git update-index --ignore-missing --refresh &&
+	git update-index --ignore-submodules --refresh
+
+HEAD is now at ce14d7f initial
+[master 66f0d66] sub second
+ Author: A U Thor <author@example.com>
+xyzzy: needs update
+xyzzy: needs update
+ok 5 - --ignore-submodules --refresh (2)
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2082-parallel-checkout-attributes.sh ***
+expecting success of 2082.1 'parallel-checkout with ident': 
+	set_checkout_config 2 0 &&
+	git init ident &&
+	(
+		cd ident &&
+		echo "A ident" >.gitattributes &&
+		echo "\$Id\$" >A &&
+		echo "\$Id\$" >B &&
+		git add -A &&
+		git commit -m id &&
+
+		rm A B &&
+		test_checkout_workers 2 git reset --hard &&
+		hexsz=$(test_oid hexsz) &&
+		grep -E "\\\$Id: [0-9a-f]{$hexsz} \\\$" A &&
+		grep "\\\$Id\\\$" B
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2082-parallel-checkout-attributes/ident/.git/
+[master (root-commit) f770bc4] id
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 A
+ create mode 100644 B
+HEAD is now at f770bc4 id
+$Id: 055c8729cdcc372500a08db659c045e16c4409fb $
+$Id$
+ok 1 - parallel-checkout with ident
+
+expecting success of 2082.2 'parallel-checkout with re-encoding': 
+	set_checkout_config 2 0 &&
+	git init encoding &&
+	(
+		cd encoding &&
+		echo text >utf8-text &&
+		write_utf16 <utf8-text >utf16-text &&
+
+		echo "A working-tree-encoding=UTF-16" >.gitattributes &&
+		cp utf16-text A &&
+		cp utf8-text B &&
+		git add A B .gitattributes &&
+		git commit -m encoding &&
+
+		# Check that A is stored in UTF-8
+		git cat-file -p :A >A.internal &&
+		test_cmp_bin utf8-text A.internal &&
+
+		rm A B &&
+		test_checkout_workers 2 git checkout A B &&
+
+		# Check that A (and only A) is re-encoded during checkout
+		test_cmp_bin utf16-text A &&
+		test_cmp_bin utf8-text B
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2082-parallel-checkout-attributes/encoding/.git/
+checking prerequisite: NO_UTF16_BOM
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF16_BOM" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF16_BOM" &&
+	test $(printf abc | iconv -f UTF-8 -t UTF-16 | wc -c) = 6
+
+)
+prerequisite NO_UTF16_BOM not satisfied
+[master (root-commit) eb6a843] encoding
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 A
+ create mode 100644 B
+Updated 2 paths from the index
+ok 2 - parallel-checkout with re-encoding
+
+expecting success of 2082.3 'parallel-checkout with eol conversions': 
+	set_checkout_config 2 0 &&
+	git init eol &&
+	(
+		cd eol &&
+		printf "multi\r\nline\r\ntext" >crlf-text &&
+		printf "multi\nline\ntext" >lf-text &&
+
+		git config core.autocrlf false &&
+		echo "A eol=crlf" >.gitattributes &&
+		cp crlf-text A &&
+		cp lf-text B &&
+		git add A B .gitattributes &&
+		git commit -m eol &&
+
+		# Check that A is stored with LF format
+		git cat-file -p :A >A.internal &&
+		test_cmp_bin lf-text A.internal &&
+
+		rm A B &&
+		test_checkout_workers 2 git checkout A B &&
+
+		# Check that A (and only A) is converted to CRLF during checkout
+		test_cmp_bin crlf-text A &&
+		test_cmp_bin lf-text B
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2082-parallel-checkout-attributes/eol/.git/
+[master (root-commit) cd8ac0d] eol
+ Author: A U Thor <author@example.com>
+ 3 files changed, 7 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 A
+ create mode 100644 B
+Updated 2 paths from the index
+ok 3 - parallel-checkout with eol conversions
+
+expecting success of 2082.4 'parallel-checkout and external filter': 
+	set_checkout_config 2 0 &&
+	git init filter &&
+	(
+		cd filter &&
+		write_script <<-\EOF rot13.sh &&
+		tr \
+		  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
+		  "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM"
+		EOF
+
+		git config filter.rot13.clean "\"$(pwd)/rot13.sh\"" &&
+		git config filter.rot13.smudge "\"$(pwd)/rot13.sh\"" &&
+		git config filter.rot13.required true &&
+
+		echo abcd >original &&
+		echo nopq >rot13 &&
+
+		echo "A filter=rot13" >.gitattributes &&
+		cp original A &&
+		cp original B &&
+		cp original C &&
+		git add A B C .gitattributes &&
+		git commit -m filter &&
+
+		# Check that A (and only A) was cleaned
+		git cat-file -p :A >A.internal &&
+		test_cmp rot13 A.internal &&
+		git cat-file -p :B >B.internal &&
+		test_cmp original B.internal &&
+		git cat-file -p :C >C.internal &&
+		test_cmp original C.internal &&
+
+		rm A B C *.internal &&
+		test_checkout_workers 2 git checkout A B C &&
+
+		# Check that A (and only A) was smudged during checkout
+		test_cmp original A &&
+		test_cmp original B &&
+		test_cmp original C
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2082-parallel-checkout-attributes/filter/.git/
+[master (root-commit) 9fb524e] filter
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 A
+ create mode 100644 B
+ create mode 100644 C
+Updated 3 paths from the index
+ok 4 - parallel-checkout and external filter
+
+expecting success of 2082.5 'parallel-checkout and delayed checkout': 
+	test_config_global filter.delay.process \
+		"test-tool rot13-filter --always-delay --log=\"$(pwd)/delayed.log\" clean smudge delay" &&
+	test_config_global filter.delay.required true &&
+
+	echo "abcd" >original &&
+	echo "nopq" >rot13 &&
+
+	git init delayed &&
+	(
+		cd delayed &&
+		echo "*.d filter=delay" >.gitattributes &&
+		cp ../original W.d &&
+		cp ../original X.d &&
+		cp ../original Y &&
+		cp ../original Z &&
+		git add -A &&
+		git commit -m delayed &&
+
+		# Check that *.d files were cleaned
+		git cat-file -p :W.d >W.d.internal &&
+		test_cmp W.d.internal ../rot13 &&
+		git cat-file -p :X.d >X.d.internal &&
+		test_cmp X.d.internal ../rot13 &&
+		git cat-file -p :Y >Y.internal &&
+		test_cmp Y.internal ../original &&
+		git cat-file -p :Z >Z.internal &&
+		test_cmp Z.internal ../original &&
+
+		rm *
+	) &&
+
+	set_checkout_config 2 0 &&
+	test_checkout_workers 2 git -C delayed checkout -f &&
+	verify_checkout delayed &&
+
+	# Check that the *.d files got to the delay queue and were filtered
+	grep "smudge W.d .* \[DELAYED\]" delayed.log &&
+	grep "smudge X.d .* \[DELAYED\]" delayed.log &&
+	test_cmp delayed/W.d original &&
+	test_cmp delayed/X.d original &&
+
+	# Check that the parallel-eligible entries went to the right queue and
+	# were not filtered
+	! grep "smudge Y .* \[DELAYED\]" delayed.log &&
+	! grep "smudge Z .* \[DELAYED\]" delayed.log &&
+	test_cmp delayed/Y original &&
+	test_cmp delayed/Z original
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2082-parallel-checkout-attributes/delayed/.git/
+[master (root-commit) 73aa10e] delayed
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 W.d
+ create mode 100644 X.d
+ create mode 100644 Y
+ create mode 100644 Z
+IN: smudge W.d treeish=73aa10e96740aa088d4dcea378e1df6a64c5577d blob=0c362bbfebfbae31b3762aada18b9d0119486316 5 [OK] -- [DELAYED]
+IN: smudge X.d treeish=73aa10e96740aa088d4dcea378e1df6a64c5577d blob=0c362bbfebfbae31b3762aada18b9d0119486316 5 [OK] -- [DELAYED]
+ok 5 - parallel-checkout and delayed checkout
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2106-update-index-assume-unchanged.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2106-update-index-assume-unchanged/.git/
+expecting success of 2106.1 'setup': 
+	: >file &&
+	git add file &&
+	git commit -m initial &&
+	git branch other &&
+	echo upstream >file &&
+	git add file &&
+	git commit -m upstream
+
+[master (root-commit) 6ce5622] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[master fbda113] upstream
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 2106.2 'do not switch branches with dirty file': 
+	git reset --hard &&
+	git checkout other &&
+	echo dirt >file &&
+	git update-index --assume-unchanged file &&
+	test_must_fail git checkout - 2>err &&
+	test_grep overwritten err
+
+HEAD is now at fbda113 upstream
+Switched to branch 'other'
+error: Your local changes to the following files would be overwritten by checkout:
+ok 2 - do not switch branches with dirty file
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1510-repo-setup.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/.git/
+expecting success of 1510.1 '#0: nonbare repo, no explicit configuration': 
+	try_repo 0 unset unset unset "" unset \
+		.git "$here/0" "$here/0" "(null)" \
+		.git "$here/0" "$here/0" sub/ 2>message &&
+	test_must_be_empty message
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/0/.git/
+ok 1 - #0: nonbare repo, no explicit configuration
+
+expecting success of 1510.2 '#1: GIT_WORK_TREE without explicit GIT_DIR is accepted': 
+	try_repo 1 "$here" unset unset "" unset \
+		"$here/1/.git" "$here" "$here" 1/ \
+		"$here/1/.git" "$here" "$here" 1/sub/ 2>message &&
+	test_must_be_empty message
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/1/.git/
+ok 2 - #1: GIT_WORK_TREE without explicit GIT_DIR is accepted
+
+expecting success of 1510.3 '#2: worktree defaults to cwd with explicit GIT_DIR': 
+	try_repo 2 unset "$here/2/.git" unset "" unset \
+		"$here/2/.git" "$here/2" "$here/2" "(null)" \
+		"$here/2/.git" "$here/2/sub" "$here/2/sub" "(null)"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/2/.git/
+ok 3 - #2: worktree defaults to cwd with explicit GIT_DIR
+
+expecting success of 1510.4 '#2b: relative GIT_DIR': 
+	try_repo 2b unset ".git" unset "" unset \
+		".git" "$here/2b" "$here/2b" "(null)" \
+		"../.git" "$here/2b/sub" "$here/2b/sub" "(null)"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/2b/.git/
+ok 4 - #2b: relative GIT_DIR
+
+expecting success of 1510.5 '#3: setup': 
+	setup_repo 3 unset "" unset &&
+	mkdir -p 3/sub/sub 3/wt/sub
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/3/.git/
+ok 5 - #3: setup
+
+expecting success of 1510.6 '#3: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 6 - #3: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+
+expecting success of 1510.7 '#3: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 7 - #3: explicit GIT_WORK_TREE and GIT_DIR in subdir
+
+expecting success of 1510.8 '#3: explicit GIT_WORK_TREE from parent of worktree': 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 8 - #3: explicit GIT_WORK_TREE from parent of worktree
+
+expecting success of 1510.9 '#3: explicit GIT_WORK_TREE from nephew of worktree': 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 9 - #3: explicit GIT_WORK_TREE from nephew of worktree
+
+expecting success of 1510.10 '#3: chdir_to_toplevel uses worktree, not git dir': 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 10 - #3: chdir_to_toplevel uses worktree, not git dir
+
+expecting success of 1510.11 '#3: chdir_to_toplevel uses worktree (from subdir)': 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 11 - #3: chdir_to_toplevel uses worktree (from subdir)
+
+expecting success of 1510.12 '#4: core.worktree without GIT_DIR set is accepted': 
+	setup_repo 4 ../sub "" unset &&
+	mkdir -p 4/sub sub &&
+	try_case 4 unset unset \
+		.git "$here/4/sub" "$here/4" "(null)" \
+		"$here/4/.git" "$here/4/sub" "$here/4/sub" "(null)" 2>message &&
+	test_must_be_empty message
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/4/.git/
+ok 12 - #4: core.worktree without GIT_DIR set is accepted
+
+expecting success of 1510.13 '#5: core.worktree + GIT_WORK_TREE is accepted': 
+	# or: you cannot intimidate away the lack of GIT_DIR setting
+	try_repo 5 "$here" unset "$here/5" "" unset \
+		"$here/5/.git" "$here" "$here" 5/ \
+		"$here/5/.git" "$here" "$here" 5/sub/ 2>message &&
+	try_repo 5a .. unset "$here/5a" "" unset \
+		"$here/5a/.git" "$here" "$here" 5a/ \
+		"$here/5a/.git" "$here/5a" "$here/5a" sub/ &&
+	test_must_be_empty message
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/5/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/5a/.git/
+ok 13 - #5: core.worktree + GIT_WORK_TREE is accepted
+
+expecting success of 1510.14 '#6: setting GIT_DIR brings core.worktree to life': 
+	setup_repo 6 "$here/6" "" unset &&
+	try_case 6 unset .git \
+		.git "$here/6" "$here/6" "(null)" &&
+	try_case 6 unset "$here/6/.git" \
+		"$here/6/.git" "$here/6" "$here/6" "(null)" &&
+	try_case 6/sub/sub unset ../../.git \
+		"$here/6/.git" "$here/6" "$here/6" sub/sub/ &&
+	try_case 6/sub/sub unset "$here/6/.git" \
+		"$here/6/.git" "$here/6" "$here/6" sub/sub/
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/6/.git/
+ok 14 - #6: setting GIT_DIR brings core.worktree to life
+
+expecting success of 1510.15 '#6b: GIT_DIR set, core.worktree relative': 
+	setup_repo 6b .. "" unset &&
+	try_case 6b unset .git \
+		.git "$here/6b" "$here/6b" "(null)" &&
+	try_case 6b unset "$here/6b/.git" \
+		"$here/6b/.git" "$here/6b" "$here/6b" "(null)" &&
+	try_case 6b/sub/sub unset ../../.git \
+		"$here/6b/.git" "$here/6b" "$here/6b" sub/sub/ &&
+	try_case 6b/sub/sub unset "$here/6b/.git" \
+		"$here/6b/.git" "$here/6b" "$here/6b" sub/sub/
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/6b/.git/
+ok 15 - #6b: GIT_DIR set, core.worktree relative
+
+expecting success of 1510.16 '#6c: GIT_DIR set, core.worktree=../wt (absolute)': 
+	setup_repo 6c "$here/6c/wt" "" unset &&
+	mkdir -p 6c/wt/sub &&
+
+	try_case 6c unset .git \
+		.git "$here/6c/wt" "$here/6c" "(null)" &&
+	try_case 6c unset "$here/6c/.git" \
+		"$here/6c/.git" "$here/6c/wt" "$here/6c" "(null)" &&
+	try_case 6c/sub/sub unset ../../.git \
+		../../.git "$here/6c/wt" "$here/6c/sub/sub" "(null)" &&
+	try_case 6c/sub/sub unset "$here/6c/.git" \
+		"$here/6c/.git" "$here/6c/wt" "$here/6c/sub/sub" "(null)"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/6c/.git/
+ok 16 - #6c: GIT_DIR set, core.worktree=../wt (absolute)
+
+expecting success of 1510.17 '#6d: GIT_DIR set, core.worktree=../wt (relative)': 
+	setup_repo 6d "$here/6d/wt" "" unset &&
+	mkdir -p 6d/wt/sub &&
+
+	try_case 6d unset .git \
+		.git "$here/6d/wt" "$here/6d" "(null)" &&
+	try_case 6d unset "$here/6d/.git" \
+		"$here/6d/.git" "$here/6d/wt" "$here/6d" "(null)" &&
+	try_case 6d/sub/sub unset ../../.git \
+		../../.git "$here/6d/wt" "$here/6d/sub/sub" "(null)" &&
+	try_case 6d/sub/sub unset "$here/6d/.git" \
+		"$here/6d/.git" "$here/6d/wt" "$here/6d/sub/sub" "(null)"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/6d/.git/
+ok 17 - #6d: GIT_DIR set, core.worktree=../wt (relative)
+
+expecting success of 1510.18 '#6e: GIT_DIR set, core.worktree=../.. (absolute)': 
+	setup_repo 6e "$here" "" unset &&
+	try_case 6e unset .git \
+		"$here/6e/.git" "$here" "$here" 6e/ &&
+	try_case 6e unset "$here/6e/.git" \
+		"$here/6e/.git" "$here" "$here" 6e/ &&
+	try_case 6e/sub/sub unset ../../.git \
+		"$here/6e/.git" "$here" "$here" 6e/sub/sub/ &&
+	try_case 6e/sub/sub unset "$here/6e/.git" \
+		"$here/6e/.git" "$here" "$here" 6e/sub/sub/
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/6e/.git/
+ok 18 - #6e: GIT_DIR set, core.worktree=../.. (absolute)
+
+expecting success of 1510.19 '#6f: GIT_DIR set, core.worktree=../.. (relative)': 
+	setup_repo 6f ../../ "" unset &&
+	try_case 6f unset .git \
+		"$here/6f/.git" "$here" "$here" 6f/ &&
+	try_case 6f unset "$here/6f/.git" \
+		"$here/6f/.git" "$here" "$here" 6f/ &&
+	try_case 6f/sub/sub unset ../../.git \
+		"$here/6f/.git" "$here" "$here" 6f/sub/sub/ &&
+	try_case 6f/sub/sub unset "$here/6f/.git" \
+		"$here/6f/.git" "$here" "$here" 6f/sub/sub/
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1510-repo-setup/6f/.git/
 ok 19 - #6f: GIT_DIR set, core.worktree=../.. (relative)
@@ -99289,1083 +101237,6 @@
 1..109
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2104-update-index-skip-worktree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2104-update-index-skip-worktree/.git/
-expecting success of 2104.1 'setup': 
-	cat >expect.full <<-\EOF &&
-	H 1
-	H 2
-	H sub/1
-	H sub/2
-	EOF
-
-	cat >expect.skip <<-\EOF &&
-	S 1
-	H 2
-	S sub/1
-	H sub/2
-	EOF
-
-	mkdir sub &&
-	touch ./1 ./2 sub/1 sub/2 &&
-	git add 1 2 sub/1 sub/2 &&
-	git ls-files -t | test_cmp expect.full -
-
-ok 1 - setup
-
-expecting success of 2104.2 'index is at version 2': 
-	test "$(git update-index --show-index-version)" = 2
-
-ok 2 - index is at version 2
-
-expecting success of 2104.3 'update-index --skip-worktree': 
-	git update-index --skip-worktree 1 sub/1 &&
-	git ls-files -t | test_cmp expect.skip -
-
-ok 3 - update-index --skip-worktree
-
-expecting success of 2104.4 'index is at version 3 after having some skip-worktree entries': 
-	test "$(git update-index --show-index-version)" = 3
-
-ok 4 - index is at version 3 after having some skip-worktree entries
-
-expecting success of 2104.5 'ls-files -t': 
-	git ls-files -t | test_cmp expect.skip -
-
-ok 5 - ls-files -t
-
-expecting success of 2104.6 'update-index --no-skip-worktree': 
-	git update-index --no-skip-worktree 1 sub/1 &&
-	git ls-files -t | test_cmp expect.full -
-
-ok 6 - update-index --no-skip-worktree
-
-expecting success of 2104.7 'index version is back to 2 when there is no skip-worktree entry': 
-	test "$(git update-index --show-index-version)" = 2
-
-ok 7 - index version is back to 2 when there is no skip-worktree entry
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2105-update-index-gitfile.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2030-unresolve-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-
-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 894de51] merged
- Author: A U Thor <author@example.com>
-committing keeps
-plumbing clear
-ok 4 - plumbing clears
-
-expecting success of 2030.5 'add records checkout -m undoes': 
-	prime_resolve_undo &&
-	git diff HEAD &&
-	git checkout --conflict=merge fi/le &&
-	echo checkout used the record and removed it &&
-	check_resolve_undo removed &&
-	echo the index and the work tree is unmerged again &&
-	git diff >actual &&
-	grep "^++<<<<<<<" actual
-
-HEAD is now at 894de51 merged
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  894de51 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> 894de51
-
-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.
-diff --git a/fi/le b/fi/le
-index e019be0..8dca2f8 100644
---- a/fi/le
-+++ b/fi/le
-@@ -1 +1 @@
--second
-+different
-Recreated 1 merge conflict
-checkout used the record and removed it
-the index and the work tree is unmerged again
-++<<<<<<< ours
-ok 5 - add records checkout -m undoes
-
-expecting success of 2030.6 'unmerge with plumbing': 
-	prime_resolve_undo &&
-	git update-index --unresolve fi/le &&
-	git ls-files --resolve-undo fi/le >actual &&
-	test_must_be_empty actual &&
-	git ls-files -u >actual &&
-	test_line_count = 3 actual
-
-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.
-ok 6 - unmerge with plumbing
-
-expecting success of 2030.7 'unmerge can be done even after committing': 
-	prime_resolve_undo &&
-	git commit -m "record to nuke MERGE_HEAD" &&
-	git update-index --unresolve fi/le &&
-	git ls-files --resolve-undo fi/le >actual &&
-	test_must_be_empty actual &&
-	git ls-files -u >actual &&
-	test_line_count = 3 actual
-
-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 739b00c] record to nuke MERGE_HEAD
- Author: A U Thor <author@example.com>
-ok 7 - unmerge can be done even after committing
-
-expecting success of 2030.8 'unmerge removal': 
-	prime_resolve_undo remove &&
-	git update-index --unresolve fi/le &&
-	git ls-files --resolve-undo fi/le >actual &&
-	test_must_be_empty actual &&
-	git ls-files -u >actual &&
-	test_line_count = 3 actual
-
-HEAD is now at 739b00c record to nuke MERGE_HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  739b00c record to nuke MERGE_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> 739b00c
-
-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.
-rm 'fi/le'
-ok 8 - unmerge removal
-
-expecting success of 2030.9 'unmerge removal after committing': 
-	prime_resolve_undo remove &&
-	git commit -m "record to nuke MERGE_HEAD" &&
-	git update-index --unresolve fi/le &&
-	git ls-files --resolve-undo fi/le >actual &&
-	test_must_be_empty actual &&
-	git ls-files -u >actual &&
-	test_line_count = 3 actual
-
-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.
-rm 'fi/le'
-[detached HEAD 76cfeff] record to nuke MERGE_HEAD
- Author: A U Thor <author@example.com>
-ok 9 - unmerge removal after committing
-
-expecting success of 2030.10 'rerere and rerere forget': 
-	mkdir .git/rr-cache &&
-	prime_resolve_undo &&
-	echo record the resolution &&
-	git rerere &&
-	rerere_id=$(cd .git/rr-cache && echo */postimage) &&
-	rerere_id=${rerere_id%/postimage} &&
-	test -f .git/rr-cache/$rerere_id/postimage &&
-	git checkout -m fi/le &&
-	echo resurrect the conflict &&
-	grep "^=======" fi/le &&
-	echo reresolve the conflict &&
-	git rerere &&
-	test "z$(cat fi/le)" = zdifferent &&
-	echo register the resolution again &&
-	git add fi/le &&
-	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
-	test -z "$(git ls-files -u)" &&
-	git rerere forget fi/le &&
-	! test -f .git/rr-cache/$rerere_id/postimage &&
-	tr "\0" "\n" <.git/MERGE_RR >actual &&
-	echo "$rerere_id	fi/le" >expect &&
-	test_cmp expect actual
-
-HEAD is now at 76cfeff record to nuke MERGE_HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  76cfeff record to nuke MERGE_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> 76cfeff
-
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Recorded preimage for 'fi/le'
-Automatic merge failed; fix conflicts and then commit the result.
-record the resolution
-Recorded resolution for 'fi/le'.
-Recreated 1 merge conflict
-resurrect the conflict
-=======
-reresolve the conflict
-Resolved 'fi/le' using previous resolution.
-register the resolution again
-Updated preimage for 'fi/le'
-Forgot resolution for 'fi/le'
-ok 10 - rerere and rerere forget
-
-expecting success of 2030.11 'rerere and rerere forget (subdirectory)': 
-	rm -fr .git/rr-cache &&
-	mkdir .git/rr-cache &&
-	prime_resolve_undo &&
-	echo record the resolution &&
-	(cd fi && git rerere) &&
-	rerere_id=$(cd .git/rr-cache && echo */postimage) &&
-	rerere_id=${rerere_id%/postimage} &&
-	test -f .git/rr-cache/$rerere_id/postimage &&
-	(cd fi && git checkout -m le) &&
-	echo resurrect the conflict &&
-	grep "^=======" fi/le &&
-	echo reresolve the conflict &&
-	(cd fi && git rerere) &&
-	test "z$(cat fi/le)" = zdifferent &&
-	echo register the resolution again &&
-	(cd fi && git add le) &&
-	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
-	test -z "$(git ls-files -u)" &&
-	(cd fi && git rerere forget le) &&
-	! test -f .git/rr-cache/$rerere_id/postimage &&
-	tr "\0" "\n" <.git/MERGE_RR >actual &&
-	echo "$rerere_id	fi/le" >expect &&
-	test_cmp expect actual
-
-HEAD is now at 9a00f99 second
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Recorded preimage for 'fi/le'
-Automatic merge failed; fix conflicts and then commit the result.
-record the resolution
-Recorded resolution for 'fi/le'.
-Recreated 1 merge conflict
-resurrect the conflict
-=======
-reresolve the conflict
-Resolved 'fi/le' using previous resolution.
-register the resolution again
-Updated preimage for 'fi/le'
-Forgot resolution for 'fi/le'
-ok 11 - rerere and rerere forget (subdirectory)
-
-expecting success of 2030.12 'rerere forget (binary)': 
-	git checkout -f side &&
-	test_commit --printf binary binary "a\0c" &&
-	test_must_fail git merge second &&
-	git rerere forget binary
-
-Previous HEAD position was 9a00f99 second
-Switched to branch 'side'
-[side ebd12fa] binary
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-warning: Cannot merge binary files: binary (HEAD vs. second)
-Auto-merging binary
-CONFLICT (content): Merge conflict in binary
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Recorded preimage for 'fi/le'
-Automatic merge failed; fix conflicts and then commit the result.
-error: could not parse conflict hunks in 'binary'
-ok 12 - rerere forget (binary)
-
-expecting success of 2030.13 'rerere forget (add-add conflict)': 
-	git checkout -f main &&
-	echo main >add-differently &&
-	git add add-differently &&
-	git commit -m "add differently" &&
-	test_must_fail git merge fifth &&
-	git rerere forget add-differently 2>actual &&
-	test_grep "no remembered" actual
-
-Switched to branch 'main'
-[main d92f3b1] add differently
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 add-differently
-Auto-merging add-differently
-CONFLICT (add/add): Merge conflict in add-differently
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Recorded preimage for 'add-differently'
-Recorded preimage for 'fi/le'
-Automatic merge failed; fix conflicts and then commit the result.
-error: no remembered resolution for 'add-differently'
-ok 13 - rerere forget (add-add conflict)
-
-expecting success of 2030.14 'resolve-undo keeps blobs from gc': 
-	git checkout -f main &&
-
-	# First make sure we do not have any cruft left in the object store
-	git repack -a -d &&
-	git prune --expire=now &&
-	git prune-packed &&
-	git gc --prune=now &&
-	git fsck --unreachable >cruft &&
-	test_must_be_empty cruft &&
-
-	# Now add three otherwise unreferenced blob objects to the index
-	git reset --hard &&
-	B1=$(echo "resolve undo test data 1" | git hash-object -w --stdin) &&
-	B2=$(echo "resolve undo test data 2" | git hash-object -w --stdin) &&
-	B3=$(echo "resolve undo test data 3" | git hash-object -w --stdin) &&
-	git update-index --add --index-info <<-EOF &&
-	100644 $B1 1	frotz
-	100644 $B2 2	frotz
-	100644 $B3 3	frotz
-	EOF
-
-	# These three blob objects are reachable (only) from the index
-	git fsck --unreachable >cruft &&
-	test_must_be_empty cruft &&
-	# and they should be protected from GC
-	git gc --prune=now &&
-	git cat-file -e $B1 &&
-	git cat-file -e $B2 &&
-	git cat-file -e $B3 &&
-
-	# Now resolve the conflicted path
-	B0=$(echo "resolve undo test data 0" | git hash-object -w --stdin) &&
-	git update-index --add --cacheinfo 100644,$B0,frotz &&
-
-	# These three blob objects are now reachable only from the resolve-undo
-	git fsck --unreachable >cruft &&
-	test_must_be_empty cruft &&
-
-	# and they should survive GC
-	git gc --prune=now &&
-	git cat-file -e $B0 &&
-	git cat-file -e $B1 &&
-	git cat-file -e $B2 &&
-	git cat-file -e $B3 &&
-
-	# Now we switch away, which nukes resolve-undo, and
-	# blobs B0..B3 would become dangling.  fsck should
-	# notice that they are now unreachable.
-	git checkout -f side &&
-	git fsck --unreachable >cruft &&
-	sort cruft >actual &&
-	sort <<-EOF >expect &&
-	unreachable blob $B0
-	unreachable blob $B1
-	unreachable blob $B2
-	unreachable blob $B3
-	EOF
-	test_cmp expect actual &&
-
-	# And they should go away when gc runs.
-	git gc --prune=now &&
-	git fsck --unreachable >cruft &&
-	test_must_be_empty cruft &&
-
-	test_must_fail git cat-file -e $B0 &&
-	test_must_fail git cat-file -e $B1 &&
-	test_must_fail git cat-file -e $B2 &&
-	test_must_fail git cat-file -e $B3
-
-Already on 'main'
-HEAD is now at d92f3b1 add differently
-Switched to branch 'side'
-ok 14 - resolve-undo keeps blobs from gc
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2103-update-index-ignore-missing.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2103-update-index-ignore-missing/.git/
-expecting success of 2103.1 'basics': 
-	>one &&
-	>two &&
-	>three &&
-
-	# need --add when adding
-	test_must_fail git update-index one &&
-	test -z "$(git ls-files)" &&
-	git update-index --add one &&
-	test zone = "z$(git ls-files)" &&
-
-	# update-index is atomic
-	echo 1 >one &&
-	test_must_fail git update-index one two &&
-	echo "M	one" >expect &&
-	git diff-files --name-status >actual &&
-	test_cmp expect actual &&
-
-	git update-index --add one two three &&
-	test_write_lines one three two >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual &&
-
-	test_tick &&
-	(
-		test_create_repo xyzzy &&
-		cd xyzzy &&
-		>file &&
-		git add file &&
-		git commit -m "sub initial"
-	) &&
-	git add xyzzy &&
-
-	test_tick &&
-	git commit -m initial &&
-	git tag initial
-
-error: one: cannot add to the index - missing --add option?
-fatal: Unable to process path one
-error: two: cannot add to the index - missing --add option?
-fatal: Unable to process path two
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2103-update-index-ignore-missing/xyzzy/.git/
-[master (root-commit) a40d181] sub initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-warning: adding embedded git repository: xyzzy
-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> xyzzy
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached xyzzy
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[master (root-commit) ce14d7f] initial
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- create mode 100644 one
- create mode 100644 three
- create mode 100644 two
- create mode 160000 xyzzy
-ok 1 - basics
-
-expecting success of 2103.2 '--ignore-missing --refresh': 
-	git reset --hard initial &&
-	echo 2 >one &&
-	test_must_fail git update-index --refresh &&
-	echo 1 >one &&
-	git update-index --refresh &&
-	rm -f two &&
-	test_must_fail git update-index --refresh &&
-	git update-index --ignore-missing --refresh
-
-
-HEAD is now at ce14d7f initial
-one: needs update
-two: needs update
-ok 2 - --ignore-missing --refresh
-
-expecting success of 2103.3 '--unmerged --refresh': 
-	git reset --hard initial &&
-	info=$(git ls-files -s one | sed -e "s/ 0	/ 1	/") &&
-	git rm --cached one &&
-	echo "$info" | git update-index --index-info &&
-	test_must_fail git update-index --refresh &&
-	git update-index --unmerged --refresh &&
-	echo 2 >two &&
-	test_must_fail git update-index --unmerged --refresh >actual &&
-	grep two actual &&
-	! grep one actual &&
-	! grep three actual
-
-HEAD is now at ce14d7f initial
-rm 'one'
-one: needs merge
-two: needs update
-ok 3 - --unmerged --refresh
-
-expecting success of 2103.4 '--ignore-submodules --refresh (1)': 
-	git reset --hard initial &&
-	rm -f two &&
-	test_must_fail git update-index --ignore-submodules --refresh
-
-HEAD is now at ce14d7f initial
-two: needs update
-ok 4 - --ignore-submodules --refresh (1)
-
-expecting success of 2103.5 '--ignore-submodules --refresh (2)': 
-	git reset --hard initial &&
-	test_tick &&
-	(
-		cd xyzzy &&
-		git commit -m "sub second" --allow-empty
-	) &&
-	test_must_fail git update-index --refresh &&
-	test_must_fail git update-index --ignore-missing --refresh &&
-	git update-index --ignore-submodules --refresh
-
-HEAD is now at ce14d7f initial
-[master 66f0d66] sub second
- Author: A U Thor <author@example.com>
-xyzzy: needs update
-xyzzy: needs update
-ok 5 - --ignore-submodules --refresh (2)
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2106-update-index-assume-unchanged.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2106-update-index-assume-unchanged/.git/
-expecting success of 2106.1 'setup': 
-	: >file &&
-	git add file &&
-	git commit -m initial &&
-	git branch other &&
-	echo upstream >file &&
-	git add file &&
-	git commit -m upstream
-
-[master (root-commit) 6ce5622] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[master fbda113] upstream
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 2106.2 'do not switch branches with dirty file': 
-	git reset --hard &&
-	git checkout other &&
-	echo dirt >file &&
-	git update-index --assume-unchanged file &&
-	test_must_fail git checkout - 2>err &&
-	test_grep overwritten err
-
-HEAD is now at fbda113 upstream
-Switched to branch 'other'
-error: Your local changes to the following files would be overwritten by checkout:
-ok 2 - do not switch branches with dirty file
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2082-parallel-checkout-attributes.sh ***
-expecting success of 2082.1 'parallel-checkout with ident': 
-	set_checkout_config 2 0 &&
-	git init ident &&
-	(
-		cd ident &&
-		echo "A ident" >.gitattributes &&
-		echo "\$Id\$" >A &&
-		echo "\$Id\$" >B &&
-		git add -A &&
-		git commit -m id &&
-
-		rm A B &&
-		test_checkout_workers 2 git reset --hard &&
-		hexsz=$(test_oid hexsz) &&
-		grep -E "\\\$Id: [0-9a-f]{$hexsz} \\\$" A &&
-		grep "\\\$Id\\\$" B
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2082-parallel-checkout-attributes/ident/.git/
-[master (root-commit) f770bc4] id
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 A
- create mode 100644 B
-HEAD is now at f770bc4 id
-$Id: 055c8729cdcc372500a08db659c045e16c4409fb $
-$Id$
-ok 1 - parallel-checkout with ident
-
-expecting success of 2082.2 'parallel-checkout with re-encoding': 
-	set_checkout_config 2 0 &&
-	git init encoding &&
-	(
-		cd encoding &&
-		echo text >utf8-text &&
-		write_utf16 <utf8-text >utf16-text &&
-
-		echo "A working-tree-encoding=UTF-16" >.gitattributes &&
-		cp utf16-text A &&
-		cp utf8-text B &&
-		git add A B .gitattributes &&
-		git commit -m encoding &&
-
-		# Check that A is stored in UTF-8
-		git cat-file -p :A >A.internal &&
-		test_cmp_bin utf8-text A.internal &&
-
-		rm A B &&
-		test_checkout_workers 2 git checkout A B &&
-
-		# Check that A (and only A) is re-encoded during checkout
-		test_cmp_bin utf16-text A &&
-		test_cmp_bin utf8-text B
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2082-parallel-checkout-attributes/encoding/.git/
-checking prerequisite: NO_UTF16_BOM
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF16_BOM" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF16_BOM" &&
-	test $(printf abc | iconv -f UTF-8 -t UTF-16 | wc -c) = 6
-
-)
-prerequisite NO_UTF16_BOM not satisfied
-[master (root-commit) eb6a843] encoding
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 A
- create mode 100644 B
-Updated 2 paths from the index
-ok 2 - parallel-checkout with re-encoding
-
-expecting success of 2082.3 'parallel-checkout with eol conversions': 
-	set_checkout_config 2 0 &&
-	git init eol &&
-	(
-		cd eol &&
-		printf "multi\r\nline\r\ntext" >crlf-text &&
-		printf "multi\nline\ntext" >lf-text &&
-
-		git config core.autocrlf false &&
-		echo "A eol=crlf" >.gitattributes &&
-		cp crlf-text A &&
-		cp lf-text B &&
-		git add A B .gitattributes &&
-		git commit -m eol &&
-
-		# Check that A is stored with LF format
-		git cat-file -p :A >A.internal &&
-		test_cmp_bin lf-text A.internal &&
-
-		rm A B &&
-		test_checkout_workers 2 git checkout A B &&
-
-		# Check that A (and only A) is converted to CRLF during checkout
-		test_cmp_bin crlf-text A &&
-		test_cmp_bin lf-text B
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2082-parallel-checkout-attributes/eol/.git/
-[master (root-commit) cd8ac0d] eol
- Author: A U Thor <author@example.com>
- 3 files changed, 7 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 A
- create mode 100644 B
-Updated 2 paths from the index
-ok 3 - parallel-checkout with eol conversions
-
-expecting success of 2082.4 'parallel-checkout and external filter': 
-	set_checkout_config 2 0 &&
-	git init filter &&
-	(
-		cd filter &&
-		write_script <<-\EOF rot13.sh &&
-		tr \
-		  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
-		  "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM"
-		EOF
-
-		git config filter.rot13.clean "\"$(pwd)/rot13.sh\"" &&
-		git config filter.rot13.smudge "\"$(pwd)/rot13.sh\"" &&
-		git config filter.rot13.required true &&
-
-		echo abcd >original &&
-		echo nopq >rot13 &&
-
-		echo "A filter=rot13" >.gitattributes &&
-		cp original A &&
-		cp original B &&
-		cp original C &&
-		git add A B C .gitattributes &&
-		git commit -m filter &&
-
-		# Check that A (and only A) was cleaned
-		git cat-file -p :A >A.internal &&
-		test_cmp rot13 A.internal &&
-		git cat-file -p :B >B.internal &&
-		test_cmp original B.internal &&
-		git cat-file -p :C >C.internal &&
-		test_cmp original C.internal &&
-
-		rm A B C *.internal &&
-		test_checkout_workers 2 git checkout A B C &&
-
-		# Check that A (and only A) was smudged during checkout
-		test_cmp original A &&
-		test_cmp original B &&
-		test_cmp original C
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2082-parallel-checkout-attributes/filter/.git/
-[master (root-commit) 9fb524e] filter
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 A
- create mode 100644 B
- create mode 100644 C
-Updated 3 paths from the index
-ok 4 - parallel-checkout and external filter
-
-expecting success of 2082.5 'parallel-checkout and delayed checkout': 
-	test_config_global filter.delay.process \
-		"test-tool rot13-filter --always-delay --log=\"$(pwd)/delayed.log\" clean smudge delay" &&
-	test_config_global filter.delay.required true &&
-
-	echo "abcd" >original &&
-	echo "nopq" >rot13 &&
-
-	git init delayed &&
-	(
-		cd delayed &&
-		echo "*.d filter=delay" >.gitattributes &&
-		cp ../original W.d &&
-		cp ../original X.d &&
-		cp ../original Y &&
-		cp ../original Z &&
-		git add -A &&
-		git commit -m delayed &&
-
-		# Check that *.d files were cleaned
-		git cat-file -p :W.d >W.d.internal &&
-		test_cmp W.d.internal ../rot13 &&
-		git cat-file -p :X.d >X.d.internal &&
-		test_cmp X.d.internal ../rot13 &&
-		git cat-file -p :Y >Y.internal &&
-		test_cmp Y.internal ../original &&
-		git cat-file -p :Z >Z.internal &&
-		test_cmp Z.internal ../original &&
-
-		rm *
-	) &&
-
-	set_checkout_config 2 0 &&
-	test_checkout_workers 2 git -C delayed checkout -f &&
-	verify_checkout delayed &&
-
-	# Check that the *.d files got to the delay queue and were filtered
-	grep "smudge W.d .* \[DELAYED\]" delayed.log &&
-	grep "smudge X.d .* \[DELAYED\]" delayed.log &&
-	test_cmp delayed/W.d original &&
-	test_cmp delayed/X.d original &&
-
-	# Check that the parallel-eligible entries went to the right queue and
-	# were not filtered
-	! grep "smudge Y .* \[DELAYED\]" delayed.log &&
-	! grep "smudge Z .* \[DELAYED\]" delayed.log &&
-	test_cmp delayed/Y original &&
-	test_cmp delayed/Z original
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2082-parallel-checkout-attributes/delayed/.git/
-[master (root-commit) 73aa10e] delayed
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 W.d
- create mode 100644 X.d
- create mode 100644 Y
- create mode 100644 Z
-IN: smudge W.d treeish=73aa10e96740aa088d4dcea378e1df6a64c5577d blob=0c362bbfebfbae31b3762aada18b9d0119486316 5 [OK] -- [DELAYED]
-IN: smudge X.d treeish=73aa10e96740aa088d4dcea378e1df6a64c5577d blob=0c362bbfebfbae31b3762aada18b9d0119486316 5 [OK] -- [DELAYED]
-ok 5 - parallel-checkout and delayed checkout
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2202-add-addremove.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2202-add-addremove/.git/
-expecting success of 2202.1 'setup': 
-	(
-		echo .gitignore &&
-		echo will-remove
-	) >expect &&
-	(
-		echo actual &&
-		echo expect &&
-		echo ignored
-	) >.gitignore &&
-	git --literal-pathspecs add --all &&
-	>will-remove &&
-	git add --all &&
-	test_tick &&
-	git commit -m initial &&
-	git ls-files >actual &&
-	test_cmp expect actual
-
-[master (root-commit) 50dd5d8] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 will-remove
-ok 1 - setup
-
-expecting success of 2202.2 'git add --all': 
-	(
-		echo .gitignore &&
-		echo not-ignored &&
-		echo "M	.gitignore" &&
-		echo "A	not-ignored" &&
-		echo "D	will-remove"
-	) >expect &&
-	>ignored &&
-	>not-ignored &&
-	echo modification >>.gitignore &&
-	rm -f will-remove &&
-	git add --all &&
-	git update-index --refresh &&
-	git ls-files >actual &&
-	git diff-index --name-status --cached HEAD >>actual &&
-	test_cmp expect actual
-
-ok 2 - git add --all
-
-expecting success of 2202.3 'Just "git add" is a no-op': 
-	git reset --hard &&
-	echo >will-remove &&
-	>will-not-be-added &&
-	git add &&
-	git diff-index --name-status --cached HEAD >actual &&
-	test_must_be_empty actual
-
-HEAD is now at 50dd5d8 initial
-Nothing specified, nothing added.
-hint: Maybe you wanted to say 'git add .'?
-hint: Disable this message with "git config set advice.addEmptyPathspec false"
-ok 3 - Just "git add" is a no-op
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2107-update-index-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2107-update-index-basic/.git/
 expecting success of 2107.1 'update-index --nonsense fails': 
@@ -100560,6 +101431,71 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2202-add-addremove.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2202-add-addremove/.git/
+expecting success of 2202.1 'setup': 
+	(
+		echo .gitignore &&
+		echo will-remove
+	) >expect &&
+	(
+		echo actual &&
+		echo expect &&
+		echo ignored
+	) >.gitignore &&
+	git --literal-pathspecs add --all &&
+	>will-remove &&
+	git add --all &&
+	test_tick &&
+	git commit -m initial &&
+	git ls-files >actual &&
+	test_cmp expect actual
+
+[master (root-commit) 50dd5d8] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 will-remove
+ok 1 - setup
+
+expecting success of 2202.2 'git add --all': 
+	(
+		echo .gitignore &&
+		echo not-ignored &&
+		echo "M	.gitignore" &&
+		echo "A	not-ignored" &&
+		echo "D	will-remove"
+	) >expect &&
+	>ignored &&
+	>not-ignored &&
+	echo modification >>.gitignore &&
+	rm -f will-remove &&
+	git add --all &&
+	git update-index --refresh &&
+	git ls-files >actual &&
+	git diff-index --name-status --cached HEAD >>actual &&
+	test_cmp expect actual
+
+ok 2 - git add --all
+
+expecting success of 2202.3 'Just "git add" is a no-op': 
+	git reset --hard &&
+	echo >will-remove &&
+	>will-not-be-added &&
+	git add &&
+	git diff-index --name-status --cached HEAD >actual &&
+	test_must_be_empty actual
+
+HEAD is now at 50dd5d8 initial
+Nothing specified, nothing added.
+hint: Maybe you wanted to say 'git add .'?
+hint: Disable this message with "git config set advice.addEmptyPathspec false"
+ok 3 - Just "git add" is a no-op
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2201-add-update-typechange.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2201-add-update-typechange/.git/
 expecting success of 2201.1 'setup': 
@@ -100782,22 +101718,22 @@
 	reset_files &&
 	update_assert_changed --refresh
 
---- .git/test-mtime-expect	2025-08-27 08:20:20.791406813 +0000
-+++ .git/test-mtime-actual	2025-08-27 08:20:20.791406813 +0000
+--- .git/test-mtime-expect	2026-09-29 14:51:59.342548970 +0000
++++ .git/test-mtime-actual	2026-09-29 14:51:59.346548970 +0000
 @@ -1 +1 @@
 -1234567890
-+1756282820
++1790693519
 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	2025-08-27 08:20:20.855407235 +0000
-+++ .git/test-mtime-actual	2025-08-27 08:20:20.859407261 +0000
+--- .git/test-mtime-expect	2026-09-29 14:51:59.398548970 +0000
++++ .git/test-mtime-actual	2026-09-29 14:51:59.402548970 +0000
 @@ -1 +1 @@
 -1234567890
-+1756282820
++1790693519
 ok 4 - --really-refresh should fix racy timestamp
 
 expecting success of 2108.5 '--refresh should fix racy timestamp if other file needs update': 
@@ -100807,11 +101743,11 @@
 	update_assert_changed --refresh
 
 other: needs update
---- .git/test-mtime-expect	2025-08-27 08:20:20.967407973 +0000
-+++ .git/test-mtime-actual	2025-08-27 08:20:20.971408000 +0000
+--- .git/test-mtime-expect	2026-09-29 14:51:59.482548970 +0000
++++ .git/test-mtime-actual	2026-09-29 14:51:59.486548970 +0000
 @@ -1 +1 @@
 -1234567890
-+1756282820
++1790693519
 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': 
@@ -100821,11 +101757,11 @@
 	update_assert_changed --refresh
 
 file: needs update
---- .git/test-mtime-expect	2025-08-27 08:20:21.083408738 +0000
-+++ .git/test-mtime-actual	2025-08-27 08:20:21.083408738 +0000
+--- .git/test-mtime-expect	2026-09-29 14:51:59.554548970 +0000
++++ .git/test-mtime-actual	2026-09-29 14:51:59.558548970 +0000
 @@ -1 +1 @@
 -1234567890
-+1756282821
++1790693519
 ok 6 - --refresh should fix racy timestamp if racy file needs update
 
 # passed all 6 test(s)
@@ -101109,77 +102045,6 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2300-cd-to-toplevel.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2205-add-worktree-config.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2205-add-worktree-config/.git/
 expecting success of 2205.1 '1a: setup--config worktree': 
@@ -101447,6 +102312,77 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2300-cd-to-toplevel.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2204-add-ignored.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2204-add-ignored/.git/
 expecting success of 2204.1 'setup': 
@@ -101821,221 +102757,6 @@
 1..47
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2401-worktree-prune.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2203-add-intent.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2203-add-intent/.git/
 expecting success of 2203.1 'intent to add': 
@@ -102447,6 +103168,221 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2401-worktree-prune.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2404-worktree-config.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2404-worktree-config/.git/
 expecting success of 2404.1 'setup': 
@@ -102550,2177 +103486,810 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2403-worktree-move.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-
-[master (root-commit) 2519212] init
+*** t1013-read-tree-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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': 
+		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.51.0/t/trash directory.t1013-read-tree-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 init.t
-Preparing worktree (new branch 'source')
-HEAD is now at 2519212 init
-ok 1 - setup
-
-expecting success of 2403.2 'lock main worktree': 
-	test_must_fail git worktree lock .
-
-fatal: The main working tree cannot be locked or unlocked
-ok 2 - lock main worktree
-
-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 3 - lock linked worktree
-
-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
-
-Preparing worktree (new branch 'elsewhere')
-HEAD is now at 2519212 init
-ok 4 - lock linked worktree from another worktree
-
-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
-
-fatal: 'source' is already locked, reason: hahaha
-ok 5 - lock worktree twice
-
-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
-
-fatal: '.' is already locked, reason: hahaha
-ok 6 - lock worktree twice (from the locked worktree)
-
-expecting success of 2403.7 'unlock main worktree': 
-	test_must_fail git worktree unlock .
-
-fatal: The main working tree cannot be locked or unlocked
-ok 7 - unlock main worktree
-
-expecting success of 2403.8 'unlock linked worktree': 
-	git worktree unlock source &&
-	test_path_is_missing .git/worktrees/source/locked
-
-ok 8 - unlock linked worktree
-
-expecting success of 2403.9 'unlock worktree twice': 
-	test_must_fail git worktree unlock source &&
-	test_path_is_missing .git/worktrees/source/locked
-
-fatal: 'source' is not locked
-ok 9 - unlock worktree twice
-
-expecting success of 2403.10 'move non-worktree': 
-	mkdir abc &&
-	test_must_fail git worktree move abc def
-
-fatal: 'abc' is not a working tree
-ok 10 - move non-worktree
-
-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.51.0/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.51.0/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.51.0/t/trash directory.t2403-worktree-move/withsub/.git/
-[master (root-commit) 5e30013] initial
+ 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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t2403-worktree-move/withsub/sub'...
+ 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.51.0/t/trash directory.t1013-read-tree-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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1'...
 done.
-[master a16c2a3] withsub
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
+ 2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 sub
-Preparing worktree (detached HEAD a16c2a3)
-HEAD is now at a16c2a3 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.51.0/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.51.0/t/trash directory.t2403-worktree-move/moog/.git/
-[master (root-commit) 89d547b] bim
+ 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(+)
- 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 a16c2a3)
-HEAD is now at a16c2a3 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 a16c2a3)
-HEAD is now at a16c2a3 withsub
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2405-worktree-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2405-worktree-submodule/origin/sub/.git/
-[main (root-commit) 69af168] file1
+ 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(+)
- create mode 100644 file1.t
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2405-worktree-submodule/origin/main/.git/
-[main (root-commit) 1e96f59] first
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 first.t
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t2405-worktree-submodule/origin/main/sub'...
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1/sub2'...
 done.
-[main 322c452] add sub
+[add_nested_sub 8b3b335] add a nested submodule
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
+ 2 files changed, 5 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 sub
-[main 7829796] file1 updated
+ 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 file1
-From /build/reproducible-path/git-2.51.0/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
+ 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(-)
-ok 1 - setup: create origin repos
-
-expecting success of 2405.2 'setup: clone superproject to create main worktree': 
-	git clone --recursive "$base_path/origin/main" main
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m --recurse-submodules: added submodule is checked out
 
-Cloning into 'main'...
+expecting success of 1013.2 'git read-tree -u -m --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.
-Submodule 'sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t2405-worktree-submodule/origin/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t2405-worktree-submodule/main/sub'...
+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 read-tree -u -m --recurse-submodules: added submodule is checked out in empty dir
+
+expecting success of 1013.3 'git read-tree -u -m --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.
-Submodule path 'sub': checked out '782979677c1932d3806e9adc80194f805c02f4f3'
-ok 2 - setup: clone superproject to create main worktree
+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 read-tree -u -m --recurse-submodules: replace tracked file with submodule checks out submodule
 
-expecting success of 2405.3 'add superproject worktree': 
-	git -C main worktree add "$base_path/worktree" "$rev1_hash_main"
+expecting success of 1013.4 'git read-tree -u -m --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 read-tree -u -m --recurse-submodules: replace directory with submodule
 
-Preparing worktree (detached HEAD 322c452)
-HEAD is now at 322c452 add sub
-ok 3 - add superproject worktree
+expecting success of 1013.5 'git read-tree -u -m --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 read-tree -u -m --recurse-submodules: nested submodules are checked out
 
-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 1013.6 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+ok 6 - git read-tree -u -m --recurse-submodules: removed submodule removes submodules working tree
 
-not ok 4 - submodule is checked out just after worktree add # TODO known breakage
+expecting success of 1013.7 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
+ok 7 - git read-tree -u -m --recurse-submodules: removed submodule absorbs submodules .git directory
 
-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 1013.8 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m --recurse-submodules: replace submodule with a file
 
-Preparing worktree (detached HEAD 322c452)
-HEAD is now at 322c452 add sub
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t2405-worktree-submodule/worktree-submodule-update/sub'...
+checking known breakage of 1013.9 'git read-tree -u -m --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.
-Submodule path 'sub': checked out '69af1687b671131ed0cfa61b7fcdc907a4c21f2c'
-ok 5 - add superproject worktree and initialize submodules
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 --recurse-submodules replace_sub1_with_file
+not ok 9 - git read-tree -u -m --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
 
-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 1013.10 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m --recurse-submodules: worktrees of nested submodules are removed
 
-  > file1 updated
-ok 6 - submodule is checked out just after submodule update in linked worktree
+expecting success of 1013.11 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+ok 11 - git read-tree -u -m --recurse-submodules: modified submodule updates submodule work tree
 
-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 1013.12 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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.
+ok 12 - git read-tree -u -m --recurse-submodules: updating to a missing submodule commit fails
 
-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 1013.13 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m --recurse-submodules: submodule branch is not changed, detach HEAD instead
 
-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 1013.14 'git read-tree -u -m --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.
+ok 14 - git read-tree -u -m --recurse-submodules: added submodule doesn't remove untracked file with same name
 
-  > file1 updated
-ok 8 - submodule is checked out after manually adding submodule worktree
+expecting success of 1013.15 'git read-tree -u -m --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 read-tree -u -m --recurse-submodules: added submodule removes an untracked ignored file
 
-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
+checking known breakage of 1013.16 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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.
+not ok 16 - git read-tree -u -m --recurse-submodules: replace submodule with a directory # TODO known breakage
 
-Preparing worktree (detached HEAD d717f19)
-HEAD is now at d717f19 sub updated
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t2405-worktree-submodule/checkout-recurse/sub'...
+checking known breakage of 1013.17 'git read-tree -u -m --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.
-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
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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.
+not ok 17 - git read-tree -u -m --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
 
-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 1013.18 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
 
-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 1013.19 'git -c submodule.recurse=true read-tree -u -m: 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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m: modified submodule updates submodule work tree
 
-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 1013.20 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m --recurse-submodules: modified submodule updates submodule recursively
 
-commit 69af1687b671131ed0cfa61b7fcdc907a4c21f2c
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+expecting success of 1013.21 'git read-tree -u --reset --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'.
+ok 21 - git read-tree -u --reset --recurse-submodules: added submodule is checked out
 
-    file1
-ok 11 - unsetting core.worktree does not prevent running commands directly against the submodule repository
+expecting success of 1013.22 'git read-tree -u --reset --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 22 - git read-tree -u --reset --recurse-submodules: added submodule is checked out in empty dir
 
-# still have 1 known breakage(s)
-# passed all remaining 10 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2402-worktree-list.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2402-worktree-list/.git/
-expecting success of 2402.1 'setup': 
-	test_commit init
+expecting success of 1013.23 'git read-tree -u --reset --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 23 - git read-tree -u --reset --recurse-submodules: replace tracked file with submodule checks out submodule
 
-[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 1013.24 'git read-tree -u --reset --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 24 - git read-tree -u --reset --recurse-submodules: replace directory with submodule
 
-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
+expecting success of 1013.25 'git read-tree -u --reset --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 25 - git read-tree -u --reset --recurse-submodules: nested submodules are checked out
 
-ok 2 - rev-parse --git-common-dir on main worktree
+expecting success of 1013.26 'git read-tree -u --reset --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+ok 26 - git read-tree -u --reset --recurse-submodules: removed submodule removes submodules working tree
 
-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
+expecting success of 1013.27 'git read-tree -u --reset --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
+ok 27 - git read-tree -u --reset --recurse-submodules: removed submodule absorbs submodules .git directory
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 3 - rev-parse --git-path objects linked worktree
+expecting success of 1013.28 'git read-tree -u --reset --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 28 - git read-tree -u --reset --recurse-submodules: replace submodule with a file
 
-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
+checking known breakage of 1013.29 'git read-tree -u --reset --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 --reset --recurse-submodules replace_sub1_with_file
+not ok 29 - git read-tree -u --reset --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
 
-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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2406-worktree-repair.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t/trash directory.t2406-worktree-repair/repo/.git/
-error: .git is not a file: /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t2406-worktree-repair/.git/worktrees/orig1/gitdir
-repair: gitdir incorrect: /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t2406-worktree-repair/main/.git/worktrees/side/gitdir
-repair: .git file absolute/relative path mismatch: /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1013-read-tree-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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': 
-		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.51.0/t/trash directory.t1013-read-tree-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.51.0/t/trash directory.t1013-read-tree-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.51.0/t/trash directory.t1013-read-tree-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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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.51.0/t/trash directory.t1013-read-tree-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.51.0/t/trash directory.t1013-read-tree-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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m --recurse-submodules: added submodule is checked out
-
-expecting success of 1013.2 'git read-tree -u -m --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 read-tree -u -m --recurse-submodules: added submodule is checked out in empty dir
-
-expecting success of 1013.3 'git read-tree -u -m --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 read-tree -u -m --recurse-submodules: replace tracked file with submodule checks out submodule
-
-expecting success of 1013.4 'git read-tree -u -m --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 read-tree -u -m --recurse-submodules: replace directory with submodule
-
-expecting success of 1013.5 'git read-tree -u -m --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 read-tree -u -m --recurse-submodules: nested submodules are checked out
-
-expecting success of 1013.6 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-ok 6 - git read-tree -u -m --recurse-submodules: removed submodule removes submodules working tree
-
-expecting success of 1013.7 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
-ok 7 - git read-tree -u -m --recurse-submodules: removed submodule absorbs submodules .git directory
-
-expecting success of 1013.8 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m --recurse-submodules: replace submodule with a file
-
-checking known breakage of 1013.9 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 --recurse-submodules replace_sub1_with_file
-not ok 9 - git read-tree -u -m --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
-
-expecting success of 1013.10 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m --recurse-submodules: worktrees of nested submodules are removed
-
-expecting success of 1013.11 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-ok 11 - git read-tree -u -m --recurse-submodules: modified submodule updates submodule work tree
-
-expecting success of 1013.12 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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.
-ok 12 - git read-tree -u -m --recurse-submodules: updating to a missing submodule commit fails
-
-expecting success of 1013.13 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m --recurse-submodules: submodule branch is not changed, detach HEAD instead
-
-expecting success of 1013.14 'git read-tree -u -m --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.
-ok 14 - git read-tree -u -m --recurse-submodules: added submodule doesn't remove untracked file with same name
-
-expecting success of 1013.15 'git read-tree -u -m --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 read-tree -u -m --recurse-submodules: added submodule removes an untracked ignored file
-
-checking known breakage of 1013.16 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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.
-not ok 16 - git read-tree -u -m --recurse-submodules: replace submodule with a directory # TODO known breakage
-
-checking known breakage of 1013.17 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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.
-not ok 17 - git read-tree -u -m --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
-
-expecting success of 1013.18 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
-
-expecting success of 1013.19 'git -c submodule.recurse=true read-tree -u -m: 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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m: modified submodule updates submodule work tree
-
-expecting success of 1013.20 'git read-tree -u -m --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 read-tree -u -m --recurse-submodules: modified submodule updates submodule recursively
-
-expecting success of 1013.21 'git read-tree -u --reset --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'.
-ok 21 - git read-tree -u --reset --recurse-submodules: added submodule is checked out
-
-expecting success of 1013.22 'git read-tree -u --reset --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 22 - git read-tree -u --reset --recurse-submodules: added submodule is checked out in empty dir
-
-expecting success of 1013.23 'git read-tree -u --reset --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 23 - git read-tree -u --reset --recurse-submodules: replace tracked file with submodule checks out submodule
-
-expecting success of 1013.24 'git read-tree -u --reset --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 24 - git read-tree -u --reset --recurse-submodules: replace directory with submodule
-
-expecting success of 1013.25 'git read-tree -u --reset --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 25 - git read-tree -u --reset --recurse-submodules: nested submodules are checked out
-
-expecting success of 1013.26 'git read-tree -u --reset --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-ok 26 - git read-tree -u --reset --recurse-submodules: removed submodule removes submodules working tree
-
-expecting success of 1013.27 'git read-tree -u --reset --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
-ok 27 - git read-tree -u --reset --recurse-submodules: removed submodule absorbs submodules .git directory
-
-expecting success of 1013.28 'git read-tree -u --reset --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 28 - git read-tree -u --reset --recurse-submodules: replace submodule with a file
-
-checking known breakage of 1013.29 'git read-tree -u --reset --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-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 --reset --recurse-submodules replace_sub1_with_file
-not ok 29 - git read-tree -u --reset --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
-
-expecting success of 1013.30 'git read-tree -u --reset --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-ok 30 - git read-tree -u --reset --recurse-submodules: worktrees of nested submodules are removed
+expecting success of 1013.30 'git read-tree -u --reset --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.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+ok 30 - git read-tree -u --reset --recurse-submodules: worktrees of nested submodules are removed
 
 expecting success of 1013.31 'git read-tree -u --reset --recurse-submodules: modified submodule updates submodule work tree': 
 		prolog &&
@@ -105678,355 +105247,1371 @@
 1..68
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2407-worktree-heads.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2407-worktree-heads/.git/
-expecting success of 2407.1 'setup': 
+*** t2403-worktree-move.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2403-worktree-move/.git/
+expecting success of 2403.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
+	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
 
 [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
+Preparing worktree (new branch 'source')
+HEAD is now at 2519212 init
+ok 1 - setup
+
+expecting success of 2403.2 'lock main worktree': 
+	test_must_fail git worktree lock .
+
+fatal: The main working tree cannot be locked or unlocked
+ok 2 - lock main worktree
+
+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 3 - lock linked worktree
+
+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
+
+Preparing worktree (new branch 'elsewhere')
+HEAD is now at 2519212 init
+ok 4 - lock linked worktree from another worktree
+
+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
+
+fatal: 'source' is already locked, reason: hahaha
+ok 5 - lock worktree twice
+
+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
+
+fatal: '.' is already locked, reason: hahaha
+ok 6 - lock worktree twice (from the locked worktree)
+
+expecting success of 2403.7 'unlock main worktree': 
+	test_must_fail git worktree unlock .
+
+fatal: The main working tree cannot be locked or unlocked
+ok 7 - unlock main worktree
+
+expecting success of 2403.8 'unlock linked worktree': 
+	git worktree unlock source &&
+	test_path_is_missing .git/worktrees/source/locked
+
+ok 8 - unlock linked worktree
+
+expecting success of 2403.9 'unlock worktree twice': 
+	test_must_fail git worktree unlock source &&
+	test_path_is_missing .git/worktrees/source/locked
+
+fatal: 'source' is not locked
+ok 9 - unlock worktree twice
+
+expecting success of 2403.10 'move non-worktree': 
+	mkdir abc &&
+	test_must_fail git worktree move abc def
+
+fatal: 'abc' is not a working tree
+ok 10 - move non-worktree
+
+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.51.0/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.51.0/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.51.0/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 1.t
-Switched to branch 'master'
-[master dd232bf] 1
+ create mode 100644 initial.t
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t2403-worktree-move/withsub/sub'...
+done.
+[master a16c2a3] withsub
  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
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Preparing worktree (detached HEAD a16c2a3)
+HEAD is now at a16c2a3 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.51.0/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.51.0/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 2.t
-Switched to branch 'master'
-[master 8f55bc3] 2
+ 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 a16c2a3)
+HEAD is now at a16c2a3 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 a16c2a3)
+HEAD is now at a16c2a3 withsub
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2405-worktree-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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
+ create mode 100644 file1.t
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 3.t
-Switched to branch 'master'
-[master 4c93b0a] 3
+ create mode 100644 first.t
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t2405-worktree-submodule/origin/main/sub'...
+done.
+[main 322c452] add sub
  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
+ 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 4.t
-Switched to branch 'master'
-[master 3fbd4b0] 4
- Author: A U Thor <author@example.com>
+ create mode 100644 file1
+From /build/reproducible-path/git-2.51.0/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 4.t
-Preparing worktree (checking out 'wt-4')
-HEAD is now at 3fbd4b0 4
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2407-worktree-heads/server/.git/
-[master (root-commit) 31243c6] initial
+ create mode 100644 file1
+[main d717f19] sub updated
  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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup: create origin repos
+
+expecting success of 2405.2 'setup: clone superproject to create main worktree': 
+	git clone --recursive "$base_path/origin/main" main
+
+Cloning into 'main'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t2405-worktree-submodule/origin/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.51.0/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 2405.3 'add superproject worktree': 
+	git -C main worktree add "$base_path/worktree" "$rev1_hash_main"
+
+Preparing worktree (detached HEAD 322c452)
+HEAD is now at 322c452 add sub
+ok 3 - add superproject worktree
+
+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
+
+not ok 4 - submodule is checked out just after worktree add # TODO known breakage
+
+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
+
+Preparing worktree (detached HEAD 322c452)
+HEAD is now at 322c452 add sub
+Cloning into '/build/reproducible-path/git-2.51.0/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 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
+
+  > file1 updated
+ok 6 - submodule is checked out just after submodule update in linked worktree
+
+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"
+
+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 2405.8 'submodule is checked out after manually adding submodule worktree': 
+	git -C linked_submodule diff --submodule main"^!" >out &&
+	grep "file1 updated" out
+
+  > file1 updated
+ok 8 - submodule is checked out after manually adding submodule worktree
+
+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
+
+Preparing worktree (detached HEAD d717f19)
+HEAD is now at d717f19 sub updated
+Cloning into '/build/reproducible-path/git-2.51.0/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 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
+
+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 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
+
+commit 69af1687b671131ed0cfa61b7fcdc907a4c21f2c
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    file1
+ok 11 - unsetting core.worktree does not prevent running commands directly against the submodule repository
+
+# still have 1 known breakage(s)
+# passed all remaining 10 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2402-worktree-list.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 A-1.t
-Switched to a new branch 'wt-2'
-[wt-2 3582f45] A-2
+ 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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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 A-2.t
-Switched to a new branch 'wt-3'
-[wt-3 b62f76d] A-3
+ 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.51.0/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 A-3.t
-Switched to a new branch 'wt-4'
-[wt-4 5e1557d] A-4
+ create mode 100644 new.t
+Preparing worktree (new branch 'linked')
+HEAD is now at 3325ee1 new
+/build/reproducible-path/git-2.51.0/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.51.0/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 A-4.t
-Switched to a new branch 'fake-1'
-[fake-1 ae0524d] f-1
+ 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.51.0/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 f-1.t
-Switched to a new branch 'fake-2'
-[fake-2 8b85f46] f-2
+ 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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2406-worktree-repair.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 f-2.t
+ create mode 100644 init.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 &&
+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
 
-		test_must_fail git branch -D wt-$i 2>err &&
-		grep "cannot delete branch" err || return 1
-	done
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 2 - skip missing worktree
 
-fatal: cannot force update the branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t2407-worktree-heads/wt-1'
-error: cannot delete branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t2407-worktree-heads/wt-2'
-error: cannot delete branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t2407-worktree-heads/wt-3'
-error: cannot delete branch 'wt-3' used by worktree at '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t2407-worktree-heads/wt-4'
-error: cannot delete branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t2407-worktree-heads/wt-4'
-ok 2 - refuse to overwrite: checked out in 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
 
-expecting success of 2407.3 'refuse to overwrite: worktree in bisect': 
-	test_when_finished git -C wt-4 bisect reset &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+error: not a directory: /build/reproducible-path/git-2.51.0/t/trash directory.t2406-worktree-repair/notdir
+ok 3 - worktree path not directory
 
-	# 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 &&
+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
 
-	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
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2406-worktree-repair/repo/.git/
+error: .git is not a file: /build/reproducible-path/git-2.51.0/t/trash directory.t2406-worktree-repair/repo
+ok 4 - don't clobber .git repo
 
-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.51.0/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 2406.5 'repair missing .git file': 
+	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken"
 
-expecting success of 2407.4 'refuse to overwrite: worktree in rebase (apply)': 
-	test_when_finished git -C wt-2 rebase --abort &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.51.0/t/trash directory.t2406-worktree-repair/corrupt
+ok 5 - repair missing .git file
 
-	# This will fail part-way through due to a conflict.
-	test_must_fail git -C wt-2 rebase --apply conflict-2 &&
+expecting success of 2406.6 'repair bogus .git file': 
+	test_corrupt_gitfile "echo \"gitdir: /nowhere\" >corrupt/.git" \
+		".git file broken"
 
-	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
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.51.0/t/trash directory.t2406-worktree-repair/corrupt
+ok 6 - repair bogus .git file
 
-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...
-Auto-merging 2.t
-CONFLICT (add/add): Merge conflict in 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.51.0/t/trash directory.t2407-worktree-heads/wt-2'
-ok 4 - refuse to overwrite: worktree in rebase (apply)
+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"
 
-expecting success of 2407.5 'refuse to overwrite: worktree in rebase (merge)': 
-	test_when_finished git -C wt-2 rebase --abort &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t2406-worktree-repair/corrupt
+ok 7 - repair incorrect .git file
 
-	# This will fail part-way through due to a conflict.
-	test_must_fail git -C wt-2 rebase conflict-2 &&
+expecting success of 2406.8 'repair .git file from main/.git': 
+	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" .git
 
-	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
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.51.0/t/trash directory.t2406-worktree-repair/corrupt
+ok 8 - repair .git file from main/.git
 
-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.51.0/t/trash directory.t2407-worktree-heads/wt-2'
-ok 5 - refuse to overwrite: worktree in rebase (merge)
+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
 
-expecting success of 2407.6 'refuse to overwrite: worktree in rebase with --update-refs': 
-	test_when_finished git -C wt-3 rebase --abort &&
+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.51.0/t/trash directory.t2406-worktree-repair/corrupt
+ok 9 - repair .git file from linked worktree
 
-	git branch -f can-be-updated wt-3 &&
-	test_must_fail git -C wt-3 rebase --update-refs conflict-3 &&
+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
 
-	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
+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.51.0/t/trash directory.t2406-worktree-repair/corrupt
+ok 10 - repair .git file from bare.git
 
-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.51.0/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.51.0/t/trash directory.t2407-worktree-heads/wt-3'
-ok 6 - refuse to overwrite: worktree in rebase with --update-refs
+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
 
-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 &&
+error: not a valid path: /notvalid
+ok 11 - invalid worktree path
 
-	# 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
+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
 
-fatal: refusing to fetch into branch 'refs/heads/wt-3' checked out at '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t2407-worktree-heads'
-ok 7 - refuse to fetch over ref: checked out
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t2406-worktree-repair/not-a-worktree/.git
+ok 12 - repo not found; .git not file
 
-expecting success of 2407.8 'refuse to fetch over ref: worktree in bisect': 
-	test_when_finished git -C wt-4 bisect reset &&
+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
 
-	# 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 &&
+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.51.0/t/trash directory.t2406-worktree-repair/side/.git
+ok 13 - repo not found; .git not referencing repo
 
-	test_must_fail git fetch server +refs/heads/wt-4:refs/heads/wt-4 2>err &&
-	grep "refusing to fetch into branch" err
+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
 
-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.51.0/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
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+error: unable to locate repository; .git file broken: /build/reproducible-path/git-2.51.0/t/trash directory.t2406-worktree-repair/moved/.git
+ok 14 - repo not found; .git file broken
 
-expecting success of 2407.9 'refuse to fetch over ref: worktree in rebase': 
-	test_when_finished git -C wt-3 rebase --abort &&
+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
 
-	# This will fail part-way through due to a conflict.
-	test_must_fail git -C wt-3 rebase conflict-3 &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir unreadable: /build/reproducible-path/git-2.51.0/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
+ok 15 - repair broken gitdir
 
-	test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
-	grep "refusing to fetch into branch" err
+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
 
-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.51.0/t/trash directory.t2407-worktree-heads/wt-3'
-ok 9 - refuse to fetch over ref: worktree in rebase
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir incorrect: /build/reproducible-path/git-2.51.0/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
+ok 16 - repair incorrect gitdir
 
-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_* &&
+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
 
-	# 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 &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir incorrect: /build/reproducible-path/git-2.51.0/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
+ok 17 - repair gitdir (implicit) from linked worktree
 
-	# 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 &&
+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
 
-	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
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 18 - unable to repair gitdir (implicit) from main worktree
 
-fatal: cannot force update the branch 'fake-1' used by worktree at '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t2407-worktree-heads/wt-4'
-ok 10 - refuse to overwrite when in error states
+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
 
-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
-	)
+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.51.0/t/trash directory.t2406-worktree-repair/.git/worktrees/orig1/gitdir
+repair: gitdir incorrect: /build/reproducible-path/git-2.51.0/t/trash directory.t2406-worktree-repair/.git/worktrees/orig2/gitdir
+ok 19 - repair multiple gitdir files
 
-[master 3e1ca9c] fixup! 2
+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.51.0/t/trash directory.t2406-worktree-repair/main/.git/
+[master (root-commit) f54694c] init
  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
+ 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.51.0/t/trash directory.t2406-worktree-repair/mainmoved/.git/worktrees/side/gitdir
+ok 20 - repair moved main and linked worktrees
 
-expecting success of 2407.12 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
+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
 
-ok 12 - $EDITOR and friends are unchanged
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t2406-worktree-repair/dup/main/.git/worktrees/linked/gitdir
+ok 21 - repair copied main and linked worktrees
 
-# passed all 12 test(s)
-1..12
+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.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t2406-worktree-repair/main/.git/worktrees/side/gitdir
+repair: .git file absolute/relative path mismatch: /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3000-ls-files-others.sh ***
@@ -106254,387 +106839,355 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3002-ls-files-dashpath.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t2407-worktree-heads.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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" &&
 
-ok 6 - git ls-files with no path restriction.
+		git checkout - &&
+		test_commit $i &&
+		git branch wt-$i &&
+		git branch fake-$i &&
+		git worktree add wt-$i wt-$i || return 1
+	done &&
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3003-ls-files-exclude.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+	# 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) 39caa03] file
+[master (root-commit) 2519212] init
  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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3001-ls-files-others-exclude.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+ 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.51.0/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 &&
 
-ok 7 - trailing slash in exclude allows directory match(1)
+		test_must_fail git branch -D wt-$i 2>err &&
+		grep "cannot delete branch" err || return 1
+	done
 
-expecting success of 3001.8 'trailing slash in exclude allows directory match (2)': 
+fatal: cannot force update the branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t2407-worktree-heads/wt-1'
+error: cannot delete branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t2407-worktree-heads/wt-2'
+error: cannot delete branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t2407-worktree-heads/wt-3'
+error: cannot delete branch 'wt-3' used by worktree at '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t2407-worktree-heads/wt-4'
+error: cannot delete branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t2407-worktree-heads/wt-4'
+ok 2 - refuse to overwrite: checked out in worktree
 
-	git ls-files --others --exclude=one/two/ >output &&
-	if grep "^one/two/" output
-	then
-		echo Ooops
-		false
-	else
-		: happy
-	fi
+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 &&
 
-ok 8 - trailing slash in exclude allows directory match (2)
+	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
 
-expecting success of 3001.9 'trailing slash in exclude forces directory match (1)': 
+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.51.0/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
 
-	>two &&
-	git ls-files --others --exclude=two/ >output &&
-	grep "^two" output
+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 &&
 
-two
-ok 9 - trailing slash in exclude forces directory match (1)
+	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
 
-expecting success of 3001.10 'trailing slash in exclude forces directory match (2)': 
+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...
+Auto-merging 2.t
+CONFLICT (add/add): Merge conflict in 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.51.0/t/trash directory.t2407-worktree-heads/wt-2'
+ok 4 - refuse to overwrite: worktree in rebase (apply)
 
-	git ls-files --others --exclude=one/a.1/ >output &&
-	grep "^one/a.1" output
+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 &&
 
-one/a.1
-ok 10 - trailing slash in exclude forces directory match (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
 
-expecting success of 3001.11 'negated exclude matches can override previous ones': 
+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.51.0/t/trash directory.t2407-worktree-heads/wt-2'
+ok 5 - refuse to overwrite: worktree in rebase (merge)
 
-	git ls-files --others --exclude="a.*" --exclude="!a.1" >output &&
-	grep "^a.1" output
+expecting success of 2407.6 'refuse to overwrite: worktree in rebase with --update-refs': 
+	test_when_finished git -C wt-3 rebase --abort &&
 
-a.1
-ok 11 - negated exclude matches can override previous ones
+	git branch -f can-be-updated wt-3 &&
+	test_must_fail git -C wt-3 rebase --update-refs conflict-3 &&
 
-expecting success of 3001.12 'excluded directory overrides content patterns': 
+	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
 
-	git ls-files --others --exclude="one" --exclude="!one/a.1" >output &&
-	if grep "^one/a.1" output
-	then
-		false
-	fi
+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.51.0/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.51.0/t/trash directory.t2407-worktree-heads/wt-3'
+ok 6 - refuse to overwrite: worktree in rebase with --update-refs
 
-ok 12 - excluded directory overrides content patterns
+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 &&
 
-expecting success of 3001.13 'negated directory doesn't affect content patterns': 
+	# 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
 
-	git ls-files --others --exclude="!one" --exclude="one/a.1" >output &&
-	if grep "^one/a.1" output
-	then
-		false
-	fi
+fatal: refusing to fetch into branch 'refs/heads/wt-3' checked out at '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t2407-worktree-heads'
+ok 7 - refuse to fetch over ref: checked out
 
-ok 13 - negated directory doesn't affect content patterns
+expecting success of 2407.8 'refuse to fetch over ref: worktree in bisect': 
+	test_when_finished git -C wt-4 bisect reset &&
 
-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
-	)
+	# 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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3001-ls-files-others-exclude/top/.git/
-ok 14 - subdirectory ignore (setup)
+	test_must_fail git fetch server +refs/heads/wt-4:refs/heads/wt-4 2>err &&
+	grep "refusing to fetch into branch" err
 
-expecting success of 3001.15 'subdirectory ignore (toplevel)': 
-	(
-		cd top &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
+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.51.0/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
 
-ok 15 - subdirectory ignore (toplevel)
+expecting success of 2407.9 'refuse to fetch over ref: worktree in rebase': 
+	test_when_finished git -C wt-3 rebase --abort &&
 
-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
+	# This will fail part-way through due to a conflict.
+	test_must_fail git -C wt-3 rebase conflict-3 &&
 
-ok 16 - subdirectory ignore (l1/l2)
+	test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
+	grep "refusing to fetch into branch" err
 
-expecting success of 3001.17 'subdirectory ignore (l1)': 
-	(
-		cd top/l1 &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
+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.51.0/t/trash directory.t2407-worktree-heads/wt-3'
+ok 9 - refuse to fetch over ref: worktree in rebase
 
-ok 17 - subdirectory ignore (l1)
+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_* &&
 
-expecting success of 3001.18 'show/hide empty ignored directory (setup)': 
-	rm top/l1/l2/l1 &&
-	rm top/l1/.gitignore
+	# 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 &&
 
-ok 18 - show/hide empty ignored directory (setup)
+	# 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 &&
 
-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
+	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
 
-ok 19 - show empty ignored directory with --directory
+fatal: cannot force update the branch 'fake-1' used by worktree at '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t2407-worktree-heads/wt-4'
+ok 10 - refuse to overwrite when in error states
 
-expecting success of 3001.20 'hide empty ignored directory with --no-empty-directory': 
+expecting success of 2407.11 'refuse to overwrite during rebase with --update-refs': 
+	git commit --fixup HEAD~2 --allow-empty &&
 	(
-		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 &&
+		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 &&
 	(
-		cd top &&
-		git add -f l1/tracked
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i --update-refs HEAD~3 >todo &&
+		grep "update-ref refs/heads/allow-update" todo
 	)
 
-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
+[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 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 2407.12 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
 
-ok 27 - ls-files with "**" patterns and no slashes
+ok 12 - $EDITOR and friends are unchanged
 
-# passed all 27 test(s)
-1..27
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2080-parallel-checkout-basics.sh ***
@@ -107099,340 +107652,1114 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3004-ls-files-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t3002-ls-files-dashpath.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3002-ls-files-dashpath/.git/
+expecting success of 3002.1 'setup': 
+	echo frotz >path0 &&
+	echo frotz >./-foo &&
+	echo frotz >./--
 
-ok 2 - ls-files with nonexistent path
+ok 1 - setup
 
-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
+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
 
-usage: git ls-files [<options>] [<file>...]
-ok 3 - ls-files with nonsense option
+ok 2 - git ls-files without path restriction.
 
-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
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3004-ls-files-basic/broken/.git/
-usage: git ls-files [<options>] [<file>...]
-ok 4 - ls-files -h in corrupt repository
+ok 3 - git ls-files with path restriction.
 
-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
+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
 
-usage: git ls-files [<options>] [<file>...]
-usage: git ls-files [<options>] [<file>...]
-ok 5 - ls-files does not crash with -h
+ok 4 - git ls-files with path restriction with --.
 
-checking prerequisite: SYMLINKS
+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
 
-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 5 - git ls-files with path restriction with -- --.
 
-)
-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 &&
+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
 
-	(
-		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
+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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3005-ls-files-relative.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3005-ls-files-relative/.git/
-expecting success of 3005.1 'prepare': 
-	: >never-mind-me &&
-	git add never-mind-me &&
-	mkdir top &&
-	(
-		cd top &&
-		mkdir sub &&
-		x="x xa xbc xdef xghij xklmno" &&
-		y=$(echo "$x" | tr x y) &&
-		touch $x &&
-		touch $y &&
-		cd sub &&
-		git add ../x*
-	)
+*** t3001-ls-files-others-exclude.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 - prepare
+ok 1 - git ls-files --others with various exclude options.
 
-expecting success of 3005.2 'ls-files with mixed levels': 
-	(
-		cd top/sub &&
-		cat >expect <<-EOF &&
-		../../never-mind-me
-		../x
-		EOF
-		git ls-files $(cat expect) >actual &&
-		test_cmp expect actual
-	)
+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 - ls-files with mixed levels
+ok 2 - git ls-files --others with \r\n line endings.
 
-expecting success of 3005.3 'ls-files -c': 
-	(
-		cd top/sub &&
-		printf "error: pathspec $SQ%s$SQ did not match any file(s) known to git\n" ../y* >expect.err &&
-		echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
-		ls ../x* >expect.out &&
-		test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
-		test_cmp expect.out actual.out &&
-		test_cmp expect.err actual.err
-	)
+expecting success of 3001.3 'setup skip-worktree gitignore': 
+	git add $allignores &&
+	git update-index --skip-worktree $allignores &&
+	rm $allignores
 
-ok 3 - ls-files -c
+ok 3 - setup skip-worktree gitignore
 
-expecting success of 3005.4 'ls-files -o': 
-	(
-		cd top/sub &&
-		printf "error: pathspec $SQ%s$SQ did not match any file(s) known to git\n" ../x* >expect.err &&
-		echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
-		ls ../y* >expect.out &&
-		test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
-		test_cmp expect.out actual.out &&
-		test_cmp expect.err actual.err
-	)
+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 - ls-files -o
+ok 4 - git ls-files --others with various exclude options.
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3006-ls-files-long.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3006-ls-files-long/.git/
-expecting success of 3006.1 'setup': 
-	p=filefilefilefilefilefilefilefile &&
-	p=$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p &&
-	p=$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p &&
+expecting success of 3001.5 'restore gitignore': 
+	git checkout --ignore-skip-worktree-bits $allignores &&
+	rm .git/index
 
-	path_a=${p}_a &&
-	path_z=${p}_z &&
+Updated 3 paths from the index
+ok 5 - restore gitignore
 
-	blob_a=$(echo frotz | git hash-object -w --stdin) &&
-	blob_z=$(echo nitfol | git hash-object -w --stdin) &&
+expecting success of 3001.6 'git status honors core.excludesfile': test_cmp expect output
+ok 6 - git status honors core.excludesfile
 
-	pat="100644 %s 0\t%s\n"
+expecting success of 3001.7 'trailing slash in exclude allows directory match(1)': 
 
-ok 1 - setup
+	git ls-files --others --exclude=one/ >output &&
+	if grep "^one/" output
+	then
+		echo Ooops
+		false
+	else
+		: happy
+	fi
 
-expecting success of 3006.2 'overly-long path by itself is not a problem': 
-	printf "$pat" "$blob_a" "$path_a" |
-	git update-index --add --index-info &&
-	echo "$path_a" >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual
 
-ok 2 - overly-long path by itself is not a problem
+ok 7 - trailing slash in exclude allows directory match(1)
 
-expecting success of 3006.3 'overly-long path does not replace another by mistake': 
-	printf "$pat" "$blob_a" "$path_a" "$blob_z" "$path_z" |
-	git update-index --add --index-info &&
-	(
-		echo "$path_a" &&
-		echo "$path_z"
-	) >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual
+expecting success of 3001.8 'trailing slash in exclude allows directory match (2)': 
 
-ok 3 - overly-long path does not replace another by mistake
+	git ls-files --others --exclude=one/two/ >output &&
+	if grep "^one/two/" output
+	then
+		echo Ooops
+		false
+	else
+		: happy
+	fi
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3008-ls-files-lazy-init-name-hash.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3008-ls-files-lazy-init-name-hash/.git/
-expecting success of 3008.1 'no buffer overflow in lazy_init_name_hash': 
-	(
-	    test_seq $LAZY_THREAD_COST | sed "s/^/a_/" &&
-	    echo b/b/b &&
-	    test_seq $LAZY_THREAD_COST | sed "s/^/c_/" &&
-	    test_seq 50 | sed "s/^/d_/" | tr "\n" "/" && echo d
-	) |
-	sed "s/^/100644 $EMPTY_BLOB	/" |
-	git update-index --index-info &&
-	test-tool lazy-init-name-hash -m
 
-0.012884 0.003809 4002 multi 2
-ok 1 - no buffer overflow in lazy_init_name_hash
+ok 8 - trailing slash in exclude allows directory match (2)
 
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3009-ls-files-others-nonsubmodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3009-ls-files-others-nonsubmodule/.git/
-expecting success of 3009.1 'setup: directories': 
-	mkdir nonrepo-no-files/ &&
-	mkdir nonrepo-untracked-file &&
-	: >nonrepo-untracked-file/untracked &&
-	git init repo-no-commit-no-files &&
-	git init repo-no-commit-untracked-file &&
-	: >repo-no-commit-untracked-file/untracked &&
-	git init repo-with-commit-no-files &&
-	git -C repo-with-commit-no-files commit --allow-empty -mmsg &&
-	git init repo-with-commit-untracked-file &&
-	test_commit -C repo-with-commit-untracked-file msg &&
-	: >repo-with-commit-untracked-file/untracked
+expecting success of 3001.9 'trailing slash in exclude forces directory match (1)': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-no-commit-no-files/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-no-commit-untracked-file/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-with-commit-no-files/.git/
-[master (root-commit) b4b9816] msg
- Author: A U Thor <author@example.com>
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-with-commit-untracked-file/.git/
-[master (root-commit) c24fc06] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 msg.t
-ok 1 - setup: directories
+	>two &&
+	git ls-files --others --exclude=two/ >output &&
+	grep "^two" output
 
-expecting success of 3009.2 'ls-files --others handles untracked git repositories': 
-	git ls-files -o >output &&
-	cat >expect <<-EOF &&
-	nonrepo-untracked-file/untracked
-	output
-	repo-no-commit-no-files/
-	repo-no-commit-untracked-file/
-	repo-with-commit-no-files/
-	repo-with-commit-untracked-file/
-	EOF
-	test_cmp expect output
 
-ok 2 - ls-files --others handles untracked git repositories
+two
+ok 9 - trailing slash in exclude forces directory match (1)
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3012-ls-files-dedup.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3012-ls-files-dedup/.git/
-expecting success of 3012.1 'setup': 
-	>a.txt &&
-	>b.txt &&
-	>delete.txt &&
-	git add a.txt b.txt delete.txt &&
-	git commit -m base &&
-	echo a >a.txt &&
-	echo b >b.txt &&
-	echo delete >delete.txt &&
-	git add a.txt b.txt delete.txt &&
-	git commit -m tip &&
-	git tag tip &&
-	git reset --hard HEAD^ &&
-	echo change >a.txt &&
-	git commit -a -m side &&
-	git tag side
+expecting success of 3001.10 'trailing slash in exclude forces directory match (2)': 
 
-[master (root-commit) 211e5bc] base
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a.txt
- create mode 100644 b.txt
- create mode 100644 delete.txt
-[master 8a0f78f] tip
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-HEAD is now at 211e5bc base
-[master 692b228] side
+	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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3003-ls-files-exclude.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3005-ls-files-relative.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3005-ls-files-relative/.git/
+expecting success of 3005.1 'prepare': 
+	: >never-mind-me &&
+	git add never-mind-me &&
+	mkdir top &&
+	(
+		cd top &&
+		mkdir sub &&
+		x="x xa xbc xdef xghij xklmno" &&
+		y=$(echo "$x" | tr x y) &&
+		touch $x &&
+		touch $y &&
+		cd sub &&
+		git add ../x*
+	)
+
+ok 1 - prepare
+
+expecting success of 3005.2 'ls-files with mixed levels': 
+	(
+		cd top/sub &&
+		cat >expect <<-EOF &&
+		../../never-mind-me
+		../x
+		EOF
+		git ls-files $(cat expect) >actual &&
+		test_cmp expect actual
+	)
+
+ok 2 - ls-files with mixed levels
+
+expecting success of 3005.3 'ls-files -c': 
+	(
+		cd top/sub &&
+		printf "error: pathspec $SQ%s$SQ did not match any file(s) known to git\n" ../y* >expect.err &&
+		echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
+		ls ../x* >expect.out &&
+		test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
+		test_cmp expect.out actual.out &&
+		test_cmp expect.err actual.err
+	)
+
+ok 3 - ls-files -c
+
+expecting success of 3005.4 'ls-files -o': 
+	(
+		cd top/sub &&
+		printf "error: pathspec $SQ%s$SQ did not match any file(s) known to git\n" ../x* >expect.err &&
+		echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
+		ls ../y* >expect.out &&
+		test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
+		test_cmp expect.out actual.out &&
+		test_cmp expect.err actual.err
+	)
+
+ok 4 - ls-files -o
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3006-ls-files-long.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3006-ls-files-long/.git/
+expecting success of 3006.1 'setup': 
+	p=filefilefilefilefilefilefilefile &&
+	p=$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p &&
+	p=$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p &&
+
+	path_a=${p}_a &&
+	path_z=${p}_z &&
+
+	blob_a=$(echo frotz | git hash-object -w --stdin) &&
+	blob_z=$(echo nitfol | git hash-object -w --stdin) &&
+
+	pat="100644 %s 0\t%s\n"
+
 ok 1 - setup
 
-expecting success of 3012.2 'git ls-files --deduplicate to show unique unmerged path': 
-	test_must_fail git merge tip &&
-	git ls-files --deduplicate >actual &&
-	cat >expect <<-\EOF &&
-	a.txt
-	b.txt
-	delete.txt
-	EOF
-	test_cmp expect actual &&
-	git merge --abort
+expecting success of 3006.2 'overly-long path by itself is not a problem': 
+	printf "$pat" "$blob_a" "$path_a" |
+	git update-index --add --index-info &&
+	echo "$path_a" >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual
 
-Auto-merging a.txt
-CONFLICT (content): Merge conflict in a.txt
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - git ls-files --deduplicate to show unique unmerged path
+ok 2 - overly-long path by itself is not a problem
 
-expecting success of 3012.3 'git ls-files -d -m --deduplicate with different display options': 
-	git reset --hard side &&
-	test_must_fail git merge tip &&
-	rm delete.txt &&
-	git ls-files -d -m --deduplicate >actual &&
-	cat >expect <<-\EOF &&
-	a.txt
-	delete.txt
-	EOF
-	test_cmp expect actual &&
-	git ls-files -d -m -t --deduplicate >actual &&
-	cat >expect <<-\EOF &&
-	C a.txt
-	C a.txt
-	C a.txt
-	R delete.txt
-	C delete.txt
-	EOF
-	test_cmp expect actual &&
-	git ls-files -d -m -c --deduplicate >actual &&
-	cat >expect <<-\EOF &&
-	a.txt
-	b.txt
-	delete.txt
-	EOF
-	test_cmp expect actual &&
-	git merge --abort
+expecting success of 3006.3 'overly-long path does not replace another by mistake': 
+	printf "$pat" "$blob_a" "$path_a" "$blob_z" "$path_z" |
+	git update-index --add --index-info &&
+	(
+		echo "$path_a" &&
+		echo "$path_z"
+	) >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual
 
-HEAD is now at 692b228 side
-Auto-merging a.txt
-CONFLICT (content): Merge conflict in a.txt
-Automatic merge failed; fix conflicts and then commit the result.
-ok 3 - git ls-files -d -m --deduplicate with different display options
+ok 3 - overly-long path does not replace another by mistake
 
 # passed all 3 test(s)
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3004-ls-files-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3008-ls-files-lazy-init-name-hash.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3008-ls-files-lazy-init-name-hash/.git/
+expecting success of 3008.1 'no buffer overflow in lazy_init_name_hash': 
+	(
+	    test_seq $LAZY_THREAD_COST | sed "s/^/a_/" &&
+	    echo b/b/b &&
+	    test_seq $LAZY_THREAD_COST | sed "s/^/c_/" &&
+	    test_seq 50 | sed "s/^/d_/" | tr "\n" "/" && echo d
+	) |
+	sed "s/^/100644 $EMPTY_BLOB	/" |
+	git update-index --index-info &&
+	test-tool lazy-init-name-hash -m
+
+0.000984 0.001992 4002 multi 2
+ok 1 - no buffer overflow in lazy_init_name_hash
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t2500-untracked-overwriting.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/reset_keep/.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 3 - reset --keep will preserve untracked files/dirs
+
+expecting success of 2500.4 'checkout -m does not nuke untracked file': 
+	test_setup_checkout_m &&
+	(
+		cd checkout &&
+
+		# Tweak filler
+		test_write_lines this file has some >filler &&
+		# Make an untracked file, save its contents in "expect"
+		echo precious >notes.txt &&
+		cp notes.txt expect &&
+
+		test_must_fail git checkout -m work &&
+		test_cmp expect notes.txt
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/checkout/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 7d7f42a] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 filler
+Switched to a new branch 'work'
+[work bac6a98] filler
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 notes.txt
+Switched to branch 'stable'
+error: Untracked working tree file 'notes.txt' would be overwritten by merge.
+ok 4 - checkout -m does not nuke untracked file
+
+expecting success of 2500.5 'git rebase --abort and untracked files': 
+	test_setup_sequencing rebase_abort_and_untracked &&
+	(
+		cd sequencing_rebase_abort_and_untracked &&
+		git checkout fooey &&
+		test_must_fail git rebase simple &&
+
+		cat init.t &&
+		git rm init.t &&
+		echo precious >init.t &&
+		cp init.t expect &&
+		git status --porcelain &&
+		test_must_fail git rebase --abort &&
+		test_cmp expect init.t
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/sequencing_rebase_abort_and_untracked/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 8220a2b] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+[master 4cfedf0] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+Switched to branch 'fooey'
+rm 'foo/bar/baz.t'
+[fooey d39f842] changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'simple'
+[simple 15a37e4] another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 newfile
+Switched to branch 'fooey'
+Rebasing (1/1)
Auto-merging filler
+CONFLICT (content): Merge conflict in filler
+error: could not apply d39f842... changes
+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 d39f842... # changes
+init
+rm 'init.t'
+UU filler
+D  foo/bar/baz.t
+D  init.t
+?? expect
+?? init.t
+error: The following untracked working tree files would be overwritten by reset:
+	init.t
+Please move or remove them before you reset.
+Aborting
+fatal: could not move back to d39f842c8a54822614a71d9e503b01b89b57e3bf
+ok 5 - git rebase --abort and untracked files
+
+expecting success of 2500.6 'git rebase fast forwarding and untracked files': 
+	test_setup_sequencing rebase_fast_forward_and_untracked &&
+	(
+		cd sequencing_rebase_fast_forward_and_untracked &&
+		git checkout init &&
+		echo precious >filler &&
+		cp filler expect &&
+		test_must_fail git rebase init simple &&
+		test_cmp expect filler
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/sequencing_rebase_fast_forward_and_untracked/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 8220a2b] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+[master 4cfedf0] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+Switched to branch 'fooey'
+rm 'foo/bar/baz.t'
+[fooey d39f842] changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'simple'
+[simple 15a37e4] another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 newfile
+Note: switching to 'init'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 2519212 init
+error: The following untracked working tree files would be overwritten by checkout:
+	filler
+Please move or remove them before you switch branches.
+Aborting
+error: could not switch to simple
+ok 6 - git rebase fast forwarding and untracked files
+
+checking known breakage of 2500.7 'git rebase --autostash and untracked files': 
+	test_setup_sequencing rebase_autostash_and_untracked &&
+	(
+		cd sequencing_rebase_autostash_and_untracked &&
+		git checkout simple &&
+		git rm filler &&
+		mkdir filler &&
+		echo precious >filler/file &&
+		cp filler/file expect &&
+		git rebase --autostash init &&
+		test_path_is_file filler/file
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/sequencing_rebase_autostash_and_untracked/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 8220a2b] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+[master 4cfedf0] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+Switched to branch 'fooey'
+rm 'foo/bar/baz.t'
+[fooey d39f842] changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'simple'
+[simple 15a37e4] another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 newfile
+Already on 'simple'
+rm 'filler'
+error: Updating the following directories would lose untracked files in them:
+	filler
+
+Aborting
+fatal: could not reset --hard
+Created autostash: ae7ed59
+not ok 7 - git rebase --autostash and untracked files # TODO known breakage
+
+checking known breakage of 2500.8 'git stash and untracked files': 
+	test_setup_sequencing stash_and_untracked_files &&
+	(
+		cd sequencing_stash_and_untracked_files &&
+		git checkout simple &&
+		git rm filler &&
+		mkdir filler &&
+		echo precious >filler/file &&
+		cp filler/file expect &&
+		git status --porcelain &&
+		git stash push &&
+		git status --porcelain &&
+		test_path_is_file filler/file
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/sequencing_stash_and_untracked_files/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 8220a2b] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+[master 4cfedf0] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+Switched to branch 'fooey'
+rm 'foo/bar/baz.t'
+[fooey d39f842] changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'simple'
+[simple 15a37e4] another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 newfile
+Already on 'simple'
+rm 'filler'
+D  filler
+?? expect
+?? filler/
+Saved working directory and index state WIP on simple: 15a37e4 another
+?? expect
+File filler/file doesn't exist
+not ok 8 - git stash and untracked files # TODO known breakage
+
+expecting success of 2500.9 'git am --abort and untracked dir vs. unmerged file': 
+	test_setup_sequencing am_abort_and_untracked &&
+	(
+		cd sequencing_am_abort_and_untracked &&
+		git format-patch -1 --stdout fooey >changes.mbox &&
+		test_must_fail git am --3way changes.mbox &&
+
+		# Delete the conflicted file; we will stage and commit it later
+		rm filler &&
+
+		# Put an unrelated untracked directory there
+		mkdir filler &&
+		echo foo >filler/file1 &&
+		echo bar >filler/file2 &&
+
+		test_must_fail git am --abort 2>errors &&
+		test_path_is_dir filler &&
+		grep "Updating .filler. would lose untracked files in it" errors
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/sequencing_am_abort_and_untracked/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 8220a2b] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+[master 4cfedf0] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+Switched to branch 'fooey'
+rm 'foo/bar/baz.t'
+[fooey d39f842] changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'simple'
+[simple 15a37e4] another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 newfile
+Applying: changes
+Using index info to reconstruct a base tree...
+M	filler
+Falling back to patching base and 3-way merge...
+Auto-merging filler
+CONFLICT (content): Merge conflict in filler
+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 changes
+error: Updating 'filler' would lose untracked files in it
+ok 9 - git am --abort and untracked dir vs. unmerged file
+
+expecting success of 2500.10 'git am --skip and untracked dir vs deleted file': 
+	test_setup_sequencing am_skip_and_untracked &&
+	(
+		cd sequencing_am_skip_and_untracked &&
+		git checkout fooey &&
+		git format-patch -1 --stdout simple >changes.mbox &&
+		test_must_fail git am --3way changes.mbox &&
+
+		# Delete newfile
+		rm newfile &&
+
+		# Put an unrelated untracked directory there
+		mkdir newfile &&
+		echo foo >newfile/file1 &&
+		echo bar >newfile/file2 &&
+
+		# Change our mind about resolutions, just skip this patch
+		test_must_fail git am --skip 2>errors &&
+		test_path_is_dir newfile &&
+		grep "Updating .newfile. would lose untracked files in it" errors
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/sequencing_am_skip_and_untracked/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 8220a2b] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+[master 4cfedf0] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+Switched to branch 'fooey'
+rm 'foo/bar/baz.t'
+[fooey d39f842] changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'simple'
+[simple 15a37e4] another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 newfile
+Switched to branch 'fooey'
+Applying: another
+Using index info to reconstruct a base tree...
+M	filler
+Falling back to patching base and 3-way merge...
+Auto-merging filler
+CONFLICT (content): Merge conflict in filler
+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 another
+error: Updating 'newfile' would lose untracked files in it
+ok 10 - git am --skip and untracked dir vs deleted file
+
+# still have 2 known breakage(s)
+# passed all remaining 8 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3009-ls-files-others-nonsubmodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3009-ls-files-others-nonsubmodule/.git/
+expecting success of 3009.1 'setup: directories': 
+	mkdir nonrepo-no-files/ &&
+	mkdir nonrepo-untracked-file &&
+	: >nonrepo-untracked-file/untracked &&
+	git init repo-no-commit-no-files &&
+	git init repo-no-commit-untracked-file &&
+	: >repo-no-commit-untracked-file/untracked &&
+	git init repo-with-commit-no-files &&
+	git -C repo-with-commit-no-files commit --allow-empty -mmsg &&
+	git init repo-with-commit-untracked-file &&
+	test_commit -C repo-with-commit-untracked-file msg &&
+	: >repo-with-commit-untracked-file/untracked
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-no-commit-no-files/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-no-commit-untracked-file/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-with-commit-no-files/.git/
+[master (root-commit) b4b9816] msg
+ Author: A U Thor <author@example.com>
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-with-commit-untracked-file/.git/
+[master (root-commit) c24fc06] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 msg.t
+ok 1 - setup: directories
+
+expecting success of 3009.2 'ls-files --others handles untracked git repositories': 
+	git ls-files -o >output &&
+	cat >expect <<-EOF &&
+	nonrepo-untracked-file/untracked
+	output
+	repo-no-commit-no-files/
+	repo-no-commit-untracked-file/
+	repo-with-commit-no-files/
+	repo-with-commit-untracked-file/
+	EOF
+	test_cmp expect output
+
+ok 2 - ls-files --others handles untracked git repositories
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3010-ls-files-killed-modified.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3010-ls-files-killed-modified/.git/
 expecting success of 3010.1 'git update-index --add to add various paths.': 
@@ -107543,6 +108870,127 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3020-ls-files-error-unmatch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3012-ls-files-dedup.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3012-ls-files-dedup/.git/
+expecting success of 3012.1 'setup': 
+	>a.txt &&
+	>b.txt &&
+	>delete.txt &&
+	git add a.txt b.txt delete.txt &&
+	git commit -m base &&
+	echo a >a.txt &&
+	echo b >b.txt &&
+	echo delete >delete.txt &&
+	git add a.txt b.txt delete.txt &&
+	git commit -m tip &&
+	git tag tip &&
+	git reset --hard HEAD^ &&
+	echo change >a.txt &&
+	git commit -a -m side &&
+	git tag side
+
+[master (root-commit) 211e5bc] base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a.txt
+ create mode 100644 b.txt
+ create mode 100644 delete.txt
+[master 8a0f78f] tip
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+HEAD is now at 211e5bc base
+[master 692b228] side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 3012.2 'git ls-files --deduplicate to show unique unmerged path': 
+	test_must_fail git merge tip &&
+	git ls-files --deduplicate >actual &&
+	cat >expect <<-\EOF &&
+	a.txt
+	b.txt
+	delete.txt
+	EOF
+	test_cmp expect actual &&
+	git merge --abort
+
+Auto-merging a.txt
+CONFLICT (content): Merge conflict in a.txt
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - git ls-files --deduplicate to show unique unmerged path
+
+expecting success of 3012.3 'git ls-files -d -m --deduplicate with different display options': 
+	git reset --hard side &&
+	test_must_fail git merge tip &&
+	rm delete.txt &&
+	git ls-files -d -m --deduplicate >actual &&
+	cat >expect <<-\EOF &&
+	a.txt
+	delete.txt
+	EOF
+	test_cmp expect actual &&
+	git ls-files -d -m -t --deduplicate >actual &&
+	cat >expect <<-\EOF &&
+	C a.txt
+	C a.txt
+	C a.txt
+	R delete.txt
+	C delete.txt
+	EOF
+	test_cmp expect actual &&
+	git ls-files -d -m -c --deduplicate >actual &&
+	cat >expect <<-\EOF &&
+	a.txt
+	b.txt
+	delete.txt
+	EOF
+	test_cmp expect actual &&
+	git merge --abort
+
+HEAD is now at 692b228 side
+Auto-merging a.txt
+CONFLICT (content): Merge conflict in a.txt
+Automatic merge failed; fix conflicts and then commit the result.
+ok 3 - git ls-files -d -m --deduplicate with different display options
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3011-common-prefixes-and-directory-traversal.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3011-common-prefixes-and-directory-traversal/.git/
 expecting success of 3011.1 'setup': 
@@ -107741,8 +109189,8 @@
 	git ls-files -o "untracked_*/" >actual &&
 	test_cmp expect actual
 
---- expect	2025-08-27 08:20:25.419437336 +0000
-+++ actual	2025-08-27 08:20:25.427437389 +0000
+--- expect	2026-09-29 14:52:02.266548970 +0000
++++ actual	2026-09-29 14:52:02.270548970 +0000
 @@ -1,3 +1,2 @@
  untracked_*/empty
 -untracked_dir/empty
@@ -108270,986 +109718,6 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3020-ls-files-error-unmatch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t2500-untracked-overwriting.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/reset_keep/.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 3 - reset --keep will preserve untracked files/dirs
-
-expecting success of 2500.4 'checkout -m does not nuke untracked file': 
-	test_setup_checkout_m &&
-	(
-		cd checkout &&
-
-		# Tweak filler
-		test_write_lines this file has some >filler &&
-		# Make an untracked file, save its contents in "expect"
-		echo precious >notes.txt &&
-		cp notes.txt expect &&
-
-		test_must_fail git checkout -m work &&
-		test_cmp expect notes.txt
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/checkout/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 7d7f42a] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 filler
-Switched to a new branch 'work'
-[work bac6a98] filler
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 notes.txt
-Switched to branch 'stable'
-error: Untracked working tree file 'notes.txt' would be overwritten by merge.
-ok 4 - checkout -m does not nuke untracked file
-
-expecting success of 2500.5 'git rebase --abort and untracked files': 
-	test_setup_sequencing rebase_abort_and_untracked &&
-	(
-		cd sequencing_rebase_abort_and_untracked &&
-		git checkout fooey &&
-		test_must_fail git rebase simple &&
-
-		cat init.t &&
-		git rm init.t &&
-		echo precious >init.t &&
-		cp init.t expect &&
-		git status --porcelain &&
-		test_must_fail git rebase --abort &&
-		test_cmp expect init.t
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/sequencing_rebase_abort_and_untracked/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 8220a2b] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-[master 4cfedf0] foo/bar/baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-Switched to branch 'fooey'
-rm 'foo/bar/baz.t'
-[fooey d39f842] changes
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'simple'
-[simple 15a37e4] another
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 newfile
-Switched to branch 'fooey'
-Rebasing (1/1)
Auto-merging filler
-CONFLICT (content): Merge conflict in filler
-error: could not apply d39f842... changes
-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 d39f842... # changes
-init
-rm 'init.t'
-UU filler
-D  foo/bar/baz.t
-D  init.t
-?? expect
-?? init.t
-error: The following untracked working tree files would be overwritten by reset:
-	init.t
-Please move or remove them before you reset.
-Aborting
-fatal: could not move back to d39f842c8a54822614a71d9e503b01b89b57e3bf
-ok 5 - git rebase --abort and untracked files
-
-expecting success of 2500.6 'git rebase fast forwarding and untracked files': 
-	test_setup_sequencing rebase_fast_forward_and_untracked &&
-	(
-		cd sequencing_rebase_fast_forward_and_untracked &&
-		git checkout init &&
-		echo precious >filler &&
-		cp filler expect &&
-		test_must_fail git rebase init simple &&
-		test_cmp expect filler
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/sequencing_rebase_fast_forward_and_untracked/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 8220a2b] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-[master 4cfedf0] foo/bar/baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-Switched to branch 'fooey'
-rm 'foo/bar/baz.t'
-[fooey d39f842] changes
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'simple'
-[simple 15a37e4] another
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 newfile
-Note: switching to 'init'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 2519212 init
-error: The following untracked working tree files would be overwritten by checkout:
-	filler
-Please move or remove them before you switch branches.
-Aborting
-error: could not switch to simple
-ok 6 - git rebase fast forwarding and untracked files
-
-checking known breakage of 2500.7 'git rebase --autostash and untracked files': 
-	test_setup_sequencing rebase_autostash_and_untracked &&
-	(
-		cd sequencing_rebase_autostash_and_untracked &&
-		git checkout simple &&
-		git rm filler &&
-		mkdir filler &&
-		echo precious >filler/file &&
-		cp filler/file expect &&
-		git rebase --autostash init &&
-		test_path_is_file filler/file
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/sequencing_rebase_autostash_and_untracked/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 8220a2b] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-[master 4cfedf0] foo/bar/baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-Switched to branch 'fooey'
-rm 'foo/bar/baz.t'
-[fooey d39f842] changes
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'simple'
-[simple 15a37e4] another
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 newfile
-Already on 'simple'
-rm 'filler'
-error: Updating the following directories would lose untracked files in them:
-	filler
-
-Aborting
-fatal: could not reset --hard
-Created autostash: ae7ed59
-not ok 7 - git rebase --autostash and untracked files # TODO known breakage
-
-checking known breakage of 2500.8 'git stash and untracked files': 
-	test_setup_sequencing stash_and_untracked_files &&
-	(
-		cd sequencing_stash_and_untracked_files &&
-		git checkout simple &&
-		git rm filler &&
-		mkdir filler &&
-		echo precious >filler/file &&
-		cp filler/file expect &&
-		git status --porcelain &&
-		git stash push &&
-		git status --porcelain &&
-		test_path_is_file filler/file
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/sequencing_stash_and_untracked_files/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 8220a2b] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-[master 4cfedf0] foo/bar/baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-Switched to branch 'fooey'
-rm 'foo/bar/baz.t'
-[fooey d39f842] changes
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'simple'
-[simple 15a37e4] another
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 newfile
-Already on 'simple'
-rm 'filler'
-D  filler
-?? expect
-?? filler/
-Saved working directory and index state WIP on simple: 15a37e4 another
-?? expect
-File filler/file doesn't exist
-not ok 8 - git stash and untracked files # TODO known breakage
-
-expecting success of 2500.9 'git am --abort and untracked dir vs. unmerged file': 
-	test_setup_sequencing am_abort_and_untracked &&
-	(
-		cd sequencing_am_abort_and_untracked &&
-		git format-patch -1 --stdout fooey >changes.mbox &&
-		test_must_fail git am --3way changes.mbox &&
-
-		# Delete the conflicted file; we will stage and commit it later
-		rm filler &&
-
-		# Put an unrelated untracked directory there
-		mkdir filler &&
-		echo foo >filler/file1 &&
-		echo bar >filler/file2 &&
-
-		test_must_fail git am --abort 2>errors &&
-		test_path_is_dir filler &&
-		grep "Updating .filler. would lose untracked files in it" errors
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/sequencing_am_abort_and_untracked/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 8220a2b] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-[master 4cfedf0] foo/bar/baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-Switched to branch 'fooey'
-rm 'foo/bar/baz.t'
-[fooey d39f842] changes
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'simple'
-[simple 15a37e4] another
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 newfile
-Applying: changes
-Using index info to reconstruct a base tree...
-M	filler
-Falling back to patching base and 3-way merge...
-Auto-merging filler
-CONFLICT (content): Merge conflict in filler
-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 changes
-error: Updating 'filler' would lose untracked files in it
-ok 9 - git am --abort and untracked dir vs. unmerged file
-
-expecting success of 2500.10 'git am --skip and untracked dir vs deleted file': 
-	test_setup_sequencing am_skip_and_untracked &&
-	(
-		cd sequencing_am_skip_and_untracked &&
-		git checkout fooey &&
-		git format-patch -1 --stdout simple >changes.mbox &&
-		test_must_fail git am --3way changes.mbox &&
-
-		# Delete newfile
-		rm newfile &&
-
-		# Put an unrelated untracked directory there
-		mkdir newfile &&
-		echo foo >newfile/file1 &&
-		echo bar >newfile/file2 &&
-
-		# Change our mind about resolutions, just skip this patch
-		test_must_fail git am --skip 2>errors &&
-		test_path_is_dir newfile &&
-		grep "Updating .newfile. would lose untracked files in it" errors
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2500-untracked-overwriting/sequencing_am_skip_and_untracked/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 8220a2b] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-[master 4cfedf0] foo/bar/baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-Switched to branch 'fooey'
-rm 'foo/bar/baz.t'
-[fooey d39f842] changes
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'simple'
-[simple 15a37e4] another
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 newfile
-Switched to branch 'fooey'
-Applying: another
-Using index info to reconstruct a base tree...
-M	filler
-Falling back to patching base and 3-way merge...
-Auto-merging filler
-CONFLICT (content): Merge conflict in filler
-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 another
-error: Updating 'newfile' would lose untracked files in it
-ok 10 - git am --skip and untracked dir vs deleted file
-
-# still have 2 known breakage(s)
-# passed all remaining 8 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3007-ls-files-recurse-submodules.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git' to
-'/build/reproducible-path/git-2.51.0/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule'
-Migrating git directory of 'submodule/subsub' from
-'/build/reproducible-path/git-2.51.0/t/trash directory.t3007-ls-files-recurse-submodules/submodule/subsub/.git' to
-'/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3040-subprojects-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3040-subprojects-basic/.git/
 expecting success of 3040.1 'setup: create superproject': 
@@ -109394,6 +109862,102 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3050-subprojects-fetch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2501-cwd-empty.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t2501-cwd-empty/.git/
 expecting success of 2501.1 'setup': 
@@ -109749,7 +110313,7 @@
 		git version
 	)
 
-sh: 0: getcwd() failed: No such file or directory
+shell-init: error retrieving current directory: getcwd: cannot access parent directories: No such file or directory
 git version 2.51.0
 ok 21 - git version continues working from a deleted dir
 
@@ -109827,102 +110391,6 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3050-subprojects-fetch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3060-ls-files-with-tree.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3060-ls-files-with-tree/.git/
 expecting success of 3060.1 'setup': 
@@ -110173,6 +110641,474 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3007-ls-files-recurse-submodules.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git' to
+'/build/reproducible-path/git-2.51.0/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule'
+Migrating git directory of 'submodule/subsub' from
+'/build/reproducible-path/git-2.51.0/t/trash directory.t3007-ls-files-recurse-submodules/submodule/subsub/.git' to
+'/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3102-ls-tree-wildcards.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3102-ls-tree-wildcards/.git/
 expecting success of 3102.1 'setup': 
@@ -110220,6 +111156,140 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3100-ls-tree-restrict.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3100-ls-tree-restrict/.git/
+expecting success of 3100.1 'setup': mkdir path2 path2/baz &&
+     echo Hi >path0 &&
+     test_ln_s_add path0 path1 &&
+     test_ln_s_add ../path1 path2/bazbo &&
+     echo Lo >path2/foo &&
+     echo Mi >path2/baz/b &&
+     find path? \( -type f -o -type l \) -print |
+     xargs git update-index --add &&
+     tree=$(git write-tree) &&
+     echo $tree
+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
+a384d4f8dd786f29d6da4705dee4c2c0bc6b5049
+ok 1 - setup
+
+expecting success of 3100.2 'ls-tree plain': git ls-tree $tree >current &&
+     cat >expected <<\EOF &&
+100644 blob X	path0
+120000 blob X	path1
+040000 tree X	path2
+EOF
+     test_output
+ok 2 - ls-tree plain
+
+expecting success of 3100.3 'ls-tree recursive': git ls-tree -r $tree >current &&
+     cat >expected <<\EOF &&
+100644 blob X	path0
+120000 blob X	path1
+100644 blob X	path2/baz/b
+120000 blob X	path2/bazbo
+100644 blob X	path2/foo
+EOF
+     test_output
+ok 3 - ls-tree recursive
+
+expecting success of 3100.4 'ls-tree recursive with -t': git ls-tree -r -t $tree >current &&
+     cat >expected <<\EOF &&
+100644 blob X	path0
+120000 blob X	path1
+040000 tree X	path2
+040000 tree X	path2/baz
+100644 blob X	path2/baz/b
+120000 blob X	path2/bazbo
+100644 blob X	path2/foo
+EOF
+     test_output
+ok 4 - ls-tree recursive with -t
+
+expecting success of 3100.5 'ls-tree recursive with -d': git ls-tree -r -d $tree >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2
+040000 tree X	path2/baz
+EOF
+     test_output
+ok 5 - ls-tree recursive with -d
+
+expecting success of 3100.6 'ls-tree filtered with path': git ls-tree $tree path >current &&
+     cat >expected <<\EOF &&
+EOF
+     test_output
+ok 6 - ls-tree filtered with path
+
+expecting success of 3100.7 'ls-tree filtered with path1 path0': git ls-tree $tree path1 path0 >current &&
+     cat >expected <<\EOF &&
+100644 blob X	path0
+120000 blob X	path1
+EOF
+     test_output
+ok 7 - ls-tree filtered with path1 path0
+
+expecting success of 3100.8 'ls-tree filtered with path0/': git ls-tree $tree path0/ >current &&
+     cat >expected <<\EOF &&
+EOF
+     test_output
+ok 8 - ls-tree filtered with path0/
+
+expecting success of 3100.9 'ls-tree filtered with path2': git ls-tree $tree path2 >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2
+EOF
+     test_output
+ok 9 - ls-tree filtered with path2
+
+expecting success of 3100.10 'ls-tree filtered with path2/': git ls-tree $tree path2/ >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2/baz
+120000 blob X	path2/bazbo
+100644 blob X	path2/foo
+EOF
+     test_output
+ok 10 - ls-tree filtered with path2/
+
+expecting success of 3100.11 'ls-tree filtered with path2/baz': git ls-tree $tree path2/baz >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2/baz
+EOF
+     test_output
+ok 11 - ls-tree filtered with path2/baz
+
+expecting success of 3100.12 'ls-tree filtered with path2/bak': git ls-tree $tree path2/bak >current &&
+     cat >expected <<\EOF &&
+EOF
+     test_output
+ok 12 - ls-tree filtered with path2/bak
+
+expecting success of 3100.13 'ls-tree -t filtered with path2/bak': git ls-tree -t $tree path2/bak >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2
+EOF
+     test_output
+ok 13 - ls-tree -t filtered with path2/bak
+
+expecting success of 3100.14 'ls-tree with one path a prefix of the other': git ls-tree $tree path2/baz path2/bazbo >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2/baz
+120000 blob X	path2/bazbo
+EOF
+     test_output
+ok 14 - ls-tree with one path a prefix of the other
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3103-ls-tree-misc.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3103-ls-tree-misc/.git/
 expecting success of 3103.1 'setup': 
@@ -110358,140 +111428,6 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3100-ls-tree-restrict.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3100-ls-tree-restrict/.git/
-expecting success of 3100.1 'setup': mkdir path2 path2/baz &&
-     echo Hi >path0 &&
-     test_ln_s_add path0 path1 &&
-     test_ln_s_add ../path1 path2/bazbo &&
-     echo Lo >path2/foo &&
-     echo Mi >path2/baz/b &&
-     find path? \( -type f -o -type l \) -print |
-     xargs git update-index --add &&
-     tree=$(git write-tree) &&
-     echo $tree
-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
-a384d4f8dd786f29d6da4705dee4c2c0bc6b5049
-ok 1 - setup
-
-expecting success of 3100.2 'ls-tree plain': git ls-tree $tree >current &&
-     cat >expected <<\EOF &&
-100644 blob X	path0
-120000 blob X	path1
-040000 tree X	path2
-EOF
-     test_output
-ok 2 - ls-tree plain
-
-expecting success of 3100.3 'ls-tree recursive': git ls-tree -r $tree >current &&
-     cat >expected <<\EOF &&
-100644 blob X	path0
-120000 blob X	path1
-100644 blob X	path2/baz/b
-120000 blob X	path2/bazbo
-100644 blob X	path2/foo
-EOF
-     test_output
-ok 3 - ls-tree recursive
-
-expecting success of 3100.4 'ls-tree recursive with -t': git ls-tree -r -t $tree >current &&
-     cat >expected <<\EOF &&
-100644 blob X	path0
-120000 blob X	path1
-040000 tree X	path2
-040000 tree X	path2/baz
-100644 blob X	path2/baz/b
-120000 blob X	path2/bazbo
-100644 blob X	path2/foo
-EOF
-     test_output
-ok 4 - ls-tree recursive with -t
-
-expecting success of 3100.5 'ls-tree recursive with -d': git ls-tree -r -d $tree >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2
-040000 tree X	path2/baz
-EOF
-     test_output
-ok 5 - ls-tree recursive with -d
-
-expecting success of 3100.6 'ls-tree filtered with path': git ls-tree $tree path >current &&
-     cat >expected <<\EOF &&
-EOF
-     test_output
-ok 6 - ls-tree filtered with path
-
-expecting success of 3100.7 'ls-tree filtered with path1 path0': git ls-tree $tree path1 path0 >current &&
-     cat >expected <<\EOF &&
-100644 blob X	path0
-120000 blob X	path1
-EOF
-     test_output
-ok 7 - ls-tree filtered with path1 path0
-
-expecting success of 3100.8 'ls-tree filtered with path0/': git ls-tree $tree path0/ >current &&
-     cat >expected <<\EOF &&
-EOF
-     test_output
-ok 8 - ls-tree filtered with path0/
-
-expecting success of 3100.9 'ls-tree filtered with path2': git ls-tree $tree path2 >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2
-EOF
-     test_output
-ok 9 - ls-tree filtered with path2
-
-expecting success of 3100.10 'ls-tree filtered with path2/': git ls-tree $tree path2/ >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2/baz
-120000 blob X	path2/bazbo
-100644 blob X	path2/foo
-EOF
-     test_output
-ok 10 - ls-tree filtered with path2/
-
-expecting success of 3100.11 'ls-tree filtered with path2/baz': git ls-tree $tree path2/baz >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2/baz
-EOF
-     test_output
-ok 11 - ls-tree filtered with path2/baz
-
-expecting success of 3100.12 'ls-tree filtered with path2/bak': git ls-tree $tree path2/bak >current &&
-     cat >expected <<\EOF &&
-EOF
-     test_output
-ok 12 - ls-tree filtered with path2/bak
-
-expecting success of 3100.13 'ls-tree -t filtered with path2/bak': git ls-tree -t $tree path2/bak >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2
-EOF
-     test_output
-ok 13 - ls-tree -t filtered with path2/bak
-
-expecting success of 3100.14 'ls-tree with one path a prefix of the other': git ls-tree $tree path2/baz path2/bazbo >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2/baz
-120000 blob X	path2/bazbo
-EOF
-     test_output
-ok 14 - ls-tree with one path a prefix of the other
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3101-ls-tree-dirname.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3101-ls-tree-dirname/.git/
 expecting success of 3101.1 'setup': 
@@ -115277,8 +116213,8 @@
 submodule 'sub': creating branch 'branch-a'
 submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
 1482c8a60665a80ce91af3574f217e2a8d6df692
---- expected	2025-08-27 08:20:29.379463454 +0000
-+++ actual-old-branch-a	2025-08-27 08:20:29.451463928 +0000
+--- expected	2026-09-29 14:52:04.862548970 +0000
++++ actual-old-branch-a	2026-09-29 14:52:04.902548970 +0000
 @@ -1 +1 @@
 -89567a01eb47f31eb589180044475f970fcc3cd7
 +84481420899365bb989028fe603b7e7c6c9d2934
@@ -115672,878 +116608,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1701-racy-split-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1701-racy-split-index/.git/
-expecting success of 1701.1 'setup': 
-	# Only split the index when the test explicitly says so.
-	sane_unset GIT_TEST_SPLIT_INDEX &&
-	git config splitIndex.maxPercentChange 100 &&
-
-	echo "cached content" >racy-file &&
-	git add racy-file &&
-	git commit -m initial &&
-
-	echo something >other-file &&
-	# No raciness with this file.
-	test-tool chmtime =-20 other-file &&
-
-	echo "+cached content" >expect
-
-[master (root-commit) a4904a4] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 racy-file
-ok 1 - setup
-
-expecting success of 1701.2 'split the index while adding a racily clean file #0': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second (so both writes to racy-file result in the same
-		# mtime) to create the interesting racy situation.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 2 - split the index while adding a racily clean file #0
-
-expecting success of 1701.3 'split the index while adding a racily clean file #1': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second (so both writes to racy-file result in the same
-		# mtime) to create the interesting racy situation.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 3 - split the index while adding a racily clean file #1
-
-expecting success of 1701.4 'split the index while adding a racily clean file #2': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second (so both writes to racy-file result in the same
-		# mtime) to create the interesting racy situation.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 4 - split the index while adding a racily clean file #2
-
-expecting success of 1701.5 'split the index while adding a racily clean file #3': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second (so both writes to racy-file result in the same
-		# mtime) to create the interesting racy situation.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 5 - split the index while adding a racily clean file #3
-
-expecting success of 1701.6 'split the index while adding a racily clean file #4': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second (so both writes to racy-file result in the same
-		# mtime) to create the interesting racy situation.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 6 - split the index while adding a racily clean file #4
-
-expecting success of 1701.7 'add a racily clean file to an already split index #0': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 7 - add a racily clean file to an already split index #0
-
-expecting success of 1701.8 'add a racily clean file to an already split index #1': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 8 - add a racily clean file to an already split index #1
-
-expecting success of 1701.9 'add a racily clean file to an already split index #2': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 9 - add a racily clean file to an already split index #2
-
-expecting success of 1701.10 'add a racily clean file to an already split index #3': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 10 - add a racily clean file to an already split index #3
-
-expecting success of 1701.11 'add a racily clean file to an already split index #4': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 11 - add a racily clean file to an already split index #4
-
-expecting success of 1701.12 'split the index when the index contains a racily clean cache entry #0': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data in the replacement cache entry and that it
-		# doesnt match with the file the worktree.
-		check_cached_diff
-	
-ok 12 - split the index when the index contains a racily clean cache entry #0
-
-expecting success of 1701.13 'split the index when the index contains a racily clean cache entry #1': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data in the replacement cache entry and that it
-		# doesnt match with the file the worktree.
-		check_cached_diff
-	
-ok 13 - split the index when the index contains a racily clean cache entry #1
-
-expecting success of 1701.14 'split the index when the index contains a racily clean cache entry #2': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data in the replacement cache entry and that it
-		# doesnt match with the file the worktree.
-		check_cached_diff
-	
-ok 14 - split the index when the index contains a racily clean cache entry #2
-
-expecting success of 1701.15 'split the index when the index contains a racily clean cache entry #3': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data in the replacement cache entry and that it
-		# doesnt match with the file the worktree.
-		check_cached_diff
-	
-ok 15 - split the index when the index contains a racily clean cache entry #3
-
-expecting success of 1701.16 'split the index when the index contains a racily clean cache entry #4': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data in the replacement cache entry and that it
-		# doesnt match with the file the worktree.
-		check_cached_diff
-	
-ok 16 - split the index when the index contains a racily clean cache entry #4
-
-expecting success of 1701.17 'update the split index when it contains a new racily clean cache entry #0': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 17 - update the split index when it contains a new racily clean cache entry #0
-
-expecting success of 1701.18 'update the split index when it contains a new racily clean cache entry #1': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 18 - update the split index when it contains a new racily clean cache entry #1
-
-expecting success of 1701.19 'update the split index when it contains a new racily clean cache entry #2': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 19 - update the split index when it contains a new racily clean cache entry #2
-
-expecting success of 1701.20 'update the split index when it contains a new racily clean cache entry #3': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 20 - update the split index when it contains a new racily clean cache entry #3
-
-expecting success of 1701.21 'update the split index when it contains a new racily clean cache entry #4': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 21 - update the split index when it contains a new racily clean cache entry #4
-
-expecting success of 1701.22 'update the split index when a racily clean cache entry is stored only in the shared index #0': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the shared index.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 22 - update the split index when a racily clean cache entry is stored only in the shared index #0
-
-expecting success of 1701.23 'update the split index when a racily clean cache entry is stored only in the shared index #1': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the shared index.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 23 - update the split index when a racily clean cache entry is stored only in the shared index #1
-
-expecting success of 1701.24 'update the split index when a racily clean cache entry is stored only in the shared index #2': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the shared index.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 24 - update the split index when a racily clean cache entry is stored only in the shared index #2
-
-expecting success of 1701.25 'update the split index when a racily clean cache entry is stored only in the shared index #3': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the shared index.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 25 - update the split index when a racily clean cache entry is stored only in the shared index #3
-
-expecting success of 1701.26 'update the split index when a racily clean cache entry is stored only in the shared index #4': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the shared index.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 26 - update the split index when a racily clean cache entry is stored only in the shared index #4
-
-expecting success of 1701.27 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #0': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index after unpack_trees() copied the
-		# racily clean cache entry of racy-file from the shared
-		# index.  A corresponding replacement cache entry
-		# with smudged stat data should be added to the new
-		# split index.
-		git read-tree -m HEAD &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 27 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #0
-
-expecting success of 1701.28 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #1': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index after unpack_trees() copied the
-		# racily clean cache entry of racy-file from the shared
-		# index.  A corresponding replacement cache entry
-		# with smudged stat data should be added to the new
-		# split index.
-		git read-tree -m HEAD &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 28 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #1
-
-expecting success of 1701.29 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #2': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index after unpack_trees() copied the
-		# racily clean cache entry of racy-file from the shared
-		# index.  A corresponding replacement cache entry
-		# with smudged stat data should be added to the new
-		# split index.
-		git read-tree -m HEAD &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 29 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #2
-
-expecting success of 1701.30 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #3': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index after unpack_trees() copied the
-		# racily clean cache entry of racy-file from the shared
-		# index.  A corresponding replacement cache entry
-		# with smudged stat data should be added to the new
-		# split index.
-		git read-tree -m HEAD &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 30 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #3
-
-expecting success of 1701.31 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #4': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index after unpack_trees() copied the
-		# racily clean cache entry of racy-file from the shared
-		# index.  A corresponding replacement cache entry
-		# with smudged stat data should be added to the new
-		# split index.
-		git read-tree -m HEAD &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 31 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #4
-
-# passed all 31 test(s)
-1..31
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3308-notes-merge.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3308-notes-merge/.git/
 expecting success of 3308.1 'setup': 
@@ -116787,17 +116851,84 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3301-notes.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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>
@@ -116807,32 +116938,417 @@
  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.
+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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3301-notes.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+
+fatal: failed to resolve 'HEAD' as a valid ref.
+ok 1 - cannot annotate non-existing HEAD
+
+expecting success of 3301.2 'setup': 
+	test_commit 1st &&
+	test_commit 2nd
+
+[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 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
+
+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 3301.4 'refusing to add notes in refs/heads/': 
+	test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes add
+
+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 3301.5 'refusing to edit notes in refs/remotes/': 
+	test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes edit
+
+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 3301.6 'handle empty notes gracefully': 
+	test_expect_code 1 git notes show
+
+error: no note found for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691.
 ok 6 - handle empty notes gracefully
 
 expecting success of 3301.7 'show non-existent notes entry with %N': 
@@ -121760,458 +122276,6 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3309-notes-merge-auto-resolve.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3310-notes-merge-manual-resolve.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3310-notes-merge-manual-resolve/.git/
 expecting success of 3310.1 'setup commits': 
@@ -122657,404 +122721,6 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3401-rebase-and-am-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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...
-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...
-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.51.0/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...
-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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3321-notes-stripspace.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3321-notes-stripspace/.git/
 expecting success of 3321.1 'setup the commit': 
@@ -123731,1137 +123397,402 @@
 1..27
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3402-rebase-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3402-rebase-merge/.git/
-expecting success of 3402.1 'setup': 
-	git add original &&
-	git commit -m"initial" &&
-	git branch side &&
-	echo "11 $T" >>original &&
-	git commit -a -m"main updates a bit." &&
-
-	echo "12 $T" >>original &&
-	git commit -a -m"main updates a bit more." &&
+*** t3401-rebase-and-am-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
 
-	git checkout side &&
-	(echo "0 $T" && cat original) >renamed &&
-	git add renamed &&
-	git update-index --force-remove original &&
-	git commit -a -m"side renames and edits." &&
+		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" &&
 
-	tr "[a-z]" "[A-Z]" <original >newfile &&
-	git add newfile &&
-	git commit -a -m"side edits further." &&
-	git branch second-side &&
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-	tr "[a-m]" "[A-M]" <original >newfile &&
-	rm -f original &&
-	git commit -a -m"side edits once again." &&
+		git checkout A &&
+		git mv x y &&
+		git mv l letters &&
+		git commit -m "Rename x to y, l to letters" &&
 
-	git branch test-rebase side &&
-	git branch test-rebase-pick side &&
-	git branch test-reference-pick side &&
-	git branch test-conflicts side &&
-	git checkout -b test-merge side
+		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"
+	)
 
-[main (root-commit) ea140ad] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 20 insertions(+)
- create mode 100644 original
-[main 3fbedc5] main updates a bit.
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[main 9d5d029] main updates a bit more.
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'side'
-[side 2f3019a] side renames and edits.
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3401-rebase-and-am-rename/dir-rename/.git/
+[master (root-commit) 79c153a] Initial
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- rename original => renamed (90%)
-[side e99fe16] side edits further.
+ 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>
- 1 file changed, 20 insertions(+)
- create mode 100644 newfile
-[side 5203c39] side edits once again.
+ 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>
- 1 file changed, 20 insertions(+), 20 deletions(-)
-Switched to a new branch 'test-merge'
-ok 1 - setup
-
-expecting success of 3402.2 'reference merge': 
-	git merge -s recursive -m "reference merge" main
-
-Auto-merging renamed
-Merge made by the 'recursive' strategy.
- renamed | 4 ++++
- 1 file changed, 4 insertions(+)
-ok 2 - reference merge
+ 2 files changed, 11 insertions(+)
+ create mode 100644 x/d
+ok 1 - setup testcase where directory rename should be detected
 
-expecting success of 3402.3 'rebase': 
-	git checkout test-rebase &&
-	GIT_TRACE=1 git rebase --merge main
+expecting success of 3401.2 'rebase --interactive: directory rename detected': 
+	(
+		cd dir-rename &&
 
-Switched to branch 'test-rebase'
-trace: built-in: git rebase --merge main
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
trace: run_command: git notes copy --for-rewrite=rebase
-trace: start_command: /build/reproducible-path/git-2.51.0/git notes copy --for-rewrite=rebase
-trace: built-in: git notes copy --for-rewrite=rebase
-Successfully rebased and updated refs/heads/test-rebase.
-ok 3 - rebase
+		git checkout B^0 &&
 
-expecting success of 3402.4 'test-rebase@{1} is pre rebase': 
-	test $PRE_REBASE = $(git rev-parse test-rebase@{1})
+		set_fake_editor &&
+		FAKE_LINES="1" git -c merge.directoryRenames=true rebase --interactive A &&
 
-ok 4 - test-rebase@{1} is pre rebase
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
 
-expecting success of 3402.5 'merge and rebase should match': 
-	git diff-tree -r test-rebase test-merge >difference &&
-	if test -s difference
-	then
-		cat difference
-		false
-	else
-		echo happy
-	fi
+		test_path_is_file y/d &&
+		test_path_is_missing x/d
+	)
 
-happy
-ok 5 - merge and rebase should match
+Note: switching to 'B^0'.
 
-expecting success of 3402.6 'rebase the other way': 
-	git reset --hard main &&
-	git rebase --merge side
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 9d5d029 main updates a bit more.
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test-rebase.
-ok 6 - rebase the other way
+If you want to 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 3402.7 'rebase -Xtheirs': 
-	git checkout -b conflicting main~2 &&
-	echo "AB $T" >> original &&
-	git commit -mconflicting original &&
-	git rebase -Xtheirs main &&
-	grep AB original &&
-	! grep 11 original
+  git switch -c <new-branch-name>
 
-Switched to a new branch 'conflicting'
-[conflicting 0a8644e] conflicting
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Rebasing (1/1)
Successfully rebased and updated refs/heads/conflicting.
-AB A quick brown fox
-ok 7 - rebase -Xtheirs
+Or undo this operation with:
 
-expecting success of 3402.8 'rebase -Xtheirs from orphan': 
-	git checkout --orphan orphan-conflicting main~2 &&
-	echo "AB $T" >> original &&
-	git commit -morphan-conflicting original &&
-	git rebase -Xtheirs main &&
-	grep AB original &&
-	! grep 11 original
+  git switch -
 
-Switched to a new branch 'orphan-conflicting'
-[orphan-conflicting (root-commit) 9b6ca42] orphan-conflicting
- Author: A U Thor <author@example.com>
- 1 file changed, 22 insertions(+)
- create mode 100644 original
-Rebasing (1/1)
Successfully rebased and updated refs/heads/orphan-conflicting.
-AB A quick brown fox
-ok 8 - rebase -Xtheirs from orphan
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3402.9 'merge and rebase should match': 
-	git diff-tree -r test-rebase test-merge >difference &&
-	if test -s difference
-	then
-		cat difference
-		false
-	else
-		echo happy
-	fi
+HEAD is now at 6c5e67f Modify l, add x/d
+rebase -i script before editing:
+pick 6c5e67f # Modify l, add x/d
 
-happy
-ok 9 - merge and rebase should match
+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
 
-expecting success of 3402.10 'picking rebase': 
-	git reset --hard side &&
-	git rebase --merge --onto main side^^ &&
-	mb=$(git merge-base main HEAD) &&
-	if test "$mb" = "$(git rev-parse main)"
-	then
-		echo happy
-	else
-		git show-branch
-		false
-	fi &&
-	f=$(git diff-tree --name-only HEAD^ HEAD) &&
-	g=$(git diff-tree --name-only HEAD^^ HEAD^) &&
-	case "$f,$g" in
-	newfile,newfile)
-		echo happy ;;
-	*)
-		echo "$f"
-		echo "$g"
-		false
-	esac
+checking known breakage of 3401.3 'rebase --apply: directory rename detected': 
+	(
+		cd dir-rename &&
 
-HEAD is now at 5203c39 side edits once again.
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/orphan-conflicting.
-happy
-happy
-ok 10 - picking rebase
+		git checkout B^0 &&
 
-expecting success of 3402.11 'rebase --skip works with two conflicts in a row': 
-	git checkout second-side  &&
-	tr "[A-Z]" "[a-z]" <newfile >tmp &&
-	mv tmp newfile &&
-	git commit -a -m"edit conflicting with side" &&
-	tr "[d-f]" "[D-F]" <newfile >tmp &&
-	mv tmp newfile &&
-	git commit -a -m"another edit conflicting with side" &&
-	test_must_fail git rebase --merge test-conflicts &&
-	test_must_fail git rebase --skip &&
-	git rebase --skip
+		git -c merge.directoryRenames=true rebase --apply A &&
 
-Switched to branch 'second-side'
-[second-side 546296f] edit conflicting with side
- Author: A U Thor <author@example.com>
- 1 file changed, 20 insertions(+), 20 deletions(-)
-[second-side 896ca60] another edit conflicting with side
- Author: A U Thor <author@example.com>
- 1 file changed, 20 insertions(+), 20 deletions(-)
-Rebasing (1/2)
Auto-merging newfile
-CONFLICT (content): Merge conflict in newfile
-error: could not apply 546296f... edit conflicting with side
-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 546296f... # edit conflicting with side
-Rebasing (2/2)
Auto-merging newfile
-CONFLICT (content): Merge conflict in newfile
-error: could not apply 896ca60... another edit conflicting with side
-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 896ca60... # another edit conflicting with side
-Successfully rebased and updated refs/heads/second-side.
-ok 11 - rebase --skip works with two conflicts in a row
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
 
-expecting success of 3402.12 '--reapply-cherry-picks': 
-	git init repo &&
+		test_path_is_file y/d &&
+		test_path_is_missing x/d
+	)
 
-	# O(1-10) -- O(1-11) -- O(0-10) main
-	#        \
-	#         -- O(1-11) -- O(1-12) otherbranch
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	printf "Line %d\n" $(test_seq 1 10) >repo/file.txt &&
-	git -C repo add file.txt &&
-	git -C repo commit -m "base commit" &&
+  2e986bc Modify l, add x/d
 
-	printf "Line %d\n" $(test_seq 1 11) >repo/file.txt &&
-	git -C repo commit -a -m "add 11" &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	printf "Line %d\n" $(test_seq 0 10) >repo/file.txt &&
-	git -C repo commit -a -m "add 0 delete 11" &&
+ git branch <new-branch-name> 2e986bc
 
-	git -C repo checkout -b otherbranch HEAD^^ &&
-	printf "Line %d\n" $(test_seq 1 11) >repo/file.txt &&
-	git -C repo commit -a -m "add 11 in another branch" &&
+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...
+File y/d doesn't exist
+not ok 3 - rebase --apply: directory rename detected # TODO known breakage
 
-	printf "Line %d\n" $(test_seq 1 12) >repo/file.txt &&
-	git -C repo commit -a -m "add 12 in another branch" &&
+expecting success of 3401.4 'rebase --merge: directory rename detected': 
+	(
+		cd dir-rename &&
 
-	# Regular rebase fails, because the 1-11 commit is deduplicated
-	test_must_fail git -C repo rebase --merge main 2> err &&
-	test_grep "error: could not apply.*add 12 in another branch" err &&
-	git -C repo rebase --abort &&
+		git checkout B^0 &&
 
-	# With --reapply-cherry-picks, it works
-	git -C repo rebase --merge --reapply-cherry-picks main
+		git -c merge.directoryRenames=true rebase --merge A &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3402-rebase-merge/repo/.git/
-[main (root-commit) 501a156] base commit
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 file.txt
-[main c19c7b3] add 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 841ae2b] add 0 delete 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'otherbranch'
-[otherbranch a7517c6] add 11 in another branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[otherbranch e4b3c77] add 12 in another branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Auto-merging file.txt
-CONFLICT (content): Merge conflict in file.txt
-Rebasing (1/1)
error: could not apply e4b3c77... add 12 in another branch
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/otherbranch.
-ok 12 - --reapply-cherry-picks
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
 
-expecting success of 3402.13 '--reapply-cherry-picks refrains from reading unneeded blobs': 
-	git init server &&
+		test_path_is_file y/d &&
+		test_path_is_missing x/d
+	)
 
-	# O(1-10) -- O(1-11) -- O(1-12) main
-	#        \
-	#         -- O(0-10) otherbranch
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	printf "Line %d\n" $(test_seq 1 10) >server/file.txt &&
-	git -C server add file.txt &&
-	git -C server commit -m "merge base" &&
+  7f699cd Modify l, add x/d
 
-	printf "Line %d\n" $(test_seq 1 11) >server/file.txt &&
-	git -C server commit -a -m "add 11" &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	printf "Line %d\n" $(test_seq 1 12) >server/file.txt &&
-	git -C server commit -a -m "add 12" &&
+ git branch <new-branch-name> 7f699cd
 
-	git -C server checkout -b otherbranch HEAD^^ &&
-	printf "Line %d\n" $(test_seq 0 10) >server/file.txt &&
-	git -C server commit -a -m "add 0" &&
+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
 
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
+checking known breakage of 3401.5 'am: directory rename detected': 
+	(
+		cd dir-rename &&
 
-	git clone --filter=blob:none "file://$(pwd)/server" client &&
-	git -C client checkout origin/main &&
-	git -C client checkout origin/otherbranch &&
+		git checkout A^0 &&
 
-	# Sanity check to ensure that the blobs from the merge base and "add
-	# 11" are missing
-	git -C client rev-list --objects --all --missing=print >missing_list &&
-	MERGE_BASE_BLOB=$(git -C server rev-parse main^^:file.txt) &&
-	ADD_11_BLOB=$(git -C server rev-parse main^:file.txt) &&
-	grep "[?]$MERGE_BASE_BLOB" missing_list &&
-	grep "[?]$ADD_11_BLOB" missing_list &&
+		git format-patch -1 B &&
 
-	git -C client rebase --merge --reapply-cherry-picks origin/main &&
+		git -c merge.directoryRenames=true am --3way 0001*.patch &&
 
-	# The blob from the merge base had to be fetched, but not "add 11"
-	git -C client rev-list --objects --all --missing=print >missing_list &&
-	! grep "[?]$MERGE_BASE_BLOB" missing_list &&
-	grep "[?]$ADD_11_BLOB" missing_list
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3402-rebase-merge/server/.git/
-[main (root-commit) ded066b] merge base
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 file.txt
-[main c684029] add 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 161081c] add 12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'otherbranch'
-[otherbranch ffb36e9] add 0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Cloning into 'client'...
-Note: switching to 'origin/main'.
+		test_path_is_file y/d &&
+		test_path_is_missing x/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.
+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:
+  2e986bc Modify l, add x/d
 
-  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> 2e986bc
 
-  git switch -
+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...
+File y/d doesn't exist
+not ok 5 - am: directory rename detected # TODO known breakage
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3401.6 'setup testcase where directory rename should NOT be detected': 
+	test_create_repo no-dir-rename &&
+	(
+		cd no-dir-rename &&
 
-HEAD is now at 161081c add 12
-Previous HEAD position was 161081c add 12
-HEAD is now at ffb36e9 add 0
-?00935f183cbd9243998bd3f84ac67e18eff726a4
-?8bf8891e216480d36945027a1d30bdbba5c96d90
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-?8bf8891e216480d36945027a1d30bdbba5c96d90
-ok 13 - --reapply-cherry-picks refrains from reading unneeded blobs
+		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" &&
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3403-rebase-skip.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3403-rebase-skip/.git/
-expecting success of 3403.1 'setup': 
-	echo hello > hello &&
-	git add hello &&
-	git commit -m "hello" &&
-	git branch skip-reference &&
-	git tag hello &&
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-	echo world >> hello &&
-	git commit -a -m "hello world" &&
-	echo goodbye >> hello &&
-	git commit -a -m "goodbye" &&
-	git tag goodbye &&
+		git checkout A &&
+		echo v2 >project_info &&
+		git add project_info &&
+		git commit -m "Modify project_info" &&
 
-	git checkout --detach &&
-	git checkout HEAD^ . &&
-	test_tick &&
-	git commit -m reverted-goodbye &&
-	git tag reverted-goodbye &&
-	git checkout goodbye &&
-	test_tick &&
-	GIT_AUTHOR_NAME="Another Author" \
-		GIT_AUTHOR_EMAIL="another.author@example.com" \
-		git commit --amend --no-edit -m amended-goodbye \
-			--reset-author &&
-	test_tick &&
-	git tag amended-goodbye &&
+		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"
+	)
 
-	git checkout -f skip-reference &&
-	echo moo > hello &&
-	git commit -a -m "we should skip this" &&
-	echo moo > cow &&
-	git add cow &&
-	git commit -m "this should not be skipped" &&
-	git branch pre-rebase skip-reference &&
-	git branch skip-merge skip-reference
-	
-[main (root-commit) 7b3be24] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello
-[main 5a0b053] hello world
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 64bec18] goodbye
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-HEAD is now at 64bec18 goodbye
-Updated 1 path from f7e12fd
-[detached HEAD 1f15beb] reverted-goodbye
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3401-rebase-and-am-rename/no-dir-rename/.git/
+[master (root-commit) 229b7b2] Initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-Previous HEAD position was 1f15beb reverted-goodbye
-HEAD is now at 64bec18 goodbye
-[detached HEAD d66ccab] amended-goodbye
- Author: Another Author <another.author@example.com>
- 1 file changed, 1 insertion(+)
-Previous HEAD position was d66ccab amended-goodbye
-Switched to branch 'skip-reference'
-[skip-reference 847c4cd] we should skip this
+ 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(-)
-[skip-reference c443746] this should not be skipped
+Switched to branch 'B'
+[B 1f2a3f5] Rename x/c to y/c, modify project_info
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 cow
-ok 1 - setup
+ 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 3403.2 'rebase with git am -3 (default)': 
-	test_must_fail git rebase --apply main
+expecting success of 3401.7 'rebase --interactive: NO directory rename': 
+	test_when_finished "git -C no-dir-rename rebase --abort" &&
+	(
+		cd no-dir-rename &&
 
-First, rewinding head to replay your work on top of it...
-Applying: we should skip this
-Using index info to reconstruct a base tree...
-M	hello
-Falling back to patching base and 3-way merge...
-Auto-merging hello
-CONFLICT (content): Merge conflict in hello
-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 we should skip this
-ok 2 - rebase with git am -3 (default)
+		git checkout B^0 &&
 
-expecting success of 3403.3 'rebase --skip can not be used with other options': 
-	test_must_fail git rebase -v --skip &&
-	test_must_fail git rebase --skip -v
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1" git rebase --interactive A &&
 
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+		test_path_is_file x/a &&
+		test_path_is_file x/b &&
+		test_path_is_missing x/c
+	)
 
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+Note: switching to 'B^0'.
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present 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.
 
-ok 3 - rebase --skip can not be used with other options
+If you want to 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 3403.4 'rebase --skip with am -3': 
-	git rebase --skip
-	
-Applying: this should not be skipped
-ok 4 - rebase --skip with am -3
+  git switch -c <new-branch-name>
 
-expecting success of 3403.5 'rebase moves back to skip-reference': 
-	test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
-	git branch post-rebase &&
-	git reset --hard pre-rebase &&
-	test_must_fail git rebase main &&
-	echo "hello" > hello &&
-	git add hello &&
-	git rebase --continue &&
-	test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
-	git reset --hard post-rebase
+Or undo this operation with:
 
-HEAD is now at c443746 this should not be skipped
-Rebasing (1/2)
Auto-merging hello
-CONFLICT (content): Merge conflict in hello
-error: could not apply 847c4cd... we should skip this
-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 847c4cd... # we should skip this
-[detached HEAD 0283955] we should skip this
- Author: A U Thor <author@example.com>
- 1 file changed, 2 deletions(-)
-Rebasing (2/2)
Successfully rebased and updated refs/heads/skip-reference.
-HEAD is now at 86a691d this should not be skipped
-ok 5 - rebase moves back to skip-reference
+  git switch -
 
-expecting success of 3403.6 'checkout skip-merge': git checkout -f skip-merge
-Switched to branch 'skip-merge'
-ok 6 - checkout skip-merge
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3403.7 'rebase with --merge': 
-	test_must_fail git rebase --merge main
+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
 
-Rebasing (1/2)
Auto-merging hello
-CONFLICT (content): Merge conflict in hello
-error: could not apply 847c4cd... we should skip this
+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 847c4cd... # we should skip this
-ok 7 - rebase with --merge
-
-expecting success of 3403.8 'rebase --skip with --merge': 
-	git rebase --skip
-
-Rebasing (2/2)
Successfully rebased and updated refs/heads/skip-merge.
-ok 8 - rebase --skip with --merge
+Could not apply 1f2a3f5... # Rename x/c to y/c, modify project_info
+ok 7 - rebase --interactive: NO directory rename
 
-expecting success of 3403.9 'merge and reference trees equal': 
-	test -z "$(git diff-tree skip-merge skip-reference)"
+expecting success of 3401.8 'rebase (am): NO directory rename': 
+	test_when_finished "git -C no-dir-rename rebase --abort" &&
+	(
+		cd no-dir-rename &&
 
-ok 9 - merge and reference trees equal
+		git checkout B^0 &&
 
-expecting success of 3403.10 'moved back to branch correctly': 
-	test refs/heads/skip-merge = $(git symbolic-ref HEAD)
+		set_fake_editor &&
+		test_must_fail git rebase A &&
 
-ok 10 - moved back to branch correctly
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
 
-expecting success of 3403.11 'skipping final pick removes .git/MERGE_MSG': 
-	test_must_fail git rebase --onto hello reverted-goodbye^ \
-		reverted-goodbye &&
-	git rebase --skip &&
-	test_path_is_missing .git/MERGE_MSG
+		test_path_is_file x/a &&
+		test_path_is_file x/b &&
+		test_path_is_missing x/c
+	)
 
-Rebasing (1/1)
Auto-merging hello
-CONFLICT (content): Merge conflict in hello
-error: could not apply 1f15beb... reverted-goodbye
+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 1f15beb... # reverted-goodbye
-Successfully rebased and updated detached HEAD.
-ok 11 - skipping final pick removes .git/MERGE_MSG
-
-expecting success of 3403.12 'correct advice upon picking empty commit': 
-	test_when_finished "git rebase --abort" &&
-	test_must_fail git rebase -i --onto goodbye \
-		amended-goodbye^ amended-goodbye 2>err &&
-	test_grep "previous cherry-pick is now empty" err &&
-	test_grep "git rebase --skip" err &&
-	test_must_fail git commit &&
-	test_grep "git rebase --skip" err
-
-Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-Otherwise, please use 'git rebase --skip'
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
-
-    git commit --allow-empty
-
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 64bec18
-Last command done (1 command done):
-   pick d66ccab # amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
-
-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)
-Otherwise, please use 'git rebase --skip'
-ok 12 - correct advice upon picking empty commit
-
-expecting success of 3403.13 'correct authorship when committing empty pick': 
-	test_when_finished "git rebase --abort" &&
-	test_must_fail git rebase -i --onto goodbye \
-		amended-goodbye^ amended-goodbye &&
-	git commit --allow-empty &&
-	git log --pretty=format:"%an <%ae>%n%ad%B" -1 amended-goodbye >expect &&
-	git log --pretty=format:"%an <%ae>%n%ad%B" -1 HEAD >actual &&
-	test_cmp expect actual
-
-Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
-
-    git commit --allow-empty
-
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 64bec18
-Last command done (1 command done):
-   pick d66ccab # amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
-
-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)
-Could not apply d66ccab... # amended-goodbye
-[detached HEAD 046fc51] amended-goodbye
- Author: Another Author <another.author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
-ok 13 - correct authorship when committing empty pick
-
-expecting success of 3403.14 'correct advice upon rewording empty commit': 
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="reword 1" git rebase -i \
-			--onto goodbye amended-goodbye^ amended-goodbye 2>err
-	) &&
-	test_grep "previous cherry-pick is now empty" err &&
-	test_grep "git rebase --skip" err &&
-	test_must_fail git commit &&
-	test_grep "git rebase --skip" err
-
-rebase -i script before editing:
-pick d66ccab # amended-goodbye
-
-rebase -i script after editing:
-reword d66ccab # amended-goodbye
-Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-Otherwise, please use 'git rebase --skip'
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
-
-    git commit --allow-empty
-
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 64bec18
-Last command done (1 command done):
-   reword d66ccab # amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
-
-nothing added to commit but untracked files present (use "git add" to track)
-Otherwise, please use 'git rebase --skip'
-ok 14 - correct advice upon rewording empty commit
-
-expecting success of 3403.15 'correct advice upon editing empty commit': 
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="edit 1" git rebase -i \
-			--onto goodbye amended-goodbye^ amended-goodbye 2>err
-	) &&
-	test_grep "previous cherry-pick is now empty" err &&
-	test_grep "git rebase --skip" err &&
-	test_must_fail git commit &&
-	test_grep "git rebase --skip" err
-
-rebase -i script before editing:
-pick d66ccab # amended-goodbye
-
-rebase -i script after editing:
-edit d66ccab # amended-goodbye
-Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-Otherwise, please use 'git rebase --skip'
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
-
-    git commit --allow-empty
-
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 64bec18
-Last command done (1 command done):
-   edit d66ccab # amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
-
-nothing added to commit but untracked files present (use "git add" to track)
-Otherwise, please use 'git rebase --skip'
-ok 15 - correct advice upon editing empty commit
+Could not apply 1f2a3f5... # Rename x/c to y/c, modify project_info
+ok 8 - rebase (am): NO directory rename
 
-expecting success of 3403.16 'correct advice upon cherry-picking an empty commit during a rebase': 
-	test_when_finished "git rebase --abort" &&
+expecting success of 3401.9 'rebase --merge: NO directory rename': 
+	test_when_finished "git -C no-dir-rename rebase --abort" &&
 	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_amended-goodbye" \
-			git rebase -i goodbye^ goodbye 2>err
-	) &&
-	test_grep "previous cherry-pick is now empty" err &&
-	test_grep "git cherry-pick --skip" err &&
-	test_must_fail git commit 2>err &&
-	test_grep "git cherry-pick --skip" err
-
-rebase -i script before editing:
-pick 64bec18 # goodbye
-
-rebase -i script after editing:
-pick 64bec18 # goodbye
-exec git cherry-pick amended-goodbye
-interactive rebase in progress; onto 5a0b053
-Last commands done (2 commands done):
-   pick 64bec18 # goodbye
-   exec git cherry-pick amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
-
-nothing added to commit but untracked files present (use "git add" to track)
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-Otherwise, please use 'git cherry-pick --skip'
-interactive rebase in progress; onto 5a0b053
-Last commands done (2 commands done):
-   pick 64bec18 # goodbye
-   exec git cherry-pick amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
+		cd no-dir-rename &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-Otherwise, please use 'git cherry-pick --skip'
-ok 16 - correct advice upon cherry-picking an empty commit during a rebase
+		git checkout B^0 &&
 
-expecting success of 3403.17 'correct advice upon multi cherry-pick picking an empty commit during a rebase': 
-	test_when_finished "git rebase --abort" &&
-	(
 		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_goodbye_amended-goodbye" \
-			git rebase -i goodbye^^ goodbye 2>err
-	) &&
-	test_grep "previous cherry-pick is now empty" err &&
-	test_grep "git cherry-pick --skip" err &&
-	test_must_fail git commit 2>err &&
-	test_grep "git cherry-pick --skip" err
-
-rebase -i script before editing:
-pick 5a0b053 # hello world
-pick 64bec18 # goodbye
-
-rebase -i script after editing:
-pick 5a0b053 # hello world
-exec git cherry-pick goodbye amended-goodbye
-[detached HEAD 67e8618] goodbye
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-interactive rebase in progress; onto 7b3be24
-Last commands done (2 commands done):
-   pick 5a0b053 # hello world
-   exec git cherry-pick goodbye amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
-
-nothing added to commit but untracked files present (use "git add" to track)
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-Otherwise, please use 'git cherry-pick --skip'
-interactive rebase in progress; onto 7b3be24
-Last commands done (2 commands done):
-   pick 5a0b053 # hello world
-   exec git cherry-pick goodbye amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
+		test_must_fail git rebase --merge A &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-Otherwise, please use 'git cherry-pick --skip'
-ok 17 - correct advice upon multi cherry-pick picking an empty commit during a rebase
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
 
-expecting success of 3403.18 'fixup that empties commit fails': 
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 fixup 2" git rebase -i \
-			goodbye^ reverted-goodbye
+		test_path_is_file x/a &&
+		test_path_is_file x/b &&
+		test_path_is_missing x/c
 	)
 
-rebase -i script before editing:
-pick 64bec18 # goodbye
-pick 1f15beb # reverted-goodbye
-
-rebase -i script after editing:
-pick 64bec18 # goodbye
-fixup 1f15beb # reverted-goodbye
-Rebasing (2/2)
You asked to amend the most recent commit, but doing so would make
-it empty. You can repeat your command with --allow-empty, or you can
-remove the commit entirely with "git reset HEAD^".
-interactive rebase in progress; onto 5a0b053
-Last commands done (2 commands done):
-   pick 64bec18 # goodbye
-   fixup 1f15beb # reverted-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
-
-No changes
-Could not apply 1f15beb... # reverted-goodbye
-ok 18 - fixup that empties commit fails
+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 3403.19 'squash that empties commit fails': 
-	test_when_finished "git rebase --abort" &&
+expecting success of 3401.10 'am: NO directory rename': 
+	test_when_finished "git -C no-dir-rename am --abort" &&
 	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 squash 2" git rebase -i \
-			goodbye^ reverted-goodbye
-	)
-
-rebase -i script before editing:
-pick 64bec18 # goodbye
-pick 1f15beb # reverted-goodbye
-
-rebase -i script after editing:
-pick 64bec18 # goodbye
-squash 1f15beb # reverted-goodbye
-Rebasing (2/2)
You asked to amend the most recent commit, but doing so would make
-it empty. You can repeat your command with --allow-empty, or you can
-remove the commit entirely with "git reset HEAD^".
-interactive rebase in progress; onto 5a0b053
-Last commands done (2 commands done):
-   pick 64bec18 # goodbye
-   squash 1f15beb # reverted-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
-
-No changes
-Could not apply 1f15beb... # reverted-goodbye
-ok 19 - squash that empties commit fails
-
-expecting success of 3403.20 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
-
-ok 20 - $EDITOR and friends are unchanged
-
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3405-rebase-malformed.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3405-rebase-malformed/.git/
-expecting success of 3405.1 'setup': 
-
-	>file1 &&
-	>file2 &&
-	git add file1 file2 &&
-	test_tick &&
-	git commit -m "Initial commit" &&
-	git branch diff-in-message &&
-	git branch empty-message-merge &&
-
-	git checkout -b multi-line-subject &&
-	cat F >file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -F F &&
-
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >F0 &&
-
-	git checkout diff-in-message &&
-	echo "commit log message containing a diff" >G &&
-	echo "" >>G &&
-	cat G >file2 &&
-	git add file2 &&
-	git diff --cached >>G &&
-	test_tick &&
-	git commit -F G &&
-
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >G0 &&
-
-	git checkout empty-message-merge &&
-	echo file3 >file3 &&
-	git add file3 &&
-	git commit --allow-empty-message -m "" &&
-
-	git checkout main &&
-
-	echo One >file1 &&
-	test_tick &&
-	git add file1 &&
-	git commit -m "Second commit"
-
-[main (root-commit) a8d727e] Initial commit
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'multi-line-subject'
-[multi-line-subject 5037af6] This is an example of a commit log message that does not  conform to git commit convention.
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
-Switched to branch 'diff-in-message'
-[diff-in-message 132c17c] commit log message containing a diff
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'empty-message-merge'
-[empty-message-merge 942c0ff] 
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Switched to branch 'main'
-[main d5181bc] Second commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 3405.2 'rebase commit with multi-line subject': 
-
-	git rebase main multi-line-subject &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >F1 &&
-
-	test_cmp F0 F1 &&
-	test_cmp F F0
-
-Rebasing (1/1)
Successfully rebased and updated refs/heads/multi-line-subject.
-ok 2 - rebase commit with multi-line subject
-
-expecting success of 3405.3 'rebase commit with diff in message': 
-	git rebase main diff-in-message &&
-	git cat-file commit HEAD | sed -e "1,/^$/d" >G1 &&
-	test_cmp G0 G1 &&
-	test_cmp G G0
-
-Rebasing (1/1)
Successfully rebased and updated refs/heads/diff-in-message.
-ok 3 - rebase commit with diff in message
-
-expecting success of 3405.4 'rebase -m commit with empty message': 
-	git rebase -m main empty-message-merge
-
-Rebasing (1/1)
Successfully rebased and updated refs/heads/empty-message-merge.
-ok 4 - rebase -m commit with empty message
+		cd no-dir-rename &&
 
-expecting success of 3405.5 'rebase -i commit with empty message': 
-	git checkout diff-in-message &&
-	set_fake_editor &&
-	test_must_fail env FAKE_COMMIT_MESSAGE=" " FAKE_LINES="reword 1" \
-		git rebase -i HEAD^
+		git checkout A^0 &&
 
-Switched to branch 'diff-in-message'
-rebase -i script before editing:
-pick 87b000b # commit log message containing a diff
+		git format-patch -1 B &&
 
-rebase -i script after editing:
-reword 87b000b # commit log message containing a diff
-Rebasing (1/1)
Aborting commit due to empty commit message.
-You can amend the commit now, with
+		test_must_fail git am --3way 0001*.patch &&
 
-  git commit --amend 
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
 
-Once you are satisfied with your changes, run
+		test_path_is_file x/a &&
+		test_path_is_file x/b &&
+		test_path_is_missing x/c
+	)
 
-  git rebase --continue
-ok 5 - rebase -i commit with empty message
+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...
+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
 
-# passed all 5 test(s)
-1..5
+# still have 2 known breakage(s)
+# passed all remaining 8 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2013-checkout-submodule.sh ***
@@ -126865,6 +125796,1020 @@
 1..74
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3402-rebase-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3402-rebase-merge/.git/
+expecting success of 3402.1 'setup': 
+	git add original &&
+	git commit -m"initial" &&
+	git branch side &&
+	echo "11 $T" >>original &&
+	git commit -a -m"main updates a bit." &&
+
+	echo "12 $T" >>original &&
+	git commit -a -m"main updates a bit more." &&
+
+	git checkout side &&
+	(echo "0 $T" && cat original) >renamed &&
+	git add renamed &&
+	git update-index --force-remove original &&
+	git commit -a -m"side renames and edits." &&
+
+	tr "[a-z]" "[A-Z]" <original >newfile &&
+	git add newfile &&
+	git commit -a -m"side edits further." &&
+	git branch second-side &&
+
+	tr "[a-m]" "[A-M]" <original >newfile &&
+	rm -f original &&
+	git commit -a -m"side edits once again." &&
+
+	git branch test-rebase side &&
+	git branch test-rebase-pick side &&
+	git branch test-reference-pick side &&
+	git branch test-conflicts side &&
+	git checkout -b test-merge side
+
+[main (root-commit) ea140ad] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 20 insertions(+)
+ create mode 100644 original
+[main 3fbedc5] main updates a bit.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[main 9d5d029] main updates a bit more.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'side'
+[side 2f3019a] side renames and edits.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename original => renamed (90%)
+[side e99fe16] side edits further.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 20 insertions(+)
+ create mode 100644 newfile
+[side 5203c39] side edits once again.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+Switched to a new branch 'test-merge'
+ok 1 - setup
+
+expecting success of 3402.2 'reference merge': 
+	git merge -s recursive -m "reference merge" main
+
+Auto-merging renamed
+Merge made by the 'recursive' strategy.
+ renamed | 4 ++++
+ 1 file changed, 4 insertions(+)
+ok 2 - reference merge
+
+expecting success of 3402.3 'rebase': 
+	git checkout test-rebase &&
+	GIT_TRACE=1 git rebase --merge main
+
+Switched to branch 'test-rebase'
+trace: built-in: git rebase --merge main
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
trace: run_command: git notes copy --for-rewrite=rebase
+trace: start_command: /build/reproducible-path/git-2.51.0/git notes copy --for-rewrite=rebase
+trace: built-in: git notes copy --for-rewrite=rebase
+Successfully rebased and updated refs/heads/test-rebase.
+ok 3 - rebase
+
+expecting success of 3402.4 'test-rebase@{1} is pre rebase': 
+	test $PRE_REBASE = $(git rev-parse test-rebase@{1})
+
+ok 4 - test-rebase@{1} is pre rebase
+
+expecting success of 3402.5 'merge and rebase should match': 
+	git diff-tree -r test-rebase test-merge >difference &&
+	if test -s difference
+	then
+		cat difference
+		false
+	else
+		echo happy
+	fi
+
+happy
+ok 5 - merge and rebase should match
+
+expecting success of 3402.6 'rebase the other way': 
+	git reset --hard main &&
+	git rebase --merge side
+
+HEAD is now at 9d5d029 main updates a bit more.
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test-rebase.
+ok 6 - rebase the other way
+
+expecting success of 3402.7 'rebase -Xtheirs': 
+	git checkout -b conflicting main~2 &&
+	echo "AB $T" >> original &&
+	git commit -mconflicting original &&
+	git rebase -Xtheirs main &&
+	grep AB original &&
+	! grep 11 original
+
+Switched to a new branch 'conflicting'
+[conflicting 0a8644e] conflicting
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Rebasing (1/1)
Successfully rebased and updated refs/heads/conflicting.
+AB A quick brown fox
+ok 7 - rebase -Xtheirs
+
+expecting success of 3402.8 'rebase -Xtheirs from orphan': 
+	git checkout --orphan orphan-conflicting main~2 &&
+	echo "AB $T" >> original &&
+	git commit -morphan-conflicting original &&
+	git rebase -Xtheirs main &&
+	grep AB original &&
+	! grep 11 original
+
+Switched to a new branch 'orphan-conflicting'
+[orphan-conflicting (root-commit) 9b6ca42] orphan-conflicting
+ Author: A U Thor <author@example.com>
+ 1 file changed, 22 insertions(+)
+ create mode 100644 original
+Rebasing (1/1)
Successfully rebased and updated refs/heads/orphan-conflicting.
+AB A quick brown fox
+ok 8 - rebase -Xtheirs from orphan
+
+expecting success of 3402.9 'merge and rebase should match': 
+	git diff-tree -r test-rebase test-merge >difference &&
+	if test -s difference
+	then
+		cat difference
+		false
+	else
+		echo happy
+	fi
+
+happy
+ok 9 - merge and rebase should match
+
+expecting success of 3402.10 'picking rebase': 
+	git reset --hard side &&
+	git rebase --merge --onto main side^^ &&
+	mb=$(git merge-base main HEAD) &&
+	if test "$mb" = "$(git rev-parse main)"
+	then
+		echo happy
+	else
+		git show-branch
+		false
+	fi &&
+	f=$(git diff-tree --name-only HEAD^ HEAD) &&
+	g=$(git diff-tree --name-only HEAD^^ HEAD^) &&
+	case "$f,$g" in
+	newfile,newfile)
+		echo happy ;;
+	*)
+		echo "$f"
+		echo "$g"
+		false
+	esac
+
+HEAD is now at 5203c39 side edits once again.
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/orphan-conflicting.
+happy
+happy
+ok 10 - picking rebase
+
+expecting success of 3402.11 'rebase --skip works with two conflicts in a row': 
+	git checkout second-side  &&
+	tr "[A-Z]" "[a-z]" <newfile >tmp &&
+	mv tmp newfile &&
+	git commit -a -m"edit conflicting with side" &&
+	tr "[d-f]" "[D-F]" <newfile >tmp &&
+	mv tmp newfile &&
+	git commit -a -m"another edit conflicting with side" &&
+	test_must_fail git rebase --merge test-conflicts &&
+	test_must_fail git rebase --skip &&
+	git rebase --skip
+
+Switched to branch 'second-side'
+[second-side 546296f] edit conflicting with side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+[second-side 896ca60] another edit conflicting with side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+Rebasing (1/2)
Auto-merging newfile
+CONFLICT (content): Merge conflict in newfile
+error: could not apply 546296f... edit conflicting with side
+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 546296f... # edit conflicting with side
+Rebasing (2/2)
Auto-merging newfile
+CONFLICT (content): Merge conflict in newfile
+error: could not apply 896ca60... another edit conflicting with side
+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 896ca60... # another edit conflicting with side
+Successfully rebased and updated refs/heads/second-side.
+ok 11 - rebase --skip works with two conflicts in a row
+
+expecting success of 3402.12 '--reapply-cherry-picks': 
+	git init repo &&
+
+	# O(1-10) -- O(1-11) -- O(0-10) main
+	#        \
+	#         -- O(1-11) -- O(1-12) otherbranch
+
+	printf "Line %d\n" $(test_seq 1 10) >repo/file.txt &&
+	git -C repo add file.txt &&
+	git -C repo commit -m "base commit" &&
+
+	printf "Line %d\n" $(test_seq 1 11) >repo/file.txt &&
+	git -C repo commit -a -m "add 11" &&
+
+	printf "Line %d\n" $(test_seq 0 10) >repo/file.txt &&
+	git -C repo commit -a -m "add 0 delete 11" &&
+
+	git -C repo checkout -b otherbranch HEAD^^ &&
+	printf "Line %d\n" $(test_seq 1 11) >repo/file.txt &&
+	git -C repo commit -a -m "add 11 in another branch" &&
+
+	printf "Line %d\n" $(test_seq 1 12) >repo/file.txt &&
+	git -C repo commit -a -m "add 12 in another branch" &&
+
+	# Regular rebase fails, because the 1-11 commit is deduplicated
+	test_must_fail git -C repo rebase --merge main 2> err &&
+	test_grep "error: could not apply.*add 12 in another branch" err &&
+	git -C repo rebase --abort &&
+
+	# With --reapply-cherry-picks, it works
+	git -C repo rebase --merge --reapply-cherry-picks main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3402-rebase-merge/repo/.git/
+[main (root-commit) 501a156] base commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 file.txt
+[main c19c7b3] add 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 841ae2b] add 0 delete 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'otherbranch'
+[otherbranch a7517c6] add 11 in another branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[otherbranch e4b3c77] add 12 in another branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Auto-merging file.txt
+CONFLICT (content): Merge conflict in file.txt
+Rebasing (1/1)
error: could not apply e4b3c77... add 12 in another branch
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/otherbranch.
+ok 12 - --reapply-cherry-picks
+
+expecting success of 3402.13 '--reapply-cherry-picks refrains from reading unneeded blobs': 
+	git init server &&
+
+	# O(1-10) -- O(1-11) -- O(1-12) main
+	#        \
+	#         -- O(0-10) otherbranch
+
+	printf "Line %d\n" $(test_seq 1 10) >server/file.txt &&
+	git -C server add file.txt &&
+	git -C server commit -m "merge base" &&
+
+	printf "Line %d\n" $(test_seq 1 11) >server/file.txt &&
+	git -C server commit -a -m "add 11" &&
+
+	printf "Line %d\n" $(test_seq 1 12) >server/file.txt &&
+	git -C server commit -a -m "add 12" &&
+
+	git -C server checkout -b otherbranch HEAD^^ &&
+	printf "Line %d\n" $(test_seq 0 10) >server/file.txt &&
+	git -C server commit -a -m "add 0" &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	git -C client checkout origin/main &&
+	git -C client checkout origin/otherbranch &&
+
+	# Sanity check to ensure that the blobs from the merge base and "add
+	# 11" are missing
+	git -C client rev-list --objects --all --missing=print >missing_list &&
+	MERGE_BASE_BLOB=$(git -C server rev-parse main^^:file.txt) &&
+	ADD_11_BLOB=$(git -C server rev-parse main^:file.txt) &&
+	grep "[?]$MERGE_BASE_BLOB" missing_list &&
+	grep "[?]$ADD_11_BLOB" missing_list &&
+
+	git -C client rebase --merge --reapply-cherry-picks origin/main &&
+
+	# The blob from the merge base had to be fetched, but not "add 11"
+	git -C client rev-list --objects --all --missing=print >missing_list &&
+	! grep "[?]$MERGE_BASE_BLOB" missing_list &&
+	grep "[?]$ADD_11_BLOB" missing_list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3402-rebase-merge/server/.git/
+[main (root-commit) ded066b] merge base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 file.txt
+[main c684029] add 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 161081c] add 12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'otherbranch'
+[otherbranch ffb36e9] add 0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Cloning into 'client'...
+Note: switching to 'origin/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 161081c add 12
+Previous HEAD position was 161081c add 12
+HEAD is now at ffb36e9 add 0
+?00935f183cbd9243998bd3f84ac67e18eff726a4
+?8bf8891e216480d36945027a1d30bdbba5c96d90
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+?8bf8891e216480d36945027a1d30bdbba5c96d90
+ok 13 - --reapply-cherry-picks refrains from reading unneeded blobs
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3403-rebase-skip.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3403-rebase-skip/.git/
+expecting success of 3403.1 'setup': 
+	echo hello > hello &&
+	git add hello &&
+	git commit -m "hello" &&
+	git branch skip-reference &&
+	git tag hello &&
+
+	echo world >> hello &&
+	git commit -a -m "hello world" &&
+	echo goodbye >> hello &&
+	git commit -a -m "goodbye" &&
+	git tag goodbye &&
+
+	git checkout --detach &&
+	git checkout HEAD^ . &&
+	test_tick &&
+	git commit -m reverted-goodbye &&
+	git tag reverted-goodbye &&
+	git checkout goodbye &&
+	test_tick &&
+	GIT_AUTHOR_NAME="Another Author" \
+		GIT_AUTHOR_EMAIL="another.author@example.com" \
+		git commit --amend --no-edit -m amended-goodbye \
+			--reset-author &&
+	test_tick &&
+	git tag amended-goodbye &&
+
+	git checkout -f skip-reference &&
+	echo moo > hello &&
+	git commit -a -m "we should skip this" &&
+	echo moo > cow &&
+	git add cow &&
+	git commit -m "this should not be skipped" &&
+	git branch pre-rebase skip-reference &&
+	git branch skip-merge skip-reference
+	
+[main (root-commit) 7b3be24] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello
+[main 5a0b053] hello world
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 64bec18] goodbye
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+HEAD is now at 64bec18 goodbye
+Updated 1 path from f7e12fd
+[detached HEAD 1f15beb] reverted-goodbye
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+Previous HEAD position was 1f15beb reverted-goodbye
+HEAD is now at 64bec18 goodbye
+[detached HEAD d66ccab] amended-goodbye
+ Author: Another Author <another.author@example.com>
+ 1 file changed, 1 insertion(+)
+Previous HEAD position was d66ccab amended-goodbye
+Switched to branch 'skip-reference'
+[skip-reference 847c4cd] we should skip this
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[skip-reference c443746] this should not be skipped
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cow
+ok 1 - setup
+
+expecting success of 3403.2 'rebase with git am -3 (default)': 
+	test_must_fail git rebase --apply main
+
+First, rewinding head to replay your work on top of it...
+Applying: we should skip this
+Using index info to reconstruct a base tree...
+M	hello
+Falling back to patching base and 3-way merge...
+Auto-merging hello
+CONFLICT (content): Merge conflict in hello
+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 we should skip this
+ok 2 - rebase with git am -3 (default)
+
+expecting success of 3403.3 'rebase --skip can not be used with other options': 
+	test_must_fail git rebase -v --skip &&
+	test_must_fail git rebase --skip -v
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+ok 3 - rebase --skip can not be used with other options
+
+expecting success of 3403.4 'rebase --skip with am -3': 
+	git rebase --skip
+	
+Applying: this should not be skipped
+ok 4 - rebase --skip with am -3
+
+expecting success of 3403.5 'rebase moves back to skip-reference': 
+	test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
+	git branch post-rebase &&
+	git reset --hard pre-rebase &&
+	test_must_fail git rebase main &&
+	echo "hello" > hello &&
+	git add hello &&
+	git rebase --continue &&
+	test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
+	git reset --hard post-rebase
+
+HEAD is now at c443746 this should not be skipped
+Rebasing (1/2)
Auto-merging hello
+CONFLICT (content): Merge conflict in hello
+error: could not apply 847c4cd... we should skip this
+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 847c4cd... # we should skip this
+[detached HEAD 0283955] we should skip this
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 deletions(-)
+Rebasing (2/2)
Successfully rebased and updated refs/heads/skip-reference.
+HEAD is now at 86a691d this should not be skipped
+ok 5 - rebase moves back to skip-reference
+
+expecting success of 3403.6 'checkout skip-merge': git checkout -f skip-merge
+Switched to branch 'skip-merge'
+ok 6 - checkout skip-merge
+
+expecting success of 3403.7 'rebase with --merge': 
+	test_must_fail git rebase --merge main
+
+Rebasing (1/2)
Auto-merging hello
+CONFLICT (content): Merge conflict in hello
+error: could not apply 847c4cd... we should skip this
+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 847c4cd... # we should skip this
+ok 7 - rebase with --merge
+
+expecting success of 3403.8 'rebase --skip with --merge': 
+	git rebase --skip
+
+Rebasing (2/2)
Successfully rebased and updated refs/heads/skip-merge.
+ok 8 - rebase --skip with --merge
+
+expecting success of 3403.9 'merge and reference trees equal': 
+	test -z "$(git diff-tree skip-merge skip-reference)"
+
+ok 9 - merge and reference trees equal
+
+expecting success of 3403.10 'moved back to branch correctly': 
+	test refs/heads/skip-merge = $(git symbolic-ref HEAD)
+
+ok 10 - moved back to branch correctly
+
+expecting success of 3403.11 'skipping final pick removes .git/MERGE_MSG': 
+	test_must_fail git rebase --onto hello reverted-goodbye^ \
+		reverted-goodbye &&
+	git rebase --skip &&
+	test_path_is_missing .git/MERGE_MSG
+
+Rebasing (1/1)
Auto-merging hello
+CONFLICT (content): Merge conflict in hello
+error: could not apply 1f15beb... reverted-goodbye
+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 1f15beb... # reverted-goodbye
+Successfully rebased and updated detached HEAD.
+ok 11 - skipping final pick removes .git/MERGE_MSG
+
+expecting success of 3403.12 'correct advice upon picking empty commit': 
+	test_when_finished "git rebase --abort" &&
+	test_must_fail git rebase -i --onto goodbye \
+		amended-goodbye^ amended-goodbye 2>err &&
+	test_grep "previous cherry-pick is now empty" err &&
+	test_grep "git rebase --skip" err &&
+	test_must_fail git commit &&
+	test_grep "git rebase --skip" err
+
+Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+Otherwise, please use 'git rebase --skip'
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
+
+    git commit --allow-empty
+
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 64bec18
+Last command done (1 command done):
+   pick d66ccab # amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+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)
+Otherwise, please use 'git rebase --skip'
+ok 12 - correct advice upon picking empty commit
+
+expecting success of 3403.13 'correct authorship when committing empty pick': 
+	test_when_finished "git rebase --abort" &&
+	test_must_fail git rebase -i --onto goodbye \
+		amended-goodbye^ amended-goodbye &&
+	git commit --allow-empty &&
+	git log --pretty=format:"%an <%ae>%n%ad%B" -1 amended-goodbye >expect &&
+	git log --pretty=format:"%an <%ae>%n%ad%B" -1 HEAD >actual &&
+	test_cmp expect actual
+
+Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
+
+    git commit --allow-empty
+
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 64bec18
+Last command done (1 command done):
+   pick d66ccab # amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+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)
+Could not apply d66ccab... # amended-goodbye
+[detached HEAD 046fc51] amended-goodbye
+ Author: Another Author <another.author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ok 13 - correct authorship when committing empty pick
+
+expecting success of 3403.14 'correct advice upon rewording empty commit': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="reword 1" git rebase -i \
+			--onto goodbye amended-goodbye^ amended-goodbye 2>err
+	) &&
+	test_grep "previous cherry-pick is now empty" err &&
+	test_grep "git rebase --skip" err &&
+	test_must_fail git commit &&
+	test_grep "git rebase --skip" err
+
+rebase -i script before editing:
+pick d66ccab # amended-goodbye
+
+rebase -i script after editing:
+reword d66ccab # amended-goodbye
+Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+Otherwise, please use 'git rebase --skip'
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
+
+    git commit --allow-empty
+
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 64bec18
+Last command done (1 command done):
+   reword d66ccab # amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+nothing added to commit but untracked files present (use "git add" to track)
+Otherwise, please use 'git rebase --skip'
+ok 14 - correct advice upon rewording empty commit
+
+expecting success of 3403.15 'correct advice upon editing empty commit': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="edit 1" git rebase -i \
+			--onto goodbye amended-goodbye^ amended-goodbye 2>err
+	) &&
+	test_grep "previous cherry-pick is now empty" err &&
+	test_grep "git rebase --skip" err &&
+	test_must_fail git commit &&
+	test_grep "git rebase --skip" err
+
+rebase -i script before editing:
+pick d66ccab # amended-goodbye
+
+rebase -i script after editing:
+edit d66ccab # amended-goodbye
+Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+Otherwise, please use 'git rebase --skip'
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
+
+    git commit --allow-empty
+
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 64bec18
+Last command done (1 command done):
+   edit d66ccab # amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+nothing added to commit but untracked files present (use "git add" to track)
+Otherwise, please use 'git rebase --skip'
+ok 15 - correct advice upon editing empty commit
+
+expecting success of 3403.16 'correct advice upon cherry-picking an empty commit during a rebase': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_amended-goodbye" \
+			git rebase -i goodbye^ goodbye 2>err
+	) &&
+	test_grep "previous cherry-pick is now empty" err &&
+	test_grep "git cherry-pick --skip" err &&
+	test_must_fail git commit 2>err &&
+	test_grep "git cherry-pick --skip" err
+
+rebase -i script before editing:
+pick 64bec18 # goodbye
+
+rebase -i script after editing:
+pick 64bec18 # goodbye
+exec git cherry-pick amended-goodbye
+interactive rebase in progress; onto 5a0b053
+Last commands done (2 commands done):
+   pick 64bec18 # goodbye
+   exec git cherry-pick amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+nothing added to commit but untracked files present (use "git add" to track)
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+Otherwise, please use 'git cherry-pick --skip'
+interactive rebase in progress; onto 5a0b053
+Last commands done (2 commands done):
+   pick 64bec18 # goodbye
+   exec git cherry-pick amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+nothing added to commit but untracked files present (use "git add" to track)
+Otherwise, please use 'git cherry-pick --skip'
+ok 16 - correct advice upon cherry-picking an empty commit during a rebase
+
+expecting success of 3403.17 'correct advice upon multi cherry-pick picking an empty commit during a rebase': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_goodbye_amended-goodbye" \
+			git rebase -i goodbye^^ goodbye 2>err
+	) &&
+	test_grep "previous cherry-pick is now empty" err &&
+	test_grep "git cherry-pick --skip" err &&
+	test_must_fail git commit 2>err &&
+	test_grep "git cherry-pick --skip" err
+
+rebase -i script before editing:
+pick 5a0b053 # hello world
+pick 64bec18 # goodbye
+
+rebase -i script after editing:
+pick 5a0b053 # hello world
+exec git cherry-pick goodbye amended-goodbye
+[detached HEAD 67e8618] goodbye
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+interactive rebase in progress; onto 7b3be24
+Last commands done (2 commands done):
+   pick 5a0b053 # hello world
+   exec git cherry-pick goodbye amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+nothing added to commit but untracked files present (use "git add" to track)
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+Otherwise, please use 'git cherry-pick --skip'
+interactive rebase in progress; onto 7b3be24
+Last commands done (2 commands done):
+   pick 5a0b053 # hello world
+   exec git cherry-pick goodbye amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+nothing added to commit but untracked files present (use "git add" to track)
+Otherwise, please use 'git cherry-pick --skip'
+ok 17 - correct advice upon multi cherry-pick picking an empty commit during a rebase
+
+expecting success of 3403.18 'fixup that empties commit fails': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 fixup 2" git rebase -i \
+			goodbye^ reverted-goodbye
+	)
+
+rebase -i script before editing:
+pick 64bec18 # goodbye
+pick 1f15beb # reverted-goodbye
+
+rebase -i script after editing:
+pick 64bec18 # goodbye
+fixup 1f15beb # reverted-goodbye
+Rebasing (2/2)
You asked to amend the most recent commit, but doing so would make
+it empty. You can repeat your command with --allow-empty, or you can
+remove the commit entirely with "git reset HEAD^".
+interactive rebase in progress; onto 5a0b053
+Last commands done (2 commands done):
+   pick 64bec18 # goodbye
+   fixup 1f15beb # reverted-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+No changes
+Could not apply 1f15beb... # reverted-goodbye
+ok 18 - fixup that empties commit fails
+
+expecting success of 3403.19 'squash that empties commit fails': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 squash 2" git rebase -i \
+			goodbye^ reverted-goodbye
+	)
+
+rebase -i script before editing:
+pick 64bec18 # goodbye
+pick 1f15beb # reverted-goodbye
+
+rebase -i script after editing:
+pick 64bec18 # goodbye
+squash 1f15beb # reverted-goodbye
+Rebasing (2/2)
You asked to amend the most recent commit, but doing so would make
+it empty. You can repeat your command with --allow-empty, or you can
+remove the commit entirely with "git reset HEAD^".
+interactive rebase in progress; onto 5a0b053
+Last commands done (2 commands done):
+   pick 64bec18 # goodbye
+   squash 1f15beb # reverted-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+No changes
+Could not apply 1f15beb... # reverted-goodbye
+ok 19 - squash that empties commit fails
+
+expecting success of 3403.20 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
+
+ok 20 - $EDITOR and friends are unchanged
+
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3400-rebase.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3400-rebase/.git/
 expecting success of 3400.1 'prepare repository with topic branches': 
@@ -127840,6 +127785,125 @@
 1..39
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3405-rebase-malformed.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3405-rebase-malformed/.git/
+expecting success of 3405.1 'setup': 
+
+	>file1 &&
+	>file2 &&
+	git add file1 file2 &&
+	test_tick &&
+	git commit -m "Initial commit" &&
+	git branch diff-in-message &&
+	git branch empty-message-merge &&
+
+	git checkout -b multi-line-subject &&
+	cat F >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -F F &&
+
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >F0 &&
+
+	git checkout diff-in-message &&
+	echo "commit log message containing a diff" >G &&
+	echo "" >>G &&
+	cat G >file2 &&
+	git add file2 &&
+	git diff --cached >>G &&
+	test_tick &&
+	git commit -F G &&
+
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >G0 &&
+
+	git checkout empty-message-merge &&
+	echo file3 >file3 &&
+	git add file3 &&
+	git commit --allow-empty-message -m "" &&
+
+	git checkout main &&
+
+	echo One >file1 &&
+	test_tick &&
+	git add file1 &&
+	git commit -m "Second commit"
+
+[main (root-commit) a8d727e] Initial commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'multi-line-subject'
+[multi-line-subject 5037af6] This is an example of a commit log message that does not  conform to git commit convention.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+Switched to branch 'diff-in-message'
+[diff-in-message 132c17c] commit log message containing a diff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'empty-message-merge'
+[empty-message-merge 942c0ff] 
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Switched to branch 'main'
+[main d5181bc] Second commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 3405.2 'rebase commit with multi-line subject': 
+
+	git rebase main multi-line-subject &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >F1 &&
+
+	test_cmp F0 F1 &&
+	test_cmp F F0
+
+Rebasing (1/1)
Successfully rebased and updated refs/heads/multi-line-subject.
+ok 2 - rebase commit with multi-line subject
+
+expecting success of 3405.3 'rebase commit with diff in message': 
+	git rebase main diff-in-message &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >G1 &&
+	test_cmp G0 G1 &&
+	test_cmp G G0
+
+Rebasing (1/1)
Successfully rebased and updated refs/heads/diff-in-message.
+ok 3 - rebase commit with diff in message
+
+expecting success of 3405.4 'rebase -m commit with empty message': 
+	git rebase -m main empty-message-merge
+
+Rebasing (1/1)
Successfully rebased and updated refs/heads/empty-message-merge.
+ok 4 - rebase -m commit with empty message
+
+expecting success of 3405.5 'rebase -i commit with empty message': 
+	git checkout diff-in-message &&
+	set_fake_editor &&
+	test_must_fail env FAKE_COMMIT_MESSAGE=" " FAKE_LINES="reword 1" \
+		git rebase -i HEAD^
+
+Switched to branch 'diff-in-message'
+rebase -i script before editing:
+pick 87b000b # commit log message containing a diff
+
+rebase -i script after editing:
+reword 87b000b # commit log message containing a diff
+Rebasing (1/1)
Aborting commit due to empty commit message.
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+ok 5 - rebase -i commit with empty message
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3408-rebase-multi-line.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3408-rebase-multi-line/.git/
 expecting success of 3408.1 'setup': 
@@ -127966,6 +128030,370 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3412-rebase-root.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3412-rebase-root/.git/
+expecting success of 3412.1 'prepare repository': 
+	test_commit 1 A &&
+	test_commit 2 A &&
+	git symbolic-ref HEAD refs/heads/other &&
+	rm .git/index &&
+	test_commit 3 B &&
+	test_commit 1b A 1 &&
+	test_commit 4 B
+
+[main (root-commit) c746ea0] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+[main 46611ad] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other (root-commit) 2c64091] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+[other 1c4476a] 1b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+[other 41e7797] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - prepare repository
+
+expecting success of 3412.2 'rebase --root fails with too many args': 
+	git checkout -B fail other &&
+	test_must_fail git rebase --onto main --root fail fail
+
+Switched to a new branch 'fail'
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+ok 2 - rebase --root fails with too many args
+
+expecting success of 3412.3 'setup pre-rebase hook': 
+	test_hook --setup pre-rebase <<-\EOF
+	echo "$1,$2" >.git/PRE-REBASE-INPUT
+	EOF
+
+ok 3 - setup pre-rebase hook
+
+expecting success of 3412.4 'rebase --root --onto <newbase>': 
+	git checkout -b work other &&
+	git rebase --root --onto main &&
+	git log --pretty=tformat:"%s" > rebased &&
+	test_cmp expect rebased
+
+Switched to a new branch 'work'
+warning: skipped previously applied commit 1c4476a
+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/work.
+ok 4 - rebase --root --onto <newbase>
+
+expecting success of 3412.5 'pre-rebase got correct input (1)': 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
+
+ok 5 - pre-rebase got correct input (1)
+
+expecting success of 3412.6 'rebase --root --onto <newbase> <branch>': 
+	git branch work2 other &&
+	git rebase --root --onto main work2 &&
+	git log --pretty=tformat:"%s" > rebased2 &&
+	test_cmp expect rebased2
+
+warning: skipped previously applied commit 1c4476a
+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/work2.
+ok 6 - rebase --root --onto <newbase> <branch>
+
+expecting success of 3412.7 'pre-rebase got correct input (2)': 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work2
+
+ok 7 - pre-rebase got correct input (2)
+
+expecting success of 3412.8 'rebase -i --root --onto <newbase>': 
+	git checkout -b work3 other &&
+	git rebase -i --root --onto main &&
+	git log --pretty=tformat:"%s" > rebased3 &&
+	test_cmp expect rebased3
+
+Switched to a new branch 'work3'
+warning: skipped previously applied commit 1c4476a
+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/work3.
+ok 8 - rebase -i --root --onto <newbase>
+
+expecting success of 3412.9 'pre-rebase got correct input (3)': 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
+
+ok 9 - pre-rebase got correct input (3)
+
+expecting success of 3412.10 'rebase -i --root --onto <newbase> <branch>': 
+	git branch work4 other &&
+	git rebase -i --root --onto main work4 &&
+	git log --pretty=tformat:"%s" > rebased4 &&
+	test_cmp expect rebased4
+
+warning: skipped previously applied commit 1c4476a
+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/work4.
+ok 10 - rebase -i --root --onto <newbase> <branch>
+
+expecting success of 3412.11 'pre-rebase got correct input (4)': 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work4
+
+ok 11 - pre-rebase got correct input (4)
+
+expecting success of 3412.12 'set up merge history': 
+	git checkout other^ &&
+	git checkout -b side &&
+	test_commit 5 C &&
+	git checkout other &&
+	git merge side
+
+Note: switching to 'other^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 1c4476a 1b
+Switched to a new branch 'side'
+[side 0c9a4e9] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C
+Switched to branch 'other'
+Merge made by the 'ort' strategy.
+ C | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C
+ok 12 - set up merge history
+
+expecting success of 3412.13 'set up second root and merge': 
+	git symbolic-ref HEAD refs/heads/third &&
+	rm .git/index &&
+	rm A B C &&
+	test_commit 6 D &&
+	git checkout other &&
+	git merge --allow-unrelated-histories third
+
+[third (root-commit) 00ac2af] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D
+Switched to branch 'other'
+Merge made by the 'ort' strategy.
+ D | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D
+ok 13 - set up second root and merge
+
+expecting success of 3412.14 'setup pre-rebase hook that fails': 
+	test_hook --setup --clobber pre-rebase <<-\EOF
+	false
+	EOF
+
+ok 14 - setup pre-rebase hook that fails
+
+expecting success of 3412.15 'pre-rebase hook stops rebase': 
+	git checkout -b stops1 other &&
+	test_must_fail git rebase --root --onto main &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1 &&
+	test 0 = $(git rev-list other...stops1 | wc -l)
+
+Switched to a new branch 'stops1'
+error: The pre-rebase hook refused to rebase.
+ok 15 - pre-rebase hook stops rebase
+
+expecting success of 3412.16 'pre-rebase hook stops rebase -i': 
+	git checkout -b stops2 other &&
+	test_must_fail git rebase --root --onto main &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2 &&
+	test 0 = $(git rev-list other...stops2 | wc -l)
+
+Switched to a new branch 'stops2'
+error: The pre-rebase hook refused to rebase.
+ok 16 - pre-rebase hook stops rebase -i
+
+expecting success of 3412.17 'remove pre-rebase hook': 
+	rm -f .git/hooks/pre-rebase
+
+ok 17 - remove pre-rebase hook
+
+expecting success of 3412.18 'set up a conflict': 
+	git checkout main &&
+	echo conflict > B &&
+	git add B &&
+	git commit -m conflict
+
+Switched to branch 'main'
+[main f80eebe] conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+ok 18 - set up a conflict
+
+expecting success of 3412.19 'rebase --root with conflict (first part)': 
+	git checkout -b conflict1 other &&
+	test_must_fail git rebase --root --onto main &&
+	git ls-files -u | grep "B$"
+
+Switched to a new branch 'conflict1'
+warning: skipped previously applied commit 1c4476a
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/4)
Auto-merging B
+CONFLICT (add/add): Merge conflict in B
+error: could not apply 2c64091... 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 2c64091... # 3
+100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
+100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
+ok 19 - rebase --root with conflict (first part)
+
+expecting success of 3412.20 'fix the conflict': 
+	echo 3 > B &&
+	git add B
+
+ok 20 - fix the conflict
+
+expecting success of 3412.21 'rebase --root with conflict (second part)': 
+	git rebase --continue &&
+	git log --pretty=tformat:"%s" > conflict1 &&
+	test_cmp expect-conflict conflict1
+
+[detached HEAD 308ae33] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/conflict1.
+ok 21 - rebase --root with conflict (second part)
+
+expecting success of 3412.22 'rebase -i --root with conflict (first part)': 
+	git checkout -b conflict2 other &&
+	test_must_fail git rebase -i --root --onto main &&
+	git ls-files -u | grep "B$"
+
+Switched to a new branch 'conflict2'
+warning: skipped previously applied commit 1c4476a
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/4)
Auto-merging B
+CONFLICT (add/add): Merge conflict in B
+error: could not apply 2c64091... 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 2c64091... # 3
+100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
+100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
+ok 22 - rebase -i --root with conflict (first part)
+
+expecting success of 3412.23 'fix the conflict': 
+	echo 3 > B &&
+	git add B
+
+ok 23 - fix the conflict
+
+expecting success of 3412.24 'rebase -i --root with conflict (second part)': 
+	git rebase --continue &&
+	git log --pretty=tformat:"%s" > conflict2 &&
+	test_cmp expect-conflict conflict2
+
+[detached HEAD 308ae33] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/conflict2.
+ok 24 - rebase -i --root with conflict (second part)
+
+expecting success of 3412.25 'fix the conflict': 
+	echo 3 > B &&
+	git add B
+
+ok 25 - fix the conflict
+
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3407-rebase-abort.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3407-rebase-abort/.git/
 expecting success of 3407.1 'setup': 
@@ -128734,677 +129162,105 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3413-rebase-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t3406-rebase-message.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3406-rebase-message/.git/
+expecting success of 3406.1 'setup': 
+	test_commit O fileO &&
+	test_commit X fileX &&
+	git branch fast-forward &&
+	test_commit A fileA &&
+	test_commit B fileB &&
+	test_commit Y fileY &&
 
-[main (root-commit) 6637599] initial
+	git checkout -b conflicts O &&
+	test_commit P &&
+	test_commit conflict-X fileX &&
+	test_commit Q &&
+
+	git checkout -b topic O &&
+	git cherry-pick A B &&
+	test_commit Z fileZ &&
+	git tag start
+
+[main (root-commit) 3749684] O
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 20a11a4] second
+ create mode 100644 fileO
+[main a2df67f] X
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side'
-[side c847452] side
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileX
+[main 9491ce3] A
  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
+ create mode 100644 fileA
+[main 83a6553] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileB
+[main 545b0d0] Y
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileY
+Switched to a new branch 'conflicts'
+[conflicts bd906e8] P
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 P.t
+[conflicts f31fbd6] conflict-X
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileX
+[conflicts f39a215] Q
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Q.t
+Switched to a new branch 'topic'
+[topic 731bf4a] A
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileA
+[topic bd8c9c9] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileB
+[topic dd54835] Z
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileZ
 ok 1 - setup
 
-expecting success of 3413.2 'rebase': 
-	git checkout test &&
-	git reset --hard side &&
-	git rebase main &&
-	test "z$(cat git)" = zworld
+expecting success of 3406.2 'rebase -m': 
+	git rebase -m main >actual &&
+	test_must_be_empty actual
 
-Switched to branch 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 2 - rebase
+warning: skipped previously applied commit 731bf4a
+warning: skipped previously applied commit bd8c9c9
+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/topic.
+ok 2 - rebase -m
 
-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
+expecting success of 3406.3 'rebase against main twice': 
+	git rebase --apply main >out &&
+	test_grep "Current branch topic is up to date" out
 
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 3 - rebase -i
+Current branch topic is up to date.
+ok 3 - rebase against main twice
 
-expecting success of 3413.4 'setup pre-rebase hook': 
-	test_hook --setup pre-rebase <<-\EOF
-	echo "$1,$2" >.git/PRE-REBASE-INPUT
-	EOF
+expecting success of 3406.4 'rebase against main twice with --force': 
+	git rebase --force-rebase --apply main >out &&
+	test_grep "Current branch topic is up to date, rebase forced" out
 
-ok 4 - setup pre-rebase hook
+Current branch topic is up to date, rebase forced.
+ok 4 - rebase against main twice with --force
 
-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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3412-rebase-root.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3412-rebase-root/.git/
-expecting success of 3412.1 'prepare repository': 
-	test_commit 1 A &&
-	test_commit 2 A &&
-	git symbolic-ref HEAD refs/heads/other &&
-	rm .git/index &&
-	test_commit 3 B &&
-	test_commit 1b A 1 &&
-	test_commit 4 B
-
-[main (root-commit) c746ea0] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-[main 46611ad] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other (root-commit) 2c64091] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-[other 1c4476a] 1b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-[other 41e7797] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - prepare repository
-
-expecting success of 3412.2 'rebase --root fails with too many args': 
-	git checkout -B fail other &&
-	test_must_fail git rebase --onto main --root fail fail
-
-Switched to a new branch 'fail'
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
-
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
-
-ok 2 - rebase --root fails with too many args
-
-expecting success of 3412.3 'setup pre-rebase hook': 
-	test_hook --setup pre-rebase <<-\EOF
-	echo "$1,$2" >.git/PRE-REBASE-INPUT
-	EOF
-
-ok 3 - setup pre-rebase hook
-
-expecting success of 3412.4 'rebase --root --onto <newbase>': 
-	git checkout -b work other &&
-	git rebase --root --onto main &&
-	git log --pretty=tformat:"%s" > rebased &&
-	test_cmp expect rebased
-
-Switched to a new branch 'work'
-warning: skipped previously applied commit 1c4476a
-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/work.
-ok 4 - rebase --root --onto <newbase>
-
-expecting success of 3412.5 'pre-rebase got correct input (1)': 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
-
-ok 5 - pre-rebase got correct input (1)
-
-expecting success of 3412.6 'rebase --root --onto <newbase> <branch>': 
-	git branch work2 other &&
-	git rebase --root --onto main work2 &&
-	git log --pretty=tformat:"%s" > rebased2 &&
-	test_cmp expect rebased2
-
-warning: skipped previously applied commit 1c4476a
-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/work2.
-ok 6 - rebase --root --onto <newbase> <branch>
-
-expecting success of 3412.7 'pre-rebase got correct input (2)': 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work2
-
-ok 7 - pre-rebase got correct input (2)
-
-expecting success of 3412.8 'rebase -i --root --onto <newbase>': 
-	git checkout -b work3 other &&
-	git rebase -i --root --onto main &&
-	git log --pretty=tformat:"%s" > rebased3 &&
-	test_cmp expect rebased3
-
-Switched to a new branch 'work3'
-warning: skipped previously applied commit 1c4476a
-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/work3.
-ok 8 - rebase -i --root --onto <newbase>
-
-expecting success of 3412.9 'pre-rebase got correct input (3)': 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
-
-ok 9 - pre-rebase got correct input (3)
-
-expecting success of 3412.10 'rebase -i --root --onto <newbase> <branch>': 
-	git branch work4 other &&
-	git rebase -i --root --onto main work4 &&
-	git log --pretty=tformat:"%s" > rebased4 &&
-	test_cmp expect rebased4
-
-warning: skipped previously applied commit 1c4476a
-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/work4.
-ok 10 - rebase -i --root --onto <newbase> <branch>
-
-expecting success of 3412.11 'pre-rebase got correct input (4)': 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work4
-
-ok 11 - pre-rebase got correct input (4)
-
-expecting success of 3412.12 'set up merge history': 
-	git checkout other^ &&
-	git checkout -b side &&
-	test_commit 5 C &&
-	git checkout other &&
-	git merge side
-
-Note: switching to 'other^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 1c4476a 1b
-Switched to a new branch 'side'
-[side 0c9a4e9] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C
-Switched to branch 'other'
-Merge made by the 'ort' strategy.
- C | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C
-ok 12 - set up merge history
-
-expecting success of 3412.13 'set up second root and merge': 
-	git symbolic-ref HEAD refs/heads/third &&
-	rm .git/index &&
-	rm A B C &&
-	test_commit 6 D &&
-	git checkout other &&
-	git merge --allow-unrelated-histories third
-
-[third (root-commit) 00ac2af] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D
-Switched to branch 'other'
-Merge made by the 'ort' strategy.
- D | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 D
-ok 13 - set up second root and merge
-
-expecting success of 3412.14 'setup pre-rebase hook that fails': 
-	test_hook --setup --clobber pre-rebase <<-\EOF
-	false
-	EOF
-
-ok 14 - setup pre-rebase hook that fails
-
-expecting success of 3412.15 'pre-rebase hook stops rebase': 
-	git checkout -b stops1 other &&
-	test_must_fail git rebase --root --onto main &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1 &&
-	test 0 = $(git rev-list other...stops1 | wc -l)
-
-Switched to a new branch 'stops1'
-error: The pre-rebase hook refused to rebase.
-ok 15 - pre-rebase hook stops rebase
-
-expecting success of 3412.16 'pre-rebase hook stops rebase -i': 
-	git checkout -b stops2 other &&
-	test_must_fail git rebase --root --onto main &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2 &&
-	test 0 = $(git rev-list other...stops2 | wc -l)
-
-Switched to a new branch 'stops2'
-error: The pre-rebase hook refused to rebase.
-ok 16 - pre-rebase hook stops rebase -i
-
-expecting success of 3412.17 'remove pre-rebase hook': 
-	rm -f .git/hooks/pre-rebase
-
-ok 17 - remove pre-rebase hook
-
-expecting success of 3412.18 'set up a conflict': 
-	git checkout main &&
-	echo conflict > B &&
-	git add B &&
-	git commit -m conflict
-
-Switched to branch 'main'
-[main f80eebe] conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-ok 18 - set up a conflict
-
-expecting success of 3412.19 'rebase --root with conflict (first part)': 
-	git checkout -b conflict1 other &&
-	test_must_fail git rebase --root --onto main &&
-	git ls-files -u | grep "B$"
-
-Switched to a new branch 'conflict1'
-warning: skipped previously applied commit 1c4476a
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/4)
Auto-merging B
-CONFLICT (add/add): Merge conflict in B
-error: could not apply 2c64091... 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 2c64091... # 3
-100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
-100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
-ok 19 - rebase --root with conflict (first part)
-
-expecting success of 3412.20 'fix the conflict': 
-	echo 3 > B &&
-	git add B
-
-ok 20 - fix the conflict
-
-expecting success of 3412.21 'rebase --root with conflict (second part)': 
-	git rebase --continue &&
-	git log --pretty=tformat:"%s" > conflict1 &&
-	test_cmp expect-conflict conflict1
-
-[detached HEAD 308ae33] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/conflict1.
-ok 21 - rebase --root with conflict (second part)
-
-expecting success of 3412.22 'rebase -i --root with conflict (first part)': 
-	git checkout -b conflict2 other &&
-	test_must_fail git rebase -i --root --onto main &&
-	git ls-files -u | grep "B$"
-
-Switched to a new branch 'conflict2'
-warning: skipped previously applied commit 1c4476a
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/4)
Auto-merging B
-CONFLICT (add/add): Merge conflict in B
-error: could not apply 2c64091... 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 2c64091... # 3
-100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
-100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
-ok 22 - rebase -i --root with conflict (first part)
-
-expecting success of 3412.23 'fix the conflict': 
-	echo 3 > B &&
-	git add B
-
-ok 23 - fix the conflict
-
-expecting success of 3412.24 'rebase -i --root with conflict (second part)': 
-	git rebase --continue &&
-	git log --pretty=tformat:"%s" > conflict2 &&
-	test_cmp expect-conflict conflict2
-
-[detached HEAD 308ae33] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/conflict2.
-ok 24 - rebase -i --root with conflict (second part)
-
-expecting success of 3412.25 'fix the conflict': 
-	echo 3 > B &&
-	git add B
-
-ok 25 - fix the conflict
-
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3406-rebase-message.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3406-rebase-message/.git/
-expecting success of 3406.1 'setup': 
-	test_commit O fileO &&
-	test_commit X fileX &&
-	git branch fast-forward &&
-	test_commit A fileA &&
-	test_commit B fileB &&
-	test_commit Y fileY &&
-
-	git checkout -b conflicts O &&
-	test_commit P &&
-	test_commit conflict-X fileX &&
-	test_commit Q &&
-
-	git checkout -b topic O &&
-	git cherry-pick A B &&
-	test_commit Z fileZ &&
-	git tag start
-
-[main (root-commit) 3749684] O
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileO
-[main a2df67f] X
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileX
-[main 9491ce3] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileA
-[main 83a6553] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileB
-[main 545b0d0] Y
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileY
-Switched to a new branch 'conflicts'
-[conflicts bd906e8] P
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 P.t
-[conflicts f31fbd6] conflict-X
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileX
-[conflicts f39a215] Q
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 Q.t
-Switched to a new branch 'topic'
-[topic 731bf4a] A
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 fileA
-[topic bd8c9c9] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 fileB
-[topic dd54835] Z
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileZ
-ok 1 - setup
-
-expecting success of 3406.2 'rebase -m': 
-	git rebase -m main >actual &&
-	test_must_be_empty actual
-
-warning: skipped previously applied commit 731bf4a
-warning: skipped previously applied commit bd8c9c9
-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/topic.
-ok 2 - rebase -m
-
-expecting success of 3406.3 'rebase against main twice': 
-	git rebase --apply main >out &&
-	test_grep "Current branch topic is up to date" out
-
-Current branch topic is up to date.
-ok 3 - rebase against main twice
-
-expecting success of 3406.4 'rebase against main twice with --force': 
-	git rebase --force-rebase --apply main >out &&
-	test_grep "Current branch topic is up to date, rebase forced" out
-
-Current branch topic is up to date, rebase forced.
-ok 4 - rebase against main twice with --force
-
-expecting success of 3406.5 'rebase against main twice from another branch': 
-	git checkout topic^ &&
-	git rebase --apply main topic >out &&
-	test_grep "Current branch topic is up to date" out
+expecting success of 3406.5 'rebase against main twice from another branch': 
+	git checkout topic^ &&
+	git rebase --apply main topic >out &&
+	test_grep "Current branch topic is up to date" out
 
 Note: switching to 'topic^'.
 
@@ -130632,84 +130488,212 @@
 1..32
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3417-rebase-whitespace-fix.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3417-rebase-whitespace-fix/.git/
-expecting success of 3417.1 'blank line at end of file; extend at end of file': 
-	git commit --allow-empty -m "Initial empty commit" &&
-	git add file && git commit -m first &&
-	mv second file &&
-	git add file && git commit -m second &&
-	git rebase --whitespace=fix HEAD^^ &&
-	git diff --exit-code HEAD^:file expect-first &&
-	test_cmp expect-second file
+*** t3413-rebase-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-[master (root-commit) 6c54391] Initial empty commit
- Author: A U Thor <author@example.com>
-[master e2d0a8f] first
+[main (root-commit) 6637599] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
+ 1 file changed, 1 insertion(+)
  create mode 100644 file
-[master 14cb724] second
+[main 20a11a4] second
  Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
-First, rewinding head to replay your work on top of it...
-Applying: first
-Applying: second
-ok 1 - blank line at end of file; extend at end of file
+ 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 3417.2 'two blanks line at end of file; extend at end of file': 
-	cp third file && git add file && git commit -m third &&
-	git rebase --whitespace=fix HEAD^^ &&
-	git diff --exit-code HEAD^:file expect-second &&
-	test_cmp expect-third file
+expecting success of 3413.2 'rebase': 
+	git checkout test &&
+	git reset --hard side &&
+	git rebase main &&
+	test "z$(cat git)" = zworld
 
-[master c2f1416] third
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
-First, rewinding head to replay your work on top of it...
-Applying: second
-Applying: third
-ok 2 - two blanks line at end of file; extend at end of file
+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 3417.3 'same, but do not remove trailing spaces': 
-	git config core.whitespace "-blank-at-eol" &&
-	git reset --hard HEAD^ &&
-	cp third file && git add file && git commit -m third &&
-	git rebase --whitespace=fix HEAD^^ &&
-	git diff --exit-code HEAD^:file expect-second &&
-	test_cmp file third
+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
 
-HEAD is now at 0c4819a second
-[master c2f1416] third
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
-First, rewinding head to replay your work on top of it...
-Applying: second
-Applying: third
-ok 3 - same, but do not remove trailing spaces
+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 3417.4 'at beginning of file': 
-	git config core.whitespace "blank-at-eol" &&
-	cp beginning file &&
-	git commit -m beginning file &&
-	test_write_lines 1 2 3 4 5 >>file &&
-	git commit -m more file &&
-	git rebase --whitespace=fix HEAD^^ &&
-	test_cmp expect-beginning file
+expecting success of 3413.4 'setup pre-rebase hook': 
+	test_hook --setup pre-rebase <<-\EOF
+	echo "$1,$2" >.git/PRE-REBASE-INPUT
+	EOF
 
-[master 5eeec3e] beginning
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 13 deletions(-)
-[master b2ce110] more
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
-First, rewinding head to replay your work on top of it...
-Applying: beginning
-Applying: more
-ok 4 - at beginning of file
+ok 4 - setup pre-rebase hook
 
-# passed all 4 test(s)
-1..4
+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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t2400-worktree-add.sh ***
@@ -147928,1109 +147912,6 @@
 1..232
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3419-rebase-patch-id.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3416-rebase-onto-threedots.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3422-rebase-incompatible-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3422-rebase-incompatible-options/.git/
-expecting success of 3422.1 'setup': 
-	test_seq 2 9 >foo &&
-	git add foo &&
-	git commit -m orig &&
-
-	git branch A &&
-	git branch B &&
-
-	git checkout A &&
-	test_seq 1 9 >foo &&
-	git add foo &&
-	git commit -m A &&
-
-	git checkout B &&
-	echo "q qfoo();" | q_to_tab >>foo &&
-	git add foo &&
-	git commit -m B
-
-[master (root-commit) 3639f03] orig
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 foo
-Switched to branch 'A'
-[A ef5b704] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'B'
-[B 079b709] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 3422.2 '--whitespace=fix incompatible with --merge': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --merge A
-	
-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 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 2 - --whitespace=fix incompatible with --merge
-
-expecting success of 3422.3 '--whitespace=fix incompatible with --strategy=ours': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --strategy=ours A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 3 - --whitespace=fix incompatible with --strategy=ours
-
-expecting success of 3422.4 '--whitespace=fix incompatible with --strategy-option=ours': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --strategy-option=ours A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 4 - --whitespace=fix incompatible with --strategy-option=ours
-
-expecting success of 3422.5 '--whitespace=fix incompatible with --autosquash': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --autosquash A
-	
-HEAD is now at 079b709 B
-fatal: --autosquash requires the merge backend
-ok 5 - --whitespace=fix incompatible with --autosquash
-
-expecting success of 3422.6 '--whitespace=fix incompatible with --interactive': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --interactive A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 6 - --whitespace=fix incompatible with --interactive
-
-expecting success of 3422.7 '--whitespace=fix incompatible with --exec': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --exec 'true' A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 7 - --whitespace=fix incompatible with --exec
-
-expecting success of 3422.8 '--whitespace=fix incompatible with --keep-empty': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --keep-empty A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 8 - --whitespace=fix incompatible with --keep-empty
-
-expecting success of 3422.9 '--whitespace=fix incompatible with --empty=...': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --empty=ask A
-	
-HEAD is now at 079b709 B
-warning: --empty=ask is deprecated; use '--empty=stop' instead.
-fatal: apply options and merge options cannot be used together
-ok 9 - --whitespace=fix incompatible with --empty=...
-
-expecting success of 3422.10 '--whitespace=fix incompatible with --no-reapply-cherry-picks': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --no-reapply-cherry-picks A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 10 - --whitespace=fix incompatible with --no-reapply-cherry-picks
-
-expecting success of 3422.11 '--whitespace=fix incompatible with --reapply-cherry-picks': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --reapply-cherry-picks A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 11 - --whitespace=fix incompatible with --reapply-cherry-picks
-
-expecting success of 3422.12 '--whitespace=fix incompatible with --rebase-merges': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --rebase-merges A
-	
-HEAD is now at 079b709 B
-fatal: --rebase-merges requires the merge backend
-ok 12 - --whitespace=fix incompatible with --rebase-merges
-
-expecting success of 3422.13 '--whitespace=fix incompatible with --update-refs': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --update-refs A
-	
-HEAD is now at 079b709 B
-fatal: --update-refs requires the merge backend
-ok 13 - --whitespace=fix incompatible with --update-refs
-
-expecting success of 3422.14 '--whitespace=fix incompatible with --root without --onto': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --root A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 14 - --whitespace=fix incompatible with --root without --onto
-
-expecting success of 3422.15 '--whitespace=fix incompatible with rebase.rebaseMerges': 
-		git checkout B^0 &&
-		test_must_fail git -c rebase.rebaseMerges=true rebase --whitespace=fix A 2>err &&
-		grep -e --no-rebase-merges err
-	
-HEAD is now at 079b709 B
-fatal: apply options are incompatible with rebase.rebaseMerges.  Consider adding --no-rebase-merges
-ok 15 - --whitespace=fix incompatible with rebase.rebaseMerges
-
-expecting success of 3422.16 '--whitespace=fix incompatible with rebase.updateRefs': 
-		git checkout B^0 &&
-		test_must_fail git -c rebase.updateRefs=true rebase --whitespace=fix A 2>err &&
-		grep -e --no-update-refs err
-	
-HEAD is now at 079b709 B
-fatal: apply options are incompatible with rebase.updateRefs.  Consider adding --no-update-refs
-ok 16 - --whitespace=fix incompatible with rebase.updateRefs
-
-expecting success of 3422.17 '--whitespace=fix okay with overridden rebase.rebaseMerges': 
-		test_when_finished "git reset --hard B^0" &&
-		git checkout B^0 &&
-		git -c rebase.rebaseMerges=true rebase --no-rebase-merges --whitespace=fix A
-	
-HEAD is now at 079b709 B
-First, rewinding head to replay your work on top of it...
-Applying: B
-HEAD is now at 079b709 B
-ok 17 - --whitespace=fix okay with overridden rebase.rebaseMerges
-
-expecting success of 3422.18 '--whitespace=fix okay with overridden rebase.updateRefs': 
-		test_when_finished "git reset --hard B^0" &&
-		git checkout B^0 &&
-		git -c rebase.updateRefs=true rebase --no-update-refs --whitespace=fix A
-	
-HEAD is now at 079b709 B
-First, rewinding head to replay your work on top of it...
-Applying: B
-HEAD is now at 079b709 B
-ok 18 - --whitespace=fix okay with overridden rebase.updateRefs
-
-expecting success of 3422.19 '-C4 incompatible with --merge': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --merge A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 19 - -C4 incompatible with --merge
-
-expecting success of 3422.20 '-C4 incompatible with --strategy=ours': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --strategy=ours A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 20 - -C4 incompatible with --strategy=ours
-
-expecting success of 3422.21 '-C4 incompatible with --strategy-option=ours': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --strategy-option=ours A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 21 - -C4 incompatible with --strategy-option=ours
-
-expecting success of 3422.22 '-C4 incompatible with --autosquash': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --autosquash A
-	
-HEAD is now at 079b709 B
-fatal: --autosquash requires the merge backend
-ok 22 - -C4 incompatible with --autosquash
-
-expecting success of 3422.23 '-C4 incompatible with --interactive': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --interactive A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 23 - -C4 incompatible with --interactive
-
-expecting success of 3422.24 '-C4 incompatible with --exec': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --exec 'true' A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 24 - -C4 incompatible with --exec
-
-expecting success of 3422.25 '-C4 incompatible with --keep-empty': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --keep-empty A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 25 - -C4 incompatible with --keep-empty
-
-expecting success of 3422.26 '-C4 incompatible with --empty=...': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --empty=ask A
-	
-HEAD is now at 079b709 B
-warning: --empty=ask is deprecated; use '--empty=stop' instead.
-fatal: apply options and merge options cannot be used together
-ok 26 - -C4 incompatible with --empty=...
-
-expecting success of 3422.27 '-C4 incompatible with --no-reapply-cherry-picks': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --no-reapply-cherry-picks A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 27 - -C4 incompatible with --no-reapply-cherry-picks
-
-expecting success of 3422.28 '-C4 incompatible with --reapply-cherry-picks': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --reapply-cherry-picks A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 28 - -C4 incompatible with --reapply-cherry-picks
-
-expecting success of 3422.29 '-C4 incompatible with --rebase-merges': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --rebase-merges A
-	
-HEAD is now at 079b709 B
-fatal: --rebase-merges requires the merge backend
-ok 29 - -C4 incompatible with --rebase-merges
-
-expecting success of 3422.30 '-C4 incompatible with --update-refs': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --update-refs A
-	
-HEAD is now at 079b709 B
-fatal: --update-refs requires the merge backend
-ok 30 - -C4 incompatible with --update-refs
-
-expecting success of 3422.31 '-C4 incompatible with --root without --onto': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --root A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 31 - -C4 incompatible with --root without --onto
-
-expecting success of 3422.32 '-C4 incompatible with rebase.rebaseMerges': 
-		git checkout B^0 &&
-		test_must_fail git -c rebase.rebaseMerges=true rebase -C4 A 2>err &&
-		grep -e --no-rebase-merges err
-	
-HEAD is now at 079b709 B
-fatal: apply options are incompatible with rebase.rebaseMerges.  Consider adding --no-rebase-merges
-ok 32 - -C4 incompatible with rebase.rebaseMerges
-
-expecting success of 3422.33 '-C4 incompatible with rebase.updateRefs': 
-		git checkout B^0 &&
-		test_must_fail git -c rebase.updateRefs=true rebase -C4 A 2>err &&
-		grep -e --no-update-refs err
-	
-HEAD is now at 079b709 B
-fatal: apply options are incompatible with rebase.updateRefs.  Consider adding --no-update-refs
-ok 33 - -C4 incompatible with rebase.updateRefs
-
-expecting success of 3422.34 '-C4 okay with overridden rebase.rebaseMerges': 
-		test_when_finished "git reset --hard B^0" &&
-		git checkout B^0 &&
-		git -c rebase.rebaseMerges=true rebase --no-rebase-merges -C4 A
-	
-HEAD is now at 079b709 B
-First, rewinding head to replay your work on top of it...
-Applying: B
-HEAD is now at 079b709 B
-ok 34 - -C4 okay with overridden rebase.rebaseMerges
-
-expecting success of 3422.35 '-C4 okay with overridden rebase.updateRefs': 
-		test_when_finished "git reset --hard B^0" &&
-		git checkout B^0 &&
-		git -c rebase.updateRefs=true rebase --no-update-refs -C4 A
-	
-HEAD is now at 079b709 B
-First, rewinding head to replay your work on top of it...
-Applying: B
-HEAD is now at 079b709 B
-ok 35 - -C4 okay with overridden rebase.updateRefs
-
-expecting success of 3422.36 '--apply incompatible with --merge': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --merge A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 36 - --apply incompatible with --merge
-
-expecting success of 3422.37 '--apply incompatible with --strategy=ours': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --strategy=ours A
-	
-HEAD is now at 079b709 B
-fatal: --strategy requires the merge backend
-ok 37 - --apply incompatible with --strategy=ours
-
-expecting success of 3422.38 '--apply incompatible with --strategy-option=ours': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --strategy-option=ours A
-	
-HEAD is now at 079b709 B
-fatal: --strategy requires the merge backend
-ok 38 - --apply incompatible with --strategy-option=ours
-
-expecting success of 3422.39 '--apply incompatible with --autosquash': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --autosquash A
-	
-HEAD is now at 079b709 B
-fatal: --autosquash requires the merge backend
-ok 39 - --apply incompatible with --autosquash
-
-expecting success of 3422.40 '--apply incompatible with --interactive': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --interactive A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 40 - --apply incompatible with --interactive
-
-expecting success of 3422.41 '--apply incompatible with --exec': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --exec 'true' A
-	
-HEAD is now at 079b709 B
-fatal: --exec requires the merge backend
-ok 41 - --apply incompatible with --exec
-
-expecting success of 3422.42 '--apply incompatible with --keep-empty': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --keep-empty A
-	
-HEAD is now at 079b709 B
-fatal: --keep-empty requires the merge backend
-ok 42 - --apply incompatible with --keep-empty
-
-expecting success of 3422.43 '--apply incompatible with --empty=...': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --empty=ask A
-	
-HEAD is now at 079b709 B
-warning: --empty=ask is deprecated; use '--empty=stop' instead.
-fatal: --empty requires the merge backend
-ok 43 - --apply incompatible with --empty=...
-
-expecting success of 3422.44 '--apply incompatible with --no-reapply-cherry-picks': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --no-reapply-cherry-picks A
-	
-HEAD is now at 079b709 B
-fatal: --no-reapply-cherry-picks requires the merge backend
-ok 44 - --apply incompatible with --no-reapply-cherry-picks
-
-expecting success of 3422.45 '--apply incompatible with --reapply-cherry-picks': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --reapply-cherry-picks A
-	
-HEAD is now at 079b709 B
-fatal: --reapply-cherry-picks requires the merge backend
-ok 45 - --apply incompatible with --reapply-cherry-picks
-
-expecting success of 3422.46 '--apply incompatible with --rebase-merges': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --rebase-merges A
-	
-HEAD is now at 079b709 B
-fatal: --rebase-merges requires the merge backend
-ok 46 - --apply incompatible with --rebase-merges
-
-expecting success of 3422.47 '--apply incompatible with --update-refs': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --update-refs A
-	
-HEAD is now at 079b709 B
-fatal: --update-refs requires the merge backend
-ok 47 - --apply incompatible with --update-refs
-
-expecting success of 3422.48 '--apply incompatible with --root without --onto': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --root A
-	
-HEAD is now at 079b709 B
-fatal: --root without --onto requires the merge backend
-ok 48 - --apply incompatible with --root without --onto
-
-expecting success of 3422.49 '--apply incompatible with rebase.rebaseMerges': 
-		git checkout B^0 &&
-		test_must_fail git -c rebase.rebaseMerges=true rebase --apply A 2>err &&
-		grep -e --no-rebase-merges err
-	
-HEAD is now at 079b709 B
-fatal: apply options are incompatible with rebase.rebaseMerges.  Consider adding --no-rebase-merges
-ok 49 - --apply incompatible with rebase.rebaseMerges
-
-expecting success of 3422.50 '--apply incompatible with rebase.updateRefs': 
-		git checkout B^0 &&
-		test_must_fail git -c rebase.updateRefs=true rebase --apply A 2>err &&
-		grep -e --no-update-refs err
-	
-HEAD is now at 079b709 B
-fatal: apply options are incompatible with rebase.updateRefs.  Consider adding --no-update-refs
-ok 50 - --apply incompatible with rebase.updateRefs
-
-expecting success of 3422.51 '--apply okay with overridden rebase.rebaseMerges': 
-		test_when_finished "git reset --hard B^0" &&
-		git checkout B^0 &&
-		git -c rebase.rebaseMerges=true rebase --no-rebase-merges --apply A
-	
-HEAD is now at 079b709 B
-First, rewinding head to replay your work on top of it...
-Applying: B
-HEAD is now at 079b709 B
-ok 51 - --apply okay with overridden rebase.rebaseMerges
-
-expecting success of 3422.52 '--apply okay with overridden rebase.updateRefs': 
-		test_when_finished "git reset --hard B^0" &&
-		git checkout B^0 &&
-		git -c rebase.updateRefs=true rebase --no-update-refs --apply A
-	
-HEAD is now at 079b709 B
-First, rewinding head to replay your work on top of it...
-Applying: B
-HEAD is now at 079b709 B
-ok 52 - --apply okay with overridden rebase.updateRefs
-
-# passed all 52 test(s)
-1..52
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3423-rebase-reword.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t0027-auto-crlf.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t0027-auto-crlf/.git/
 expecting success of 0027.1 'ls-files --eol -o Text/Binary': 
@@ -166300,2107 +165181,2171 @@
 1..2600
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3415-rebase-autosquash.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3415-rebase-autosquash/.git/
-expecting success of 3415.1 'setup': 
-	echo 0 >file0 &&
-	git add . &&
-	test_tick &&
-	git commit -m "initial commit" &&
-	echo 0 >file1 &&
-	echo 2 >file2 &&
-	git add . &&
-	test_tick &&
-	git commit -m "first commit" &&
-	git tag first-commit &&
-	echo 3 >file3 &&
-	git add . &&
-	test_tick &&
-	git commit -m "second commit" &&
-	git tag base
+*** t3417-rebase-whitespace-fix.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3417-rebase-whitespace-fix/.git/
+expecting success of 3417.1 'blank line at end of file; extend at end of file': 
+	git commit --allow-empty -m "Initial empty commit" &&
+	git add file && git commit -m first &&
+	mv second file &&
+	git add file && git commit -m second &&
+	git rebase --whitespace=fix HEAD^^ &&
+	git diff --exit-code HEAD^:file expect-first &&
+	test_cmp expect-second file
 
-[main (root-commit) d78c915] initial commit
+[master (root-commit) 6c54391] Initial empty commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file0
-[main 244a0fe] first commit
+[master e2d0a8f] first
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-[main f0c2a7e] second commit
+ 1 file changed, 4 insertions(+)
+ create mode 100644 file
+[master 14cb724] second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-ok 1 - setup
+ 1 file changed, 7 insertions(+)
+First, rewinding head to replay your work on top of it...
+Applying: first
+Applying: second
+ok 1 - blank line at end of file; extend at end of file
 
-expecting success of 3415.2 'auto fixup (option)': 
-	test_auto_fixup fixup-option --autosquash &&
-	test_auto_fixup fixup-option-i "--autosquash -i"
+expecting success of 3417.2 'two blanks line at end of file; extend at end of file': 
+	cp third file && git add file && git commit -m third &&
+	git rebase --whitespace=fix HEAD^^ &&
+	git diff --exit-code HEAD^:file expect-second &&
+	test_cmp expect-third file
 
-HEAD is now at f0c2a7e second commit
-[main e17f730] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-HEAD is now at f0c2a7e second commit
-[main f84b6d6] fixup! first
+[master c2f1416] third
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-ok 2 - auto fixup (option)
+ 1 file changed, 7 insertions(+)
+First, rewinding head to replay your work on top of it...
+Applying: second
+Applying: third
+ok 2 - two blanks line at end of file; extend at end of file
 
-expecting success of 3415.3 'auto fixup (config true)': 
-	git config rebase.autosquash true &&
-	test_auto_fixup ! fixup-config-true &&
-	test_auto_fixup fixup-config-true-i -i &&
-	test_auto_fixup ! fixup-config-true-no --no-autosquash &&
-	test_auto_fixup ! fixup-config-true-i-no "-i --no-autosquash"
+expecting success of 3417.3 'same, but do not remove trailing spaces': 
+	git config core.whitespace "-blank-at-eol" &&
+	git reset --hard HEAD^ &&
+	cp third file && git add file && git commit -m third &&
+	git rebase --whitespace=fix HEAD^^ &&
+	git diff --exit-code HEAD^:file expect-second &&
+	test_cmp file third
 
-HEAD is now at f0c2a7e second commit
-[main 03041cb] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Current branch main is up to date.
-HEAD is now at f0c2a7e second commit
-[main bee11d3] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-HEAD is now at f0c2a7e second commit
-[main 1469752] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Current branch main is up to date.
-HEAD is now at f0c2a7e second commit
-[main 11d4929] fixup! first
+HEAD is now at 0c4819a second
+[master c2f1416] third
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/main.
-ok 3 - auto fixup (config true)
+ 1 file changed, 7 insertions(+)
+First, rewinding head to replay your work on top of it...
+Applying: second
+Applying: third
+ok 3 - same, but do not remove trailing spaces
 
-expecting success of 3415.4 'auto fixup (config false)': 
-	git config rebase.autosquash false &&
-	test_auto_fixup ! fixup-config-false &&
-	test_auto_fixup ! fixup-config-false-i -i &&
-	test_auto_fixup fixup-config-false-yes --autosquash &&
-	test_auto_fixup fixup-config-false-i-yes "-i --autosquash"
+expecting success of 3417.4 'at beginning of file': 
+	git config core.whitespace "blank-at-eol" &&
+	cp beginning file &&
+	git commit -m beginning file &&
+	test_write_lines 1 2 3 4 5 >>file &&
+	git commit -m more file &&
+	git rebase --whitespace=fix HEAD^^ &&
+	test_cmp expect-beginning file
 
-HEAD is now at f0c2a7e second commit
-[main ba7bf68] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Current branch main is up to date.
-HEAD is now at f0c2a7e second commit
-[main ac63a35] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/main.
-HEAD is now at f0c2a7e second commit
-[main d9d1dd1] fixup! first
+[master 5eeec3e] beginning
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-HEAD is now at f0c2a7e second commit
-[main 9dd95ee] fixup! first
+ 1 file changed, 2 insertions(+), 13 deletions(-)
+[master b2ce110] more
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-ok 4 - auto fixup (config false)
+ 1 file changed, 5 insertions(+)
+First, rewinding head to replay your work on top of it...
+Applying: beginning
+Applying: more
+ok 4 - at beginning of file
 
-expecting success of 3415.5 'auto squash (option)': 
-	test_auto_squash squash-option --autosquash &&
-	test_auto_squash squash-option-i "--autosquash -i"
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1701-racy-split-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t1701-racy-split-index/.git/
+expecting success of 1701.1 'setup': 
+	# Only split the index when the test explicitly says so.
+	sane_unset GIT_TEST_SPLIT_INDEX &&
+	git config splitIndex.maxPercentChange 100 &&
 
-HEAD is now at f0c2a7e second commit
-[main dce065e] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD 6abb6fe] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-HEAD is now at f0c2a7e second commit
-[main e78a7a1] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD 5f4f4e7] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-ok 5 - auto squash (option)
+	echo "cached content" >racy-file &&
+	git add racy-file &&
+	git commit -m initial &&
 
-expecting success of 3415.6 'auto squash (config true)': 
-	git config rebase.autosquash true &&
-	test_auto_squash ! squash-config-true &&
-	test_auto_squash squash-config-true-i -i &&
-	test_auto_squash ! squash-config-true-no --no-autosquash &&
-	test_auto_squash ! squash-config-true-i-no "-i --no-autosquash"
+	echo something >other-file &&
+	# No raciness with this file.
+	test-tool chmtime =-20 other-file &&
 
-HEAD is now at f0c2a7e second commit
-[main aa2cfac] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Current branch main is up to date.
-HEAD is now at f0c2a7e second commit
-[main a1a4b3d] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD 0b600c3] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-HEAD is now at f0c2a7e second commit
-[main 6ee55a2] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Current branch main is up to date.
-HEAD is now at f0c2a7e second commit
-[main 8980136] squash! first
+	echo "+cached content" >expect
+
+[master (root-commit) a4904a4] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/main.
-ok 6 - auto squash (config true)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 racy-file
+ok 1 - setup
 
-expecting success of 3415.7 'auto squash (config false)': 
-	git config rebase.autosquash false &&
-	test_auto_squash ! squash-config-false &&
-	test_auto_squash ! squash-config-false-i -i &&
-	test_auto_squash squash-config-false-yes --autosquash &&
-	test_auto_squash squash-config-false-i-yes "-i --autosquash"
+expecting success of 1701.2 'split the index while adding a racily clean file #0': 
+		rm -f .git/index .git/sharedindex.* &&
 
-HEAD is now at f0c2a7e second commit
-[main 803175e] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Current branch main is up to date.
-HEAD is now at f0c2a7e second commit
-[main 840a8d9] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/main.
-HEAD is now at f0c2a7e second commit
-[main cbc5c53] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD cbe440d] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-HEAD is now at f0c2a7e second commit
-[main f78136a] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD 2dd732a] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-ok 7 - auto squash (config false)
+		# The next three commands must be run within the same
+		# second (so both writes to racy-file result in the same
+		# mtime) to create the interesting racy situation.
+		echo "cached content" >racy-file &&
 
-expecting success of 3415.8 'misspelled auto squash': 
-	git reset --hard base &&
-	echo 1 >file1 &&
-	git add -u &&
-	test_tick &&
-	git commit -m "squash! forst" &&
-	git tag final-missquash &&
-	test_tick &&
-	git rebase --autosquash -i HEAD^^^ &&
-	git log --oneline >actual &&
-	test_line_count = 4 actual &&
-	git diff --exit-code final-missquash &&
-	git rev-list final-missquash...HEAD >list &&
-	test_must_be_empty list
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-HEAD is now at f0c2a7e second commit
-[main 75c5826] squash! forst
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/main.
-ok 8 - misspelled auto squash
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3415.9 'auto squash that matches 2 commits': 
-	git reset --hard base &&
-	echo 4 >file4 &&
-	git add file4 &&
-	test_tick &&
-	git commit -m "first new commit" &&
-	echo 1 >file1 &&
-	git add -u &&
-	test_tick &&
-	git commit -m "squash! first" -m "extra para for first" &&
-	git tag final-multisquash &&
-	test_tick &&
-	git rebase --autosquash -i HEAD~4 &&
-	git log --oneline >actual &&
-	test_line_count = 4 actual &&
-	git diff --exit-code final-multisquash &&
-	echo 1 >expect &&
-	git cat-file blob HEAD^^:file1 >actual &&
-	test_cmp expect actual &&
-	git cat-file commit HEAD^^ >commit &&
-	grep first commit >actual &&
-	test_line_count = 2 actual &&
-	git cat-file commit HEAD >commit &&
-	grep first commit >actual &&
-	test_line_count = 1 actual
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 2 - split the index while adding a racily clean file #0
 
-HEAD is now at f0c2a7e second commit
-[main 1b761d9] first new commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-[main d70dbe2] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/4)
[detached HEAD 927baf6] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/main.
-ok 9 - auto squash that matches 2 commits
+expecting success of 1701.3 'split the index while adding a racily clean file #1': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3415.10 'auto squash that matches a commit after the squash': 
-	git reset --hard base &&
-	echo 1 >file1 &&
-	git add -u &&
-	test_tick &&
-	git commit -m "squash! third" &&
-	echo 4 >file4 &&
-	git add file4 &&
-	test_tick &&
-	git commit -m "third commit" &&
-	git tag final-presquash &&
-	test_tick &&
-	git rebase --autosquash -i HEAD~4 &&
-	git log --oneline >actual &&
-	test_line_count = 5 actual &&
-	git diff --exit-code final-presquash &&
-	echo 0 >expect &&
-	git cat-file blob HEAD^^:file1 >actual &&
-	test_cmp expect actual &&
-	echo 1 >expect &&
-	git cat-file blob HEAD^:file1 >actual &&
-	test_cmp expect actual &&
-	git cat-file commit HEAD >commit &&
-	grep third commit >actual &&
-	test_line_count = 1 actual &&
-	git cat-file commit HEAD^ >commit &&
-	grep third commit >actual &&
-	test_line_count = 1 actual
+		# The next three commands must be run within the same
+		# second (so both writes to racy-file result in the same
+		# mtime) to create the interesting racy situation.
+		echo "cached content" >racy-file &&
 
-HEAD is now at f0c2a7e second commit
-[main 9714540] squash! third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 75567fa] third commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-Successfully rebased and updated refs/heads/main.
-ok 10 - auto squash that matches a commit after the squash
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-expecting success of 3415.11 'auto squash that matches a sha1': 
-	git reset --hard base &&
-	echo 1 >file1 &&
-	git add -u &&
-	test_tick &&
-	oid=$(git rev-parse --short HEAD^) &&
-	git commit -m "squash! $oid" -m "extra para" &&
-	git tag final-shasquash &&
-	test_tick &&
-	git rebase --autosquash -i HEAD^^^ &&
-	git log --oneline >actual &&
-	test_line_count = 3 actual &&
-	git diff --exit-code final-shasquash &&
-	echo 1 >expect &&
-	git cat-file blob HEAD^:file1 >actual &&
-	test_cmp expect actual &&
-	git cat-file commit HEAD^ >commit &&
-	! grep "squash" commit &&
-	grep "^extra para" commit >actual &&
-	test_line_count = 1 actual
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-HEAD is now at f0c2a7e second commit
-[main 3b312a0] squash! 244a0fe
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD b9e15f6] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-ok 11 - auto squash that matches a sha1
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 3 - split the index while adding a racily clean file #1
 
-expecting success of 3415.12 'auto squash that matches longer sha1': 
-	git reset --hard base &&
-	echo 1 >file1 &&
-	git add -u &&
-	test_tick &&
-	oid=$(git rev-parse --short=11 HEAD^) &&
-	git commit -m "squash! $oid" -m "extra para" &&
-	git tag final-longshasquash &&
-	test_tick &&
-	git rebase --autosquash -i HEAD^^^ &&
-	git log --oneline >actual &&
-	test_line_count = 3 actual &&
-	git diff --exit-code final-longshasquash &&
-	echo 1 >expect &&
-	git cat-file blob HEAD^:file1 >actual &&
-	test_cmp expect actual &&
-	git cat-file commit HEAD^ >commit &&
-	! grep "squash" commit &&
-	grep "^extra para" commit >actual &&
-	test_line_count = 1 actual
+expecting success of 1701.4 'split the index while adding a racily clean file #2': 
+		rm -f .git/index .git/sharedindex.* &&
 
-HEAD is now at f0c2a7e second commit
-[main 56b8696] squash! 244a0fe611d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD 31cb7fc] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-ok 12 - auto squash that matches longer sha1
+		# The next three commands must be run within the same
+		# second (so both writes to racy-file result in the same
+		# mtime) to create the interesting racy situation.
+		echo "cached content" >racy-file &&
 
-expecting success of 3415.13 'auto squash of fixup commit that matches branch name which points back to fixup commit': 
-	git reset --hard base &&
-	git commit --allow-empty -m "fixup! self-cycle" &&
-	git branch self-cycle &&
-	GIT_SEQUENCE_EDITOR="cat >tmp" git rebase --autosquash -i HEAD^^ &&
-	sed -ne "/^[^#]/{s/[0-9a-f]\{7,\}/HASH/g;p;}" tmp >actual &&
-	cat <<-EOF >expect &&
-	pick HASH # second commit
-	pick HASH # fixup! self-cycle # empty
-	EOF
-	test_cmp expect actual
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-HEAD is now at f0c2a7e second commit
-[main a4ce9a1] fixup! self-cycle
- Author: A U Thor <author@example.com>
-Successfully rebased and updated refs/heads/main.
-ok 13 - auto squash of fixup commit that matches branch name which points back to fixup commit
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3415.14 'use commit --fixup': 
-	test_auto_commit_flags fixup 1
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 4 - split the index while adding a racily clean file #2
 
-HEAD is now at f0c2a7e second commit
-[main edb6f7e] fixup! first commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-ok 14 - use commit --fixup
+expecting success of 1701.5 'split the index while adding a racily clean file #3': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3415.15 'use commit --squash': 
-	test_auto_commit_flags squash 2
+		# The next three commands must be run within the same
+		# second (so both writes to racy-file result in the same
+		# mtime) to create the interesting racy situation.
+		echo "cached content" >racy-file &&
 
-HEAD is now at f0c2a7e second commit
-[main a73a4cd] squash! first commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD 031171d] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-ok 15 - use commit --squash
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-expecting success of 3415.16 'fixup! fixup!': 
-	test_auto_fixup_fixup fixup fixup
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-HEAD is now at f0c2a7e second commit
-[main a97ca76] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 14d8294] fixup! fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/main.
-ok 16 - fixup! fixup!
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 5 - split the index while adding a racily clean file #3
 
-expecting success of 3415.17 'fixup! squash!': 
-	test_auto_fixup_fixup fixup squash
+expecting success of 1701.6 'split the index while adding a racily clean file #4': 
+		rm -f .git/index .git/sharedindex.* &&
 
-HEAD is now at f0c2a7e second commit
-[main 7adbe26] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main d0955c3] fixup! squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/main.
-ok 17 - fixup! squash!
+		# The next three commands must be run within the same
+		# second (so both writes to racy-file result in the same
+		# mtime) to create the interesting racy situation.
+		echo "cached content" >racy-file &&
 
-expecting success of 3415.18 'squash! squash!': 
-	test_auto_fixup_fixup squash squash
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-HEAD is now at f0c2a7e second commit
-[main 0a61927] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 5ccfd59] squash! squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-Rebasing (2/4)
Rebasing (3/4)
[detached HEAD 33d4933] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (4/4)
Successfully rebased and updated refs/heads/main.
-ok 18 - squash! squash!
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3415.19 'squash! fixup!': 
-	test_auto_fixup_fixup squash fixup
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 6 - split the index while adding a racily clean file #4
 
-HEAD is now at f0c2a7e second commit
-[main 0a64228] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main eb3b77a] squash! fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-Rebasing (2/4)
Rebasing (3/4)
[detached HEAD 4077931] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (4/4)
Successfully rebased and updated refs/heads/main.
-ok 19 - squash! fixup!
+expecting success of 1701.7 'add a racily clean file to an already split index #0': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3415.20 'autosquash with custom inst format': 
-	git reset --hard base &&
-	git config --add rebase.instructionFormat "[%an @ %ar] %s"  &&
-	echo 2 >file1 &&
-	git add -u &&
-	test_tick &&
-	oid=$(git rev-parse --short HEAD^) &&
-	git commit -m "squash! $oid" -m "extra para for first" &&
-	echo 1 >file1 &&
-	git add -u &&
-	test_tick &&
-	subject=$(git log -n 1 --format=%s HEAD~2) &&
-	git commit -m "squash! $subject" -m "second extra para for first" &&
-	git tag final-squash-instFmt &&
-	test_tick &&
-	git rebase --autosquash -i HEAD~4 &&
-	git log --oneline >actual &&
-	test_line_count = 3 actual &&
-	git diff --exit-code final-squash-instFmt &&
-	echo 1 >expect &&
-	git cat-file blob HEAD^:file1 >actual &&
-	test_cmp expect actual &&
-	git cat-file commit HEAD^ >commit &&
-	! grep "squash" commit &&
-	grep first commit >actual &&
-	test_line_count = 3 actual
+		git update-index --split-index &&
 
-HEAD is now at f0c2a7e second commit
-[main dda10d1] squash! 244a0fe
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 3d3c49b] squash! first commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/4)
Rebasing (3/4)
[detached HEAD 5f906d9] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (4/4)
Successfully rebased and updated refs/heads/main.
-ok 20 - autosquash with custom inst format
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3415.21 'autosquash with empty custom instructionFormat': 
-	git reset --hard base &&
-	test_commit empty-instructionFormat-test &&
-	(
-		set_cat_todo_editor &&
-		test_must_fail git -c rebase.instructionFormat= \
-			rebase --autosquash  --force-rebase -i HEAD^ >actual &&
-		git log -1 --format="pick %h # %s" >expect &&
-		test_cmp expect actual
-	)
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-HEAD is now at f0c2a7e second commit
-[main bd7d73b] empty-instructionFormat-test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 empty-instructionFormat-test.t
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-ok 21 - autosquash with empty custom instructionFormat
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3415.22 'autosquash with invalid custom instructionFormat': 
-	git reset --hard base &&
-	test_commit invalid-instructionFormat-test &&
-	(
-		test_must_fail git -c rebase.instructionFormat=blah \
-			rebase --autosquash  --force-rebase -i HEAD^ &&
-		test_path_is_missing .git/rebase-merge
-	)
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 7 - add a racily clean file to an already split index #0
 
-HEAD is now at f0c2a7e second commit
-[main a5c4c84] invalid-instructionFormat-test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 invalid-instructionFormat-test.t
-fatal: invalid --pretty format: # blah
-ok 22 - autosquash with invalid custom instructionFormat
+expecting success of 1701.8 'add a racily clean file to an already split index #1': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3415.23 'autosquash with multiple empty patches': 
-	test_tick &&
-	git commit --allow-empty -m "empty" &&
-	test_tick &&
-	git commit --allow-empty -m "empty2" &&
-	test_tick &&
-	>fixup &&
-	git add fixup &&
-	git commit --fixup HEAD^^ &&
-	(
-		set_backup_editor &&
-		GIT_USE_REBASE_HELPER=false \
-		git rebase -i --force-rebase --autosquash HEAD~4 &&
-		grep empty2 .git/backup-git-rebase-todo
-	)
+		git update-index --split-index &&
 
-[main 281d3f3] empty
- Author: A U Thor <author@example.com>
-[main 7748858] empty2
- Author: A U Thor <author@example.com>
-[main 842aea1] fixup! invalid-instructionFormat-test
- Author: A U Thor <author@example.com>
- 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 7748858 # [A U Thor @ 20 years ago] empty2 # empty
-ok 23 - autosquash with multiple empty patches
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3415.24 'extra spaces after fixup!': 
-	base=$(git rev-parse HEAD) &&
-	test_commit to-fixup &&
-	git commit --allow-empty -m "fixup!  to-fixup" &&
-	git rebase -i --autosquash --keep-empty HEAD~2 &&
-	parent=$(git rev-parse HEAD^) &&
-	test $base = $parent
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-[main 1f2bd5c] to-fixup
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-fixup.t
-[main 1fccff9] fixup!  to-fixup
- Author: A U Thor <author@example.com>
-Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
-ok 24 - extra spaces after fixup!
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3415.25 'wrapped original subject': 
-	if test -d .git/rebase-merge; then git rebase --abort; fi &&
-	base=$(git rev-parse HEAD) &&
-	echo "wrapped subject" >wrapped &&
-	git add wrapped &&
-	test_tick &&
-	git commit --allow-empty -m "$(printf "To\nfixup")" &&
-	test_tick &&
-	git commit --allow-empty -m "fixup! To fixup" &&
-	git rebase -i --autosquash --keep-empty HEAD~2 &&
-	parent=$(git rev-parse HEAD^) &&
-	test $base = $parent
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 8 - add a racily clean file to an already split index #1
 
-[main d729bb1] To fixup
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 wrapped
-[main 2fbc68a] fixup! To fixup
- Author: A U Thor <author@example.com>
-Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
-ok 25 - wrapped original subject
+expecting success of 1701.9 'add a racily clean file to an already split index #2': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3415.26 'abort last squash': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	test_when_finished "git checkout main" &&
+		git update-index --split-index &&
 
-	git checkout -b some-squashes &&
-	git commit --allow-empty -m first &&
-	git commit --allow-empty --squash HEAD &&
-	git commit --allow-empty -m second &&
-	git commit --allow-empty --squash HEAD &&
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-	test_must_fail git -c core.editor="grep -q ^pick" \
-		rebase -ki --autosquash HEAD~4 &&
-	: do not finish the squash, but resolve it manually &&
-	git commit --allow-empty --amend -m edited-first &&
-	git rebase --skip &&
-	git show >actual &&
-	! grep first actual
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-Switched to a new branch 'some-squashes'
-[some-squashes 6a03c74] first
- Author: A U Thor <author@example.com>
-[some-squashes cb6a143] squash! first
- Author: A U Thor <author@example.com>
-[some-squashes 86a2bca] second
- Author: A U Thor <author@example.com>
-[some-squashes 1fa2c82] squash! second
- 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 cb6a143... # [A U Thor @ 20 years ago] squash! first # empty
-[detached HEAD cd546b3] edited-first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 16:34:13 2005 -0700
-Rebasing (3/4)
Rebasing (4/4)
[detached HEAD e630f70] second
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 16:34:13 2005 -0700
-Successfully rebased and updated refs/heads/some-squashes.
-Switched to branch 'main'
-fatal: no rebase in progress
-ok 26 - abort last squash
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3415.27 'fixup a fixup': 
-	echo 0to-fixup >file0 &&
-	test_tick &&
-	git commit -m "to-fixup" file0 &&
-	test_tick &&
-	git commit --squash HEAD -m X --allow-empty &&
-	test_tick &&
-	git commit --squash HEAD^ -m Y --allow-empty &&
-	test_tick &&
-	git commit -m "squash! $(git rev-parse HEAD^)" -m Z --allow-empty &&
-	test_tick &&
-	git commit -m "squash! $(git rev-parse HEAD^^)" -m W --allow-empty &&
-	git rebase -ki --autosquash HEAD~5 &&
-	test XZWY = $(git show | tr -cd W-Z)
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 9 - add a racily clean file to an already split index #2
 
-[main bfbd802] to-fixup
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 79f57e9] squash! to-fixup
- Author: A U Thor <author@example.com>
-[main 6870054] squash! to-fixup
- Author: A U Thor <author@example.com>
-[main f0d8f1d] squash! 79f57e91ed6fd29da1b4a34f0614b6efa1bea276
- Author: A U Thor <author@example.com>
-[main b333853] squash! 79f57e91ed6fd29da1b4a34f0614b6efa1bea276
- Author: A U Thor <author@example.com>
-Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
[detached HEAD 8f0e069] to-fixup
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 16:35:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/main.
-ok 27 - fixup a fixup
+expecting success of 1701.10 'add a racily clean file to an already split index #3': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3415.28 'fixup does not clean up commit message': 
-	oneline="#818" &&
-	git commit --allow-empty -m "$oneline" &&
-	git commit --fixup HEAD --allow-empty &&
-	git -c commit.cleanup=strip rebase -ki --autosquash HEAD~2 &&
-	test "$oneline" = "$(git show -s --format=%s)"
+		git update-index --split-index &&
 
-[main 40f9e66] #818
- Author: A U Thor <author@example.com>
-[main de528f3] fixup! #818
- Author: A U Thor <author@example.com>
-Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
-ok 28 - fixup does not clean up commit message
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-# passed all 28 test(s)
-1..28
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3418-rebase-continue.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-	git checkout -b topic HEAD^ &&
-	test_commit "commit-new-file-F2-on-topic-branch" F2 22 &&
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-	git checkout main
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 10 - add a racily clean file to an already split index #3
 
-[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 1701.11 'add a racily clean file to an already split index #4': 
+		rm -f .git/index .git/sharedindex.* &&
 
-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 update-index --split-index &&
 
-	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-	test-tool chmtime =-60 F1 &&
-	git rebase --continue
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-HEAD is now at 953b3db commit-new-file-F2
-Already on 'main'
-rebase -i script before editing:
-pick 953b3db # commit-new-file-F2
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-rebase -i script after editing:
-edit 953b3db # commit-new-file-F2
-Rebasing (1/1)
Stopped at 953b3db...  # commit-new-file-F2
-You can amend the commit now, with
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-  git commit --amend 
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 11 - add a racily clean file to an already split index #4
 
-Once you are satisfied with your changes, run
+expecting success of 1701.12 'split the index when the index contains a racily clean cache entry #0': 
+		rm -f .git/index .git/sharedindex.* &&
 
-  git rebase --continue
-Successfully rebased and updated refs/heads/main.
-ok 2 - merge based rebase --continue with works with touched file
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3418.3 'merge based rebase --continue removes .git/MERGE_MSG': 
-	git checkout -f --detach topic &&
+		git update-index --add racy-file &&
 
-	test_must_fail git rebase --onto main HEAD^ &&
-	git read-tree --reset -u HEAD &&
-	test_path_is_file .git/MERGE_MSG &&
-	git rebase --continue &&
-	test_path_is_missing .git/MERGE_MSG
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-Rebasing (1/1)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-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 24c5d85... # commit-new-file-F2-on-topic-branch
-Successfully rebased and updated detached HEAD.
-ok 3 - merge based rebase --continue removes .git/MERGE_MSG
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 3418.4 'apply based rebase --continue works with touched file': 
-	rm -fr .git/rebase-* &&
-	git reset --hard &&
-	git checkout main &&
+		# Update and split the index when the index contains
+		# the racily clean cache entry of racy-file.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --split-index --add other-file &&
 
-	test_must_fail git rebase --apply --onto main main topic &&
-	echo "Resolved" >F2 &&
-	git add F2 &&
-	test-tool chmtime =-60 F1 &&
-	git rebase --continue
+		# Subsequent git commands should notice the smudged
+		# stat data in the replacement cache entry and that it
+		# doesnt match with the file the worktree.
+		check_cached_diff
+	
+ok 12 - split the index when the index contains a racily clean cache entry #0
 
-HEAD is now at 953b3db commit-new-file-F2
-Switched to branch 'main'
-First, rewinding head to replay your work on top of it...
-Applying: commit-new-file-F2-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-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 commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F2-on-topic-branch
-ok 4 - apply based rebase --continue works with touched file
+expecting success of 1701.13 'split the index when the index contains a racily clean cache entry #1': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3418.5 'rebase --continue can not be used with other options': 
-	test_must_fail git rebase -v --continue &&
-	test_must_fail git rebase --continue -v
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+		git update-index --add racy-file &&
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+		# Update and split the index when the index contains
+		# the racily clean cache entry of racy-file.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --split-index --add other-file &&
 
-ok 5 - rebase --continue can not be used with other options
+		# Subsequent git commands should notice the smudged
+		# stat data in the replacement cache entry and that it
+		# doesnt match with the file the worktree.
+		check_cached_diff
+	
+ok 13 - split the index when the index contains a racily clean cache entry #1
 
-expecting success of 3418.6 'rebase --continue remembers merge strategy and options': 
-	rm -fr .git/rebase-* &&
-	git reset --hard commit-new-file-F2-on-topic-branch &&
-	test_commit "commit-new-file-F3-on-topic-branch" F3 32 &&
-	test_when_finished "rm -fr test-bin" &&
-	mkdir test-bin &&
+expecting success of 1701.14 'split the index when the index contains a racily clean cache entry #2': 
+		rm -f .git/index .git/sharedindex.* &&
 
-	write_script test-bin/git-merge-funny <<-\EOF &&
-	printf "[%s]\n" $# "$1" "$2" "$3" "$5" >actual
-	shift 3 &&
-	exec git merge-recursive "$@"
-	EOF
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-	cat >expect <<-\EOF &&
-	[7]
-	[--option=arg with space]
-	[--op"tion\]
-	[--new
-	line ]
-	[--]
-	EOF
+		git update-index --add racy-file &&
 
-	rm -f actual &&
-	(
-		PATH=./test-bin:$PATH &&
-		test_must_fail git rebase -s funny -X"option=arg with space" \
-				-Xop\"tion\\ -X"new${LF}line " main topic
-	) &&
-	test_cmp expect actual &&
-	rm actual &&
-	echo "Resolved" >F2 &&
-	git add F2 &&
-	(
-		PATH=./test-bin:$PATH &&
-		git rebase --continue
-	) &&
-	test_cmp expect actual
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-[topic 39de9a1] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F3
-Rebasing (1/2)
Merging 953b3db31f61f8fc41bbcb85a1c76eadc748cf75 with 24c5d85f362d6c25d316c040586afc3e0548165a
-Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-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 24c5d85... # commit-new-file-F2-on-topic-branch
-[detached HEAD 6396a51] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Merging 6396a513d945e21e13de4128c5f8af13443529d5 with 39de9a17650c52c96f2d6848fba0d846df88a78f
-Successfully rebased and updated refs/heads/topic.
-ok 6 - rebase --continue remembers merge strategy and options
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 3418.7 'rebase -r passes merge strategy options correctly': 
-	rm -fr .git/rebase-* &&
-	git reset --hard commit-new-file-F3-on-topic-branch &&
-	test_commit merge-theirs &&
-	git reset --hard HEAD^ &&
-	test_commit some-other-commit &&
-	test_tick &&
-	git merge --no-ff merge-theirs &&
-	FAKE_LINES="1 3 edit 4 5 7 8 9" git rebase -i -f -r -m \
-		-s recursive --strategy-option=theirs HEAD~2 &&
-	test_commit force-change-ours &&
-	git rebase --continue
+		# Update and split the index when the index contains
+		# the racily clean cache entry of racy-file.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --split-index --add other-file &&
 
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-[topic b1d70bd] merge-theirs
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 merge-theirs.t
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-[topic ffb1279] some-other-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 some-other-commit.t
-Merge made by the 'ort' strategy.
- merge-theirs.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 merge-theirs.t
-rebase -i script before editing:
-label onto
+		# Subsequent git commands should notice the smudged
+		# stat data in the replacement cache entry and that it
+		# doesnt match with the file the worktree.
+		check_cached_diff
+	
+ok 14 - split the index when the index contains a racily clean cache entry #2
 
-reset onto
-pick b1d70bd # merge-theirs
-label merge-theirs
+expecting success of 1701.15 'split the index when the index contains a racily clean cache entry #3': 
+		rm -f .git/index .git/sharedindex.* &&
 
-reset onto
-pick ffb1279 # some-other-commit
-merge -C bb27065 merge-theirs # Merge tag 'merge-theirs' into topic
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-rebase -i script after editing:
-label onto
-reset onto
-edit b1d70bd # merge-theirs
-label merge-theirs
-reset onto
-pick ffb1279 # some-other-commit
-merge -C bb27065 merge-theirs # Merge tag 'merge-theirs' into topic
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Stopped at b1d70bd...  # merge-theirs
-You can amend the commit now, with
+		git update-index --add racy-file &&
 
-  git commit --amend 
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-Once you are satisfied with your changes, run
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-  git rebase --continue
-[detached HEAD 6393337] force-change-ours
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 force-change-ours.t
-Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Merge made by the 'recursive' strategy.
-Successfully rebased and updated refs/heads/topic.
-ok 7 - rebase -r passes merge strategy options correctly
+		# Update and split the index when the index contains
+		# the racily clean cache entry of racy-file.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --split-index --add other-file &&
 
-expecting success of 3418.8 '--skip after failed fixup cleans commit message': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -b with-conflicting-fixup &&
-	test_commit wants-fixup &&
-	test_commit "fixup 1" wants-fixup.t 1 wants-fixup-1 &&
-	test_commit "fixup 2" wants-fixup.t 2 wants-fixup-2 &&
-	test_commit "fixup 3" wants-fixup.t 3 wants-fixup-3 &&
-	test_must_fail env FAKE_LINES="1 fixup 2 squash 4" \
-		git rebase -i HEAD~4 &&
+		# Subsequent git commands should notice the smudged
+		# stat data in the replacement cache entry and that it
+		# doesnt match with the file the worktree.
+		check_cached_diff
+	
+ok 15 - split the index when the index contains a racily clean cache entry #3
 
-	: now there is a conflict, and comments in the commit message &&
-	test_commit_message HEAD <<-\EOF &&
-	# This is a combination of 2 commits.
-	# This is the 1st commit message:
+expecting success of 1701.16 'split the index when the index contains a racily clean cache entry #4': 
+		rm -f .git/index .git/sharedindex.* &&
 
-	wants-fixup
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-	# The commit message #2 will be skipped:
+		git update-index --add racy-file &&
 
-	# fixup 1
-	EOF
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-	: skip and continue &&
-	echo "cp \"\$1\" .git/copy.txt" | write_script copy-editor.sh &&
-	(test_set_editor "$PWD/copy-editor.sh" && git rebase --skip) &&
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-	: the user should not have had to edit the commit message &&
-	test_path_is_missing .git/copy.txt &&
+		# Update and split the index when the index contains
+		# the racily clean cache entry of racy-file.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --split-index --add other-file &&
 
-	: now the comments in the commit message should have been cleaned up &&
-	test_commit_message HEAD -m wants-fixup &&
+		# Subsequent git commands should notice the smudged
+		# stat data in the replacement cache entry and that it
+		# doesnt match with the file the worktree.
+		check_cached_diff
+	
+ok 16 - split the index when the index contains a racily clean cache entry #4
 
-	: now, let us ensure that "squash" is handled correctly &&
-	git reset --hard wants-fixup-3 &&
-	test_must_fail env FAKE_LINES="1 squash 2 squash 1 squash 3 squash 1" \
-		git rebase -i HEAD~4 &&
+expecting success of 1701.17 'update the split index when it contains a new racily clean cache entry #0': 
+		rm -f .git/index .git/sharedindex.* &&
 
-	: the second squash failed, but there are two more in the chain &&
-	(test_set_editor "$PWD/copy-editor.sh" &&
-	 test_must_fail git rebase --skip) &&
+		git update-index --split-index &&
 
-	: not the final squash, no need to edit the commit message &&
-	test_path_is_missing .git/copy.txt &&
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-	: The first and third squashes succeeded, therefore: &&
-	test_commit_message HEAD <<-\EOF &&
-	# This is a combination of 3 commits.
-	# This is the 1st commit message:
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-	wants-fixup
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-	# This is the commit message #2:
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-	fixup 1
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the split index.
+		# An updated cache entry with smudged stat data should
+		# be added to the new split index.
+		git update-index --add other-file &&
 
-	# This is the commit message #3:
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 17 - update the split index when it contains a new racily clean cache entry #0
 
-	fixup 2
-	EOF
+expecting success of 1701.18 'update the split index when it contains a new racily clean cache entry #1': 
+		rm -f .git/index .git/sharedindex.* &&
 
-	(test_set_editor "$PWD/copy-editor.sh" && git rebase --skip) &&
-	test_commit_message HEAD <<-\EOF &&
-	wants-fixup
+		git update-index --split-index &&
 
-	fixup 1
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-	fixup 2
-	EOF
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-	: Final squash failed, but there was still a squash &&
-	head -n1 .git/copy.txt >first-line &&
-	test_grep "# This is a combination of 3 commits" first-line &&
-	test_grep "# This is the commit message #3:" .git/copy.txt
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-Switched to a new branch 'with-conflicting-fixup'
-[with-conflicting-fixup c5541cc] wants-fixup
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 wants-fixup.t
-[with-conflicting-fixup 1453cf1] fixup 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[with-conflicting-fixup f2bd94a] fixup 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[with-conflicting-fixup 265fcdc] fixup 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-rebase -i script before editing:
-pick c5541cc # wants-fixup
-pick 1453cf1 # fixup 1
-pick f2bd94a # fixup 2
-pick 265fcdc # fixup 3
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-rebase -i script after editing:
-pick c5541cc # wants-fixup
-fixup 1453cf1 # fixup 1
-squash 265fcdc # fixup 3
-Rebasing (2/3)
Rebasing (3/3)
Auto-merging wants-fixup.t
-CONFLICT (content): Merge conflict in wants-fixup.t
-error: could not apply 265fcdc... fixup 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 265fcdc... # fixup 3
-Successfully rebased and updated refs/heads/with-conflicting-fixup.
-HEAD is now at 265fcdc fixup 3
-rebase -i script before editing:
-pick c5541cc # wants-fixup
-pick 1453cf1 # fixup 1
-pick f2bd94a # fixup 2
-pick 265fcdc # fixup 3
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the split index.
+		# An updated cache entry with smudged stat data should
+		# be added to the new split index.
+		git update-index --add other-file &&
 
-rebase -i script after editing:
-pick c5541cc # wants-fixup
-squash 1453cf1 # fixup 1
-squash c5541cc # wants-fixup
-squash f2bd94a # fixup 2
-squash c5541cc # wants-fixup
-Rebasing (2/5)
Rebasing (3/5)
Auto-merging wants-fixup.t
-CONFLICT (add/add): Merge conflict in wants-fixup.t
-error: could not apply c5541cc... wants-fixup
-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 c5541cc... # wants-fixup
-Rebasing (4/5)
Rebasing (5/5)
Auto-merging wants-fixup.t
-CONFLICT (add/add): Merge conflict in wants-fixup.t
-error: could not apply c5541cc... wants-fixup
-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 c5541cc... # wants-fixup
-[detached HEAD c5ae848] wants-fixup
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 wants-fixup.t
-Successfully rebased and updated refs/heads/with-conflicting-fixup.
-# This is a combination of 3 commits.
-# This is the commit message #3:
-fatal: no rebase in progress
-ok 8 - --skip after failed fixup cleans commit message
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 18 - update the split index when it contains a new racily clean cache entry #1
 
-expecting success of 3418.9 'setup rerere database': 
-	rm -fr .git/rebase-* &&
-	git reset --hard commit-new-file-F3-on-topic-branch &&
-	git checkout main &&
-	test_commit "commit-new-file-F3" F3 3 &&
-	test_config rerere.enabled true &&
-	git update-ref refs/heads/topic commit-new-file-F3-on-topic-branch &&
-	test_must_fail git rebase -m main topic &&
-	echo "Resolved" >F2 &&
-	cp F2 expected-F2 &&
-	git add F2 &&
-	test_must_fail git rebase --continue &&
-	echo "Resolved" >F3 &&
-	cp F3 expected-F3 &&
-	git add F3 &&
-	git rebase --continue &&
-	git reset --hard topic@{1}
+expecting success of 1701.19 'update the split index when it contains a new racily clean cache entry #2': 
+		rm -f .git/index .git/sharedindex.* &&
 
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-[main 544942a] commit-new-file-F3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F3
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-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"
-Recorded preimage for 'F2'
-Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
-Recorded resolution for 'F2'.
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-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"
-Recorded preimage for 'F3'
-Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
-Recorded resolution for 'F3'.
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-ok 9 - setup rerere database
+		git update-index --split-index &&
 
-expecting success of 3418.10 'rebase --apply --continue remembers --rerere-autoupdate': 
-		prepare &&
-		test_must_fail git rebase $action --rerere-autoupdate main topic &&
-		test_cmp expected-F2 F2 &&
-		git diff-files --quiet &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		git diff-files --quiet &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-First, rewinding head to replay your work on top of it...
-Applying: commit-new-file-F2-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-Staged 'F2' using previous resolution.
-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 commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F3-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-Staged 'F3' using previous resolution.
-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 commit-new-file-F3-on-topic-branch
-Applying: commit-new-file-F3-on-topic-branch
-ok 10 - rebase --apply --continue remembers --rerere-autoupdate
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3418.11 'rebase --apply --continue honors rerere.autoUpdate': 
-		prepare &&
-		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action main topic &&
-		test_cmp expected-F2 F2 &&
-		git diff-files --quiet &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		git diff-files --quiet &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-First, rewinding head to replay your work on top of it...
-Applying: commit-new-file-F2-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-Staged 'F2' using previous resolution.
-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 commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F3-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-Staged 'F3' using previous resolution.
-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 commit-new-file-F3-on-topic-branch
-Applying: commit-new-file-F3-on-topic-branch
-ok 11 - rebase --apply --continue honors rerere.autoUpdate
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-expecting success of 3418.12 'rebase --apply --continue remembers --no-rerere-autoupdate': 
-		prepare &&
-		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
-		test_cmp expected-F2 F2 &&
-		test_must_fail git diff-files --quiet &&
-		git add F2 &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		test_must_fail git diff-files --quiet &&
-		git add F3 &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-First, rewinding head to replay your work on top of it...
-Applying: commit-new-file-F2-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-Resolved 'F2' using previous resolution.
-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 commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F3-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-Resolved 'F3' using previous resolution.
-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 commit-new-file-F3-on-topic-branch
-Applying: commit-new-file-F3-on-topic-branch
-ok 12 - rebase --apply --continue remembers --no-rerere-autoupdate
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3418.13 'rebase -m --continue remembers --rerere-autoupdate': 
-		prepare &&
-		test_must_fail git rebase $action --rerere-autoupdate main topic &&
-		test_cmp expected-F2 F2 &&
-		git diff-files --quiet &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		git diff-files --quiet &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-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"
-Staged 'F2' using previous resolution.
-Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-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"
-Staged 'F3' using previous resolution.
-Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-ok 13 - rebase -m --continue remembers --rerere-autoupdate
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 3418.14 'rebase -m --continue honors rerere.autoUpdate': 
-		prepare &&
-		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action main topic &&
-		test_cmp expected-F2 F2 &&
-		git diff-files --quiet &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		git diff-files --quiet &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-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"
-Staged 'F2' using previous resolution.
-Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-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"
-Staged 'F3' using previous resolution.
-Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-ok 14 - rebase -m --continue honors rerere.autoUpdate
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the split index.
+		# An updated cache entry with smudged stat data should
+		# be added to the new split index.
+		git update-index --add other-file &&
 
-expecting success of 3418.15 'rebase -m --continue remembers --no-rerere-autoupdate': 
-		prepare &&
-		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
-		test_cmp expected-F2 F2 &&
-		test_must_fail git diff-files --quiet &&
-		git add F2 &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		test_must_fail git diff-files --quiet &&
-		git add F3 &&
-		git rebase --continue
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
 	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-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"
-Resolved 'F2' using previous resolution.
-Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-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"
-Resolved 'F3' using previous resolution.
-Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-ok 15 - rebase -m --continue remembers --no-rerere-autoupdate
+ok 19 - update the split index when it contains a new racily clean cache entry #2
 
-expecting success of 3418.16 'rebase -i --continue remembers --rerere-autoupdate': 
-		prepare &&
-		test_must_fail git rebase $action --rerere-autoupdate main topic &&
-		test_cmp expected-F2 F2 &&
-		git diff-files --quiet &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		git diff-files --quiet &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-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"
-Staged 'F2' using previous resolution.
-Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-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"
-Staged 'F3' using previous resolution.
-Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-ok 16 - rebase -i --continue remembers --rerere-autoupdate
+expecting success of 1701.20 'update the split index when it contains a new racily clean cache entry #3': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3418.17 'rebase -i --continue honors rerere.autoUpdate': 
-		prepare &&
-		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action main topic &&
-		test_cmp expected-F2 F2 &&
-		git diff-files --quiet &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		git diff-files --quiet &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-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"
-Staged 'F2' using previous resolution.
-Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-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"
-Staged 'F3' using previous resolution.
-Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-ok 17 - rebase -i --continue honors rerere.autoUpdate
+		git update-index --split-index &&
 
-expecting success of 3418.18 'rebase -i --continue remembers --no-rerere-autoupdate': 
-		prepare &&
-		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
-		test_cmp expected-F2 F2 &&
-		test_must_fail git diff-files --quiet &&
-		git add F2 &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		test_must_fail git diff-files --quiet &&
-		git add F3 &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-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"
-Resolved 'F2' using previous resolution.
-Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-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"
-Resolved 'F3' using previous resolution.
-Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-ok 18 - rebase -i --continue remembers --no-rerere-autoupdate
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3418.19 'the todo command "break" works': 
-	rm -f execed &&
-	FAKE_LINES="break b exec_>execed" git rebase -i HEAD &&
-	test_path_is_missing execed &&
-	git rebase --continue &&
-	test_path_is_missing execed &&
-	git rebase --continue &&
-	test_path_is_file execed
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-rebase -i script before editing:
-noop
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-rebase -i script after editing:
-break
-b
-exec >execed
-Rebasing (1/3)
Stopped at 6cb54c7 (commit-new-file-F3-on-topic-branch)
-Rebasing (2/3)
Stopped at 6cb54c7 (commit-new-file-F3-on-topic-branch)
-Rebasing (3/3)
Executing: >execed
-Successfully rebased and updated refs/heads/topic.
-ok 19 - the todo command "break" works
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 3418.20 'patch file is removed before break command': 
-	test_when_finished "git rebase --abort" &&
-	cat >todo <<-\EOF &&
-	pick commit-new-file-F2-on-topic-branch
-	break
-	EOF
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the split index.
+		# An updated cache entry with smudged stat data should
+		# be added to the new split index.
+		git update-index --add other-file &&
 
-	(
-		set_replace_editor todo &&
-		test_must_fail git rebase -i --onto commit-new-file-F2 HEAD
-	) &&
-	test_path_is_file .git/rebase-merge/patch &&
-	echo 22>F2 &&
-	git add F2 &&
-	git rebase --continue &&
-	test_path_is_missing .git/rebase-merge/patch
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 20 - update the split index when it contains a new racily clean cache entry #3
 
-rebase -i script after editing:
-pick commit-new-file-F2-on-topic-branch
-break
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-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"
-Resolved 'F2' using previous resolution.
-Could not apply 24c5d85... 
-[detached HEAD cf7125b] 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)
-ok 20 - patch file is removed before break command
+expecting success of 1701.21 'update the split index when it contains a new racily clean cache entry #4': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3418.21 '--reschedule-failed-exec': 
-	test_when_finished "git rebase --abort" &&
-	test_must_fail git rebase -x false --reschedule-failed-exec HEAD^ &&
-	grep "^exec false" .git/rebase-merge/git-rebase-todo &&
-	git rebase --abort &&
-	test_must_fail git -c rebase.rescheduleFailedExec=true \
-		rebase -x false HEAD^ 2>err &&
-	grep "^exec false" .git/rebase-merge/git-rebase-todo &&
-	test_grep "has been rescheduled" err
+		git update-index --split-index &&
 
-Rebasing (2/2)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-  git rebase --continue
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-hint: Could not execute the todo command
-hint:
-hint:     exec false
-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
-exec false
-exec false
-hint: It has been rescheduled; To edit the command before continuing, please
-ok 21 - --reschedule-failed-exec
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 3418.22 'rebase.rescheduleFailedExec only affects `rebase -i`': 
-	test_config rebase.rescheduleFailedExec true &&
-	test_must_fail git rebase -x false HEAD^ &&
-	grep "^exec false" .git/rebase-merge/git-rebase-todo &&
-	git rebase --abort &&
-	git rebase HEAD^
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the split index.
+		# An updated cache entry with smudged stat data should
+		# be added to the new split index.
+		git update-index --add other-file &&
 
-Rebasing (2/2)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 21 - update the split index when it contains a new racily clean cache entry #4
 
-  git rebase --continue
+expecting success of 1701.22 'update the split index when a racily clean cache entry is stored only in the shared index #0': 
+		rm -f .git/index .git/sharedindex.* &&
 
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-hint: Could not execute the todo command
-hint:
-hint:     exec false
-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
-exec false
-Current branch topic is up to date.
-ok 22 - rebase.rescheduleFailedExec only affects `rebase -i`
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-expecting success of 3418.23 'rebase.rescheduleFailedExec=true & --no-reschedule-failed-exec': 
-	test_when_finished "git rebase --abort" &&
-	test_config rebase.rescheduleFailedExec true &&
-	test_must_fail git rebase -x false --no-reschedule-failed-exec HEAD~2 &&
-	test_must_fail git rebase --continue 2>err &&
-	! grep "has been rescheduled" err
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-Rebasing (2/4)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-  git rebase --continue
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the shared index.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --add other-file &&
 
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 22 - update the split index when a racily clean cache entry is stored only in the shared index #0
 
-ok 23 - rebase.rescheduleFailedExec=true & --no-reschedule-failed-exec
+expecting success of 1701.23 'update the split index when a racily clean cache entry is stored only in the shared index #1': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3418.24 'new rebase.rescheduleFailedExec=true setting in an ongoing rebase is ignored': 
-	test_when_finished "git rebase --abort" &&
-	test_must_fail git rebase -x false HEAD~2 &&
-	test_config rebase.rescheduleFailedExec true &&
-	test_must_fail git rebase --continue 2>err &&
-	! grep "has been rescheduled" err
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-Rebasing (2/4)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-  git rebase --continue
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-ok 24 - new rebase.rescheduleFailedExec=true setting in an ongoing rebase is ignored
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the shared index.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --add other-file &&
 
-expecting success of 3418.25 'there is no --no-reschedule-failed-exec in an ongoing rebase': 
-	test_when_finished "git rebase --abort" &&
-	test_must_fail git rebase -x false HEAD~2 &&
-	test_expect_code 129 git rebase --continue --no-reschedule-failed-exec &&
-	test_expect_code 129 git rebase --edit-todo --no-reschedule-failed-exec
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 23 - update the split index when a racily clean cache entry is stored only in the shared index #1
 
-Rebasing (2/4)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
+expecting success of 1701.24 'update the split index when a racily clean cache entry is stored only in the shared index #2': 
+		rm -f .git/index .git/sharedindex.* &&
 
-  git rebase --continue
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the shared index.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --add other-file &&
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 24 - update the split index when a racily clean cache entry is stored only in the shared index #2
 
-ok 25 - there is no --no-reschedule-failed-exec in an ongoing rebase
+expecting success of 1701.25 'update the split index when a racily clean cache entry is stored only in the shared index #3': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3418.26 'no change in comment character due to conflicts markers with core.commentChar=auto': 
-	git checkout -b branch-a &&
-	test_commit A F1 &&
-	git checkout -b branch-b HEAD^ &&
-	test_commit B F1 &&
-	test_must_fail git rebase branch-a &&
-	printf "B\nA\n" >F1 &&
-	git add F1 &&
-	GIT_EDITOR="cat >actual" git -c core.commentChar=auto rebase --continue &&
-	# Check that "#" is still the comment character.
-	test_grep "^# Changes to be committed" actual
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-Switched to a new branch 'branch-a'
-[branch-a 1d5c201] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branch-b'
-[branch-b 4a7301d] B
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the shared index.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 25 - update the split index when a racily clean cache entry is stored only in the shared index #3
+
+expecting success of 1701.26 'update the split index when a racily clean cache entry is stored only in the shared index #4': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the shared index.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 26 - update the split index when a racily clean cache entry is stored only in the shared index #4
+
+expecting success of 1701.27 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #0': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index after unpack_trees() copied the
+		# racily clean cache entry of racy-file from the shared
+		# index.  A corresponding replacement cache entry
+		# with smudged stat data should be added to the new
+		# split index.
+		git read-tree -m HEAD &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 27 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #0
+
+expecting success of 1701.28 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #1': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index after unpack_trees() copied the
+		# racily clean cache entry of racy-file from the shared
+		# index.  A corresponding replacement cache entry
+		# with smudged stat data should be added to the new
+		# split index.
+		git read-tree -m HEAD &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 28 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #1
+
+expecting success of 1701.29 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #2': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index after unpack_trees() copied the
+		# racily clean cache entry of racy-file from the shared
+		# index.  A corresponding replacement cache entry
+		# with smudged stat data should be added to the new
+		# split index.
+		git read-tree -m HEAD &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 29 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #2
+
+expecting success of 1701.30 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #3': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index after unpack_trees() copied the
+		# racily clean cache entry of racy-file from the shared
+		# index.  A corresponding replacement cache entry
+		# with smudged stat data should be added to the new
+		# split index.
+		git read-tree -m HEAD &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 30 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #3
+
+expecting success of 1701.31 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #4': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index after unpack_trees() copied the
+		# racily clean cache entry of racy-file from the shared
+		# index.  A corresponding replacement cache entry
+		# with smudged stat data should be added to the new
+		# split index.
+		git read-tree -m HEAD &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 31 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #4
+
+# passed all 31 test(s)
+1..31
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3419-rebase-patch-id.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/1)
Auto-merging F1
-CONFLICT (content): Merge conflict in F1
-error: could not apply 4a7301d... B
+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"
-Recorded preimage for 'F1'
-Could not apply 4a7301d... # B
-Recorded resolution for 'F1'.
-[detached HEAD ce30074] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Successfully rebased and updated refs/heads/branch-b.
-# Changes to be committed:
-ok 26 - no change in comment character due to conflicts markers with core.commentChar=auto
+Could not apply bb8cb29... # initial
+ok 6 - do not drop patch
 
-expecting success of 3418.27 'rebase --apply sets ORIG_HEAD correctly': 
-		git checkout topic &&
-		git reset --hard commit-new-file-F2-on-topic-branch &&
-		test_orig_head_helper $type main
-	
-Switched to branch 'topic'
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-First, rewinding head to replay your work on top of it...
-Applying: commit-new-file-F2-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-Resolved 'F2' using previous resolution.
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed 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"
-Patch failed at 0001 commit-new-file-F2-on-topic-branch
-Already on 'topic'
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-ok 27 - rebase --apply sets ORIG_HEAD correctly
+Could not apply bb8cb29... # initial
+ok 7 - do not drop patch binary
 
-expecting success of 3418.28 'rebase --apply <upstream> <branch> sets ORIG_HEAD correctly': 
-		git checkout main &&
-		test_orig_head_helper $type main topic
-	
+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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3416-rebase-onto-threedots.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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'
-First, rewinding head to replay your work on top of it...
-Applying: commit-new-file-F2-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-Resolved 'F2' using previous resolution.
-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 commit-new-file-F2-on-topic-branch
-Already on 'topic'
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-ok 28 - rebase --apply <upstream> <branch> sets ORIG_HEAD correctly
+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 3418.29 'rebase --merge sets ORIG_HEAD correctly': 
-		git checkout topic &&
-		git reset --hard commit-new-file-F2-on-topic-branch &&
-		test_orig_head_helper $type main
-	
+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 24c5d85 commit-new-file-F2-on-topic-branch
-Rebasing (1/1)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-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"
-Resolved 'F2' using previous resolution.
-Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
+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 24c5d85 commit-new-file-F2-on-topic-branch
-ok 29 - rebase --merge sets ORIG_HEAD correctly
+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
 
-expecting success of 3418.30 'rebase --merge <upstream> <branch> sets ORIG_HEAD correctly': 
-		git checkout main &&
-		test_orig_head_helper $type main topic
-	
 Switched to branch 'main'
-Rebasing (1/1)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3423-rebase-reword.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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"
-Resolved 'F2' using previous resolution.
-Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
-Already on 'topic'
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-ok 30 - rebase --merge <upstream> <branch> sets ORIG_HEAD correctly
+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 30 test(s)
-1..30
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3303-notes-subtrees.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3422-rebase-incompatible-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3422-rebase-incompatible-options/.git/
+expecting success of 3422.1 'setup': 
+	test_seq 2 9 >foo &&
+	git add foo &&
+	git commit -m orig &&
+
+	git branch A &&
+	git branch B &&
+
+	git checkout A &&
+	test_seq 1 9 >foo &&
+	git add foo &&
+	git commit -m A &&
+
+	git checkout B &&
+	echo "q qfoo();" | q_to_tab >>foo &&
+	git add foo &&
+	git commit -m B
+
+[master (root-commit) 3639f03] orig
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 foo
+Switched to branch 'A'
+[A ef5b704] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 079b709] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 3422.2 '--whitespace=fix incompatible with --merge': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --merge A
+	
+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 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 2 - --whitespace=fix incompatible with --merge
+
+expecting success of 3422.3 '--whitespace=fix incompatible with --strategy=ours': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --strategy=ours A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 3 - --whitespace=fix incompatible with --strategy=ours
+
+expecting success of 3422.4 '--whitespace=fix incompatible with --strategy-option=ours': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --strategy-option=ours A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 4 - --whitespace=fix incompatible with --strategy-option=ours
+
+expecting success of 3422.5 '--whitespace=fix incompatible with --autosquash': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --autosquash A
+	
+HEAD is now at 079b709 B
+fatal: --autosquash requires the merge backend
+ok 5 - --whitespace=fix incompatible with --autosquash
+
+expecting success of 3422.6 '--whitespace=fix incompatible with --interactive': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --interactive A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 6 - --whitespace=fix incompatible with --interactive
+
+expecting success of 3422.7 '--whitespace=fix incompatible with --exec': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --exec 'true' A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 7 - --whitespace=fix incompatible with --exec
+
+expecting success of 3422.8 '--whitespace=fix incompatible with --keep-empty': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --keep-empty A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 8 - --whitespace=fix incompatible with --keep-empty
+
+expecting success of 3422.9 '--whitespace=fix incompatible with --empty=...': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --empty=ask A
+	
+HEAD is now at 079b709 B
+warning: --empty=ask is deprecated; use '--empty=stop' instead.
+fatal: apply options and merge options cannot be used together
+ok 9 - --whitespace=fix incompatible with --empty=...
+
+expecting success of 3422.10 '--whitespace=fix incompatible with --no-reapply-cherry-picks': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --no-reapply-cherry-picks A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 10 - --whitespace=fix incompatible with --no-reapply-cherry-picks
+
+expecting success of 3422.11 '--whitespace=fix incompatible with --reapply-cherry-picks': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --reapply-cherry-picks A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 11 - --whitespace=fix incompatible with --reapply-cherry-picks
+
+expecting success of 3422.12 '--whitespace=fix incompatible with --rebase-merges': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --rebase-merges A
+	
+HEAD is now at 079b709 B
+fatal: --rebase-merges requires the merge backend
+ok 12 - --whitespace=fix incompatible with --rebase-merges
+
+expecting success of 3422.13 '--whitespace=fix incompatible with --update-refs': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --update-refs A
+	
+HEAD is now at 079b709 B
+fatal: --update-refs requires the merge backend
+ok 13 - --whitespace=fix incompatible with --update-refs
+
+expecting success of 3422.14 '--whitespace=fix incompatible with --root without --onto': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --root A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 14 - --whitespace=fix incompatible with --root without --onto
+
+expecting success of 3422.15 '--whitespace=fix incompatible with rebase.rebaseMerges': 
+		git checkout B^0 &&
+		test_must_fail git -c rebase.rebaseMerges=true rebase --whitespace=fix A 2>err &&
+		grep -e --no-rebase-merges err
+	
+HEAD is now at 079b709 B
+fatal: apply options are incompatible with rebase.rebaseMerges.  Consider adding --no-rebase-merges
+ok 15 - --whitespace=fix incompatible with rebase.rebaseMerges
+
+expecting success of 3422.16 '--whitespace=fix incompatible with rebase.updateRefs': 
+		git checkout B^0 &&
+		test_must_fail git -c rebase.updateRefs=true rebase --whitespace=fix A 2>err &&
+		grep -e --no-update-refs err
+	
+HEAD is now at 079b709 B
+fatal: apply options are incompatible with rebase.updateRefs.  Consider adding --no-update-refs
+ok 16 - --whitespace=fix incompatible with rebase.updateRefs
+
+expecting success of 3422.17 '--whitespace=fix okay with overridden rebase.rebaseMerges': 
+		test_when_finished "git reset --hard B^0" &&
+		git checkout B^0 &&
+		git -c rebase.rebaseMerges=true rebase --no-rebase-merges --whitespace=fix A
+	
+HEAD is now at 079b709 B
+First, rewinding head to replay your work on top of it...
+Applying: B
+HEAD is now at 079b709 B
+ok 17 - --whitespace=fix okay with overridden rebase.rebaseMerges
+
+expecting success of 3422.18 '--whitespace=fix okay with overridden rebase.updateRefs': 
+		test_when_finished "git reset --hard B^0" &&
+		git checkout B^0 &&
+		git -c rebase.updateRefs=true rebase --no-update-refs --whitespace=fix A
+	
+HEAD is now at 079b709 B
+First, rewinding head to replay your work on top of it...
+Applying: B
+HEAD is now at 079b709 B
+ok 18 - --whitespace=fix okay with overridden rebase.updateRefs
+
+expecting success of 3422.19 '-C4 incompatible with --merge': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --merge A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 19 - -C4 incompatible with --merge
+
+expecting success of 3422.20 '-C4 incompatible with --strategy=ours': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --strategy=ours A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 20 - -C4 incompatible with --strategy=ours
+
+expecting success of 3422.21 '-C4 incompatible with --strategy-option=ours': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --strategy-option=ours A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 21 - -C4 incompatible with --strategy-option=ours
+
+expecting success of 3422.22 '-C4 incompatible with --autosquash': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --autosquash A
+	
+HEAD is now at 079b709 B
+fatal: --autosquash requires the merge backend
+ok 22 - -C4 incompatible with --autosquash
+
+expecting success of 3422.23 '-C4 incompatible with --interactive': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --interactive A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 23 - -C4 incompatible with --interactive
+
+expecting success of 3422.24 '-C4 incompatible with --exec': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --exec 'true' A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 24 - -C4 incompatible with --exec
+
+expecting success of 3422.25 '-C4 incompatible with --keep-empty': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --keep-empty A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 25 - -C4 incompatible with --keep-empty
+
+expecting success of 3422.26 '-C4 incompatible with --empty=...': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --empty=ask A
+	
+HEAD is now at 079b709 B
+warning: --empty=ask is deprecated; use '--empty=stop' instead.
+fatal: apply options and merge options cannot be used together
+ok 26 - -C4 incompatible with --empty=...
+
+expecting success of 3422.27 '-C4 incompatible with --no-reapply-cherry-picks': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --no-reapply-cherry-picks A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 27 - -C4 incompatible with --no-reapply-cherry-picks
+
+expecting success of 3422.28 '-C4 incompatible with --reapply-cherry-picks': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --reapply-cherry-picks A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 28 - -C4 incompatible with --reapply-cherry-picks
+
+expecting success of 3422.29 '-C4 incompatible with --rebase-merges': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --rebase-merges A
+	
+HEAD is now at 079b709 B
+fatal: --rebase-merges requires the merge backend
+ok 29 - -C4 incompatible with --rebase-merges
+
+expecting success of 3422.30 '-C4 incompatible with --update-refs': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --update-refs A
+	
+HEAD is now at 079b709 B
+fatal: --update-refs requires the merge backend
+ok 30 - -C4 incompatible with --update-refs
+
+expecting success of 3422.31 '-C4 incompatible with --root without --onto': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --root A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 31 - -C4 incompatible with --root without --onto
+
+expecting success of 3422.32 '-C4 incompatible with rebase.rebaseMerges': 
+		git checkout B^0 &&
+		test_must_fail git -c rebase.rebaseMerges=true rebase -C4 A 2>err &&
+		grep -e --no-rebase-merges err
+	
+HEAD is now at 079b709 B
+fatal: apply options are incompatible with rebase.rebaseMerges.  Consider adding --no-rebase-merges
+ok 32 - -C4 incompatible with rebase.rebaseMerges
+
+expecting success of 3422.33 '-C4 incompatible with rebase.updateRefs': 
+		git checkout B^0 &&
+		test_must_fail git -c rebase.updateRefs=true rebase -C4 A 2>err &&
+		grep -e --no-update-refs err
+	
+HEAD is now at 079b709 B
+fatal: apply options are incompatible with rebase.updateRefs.  Consider adding --no-update-refs
+ok 33 - -C4 incompatible with rebase.updateRefs
+
+expecting success of 3422.34 '-C4 okay with overridden rebase.rebaseMerges': 
+		test_when_finished "git reset --hard B^0" &&
+		git checkout B^0 &&
+		git -c rebase.rebaseMerges=true rebase --no-rebase-merges -C4 A
+	
+HEAD is now at 079b709 B
+First, rewinding head to replay your work on top of it...
+Applying: B
+HEAD is now at 079b709 B
+ok 34 - -C4 okay with overridden rebase.rebaseMerges
+
+expecting success of 3422.35 '-C4 okay with overridden rebase.updateRefs': 
+		test_when_finished "git reset --hard B^0" &&
+		git checkout B^0 &&
+		git -c rebase.updateRefs=true rebase --no-update-refs -C4 A
+	
+HEAD is now at 079b709 B
+First, rewinding head to replay your work on top of it...
+Applying: B
+HEAD is now at 079b709 B
+ok 35 - -C4 okay with overridden rebase.updateRefs
+
+expecting success of 3422.36 '--apply incompatible with --merge': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --merge A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 36 - --apply incompatible with --merge
+
+expecting success of 3422.37 '--apply incompatible with --strategy=ours': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --strategy=ours A
+	
+HEAD is now at 079b709 B
+fatal: --strategy requires the merge backend
+ok 37 - --apply incompatible with --strategy=ours
+
+expecting success of 3422.38 '--apply incompatible with --strategy-option=ours': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --strategy-option=ours A
+	
+HEAD is now at 079b709 B
+fatal: --strategy requires the merge backend
+ok 38 - --apply incompatible with --strategy-option=ours
+
+expecting success of 3422.39 '--apply incompatible with --autosquash': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --autosquash A
+	
+HEAD is now at 079b709 B
+fatal: --autosquash requires the merge backend
+ok 39 - --apply incompatible with --autosquash
+
+expecting success of 3422.40 '--apply incompatible with --interactive': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --interactive A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 40 - --apply incompatible with --interactive
+
+expecting success of 3422.41 '--apply incompatible with --exec': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --exec 'true' A
+	
+HEAD is now at 079b709 B
+fatal: --exec requires the merge backend
+ok 41 - --apply incompatible with --exec
+
+expecting success of 3422.42 '--apply incompatible with --keep-empty': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --keep-empty A
+	
+HEAD is now at 079b709 B
+fatal: --keep-empty requires the merge backend
+ok 42 - --apply incompatible with --keep-empty
+
+expecting success of 3422.43 '--apply incompatible with --empty=...': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --empty=ask A
+	
+HEAD is now at 079b709 B
+warning: --empty=ask is deprecated; use '--empty=stop' instead.
+fatal: --empty requires the merge backend
+ok 43 - --apply incompatible with --empty=...
+
+expecting success of 3422.44 '--apply incompatible with --no-reapply-cherry-picks': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --no-reapply-cherry-picks A
+	
+HEAD is now at 079b709 B
+fatal: --no-reapply-cherry-picks requires the merge backend
+ok 44 - --apply incompatible with --no-reapply-cherry-picks
+
+expecting success of 3422.45 '--apply incompatible with --reapply-cherry-picks': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --reapply-cherry-picks A
+	
+HEAD is now at 079b709 B
+fatal: --reapply-cherry-picks requires the merge backend
+ok 45 - --apply incompatible with --reapply-cherry-picks
+
+expecting success of 3422.46 '--apply incompatible with --rebase-merges': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --rebase-merges A
+	
+HEAD is now at 079b709 B
+fatal: --rebase-merges requires the merge backend
+ok 46 - --apply incompatible with --rebase-merges
+
+expecting success of 3422.47 '--apply incompatible with --update-refs': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --update-refs A
+	
+HEAD is now at 079b709 B
+fatal: --update-refs requires the merge backend
+ok 47 - --apply incompatible with --update-refs
+
+expecting success of 3422.48 '--apply incompatible with --root without --onto': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --root A
+	
+HEAD is now at 079b709 B
+fatal: --root without --onto requires the merge backend
+ok 48 - --apply incompatible with --root without --onto
+
+expecting success of 3422.49 '--apply incompatible with rebase.rebaseMerges': 
+		git checkout B^0 &&
+		test_must_fail git -c rebase.rebaseMerges=true rebase --apply A 2>err &&
+		grep -e --no-rebase-merges err
+	
+HEAD is now at 079b709 B
+fatal: apply options are incompatible with rebase.rebaseMerges.  Consider adding --no-rebase-merges
+ok 49 - --apply incompatible with rebase.rebaseMerges
+
+expecting success of 3422.50 '--apply incompatible with rebase.updateRefs': 
+		git checkout B^0 &&
+		test_must_fail git -c rebase.updateRefs=true rebase --apply A 2>err &&
+		grep -e --no-update-refs err
+	
+HEAD is now at 079b709 B
+fatal: apply options are incompatible with rebase.updateRefs.  Consider adding --no-update-refs
+ok 50 - --apply incompatible with rebase.updateRefs
+
+expecting success of 3422.51 '--apply okay with overridden rebase.rebaseMerges': 
+		test_when_finished "git reset --hard B^0" &&
+		git checkout B^0 &&
+		git -c rebase.rebaseMerges=true rebase --no-rebase-merges --apply A
+	
+HEAD is now at 079b709 B
+First, rewinding head to replay your work on top of it...
+Applying: B
+HEAD is now at 079b709 B
+ok 51 - --apply okay with overridden rebase.rebaseMerges
+
+expecting success of 3422.52 '--apply okay with overridden rebase.updateRefs': 
+		test_when_finished "git reset --hard B^0" &&
+		git checkout B^0 &&
+		git -c rebase.updateRefs=true rebase --no-update-refs --apply A
+	
+HEAD is now at 079b709 B
+First, rewinding head to replay your work on top of it...
+Applying: B
+HEAD is now at 079b709 B
+ok 52 - --apply okay with overridden rebase.updateRefs
+
+# passed all 52 test(s)
+1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3424-rebase-empty.sh ***
@@ -168891,6 +167836,2376 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3425-rebase-topology-merges.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3425-rebase-topology-merges/.git/
+expecting success of 3425.1 'setup of non-linear-history': 
+	test_commit a &&
+	test_commit b &&
+	test_commit c &&
+	git checkout b &&
+	test_commit d &&
+	test_commit e &&
+
+	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 &&
+
+	git checkout d &&
+	test_commit n &&
+	test_commit o &&
+	test_merge w e &&
+	test_merge v c &&
+	git checkout o &&
+	test_commit z
+
+[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
+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
+Previous HEAD position was 09e072f f
+HEAD is now at 1bd0260 d
+[detached HEAD 35a5a4f] n
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n.t
+[detached HEAD a60ff6b] o
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 o.t
+Merge made by the 'ort' strategy.
+ e.t | 1 +
+ 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
+Previous HEAD position was 253142b v
+HEAD is now at a60ff6b o
+[detached HEAD 6fadda8] z
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z.t
+ok 1 - setup of non-linear-history
+
+expecting success of 3425.2 'rebase --apply after merge from upstream': 
+		reset_rebase &&
+		git rebase --apply e w &&
+		test_cmp_rev e HEAD~2 &&
+		test_linear_range 'n o' e..
+	
+fatal: no rebase in progress
+HEAD is now at 6fadda8 z
+First, rewinding head to replay your work on top of it...
+Applying: n
+Applying: o
+ok 2 - rebase --apply after merge from upstream
+
+expecting success of 3425.3 'rebase -m after merge from upstream': 
+		reset_rebase &&
+		git rebase -m e w &&
+		test_cmp_rev e HEAD~2 &&
+		test_linear_range 'n o' e..
+	
+fatal: no rebase in progress
+HEAD is now at 4cd4d2a o
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 3 - rebase -m after merge from upstream
+
+expecting success of 3425.4 'rebase -i after merge from upstream': 
+		reset_rebase &&
+		git rebase -i e w &&
+		test_cmp_rev e HEAD~2 &&
+		test_linear_range 'n o' e..
+	
+fatal: no rebase in progress
+HEAD is now at 4cd4d2a o
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 4 - rebase -i after merge from upstream
+
+expecting success of 3425.5 'rebase --apply of non-linear history is linearized in place': 
+		reset_rebase &&
+		git rebase --apply d w &&
+		test_cmp_rev d HEAD~3 &&
+		test_linear_range 'n o e' d..
+	
+fatal: no rebase in progress
+HEAD is now at 4cd4d2a o
+First, rewinding head to replay your work on top of it...
+Applying: n
+Applying: o
+Applying: e
+ok 5 - rebase --apply of non-linear history is linearized in place
+
+expecting success of 3425.6 'rebase -m of non-linear history is linearized in place': 
+		reset_rebase &&
+		git rebase -m d w &&
+		test_cmp_rev d HEAD~3 &&
+		test_linear_range 'n o e' d..
+	
+fatal: no rebase in progress
+HEAD is now at 9e9424c e
+Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 6 - rebase -m of non-linear history is linearized in place
+
+expecting success of 3425.7 'rebase -i of non-linear history is linearized in place': 
+		reset_rebase &&
+		git rebase -i d w &&
+		test_cmp_rev d HEAD~3 &&
+		test_linear_range 'n o e' d..
+	
+fatal: no rebase in progress
+HEAD is now at ef67882 e
+Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 7 - rebase -i of non-linear history is linearized in place
+
+expecting success of 3425.8 'rebase --apply of non-linear history is linearized upstream': 
+		reset_rebase &&
+		git rebase --apply c w &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at ef67882 e
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: n
+Applying: o
+Applying: e
+ok 8 - rebase --apply of non-linear history is linearized upstream
+
+expecting success of 3425.9 'rebase -m of non-linear history is linearized upstream': 
+		reset_rebase &&
+		git rebase -m c w &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 9 - rebase -m of non-linear history is linearized upstream
+
+expecting success of 3425.10 'rebase -i of non-linear history is linearized upstream': 
+		reset_rebase &&
+		git rebase -i c w &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 10 - rebase -i of non-linear history is linearized upstream
+
+expecting success of 3425.11 'rebase --apply of non-linear history with merges after upstream merge is linearized': 
+		reset_rebase &&
+		git rebase --apply c v &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: n
+Applying: o
+Applying: e
+ok 11 - rebase --apply of non-linear history with merges after upstream merge is linearized
+
+expecting success of 3425.12 'rebase -m of non-linear history with merges after upstream merge is linearized': 
+		reset_rebase &&
+		git rebase -m c v &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 12 - rebase -m of non-linear history with merges after upstream merge is linearized
+
+expecting success of 3425.13 'rebase -i of non-linear history with merges after upstream merge is linearized': 
+		reset_rebase &&
+		git rebase -i c v &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 13 - rebase -i of non-linear history with merges after upstream merge is linearized
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3415-rebase-autosquash.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3415-rebase-autosquash/.git/
+expecting success of 3415.1 'setup': 
+	echo 0 >file0 &&
+	git add . &&
+	test_tick &&
+	git commit -m "initial commit" &&
+	echo 0 >file1 &&
+	echo 2 >file2 &&
+	git add . &&
+	test_tick &&
+	git commit -m "first commit" &&
+	git tag first-commit &&
+	echo 3 >file3 &&
+	git add . &&
+	test_tick &&
+	git commit -m "second commit" &&
+	git tag base
+
+[main (root-commit) d78c915] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file0
+[main 244a0fe] first commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+[main f0c2a7e] second commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+ok 1 - setup
+
+expecting success of 3415.2 'auto fixup (option)': 
+	test_auto_fixup fixup-option --autosquash &&
+	test_auto_fixup fixup-option-i "--autosquash -i"
+
+HEAD is now at f0c2a7e second commit
+[main e17f730] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+HEAD is now at f0c2a7e second commit
+[main f84b6d6] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+ok 2 - auto fixup (option)
+
+expecting success of 3415.3 'auto fixup (config true)': 
+	git config rebase.autosquash true &&
+	test_auto_fixup ! fixup-config-true &&
+	test_auto_fixup fixup-config-true-i -i &&
+	test_auto_fixup ! fixup-config-true-no --no-autosquash &&
+	test_auto_fixup ! fixup-config-true-i-no "-i --no-autosquash"
+
+HEAD is now at f0c2a7e second commit
+[main 03041cb] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Current branch main is up to date.
+HEAD is now at f0c2a7e second commit
+[main bee11d3] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+HEAD is now at f0c2a7e second commit
+[main 1469752] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Current branch main is up to date.
+HEAD is now at f0c2a7e second commit
+[main 11d4929] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/main.
+ok 3 - auto fixup (config true)
+
+expecting success of 3415.4 'auto fixup (config false)': 
+	git config rebase.autosquash false &&
+	test_auto_fixup ! fixup-config-false &&
+	test_auto_fixup ! fixup-config-false-i -i &&
+	test_auto_fixup fixup-config-false-yes --autosquash &&
+	test_auto_fixup fixup-config-false-i-yes "-i --autosquash"
+
+HEAD is now at f0c2a7e second commit
+[main ba7bf68] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Current branch main is up to date.
+HEAD is now at f0c2a7e second commit
+[main ac63a35] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/main.
+HEAD is now at f0c2a7e second commit
+[main d9d1dd1] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+HEAD is now at f0c2a7e second commit
+[main 9dd95ee] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+ok 4 - auto fixup (config false)
+
+expecting success of 3415.5 'auto squash (option)': 
+	test_auto_squash squash-option --autosquash &&
+	test_auto_squash squash-option-i "--autosquash -i"
+
+HEAD is now at f0c2a7e second commit
+[main dce065e] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
[detached HEAD 6abb6fe] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+HEAD is now at f0c2a7e second commit
+[main e78a7a1] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
[detached HEAD 5f4f4e7] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+ok 5 - auto squash (option)
+
+expecting success of 3415.6 'auto squash (config true)': 
+	git config rebase.autosquash true &&
+	test_auto_squash ! squash-config-true &&
+	test_auto_squash squash-config-true-i -i &&
+	test_auto_squash ! squash-config-true-no --no-autosquash &&
+	test_auto_squash ! squash-config-true-i-no "-i --no-autosquash"
+
+HEAD is now at f0c2a7e second commit
+[main aa2cfac] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Current branch main is up to date.
+HEAD is now at f0c2a7e second commit
+[main a1a4b3d] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
[detached HEAD 0b600c3] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+HEAD is now at f0c2a7e second commit
+[main 6ee55a2] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Current branch main is up to date.
+HEAD is now at f0c2a7e second commit
+[main 8980136] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/main.
+ok 6 - auto squash (config true)
+
+expecting success of 3415.7 'auto squash (config false)': 
+	git config rebase.autosquash false &&
+	test_auto_squash ! squash-config-false &&
+	test_auto_squash ! squash-config-false-i -i &&
+	test_auto_squash squash-config-false-yes --autosquash &&
+	test_auto_squash squash-config-false-i-yes "-i --autosquash"
+
+HEAD is now at f0c2a7e second commit
+[main 803175e] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Current branch main is up to date.
+HEAD is now at f0c2a7e second commit
+[main 840a8d9] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/main.
+HEAD is now at f0c2a7e second commit
+[main cbc5c53] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
[detached HEAD cbe440d] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+HEAD is now at f0c2a7e second commit
+[main f78136a] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
[detached HEAD 2dd732a] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+ok 7 - auto squash (config false)
+
+expecting success of 3415.8 'misspelled auto squash': 
+	git reset --hard base &&
+	echo 1 >file1 &&
+	git add -u &&
+	test_tick &&
+	git commit -m "squash! forst" &&
+	git tag final-missquash &&
+	test_tick &&
+	git rebase --autosquash -i HEAD^^^ &&
+	git log --oneline >actual &&
+	test_line_count = 4 actual &&
+	git diff --exit-code final-missquash &&
+	git rev-list final-missquash...HEAD >list &&
+	test_must_be_empty list
+
+HEAD is now at f0c2a7e second commit
+[main 75c5826] squash! forst
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/main.
+ok 8 - misspelled auto squash
+
+expecting success of 3415.9 'auto squash that matches 2 commits': 
+	git reset --hard base &&
+	echo 4 >file4 &&
+	git add file4 &&
+	test_tick &&
+	git commit -m "first new commit" &&
+	echo 1 >file1 &&
+	git add -u &&
+	test_tick &&
+	git commit -m "squash! first" -m "extra para for first" &&
+	git tag final-multisquash &&
+	test_tick &&
+	git rebase --autosquash -i HEAD~4 &&
+	git log --oneline >actual &&
+	test_line_count = 4 actual &&
+	git diff --exit-code final-multisquash &&
+	echo 1 >expect &&
+	git cat-file blob HEAD^^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^^ >commit &&
+	grep first commit >actual &&
+	test_line_count = 2 actual &&
+	git cat-file commit HEAD >commit &&
+	grep first commit >actual &&
+	test_line_count = 1 actual
+
+HEAD is now at f0c2a7e second commit
+[main 1b761d9] first new commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+[main d70dbe2] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/4)
[detached HEAD 927baf6] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/main.
+ok 9 - auto squash that matches 2 commits
+
+expecting success of 3415.10 'auto squash that matches a commit after the squash': 
+	git reset --hard base &&
+	echo 1 >file1 &&
+	git add -u &&
+	test_tick &&
+	git commit -m "squash! third" &&
+	echo 4 >file4 &&
+	git add file4 &&
+	test_tick &&
+	git commit -m "third commit" &&
+	git tag final-presquash &&
+	test_tick &&
+	git rebase --autosquash -i HEAD~4 &&
+	git log --oneline >actual &&
+	test_line_count = 5 actual &&
+	git diff --exit-code final-presquash &&
+	echo 0 >expect &&
+	git cat-file blob HEAD^^:file1 >actual &&
+	test_cmp expect actual &&
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD >commit &&
+	grep third commit >actual &&
+	test_line_count = 1 actual &&
+	git cat-file commit HEAD^ >commit &&
+	grep third commit >actual &&
+	test_line_count = 1 actual
+
+HEAD is now at f0c2a7e second commit
+[main 9714540] squash! third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 75567fa] third commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+Successfully rebased and updated refs/heads/main.
+ok 10 - auto squash that matches a commit after the squash
+
+expecting success of 3415.11 'auto squash that matches a sha1': 
+	git reset --hard base &&
+	echo 1 >file1 &&
+	git add -u &&
+	test_tick &&
+	oid=$(git rev-parse --short HEAD^) &&
+	git commit -m "squash! $oid" -m "extra para" &&
+	git tag final-shasquash &&
+	test_tick &&
+	git rebase --autosquash -i HEAD^^^ &&
+	git log --oneline >actual &&
+	test_line_count = 3 actual &&
+	git diff --exit-code final-shasquash &&
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^ >commit &&
+	! grep "squash" commit &&
+	grep "^extra para" commit >actual &&
+	test_line_count = 1 actual
+
+HEAD is now at f0c2a7e second commit
+[main 3b312a0] squash! 244a0fe
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
[detached HEAD b9e15f6] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+ok 11 - auto squash that matches a sha1
+
+expecting success of 3415.12 'auto squash that matches longer sha1': 
+	git reset --hard base &&
+	echo 1 >file1 &&
+	git add -u &&
+	test_tick &&
+	oid=$(git rev-parse --short=11 HEAD^) &&
+	git commit -m "squash! $oid" -m "extra para" &&
+	git tag final-longshasquash &&
+	test_tick &&
+	git rebase --autosquash -i HEAD^^^ &&
+	git log --oneline >actual &&
+	test_line_count = 3 actual &&
+	git diff --exit-code final-longshasquash &&
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^ >commit &&
+	! grep "squash" commit &&
+	grep "^extra para" commit >actual &&
+	test_line_count = 1 actual
+
+HEAD is now at f0c2a7e second commit
+[main 56b8696] squash! 244a0fe611d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
[detached HEAD 31cb7fc] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+ok 12 - auto squash that matches longer sha1
+
+expecting success of 3415.13 'auto squash of fixup commit that matches branch name which points back to fixup commit': 
+	git reset --hard base &&
+	git commit --allow-empty -m "fixup! self-cycle" &&
+	git branch self-cycle &&
+	GIT_SEQUENCE_EDITOR="cat >tmp" git rebase --autosquash -i HEAD^^ &&
+	sed -ne "/^[^#]/{s/[0-9a-f]\{7,\}/HASH/g;p;}" tmp >actual &&
+	cat <<-EOF >expect &&
+	pick HASH # second commit
+	pick HASH # fixup! self-cycle # empty
+	EOF
+	test_cmp expect actual
+
+HEAD is now at f0c2a7e second commit
+[main a4ce9a1] fixup! self-cycle
+ Author: A U Thor <author@example.com>
+Successfully rebased and updated refs/heads/main.
+ok 13 - auto squash of fixup commit that matches branch name which points back to fixup commit
+
+expecting success of 3415.14 'use commit --fixup': 
+	test_auto_commit_flags fixup 1
+
+HEAD is now at f0c2a7e second commit
+[main edb6f7e] fixup! first commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+ok 14 - use commit --fixup
+
+expecting success of 3415.15 'use commit --squash': 
+	test_auto_commit_flags squash 2
+
+HEAD is now at f0c2a7e second commit
+[main a73a4cd] squash! first commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
[detached HEAD 031171d] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
+ok 15 - use commit --squash
+
+expecting success of 3415.16 'fixup! fixup!': 
+	test_auto_fixup_fixup fixup fixup
+
+HEAD is now at f0c2a7e second commit
+[main a97ca76] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 14d8294] fixup! fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/main.
+ok 16 - fixup! fixup!
+
+expecting success of 3415.17 'fixup! squash!': 
+	test_auto_fixup_fixup fixup squash
+
+HEAD is now at f0c2a7e second commit
+[main 7adbe26] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main d0955c3] fixup! squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/main.
+ok 17 - fixup! squash!
+
+expecting success of 3415.18 'squash! squash!': 
+	test_auto_fixup_fixup squash squash
+
+HEAD is now at f0c2a7e second commit
+[main 0a61927] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 5ccfd59] squash! squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+Rebasing (2/4)
Rebasing (3/4)
[detached HEAD 33d4933] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (4/4)
Successfully rebased and updated refs/heads/main.
+ok 18 - squash! squash!
+
+expecting success of 3415.19 'squash! fixup!': 
+	test_auto_fixup_fixup squash fixup
+
+HEAD is now at f0c2a7e second commit
+[main 0a64228] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main eb3b77a] squash! fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+Rebasing (2/4)
Rebasing (3/4)
[detached HEAD 4077931] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (4/4)
Successfully rebased and updated refs/heads/main.
+ok 19 - squash! fixup!
+
+expecting success of 3415.20 'autosquash with custom inst format': 
+	git reset --hard base &&
+	git config --add rebase.instructionFormat "[%an @ %ar] %s"  &&
+	echo 2 >file1 &&
+	git add -u &&
+	test_tick &&
+	oid=$(git rev-parse --short HEAD^) &&
+	git commit -m "squash! $oid" -m "extra para for first" &&
+	echo 1 >file1 &&
+	git add -u &&
+	test_tick &&
+	subject=$(git log -n 1 --format=%s HEAD~2) &&
+	git commit -m "squash! $subject" -m "second extra para for first" &&
+	git tag final-squash-instFmt &&
+	test_tick &&
+	git rebase --autosquash -i HEAD~4 &&
+	git log --oneline >actual &&
+	test_line_count = 3 actual &&
+	git diff --exit-code final-squash-instFmt &&
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^ >commit &&
+	! grep "squash" commit &&
+	grep first commit >actual &&
+	test_line_count = 3 actual
+
+HEAD is now at f0c2a7e second commit
+[main dda10d1] squash! 244a0fe
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 3d3c49b] squash! first commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/4)
Rebasing (3/4)
[detached HEAD 5f906d9] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (4/4)
Successfully rebased and updated refs/heads/main.
+ok 20 - autosquash with custom inst format
+
+expecting success of 3415.21 'autosquash with empty custom instructionFormat': 
+	git reset --hard base &&
+	test_commit empty-instructionFormat-test &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git -c rebase.instructionFormat= \
+			rebase --autosquash  --force-rebase -i HEAD^ >actual &&
+		git log -1 --format="pick %h # %s" >expect &&
+		test_cmp expect actual
+	)
+
+HEAD is now at f0c2a7e second commit
+[main bd7d73b] empty-instructionFormat-test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 empty-instructionFormat-test.t
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+ok 21 - autosquash with empty custom instructionFormat
+
+expecting success of 3415.22 'autosquash with invalid custom instructionFormat': 
+	git reset --hard base &&
+	test_commit invalid-instructionFormat-test &&
+	(
+		test_must_fail git -c rebase.instructionFormat=blah \
+			rebase --autosquash  --force-rebase -i HEAD^ &&
+		test_path_is_missing .git/rebase-merge
+	)
+
+HEAD is now at f0c2a7e second commit
+[main a5c4c84] invalid-instructionFormat-test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 invalid-instructionFormat-test.t
+fatal: invalid --pretty format: # blah
+ok 22 - autosquash with invalid custom instructionFormat
+
+expecting success of 3415.23 'autosquash with multiple empty patches': 
+	test_tick &&
+	git commit --allow-empty -m "empty" &&
+	test_tick &&
+	git commit --allow-empty -m "empty2" &&
+	test_tick &&
+	>fixup &&
+	git add fixup &&
+	git commit --fixup HEAD^^ &&
+	(
+		set_backup_editor &&
+		GIT_USE_REBASE_HELPER=false \
+		git rebase -i --force-rebase --autosquash HEAD~4 &&
+		grep empty2 .git/backup-git-rebase-todo
+	)
+
+[main 281d3f3] empty
+ Author: A U Thor <author@example.com>
+[main 7748858] empty2
+ Author: A U Thor <author@example.com>
+[main 842aea1] fixup! invalid-instructionFormat-test
+ Author: A U Thor <author@example.com>
+ 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 7748858 # [A U Thor @ 21 years ago] empty2 # empty
+ok 23 - autosquash with multiple empty patches
+
+expecting success of 3415.24 'extra spaces after fixup!': 
+	base=$(git rev-parse HEAD) &&
+	test_commit to-fixup &&
+	git commit --allow-empty -m "fixup!  to-fixup" &&
+	git rebase -i --autosquash --keep-empty HEAD~2 &&
+	parent=$(git rev-parse HEAD^) &&
+	test $base = $parent
+
+[main 1f2bd5c] to-fixup
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to-fixup.t
+[main 1fccff9] fixup!  to-fixup
+ Author: A U Thor <author@example.com>
+Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
+ok 24 - extra spaces after fixup!
+
+expecting success of 3415.25 'wrapped original subject': 
+	if test -d .git/rebase-merge; then git rebase --abort; fi &&
+	base=$(git rev-parse HEAD) &&
+	echo "wrapped subject" >wrapped &&
+	git add wrapped &&
+	test_tick &&
+	git commit --allow-empty -m "$(printf "To\nfixup")" &&
+	test_tick &&
+	git commit --allow-empty -m "fixup! To fixup" &&
+	git rebase -i --autosquash --keep-empty HEAD~2 &&
+	parent=$(git rev-parse HEAD^) &&
+	test $base = $parent
+
+[main d729bb1] To fixup
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 wrapped
+[main 2fbc68a] fixup! To fixup
+ Author: A U Thor <author@example.com>
+Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
+ok 25 - wrapped original subject
+
+expecting success of 3415.26 'abort last squash': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	test_when_finished "git checkout main" &&
+
+	git checkout -b some-squashes &&
+	git commit --allow-empty -m first &&
+	git commit --allow-empty --squash HEAD &&
+	git commit --allow-empty -m second &&
+	git commit --allow-empty --squash HEAD &&
+
+	test_must_fail git -c core.editor="grep -q ^pick" \
+		rebase -ki --autosquash HEAD~4 &&
+	: do not finish the squash, but resolve it manually &&
+	git commit --allow-empty --amend -m edited-first &&
+	git rebase --skip &&
+	git show >actual &&
+	! grep first actual
+
+Switched to a new branch 'some-squashes'
+[some-squashes 6a03c74] first
+ Author: A U Thor <author@example.com>
+[some-squashes cb6a143] squash! first
+ Author: A U Thor <author@example.com>
+[some-squashes 86a2bca] second
+ Author: A U Thor <author@example.com>
+[some-squashes 1fa2c82] squash! second
+ 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 cb6a143... # [A U Thor @ 21 years ago] squash! first # empty
+[detached HEAD cd546b3] edited-first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 16:34:13 2005 -0700
+Rebasing (3/4)
Rebasing (4/4)
[detached HEAD e630f70] second
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 16:34:13 2005 -0700
+Successfully rebased and updated refs/heads/some-squashes.
+Switched to branch 'main'
+fatal: no rebase in progress
+ok 26 - abort last squash
+
+expecting success of 3415.27 'fixup a fixup': 
+	echo 0to-fixup >file0 &&
+	test_tick &&
+	git commit -m "to-fixup" file0 &&
+	test_tick &&
+	git commit --squash HEAD -m X --allow-empty &&
+	test_tick &&
+	git commit --squash HEAD^ -m Y --allow-empty &&
+	test_tick &&
+	git commit -m "squash! $(git rev-parse HEAD^)" -m Z --allow-empty &&
+	test_tick &&
+	git commit -m "squash! $(git rev-parse HEAD^^)" -m W --allow-empty &&
+	git rebase -ki --autosquash HEAD~5 &&
+	test XZWY = $(git show | tr -cd W-Z)
+
+[main bfbd802] to-fixup
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 79f57e9] squash! to-fixup
+ Author: A U Thor <author@example.com>
+[main 6870054] squash! to-fixup
+ Author: A U Thor <author@example.com>
+[main f0d8f1d] squash! 79f57e91ed6fd29da1b4a34f0614b6efa1bea276
+ Author: A U Thor <author@example.com>
+[main b333853] squash! 79f57e91ed6fd29da1b4a34f0614b6efa1bea276
+ Author: A U Thor <author@example.com>
+Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
[detached HEAD 8f0e069] to-fixup
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 16:35:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/main.
+ok 27 - fixup a fixup
+
+expecting success of 3415.28 'fixup does not clean up commit message': 
+	oneline="#818" &&
+	git commit --allow-empty -m "$oneline" &&
+	git commit --fixup HEAD --allow-empty &&
+	git -c commit.cleanup=strip rebase -ki --autosquash HEAD~2 &&
+	test "$oneline" = "$(git show -s --format=%s)"
+
+[main 40f9e66] #818
+ Author: A U Thor <author@example.com>
+[main de528f3] fixup! #818
+ Author: A U Thor <author@example.com>
+Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
+ok 28 - fixup does not clean up commit message
+
+# passed all 28 test(s)
+1..28
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3418-rebase-continue.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+
+HEAD is now at 953b3db commit-new-file-F2
+Already on 'main'
+rebase -i script before editing:
+pick 953b3db # commit-new-file-F2
+
+rebase -i script after editing:
+edit 953b3db # commit-new-file-F2
+Rebasing (1/1)
Stopped at 953b3db...  # commit-new-file-F2
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+Successfully rebased and updated refs/heads/main.
+ok 2 - merge based rebase --continue with works with touched file
+
+expecting success of 3418.3 'merge based rebase --continue removes .git/MERGE_MSG': 
+	git checkout -f --detach topic &&
+
+	test_must_fail git rebase --onto main HEAD^ &&
+	git read-tree --reset -u HEAD &&
+	test_path_is_file .git/MERGE_MSG &&
+	git rebase --continue &&
+	test_path_is_missing .git/MERGE_MSG
+
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+Rebasing (1/1)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+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 24c5d85... # commit-new-file-F2-on-topic-branch
+Successfully rebased and updated detached HEAD.
+ok 3 - merge based rebase --continue removes .git/MERGE_MSG
+
+expecting success of 3418.4 'apply based rebase --continue works with touched file': 
+	rm -fr .git/rebase-* &&
+	git reset --hard &&
+	git checkout main &&
+
+	test_must_fail git rebase --apply --onto main main topic &&
+	echo "Resolved" >F2 &&
+	git add F2 &&
+	test-tool chmtime =-60 F1 &&
+	git rebase --continue
+
+HEAD is now at 953b3db commit-new-file-F2
+Switched to branch 'main'
+First, rewinding head to replay your work on top of it...
+Applying: commit-new-file-F2-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+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 commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F2-on-topic-branch
+ok 4 - apply based rebase --continue works with touched file
+
+expecting success of 3418.5 'rebase --continue can not be used with other options': 
+	test_must_fail git rebase -v --continue &&
+	test_must_fail git rebase --continue -v
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+ok 5 - rebase --continue can not be used with other options
+
+expecting success of 3418.6 'rebase --continue remembers merge strategy and options': 
+	rm -fr .git/rebase-* &&
+	git reset --hard commit-new-file-F2-on-topic-branch &&
+	test_commit "commit-new-file-F3-on-topic-branch" F3 32 &&
+	test_when_finished "rm -fr test-bin" &&
+	mkdir test-bin &&
+
+	write_script test-bin/git-merge-funny <<-\EOF &&
+	printf "[%s]\n" $# "$1" "$2" "$3" "$5" >actual
+	shift 3 &&
+	exec git merge-recursive "$@"
+	EOF
+
+	cat >expect <<-\EOF &&
+	[7]
+	[--option=arg with space]
+	[--op"tion\]
+	[--new
+	line ]
+	[--]
+	EOF
+
+	rm -f actual &&
+	(
+		PATH=./test-bin:$PATH &&
+		test_must_fail git rebase -s funny -X"option=arg with space" \
+				-Xop\"tion\\ -X"new${LF}line " main topic
+	) &&
+	test_cmp expect actual &&
+	rm actual &&
+	echo "Resolved" >F2 &&
+	git add F2 &&
+	(
+		PATH=./test-bin:$PATH &&
+		git rebase --continue
+	) &&
+	test_cmp expect actual
+
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+[topic 39de9a1] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F3
+Rebasing (1/2)
Merging 953b3db31f61f8fc41bbcb85a1c76eadc748cf75 with 24c5d85f362d6c25d316c040586afc3e0548165a
+Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+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 24c5d85... # commit-new-file-F2-on-topic-branch
+[detached HEAD 6396a51] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Merging 6396a513d945e21e13de4128c5f8af13443529d5 with 39de9a17650c52c96f2d6848fba0d846df88a78f
+Successfully rebased and updated refs/heads/topic.
+ok 6 - rebase --continue remembers merge strategy and options
+
+expecting success of 3418.7 'rebase -r passes merge strategy options correctly': 
+	rm -fr .git/rebase-* &&
+	git reset --hard commit-new-file-F3-on-topic-branch &&
+	test_commit merge-theirs &&
+	git reset --hard HEAD^ &&
+	test_commit some-other-commit &&
+	test_tick &&
+	git merge --no-ff merge-theirs &&
+	FAKE_LINES="1 3 edit 4 5 7 8 9" git rebase -i -f -r -m \
+		-s recursive --strategy-option=theirs HEAD~2 &&
+	test_commit force-change-ours &&
+	git rebase --continue
+
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+[topic b1d70bd] merge-theirs
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 merge-theirs.t
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+[topic ffb1279] some-other-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 some-other-commit.t
+Merge made by the 'ort' strategy.
+ merge-theirs.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 merge-theirs.t
+rebase -i script before editing:
+label onto
+
+reset onto
+pick b1d70bd # merge-theirs
+label merge-theirs
+
+reset onto
+pick ffb1279 # some-other-commit
+merge -C bb27065 merge-theirs # Merge tag 'merge-theirs' into topic
+
+rebase -i script after editing:
+label onto
+reset onto
+edit b1d70bd # merge-theirs
+label merge-theirs
+reset onto
+pick ffb1279 # some-other-commit
+merge -C bb27065 merge-theirs # Merge tag 'merge-theirs' into topic
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Stopped at b1d70bd...  # merge-theirs
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+[detached HEAD 6393337] force-change-ours
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 force-change-ours.t
+Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Merge made by the 'recursive' strategy.
+Successfully rebased and updated refs/heads/topic.
+ok 7 - rebase -r passes merge strategy options correctly
+
+expecting success of 3418.8 '--skip after failed fixup cleans commit message': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout -b with-conflicting-fixup &&
+	test_commit wants-fixup &&
+	test_commit "fixup 1" wants-fixup.t 1 wants-fixup-1 &&
+	test_commit "fixup 2" wants-fixup.t 2 wants-fixup-2 &&
+	test_commit "fixup 3" wants-fixup.t 3 wants-fixup-3 &&
+	test_must_fail env FAKE_LINES="1 fixup 2 squash 4" \
+		git rebase -i HEAD~4 &&
+
+	: now there is a conflict, and comments in the commit message &&
+	test_commit_message HEAD <<-\EOF &&
+	# This is a combination of 2 commits.
+	# This is the 1st commit message:
+
+	wants-fixup
+
+	# The commit message #2 will be skipped:
+
+	# fixup 1
+	EOF
+
+	: skip and continue &&
+	echo "cp \"\$1\" .git/copy.txt" | write_script copy-editor.sh &&
+	(test_set_editor "$PWD/copy-editor.sh" && git rebase --skip) &&
+
+	: the user should not have had to edit the commit message &&
+	test_path_is_missing .git/copy.txt &&
+
+	: now the comments in the commit message should have been cleaned up &&
+	test_commit_message HEAD -m wants-fixup &&
+
+	: now, let us ensure that "squash" is handled correctly &&
+	git reset --hard wants-fixup-3 &&
+	test_must_fail env FAKE_LINES="1 squash 2 squash 1 squash 3 squash 1" \
+		git rebase -i HEAD~4 &&
+
+	: the second squash failed, but there are two more in the chain &&
+	(test_set_editor "$PWD/copy-editor.sh" &&
+	 test_must_fail git rebase --skip) &&
+
+	: not the final squash, no need to edit the commit message &&
+	test_path_is_missing .git/copy.txt &&
+
+	: The first and third squashes succeeded, therefore: &&
+	test_commit_message HEAD <<-\EOF &&
+	# This is a combination of 3 commits.
+	# This is the 1st commit message:
+
+	wants-fixup
+
+	# This is the commit message #2:
+
+	fixup 1
+
+	# This is the commit message #3:
+
+	fixup 2
+	EOF
+
+	(test_set_editor "$PWD/copy-editor.sh" && git rebase --skip) &&
+	test_commit_message HEAD <<-\EOF &&
+	wants-fixup
+
+	fixup 1
+
+	fixup 2
+	EOF
+
+	: Final squash failed, but there was still a squash &&
+	head -n1 .git/copy.txt >first-line &&
+	test_grep "# This is a combination of 3 commits" first-line &&
+	test_grep "# This is the commit message #3:" .git/copy.txt
+
+Switched to a new branch 'with-conflicting-fixup'
+[with-conflicting-fixup c5541cc] wants-fixup
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 wants-fixup.t
+[with-conflicting-fixup 1453cf1] fixup 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[with-conflicting-fixup f2bd94a] fixup 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[with-conflicting-fixup 265fcdc] fixup 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+rebase -i script before editing:
+pick c5541cc # wants-fixup
+pick 1453cf1 # fixup 1
+pick f2bd94a # fixup 2
+pick 265fcdc # fixup 3
+
+rebase -i script after editing:
+pick c5541cc # wants-fixup
+fixup 1453cf1 # fixup 1
+squash 265fcdc # fixup 3
+Rebasing (2/3)
Rebasing (3/3)
Auto-merging wants-fixup.t
+CONFLICT (content): Merge conflict in wants-fixup.t
+error: could not apply 265fcdc... fixup 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 265fcdc... # fixup 3
+Successfully rebased and updated refs/heads/with-conflicting-fixup.
+HEAD is now at 265fcdc fixup 3
+rebase -i script before editing:
+pick c5541cc # wants-fixup
+pick 1453cf1 # fixup 1
+pick f2bd94a # fixup 2
+pick 265fcdc # fixup 3
+
+rebase -i script after editing:
+pick c5541cc # wants-fixup
+squash 1453cf1 # fixup 1
+squash c5541cc # wants-fixup
+squash f2bd94a # fixup 2
+squash c5541cc # wants-fixup
+Rebasing (2/5)
Rebasing (3/5)
Auto-merging wants-fixup.t
+CONFLICT (add/add): Merge conflict in wants-fixup.t
+error: could not apply c5541cc... wants-fixup
+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 c5541cc... # wants-fixup
+Rebasing (4/5)
Rebasing (5/5)
Auto-merging wants-fixup.t
+CONFLICT (add/add): Merge conflict in wants-fixup.t
+error: could not apply c5541cc... wants-fixup
+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 c5541cc... # wants-fixup
+[detached HEAD c5ae848] wants-fixup
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 wants-fixup.t
+Successfully rebased and updated refs/heads/with-conflicting-fixup.
+# This is a combination of 3 commits.
+# This is the commit message #3:
+fatal: no rebase in progress
+ok 8 - --skip after failed fixup cleans commit message
+
+expecting success of 3418.9 'setup rerere database': 
+	rm -fr .git/rebase-* &&
+	git reset --hard commit-new-file-F3-on-topic-branch &&
+	git checkout main &&
+	test_commit "commit-new-file-F3" F3 3 &&
+	test_config rerere.enabled true &&
+	git update-ref refs/heads/topic commit-new-file-F3-on-topic-branch &&
+	test_must_fail git rebase -m main topic &&
+	echo "Resolved" >F2 &&
+	cp F2 expected-F2 &&
+	git add F2 &&
+	test_must_fail git rebase --continue &&
+	echo "Resolved" >F3 &&
+	cp F3 expected-F3 &&
+	git add F3 &&
+	git rebase --continue &&
+	git reset --hard topic@{1}
+
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+[main 544942a] commit-new-file-F3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F3
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+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"
+Recorded preimage for 'F2'
+Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
+Recorded resolution for 'F2'.
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+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"
+Recorded preimage for 'F3'
+Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
+Recorded resolution for 'F3'.
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+ok 9 - setup rerere database
+
+expecting success of 3418.10 'rebase --apply --continue remembers --rerere-autoupdate': 
+		prepare &&
+		test_must_fail git rebase $action --rerere-autoupdate main topic &&
+		test_cmp expected-F2 F2 &&
+		git diff-files --quiet &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		git diff-files --quiet &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+First, rewinding head to replay your work on top of it...
+Applying: commit-new-file-F2-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+Staged 'F2' using previous resolution.
+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 commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F3-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+Staged 'F3' using previous resolution.
+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 commit-new-file-F3-on-topic-branch
+Applying: commit-new-file-F3-on-topic-branch
+ok 10 - rebase --apply --continue remembers --rerere-autoupdate
+
+expecting success of 3418.11 'rebase --apply --continue honors rerere.autoUpdate': 
+		prepare &&
+		test_config rerere.autoupdate true &&
+		test_must_fail git rebase $action main topic &&
+		test_cmp expected-F2 F2 &&
+		git diff-files --quiet &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		git diff-files --quiet &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+First, rewinding head to replay your work on top of it...
+Applying: commit-new-file-F2-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+Staged 'F2' using previous resolution.
+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 commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F3-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+Staged 'F3' using previous resolution.
+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 commit-new-file-F3-on-topic-branch
+Applying: commit-new-file-F3-on-topic-branch
+ok 11 - rebase --apply --continue honors rerere.autoUpdate
+
+expecting success of 3418.12 'rebase --apply --continue remembers --no-rerere-autoupdate': 
+		prepare &&
+		test_config rerere.autoupdate true &&
+		test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
+		test_cmp expected-F2 F2 &&
+		test_must_fail git diff-files --quiet &&
+		git add F2 &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		test_must_fail git diff-files --quiet &&
+		git add F3 &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+First, rewinding head to replay your work on top of it...
+Applying: commit-new-file-F2-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+Resolved 'F2' using previous resolution.
+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 commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F3-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+Resolved 'F3' using previous resolution.
+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 commit-new-file-F3-on-topic-branch
+Applying: commit-new-file-F3-on-topic-branch
+ok 12 - rebase --apply --continue remembers --no-rerere-autoupdate
+
+expecting success of 3418.13 'rebase -m --continue remembers --rerere-autoupdate': 
+		prepare &&
+		test_must_fail git rebase $action --rerere-autoupdate main topic &&
+		test_cmp expected-F2 F2 &&
+		git diff-files --quiet &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		git diff-files --quiet &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+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"
+Staged 'F2' using previous resolution.
+Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+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"
+Staged 'F3' using previous resolution.
+Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+ok 13 - rebase -m --continue remembers --rerere-autoupdate
+
+expecting success of 3418.14 'rebase -m --continue honors rerere.autoUpdate': 
+		prepare &&
+		test_config rerere.autoupdate true &&
+		test_must_fail git rebase $action main topic &&
+		test_cmp expected-F2 F2 &&
+		git diff-files --quiet &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		git diff-files --quiet &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+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"
+Staged 'F2' using previous resolution.
+Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+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"
+Staged 'F3' using previous resolution.
+Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+ok 14 - rebase -m --continue honors rerere.autoUpdate
+
+expecting success of 3418.15 'rebase -m --continue remembers --no-rerere-autoupdate': 
+		prepare &&
+		test_config rerere.autoupdate true &&
+		test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
+		test_cmp expected-F2 F2 &&
+		test_must_fail git diff-files --quiet &&
+		git add F2 &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		test_must_fail git diff-files --quiet &&
+		git add F3 &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+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"
+Resolved 'F2' using previous resolution.
+Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+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"
+Resolved 'F3' using previous resolution.
+Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+ok 15 - rebase -m --continue remembers --no-rerere-autoupdate
+
+expecting success of 3418.16 'rebase -i --continue remembers --rerere-autoupdate': 
+		prepare &&
+		test_must_fail git rebase $action --rerere-autoupdate main topic &&
+		test_cmp expected-F2 F2 &&
+		git diff-files --quiet &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		git diff-files --quiet &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+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"
+Staged 'F2' using previous resolution.
+Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+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"
+Staged 'F3' using previous resolution.
+Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+ok 16 - rebase -i --continue remembers --rerere-autoupdate
+
+expecting success of 3418.17 'rebase -i --continue honors rerere.autoUpdate': 
+		prepare &&
+		test_config rerere.autoupdate true &&
+		test_must_fail git rebase $action main topic &&
+		test_cmp expected-F2 F2 &&
+		git diff-files --quiet &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		git diff-files --quiet &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+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"
+Staged 'F2' using previous resolution.
+Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+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"
+Staged 'F3' using previous resolution.
+Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+ok 17 - rebase -i --continue honors rerere.autoUpdate
+
+expecting success of 3418.18 'rebase -i --continue remembers --no-rerere-autoupdate': 
+		prepare &&
+		test_config rerere.autoupdate true &&
+		test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
+		test_cmp expected-F2 F2 &&
+		test_must_fail git diff-files --quiet &&
+		git add F2 &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		test_must_fail git diff-files --quiet &&
+		git add F3 &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+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"
+Resolved 'F2' using previous resolution.
+Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+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"
+Resolved 'F3' using previous resolution.
+Could not apply 39de9a1... # commit-new-file-F3-on-topic-branch
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+ok 18 - rebase -i --continue remembers --no-rerere-autoupdate
+
+expecting success of 3418.19 'the todo command "break" works': 
+	rm -f execed &&
+	FAKE_LINES="break b exec_>execed" git rebase -i HEAD &&
+	test_path_is_missing execed &&
+	git rebase --continue &&
+	test_path_is_missing execed &&
+	git rebase --continue &&
+	test_path_is_file execed
+
+rebase -i script before editing:
+noop
+
+rebase -i script after editing:
+break
+b
+exec >execed
+Rebasing (1/3)
Stopped at 6cb54c7 (commit-new-file-F3-on-topic-branch)
+Rebasing (2/3)
Stopped at 6cb54c7 (commit-new-file-F3-on-topic-branch)
+Rebasing (3/3)
Executing: >execed
+Successfully rebased and updated refs/heads/topic.
+ok 19 - the todo command "break" works
+
+expecting success of 3418.20 'patch file is removed before break command': 
+	test_when_finished "git rebase --abort" &&
+	cat >todo <<-\EOF &&
+	pick commit-new-file-F2-on-topic-branch
+	break
+	EOF
+
+	(
+		set_replace_editor todo &&
+		test_must_fail git rebase -i --onto commit-new-file-F2 HEAD
+	) &&
+	test_path_is_file .git/rebase-merge/patch &&
+	echo 22>F2 &&
+	git add F2 &&
+	git rebase --continue &&
+	test_path_is_missing .git/rebase-merge/patch
+
+rebase -i script after editing:
+pick commit-new-file-F2-on-topic-branch
+break
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+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"
+Resolved 'F2' using previous resolution.
+Could not apply 24c5d85... 
+
+[detached HEAD da61d7a] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 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': 
+	test_when_finished "git rebase --abort" &&
+	test_must_fail git rebase -x false --reschedule-failed-exec HEAD^ &&
+	grep "^exec false" .git/rebase-merge/git-rebase-todo &&
+	git rebase --abort &&
+	test_must_fail git -c rebase.rescheduleFailedExec=true \
+		rebase -x false HEAD^ 2>err &&
+	grep "^exec false" .git/rebase-merge/git-rebase-todo &&
+	test_grep "has been rescheduled" err
+
+Rebasing (2/2)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+hint: Could not execute the todo command
+hint:
+hint:     exec false
+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
+exec false
+exec false
+hint: It has been rescheduled; To edit the command before continuing, please
+ok 21 - --reschedule-failed-exec
+
+expecting success of 3418.22 'rebase.rescheduleFailedExec only affects `rebase -i`': 
+	test_config rebase.rescheduleFailedExec true &&
+	test_must_fail git rebase -x false HEAD^ &&
+	grep "^exec false" .git/rebase-merge/git-rebase-todo &&
+	git rebase --abort &&
+	git rebase HEAD^
+
+Rebasing (2/2)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+hint: Could not execute the todo command
+hint:
+hint:     exec false
+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
+exec false
+Current branch topic is up to date.
+ok 22 - rebase.rescheduleFailedExec only affects `rebase -i`
+
+expecting success of 3418.23 'rebase.rescheduleFailedExec=true & --no-reschedule-failed-exec': 
+	test_when_finished "git rebase --abort" &&
+	test_config rebase.rescheduleFailedExec true &&
+	test_must_fail git rebase -x false --no-reschedule-failed-exec HEAD~2 &&
+	test_must_fail git rebase --continue 2>err &&
+	! grep "has been rescheduled" err
+
+Rebasing (2/4)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+ok 23 - rebase.rescheduleFailedExec=true & --no-reschedule-failed-exec
+
+expecting success of 3418.24 'new rebase.rescheduleFailedExec=true setting in an ongoing rebase is ignored': 
+	test_when_finished "git rebase --abort" &&
+	test_must_fail git rebase -x false HEAD~2 &&
+	test_config rebase.rescheduleFailedExec true &&
+	test_must_fail git rebase --continue 2>err &&
+	! grep "has been rescheduled" err
+
+Rebasing (2/4)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+ok 24 - new rebase.rescheduleFailedExec=true setting in an ongoing rebase is ignored
+
+expecting success of 3418.25 'there is no --no-reschedule-failed-exec in an ongoing rebase': 
+	test_when_finished "git rebase --abort" &&
+	test_must_fail git rebase -x false HEAD~2 &&
+	test_expect_code 129 git rebase --continue --no-reschedule-failed-exec &&
+	test_expect_code 129 git rebase --edit-todo --no-reschedule-failed-exec
+
+Rebasing (2/4)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+ok 25 - there is no --no-reschedule-failed-exec in an ongoing rebase
+
+expecting success of 3418.26 'no change in comment character due to conflicts markers with core.commentChar=auto': 
+	git checkout -b branch-a &&
+	test_commit A F1 &&
+	git checkout -b branch-b HEAD^ &&
+	test_commit B F1 &&
+	test_must_fail git rebase branch-a &&
+	printf "B\nA\n" >F1 &&
+	git add F1 &&
+	GIT_EDITOR="cat >actual" git -c core.commentChar=auto rebase --continue &&
+	# Check that "#" is still the comment character.
+	test_grep "^# Changes to be committed" actual
+
+Switched to a new branch 'branch-a'
+[branch-a 1d5c201] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branch-b'
+[branch-b 4a7301d] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/1)
Auto-merging F1
+CONFLICT (content): Merge conflict in F1
+error: could not apply 4a7301d... 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"
+Recorded preimage for 'F1'
+Could not apply 4a7301d... # B
+Recorded resolution for 'F1'.
+[detached HEAD ce30074] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Successfully rebased and updated refs/heads/branch-b.
+# Changes to be committed:
+ok 26 - no change in comment character due to conflicts markers with core.commentChar=auto
+
+expecting success of 3418.27 'rebase --apply sets ORIG_HEAD correctly': 
+		git checkout topic &&
+		git reset --hard commit-new-file-F2-on-topic-branch &&
+		test_orig_head_helper $type main
+	
+Switched to branch 'topic'
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+First, rewinding head to replay your work on top of it...
+Applying: commit-new-file-F2-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+Resolved 'F2' using previous resolution.
+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 commit-new-file-F2-on-topic-branch
+Already on 'topic'
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+ok 27 - rebase --apply sets ORIG_HEAD correctly
+
+expecting success of 3418.28 'rebase --apply <upstream> <branch> sets ORIG_HEAD correctly': 
+		git checkout main &&
+		test_orig_head_helper $type main topic
+	
+Switched to branch 'main'
+First, rewinding head to replay your work on top of it...
+Applying: commit-new-file-F2-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+Resolved 'F2' using previous resolution.
+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 commit-new-file-F2-on-topic-branch
+Already on 'topic'
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+ok 28 - rebase --apply <upstream> <branch> sets ORIG_HEAD correctly
+
+expecting success of 3418.29 'rebase --merge sets ORIG_HEAD correctly': 
+		git checkout topic &&
+		git reset --hard commit-new-file-F2-on-topic-branch &&
+		test_orig_head_helper $type main
+	
+Already on 'topic'
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+Rebasing (1/1)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+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"
+Resolved 'F2' using previous resolution.
+Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
+Already on 'topic'
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+ok 29 - rebase --merge sets ORIG_HEAD correctly
+
+expecting success of 3418.30 'rebase --merge <upstream> <branch> sets ORIG_HEAD correctly': 
+		git checkout main &&
+		test_orig_head_helper $type main topic
+	
+Switched to branch 'main'
+Rebasing (1/1)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+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"
+Resolved 'F2' using previous resolution.
+Could not apply 24c5d85... # commit-new-file-F2-on-topic-branch
+Already on 'topic'
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+ok 30 - rebase --merge <upstream> <branch> sets ORIG_HEAD correctly
+
+# passed all 30 test(s)
+1..30
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3427-rebase-subtree.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3427-rebase-subtree/.git/
 expecting success of 3427.1 'setup': 
@@ -169445,1283 +170760,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3425-rebase-topology-merges.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3425-rebase-topology-merges/.git/
-expecting success of 3425.1 'setup of non-linear-history': 
-	test_commit a &&
-	test_commit b &&
-	test_commit c &&
-	git checkout b &&
-	test_commit d &&
-	test_commit e &&
-
-	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 &&
-
-	git checkout d &&
-	test_commit n &&
-	test_commit o &&
-	test_merge w e &&
-	test_merge v c &&
-	git checkout o &&
-	test_commit z
-
-[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
-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
-Previous HEAD position was 09e072f f
-HEAD is now at 1bd0260 d
-[detached HEAD 35a5a4f] n
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 n.t
-[detached HEAD a60ff6b] o
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 o.t
-Merge made by the 'ort' strategy.
- e.t | 1 +
- 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
-Previous HEAD position was 253142b v
-HEAD is now at a60ff6b o
-[detached HEAD 6fadda8] z
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 z.t
-ok 1 - setup of non-linear-history
-
-expecting success of 3425.2 'rebase --apply after merge from upstream': 
-		reset_rebase &&
-		git rebase --apply e w &&
-		test_cmp_rev e HEAD~2 &&
-		test_linear_range 'n o' e..
-	
-fatal: no rebase in progress
-HEAD is now at 6fadda8 z
-First, rewinding head to replay your work on top of it...
-Applying: n
-Applying: o
-ok 2 - rebase --apply after merge from upstream
-
-expecting success of 3425.3 'rebase -m after merge from upstream': 
-		reset_rebase &&
-		git rebase -m e w &&
-		test_cmp_rev e HEAD~2 &&
-		test_linear_range 'n o' e..
-	
-fatal: no rebase in progress
-HEAD is now at 4cd4d2a o
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 3 - rebase -m after merge from upstream
-
-expecting success of 3425.4 'rebase -i after merge from upstream': 
-		reset_rebase &&
-		git rebase -i e w &&
-		test_cmp_rev e HEAD~2 &&
-		test_linear_range 'n o' e..
-	
-fatal: no rebase in progress
-HEAD is now at 4cd4d2a o
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 4 - rebase -i after merge from upstream
-
-expecting success of 3425.5 'rebase --apply of non-linear history is linearized in place': 
-		reset_rebase &&
-		git rebase --apply d w &&
-		test_cmp_rev d HEAD~3 &&
-		test_linear_range 'n o e' d..
-	
-fatal: no rebase in progress
-HEAD is now at 4cd4d2a o
-First, rewinding head to replay your work on top of it...
-Applying: n
-Applying: o
-Applying: e
-ok 5 - rebase --apply of non-linear history is linearized in place
-
-expecting success of 3425.6 'rebase -m of non-linear history is linearized in place': 
-		reset_rebase &&
-		git rebase -m d w &&
-		test_cmp_rev d HEAD~3 &&
-		test_linear_range 'n o e' d..
-	
-fatal: no rebase in progress
-HEAD is now at 9e9424c e
-Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 6 - rebase -m of non-linear history is linearized in place
-
-expecting success of 3425.7 'rebase -i of non-linear history is linearized in place': 
-		reset_rebase &&
-		git rebase -i d w &&
-		test_cmp_rev d HEAD~3 &&
-		test_linear_range 'n o e' d..
-	
-fatal: no rebase in progress
-HEAD is now at ef67882 e
-Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 7 - rebase -i of non-linear history is linearized in place
-
-expecting success of 3425.8 'rebase --apply of non-linear history is linearized upstream': 
-		reset_rebase &&
-		git rebase --apply c w &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at ef67882 e
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: n
-Applying: o
-Applying: e
-ok 8 - rebase --apply of non-linear history is linearized upstream
-
-expecting success of 3425.9 'rebase -m of non-linear history is linearized upstream': 
-		reset_rebase &&
-		git rebase -m c w &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7946025 e
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 9 - rebase -m of non-linear history is linearized upstream
-
-expecting success of 3425.10 'rebase -i of non-linear history is linearized upstream': 
-		reset_rebase &&
-		git rebase -i c w &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7946025 e
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 10 - rebase -i of non-linear history is linearized upstream
-
-expecting success of 3425.11 'rebase --apply of non-linear history with merges after upstream merge is linearized': 
-		reset_rebase &&
-		git rebase --apply c v &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7946025 e
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: n
-Applying: o
-Applying: e
-ok 11 - rebase --apply of non-linear history with merges after upstream merge is linearized
-
-expecting success of 3425.12 'rebase -m of non-linear history with merges after upstream merge is linearized': 
-		reset_rebase &&
-		git rebase -m c v &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7946025 e
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 12 - rebase -m of non-linear history with merges after upstream merge is linearized
-
-expecting success of 3425.13 'rebase -i of non-linear history with merges after upstream merge is linearized': 
-		reset_rebase &&
-		git rebase -i c v &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7946025 e
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 13 - rebase -i of non-linear history with merges after upstream merge is linearized
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3303-notes-subtrees.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3421-rebase-topology-linear.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3420-rebase-autostash.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3420-rebase-autostash/.git/
 expecting success of 3420.1 'setup': 
@@ -172114,253 +172152,903 @@
 1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3435-rebase-gpg-sign.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3435-rebase-gpg-sign/.git/
-checking prerequisite: GPG
+*** t3421-rebase-topology-linear.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-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
+[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'.
 
-	# 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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-)
-prerequisite GPG not satisfied
-1..0 # SKIP skip all test rebase --[no-]gpg-sign, gpg not available
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3434-rebase-i18n.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3434-rebase-i18n/.git/
-expecting success of 3434.1 'setup': 
-	test_commit one &&
-	git branch first &&
-	test_commit two &&
-	git switch first &&
-	test_commit three &&
-	git branch second &&
-	test_commit four &&
-	git switch second &&
-	test_commit five &&
-	test_commit six
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-[main (root-commit) d79ce16] one
+  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 one.t
-[main 139b20d] two
+ create mode 100644 d.t
+[detached HEAD 67a7211] e
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Switched to branch 'first'
-[first 897c206] three
+ 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.51.0/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 three.t
-[first 6f2ec4d] four
+ 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 four.t
-Switched to branch 'second'
-[second e2eded9] five
+ create mode 100644 g.t
+[detached HEAD 3317c29] i
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 five.t
-[second 666e62f] six
+ 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 six.t
-ok 1 - setup
+ create mode 100644 f.t
+ok 21 - setup of linear history for range selection tests
 
-expecting success of 3434.2 'rebase --rebase-merges update encoding eucJP to UTF-8': 
-	git switch -c merge-eucJP-UTF-8 first &&
-	git config i18n.commitencoding eucJP &&
-	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
-	git config i18n.commitencoding UTF-8 &&
-	git rebase --rebase-merges main &&
-	compare_msg eucJP.txt eucJP UTF-8
+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
 
-Switched to a new branch 'merge-eucJP-UTF-8'
-Merge made by the 'ort' strategy.
- five.t | 1 +
- six.t  | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 five.t
- create mode 100644 six.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/merge-eucJP-UTF-8.
-ok 2 - rebase --rebase-merges update encoding eucJP to UTF-8
+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 3434.3 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP': 
-	git switch -c merge-eucJP-ISO-2022-JP first &&
-	git config i18n.commitencoding eucJP &&
-	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
-	git config i18n.commitencoding ISO-2022-JP &&
-	git rebase --rebase-merges main &&
-	compare_msg eucJP.txt eucJP ISO-2022-JP
+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
 
-Switched to a new branch 'merge-eucJP-ISO-2022-JP'
-Merge made by the 'ort' strategy.
- five.t | 1 +
- six.t  | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 five.t
- create mode 100644 six.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/merge-eucJP-ISO-2022-JP.
-ok 3 - rebase --rebase-merges update encoding eucJP to ISO-2022-JP
+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 3434.4 'rebase --continue update from ISO-8859-1 to UTF-8': 
-		(git rebase --abort || : abort current git-rebase failure) &&
-		git switch -c conflict-$old-$new one &&
-		echo for-conflict >two.t &&
-		git add two.t &&
-		git config i18n.commitencoding $old &&
-		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
-		git config i18n.commitencoding $new &&
-		test_must_fail git rebase -m main &&
-		test -f .git/rebase-merge/message &&
-		git stripspace -s <.git/rebase-merge/message >two.t &&
-		git add two.t &&
-		git rebase --continue &&
-		compare_msg $msgfile $old $new &&
-		: git-commit assume invalid utf-8 is latin1 &&
-		test_cmp expect two.t
+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
-Switched to a new branch 'conflict-ISO-8859-1-UTF-8'
-[conflict-ISO-8859-1-UTF-8 7f6df7e] ÄËÑÏÖ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Rebasing (1/1)
Auto-merging two.t
-CONFLICT (add/add): Merge conflict in two.t
-error: could not apply 7f6df7e... ÄËÑ�Ö
-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 7f6df7e... # ÄËÑ�Ö
-[detached HEAD 2d1ef83] ÄËÑ�Ö
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/conflict-ISO-8859-1-UTF-8.
-ok 4 - rebase --continue update from ISO-8859-1 to UTF-8
+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 3434.5 'rebase --continue update from eucJP to UTF-8': 
-		(git rebase --abort || : abort current git-rebase failure) &&
-		git switch -c conflict-$old-$new one &&
-		echo for-conflict >two.t &&
-		git add two.t &&
-		git config i18n.commitencoding $old &&
-		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
-		git config i18n.commitencoding $new &&
-		test_must_fail git rebase -m main &&
-		test -f .git/rebase-merge/message &&
-		git stripspace -s <.git/rebase-merge/message >two.t &&
-		git add two.t &&
-		git rebase --continue &&
-		compare_msg $msgfile $old $new &&
-		: git-commit assume invalid utf-8 is latin1 &&
-		test_cmp expect two.t
+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
-Switched to a new branch 'conflict-eucJP-UTF-8'
-[conflict-eucJP-UTF-8 4850d3a] ¤Ï¤ì¤Ò¤Û¤Õ
+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>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Rebasing (1/1)
Auto-merging two.t
-CONFLICT (add/add): Merge conflict in two.t
-error: could not apply 4850d3a... �れ���
-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 4850d3a... # �れ���
-[detached HEAD 52bcbd9] �れ���
+Previous HEAD position was 5b67321 j
+HEAD is now at 1bd0260 d
+[detached HEAD 753370d] k
  Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/conflict-eucJP-UTF-8.
-ok 5 - rebase --continue update from eucJP to UTF-8
+[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
 
-expecting success of 3434.6 'rebase --continue update from eucJP to ISO-2022-JP': 
-		(git rebase --abort || : abort current git-rebase failure) &&
-		git switch -c conflict-$old-$new one &&
-		echo for-conflict >two.t &&
-		git add two.t &&
-		git config i18n.commitencoding $old &&
-		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
-		git config i18n.commitencoding $new &&
-		test_must_fail git rebase -m main &&
-		test -f .git/rebase-merge/message &&
-		git stripspace -s <.git/rebase-merge/message >two.t &&
-		git add two.t &&
-		git rebase --continue &&
-		compare_msg $msgfile $old $new &&
-		: git-commit assume invalid utf-8 is latin1 &&
-		test_cmp expect two.t
+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
-Switched to a new branch 'conflict-eucJP-ISO-2022-JP'
-[conflict-eucJP-ISO-2022-JP 4850d3a] ¤Ï¤ì¤Ò¤Û¤Õ
+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 two.t
-Rebasing (1/1)
Auto-merging two.t
-CONFLICT (add/add): Merge conflict in two.t
-error: could not apply 4850d3a... ?$B$O$l$R$[$U?(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 4850d3a... # $B$O$l$R$[$U
-[detached HEAD d0ef7c0] $B$O$l$R$[$U(B
+ create mode 100644 x.t
+[disjoint be1e399] y
  Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/conflict-eucJP-ISO-2022-JP.
-ok 6 - rebase --continue update from eucJP to ISO-2022-JP
+ 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
 
-# passed all 6 test(s)
-1..6
+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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3431-rebase-fork-point.sh ***
@@ -172694,410 +173382,57 @@
 1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3433-rebase-across-mode-change.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3438-rebase-broken-files.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t3435-rebase-gpg-sign.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3435-rebase-gpg-sign/.git/
+checking prerequisite: GPG
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
 (
-	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=$?
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
+	# 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
 
 )
-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
+prerequisite GPG not satisfied
+1..0 # SKIP skip all test rebase --[no-]gpg-sign, gpg not available
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3311-notes-merge-fanout.sh ***
@@ -175771,6 +176106,517 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3434-rebase-i18n.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3434-rebase-i18n/.git/
+expecting success of 3434.1 'setup': 
+	test_commit one &&
+	git branch first &&
+	test_commit two &&
+	git switch first &&
+	test_commit three &&
+	git branch second &&
+	test_commit four &&
+	git switch second &&
+	test_commit five &&
+	test_commit six
+
+[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 'first'
+[first 897c206] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[first 6f2ec4d] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+Switched to branch 'second'
+[second e2eded9] five
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+[second 666e62f] six
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 six.t
+ok 1 - setup
+
+expecting success of 3434.2 'rebase --rebase-merges update encoding eucJP to UTF-8': 
+	git switch -c merge-eucJP-UTF-8 first &&
+	git config i18n.commitencoding eucJP &&
+	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
+	git config i18n.commitencoding UTF-8 &&
+	git rebase --rebase-merges main &&
+	compare_msg eucJP.txt eucJP UTF-8
+
+Switched to a new branch 'merge-eucJP-UTF-8'
+Merge made by the 'ort' strategy.
+ five.t | 1 +
+ six.t  | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 five.t
+ create mode 100644 six.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/merge-eucJP-UTF-8.
+ok 2 - rebase --rebase-merges update encoding eucJP to UTF-8
+
+expecting success of 3434.3 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP': 
+	git switch -c merge-eucJP-ISO-2022-JP first &&
+	git config i18n.commitencoding eucJP &&
+	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
+	git config i18n.commitencoding ISO-2022-JP &&
+	git rebase --rebase-merges main &&
+	compare_msg eucJP.txt eucJP ISO-2022-JP
+
+Switched to a new branch 'merge-eucJP-ISO-2022-JP'
+Merge made by the 'ort' strategy.
+ five.t | 1 +
+ six.t  | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 five.t
+ create mode 100644 six.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/merge-eucJP-ISO-2022-JP.
+ok 3 - rebase --rebase-merges update encoding eucJP to ISO-2022-JP
+
+expecting success of 3434.4 'rebase --continue update from ISO-8859-1 to UTF-8': 
+		(git rebase --abort || : abort current git-rebase failure) &&
+		git switch -c conflict-$old-$new one &&
+		echo for-conflict >two.t &&
+		git add two.t &&
+		git config i18n.commitencoding $old &&
+		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
+		git config i18n.commitencoding $new &&
+		test_must_fail git rebase -m main &&
+		test -f .git/rebase-merge/message &&
+		git stripspace -s <.git/rebase-merge/message >two.t &&
+		git add two.t &&
+		git rebase --continue &&
+		compare_msg $msgfile $old $new &&
+		: git-commit assume invalid utf-8 is latin1 &&
+		test_cmp expect two.t
+	
+fatal: no rebase in progress
+Switched to a new branch 'conflict-ISO-8859-1-UTF-8'
+[conflict-ISO-8859-1-UTF-8 7f6df7e] ÄËÑÏÖ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Rebasing (1/1)
Auto-merging two.t
+CONFLICT (add/add): Merge conflict in two.t
+error: could not apply 7f6df7e... ÄËÑ�Ö
+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 7f6df7e... # ÄËÑ�Ö
+[detached HEAD 2d1ef83] ÄËÑ�Ö
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/conflict-ISO-8859-1-UTF-8.
+ok 4 - rebase --continue update from ISO-8859-1 to UTF-8
+
+expecting success of 3434.5 'rebase --continue update from eucJP to UTF-8': 
+		(git rebase --abort || : abort current git-rebase failure) &&
+		git switch -c conflict-$old-$new one &&
+		echo for-conflict >two.t &&
+		git add two.t &&
+		git config i18n.commitencoding $old &&
+		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
+		git config i18n.commitencoding $new &&
+		test_must_fail git rebase -m main &&
+		test -f .git/rebase-merge/message &&
+		git stripspace -s <.git/rebase-merge/message >two.t &&
+		git add two.t &&
+		git rebase --continue &&
+		compare_msg $msgfile $old $new &&
+		: git-commit assume invalid utf-8 is latin1 &&
+		test_cmp expect two.t
+	
+fatal: no rebase in progress
+Switched to a new branch 'conflict-eucJP-UTF-8'
+[conflict-eucJP-UTF-8 4850d3a] ¤Ï¤ì¤Ò¤Û¤Õ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Rebasing (1/1)
Auto-merging two.t
+CONFLICT (add/add): Merge conflict in two.t
+error: could not apply 4850d3a... �れ���
+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 4850d3a... # �れ���
+[detached HEAD 52bcbd9] �れ���
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/conflict-eucJP-UTF-8.
+ok 5 - rebase --continue update from eucJP to UTF-8
+
+expecting success of 3434.6 'rebase --continue update from eucJP to ISO-2022-JP': 
+		(git rebase --abort || : abort current git-rebase failure) &&
+		git switch -c conflict-$old-$new one &&
+		echo for-conflict >two.t &&
+		git add two.t &&
+		git config i18n.commitencoding $old &&
+		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
+		git config i18n.commitencoding $new &&
+		test_must_fail git rebase -m main &&
+		test -f .git/rebase-merge/message &&
+		git stripspace -s <.git/rebase-merge/message >two.t &&
+		git add two.t &&
+		git rebase --continue &&
+		compare_msg $msgfile $old $new &&
+		: git-commit assume invalid utf-8 is latin1 &&
+		test_cmp expect two.t
+	
+fatal: no rebase in progress
+Switched to a new branch 'conflict-eucJP-ISO-2022-JP'
+[conflict-eucJP-ISO-2022-JP 4850d3a] ¤Ï¤ì¤Ò¤Û¤Õ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Rebasing (1/1)
Auto-merging two.t
+CONFLICT (add/add): Merge conflict in two.t
+error: could not apply 4850d3a... ?$B$O$l$R$[$U?(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 4850d3a... # $B$O$l$R$[$U
+[detached HEAD d0ef7c0] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/conflict-eucJP-ISO-2022-JP.
+ok 6 - rebase --continue update from eucJP to ISO-2022-JP
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3438-rebase-broken-files.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3500-cherry.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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': 
@@ -175885,6 +176731,97 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3433-rebase-across-mode-change.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3436-rebase-more-options.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3436-rebase-more-options/.git/
 expecting success of 3436.1 'setup': 
@@ -176218,7 +177155,7 @@
 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 0a7a22b] commit2
+[detached HEAD 937314c] commit2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -176234,12 +177171,12 @@
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  0a7a22b commit2
+  937314c 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> 0a7a22b
+ git branch <new-branch-name> 937314c
 
 HEAD is now at 139b464 update file
 Merge made by the 'ort' strategy.
@@ -176267,7 +177204,7 @@
 hint: Disable this message with "git config set advice.mergeConflict false"
 Could not apply bd08fd4... # commit2
 Updated 1 path from the index
-[detached HEAD a5dad8c] commit2
+[detached HEAD ba3598c] commit2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -176288,17 +177225,17 @@
 	test_cmp expect actual &&
 	test_atime_is_ignored -1
 
-[detached HEAD 59e735f] commit3
+[detached HEAD 3b6340e] commit3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 rebase -i script before editing:
-pick 59e735f # commit3
+pick 3b6340e # commit3
 
 rebase -i script after editing:
-reword 59e735f # commit3
-Rebasing (1/1)
[detached HEAD 6fb3d05] edited
+reword 3b6340e # commit3
+Rebasing (1/1)
[detached HEAD 8cdb241] edited
  Author: A U Thor <author@example.com>
- Date: Wed Aug 27 08:20:53 2025 +0000
+ Date: Tue Sep 29 14:52:19 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
@@ -176330,7 +177267,7 @@
 Applying: commit1
 Applying: commit2
 Applying: commit3
-[detached HEAD f658e7d] empty
+[detached HEAD 4fcf0d0] empty
  Author: A U Thor <author@example.com>
  Date: Thu Apr 7 15:15:13 2005 -0700
 HEAD is up to date, rebase forced.
@@ -176346,166 +177283,6 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3503-cherry-pick-root.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3503-cherry-pick-root/.git/
-expecting success of 3503.1 'setup': 
-
-	echo first > file1 &&
-	git add file1 &&
-	test_tick &&
-	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 "second" &&
-
-	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 file1
-[second (root-commit) bbcd39a] second
- 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>
- 1 file changed, 1 insertion(+)
- 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
-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 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
-ok 2 - cherry-pick a root commit
-
-expecting success of 3503.3 'revert a root commit': 
-
-	git revert main &&
-	test_path_is_missing file1
-
-
-[detached HEAD 3eb7e0d] 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 3 - revert a root commit
-
-expecting success of 3503.4 'cherry-pick a root commit with an external strategy': 
-
-	git cherry-pick --strategy=resolve main &&
-	echo first >expect &&
-	test_cmp expect file1
-
-
-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
-
-expecting success of 3503.5 'revert a root commit with an external strategy': 
-
-	git revert --strategy=resolve main &&
-	test_path_is_missing 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 3503.6 'cherry-pick two root commits': 
-
-	echo first >expect.file1 &&
-	echo second >expect.file2 &&
-	echo third >expect.file3 &&
-
-	git checkout second^0 &&
-	git cherry-pick main third &&
-
-	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^^^
-
-
-Warning: you are leaving 4 commits behind, not connected to
-any of your branches:
-
-  a457399 Revert "first"
-  54587e2 first
-  3eb7e0d Revert "first"
-  3e6f574 first
-
-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 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
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3502-cherry-pick-merge.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3502-cherry-pick-merge/.git/
 expecting success of 3502.1 'setup': 
@@ -176793,6 +177570,166 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3503-cherry-pick-root.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3503-cherry-pick-root/.git/
+expecting success of 3503.1 'setup': 
+
+	echo first > file1 &&
+	git add file1 &&
+	test_tick &&
+	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 "second" &&
+
+	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 file1
+[second (root-commit) bbcd39a] second
+ 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>
+ 1 file changed, 1 insertion(+)
+ 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
+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 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
+ok 2 - cherry-pick a root commit
+
+expecting success of 3503.3 'revert a root commit': 
+
+	git revert main &&
+	test_path_is_missing file1
+
+
+[detached HEAD 3eb7e0d] 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 3 - revert a root commit
+
+expecting success of 3503.4 'cherry-pick a root commit with an external strategy': 
+
+	git cherry-pick --strategy=resolve main &&
+	echo first >expect &&
+	test_cmp expect file1
+
+
+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
+
+expecting success of 3503.5 'revert a root commit with an external strategy': 
+
+	git revert --strategy=resolve main &&
+	test_path_is_missing 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 3503.6 'cherry-pick two root commits': 
+
+	echo first >expect.file1 &&
+	echo second >expect.file2 &&
+	echo third >expect.file3 &&
+
+	git checkout second^0 &&
+	git cherry-pick main third &&
+
+	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^^^
+
+
+Warning: you are leaving 4 commits behind, not connected to
+any of your branches:
+
+  a457399 Revert "first"
+  54587e2 first
+  3eb7e0d Revert "first"
+  3e6f574 first
+
+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 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
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3437-rebase-fixup-options.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3437-rebase-fixup-options/.git/
 expecting success of 3437.1 'setup': 
@@ -177686,721 +178623,194 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3506-cherry-pick-ff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3506-cherry-pick-ff/.git/
-expecting success of 3506.1 'setup': 
-	echo first > file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m "first" &&
-	git tag first &&
-
-	git checkout -b other &&
-	echo second >> file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m "second" &&
-	git tag second &&
-	test_oid_cache <<-EOF
-	cp_ff sha1:1df192cd8bc58a2b275d842cede4d221ad9000d1
-	cp_ff sha256:e70d6b7fc064bddb516b8d512c9057094b96ce6ff08e12080acc4fe7f1d60a1d
-	EOF
+*** t3501-revert-cherry-pick.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3501-revert-cherry-pick/.git/
+expecting success of 3501.1 'setup': 
 
-[main (root-commit) 0c72e4f] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Switched to a new branch 'other'
-[other 453a047] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
+	for l in a b c d e f g h i j k l m n o
+	do
+		echo $l$l$l$l$l$l$l$l$l || return 1
+	done >oops &&
 
-expecting success of 3506.2 'cherry-pick using --ff fast forwards': 
-	git checkout main &&
-	git reset --hard first &&
 	test_tick &&
-	git cherry-pick --ff second &&
-	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify second)"
-
-Switched to branch 'main'
-HEAD is now at 0c72e4f first
-ok 2 - cherry-pick using --ff fast forwards
+	git add oops &&
+	git commit -m initial &&
+	git tag initial &&
 
-expecting success of 3506.3 'cherry-pick not using --ff does not fast forwards': 
-	git checkout main &&
-	git reset --hard first &&
 	test_tick &&
-	git cherry-pick second &&
-	test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify second)"
-
-Already on 'main'
-HEAD is now at 0c72e4f first
-[main 43e4ff7] second
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 3 - cherry-pick not using --ff does not fast forwards
+	echo "Add extra line at the end" >>oops &&
+	git commit -a -m added &&
+	git tag added &&
 
-expecting success of 3506.4 'merge setup': 
-	git checkout main &&
-	git reset --hard first &&
-	echo new line >A &&
-	git add A &&
 	test_tick &&
-	git commit -m "add line to A" A &&
-	git tag A &&
-	git checkout -b side first &&
-	echo new line >B &&
-	git add B &&
+	git mv oops spoo &&
+	git commit -m rename1 &&
+	git tag rename1 &&
+
 	test_tick &&
-	git commit -m "add line to B" B &&
-	git tag B &&
-	git checkout main &&
-	git merge side &&
-	git tag C &&
-	git checkout -b new A
+	git checkout -b side initial &&
+	git mv oops opos &&
+	git commit -m rename2 &&
+	git tag rename2
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-[main e3ca70e] add line to A
+[main (root-commit) a242c62] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 15 insertions(+)
+ create mode 100644 oops
+[main 4399171] added
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A
+[main 31df260] rename1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename oops => spoo (100%)
 Switched to a new branch 'side'
-[side 5faaf2e] add line to B
+[side f6d0551] rename2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- B | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-Switched to a new branch 'new'
-ok 4 - merge setup
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename oops => opos (100%)
+ok 1 - setup
 
-expecting success of 3506.5 'cherry-pick explicit first parent of a non-merge with --ff': 
-	git reset --hard A -- &&
-	git cherry-pick --ff -m 1 B &&
-	git diff --exit-code C --
+expecting success of 3501.2 'cherry-pick --nonsense': 
 
-HEAD is now at e3ca70e add line to A
-[new d859d20] add line to B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-ok 5 - cherry-pick explicit first parent of a non-merge with --ff
+	pos=$(git rev-parse HEAD) &&
+	git diff --exit-code HEAD &&
+	test_must_fail git cherry-pick --nonsense 2>msg &&
+	git diff --exit-code HEAD "$pos" &&
+	test_grep "[Uu]sage:" msg
 
-expecting success of 3506.6 'cherry pick a merge with --ff but without -m should fail': 
-	git reset --hard A -- &&
-	test_must_fail git cherry-pick --ff C &&
-	git diff --exit-code A --
+usage: git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]
+ok 2 - cherry-pick --nonsense
 
-HEAD is now at e3ca70e add line to A
-error: commit 17345dd7218a0fc4dc087d5aacc6be7192e4fa2a is a merge but no -m option was given.
-fatal: cherry-pick failed
-ok 6 - cherry pick a merge with --ff but without -m should fail
+expecting success of 3501.3 'revert --nonsense': 
 
-expecting success of 3506.7 'cherry pick with --ff a merge (1)': 
-	git reset --hard A -- &&
-	git cherry-pick --ff -m 1 C &&
-	git diff --exit-code C &&
-	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify C)"
+	pos=$(git rev-parse HEAD) &&
+	git diff --exit-code HEAD &&
+	test_must_fail git revert --nonsense 2>msg &&
+	git diff --exit-code HEAD "$pos" &&
+	test_grep "[Uu]sage:" msg
 
-HEAD is now at e3ca70e add line to A
-ok 7 - cherry pick with --ff a merge (1)
+usage: git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...
+ok 3 - revert --nonsense
 
-expecting success of 3506.8 'cherry pick with --ff a merge (2)': 
-	git reset --hard B -- &&
-	git cherry-pick --ff -m 2 C &&
-	git diff --exit-code C &&
-	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify C)"
+expecting success of 3501.4 'cherry-pick after renaming branch': 
 
-HEAD is now at 5faaf2e add line to B
-ok 8 - cherry pick with --ff a merge (2)
+	git checkout rename2 &&
+	git cherry-pick added &&
+	test_cmp_rev rename2 HEAD^ &&
+	grep "Add extra line at the end" opos &&
+	git reflog -1 | grep cherry-pick
 
-expecting success of 3506.9 'cherry pick a merge relative to nonexistent parent with --ff should fail': 
-	git reset --hard B -- &&
-	test_must_fail git cherry-pick --ff -m 3 C
 
-HEAD is now at 5faaf2e add line to B
-error: commit 17345dd7218a0fc4dc087d5aacc6be7192e4fa2a does not have parent 3
-fatal: cherry-pick failed
-ok 9 - cherry pick a merge relative to nonexistent parent with --ff should fail
+Note: switching to 'rename2'.
 
-expecting success of 3506.10 'cherry pick a root commit with --ff': 
-	git reset --hard first -- &&
-	git rm file1 &&
-	echo first >file2 &&
-	git add file2 &&
-	git commit --amend -m "file2" &&
-	git cherry-pick --ff first &&
-	test "$(git rev-parse --verify HEAD)" = "$(test_oid cp_ff)"
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 0c72e4f first
-rm 'file1'
-[new 1654ff9] file2
- 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
-[new 1df192c] first
+If you want to 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 f6d0551 rename2
+[detached HEAD 2da2754] added
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
+ Date: Thu Apr 7 15:14:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 10 - cherry pick a root commit with --ff
+Add extra line at the end
+2da2754 HEAD@{0}: cherry-pick: added
+ok 4 - cherry-pick after renaming branch
 
-expecting success of 3506.11 'cherry-pick --ff on unborn branch': 
-	git checkout --orphan unborn &&
-	git rm --cached -r . &&
-	rm -rf * &&
-	git cherry-pick --ff first &&
-	test_cmp_rev first HEAD
+expecting success of 3501.5 'revert after renaming branch': 
 
-Switched to a new branch 'unborn'
-rm 'file1'
-rm 'file2'
-ok 11 - cherry-pick --ff on unborn branch
+	git checkout rename1 &&
+	git revert added &&
+	test_cmp_rev rename1 HEAD^ &&
+	test_path_is_file spoo &&
+	test_cmp_rev initial:oops HEAD:spoo &&
+	git reflog -1 | grep revert
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3505-cherry-pick-empty.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3505-cherry-pick-empty/.git/
-expecting success of 3505.1 'setup': 
 
-	echo first > file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m "first" &&
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	git checkout -b empty-message-branch &&
-	echo third >> file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit --allow-empty-message -m "" &&
+  2da2754 added
 
-	git checkout main &&
-	git checkout -b empty-change-branch &&
-	test_tick &&
-	git commit --allow-empty -m "empty"
+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> 2da2754
 
-[main (root-commit) 0c72e4f] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Switched to a new branch 'empty-message-branch'
-[empty-message-branch d6aa1e8] 
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'main'
-Switched to a new branch 'empty-change-branch'
-[empty-change-branch 0f51a27] empty
+HEAD is now at 31df260 rename1
+[detached HEAD 9990ddc] Revert "added"
  Author: A U Thor <author@example.com>
-ok 1 - setup
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+9990ddc HEAD@{0}: revert: Revert "added"
+ok 5 - revert after renaming branch
 
-expecting success of 3505.2 'cherry-pick an empty commit': 
-	git checkout main &&
-	test_expect_code 1 git cherry-pick empty-change-branch
+expecting success of 3501.6 'cherry-pick on stat-dirty working tree': 
+	git clone . copy &&
+	(
+		cd copy &&
+		git checkout initial &&
+		test-tool chmtime +40 oops &&
+		git cherry-pick added
+	)
 
-Switched to branch 'main'
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+Cloning into 'copy'...
+done.
+Note: switching to '9990ddca844ef3875d864da986dfd141d1a88865'.
 
-    git commit --allow-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.
 
-Otherwise, please use 'git cherry-pick --skip'
-On branch main
-You are currently cherry-picking commit 0f51a27.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+If you want to 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 to commit, working tree clean
-ok 2 - cherry-pick an empty commit
+  git switch -c <new-branch-name>
 
-expecting success of 3505.3 'index lockfile was removed': 
-	test ! -f .git/index.lock
+Or undo this operation with:
 
-ok 3 - index lockfile was removed
+  git switch -
 
-expecting success of 3505.4 'cherry-pick a commit with an empty message': 
-	test_when_finished "git reset --hard empty-message-branch~1" &&
-	git checkout main &&
-	git cherry-pick empty-message-branch
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Already on 'main'
-warning: cancelling a cherry picking in progress
-[main d800ed2] 
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-HEAD is now at 0c72e4f first
-ok 4 - cherry-pick a commit with an empty message
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3505.5 'index lockfile was removed': 
-	test ! -f .git/index.lock
+  9990ddc Revert "added"
 
-ok 5 - index lockfile was removed
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3505.6 'cherry-pick a commit with an empty message with --allow-empty-message': 
-	git checkout -f main &&
-	git cherry-pick --allow-empty-message empty-message-branch
+ git branch <new-branch-name> 9990ddc
 
-Already on 'main'
-[main d800ed2] 
+HEAD is now at a242c62 initial
+[detached HEAD 096ed54] added
  Author: A U Thor <author@example.com>
  Date: Thu Apr 7 15:14:13 2005 -0700
  1 file changed, 1 insertion(+)
-ok 6 - cherry-pick a commit with an empty message with --allow-empty-message
-
-expecting success of 3505.7 'cherry pick an empty non-ff commit without --allow-empty': 
-	git checkout main &&
-	echo fourth >>file2 &&
-	git add file2 &&
-	git commit -m "fourth" &&
-	test_must_fail git cherry-pick empty-change-branch
+ok 6 - cherry-pick on stat-dirty working tree
 
-Already on 'main'
-[main 36c19c0] fourth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+expecting success of 3501.7 'revert forbidden on dirty working tree': 
 
-    git commit --allow-empty
+	echo content >extra_file &&
+	git add extra_file &&
+	test_must_fail git revert HEAD 2>errors &&
+	test_grep "your local changes would be overwritten by " errors
 
-Otherwise, please use 'git cherry-pick --skip'
-On branch main
-You are currently cherry-picking commit 0f51a27.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
-nothing to commit, working tree clean
-ok 7 - cherry pick an empty non-ff commit without --allow-empty
-
-expecting success of 3505.8 'cherry pick an empty non-ff commit with --allow-empty': 
-	git checkout main &&
-	git cherry-pick --allow-empty empty-change-branch
-
-Already on 'main'
-warning: cancelling a cherry picking in progress
-[main 72a973f] empty
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
-ok 8 - cherry pick an empty non-ff commit with --allow-empty
-
-expecting success of 3505.9 'cherry pick with --keep-redundant-commits': 
-	git checkout main &&
-	git cherry-pick --keep-redundant-commits HEAD^
-
-Already on 'main'
-[main 938d13f] fourth
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
-ok 9 - cherry pick with --keep-redundant-commits
-
-expecting success of 3505.10 'cherry-pick a commit that becomes no-op (prep)': 
-	git checkout main &&
-	git branch fork &&
-	echo foo >file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m "add file2 on main" &&
-
-	git checkout fork &&
-	echo foo >file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m "add file2 on the side"
-
-Already on 'main'
-[main aa68455] add file2 on main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'fork'
-[fork 521fc70] add file2 on the side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 10 - cherry-pick a commit that becomes no-op (prep)
-
-expecting success of 3505.11 'cherry-pick a no-op with neither --keep-redundant nor --empty': 
-	git reset --hard &&
-	git checkout fork^0 &&
-	test_must_fail git cherry-pick main
-
-HEAD is now at 521fc70 add file2 on the side
-Note: switching to 'fork^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 521fc70 add file2 on the side
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
-
-    git commit --allow-empty
-
-Otherwise, please use 'git cherry-pick --skip'
-HEAD detached at 521fc70
-You are currently cherry-picking commit aa68455.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
-
-nothing to commit, working tree clean
-ok 11 - cherry-pick a no-op with neither --keep-redundant nor --empty
-
-expecting success of 3505.12 'cherry-pick a no-op with --keep-redundant': 
-	git reset --hard &&
-	git checkout fork^0 &&
-	git cherry-pick --keep-redundant-commits main &&
-	git show -s --format=%s >actual &&
-	echo "add file2 on main" >expect &&
-	test_cmp expect actual
-
-HEAD is now at 521fc70 add file2 on the side
-HEAD is now at 521fc70 add file2 on the side
-[detached HEAD ffffb2b] add file2 on main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
-ok 12 - cherry-pick a no-op with --keep-redundant
-
-expecting success of 3505.13 '--keep-redundant-commits is incompatible with operations': 
-	test_must_fail git cherry-pick HEAD 2>output &&
-	test_grep "The previous cherry-pick is now empty" output &&
-	test_must_fail git cherry-pick --keep-redundant-commits --continue 2>output &&
-	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --continue" output &&
-	test_must_fail git cherry-pick --keep-redundant-commits --skip 2>output &&
-	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --skip" output &&
-	test_must_fail git cherry-pick --keep-redundant-commits --abort 2>output &&
-	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --abort" output &&
-	test_must_fail git cherry-pick --keep-redundant-commits --quit 2>output &&
-	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --quit" output &&
-	git cherry-pick --abort
-
-HEAD detached from 521fc70
-You are currently cherry-picking commit ffffb2b.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	output
-
-nothing added to commit but untracked files present (use "git add" to track)
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-fatal: cherry-pick: --keep-redundant-commits cannot be used with --continue
-fatal: cherry-pick: --keep-redundant-commits cannot be used with --skip
-fatal: cherry-pick: --keep-redundant-commits cannot be used with --abort
-fatal: cherry-pick: --keep-redundant-commits cannot be used with --quit
-ok 13 - --keep-redundant-commits is incompatible with operations
-
-expecting success of 3505.14 '--empty is incompatible with operations': 
-	test_must_fail git cherry-pick HEAD 2>output &&
-	test_grep "The previous cherry-pick is now empty" output &&
-	test_must_fail git cherry-pick --empty=stop --continue 2>output &&
-	test_grep "fatal: cherry-pick: --empty cannot be used with --continue" output &&
-	test_must_fail git cherry-pick --empty=stop --skip 2>output &&
-	test_grep "fatal: cherry-pick: --empty cannot be used with --skip" output &&
-	test_must_fail git cherry-pick --empty=stop --abort 2>output &&
-	test_grep "fatal: cherry-pick: --empty cannot be used with --abort" output &&
-	test_must_fail git cherry-pick --empty=stop --quit 2>output &&
-	test_grep "fatal: cherry-pick: --empty cannot be used with --quit" output &&
-	git cherry-pick --abort
-
-HEAD detached from 521fc70
-You are currently cherry-picking commit ffffb2b.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	output
-
-nothing added to commit but untracked files present (use "git add" to track)
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-fatal: cherry-pick: --empty cannot be used with --continue
-fatal: cherry-pick: --empty cannot be used with --skip
-fatal: cherry-pick: --empty cannot be used with --abort
-fatal: cherry-pick: --empty cannot be used with --quit
-ok 14 - --empty is incompatible with operations
-
-expecting success of 3505.15 'cherry-pick a no-op with --empty=stop': 
-	git reset --hard &&
-	git checkout fork^0 &&
-	test_must_fail git cherry-pick --empty=stop main 2>output &&
-	test_grep "The previous cherry-pick is now empty" output
-
-HEAD is now at ffffb2b add file2 on main
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  ffffb2b add file2 on main
-
-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> ffffb2b
-
-HEAD is now at 521fc70 add file2 on the side
-HEAD detached at 521fc70
-You are currently cherry-picking commit aa68455.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	output
-
-nothing added to commit but untracked files present (use "git add" to track)
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-ok 15 - cherry-pick a no-op with --empty=stop
-
-expecting success of 3505.16 'cherry-pick a no-op with --empty=drop': 
-	git reset --hard &&
-	git checkout fork^0 &&
-	git cherry-pick --empty=drop main &&
-	test_commit_message HEAD -m "add file2 on the side"
-
-HEAD is now at 521fc70 add file2 on the side
-HEAD is now at 521fc70 add file2 on the side
-dropping aa68455a495805013ddc30249c4c19aa0866fc23 add file2 on main -- patch contents already upstream
-ok 16 - cherry-pick a no-op with --empty=drop
-
-expecting success of 3505.17 'cherry-pick a no-op with --empty=keep': 
-	git reset --hard &&
-	git checkout fork^0 &&
-	git cherry-pick --empty=keep main &&
-	test_commit_message HEAD -m "add file2 on main"
-
-HEAD is now at 521fc70 add file2 on the side
-HEAD is now at 521fc70 add file2 on the side
-[detached HEAD ffffb2b] add file2 on main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
-ok 17 - cherry-pick a no-op with --empty=keep
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3501-revert-cherry-pick.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3501-revert-cherry-pick/.git/
-expecting success of 3501.1 'setup': 
-
-	for l in a b c d e f g h i j k l m n o
-	do
-		echo $l$l$l$l$l$l$l$l$l || return 1
-	done >oops &&
-
-	test_tick &&
-	git add oops &&
-	git commit -m initial &&
-	git tag initial &&
-
-	test_tick &&
-	echo "Add extra line at the end" >>oops &&
-	git commit -a -m added &&
-	git tag added &&
-
-	test_tick &&
-	git mv oops spoo &&
-	git commit -m rename1 &&
-	git tag rename1 &&
-
-	test_tick &&
-	git checkout -b side initial &&
-	git mv oops opos &&
-	git commit -m rename2 &&
-	git tag rename2
-
-[main (root-commit) a242c62] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 15 insertions(+)
- create mode 100644 oops
-[main 4399171] added
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 31df260] rename1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename oops => spoo (100%)
-Switched to a new branch 'side'
-[side f6d0551] rename2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename oops => opos (100%)
-ok 1 - setup
-
-expecting success of 3501.2 'cherry-pick --nonsense': 
-
-	pos=$(git rev-parse HEAD) &&
-	git diff --exit-code HEAD &&
-	test_must_fail git cherry-pick --nonsense 2>msg &&
-	git diff --exit-code HEAD "$pos" &&
-	test_grep "[Uu]sage:" msg
-
-usage: git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]
-ok 2 - cherry-pick --nonsense
-
-expecting success of 3501.3 'revert --nonsense': 
-
-	pos=$(git rev-parse HEAD) &&
-	git diff --exit-code HEAD &&
-	test_must_fail git revert --nonsense 2>msg &&
-	git diff --exit-code HEAD "$pos" &&
-	test_grep "[Uu]sage:" msg
-
-usage: git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...
-ok 3 - revert --nonsense
-
-expecting success of 3501.4 'cherry-pick after renaming branch': 
-
-	git checkout rename2 &&
-	git cherry-pick added &&
-	test_cmp_rev rename2 HEAD^ &&
-	grep "Add extra line at the end" opos &&
-	git reflog -1 | grep cherry-pick
-
-
-Note: switching to 'rename2'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 f6d0551 rename2
-[detached HEAD 2da2754] added
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-Add extra line at the end
-2da2754 HEAD@{0}: cherry-pick: added
-ok 4 - cherry-pick after renaming branch
-
-expecting success of 3501.5 'revert after renaming branch': 
-
-	git checkout rename1 &&
-	git revert added &&
-	test_cmp_rev rename1 HEAD^ &&
-	test_path_is_file spoo &&
-	test_cmp_rev initial:oops HEAD:spoo &&
-	git reflog -1 | grep revert
-
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  2da2754 added
-
-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> 2da2754
-
-HEAD is now at 31df260 rename1
-[detached HEAD 9990ddc] Revert "added"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 deletion(-)
-9990ddc HEAD@{0}: revert: Revert "added"
-ok 5 - revert after renaming branch
-
-expecting success of 3501.6 'cherry-pick on stat-dirty working tree': 
-	git clone . copy &&
-	(
-		cd copy &&
-		git checkout initial &&
-		test-tool chmtime +40 oops &&
-		git cherry-pick added
-	)
-
-Cloning into 'copy'...
-done.
-Note: switching to '9990ddca844ef3875d864da986dfd141d1a88865'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  9990ddc Revert "added"
-
-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> 9990ddc
-
-HEAD is now at a242c62 initial
-[detached HEAD 096ed54] added
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 6 - cherry-pick on stat-dirty working tree
-
-expecting success of 3501.7 'revert forbidden on dirty working tree': 
-
-	echo content >extra_file &&
-	git add extra_file &&
-	test_must_fail git revert HEAD 2>errors &&
-	test_grep "your local changes would be overwritten by " errors
-
-
-error: your local changes would be overwritten by revert.
-ok 7 - revert forbidden on dirty working tree
+error: your local changes would be overwritten by revert.
+ok 7 - revert forbidden on dirty working tree
 
 expecting success of 3501.8 'cherry-pick on unborn branch': 
 	git switch --orphan unborn &&
@@ -179836,6 +180246,533 @@
 1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3506-cherry-pick-ff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3506-cherry-pick-ff/.git/
+expecting success of 3506.1 'setup': 
+	echo first > file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m "first" &&
+	git tag first &&
+
+	git checkout -b other &&
+	echo second >> file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m "second" &&
+	git tag second &&
+	test_oid_cache <<-EOF
+	cp_ff sha1:1df192cd8bc58a2b275d842cede4d221ad9000d1
+	cp_ff sha256:e70d6b7fc064bddb516b8d512c9057094b96ce6ff08e12080acc4fe7f1d60a1d
+	EOF
+
+[main (root-commit) 0c72e4f] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Switched to a new branch 'other'
+[other 453a047] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 3506.2 'cherry-pick using --ff fast forwards': 
+	git checkout main &&
+	git reset --hard first &&
+	test_tick &&
+	git cherry-pick --ff second &&
+	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify second)"
+
+Switched to branch 'main'
+HEAD is now at 0c72e4f first
+ok 2 - cherry-pick using --ff fast forwards
+
+expecting success of 3506.3 'cherry-pick not using --ff does not fast forwards': 
+	git checkout main &&
+	git reset --hard first &&
+	test_tick &&
+	git cherry-pick second &&
+	test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify second)"
+
+Already on 'main'
+HEAD is now at 0c72e4f first
+[main 43e4ff7] second
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 3 - cherry-pick not using --ff does not fast forwards
+
+expecting success of 3506.4 'merge setup': 
+	git checkout main &&
+	git reset --hard first &&
+	echo new line >A &&
+	git add A &&
+	test_tick &&
+	git commit -m "add line to A" A &&
+	git tag A &&
+	git checkout -b side first &&
+	echo new line >B &&
+	git add B &&
+	test_tick &&
+	git commit -m "add line to B" B &&
+	git tag B &&
+	git checkout main &&
+	git merge side &&
+	git tag C &&
+	git checkout -b new A
+
+Already on 'main'
+HEAD is now at 0c72e4f first
+[main e3ca70e] add line to A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+Switched to a new branch 'side'
+[side 5faaf2e] add line to B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ B | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+Switched to a new branch 'new'
+ok 4 - merge setup
+
+expecting success of 3506.5 'cherry-pick explicit first parent of a non-merge with --ff': 
+	git reset --hard A -- &&
+	git cherry-pick --ff -m 1 B &&
+	git diff --exit-code C --
+
+HEAD is now at e3ca70e add line to A
+[new d859d20] add line to B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+ok 5 - cherry-pick explicit first parent of a non-merge with --ff
+
+expecting success of 3506.6 'cherry pick a merge with --ff but without -m should fail': 
+	git reset --hard A -- &&
+	test_must_fail git cherry-pick --ff C &&
+	git diff --exit-code A --
+
+HEAD is now at e3ca70e add line to A
+error: commit 17345dd7218a0fc4dc087d5aacc6be7192e4fa2a is a merge but no -m option was given.
+fatal: cherry-pick failed
+ok 6 - cherry pick a merge with --ff but without -m should fail
+
+expecting success of 3506.7 'cherry pick with --ff a merge (1)': 
+	git reset --hard A -- &&
+	git cherry-pick --ff -m 1 C &&
+	git diff --exit-code C &&
+	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify C)"
+
+HEAD is now at e3ca70e add line to A
+ok 7 - cherry pick with --ff a merge (1)
+
+expecting success of 3506.8 'cherry pick with --ff a merge (2)': 
+	git reset --hard B -- &&
+	git cherry-pick --ff -m 2 C &&
+	git diff --exit-code C &&
+	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify C)"
+
+HEAD is now at 5faaf2e add line to B
+ok 8 - cherry pick with --ff a merge (2)
+
+expecting success of 3506.9 'cherry pick a merge relative to nonexistent parent with --ff should fail': 
+	git reset --hard B -- &&
+	test_must_fail git cherry-pick --ff -m 3 C
+
+HEAD is now at 5faaf2e add line to B
+error: commit 17345dd7218a0fc4dc087d5aacc6be7192e4fa2a does not have parent 3
+fatal: cherry-pick failed
+ok 9 - cherry pick a merge relative to nonexistent parent with --ff should fail
+
+expecting success of 3506.10 'cherry pick a root commit with --ff': 
+	git reset --hard first -- &&
+	git rm file1 &&
+	echo first >file2 &&
+	git add file2 &&
+	git commit --amend -m "file2" &&
+	git cherry-pick --ff first &&
+	test "$(git rev-parse --verify HEAD)" = "$(test_oid cp_ff)"
+
+HEAD is now at 0c72e4f first
+rm 'file1'
+[new 1654ff9] file2
+ 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
+[new 1df192c] 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 10 - cherry pick a root commit with --ff
+
+expecting success of 3506.11 'cherry-pick --ff on unborn branch': 
+	git checkout --orphan unborn &&
+	git rm --cached -r . &&
+	rm -rf * &&
+	git cherry-pick --ff first &&
+	test_cmp_rev first HEAD
+
+Switched to a new branch 'unborn'
+rm 'file1'
+rm 'file2'
+ok 11 - cherry-pick --ff on unborn branch
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3505-cherry-pick-empty.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3505-cherry-pick-empty/.git/
+expecting success of 3505.1 'setup': 
+
+	echo first > file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m "first" &&
+
+	git checkout -b empty-message-branch &&
+	echo third >> file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit --allow-empty-message -m "" &&
+
+	git checkout main &&
+	git checkout -b empty-change-branch &&
+	test_tick &&
+	git commit --allow-empty -m "empty"
+
+
+[main (root-commit) 0c72e4f] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Switched to a new branch 'empty-message-branch'
+[empty-message-branch d6aa1e8] 
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+Switched to a new branch 'empty-change-branch'
+[empty-change-branch 0f51a27] empty
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 3505.2 'cherry-pick an empty commit': 
+	git checkout main &&
+	test_expect_code 1 git cherry-pick empty-change-branch
+
+Switched to branch 'main'
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
+
+    git commit --allow-empty
+
+Otherwise, please use 'git cherry-pick --skip'
+On branch main
+You are currently cherry-picking commit 0f51a27.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+
+nothing to commit, working tree clean
+ok 2 - cherry-pick an empty commit
+
+expecting success of 3505.3 'index lockfile was removed': 
+	test ! -f .git/index.lock
+
+ok 3 - index lockfile was removed
+
+expecting success of 3505.4 'cherry-pick a commit with an empty message': 
+	test_when_finished "git reset --hard empty-message-branch~1" &&
+	git checkout main &&
+	git cherry-pick empty-message-branch
+
+Already on 'main'
+warning: cancelling a cherry picking in progress
+[main d800ed2] 
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+HEAD is now at 0c72e4f first
+ok 4 - cherry-pick a commit with an empty message
+
+expecting success of 3505.5 'index lockfile was removed': 
+	test ! -f .git/index.lock
+
+ok 5 - index lockfile was removed
+
+expecting success of 3505.6 'cherry-pick a commit with an empty message with --allow-empty-message': 
+	git checkout -f main &&
+	git cherry-pick --allow-empty-message empty-message-branch
+
+Already on 'main'
+[main d800ed2] 
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 6 - cherry-pick a commit with an empty message with --allow-empty-message
+
+expecting success of 3505.7 'cherry pick an empty non-ff commit without --allow-empty': 
+	git checkout main &&
+	echo fourth >>file2 &&
+	git add file2 &&
+	git commit -m "fourth" &&
+	test_must_fail git cherry-pick empty-change-branch
+
+Already on 'main'
+[main 36c19c0] fourth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
+
+    git commit --allow-empty
+
+Otherwise, please use 'git cherry-pick --skip'
+On branch main
+You are currently cherry-picking commit 0f51a27.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+
+nothing to commit, working tree clean
+ok 7 - cherry pick an empty non-ff commit without --allow-empty
+
+expecting success of 3505.8 'cherry pick an empty non-ff commit with --allow-empty': 
+	git checkout main &&
+	git cherry-pick --allow-empty empty-change-branch
+
+Already on 'main'
+warning: cancelling a cherry picking in progress
+[main 72a973f] empty
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ok 8 - cherry pick an empty non-ff commit with --allow-empty
+
+expecting success of 3505.9 'cherry pick with --keep-redundant-commits': 
+	git checkout main &&
+	git cherry-pick --keep-redundant-commits HEAD^
+
+Already on 'main'
+[main 938d13f] fourth
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ok 9 - cherry pick with --keep-redundant-commits
+
+expecting success of 3505.10 'cherry-pick a commit that becomes no-op (prep)': 
+	git checkout main &&
+	git branch fork &&
+	echo foo >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m "add file2 on main" &&
+
+	git checkout fork &&
+	echo foo >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m "add file2 on the side"
+
+Already on 'main'
+[main aa68455] add file2 on main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'fork'
+[fork 521fc70] add file2 on the side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 10 - cherry-pick a commit that becomes no-op (prep)
+
+expecting success of 3505.11 'cherry-pick a no-op with neither --keep-redundant nor --empty': 
+	git reset --hard &&
+	git checkout fork^0 &&
+	test_must_fail git cherry-pick main
+
+HEAD is now at 521fc70 add file2 on the side
+Note: switching to 'fork^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 521fc70 add file2 on the side
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
+
+    git commit --allow-empty
+
+Otherwise, please use 'git cherry-pick --skip'
+HEAD detached at 521fc70
+You are currently cherry-picking commit aa68455.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+
+nothing to commit, working tree clean
+ok 11 - cherry-pick a no-op with neither --keep-redundant nor --empty
+
+expecting success of 3505.12 'cherry-pick a no-op with --keep-redundant': 
+	git reset --hard &&
+	git checkout fork^0 &&
+	git cherry-pick --keep-redundant-commits main &&
+	git show -s --format=%s >actual &&
+	echo "add file2 on main" >expect &&
+	test_cmp expect actual
+
+HEAD is now at 521fc70 add file2 on the side
+HEAD is now at 521fc70 add file2 on the side
+[detached HEAD ffffb2b] add file2 on main
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ok 12 - cherry-pick a no-op with --keep-redundant
+
+expecting success of 3505.13 '--keep-redundant-commits is incompatible with operations': 
+	test_must_fail git cherry-pick HEAD 2>output &&
+	test_grep "The previous cherry-pick is now empty" output &&
+	test_must_fail git cherry-pick --keep-redundant-commits --continue 2>output &&
+	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --continue" output &&
+	test_must_fail git cherry-pick --keep-redundant-commits --skip 2>output &&
+	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --skip" output &&
+	test_must_fail git cherry-pick --keep-redundant-commits --abort 2>output &&
+	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --abort" output &&
+	test_must_fail git cherry-pick --keep-redundant-commits --quit 2>output &&
+	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --quit" output &&
+	git cherry-pick --abort
+
+HEAD detached from 521fc70
+You are currently cherry-picking commit ffffb2b.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	output
+
+nothing added to commit but untracked files present (use "git add" to track)
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+fatal: cherry-pick: --keep-redundant-commits cannot be used with --continue
+fatal: cherry-pick: --keep-redundant-commits cannot be used with --skip
+fatal: cherry-pick: --keep-redundant-commits cannot be used with --abort
+fatal: cherry-pick: --keep-redundant-commits cannot be used with --quit
+ok 13 - --keep-redundant-commits is incompatible with operations
+
+expecting success of 3505.14 '--empty is incompatible with operations': 
+	test_must_fail git cherry-pick HEAD 2>output &&
+	test_grep "The previous cherry-pick is now empty" output &&
+	test_must_fail git cherry-pick --empty=stop --continue 2>output &&
+	test_grep "fatal: cherry-pick: --empty cannot be used with --continue" output &&
+	test_must_fail git cherry-pick --empty=stop --skip 2>output &&
+	test_grep "fatal: cherry-pick: --empty cannot be used with --skip" output &&
+	test_must_fail git cherry-pick --empty=stop --abort 2>output &&
+	test_grep "fatal: cherry-pick: --empty cannot be used with --abort" output &&
+	test_must_fail git cherry-pick --empty=stop --quit 2>output &&
+	test_grep "fatal: cherry-pick: --empty cannot be used with --quit" output &&
+	git cherry-pick --abort
+
+HEAD detached from 521fc70
+You are currently cherry-picking commit ffffb2b.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	output
+
+nothing added to commit but untracked files present (use "git add" to track)
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+fatal: cherry-pick: --empty cannot be used with --continue
+fatal: cherry-pick: --empty cannot be used with --skip
+fatal: cherry-pick: --empty cannot be used with --abort
+fatal: cherry-pick: --empty cannot be used with --quit
+ok 14 - --empty is incompatible with operations
+
+expecting success of 3505.15 'cherry-pick a no-op with --empty=stop': 
+	git reset --hard &&
+	git checkout fork^0 &&
+	test_must_fail git cherry-pick --empty=stop main 2>output &&
+	test_grep "The previous cherry-pick is now empty" output
+
+HEAD is now at ffffb2b add file2 on main
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  ffffb2b add file2 on main
+
+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> ffffb2b
+
+HEAD is now at 521fc70 add file2 on the side
+HEAD detached at 521fc70
+You are currently cherry-picking commit aa68455.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	output
+
+nothing added to commit but untracked files present (use "git add" to track)
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+ok 15 - cherry-pick a no-op with --empty=stop
+
+expecting success of 3505.16 'cherry-pick a no-op with --empty=drop': 
+	git reset --hard &&
+	git checkout fork^0 &&
+	git cherry-pick --empty=drop main &&
+	test_commit_message HEAD -m "add file2 on the side"
+
+HEAD is now at 521fc70 add file2 on the side
+HEAD is now at 521fc70 add file2 on the side
+dropping aa68455a495805013ddc30249c4c19aa0866fc23 add file2 on main -- patch contents already upstream
+ok 16 - cherry-pick a no-op with --empty=drop
+
+expecting success of 3505.17 'cherry-pick a no-op with --empty=keep': 
+	git reset --hard &&
+	git checkout fork^0 &&
+	git cherry-pick --empty=keep main &&
+	test_commit_message HEAD -m "add file2 on main"
+
+HEAD is now at 521fc70 add file2 on the side
+HEAD is now at 521fc70 add file2 on the side
+[detached HEAD ffffb2b] add file2 on main
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ok 17 - cherry-pick a no-op with --empty=keep
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3509-cherry-pick-merge-df.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3509-cherry-pick-merge-df/.git/
 expecting success of 3509.1 'Initialize repository': 
@@ -180067,12487 +181004,12861 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3070-wildmatch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3070-wildmatch/.git/
-checking prerequisite: EXPENSIVE_ON_WINDOWS
+*** t3508-cherry-pick-many-commits.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3508-cherry-pick-many-commits/.git/
+expecting success of 3508.1 'setup': 
+	echo first > file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m "first" &&
+	git tag first &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE_ON_WINDOWS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE_ON_WINDOWS" &&
-	test_have_prereq EXPENSIVE || test_have_prereq !MINGW,!CYGWIN
+	git checkout -b other &&
+	for val in second third fourth
+	do
+		echo $val >> file1 &&
+		git add file1 &&
+		test_tick &&
+		git commit -m "$val" &&
+		git tag $val || return 1
+	done
 
-)
-checking prerequisite: EXPENSIVE
+[main (root-commit) 0c72e4f] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Switched to a new branch 'other'
+[other 453a047] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[other e85abe2] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[other 94d3184] fourth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
+expecting success of 3508.2 'cherry-pick first..fourth works': 
+	git checkout -f main &&
+	git reset --hard first &&
+	test_tick &&
+	git cherry-pick first..fourth &&
+	git diff --quiet other &&
+	git diff --quiet HEAD other &&
+	check_head_differs_from fourth
 
-)
-prerequisite EXPENSIVE not satisfied
-prerequisite EXPENSIVE_ON_WINDOWS ok
-expecting success of 3070.1 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-ok 1 - cleanup after previous file test
+Switched to branch 'main'
+HEAD is now at 0c72e4f first
+[main 9589776] second
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+[main 7ef563c] third
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+[main 105ac0a] fourth
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 2 - cherry-pick first..fourth works
 
-expecting success of 3070.2 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 2 - setup match file test for foo
+expecting success of 3508.3 'cherry-pick three one two works': 
+	git checkout -f first &&
+	test_commit one &&
+	test_commit two &&
+	test_commit three &&
+	git checkout -f main &&
+	git reset --hard first &&
+	git cherry-pick three one two &&
+	git diff --quiet three &&
+	git diff --quiet HEAD three &&
+	test "$(git log --reverse --format=%s first..)" = "three
+one
+two"
 
-expecting success of 3070.3 'wildmatch: match 'foo' 'foo'': 
-			test-tool wildmatch wildmatch 'foo' 'foo'
-		
-ok 3 - wildmatch: match 'foo' 'foo'
+Note: switching to 'first'.
 
-expecting success of 3070.4 'wildmatch (via ls-files): match 'foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 4 - wildmatch (via ls-files): match 'foo' '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.
 
-expecting success of 3070.5 'iwildmatch: match 'foo' 'foo'': 
-			test-tool wildmatch iwildmatch 'foo' 'foo'
-		
-ok 5 - iwildmatch: match 'foo' 'foo'
+If you want to 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 3070.6 'iwildmatch (via ls-files): match 'foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 6 - iwildmatch (via ls-files): match 'foo' 'foo'
+  git switch -c <new-branch-name>
 
-expecting success of 3070.7 'pathmatch: match 'foo' 'foo'': 
-			test-tool wildmatch pathmatch 'foo' 'foo'
-		
-ok 7 - pathmatch: match 'foo' 'foo'
+Or undo this operation with:
 
-expecting success of 3070.8 'pathmatch (via ls-files): match 'foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 8 - pathmatch (via ls-files): match 'foo' 'foo'
+  git switch -
 
-expecting success of 3070.9 'ipathmatch: match 'foo' 'foo'': 
-			test-tool wildmatch ipathmatch 'foo' 'foo'
-		
-ok 9 - ipathmatch: match 'foo' 'foo'
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.10 'ipathmatch (via ls-files): match 'foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 10 - ipathmatch (via ls-files): match 'foo' 'foo'
+HEAD is now at 0c72e4f first
+[detached HEAD 08ada56] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[detached HEAD 556e4fe] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[detached HEAD a4e9322] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+Previous HEAD position was a4e9322 three
+Switched to branch 'main'
+HEAD is now at 0c72e4f first
+[main 124d016] three
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:20:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[main 6e6e64d] one
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 54c7896] two
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 3 - cherry-pick three one two works
 
-expecting success of 3070.11 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 11 - cleanup after previous file test
+expecting success of 3508.4 'cherry-pick three one two: fails': 
+	git checkout -f main &&
+	git reset --hard first &&
+	test_must_fail git cherry-pick three one two:
 
-expecting success of 3070.12 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 12 - setup match file test for foo
+Already on 'main'
+HEAD is now at 0c72e4f first
+error: two:: can't cherry-pick a tree
+fatal: cherry-pick failed
+ok 4 - cherry-pick three one two: fails
 
-expecting success of 3070.13 'wildmatch: no match 'foo' 'bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo' 'bar'
-		
-ok 13 - wildmatch: no match 'foo' 'bar'
+expecting success of 3508.5 'output to keep user entertained during multi-pick': 
+	cat <<-\EOF >expected &&
+	[main OBJID] second
+	 Author: A U Thor <author@example.com>
+	 Date: Thu Apr 7 15:14:13 2005 -0700
+	 1 file changed, 1 insertion(+)
+	[main OBJID] third
+	 Author: A U Thor <author@example.com>
+	 Date: Thu Apr 7 15:15:13 2005 -0700
+	 1 file changed, 1 insertion(+)
+	[main OBJID] fourth
+	 Author: A U Thor <author@example.com>
+	 Date: Thu Apr 7 15:16:13 2005 -0700
+	 1 file changed, 1 insertion(+)
+	EOF
 
-expecting success of 3070.14 'wildmatch (via ls-files): no match 'bar' 'foo'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 14 - wildmatch (via ls-files): no match 'bar' 'foo'
+	git checkout -f main &&
+	git reset --hard first &&
+	test_tick &&
+	git cherry-pick first..fourth >actual &&
+	sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
+	test_line_count -ge 3 actual.fuzzy &&
+	test_cmp expected actual.fuzzy
 
-expecting success of 3070.15 'iwildmatch: no match 'foo' 'bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' 'bar'
-		
-ok 15 - iwildmatch: no match 'foo' 'bar'
+Already on 'main'
+HEAD is now at 0c72e4f first
+ok 5 - output to keep user entertained during multi-pick
 
-expecting success of 3070.16 'iwildmatch (via ls-files): no match 'bar' 'foo'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 16 - iwildmatch (via ls-files): no match 'bar' 'foo'
+expecting success of 3508.6 'cherry-pick --strategy resolve first..fourth works': 
+	git checkout -f main &&
+	git reset --hard first &&
+	test_tick &&
+	git cherry-pick --strategy resolve first..fourth &&
+	git diff --quiet other &&
+	git diff --quiet HEAD other &&
+	check_head_differs_from fourth
 
-expecting success of 3070.17 'pathmatch: no match 'foo' 'bar'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' 'bar'
-		
-ok 17 - pathmatch: no match 'foo' 'bar'
+Already on 'main'
+HEAD is now at 0c72e4f first
+Trying simple merge.
+[main 48c207c] second
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+Trying simple merge.
+[main 9dcf789] third
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+Trying simple merge.
+[main 1f7167d] fourth
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 6 - cherry-pick --strategy resolve first..fourth works
 
-expecting success of 3070.18 'pathmatch (via ls-files): no match 'bar' 'foo'': 
-				>expect &&
-				git ls-files -z -- 'bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 18 - pathmatch (via ls-files): no match 'bar' 'foo'
+expecting success of 3508.7 'output during multi-pick indicates merge strategy': 
+	cat <<-\EOF >expected &&
+	Trying simple merge.
+	[main OBJID] second
+	 Author: A U Thor <author@example.com>
+	 Date: Thu Apr 7 15:14:13 2005 -0700
+	 1 file changed, 1 insertion(+)
+	Trying simple merge.
+	[main OBJID] third
+	 Author: A U Thor <author@example.com>
+	 Date: Thu Apr 7 15:15:13 2005 -0700
+	 1 file changed, 1 insertion(+)
+	Trying simple merge.
+	[main OBJID] fourth
+	 Author: A U Thor <author@example.com>
+	 Date: Thu Apr 7 15:16:13 2005 -0700
+	 1 file changed, 1 insertion(+)
+	EOF
 
-expecting success of 3070.19 'ipathmatch: no match 'foo' 'bar'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' 'bar'
-		
-ok 19 - ipathmatch: no match 'foo' 'bar'
+	git checkout -f main &&
+	git reset --hard first &&
+	test_tick &&
+	git cherry-pick --strategy resolve first..fourth >actual &&
+	sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
+	test_cmp expected actual.fuzzy
 
-expecting success of 3070.20 'ipathmatch (via ls-files): no match 'bar' 'foo'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 20 - ipathmatch (via ls-files): no match 'bar' 'foo'
+Already on 'main'
+HEAD is now at 0c72e4f first
+ok 7 - output during multi-pick indicates merge strategy
 
-expecting success of 3070.21 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 21 - cleanup after previous file test
+expecting success of 3508.8 'cherry-pick --ff first..fourth works': 
+	git checkout -f main &&
+	git reset --hard first &&
+	test_tick &&
+	git cherry-pick --ff first..fourth &&
+	git diff --quiet other &&
+	git diff --quiet HEAD other &&
+	check_head_equals fourth
 
-expecting success of 3070.22 'setup match file test for ': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 22 - setup match file test for 
+Already on 'main'
+HEAD is now at 0c72e4f first
+ok 8 - cherry-pick --ff first..fourth works
 
-expecting success of 3070.23 'wildmatch: match '' ''': 
-			test-tool wildmatch wildmatch '' ''
-		
-ok 23 - wildmatch: match '' ''
+expecting success of 3508.9 'cherry-pick -n first..fourth works': 
+	git checkout -f main &&
+	git reset --hard first &&
+	test_tick &&
+	git cherry-pick -n first..fourth &&
+	git diff --quiet other &&
+	git diff --cached --quiet other &&
+	git diff --quiet HEAD first
 
-checking known breakage of 3070.24 'wildmatch (via ls-files): match skip '' ''': false
-not ok 24 - wildmatch (via ls-files): match skip '' '' # TODO known breakage
+Already on 'main'
+HEAD is now at 0c72e4f first
+ok 9 - cherry-pick -n first..fourth works
 
-expecting success of 3070.25 'iwildmatch: match '' ''': 
-			test-tool wildmatch iwildmatch '' ''
-		
-ok 25 - iwildmatch: match '' ''
+expecting success of 3508.10 'revert first..fourth works': 
+	git checkout -f main &&
+	git reset --hard fourth &&
+	test_tick &&
+	git revert first..fourth &&
+	git diff --quiet first &&
+	git diff --cached --quiet first &&
+	git diff --quiet HEAD first
 
-checking known breakage of 3070.26 'iwildmatch (via ls-files): match skip '' ''': false
-not ok 26 - iwildmatch (via ls-files): match skip '' '' # TODO known breakage
+Already on 'main'
+HEAD is now at 94d3184 fourth
+[main 9fd86ee] Revert "fourth"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:26:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+[main bcb892c] Revert "third"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:26:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+[main 6e2dda4] Revert "second"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:26:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ok 10 - revert first..fourth works
 
-expecting success of 3070.27 'pathmatch: match '' ''': 
-			test-tool wildmatch pathmatch '' ''
-		
-ok 27 - pathmatch: match '' ''
+expecting success of 3508.11 'revert ^first fourth works': 
+	git checkout -f main &&
+	git reset --hard fourth &&
+	test_tick &&
+	git revert ^first fourth &&
+	git diff --quiet first &&
+	git diff --cached --quiet first &&
+	git diff --quiet HEAD first
 
-checking known breakage of 3070.28 'pathmatch (via ls-files): match skip '' ''': false
-not ok 28 - pathmatch (via ls-files): match skip '' '' # TODO known breakage
+Already on 'main'
+HEAD is now at 94d3184 fourth
+[main e6761b3] Revert "fourth"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:27:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+[main 4940ca7] Revert "third"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:27:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+[main e06156e] Revert "second"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:27:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ok 11 - revert ^first fourth works
 
-expecting success of 3070.29 'ipathmatch: match '' ''': 
-			test-tool wildmatch ipathmatch '' ''
-		
-ok 29 - ipathmatch: match '' ''
+expecting success of 3508.12 'revert fourth fourth~1 fourth~2 works': 
+	git checkout -f main &&
+	git reset --hard fourth &&
+	test_tick &&
+	git revert fourth fourth~1 fourth~2 &&
+	git diff --quiet first &&
+	git diff --cached --quiet first &&
+	git diff --quiet HEAD first
 
-checking known breakage of 3070.30 'ipathmatch (via ls-files): match skip '' ''': false
-not ok 30 - ipathmatch (via ls-files): match skip '' '' # TODO known breakage
+Already on 'main'
+HEAD is now at 94d3184 fourth
+[main 8d9417a] Revert "fourth"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:28:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+[main 210e986] Revert "third"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:28:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+[main f77c534] Revert "second"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:28:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ok 12 - revert fourth fourth~1 fourth~2 works
 
-expecting success of 3070.31 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-ok 31 - cleanup after previous file test
+expecting success of 3508.13 'cherry-pick -3 fourth works': 
+	git checkout -f main &&
+	git reset --hard first &&
+	test_tick &&
+	git cherry-pick -3 fourth &&
+	git diff --quiet other &&
+	git diff --quiet HEAD other &&
+	check_head_differs_from fourth
 
-expecting success of 3070.32 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 32 - setup match file test for foo
+Already on 'main'
+HEAD is now at 0c72e4f first
+[main 0b92961] second
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+[main e4ba54b] third
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+[main bb3aa41] fourth
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 13 - cherry-pick -3 fourth works
 
-expecting success of 3070.33 'wildmatch: match 'foo' '???'': 
-			test-tool wildmatch wildmatch 'foo' '???'
-		
-ok 33 - wildmatch: match 'foo' '???'
+expecting success of 3508.14 'cherry-pick --stdin works': 
+	git checkout -f main &&
+	git reset --hard first &&
+	test_tick &&
+	git rev-list --reverse first..fourth | git cherry-pick --stdin &&
+	git diff --quiet other &&
+	git diff --quiet HEAD other &&
+	check_head_differs_from fourth
 
-expecting success of 3070.34 'wildmatch (via ls-files): match '???' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- '???' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 34 - wildmatch (via ls-files): match '???' 'foo'
+Already on 'main'
+HEAD is now at 0c72e4f first
+[main 026fdf1] second
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+[main 56d3171] third
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+[main 2cef6d1] fourth
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 14 - cherry-pick --stdin works
 
-expecting success of 3070.35 'iwildmatch: match 'foo' '???'': 
-			test-tool wildmatch iwildmatch 'foo' '???'
-		
-ok 35 - iwildmatch: match 'foo' '???'
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3514-cherry-pick-revert-gpg.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3514-cherry-pick-revert-gpg/.git/
+checking prerequisite: GPG
 
-expecting success of 3070.36 'iwildmatch (via ls-files): match '???' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '???' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 36 - iwildmatch (via ls-files): match '???' 'foo'
+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 3070.37 'pathmatch: match 'foo' '???'': 
-			test-tool wildmatch pathmatch 'foo' '???'
-		
-ok 37 - pathmatch: match 'foo' '???'
+	# 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
 
-expecting success of 3070.38 'pathmatch (via ls-files): match '???' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git ls-files -z -- '???' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 38 - pathmatch (via ls-files): match '???' 'foo'
+)
+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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3511-cherry-pick-x.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3511-cherry-pick-x/.git/
+expecting success of 3511.1 'setup': 
+	git config set advice.detachedhead false &&
+	echo unrelated >unrelated &&
+	git add unrelated &&
+	test_commit initial foo a &&
+	test_commit "$mesg_one_line" foo b mesg-one-line &&
+	git reset --hard initial &&
+	test_commit "$mesg_no_footer" foo b mesg-no-footer &&
+	git reset --hard initial &&
+	test_commit "$mesg_broken_footer" foo b mesg-broken-footer &&
+	git reset --hard initial &&
+	test_commit "$mesg_with_footer" foo b mesg-with-footer &&
+	git reset --hard initial &&
+	test_commit "$mesg_with_footer_sob" foo b mesg-with-footer-sob &&
+	git reset --hard initial &&
+	test_commit "$mesg_with_cherry_footer" foo b mesg-with-cherry-footer &&
+	git reset --hard initial &&
+	test_config commit.cleanup verbatim &&
+	test_commit "$mesg_unclean" foo b mesg-unclean &&
+	test_unconfig commit.cleanup &&
+	pristine_detach initial &&
+	test_commit conflicting unrelated
 
-expecting success of 3070.39 'ipathmatch: match 'foo' '???'': 
-			test-tool wildmatch ipathmatch 'foo' '???'
-		
-ok 39 - ipathmatch: match 'foo' '???'
+[master (root-commit) df2a63d] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 foo
+ create mode 100644 unrelated
+[master d18d4f3] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[master e073909] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[master 0353e8f] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[master 3838485] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[master d60edf0] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[master d7a875c] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[master 860e94a] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[detached HEAD 823a98f] conflicting
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-expecting success of 3070.40 'ipathmatch (via ls-files): match '???' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --icase-pathspecs ls-files -z -- '???' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 40 - ipathmatch (via ls-files): match '???' 'foo'
+expecting success of 3511.2 'cherry-pick -x inserts blank line after one line subject': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-one-line^0) &&
+	git cherry-pick -x mesg-one-line &&
+	cat <<-EOF >expect &&
+		$mesg_one_line
 
-expecting success of 3070.41 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 41 - cleanup after previous file test
+		(cherry picked from commit $sha1)
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.42 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 42 - setup match file test for foo
+Previous HEAD position was 823a98f conflicting
+HEAD is now at df2a63d initial
+[detached HEAD 6970a53] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 2 - cherry-pick -x inserts blank line after one line subject
 
-expecting success of 3070.43 'wildmatch: no match 'foo' '??'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo' '??'
-		
-ok 43 - wildmatch: no match 'foo' '??'
+expecting success of 3511.3 'cherry-pick -s inserts blank line after one line subject': 
+	pristine_detach initial &&
+	git cherry-pick -s mesg-one-line &&
+	cat <<-EOF >expect &&
+		$mesg_one_line
 
-expecting success of 3070.44 'wildmatch (via ls-files): no match '??' 'foo'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 44 - wildmatch (via ls-files): no match '??' 'foo'
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.45 'iwildmatch: no match 'foo' '??'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' '??'
-		
-ok 45 - iwildmatch: no match 'foo' '??'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.46 'iwildmatch (via ls-files): no match '??' 'foo'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 46 - iwildmatch (via ls-files): no match '??' 'foo'
+  6970a53 base: commit message
 
-expecting success of 3070.47 'pathmatch: no match 'foo' '??'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '??'
-		
-ok 47 - pathmatch: no match 'foo' '??'
+HEAD is now at df2a63d initial
+[detached HEAD 0fda2e1] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - cherry-pick -s inserts blank line after one line subject
 
-expecting success of 3070.48 'pathmatch (via ls-files): no match '??' 'foo'': 
-				>expect &&
-				git ls-files -z -- '??' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 48 - pathmatch (via ls-files): no match '??' 'foo'
+expecting success of 3511.4 'cherry-pick -s inserts blank line after non-conforming footer': 
+	pristine_detach initial &&
+	git cherry-pick -s mesg-broken-footer &&
+	cat <<-EOF >expect &&
+		$mesg_broken_footer
 
-expecting success of 3070.49 'ipathmatch: no match 'foo' '??'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '??'
-		
-ok 49 - ipathmatch: no match 'foo' '??'
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.50 'ipathmatch (via ls-files): no match '??' 'foo'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 50 - ipathmatch (via ls-files): no match '??' 'foo'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.51 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 51 - cleanup after previous file test
+  0fda2e1 base: commit message
 
-expecting success of 3070.52 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 52 - setup match file test for foo
+HEAD is now at df2a63d initial
+[detached HEAD 0cf5261] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - cherry-pick -s inserts blank line after non-conforming footer
 
-expecting success of 3070.53 'wildmatch: match 'foo' '*'': 
-			test-tool wildmatch wildmatch 'foo' '*'
-		
-ok 53 - wildmatch: match 'foo' '*'
+expecting success of 3511.5 'cherry-pick -s recognizes trailer config': 
+	pristine_detach initial &&
+	git -c "trailer.Myfooter.ifexists=add" cherry-pick -s mesg-broken-footer &&
+	cat <<-EOF >expect &&
+		$mesg_broken_footer
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.54 'wildmatch (via ls-files): match '*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- '*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 54 - wildmatch (via ls-files): match '*' 'foo'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.55 'iwildmatch: match 'foo' '*'': 
-			test-tool wildmatch iwildmatch 'foo' '*'
-		
-ok 55 - iwildmatch: match 'foo' '*'
+  0cf5261 base: commit message
 
-expecting success of 3070.56 'iwildmatch (via ls-files): match '*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 56 - iwildmatch (via ls-files): match '*' 'foo'
+HEAD is now at df2a63d initial
+[detached HEAD b95a0f7] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 5 - cherry-pick -s recognizes trailer config
 
-expecting success of 3070.57 'pathmatch: match 'foo' '*'': 
-			test-tool wildmatch pathmatch 'foo' '*'
-		
-ok 57 - pathmatch: match 'foo' '*'
+expecting success of 3511.6 'cherry-pick -x inserts blank line when conforming footer not found': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-no-footer^0) &&
+	git cherry-pick -x mesg-no-footer &&
+	cat <<-EOF >expect &&
+		$mesg_no_footer
 
-expecting success of 3070.58 'pathmatch (via ls-files): match '*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git ls-files -z -- '*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 58 - pathmatch (via ls-files): match '*' 'foo'
+		(cherry picked from commit $sha1)
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.59 'ipathmatch: match 'foo' '*'': 
-			test-tool wildmatch ipathmatch 'foo' '*'
-		
-ok 59 - ipathmatch: match 'foo' '*'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.60 'ipathmatch (via ls-files): match '*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --icase-pathspecs ls-files -z -- '*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 60 - ipathmatch (via ls-files): match '*' 'foo'
+  b95a0f7 base: commit message
 
-expecting success of 3070.61 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 61 - cleanup after previous file test
+HEAD is now at df2a63d initial
+[detached HEAD 6f42e54] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - cherry-pick -x inserts blank line when conforming footer not found
 
-expecting success of 3070.62 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 62 - setup match file test for foo
+expecting success of 3511.7 'cherry-pick -s inserts blank line when conforming footer not found': 
+	pristine_detach initial &&
+	git cherry-pick -s mesg-no-footer &&
+	cat <<-EOF >expect &&
+		$mesg_no_footer
 
-expecting success of 3070.63 'wildmatch: match 'foo' 'f*'': 
-			test-tool wildmatch wildmatch 'foo' 'f*'
-		
-ok 63 - wildmatch: match 'foo' 'f*'
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.64 'wildmatch (via ls-files): match 'f*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- 'f*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 64 - wildmatch (via ls-files): match 'f*' 'foo'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.65 'iwildmatch: match 'foo' 'f*'': 
-			test-tool wildmatch iwildmatch 'foo' 'f*'
-		
-ok 65 - iwildmatch: match 'foo' 'f*'
+  6f42e54 base: commit message
 
-expecting success of 3070.66 'iwildmatch (via ls-files): match 'f*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 66 - iwildmatch (via ls-files): match 'f*' 'foo'
+HEAD is now at df2a63d initial
+[detached HEAD 32d2dda] base: commit message
+ 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 - cherry-pick -s inserts blank line when conforming footer not found
 
-expecting success of 3070.67 'pathmatch: match 'foo' 'f*'': 
-			test-tool wildmatch pathmatch 'foo' 'f*'
-		
-ok 67 - pathmatch: match 'foo' 'f*'
+expecting success of 3511.8 'cherry-pick -x -s inserts blank line when conforming footer not found': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-no-footer^0) &&
+	git cherry-pick -x -s mesg-no-footer &&
+	cat <<-EOF >expect &&
+		$mesg_no_footer
 
-expecting success of 3070.68 'pathmatch (via ls-files): match 'f*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git ls-files -z -- 'f*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 68 - pathmatch (via ls-files): match 'f*' 'foo'
+		(cherry picked from commit $sha1)
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.69 'ipathmatch: match 'foo' 'f*'': 
-			test-tool wildmatch ipathmatch 'foo' 'f*'
-		
-ok 69 - ipathmatch: match 'foo' 'f*'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.70 'ipathmatch (via ls-files): match 'f*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --icase-pathspecs ls-files -z -- 'f*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 70 - ipathmatch (via ls-files): match 'f*' 'foo'
+  32d2dda base: commit message
 
-expecting success of 3070.71 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 71 - cleanup after previous file test
+HEAD is now at df2a63d initial
+[detached HEAD adaaef8] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 8 - cherry-pick -x -s inserts blank line when conforming footer not found
 
-expecting success of 3070.72 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 72 - setup match file test for foo
+expecting success of 3511.9 'cherry-pick -s adds sob when last sob doesnt match committer': 
+	pristine_detach initial &&
+	git cherry-pick -s mesg-with-footer &&
+	cat <<-EOF >expect &&
+		$mesg_with_footer
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.73 'wildmatch: no match 'foo' '*f'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo' '*f'
-		
-ok 73 - wildmatch: no match 'foo' '*f'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.74 'wildmatch (via ls-files): no match '*f' 'foo'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*f' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 74 - wildmatch (via ls-files): no match '*f' 'foo'
+  adaaef8 base: commit message
 
-expecting success of 3070.75 'iwildmatch: no match 'foo' '*f'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' '*f'
-		
-ok 75 - iwildmatch: no match 'foo' '*f'
+HEAD is now at df2a63d initial
+[detached HEAD b62bd75] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 9 - cherry-pick -s adds sob when last sob doesnt match committer
 
-expecting success of 3070.76 'iwildmatch (via ls-files): no match '*f' 'foo'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*f' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 76 - iwildmatch (via ls-files): no match '*f' 'foo'
+expecting success of 3511.10 'cherry-pick -x -s adds sob when last sob doesnt match committer': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-with-footer^0) &&
+	git cherry-pick -x -s mesg-with-footer &&
+	cat <<-EOF >expect &&
+		$mesg_with_footer
+		(cherry picked from commit $sha1)
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.77 'pathmatch: no match 'foo' '*f'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '*f'
-		
-ok 77 - pathmatch: no match 'foo' '*f'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.78 'pathmatch (via ls-files): no match '*f' 'foo'': 
-				>expect &&
-				git ls-files -z -- '*f' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 78 - pathmatch (via ls-files): no match '*f' 'foo'
+  b62bd75 base: commit message
 
-expecting success of 3070.79 'ipathmatch: no match 'foo' '*f'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '*f'
-		
-ok 79 - ipathmatch: no match 'foo' '*f'
+HEAD is now at df2a63d initial
+[detached HEAD 94e740a] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 10 - cherry-pick -x -s adds sob when last sob doesnt match committer
 
-expecting success of 3070.80 'ipathmatch (via ls-files): no match '*f' 'foo'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '*f' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 80 - ipathmatch (via ls-files): no match '*f' 'foo'
+expecting success of 3511.11 'cherry-pick -s refrains from adding duplicate trailing sob': 
+	pristine_detach initial &&
+	git cherry-pick -s mesg-with-footer-sob &&
+	cat <<-EOF >expect &&
+		$mesg_with_footer_sob
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.81 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 81 - cleanup after previous file test
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.82 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 82 - setup match file test for foo
+  94e740a base: commit message
 
-expecting success of 3070.83 'wildmatch: match 'foo' '*foo*'': 
-			test-tool wildmatch wildmatch 'foo' '*foo*'
-		
-ok 83 - wildmatch: match 'foo' '*foo*'
+HEAD is now at df2a63d initial
+[detached HEAD a836c16] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 11 - cherry-pick -s refrains from adding duplicate trailing sob
 
-expecting success of 3070.84 'wildmatch (via ls-files): match '*foo*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 84 - wildmatch (via ls-files): match '*foo*' 'foo'
+expecting success of 3511.12 'cherry-pick -x -s adds sob even when trailing sob exists for committer': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-with-footer-sob^0) &&
+	git cherry-pick -x -s mesg-with-footer-sob &&
+	cat <<-EOF >expect &&
+		$mesg_with_footer_sob
+		(cherry picked from commit $sha1)
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.85 'iwildmatch: match 'foo' '*foo*'': 
-			test-tool wildmatch iwildmatch 'foo' '*foo*'
-		
-ok 85 - iwildmatch: match 'foo' '*foo*'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.86 'iwildmatch (via ls-files): match '*foo*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 86 - iwildmatch (via ls-files): match '*foo*' 'foo'
+  a836c16 base: commit message
 
-expecting success of 3070.87 'pathmatch: match 'foo' '*foo*'': 
-			test-tool wildmatch pathmatch 'foo' '*foo*'
-		
-ok 87 - pathmatch: match 'foo' '*foo*'
+HEAD is now at df2a63d initial
+[detached HEAD 2d6e386] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 12 - cherry-pick -x -s adds sob even when trailing sob exists for committer
 
-expecting success of 3070.88 'pathmatch (via ls-files): match '*foo*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 88 - pathmatch (via ls-files): match '*foo*' 'foo'
+expecting success of 3511.13 'cherry-pick -x handles commits with no NL at end of message': 
+	pristine_detach initial &&
+	printf "title\n\nSigned-off-by: A <a@example.com>" >msg &&
+	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
+	git cherry-pick -x $sha1 &&
+	git log -1 --pretty=format:%B >actual &&
 
-expecting success of 3070.89 'ipathmatch: match 'foo' '*foo*'': 
-			test-tool wildmatch ipathmatch 'foo' '*foo*'
-		
-ok 89 - ipathmatch: match 'foo' '*foo*'
+	printf "\n(cherry picked from commit %s)\n" $sha1 >>msg &&
+	test_cmp msg actual
 
-expecting success of 3070.90 'ipathmatch (via ls-files): match '*foo*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --icase-pathspecs ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 90 - ipathmatch (via ls-files): match '*foo*' 'foo'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.91 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 91 - cleanup after previous file test
+  2d6e386 base: commit message
 
-expecting success of 3070.92 'setup match file test for foobar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 92 - setup match file test for foobar
+HEAD is now at df2a63d initial
+[detached HEAD 96716be] title
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 13 - cherry-pick -x handles commits with no NL at end of message
 
-expecting success of 3070.93 'wildmatch: match 'foobar' '*ob*a*r*'': 
-			test-tool wildmatch wildmatch 'foobar' '*ob*a*r*'
-		
-ok 93 - wildmatch: match 'foobar' '*ob*a*r*'
+expecting success of 3511.14 'cherry-pick -x handles commits with no footer and no NL at end of message': 
+	pristine_detach initial &&
+	printf "title\n\nnot a footer" >msg &&
+	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
+	git cherry-pick -x $sha1 &&
+	git log -1 --pretty=format:%B >actual &&
 
-expecting success of 3070.94 'wildmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
-				printf '%s' 'foobar' >expect &&
-				git --glob-pathspecs ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 94 - wildmatch (via ls-files): match '*ob*a*r*' 'foobar'
+	printf "\n\n(cherry picked from commit %s)\n" $sha1 >>msg &&
+	test_cmp msg actual
 
-expecting success of 3070.95 'iwildmatch: match 'foobar' '*ob*a*r*'': 
-			test-tool wildmatch iwildmatch 'foobar' '*ob*a*r*'
-		
-ok 95 - iwildmatch: match 'foobar' '*ob*a*r*'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.96 'iwildmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
-				printf '%s' 'foobar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 96 - iwildmatch (via ls-files): match '*ob*a*r*' 'foobar'
+  96716be title
 
-expecting success of 3070.97 'pathmatch: match 'foobar' '*ob*a*r*'': 
-			test-tool wildmatch pathmatch 'foobar' '*ob*a*r*'
-		
-ok 97 - pathmatch: match 'foobar' '*ob*a*r*'
+HEAD is now at df2a63d initial
+[detached HEAD 8c5d63f] title
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 14 - cherry-pick -x handles commits with no footer and no NL at end of message
 
-expecting success of 3070.98 'pathmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
-				printf '%s' 'foobar' >expect &&
-				git ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 98 - pathmatch (via ls-files): match '*ob*a*r*' 'foobar'
+expecting success of 3511.15 'cherry-pick -s handles commits with no NL at end of message': 
+	pristine_detach initial &&
+	printf "title\n\nSigned-off-by: A <a@example.com>" >msg &&
+	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
+	git cherry-pick -s $sha1 &&
+	git log -1 --pretty=format:%B >actual &&
 
-expecting success of 3070.99 'ipathmatch: match 'foobar' '*ob*a*r*'': 
-			test-tool wildmatch ipathmatch 'foobar' '*ob*a*r*'
-		
-ok 99 - ipathmatch: match 'foobar' '*ob*a*r*'
+	printf "\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
+	test_cmp msg actual
 
-expecting success of 3070.100 'ipathmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
-				printf '%s' 'foobar' >expect &&
-				git --icase-pathspecs ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 100 - ipathmatch (via ls-files): match '*ob*a*r*' 'foobar'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.101 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foobar
-ok 101 - cleanup after previous file test
+  8c5d63f title
 
-expecting success of 3070.102 'setup match file test for aaaaaaabababab': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 102 - setup match file test for aaaaaaabababab
+HEAD is now at df2a63d initial
+[detached HEAD 6671fda] title
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 15 - cherry-pick -s handles commits with no NL at end of message
 
-expecting success of 3070.103 'wildmatch: match 'aaaaaaabababab' '*ab'': 
-			test-tool wildmatch wildmatch 'aaaaaaabababab' '*ab'
-		
-ok 103 - wildmatch: match 'aaaaaaabababab' '*ab'
+expecting success of 3511.16 'cherry-pick -s handles commits with no footer and no NL at end of message': 
+	pristine_detach initial &&
+	printf "title\n\nnot a footer" >msg &&
+	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
+	git cherry-pick -s $sha1 &&
+	git log -1 --pretty=format:%B >actual &&
 
-expecting success of 3070.104 'wildmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
-				printf '%s' 'aaaaaaabababab' >expect &&
-				git --glob-pathspecs ls-files -z -- '*ab' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 104 - wildmatch (via ls-files): match '*ab' 'aaaaaaabababab'
+	printf "\n\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
+	test_cmp msg actual
 
-expecting success of 3070.105 'iwildmatch: match 'aaaaaaabababab' '*ab'': 
-			test-tool wildmatch iwildmatch 'aaaaaaabababab' '*ab'
-		
-ok 105 - iwildmatch: match 'aaaaaaabababab' '*ab'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.106 'iwildmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
-				printf '%s' 'aaaaaaabababab' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*ab' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 106 - iwildmatch (via ls-files): match '*ab' 'aaaaaaabababab'
+  6671fda title
 
-expecting success of 3070.107 'pathmatch: match 'aaaaaaabababab' '*ab'': 
-			test-tool wildmatch pathmatch 'aaaaaaabababab' '*ab'
-		
-ok 107 - pathmatch: match 'aaaaaaabababab' '*ab'
+HEAD is now at df2a63d initial
+[detached HEAD 19f481d] title
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 16 - cherry-pick -s handles commits with no footer and no NL at end of message
 
-expecting success of 3070.108 'pathmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
-				printf '%s' 'aaaaaaabababab' >expect &&
-				git ls-files -z -- '*ab' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 108 - pathmatch (via ls-files): match '*ab' 'aaaaaaabababab'
+expecting success of 3511.17 'cherry-pick -x treats "(cherry picked from..." line as part of footer': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-with-cherry-footer^0) &&
+	git cherry-pick -x mesg-with-cherry-footer &&
+	cat <<-EOF >expect &&
+		$mesg_with_cherry_footer
+		(cherry picked from commit $sha1)
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.109 'ipathmatch: match 'aaaaaaabababab' '*ab'': 
-			test-tool wildmatch ipathmatch 'aaaaaaabababab' '*ab'
-		
-ok 109 - ipathmatch: match 'aaaaaaabababab' '*ab'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.110 'ipathmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
-				printf '%s' 'aaaaaaabababab' >expect &&
-				git --icase-pathspecs ls-files -z -- '*ab' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 110 - ipathmatch (via ls-files): match '*ab' 'aaaaaaabababab'
+  19f481d title
 
-expecting success of 3070.111 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing aaaaaaabababab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 111 - cleanup after previous file test
+HEAD is now at df2a63d initial
+[detached HEAD 7b5eb6d] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 17 - cherry-pick -x treats "(cherry picked from..." line as part of footer
 
-expecting success of 3070.112 'setup match file test for foo*': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 112 - setup match file test for foo*
+expecting success of 3511.18 'cherry-pick -s treats "(cherry picked from..." line as part of footer': 
+	pristine_detach initial &&
+	git cherry-pick -s mesg-with-cherry-footer &&
+	cat <<-EOF >expect &&
+		$mesg_with_cherry_footer
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.113 'wildmatch: match 'foo*' 'foo\*'': 
-			test-tool wildmatch wildmatch 'foo*' 'foo\*'
-		
-ok 113 - wildmatch: match 'foo*' 'foo\*'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.114 'wildmatch (via ls-files): match 'foo\*' 'foo*'': 
-				printf '%s' 'foo*' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 114 - wildmatch (via ls-files): match 'foo\*' 'foo*'
+  7b5eb6d base: commit message
 
-expecting success of 3070.115 'iwildmatch: match 'foo*' 'foo\*'': 
-			test-tool wildmatch iwildmatch 'foo*' 'foo\*'
-		
-ok 115 - iwildmatch: match 'foo*' 'foo\*'
+HEAD is now at df2a63d initial
+[detached HEAD b468a7b] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 18 - cherry-pick -s treats "(cherry picked from..." line as part of footer
 
-expecting success of 3070.116 'iwildmatch (via ls-files): match 'foo\*' 'foo*'': 
-				printf '%s' 'foo*' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 116 - iwildmatch (via ls-files): match 'foo\*' 'foo*'
+expecting success of 3511.19 'cherry-pick -x -s treats "(cherry picked from..." line as part of footer': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-with-cherry-footer^0) &&
+	git cherry-pick -x -s mesg-with-cherry-footer &&
+	cat <<-EOF >expect &&
+		$mesg_with_cherry_footer
+		(cherry picked from commit $sha1)
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.117 'pathmatch: match 'foo*' 'foo\*'': 
-			test-tool wildmatch pathmatch 'foo*' 'foo\*'
-		
-ok 117 - pathmatch: match 'foo*' 'foo\*'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.118 'pathmatch (via ls-files): match 'foo\*' 'foo*'': 
-				printf '%s' 'foo*' >expect &&
-				git ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 118 - pathmatch (via ls-files): match 'foo\*' 'foo*'
+  b468a7b base: commit message
 
-expecting success of 3070.119 'ipathmatch: match 'foo*' 'foo\*'': 
-			test-tool wildmatch ipathmatch 'foo*' 'foo\*'
-		
-ok 119 - ipathmatch: match 'foo*' 'foo\*'
+HEAD is now at df2a63d initial
+[detached HEAD c7c741c] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 19 - cherry-pick -x -s treats "(cherry picked from..." line as part of footer
 
-expecting success of 3070.120 'ipathmatch (via ls-files): match 'foo\*' 'foo*'': 
-				printf '%s' 'foo*' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 120 - ipathmatch (via ls-files): match 'foo\*' 'foo*'
+expecting success of 3511.20 'cherry-pick preserves commit message': 
+	pristine_detach initial &&
+	printf "$mesg_unclean" >expect &&
+	git log -1 --pretty=format:%B mesg-unclean >actual &&
+	test_cmp expect actual &&
+	git cherry-pick mesg-unclean &&
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.121 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo*
-ok 121 - cleanup after previous file test
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.122 'setup match file test for foobar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 122 - setup match file test for foobar
+  c7c741c base: commit message
 
-expecting success of 3070.123 'wildmatch: no match 'foobar' 'foo\*bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foobar' 'foo\*bar'
-		
-ok 123 - wildmatch: no match 'foobar' 'foo\*bar'
+HEAD is now at df2a63d initial
+[detached HEAD 7a2ed43] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:20:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 20 - cherry-pick preserves commit message
 
-expecting success of 3070.124 'wildmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 124 - wildmatch (via ls-files): no match 'foo\*bar' 'foobar'
+expecting success of 3511.21 'cherry-pick -x cleans commit message': 
+	pristine_detach initial &&
+	git cherry-pick -x mesg-unclean &&
+	git log -1 --pretty=format:%B >actual &&
+	printf "%s\n(cherry picked from commit %s)\n" \
+		"$mesg_unclean" $(git rev-parse mesg-unclean) |
+			git stripspace >expect &&
+	test_cmp expect actual
 
-expecting success of 3070.125 'iwildmatch: no match 'foobar' 'foo\*bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foobar' 'foo\*bar'
-		
-ok 125 - iwildmatch: no match 'foobar' 'foo\*bar'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.126 'iwildmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 126 - iwildmatch (via ls-files): no match 'foo\*bar' 'foobar'
+  7a2ed43 base: commit message
 
-expecting success of 3070.127 'pathmatch: no match 'foobar' 'foo\*bar'': 
-			test_must_fail test-tool wildmatch pathmatch 'foobar' 'foo\*bar'
-		
-ok 127 - pathmatch: no match 'foobar' 'foo\*bar'
+HEAD is now at df2a63d initial
+[detached HEAD ad2d5bc] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:20:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 21 - cherry-pick -x cleans commit message
 
-expecting success of 3070.128 'pathmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
-				>expect &&
-				git ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 128 - pathmatch (via ls-files): no match 'foo\*bar' 'foobar'
+expecting success of 3511.22 'cherry-pick -x respects commit.cleanup': 
+	pristine_detach initial &&
+	git -c commit.cleanup=strip cherry-pick -x mesg-unclean &&
+	git log -1 --pretty=format:%B >actual &&
+	printf "%s\n(cherry picked from commit %s)\n" \
+		"$mesg_unclean" $(git rev-parse mesg-unclean) |
+			git stripspace -s >expect &&
+	test_cmp expect actual
 
-expecting success of 3070.129 'ipathmatch: no match 'foobar' 'foo\*bar'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foobar' 'foo\*bar'
-		
-ok 129 - ipathmatch: no match 'foobar' 'foo\*bar'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.130 'ipathmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 130 - ipathmatch (via ls-files): no match 'foo\*bar' 'foobar'
+  ad2d5bc base: commit message
 
-expecting success of 3070.131 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foobar
-ok 131 - cleanup after previous file test
+HEAD is now at df2a63d initial
+[detached HEAD fd8c8fa] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:20:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 22 - cherry-pick -x respects commit.cleanup
 
-expecting success of 3070.132 'setup match file test for f\oo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 132 - setup match file test for f\oo
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3507-cherry-pick-conflict.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3507-cherry-pick-conflict/.git/
+expecting success of 3507.1 'setup': 
 
-expecting success of 3070.133 'wildmatch: match 'f\oo' 'f\\oo'': 
-			test-tool wildmatch wildmatch 'f\oo' 'f\\oo'
-		
-ok 133 - wildmatch: match 'f\oo' 'f\\oo'
+	echo unrelated >unrelated &&
+	git add unrelated &&
+	test_commit initial foo a &&
+	test_commit base foo b &&
+	test_commit picked foo c &&
+	test_commit --signoff picked-signed foo d &&
+	git checkout -b topic initial &&
+	test_commit redundant-pick foo c redundant &&
+	git commit --allow-empty --allow-empty-message &&
+	git tag empty &&
+	git checkout main &&
+	git config set advice.detachedhead false
 
-expecting success of 3070.134 'wildmatch (via ls-files): match 'f\\oo' 'f\oo'': 
-				printf '%s' 'f\oo' >expect &&
-				git --glob-pathspecs ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 134 - wildmatch (via ls-files): match 'f\\oo' 'f\oo'
 
-expecting success of 3070.135 'iwildmatch: match 'f\oo' 'f\\oo'': 
-			test-tool wildmatch iwildmatch 'f\oo' 'f\\oo'
-		
-ok 135 - iwildmatch: match 'f\oo' 'f\\oo'
+[main (root-commit) df2a63d] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 foo
+ create mode 100644 unrelated
+[main dc0113b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 7e6d412] picked
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main e4ca149] picked-signed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'topic'
+[topic 2aaca37] redundant-pick
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[topic c0ecbf1] 
+ Author: A U Thor <author@example.com>
+Switched to branch 'main'
+ok 1 - setup
 
-expecting success of 3070.136 'iwildmatch (via ls-files): match 'f\\oo' 'f\oo'': 
-				printf '%s' 'f\oo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 136 - iwildmatch (via ls-files): match 'f\\oo' 'f\oo'
+expecting success of 3507.2 'failed cherry-pick does not advance HEAD': 
+	pristine_detach initial &&
 
-expecting success of 3070.137 'pathmatch: match 'f\oo' 'f\\oo'': 
-			test-tool wildmatch pathmatch 'f\oo' 'f\\oo'
-		
-ok 137 - pathmatch: match 'f\oo' 'f\\oo'
+	head=$(git rev-parse HEAD) &&
+	test_must_fail git cherry-pick picked &&
+	newhead=$(git rev-parse HEAD) &&
 
-expecting success of 3070.138 'pathmatch (via ls-files): match 'f\\oo' 'f\oo'': 
-				printf '%s' 'f\oo' >expect &&
-				git ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 138 - pathmatch (via ls-files): match 'f\\oo' 'f\oo'
+	test "$head" = "$newhead"
 
-expecting success of 3070.139 'ipathmatch: match 'f\oo' 'f\\oo'': 
-			test-tool wildmatch ipathmatch 'f\oo' 'f\\oo'
-		
-ok 139 - ipathmatch: match 'f\oo' 'f\\oo'
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+ok 2 - failed cherry-pick does not advance HEAD
 
-expecting success of 3070.140 'ipathmatch (via ls-files): match 'f\\oo' 'f\oo'': 
-				printf '%s' 'f\oo' >expect &&
-				git --icase-pathspecs ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 140 - ipathmatch (via ls-files): match 'f\\oo' 'f\oo'
+expecting success of 3507.3 'advice from failed cherry-pick': 
+	pristine_detach initial &&
 
-expecting success of 3070.141 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing "f\\oo"
-ok 141 - cleanup after previous file test
+	picked=$(git rev-parse --short picked) &&
+	cat <<-EOF >expected &&
+	error: could not apply $picked... picked
+	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"
+	EOF
+	test_must_fail git cherry-pick picked 2>actual &&
 
-expecting success of 3070.142 'setup match file test for ball': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 142 - setup match file test for ball
+	test_cmp expected actual
 
-expecting success of 3070.143 'wildmatch: match 'ball' '*[al]?'': 
-			test-tool wildmatch wildmatch 'ball' '*[al]?'
-		
-ok 143 - wildmatch: match 'ball' '*[al]?'
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+ok 3 - advice from failed cherry-pick
 
-expecting success of 3070.144 'wildmatch (via ls-files): match '*[al]?' 'ball'': 
-				printf '%s' 'ball' >expect &&
-				git --glob-pathspecs ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 144 - wildmatch (via ls-files): match '*[al]?' 'ball'
+expecting success of 3507.4 'advice from failed cherry-pick --no-commit': 
+	pristine_detach initial &&
 
-expecting success of 3070.145 'iwildmatch: match 'ball' '*[al]?'': 
-			test-tool wildmatch iwildmatch 'ball' '*[al]?'
-		
-ok 145 - iwildmatch: match 'ball' '*[al]?'
+	picked=$(git rev-parse --short picked) &&
+	cat <<-EOF >expected &&
+	error: could not apply $picked... picked
+	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"
+	EOF
+	test_must_fail git cherry-pick --no-commit picked 2>actual &&
 
-expecting success of 3070.146 'iwildmatch (via ls-files): match '*[al]?' 'ball'': 
-				printf '%s' 'ball' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 146 - iwildmatch (via ls-files): match '*[al]?' 'ball'
+	test_cmp expected actual
 
-expecting success of 3070.147 'pathmatch: match 'ball' '*[al]?'': 
-			test-tool wildmatch pathmatch 'ball' '*[al]?'
-		
-ok 147 - pathmatch: match 'ball' '*[al]?'
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+ok 4 - advice from failed cherry-pick --no-commit
 
-expecting success of 3070.148 'pathmatch (via ls-files): match '*[al]?' 'ball'': 
-				printf '%s' 'ball' >expect &&
-				git ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 148 - pathmatch (via ls-files): match '*[al]?' 'ball'
+expecting success of 3507.5 'failed cherry-pick sets CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick picked &&
+	test_cmp_rev picked CHERRY_PICK_HEAD
 
-expecting success of 3070.149 'ipathmatch: match 'ball' '*[al]?'': 
-			test-tool wildmatch ipathmatch 'ball' '*[al]?'
-		
-ok 149 - ipathmatch: match 'ball' '*[al]?'
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+ok 5 - failed cherry-pick sets CHERRY_PICK_HEAD
 
-expecting success of 3070.150 'ipathmatch (via ls-files): match '*[al]?' 'ball'': 
-				printf '%s' 'ball' >expect &&
-				git --icase-pathspecs ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 150 - ipathmatch (via ls-files): match '*[al]?' 'ball'
+expecting success of 3507.6 'successful cherry-pick does not set CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
+	git cherry-pick base &&
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 
-expecting success of 3070.151 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing ball
-Removing expect
-ok 151 - cleanup after previous file test
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+[detached HEAD ccd9cfc] base
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+ok 6 - successful cherry-pick does not set CHERRY_PICK_HEAD
 
-expecting success of 3070.152 'setup match file test for ten': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 152 - setup match file test for ten
+expecting success of 3507.7 'cherry-pick --no-commit does not set CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
+	git cherry-pick --no-commit base &&
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 
-expecting success of 3070.153 'wildmatch: no match 'ten' '[ten]'': 
-			test_must_fail test-tool wildmatch wildmatch 'ten' '[ten]'
-		
-ok 153 - wildmatch: no match 'ten' '[ten]'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.154 'wildmatch (via ls-files): no match '[ten]' 'ten'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 154 - wildmatch (via ls-files): no match '[ten]' 'ten'
+  ccd9cfc base
 
-expecting success of 3070.155 'iwildmatch: no match 'ten' '[ten]'': 
-			test_must_fail test-tool wildmatch iwildmatch 'ten' '[ten]'
-		
-ok 155 - iwildmatch: no match 'ten' '[ten]'
+HEAD is now at df2a63d initial
+fatal: Needed a single revision
+ok 7 - cherry-pick --no-commit does not set CHERRY_PICK_HEAD
 
-expecting success of 3070.156 'iwildmatch (via ls-files): no match '[ten]' 'ten'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 156 - iwildmatch (via ls-files): no match '[ten]' 'ten'
+expecting success of 3507.8 'cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
+	echo foo >foo &&
+	test_must_fail git cherry-pick base &&
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 
-expecting success of 3070.157 'pathmatch: no match 'ten' '[ten]'': 
-			test_must_fail test-tool wildmatch pathmatch 'ten' '[ten]'
-		
-ok 157 - pathmatch: no match 'ten' '[ten]'
+HEAD is now at df2a63d initial
+error: Your local changes to the following files would be overwritten by merge:
+	foo
+Please commit your changes or stash them before you merge.
+Aborting
+fatal: cherry-pick failed
+fatal: Needed a single revision
+ok 8 - cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD
 
-expecting success of 3070.158 'pathmatch (via ls-files): no match '[ten]' 'ten'': 
-				>expect &&
-				git ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 158 - pathmatch (via ls-files): no match '[ten]' 'ten'
+expecting success of 3507.9 'cherry-pick --strategy=resolve w/dirty tree does not set CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
+	echo foo >foo &&
+	test_must_fail git cherry-pick --strategy=resolve base &&
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 
-expecting success of 3070.159 'ipathmatch: no match 'ten' '[ten]'': 
-			test_must_fail test-tool wildmatch ipathmatch 'ten' '[ten]'
-		
-ok 159 - ipathmatch: no match 'ten' '[ten]'
+HEAD is now at df2a63d initial
+error: Entry 'foo' not uptodate. Cannot merge.
+error: could not apply dc0113b... base
+fatal: Needed a single revision
+ok 9 - cherry-pick --strategy=resolve w/dirty tree does not set CHERRY_PICK_HEAD
 
-expecting success of 3070.160 'ipathmatch (via ls-files): no match '[ten]' 'ten'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 160 - ipathmatch (via ls-files): no match '[ten]' 'ten'
+expecting success of 3507.10 'GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
+	(
+		GIT_CHERRY_PICK_HELP="and then do something else" &&
+		export GIT_CHERRY_PICK_HELP &&
+		test_must_fail git cherry-pick picked
+	) &&
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 
-expecting success of 3070.161 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ten
-ok 161 - cleanup after previous file test
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+hint: and then do something else
+hint: Disable this message with "git config set advice.mergeConflict false"
+fatal: Needed a single revision
+ok 10 - GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD
 
-expecting success of 3070.162 'setup match file test for ten': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 162 - setup match file test for ten
+expecting success of 3507.11 'git reset clears CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
 
-expecting success of 3070.163 'wildmatch: match 'ten' '**[!te]'': 
-			test-tool wildmatch wildmatch 'ten' '**[!te]'
-		
-ok 163 - wildmatch: match 'ten' '**[!te]'
+	test_must_fail git cherry-pick picked &&
+	git reset &&
 
-expecting success of 3070.164 'wildmatch (via ls-files): match '**[!te]' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git --glob-pathspecs ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 164 - wildmatch (via ls-files): match '**[!te]' 'ten'
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 
-expecting success of 3070.165 'iwildmatch: match 'ten' '**[!te]'': 
-			test-tool wildmatch iwildmatch 'ten' '**[!te]'
-		
-ok 165 - iwildmatch: match 'ten' '**[!te]'
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+Unstaged changes after reset:
+M	foo
+fatal: Needed a single revision
+ok 11 - git reset clears CHERRY_PICK_HEAD
 
-expecting success of 3070.166 'iwildmatch (via ls-files): match '**[!te]' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 166 - iwildmatch (via ls-files): match '**[!te]' 'ten'
+expecting success of 3507.12 'failed commit does not clear CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
 
-expecting success of 3070.167 'pathmatch: match 'ten' '**[!te]'': 
-			test-tool wildmatch pathmatch 'ten' '**[!te]'
-		
-ok 167 - pathmatch: match 'ten' '**[!te]'
+	test_must_fail git cherry-pick picked &&
+	test_must_fail git commit &&
 
-expecting success of 3070.168 'pathmatch (via ls-files): match '**[!te]' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 168 - pathmatch (via ls-files): match '**[!te]' 'ten'
+	test_cmp_rev picked CHERRY_PICK_HEAD
 
-expecting success of 3070.169 'ipathmatch: match 'ten' '**[!te]'': 
-			test-tool wildmatch ipathmatch 'ten' '**[!te]'
-		
-ok 169 - ipathmatch: match 'ten' '**[!te]'
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+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	foo
+ok 12 - failed commit does not clear CHERRY_PICK_HEAD
 
-expecting success of 3070.170 'ipathmatch (via ls-files): match '**[!te]' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git --icase-pathspecs ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 170 - ipathmatch (via ls-files): match '**[!te]' 'ten'
+expecting success of 3507.13 'cancelled commit does not clear CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
 
-expecting success of 3070.171 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ten
-ok 171 - cleanup after previous file test
+	test_must_fail git cherry-pick picked &&
+	echo resolved >foo &&
+	git add foo &&
+	git update-index --refresh -q &&
+	test_must_fail git diff-index --exit-code HEAD &&
+	(
+		GIT_EDITOR=false &&
+		export GIT_EDITOR &&
+		test_must_fail git commit
+	) &&
 
-expecting success of 3070.172 'setup match file test for ten': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 172 - setup match file test for ten
+	test_cmp_rev picked CHERRY_PICK_HEAD
 
-expecting success of 3070.173 'wildmatch: no match 'ten' '**[!ten]'': 
-			test_must_fail test-tool wildmatch wildmatch 'ten' '**[!ten]'
-		
-ok 173 - wildmatch: no match 'ten' '**[!ten]'
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 2ab19ae607aabda796309682e0448237aab03047 M	foo
+error: there was a problem with the editor 'false'
+Please supply the message using either -m or -F option.
+ok 13 - cancelled commit does not clear CHERRY_PICK_HEAD
 
-expecting success of 3070.174 'wildmatch (via ls-files): no match '**[!ten]' 'ten'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 174 - wildmatch (via ls-files): no match '**[!ten]' 'ten'
+expecting success of 3507.14 'successful commit clears CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
 
-expecting success of 3070.175 'iwildmatch: no match 'ten' '**[!ten]'': 
-			test_must_fail test-tool wildmatch iwildmatch 'ten' '**[!ten]'
-		
-ok 175 - iwildmatch: no match 'ten' '**[!ten]'
+	test_must_fail git cherry-pick picked &&
+	echo resolved >foo &&
+	git add foo &&
+	git commit &&
 
-expecting success of 3070.176 'iwildmatch (via ls-files): no match '**[!ten]' 'ten'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 176 - iwildmatch (via ls-files): no match '**[!ten]' 'ten'
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 
-expecting success of 3070.177 'pathmatch: no match 'ten' '**[!ten]'': 
-			test_must_fail test-tool wildmatch pathmatch 'ten' '**[!ten]'
-		
-ok 177 - pathmatch: no match 'ten' '**[!ten]'
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+[detached HEAD a8c44c9] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+ok 14 - successful commit clears CHERRY_PICK_HEAD
 
-expecting success of 3070.178 'pathmatch (via ls-files): no match '**[!ten]' 'ten'': 
-				>expect &&
-				git ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 178 - pathmatch (via ls-files): no match '**[!ten]' 'ten'
+expecting success of 3507.15 'partial commit of cherry-pick fails': 
+	pristine_detach initial &&
 
-expecting success of 3070.179 'ipathmatch: no match 'ten' '**[!ten]'': 
-			test_must_fail test-tool wildmatch ipathmatch 'ten' '**[!ten]'
-		
-ok 179 - ipathmatch: no match 'ten' '**[!ten]'
+	test_must_fail git cherry-pick picked &&
+	echo resolved >foo &&
+	git add foo &&
+	test_must_fail git commit foo 2>err &&
 
-expecting success of 3070.180 'ipathmatch (via ls-files): no match '**[!ten]' 'ten'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 180 - ipathmatch (via ls-files): no match '**[!ten]' 'ten'
+	test_grep "cannot do a partial commit during a cherry-pick." err
 
-expecting success of 3070.181 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ten
-ok 181 - cleanup after previous file test
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.182 'setup match file test for ten': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 182 - setup match file test for ten
+  a8c44c9 picked
 
-expecting success of 3070.183 'wildmatch: match 'ten' 't[a-g]n'': 
-			test-tool wildmatch wildmatch 'ten' 't[a-g]n'
-		
-ok 183 - wildmatch: match 'ten' 't[a-g]n'
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+fatal: cannot do a partial commit during a cherry-pick.
+ok 15 - partial commit of cherry-pick fails
 
-expecting success of 3070.184 'wildmatch (via ls-files): match 't[a-g]n' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git --glob-pathspecs ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 184 - wildmatch (via ls-files): match 't[a-g]n' 'ten'
+expecting success of 3507.16 'commit --amend of cherry-pick fails': 
+	pristine_detach initial &&
 
-expecting success of 3070.185 'iwildmatch: match 'ten' 't[a-g]n'': 
-			test-tool wildmatch iwildmatch 'ten' 't[a-g]n'
-		
-ok 185 - iwildmatch: match 'ten' 't[a-g]n'
+	test_must_fail git cherry-pick picked &&
+	echo resolved >foo &&
+	git add foo &&
+	test_must_fail git commit --amend 2>err &&
 
-expecting success of 3070.186 'iwildmatch (via ls-files): match 't[a-g]n' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 186 - iwildmatch (via ls-files): match 't[a-g]n' 'ten'
+	test_grep "in the middle of a cherry-pick -- cannot amend." err
 
-expecting success of 3070.187 'pathmatch: match 'ten' 't[a-g]n'': 
-			test-tool wildmatch pathmatch 'ten' 't[a-g]n'
-		
-ok 187 - pathmatch: match 'ten' 't[a-g]n'
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+fatal: You are in the middle of a cherry-pick -- cannot amend.
+ok 16 - commit --amend of cherry-pick fails
 
-expecting success of 3070.188 'pathmatch (via ls-files): match 't[a-g]n' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 188 - pathmatch (via ls-files): match 't[a-g]n' 'ten'
+expecting success of 3507.17 'successful final commit clears cherry-pick state': 
+	pristine_detach initial &&
 
-expecting success of 3070.189 'ipathmatch: match 'ten' 't[a-g]n'': 
-			test-tool wildmatch ipathmatch 'ten' 't[a-g]n'
-		
-ok 189 - ipathmatch: match 'ten' 't[a-g]n'
+	test_must_fail git cherry-pick base picked-signed &&
+	echo resolved >foo &&
+	test_path_is_file .git/sequencer/todo &&
+	git commit -a &&
+	test_path_is_missing .git/sequencer
 
-expecting success of 3070.190 'ipathmatch (via ls-files): match 't[a-g]n' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git --icase-pathspecs ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 190 - ipathmatch (via ls-files): match 't[a-g]n' 'ten'
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+[detached HEAD ccd9cfc] base
+ 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 foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply e4ca149... picked-signed
+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"
+[detached HEAD 53c8c73] picked-signed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 17 - successful final commit clears cherry-pick state
 
-expecting success of 3070.191 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ten
-ok 191 - cleanup after previous file test
+expecting success of 3507.18 'reset after final pick clears cherry-pick state': 
+	pristine_detach initial &&
 
-expecting success of 3070.192 'setup match file test for ten': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 192 - setup match file test for ten
+	test_must_fail git cherry-pick base picked-signed &&
+	echo resolved >foo &&
+	test_path_is_file .git/sequencer/todo &&
+	git reset &&
+	test_path_is_missing .git/sequencer
 
-expecting success of 3070.193 'wildmatch: no match 'ten' 't[!a-g]n'': 
-			test_must_fail test-tool wildmatch wildmatch 'ten' 't[!a-g]n'
-		
-ok 193 - wildmatch: no match 'ten' 't[!a-g]n'
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 3070.194 'wildmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 194 - wildmatch (via ls-files): no match 't[!a-g]n' 'ten'
+  53c8c73 picked-signed
+  ccd9cfc base
 
-expecting success of 3070.195 'iwildmatch: no match 'ten' 't[!a-g]n'': 
-			test_must_fail test-tool wildmatch iwildmatch 'ten' 't[!a-g]n'
-		
-ok 195 - iwildmatch: no match 'ten' 't[!a-g]n'
+HEAD is now at df2a63d initial
+[detached HEAD ccd9cfc] base
+ 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 foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply e4ca149... picked-signed
+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"
+Unstaged changes after reset:
+M	foo
+ok 18 - reset after final pick clears cherry-pick state
 
-expecting success of 3070.196 'iwildmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 196 - iwildmatch (via ls-files): no match 't[!a-g]n' 'ten'
+expecting success of 3507.19 'failed cherry-pick produces dirty index': 
+	pristine_detach initial &&
 
-expecting success of 3070.197 'pathmatch: no match 'ten' 't[!a-g]n'': 
-			test_must_fail test-tool wildmatch pathmatch 'ten' 't[!a-g]n'
-		
-ok 197 - pathmatch: no match 'ten' 't[!a-g]n'
+	test_must_fail git cherry-pick picked &&
 
-expecting success of 3070.198 'pathmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
-				>expect &&
-				git ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 198 - pathmatch (via ls-files): no match 't[!a-g]n' 'ten'
+	test_must_fail git update-index --refresh -q &&
+	test_must_fail git diff-index --exit-code HEAD
 
-expecting success of 3070.199 'ipathmatch: no match 'ten' 't[!a-g]n'': 
-			test_must_fail test-tool wildmatch ipathmatch 'ten' 't[!a-g]n'
-		
-ok 199 - ipathmatch: no match 'ten' 't[!a-g]n'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.200 'ipathmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 200 - ipathmatch (via ls-files): no match 't[!a-g]n' 'ten'
+  ccd9cfc base
 
-expecting success of 3070.201 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ten
-ok 201 - cleanup after previous file test
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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: needs merge
+:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 0000000000000000000000000000000000000000 M	foo
+ok 19 - failed cherry-pick produces dirty index
 
-expecting success of 3070.202 'setup match file test for ton': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 202 - setup match file test for ton
+expecting success of 3507.20 'failed cherry-pick registers participants in index': 
+	pristine_detach initial &&
+	{
+		git checkout base -- foo &&
+		git ls-files --stage foo &&
+		git checkout initial -- foo &&
+		git ls-files --stage foo &&
+		git checkout picked -- foo &&
+		git ls-files --stage foo
+	} >stages &&
+	sed "
+		1 s/ 0	/ 1	/
+		2 s/ 0	/ 2	/
+		3 s/ 0	/ 3	/
+	" stages >expected &&
+	git read-tree -u --reset HEAD &&
 
-expecting success of 3070.203 'wildmatch: match 'ton' 't[!a-g]n'': 
-			test-tool wildmatch wildmatch 'ton' 't[!a-g]n'
-		
-ok 203 - wildmatch: match 'ton' 't[!a-g]n'
+	test_must_fail git cherry-pick picked &&
+	git ls-files --stage --unmerged >actual &&
 
-expecting success of 3070.204 'wildmatch (via ls-files): match 't[!a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git --glob-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 204 - wildmatch (via ls-files): match 't[!a-g]n' 'ton'
+	test_cmp expected actual
 
-expecting success of 3070.205 'iwildmatch: match 'ton' 't[!a-g]n'': 
-			test-tool wildmatch iwildmatch 'ton' 't[!a-g]n'
-		
-ok 205 - iwildmatch: match 'ton' 't[!a-g]n'
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+ok 20 - failed cherry-pick registers participants in index
 
-expecting success of 3070.206 'iwildmatch (via ls-files): match 't[!a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 206 - iwildmatch (via ls-files): match 't[!a-g]n' 'ton'
+expecting success of 3507.21 'cherry-pick conflict, ensure commit.cleanup = scissors places scissors line properly': 
+	pristine_detach initial &&
+	git config commit.cleanup scissors &&
+	cat <<-EOF >expected &&
+		picked
 
-expecting success of 3070.207 'pathmatch: match 'ton' 't[!a-g]n'': 
-			test-tool wildmatch pathmatch 'ton' 't[!a-g]n'
-		
-ok 207 - pathmatch: match 'ton' 't[!a-g]n'
+		# ------------------------ >8 ------------------------
+		# Do not modify or remove the line above.
+		# Everything below it will be ignored.
+		#
+		# Conflicts:
+		#	foo
+		EOF
 
-expecting success of 3070.208 'pathmatch (via ls-files): match 't[!a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 208 - pathmatch (via ls-files): match 't[!a-g]n' 'ton'
+	test_must_fail git cherry-pick picked &&
 
-expecting success of 3070.209 'ipathmatch: match 'ton' 't[!a-g]n'': 
-			test-tool wildmatch ipathmatch 'ton' 't[!a-g]n'
-		
-ok 209 - ipathmatch: match 'ton' 't[!a-g]n'
+	test_cmp expected .git/MERGE_MSG
 
-expecting success of 3070.210 'ipathmatch (via ls-files): match 't[!a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 210 - ipathmatch (via ls-files): match 't[!a-g]n' 'ton'
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+ok 21 - cherry-pick conflict, ensure commit.cleanup = scissors places scissors line properly
 
-expecting success of 3070.211 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ton
-ok 211 - cleanup after previous file test
+expecting success of 3507.22 'cherry-pick conflict, ensure cleanup=scissors places scissors line properly': 
+	pristine_detach initial &&
+	git config --unset commit.cleanup &&
+	cat <<-EOF >expected &&
+		picked
 
-expecting success of 3070.212 'setup match file test for ton': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 212 - setup match file test for ton
+		# ------------------------ >8 ------------------------
+		# Do not modify or remove the line above.
+		# Everything below it will be ignored.
+		#
+		# Conflicts:
+		#	foo
+		EOF
 
-expecting success of 3070.213 'wildmatch: match 'ton' 't[^a-g]n'': 
-			test-tool wildmatch wildmatch 'ton' 't[^a-g]n'
-		
-ok 213 - wildmatch: match 'ton' 't[^a-g]n'
+	test_must_fail git cherry-pick --cleanup=scissors picked &&
 
-expecting success of 3070.214 'wildmatch (via ls-files): match 't[^a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git --glob-pathspecs ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 214 - wildmatch (via ls-files): match 't[^a-g]n' 'ton'
+	test_cmp expected .git/MERGE_MSG
 
-expecting success of 3070.215 'iwildmatch: match 'ton' 't[^a-g]n'': 
-			test-tool wildmatch iwildmatch 'ton' 't[^a-g]n'
-		
-ok 215 - iwildmatch: match 'ton' 't[^a-g]n'
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+ok 22 - cherry-pick conflict, ensure cleanup=scissors places scissors line properly
 
-expecting success of 3070.216 'iwildmatch (via ls-files): match 't[^a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 216 - iwildmatch (via ls-files): match 't[^a-g]n' 'ton'
+expecting success of 3507.23 'failed cherry-pick describes conflict in work tree': 
+	pristine_detach initial &&
+	cat <<-EOF >expected &&
+	<<<<<<< HEAD
+	a
+	=======
+	c
+	>>>>>>> objid (picked)
+	EOF
 
-expecting success of 3070.217 'pathmatch: match 'ton' 't[^a-g]n'': 
-			test-tool wildmatch pathmatch 'ton' 't[^a-g]n'
-		
-ok 217 - pathmatch: match 'ton' 't[^a-g]n'
+	test_must_fail git cherry-pick picked &&
 
-expecting success of 3070.218 'pathmatch (via ls-files): match 't[^a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 218 - pathmatch (via ls-files): match 't[^a-g]n' 'ton'
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
+	test_cmp expected actual
 
-expecting success of 3070.219 'ipathmatch: match 'ton' 't[^a-g]n'': 
-			test-tool wildmatch ipathmatch 'ton' 't[^a-g]n'
-		
-ok 219 - ipathmatch: match 'ton' 't[^a-g]n'
-
-expecting success of 3070.220 'ipathmatch (via ls-files): match 't[^a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git --icase-pathspecs ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 220 - ipathmatch (via ls-files): match 't[^a-g]n' 'ton'
-
-expecting success of 3070.221 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ton
-ok 221 - cleanup after previous file test
-
-expecting success of 3070.222 'setup match file test for a]b': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 222 - setup match file test for a]b
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+ok 23 - failed cherry-pick describes conflict in work tree
 
-expecting success of 3070.223 'wildmatch: match 'a]b' 'a[]]b'': 
-			test-tool wildmatch wildmatch 'a]b' 'a[]]b'
-		
-ok 223 - wildmatch: match 'a]b' 'a[]]b'
+expecting success of 3507.24 'diff3 -m style': 
+	pristine_detach initial &&
+	git config merge.conflictstyle diff3 &&
+	cat <<-EOF >expected &&
+	<<<<<<< HEAD
+	a
+	||||||| parent of objid (picked)
+	b
+	=======
+	c
+	>>>>>>> objid (picked)
+	EOF
 
-expecting success of 3070.224 'wildmatch (via ls-files): match 'a[]]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 224 - wildmatch (via ls-files): match 'a[]]b' 'a]b'
+	test_must_fail git cherry-pick picked &&
 
-expecting success of 3070.225 'iwildmatch: match 'a]b' 'a[]]b'': 
-			test-tool wildmatch iwildmatch 'a]b' 'a[]]b'
-		
-ok 225 - iwildmatch: match 'a]b' 'a[]]b'
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
+	test_cmp expected actual
 
-expecting success of 3070.226 'iwildmatch (via ls-files): match 'a[]]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 226 - iwildmatch (via ls-files): match 'a[]]b' 'a]b'
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+ok 24 - diff3 -m style
 
-expecting success of 3070.227 'pathmatch: match 'a]b' 'a[]]b'': 
-			test-tool wildmatch pathmatch 'a]b' 'a[]]b'
-		
-ok 227 - pathmatch: match 'a]b' 'a[]]b'
+expecting success of 3507.25 'revert also handles conflicts sanely': 
+	git config --unset merge.conflictstyle &&
+	pristine_detach initial &&
+	cat <<-EOF >expected &&
+	<<<<<<< HEAD
+	a
+	=======
+	b
+	>>>>>>> parent of objid (picked)
+	EOF
+	{
+		git checkout picked -- foo &&
+		git ls-files --stage foo &&
+		git checkout initial -- foo &&
+		git ls-files --stage foo &&
+		git checkout base -- foo &&
+		git ls-files --stage foo
+	} >stages &&
+	sed "
+		1 s/ 0	/ 1	/
+		2 s/ 0	/ 2	/
+		3 s/ 0	/ 3	/
+	" stages >expected-stages &&
+	git read-tree -u --reset HEAD &&
 
-expecting success of 3070.228 'pathmatch (via ls-files): match 'a[]]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 228 - pathmatch (via ls-files): match 'a[]]b' 'a]b'
+	head=$(git rev-parse HEAD) &&
+	test_must_fail git revert picked &&
+	newhead=$(git rev-parse HEAD) &&
+	git ls-files --stage --unmerged >actual-stages &&
 
-expecting success of 3070.229 'ipathmatch: match 'a]b' 'a[]]b'': 
-			test-tool wildmatch ipathmatch 'a]b' 'a[]]b'
-		
-ok 229 - ipathmatch: match 'a]b' 'a[]]b'
+	test "$head" = "$newhead" &&
+	test_must_fail git update-index --refresh -q &&
+	test_must_fail git diff-index --exit-code HEAD &&
+	test_cmp expected-stages actual-stages &&
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
+	test_cmp expected actual
 
-expecting success of 3070.230 'ipathmatch (via ls-files): match 'a[]]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 230 - ipathmatch (via ls-files): match 'a[]]b' 'a]b'
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+foo: needs merge
+:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 0000000000000000000000000000000000000000 M	foo
+ok 25 - revert also handles conflicts sanely
 
-expecting success of 3070.231 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a]b
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 231 - cleanup after previous file test
+expecting success of 3507.26 'failed revert sets REVERT_HEAD': 
+	pristine_detach initial &&
+	test_must_fail git revert picked &&
+	test_cmp_rev picked REVERT_HEAD
 
-expecting success of 3070.232 'setup match file test for a-b': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 232 - setup match file test for a-b
+HEAD is now at df2a63d initial
+warning: cancelling a revert in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 26 - failed revert sets REVERT_HEAD
 
-expecting success of 3070.233 'wildmatch: match 'a-b' 'a[]-]b'': 
-			test-tool wildmatch wildmatch 'a-b' 'a[]-]b'
-		
-ok 233 - wildmatch: match 'a-b' 'a[]-]b'
+expecting success of 3507.27 'successful revert does not set REVERT_HEAD': 
+	pristine_detach base &&
+	git revert base &&
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
+	test_must_fail git rev-parse --verify REVERT_HEAD
 
-expecting success of 3070.234 'wildmatch (via ls-files): match 'a[]-]b' 'a-b'': 
-				printf '%s' 'a-b' >expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 234 - wildmatch (via ls-files): match 'a[]-]b' 'a-b'
+Previous HEAD position was df2a63d initial
+HEAD is now at dc0113b base
+warning: cancelling a revert in progress
+[detached HEAD feb2983] Revert "base"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 27 - successful revert does not set REVERT_HEAD
 
-expecting success of 3070.235 'iwildmatch: match 'a-b' 'a[]-]b'': 
-			test-tool wildmatch iwildmatch 'a-b' 'a[]-]b'
-		
-ok 235 - iwildmatch: match 'a-b' 'a[]-]b'
+expecting success of 3507.28 'revert --no-commit sets REVERT_HEAD': 
+	pristine_detach base &&
+	git revert --no-commit base &&
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
+	test_cmp_rev base REVERT_HEAD
 
-expecting success of 3070.236 'iwildmatch (via ls-files): match 'a[]-]b' 'a-b'': 
-				printf '%s' 'a-b' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 236 - iwildmatch (via ls-files): match 'a[]-]b' 'a-b'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.237 'pathmatch: match 'a-b' 'a[]-]b'': 
-			test-tool wildmatch pathmatch 'a-b' 'a[]-]b'
-		
-ok 237 - pathmatch: match 'a-b' 'a[]-]b'
+  feb2983 Revert "base"
 
-expecting success of 3070.238 'pathmatch (via ls-files): match 'a[]-]b' 'a-b'': 
-				printf '%s' 'a-b' >expect &&
-				git ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 238 - pathmatch (via ls-files): match 'a[]-]b' 'a-b'
+HEAD is now at dc0113b base
+fatal: Needed a single revision
+ok 28 - revert --no-commit sets REVERT_HEAD
 
-expecting success of 3070.239 'ipathmatch: match 'a-b' 'a[]-]b'': 
-			test-tool wildmatch ipathmatch 'a-b' 'a[]-]b'
-		
-ok 239 - ipathmatch: match 'a-b' 'a[]-]b'
+expecting success of 3507.29 'revert w/dirty tree does not set REVERT_HEAD': 
+	pristine_detach base &&
+	echo foo >foo &&
+	test_must_fail git revert base &&
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
+	test_must_fail git rev-parse --verify REVERT_HEAD
 
-expecting success of 3070.240 'ipathmatch (via ls-files): match 'a[]-]b' 'a-b'': 
-				printf '%s' 'a-b' >expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 240 - ipathmatch (via ls-files): match 'a[]-]b' 'a-b'
+HEAD is now at dc0113b base
+warning: cancelling a revert in progress
+error: Your local changes to the following files would be overwritten by merge:
+	foo
+Please commit your changes or stash them before you merge.
+Aborting
+fatal: revert failed
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 29 - revert w/dirty tree does not set REVERT_HEAD
 
-expecting success of 3070.241 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a-b
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 241 - cleanup after previous file test
+expecting success of 3507.30 'GIT_CHERRY_PICK_HELP does not suppress REVERT_HEAD': 
+	pristine_detach initial &&
+	(
+		GIT_CHERRY_PICK_HELP="and then do something else" &&
+		GIT_REVERT_HELP="and then do something else, again" &&
+		export GIT_CHERRY_PICK_HELP GIT_REVERT_HELP &&
+		test_must_fail git revert picked
+	) &&
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
+	test_cmp_rev picked REVERT_HEAD
 
-expecting success of 3070.242 'setup match file test for a]b': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 242 - setup match file test for a]b
+Previous HEAD position was dc0113b base
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert 7e6d412... picked
+hint: and then do something else
+hint: Disable this message with "git config set advice.mergeConflict false"
+fatal: Needed a single revision
+ok 30 - GIT_CHERRY_PICK_HELP does not suppress REVERT_HEAD
 
-expecting success of 3070.243 'wildmatch: match 'a]b' 'a[]-]b'': 
-			test-tool wildmatch wildmatch 'a]b' 'a[]-]b'
-		
-ok 243 - wildmatch: match 'a]b' 'a[]-]b'
+expecting success of 3507.31 'git reset clears REVERT_HEAD': 
+	pristine_detach initial &&
+	test_must_fail git revert picked &&
+	git reset &&
+	test_must_fail git rev-parse --verify REVERT_HEAD
 
-expecting success of 3070.244 'wildmatch (via ls-files): match 'a[]-]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 244 - wildmatch (via ls-files): match 'a[]-]b' 'a]b'
+HEAD is now at df2a63d initial
+warning: cancelling a revert in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Unstaged changes after reset:
+M	foo
+fatal: Needed a single revision
+ok 31 - git reset clears REVERT_HEAD
 
-expecting success of 3070.245 'iwildmatch: match 'a]b' 'a[]-]b'': 
-			test-tool wildmatch iwildmatch 'a]b' 'a[]-]b'
-		
-ok 245 - iwildmatch: match 'a]b' 'a[]-]b'
+expecting success of 3507.32 'failed commit does not clear REVERT_HEAD': 
+	pristine_detach initial &&
+	test_must_fail git revert picked &&
+	test_must_fail git commit &&
+	test_cmp_rev picked REVERT_HEAD
 
-expecting success of 3070.246 'iwildmatch (via ls-files): match 'a[]-]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 246 - iwildmatch (via ls-files): match 'a[]-]b' 'a]b'
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+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	foo
+ok 32 - failed commit does not clear REVERT_HEAD
 
-expecting success of 3070.247 'pathmatch: match 'a]b' 'a[]-]b'': 
-			test-tool wildmatch pathmatch 'a]b' 'a[]-]b'
-		
-ok 247 - pathmatch: match 'a]b' 'a[]-]b'
+expecting success of 3507.33 'successful final commit clears revert state': 
+	pristine_detach picked-signed &&
 
-expecting success of 3070.248 'pathmatch (via ls-files): match 'a[]-]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 248 - pathmatch (via ls-files): match 'a[]-]b' 'a]b'
+	test_must_fail git revert picked-signed base &&
+	echo resolved >foo &&
+	test_path_is_file .git/sequencer/todo &&
+	git commit -a &&
+	test_path_is_missing .git/sequencer
 
-expecting success of 3070.249 'ipathmatch: match 'a]b' 'a[]-]b'': 
-			test-tool wildmatch ipathmatch 'a]b' 'a[]-]b'
-		
-ok 249 - ipathmatch: match 'a]b' 'a[]-]b'
+Previous HEAD position was df2a63d initial
+HEAD is now at e4ca149 picked-signed
+warning: cancelling a revert in progress
+[detached HEAD b940b09] Revert "picked-signed"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert dc0113b... base
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+[detached HEAD 7342963] Revert "base"
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 33 - successful final commit clears revert state
 
-expecting success of 3070.250 'ipathmatch (via ls-files): match 'a[]-]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 250 - ipathmatch (via ls-files): match 'a[]-]b' 'a]b'
+expecting success of 3507.34 'reset after final pick clears revert state': 
+	pristine_detach picked-signed &&
 
-expecting success of 3070.251 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a]b
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 251 - cleanup after previous file test
+	test_must_fail git revert picked-signed base &&
+	echo resolved >foo &&
+	test_path_is_file .git/sequencer/todo &&
+	git reset &&
+	test_path_is_missing .git/sequencer
 
-expecting success of 3070.252 'setup match file test for aab': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 252 - setup match file test for aab
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 3070.253 'wildmatch: no match 'aab' 'a[]-]b'': 
-			test_must_fail test-tool wildmatch wildmatch 'aab' 'a[]-]b'
-		
-ok 253 - wildmatch: no match 'aab' 'a[]-]b'
+  7342963 Revert "base"
+  b940b09 Revert "picked-signed"
 
-expecting success of 3070.254 'wildmatch (via ls-files): no match 'a[]-]b' 'aab'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 254 - wildmatch (via ls-files): no match 'a[]-]b' 'aab'
+HEAD is now at e4ca149 picked-signed
+[detached HEAD b940b09] Revert "picked-signed"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert dc0113b... base
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Unstaged changes after reset:
+M	foo
+ok 34 - reset after final pick clears revert state
 
-expecting success of 3070.255 'iwildmatch: no match 'aab' 'a[]-]b'': 
-			test_must_fail test-tool wildmatch iwildmatch 'aab' 'a[]-]b'
-		
-ok 255 - iwildmatch: no match 'aab' 'a[]-]b'
+expecting success of 3507.35 'revert conflict, diff3 -m style': 
+	pristine_detach initial &&
+	git config merge.conflictstyle diff3 &&
+	cat <<-EOF >expected &&
+	<<<<<<< HEAD
+	a
+	||||||| objid (picked)
+	c
+	=======
+	b
+	>>>>>>> parent of objid (picked)
+	EOF
 
-expecting success of 3070.256 'iwildmatch (via ls-files): no match 'a[]-]b' 'aab'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 256 - iwildmatch (via ls-files): no match 'a[]-]b' 'aab'
+	test_must_fail git revert picked &&
 
-expecting success of 3070.257 'pathmatch: no match 'aab' 'a[]-]b'': 
-			test_must_fail test-tool wildmatch pathmatch 'aab' 'a[]-]b'
-		
-ok 257 - pathmatch: no match 'aab' 'a[]-]b'
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
+	test_cmp expected actual
 
-expecting success of 3070.258 'pathmatch (via ls-files): no match 'a[]-]b' 'aab'': 
-				>expect &&
-				git ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 258 - pathmatch (via ls-files): no match 'a[]-]b' 'aab'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.259 'ipathmatch: no match 'aab' 'a[]-]b'': 
-			test_must_fail test-tool wildmatch ipathmatch 'aab' 'a[]-]b'
-		
-ok 259 - ipathmatch: no match 'aab' 'a[]-]b'
+  b940b09 Revert "picked-signed"
 
-expecting success of 3070.260 'ipathmatch (via ls-files): no match 'a[]-]b' 'aab'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 260 - ipathmatch (via ls-files): no match 'a[]-]b' 'aab'
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 35 - revert conflict, diff3 -m style
 
-expecting success of 3070.261 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing aab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 261 - cleanup after previous file test
+expecting success of 3507.36 'revert conflict, ensure commit.cleanup = scissors places scissors line properly': 
+	pristine_detach initial &&
+	git config commit.cleanup scissors &&
+	cat >expected <<-EOF &&
+		Revert "picked"
 
-expecting success of 3070.262 'setup match file test for aab': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 262 - setup match file test for aab
+		This reverts commit OBJID.
 
-expecting success of 3070.263 'wildmatch: match 'aab' 'a[]a-]b'': 
-			test-tool wildmatch wildmatch 'aab' 'a[]a-]b'
-		
-ok 263 - wildmatch: match 'aab' 'a[]a-]b'
+		# ------------------------ >8 ------------------------
+		# Do not modify or remove the line above.
+		# Everything below it will be ignored.
+		#
+		# Conflicts:
+		#	foo
+		EOF
 
-expecting success of 3070.264 'wildmatch (via ls-files): match 'a[]a-]b' 'aab'': 
-				printf '%s' 'aab' >expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 264 - wildmatch (via ls-files): match 'a[]a-]b' 'aab'
+	test_must_fail git revert picked &&
 
-expecting success of 3070.265 'iwildmatch: match 'aab' 'a[]a-]b'': 
-			test-tool wildmatch iwildmatch 'aab' 'a[]a-]b'
-		
-ok 265 - iwildmatch: match 'aab' 'a[]a-]b'
+	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
+	test_cmp expected actual
 
-expecting success of 3070.266 'iwildmatch (via ls-files): match 'a[]a-]b' 'aab'': 
-				printf '%s' 'aab' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 266 - iwildmatch (via ls-files): match 'a[]a-]b' 'aab'
+HEAD is now at df2a63d initial
+warning: cancelling a revert in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 36 - revert conflict, ensure commit.cleanup = scissors places scissors line properly
 
-expecting success of 3070.267 'pathmatch: match 'aab' 'a[]a-]b'': 
-			test-tool wildmatch pathmatch 'aab' 'a[]a-]b'
-		
-ok 267 - pathmatch: match 'aab' 'a[]a-]b'
+expecting success of 3507.37 'revert conflict, ensure cleanup=scissors places scissors line properly': 
+	pristine_detach initial &&
+	git config --unset commit.cleanup &&
+	cat >expected <<-EOF &&
+		Revert "picked"
 
-expecting success of 3070.268 'pathmatch (via ls-files): match 'a[]a-]b' 'aab'': 
-				printf '%s' 'aab' >expect &&
-				git ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 268 - pathmatch (via ls-files): match 'a[]a-]b' 'aab'
+		This reverts commit OBJID.
 
-expecting success of 3070.269 'ipathmatch: match 'aab' 'a[]a-]b'': 
-			test-tool wildmatch ipathmatch 'aab' 'a[]a-]b'
-		
-ok 269 - ipathmatch: match 'aab' 'a[]a-]b'
+		# ------------------------ >8 ------------------------
+		# Do not modify or remove the line above.
+		# Everything below it will be ignored.
+		#
+		# Conflicts:
+		#	foo
+		EOF
 
-expecting success of 3070.270 'ipathmatch (via ls-files): match 'a[]a-]b' 'aab'': 
-				printf '%s' 'aab' >expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 270 - ipathmatch (via ls-files): match 'a[]a-]b' 'aab'
+	test_must_fail git revert --cleanup=scissors picked &&
 
-expecting success of 3070.271 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing aab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 271 - cleanup after previous file test
+	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
+	test_cmp expected actual
 
-expecting success of 3070.272 'setup match file test for ]': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 272 - setup match file test for ]
+HEAD is now at df2a63d initial
+warning: cancelling a revert in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 37 - revert conflict, ensure cleanup=scissors places scissors line properly
 
-expecting success of 3070.273 'wildmatch: match ']' ']'': 
-			test-tool wildmatch wildmatch ']' ']'
-		
-ok 273 - wildmatch: match ']' ']'
+expecting success of 3507.38 'failed cherry-pick does not forget -s': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick -s picked &&
+	test_grep -e "Signed-off-by" .git/MERGE_MSG
 
-expecting success of 3070.274 'wildmatch (via ls-files): match ']' ']'': 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 274 - wildmatch (via ls-files): match ']' ']'
+HEAD is now at df2a63d initial
+warning: cancelling a revert in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+Signed-off-by: C O Mitter <committer@example.com>
+ok 38 - failed cherry-pick does not forget -s
 
-expecting success of 3070.275 'iwildmatch: match ']' ']'': 
-			test-tool wildmatch iwildmatch ']' ']'
-		
-ok 275 - iwildmatch: match ']' ']'
+expecting success of 3507.39 'commit after failed cherry-pick does not add duplicated -s': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick -s picked-signed &&
+	git commit -a -s &&
+	test $(git show -s >tmp && grep -c "Signed-off-by" tmp && rm tmp) = 1
 
-expecting success of 3070.276 'iwildmatch (via ls-files): match ']' ']'': 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 276 - iwildmatch (via ls-files): match ']' ']'
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply e4ca149... picked-signed
+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"
+[detached HEAD ae79e40] picked-signed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 6 insertions(+)
+ok 39 - commit after failed cherry-pick does not add duplicated -s
 
-expecting success of 3070.277 'pathmatch: match ']' ']'': 
-			test-tool wildmatch pathmatch ']' ']'
-		
-ok 277 - pathmatch: match ']' ']'
+expecting success of 3507.40 'commit after failed cherry-pick adds -s at the right place': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick picked &&
 
-expecting success of 3070.278 'pathmatch (via ls-files): match ']' ']'': 
-				printf '%s' ']' >expect &&
-				git ls-files -z -- ']' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 278 - pathmatch (via ls-files): match ']' ']'
+	git commit -a -s &&
 
-expecting success of 3070.279 'ipathmatch: match ']' ']'': 
-			test-tool wildmatch ipathmatch ']' ']'
-		
-ok 279 - ipathmatch: match ']' ']'
+	# Do S-o-b and Conflicts appear in the right order?
+	cat <<-\EOF >expect &&
+	Signed-off-by: C O Mitter <committer@example.com>
+	# Conflicts:
+	EOF
+	grep -e "^# Conflicts:" -e "^Signed-off-by" .git/COMMIT_EDITMSG >actual &&
+	test_cmp expect actual &&
 
-expecting success of 3070.280 'ipathmatch (via ls-files): match ']' ']'': 
-				printf '%s' ']' >expect &&
-				git --icase-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 280 - ipathmatch (via ls-files): match ']' ']'
+	cat <<-\EOF >expected &&
+	picked
 
-expecting success of 3070.281 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 281 - cleanup after previous file test
+	Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 
-expecting success of 3070.282 'setup match file test for foo/baz/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 282 - setup match file test for foo/baz/bar
+	git show -s --pretty=format:%B >actual &&
+	test_cmp expected actual
 
-expecting success of 3070.283 'wildmatch: no match 'foo/baz/bar' 'foo*bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/baz/bar' 'foo*bar'
-		
-ok 283 - wildmatch: no match 'foo/baz/bar' 'foo*bar'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.284 'wildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 284 - wildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'
+  ae79e40 picked-signed
 
-expecting success of 3070.285 'iwildmatch: no match 'foo/baz/bar' 'foo*bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo*bar'
-		
-ok 285 - iwildmatch: no match 'foo/baz/bar' 'foo*bar'
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+[detached HEAD 56f790d] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 6 insertions(+)
+ok 40 - commit after failed cherry-pick adds -s at the right place
 
-expecting success of 3070.286 'iwildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 286 - iwildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'
+expecting success of 3507.41 'commit --amend -s places the sign-off at the right place': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick picked &&
 
-expecting success of 3070.287 'pathmatch: match 'foo/baz/bar' 'foo*bar'': 
-			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo*bar'
-		
-ok 287 - pathmatch: match 'foo/baz/bar' 'foo*bar'
+	# emulate old-style conflicts block
+	mv .git/MERGE_MSG .git/MERGE_MSG+ &&
+	sed -e "/^# Conflicts:/,\$s/^# *//" .git/MERGE_MSG+ >.git/MERGE_MSG &&
 
-expecting success of 3070.288 'pathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 288 - pathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'
+	git commit -a &&
+	git commit --amend -s &&
 
-expecting success of 3070.289 'ipathmatch: match 'foo/baz/bar' 'foo*bar'': 
-			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo*bar'
-		
-ok 289 - ipathmatch: match 'foo/baz/bar' 'foo*bar'
+	# Do S-o-b and Conflicts appear in the right order?
+	cat <<-\EOF >expect &&
+	Signed-off-by: C O Mitter <committer@example.com>
+	Conflicts:
+	EOF
+	grep -e "^Conflicts:" -e "^Signed-off-by" .git/COMMIT_EDITMSG >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.290 'ipathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 290 - ipathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.291 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 291 - cleanup after previous file test
+  56f790d picked
 
-expecting success of 3070.292 'setup match file test for foo/baz/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 292 - setup match file test for foo/baz/bar
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+[detached HEAD a795bbb] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 6 insertions(+)
+[detached HEAD 91df379] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 6 insertions(+)
+ok 41 - commit --amend -s places the sign-off at the right place
 
-expecting success of 3070.293 'wildmatch: no match 'foo/baz/bar' 'foo**bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/baz/bar' 'foo**bar'
-		
-ok 293 - wildmatch: no match 'foo/baz/bar' 'foo**bar'
+expecting success of 3507.42 'cherry-pick preserves sparse-checkout': 
+	pristine_detach initial &&
+	test_config core.sparseCheckout true &&
+	test_when_finished "
+		echo \"/*\" >.git/info/sparse-checkout
+		git read-tree --reset -u HEAD
+		rm .git/info/sparse-checkout" &&
+	mkdir .git/info &&
+	echo /unrelated >.git/info/sparse-checkout &&
+	git read-tree --reset -u HEAD &&
+	test_must_fail git cherry-pick -Xours picked>actual &&
+	test_grep ! "Changes not staged for commit:" actual
 
-expecting success of 3070.294 'wildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 294 - wildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.295 'iwildmatch: no match 'foo/baz/bar' 'foo**bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo**bar'
-		
-ok 295 - iwildmatch: no match 'foo/baz/bar' 'foo**bar'
+  91df379 picked
 
-expecting success of 3070.296 'iwildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 296 - iwildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'
+HEAD is now at df2a63d initial
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-expecting success of 3070.297 'pathmatch: match 'foo/baz/bar' 'foo**bar'': 
-			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo**bar'
-		
-ok 297 - pathmatch: match 'foo/baz/bar' 'foo**bar'
+    git commit --allow-empty
 
-expecting success of 3070.298 'pathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 298 - pathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'
+Otherwise, please use 'git cherry-pick --skip'
+ok 42 - cherry-pick preserves sparse-checkout
 
-expecting success of 3070.299 'ipathmatch: match 'foo/baz/bar' 'foo**bar'': 
-			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo**bar'
-		
-ok 299 - ipathmatch: match 'foo/baz/bar' 'foo**bar'
+expecting success of 3507.43 'cherry-pick --continue remembers --keep-redundant-commits': 
+	test_when_finished "git cherry-pick --abort || :" &&
+	pristine_detach initial &&
+	test_must_fail git cherry-pick --keep-redundant-commits picked redundant &&
+	echo c >foo &&
+	git add foo &&
+	git cherry-pick --continue
 
-expecting success of 3070.300 'ipathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 300 - ipathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+[detached HEAD d9f497e] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 22de78d] redundant-pick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+error: no cherry-pick or revert in progress
+fatal: cherry-pick failed
+ok 43 - cherry-pick --continue remembers --keep-redundant-commits
 
-expecting success of 3070.301 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 301 - cleanup after previous file test
+expecting success of 3507.44 'cherry-pick --continue remembers --allow-empty and --allow-empty-message': 
+	test_when_finished "git cherry-pick --abort || :" &&
+	pristine_detach initial &&
+	test_must_fail git cherry-pick --allow-empty --allow-empty-message \
+				       picked empty &&
+	echo c >foo &&
+	git add foo &&
+	git cherry-pick --continue
 
-expecting success of 3070.302 'setup match file test for foobazbar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 302 - setup match file test for foobazbar
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 3070.303 'wildmatch: match 'foobazbar' 'foo**bar'': 
-			test-tool wildmatch wildmatch 'foobazbar' 'foo**bar'
-		
-ok 303 - wildmatch: match 'foobazbar' 'foo**bar'
+  22de78d redundant-pick
+  d9f497e picked
 
-expecting success of 3070.304 'wildmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
-				printf '%s' 'foobazbar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 304 - wildmatch (via ls-files): match 'foo**bar' 'foobazbar'
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+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"
+[detached HEAD d9f497e] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD d7f7844] 
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+error: no cherry-pick or revert in progress
+fatal: cherry-pick failed
+ok 44 - cherry-pick --continue remembers --allow-empty and --allow-empty-message
 
-expecting success of 3070.305 'iwildmatch: match 'foobazbar' 'foo**bar'': 
-			test-tool wildmatch iwildmatch 'foobazbar' 'foo**bar'
-		
-ok 305 - iwildmatch: match 'foobazbar' 'foo**bar'
+# passed all 44 test(s)
+1..44
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3601-rm-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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" &&
 
-expecting success of 3070.306 'iwildmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
-				printf '%s' 'foobazbar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 306 - iwildmatch (via ls-files): match 'foo**bar' 'foobazbar'
+	git tag checkpoint
 
-expecting success of 3070.307 'pathmatch: match 'foobazbar' 'foo**bar'': 
-			test-tool wildmatch pathmatch 'foobazbar' 'foo**bar'
-		
-ok 307 - pathmatch: match 'foobazbar' 'foo**bar'
+[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 3070.308 'pathmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
-				printf '%s' 'foobazbar' >expect &&
-				git ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 308 - pathmatch (via ls-files): match 'foo**bar' 'foobazbar'
+expecting success of 3601.2 'simplest': 
+	restore_checkpoint &&
 
-expecting success of 3070.309 'ipathmatch: match 'foobazbar' 'foo**bar'': 
-			test-tool wildmatch ipathmatch 'foobazbar' 'foo**bar'
-		
-ok 309 - ipathmatch: match 'foobazbar' 'foo**bar'
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	EOF
 
-expecting success of 3070.310 'ipathmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
-				printf '%s' 'foobazbar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 310 - ipathmatch (via ls-files): match 'foo**bar' 'foobazbar'
+	echo fileA.t | git rm --pathspec-from-file=- &&
+	verify_expect
 
-expecting success of 3070.311 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foobazbar
-ok 311 - cleanup after previous file test
+HEAD is now at d32ab08 files
+rm 'fileA.t'
+ok 2 - simplest
 
-expecting success of 3070.312 'setup match file test for foo/baz/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 312 - setup match file test for foo/baz/bar
+expecting success of 3601.3 '--pathspec-file-nul': 
+	restore_checkpoint &&
 
-expecting success of 3070.313 'wildmatch: match 'foo/baz/bar' 'foo/**/bar'': 
-			test-tool wildmatch wildmatch 'foo/baz/bar' 'foo/**/bar'
-		
-ok 313 - wildmatch: match 'foo/baz/bar' 'foo/**/bar'
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	D  fileB.t
+	EOF
 
-expecting success of 3070.314 'wildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 314 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
+	printf "fileA.t\0fileB.t\0" | git rm --pathspec-from-file=- --pathspec-file-nul &&
+	verify_expect
 
-expecting success of 3070.315 'iwildmatch: match 'foo/baz/bar' 'foo/**/bar'': 
-			test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo/**/bar'
-		
-ok 315 - iwildmatch: match 'foo/baz/bar' 'foo/**/bar'
+HEAD is now at d32ab08 files
+rm 'fileA.t'
+rm 'fileB.t'
+ok 3 - --pathspec-file-nul
 
-expecting success of 3070.316 'iwildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 316 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
+expecting success of 3601.4 'only touches what was listed': 
+	restore_checkpoint &&
 
-expecting success of 3070.317 'pathmatch: match 'foo/baz/bar' 'foo/**/bar'': 
-			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo/**/bar'
-		
-ok 317 - pathmatch: match 'foo/baz/bar' 'foo/**/bar'
+	cat >expect <<-\EOF &&
+	D  fileB.t
+	D  fileC.t
+	EOF
 
-expecting success of 3070.318 'pathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 318 - pathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
+	printf "fileB.t\nfileC.t\n" | git rm --pathspec-from-file=- &&
+	verify_expect
 
-expecting success of 3070.319 'ipathmatch: match 'foo/baz/bar' 'foo/**/bar'': 
-			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo/**/bar'
-		
-ok 319 - ipathmatch: match 'foo/baz/bar' 'foo/**/bar'
+HEAD is now at d32ab08 files
+rm 'fileB.t'
+rm 'fileC.t'
+ok 4 - only touches what was listed
 
-expecting success of 3070.320 'ipathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 320 - ipathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
+expecting success of 3601.5 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
 
-expecting success of 3070.321 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 321 - cleanup after previous file test
+	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 3070.322 'setup match file test for foo/baz/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 322 - setup match file test for foo/baz/bar
+	test_must_fail git rm --pathspec-file-nul 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
 
-expecting success of 3070.323 'wildmatch: match 'foo/baz/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch wildmatch 'foo/baz/bar' 'foo/**/**/bar'
-		
-ok 323 - wildmatch: match 'foo/baz/bar' 'foo/**/**/bar'
+	>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 3070.324 'wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 324 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'
+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
 
-expecting success of 3070.325 'iwildmatch: match 'foo/baz/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo/**/**/bar'
-		
-ok 325 - iwildmatch: match 'foo/baz/bar' 'foo/**/**/bar'
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3602-rm-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
 
-expecting success of 3070.326 'iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 326 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'
+	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
 
-expecting success of 3070.327 'pathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo/baz/bar' 'foo/**/**/bar'
-		
-ok 327 - pathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'
+	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
 
-expecting success of 3070.328 'pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'': 
-				>expect &&
-				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 328 - pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'
+	echo b | cat sparse_error_header - >sparse_entry_b_error &&
+	cat sparse_entry_b_error sparse_hint >b_error_and_hint
 
-expecting success of 3070.329 'ipathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo/**/**/bar'
-		
-ok 329 - ipathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'
+[master (root-commit) ff99497] files
+ 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
+ok 1 - setup
 
-expecting success of 3070.330 'ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 330 - ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'
+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 3070.331 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+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
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 331 - cleanup after previous file test
+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 3070.332 'setup match file test for foo/b/a/z/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+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
 	
-ok 332 - setup match file test for foo/b/a/z/bar
+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 3070.333 'wildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
-			test-tool wildmatch wildmatch 'foo/b/a/z/bar' 'foo/**/bar'
-		
-ok 333 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
+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 3070.334 'wildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 334 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
+	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
 
-expecting success of 3070.335 'iwildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
-			test-tool wildmatch iwildmatch 'foo/b/a/z/bar' 'foo/**/bar'
-		
-ok 335 - iwildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
+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 3070.336 'iwildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 336 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
+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
 
-expecting success of 3070.337 'pathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
-			test-tool wildmatch pathmatch 'foo/b/a/z/bar' 'foo/**/bar'
-		
-ok 337 - pathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
+HEAD is now at ff99497 files
+rm 'sub/d'
+rm 'sub/dir/e'
+ok 6 - recursive rm --sparse removes sparse entries
 
-expecting success of 3070.338 'pathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 338 - pathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
+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 3070.339 'ipathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
-			test-tool wildmatch ipathmatch 'foo/b/a/z/bar' 'foo/**/bar'
-		
-ok 339 - ipathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
+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
 
-expecting success of 3070.340 'ipathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 340 - ipathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
+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 3070.341 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 341 - cleanup after previous file test
+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
 
-expecting success of 3070.342 'setup match file test for foo/b/a/z/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 342 - setup match file test for foo/b/a/z/bar
+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 3070.343 'wildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch wildmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
-		
-ok 343 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
+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
 
-expecting success of 3070.344 'wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 344 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
+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 3070.345 'iwildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch iwildmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
-		
-ok 345 - iwildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
+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
 
-expecting success of 3070.346 'iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 346 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
+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 3070.347 'pathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch pathmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
-		
-ok 347 - pathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
+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
 
-expecting success of 3070.348 'pathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 348 - pathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
+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 3070.349 'ipathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch ipathmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
-		
-ok 349 - ipathmatch: match 'foo/b/a/z/bar' 'foo/**/**/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
 
-expecting success of 3070.350 'ipathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 350 - ipathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
+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 3070.351 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 351 - cleanup after previous file test
+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 &&
 
-expecting success of 3070.352 'setup match file test for foo/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 352 - setup match file test for foo/bar
+	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
 
-expecting success of 3070.353 'wildmatch: match 'foo/bar' 'foo/**/bar'': 
-			test-tool wildmatch wildmatch 'foo/bar' 'foo/**/bar'
-		
-ok 353 - wildmatch: match 'foo/bar' 'foo/**/bar'
+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
 
-expecting success of 3070.354 'wildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 354 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3404-rebase-interactive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-expecting success of 3070.355 'iwildmatch: match 'foo/bar' 'foo/**/bar'': 
-			test-tool wildmatch iwildmatch 'foo/bar' 'foo/**/bar'
-		
-ok 355 - iwildmatch: match 'foo/bar' 'foo/**/bar'
+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 3070.356 'iwildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 356 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'
+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
 
-expecting success of 3070.357 'pathmatch: no match 'foo/bar' 'foo/**/bar'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bar' 'foo/**/bar'
-		
-ok 357 - pathmatch: no match 'foo/bar' 'foo/**/bar'
+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 3070.358 'pathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'': 
-				>expect &&
-				git ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 358 - pathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'
+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 3070.359 'ipathmatch: no match 'foo/bar' 'foo/**/bar'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' 'foo/**/bar'
-		
-ok 359 - ipathmatch: no match 'foo/bar' 'foo/**/bar'
+ok 3 - rebase -i with empty todo list
 
-expecting success of 3070.360 'ipathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 360 - ipathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'
+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-*
 
-expecting success of 3070.361 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 361 - cleanup after previous file test
+Switched to branch 'primary'
+rebase -i script before editing:
+pick 313fe96 # B
+pick d0f65f2 # C
+pick 0547e3f # D
+pick 8f99a4f # E
 
-expecting success of 3070.362 'setup match file test for foo/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 362 - setup match file test for foo/bar
+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
 
-expecting success of 3070.363 'wildmatch: match 'foo/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch wildmatch 'foo/bar' 'foo/**/**/bar'
-		
-ok 363 - wildmatch: match 'foo/bar' 'foo/**/**/bar'
+  git rebase --continue
 
-expecting success of 3070.364 'wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 364 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'
 
-expecting success of 3070.365 'iwildmatch: match 'foo/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch iwildmatch 'foo/bar' 'foo/**/**/bar'
-		
-ok 365 - iwildmatch: match 'foo/bar' 'foo/**/**/bar'
+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 3070.366 'iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 366 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'
+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
 
-expecting success of 3070.367 'pathmatch: no match 'foo/bar' 'foo/**/**/bar'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bar' 'foo/**/**/bar'
-		
-ok 367 - pathmatch: no match 'foo/bar' 'foo/**/**/bar'
+Already on 'primary'
+rebase -i script before editing:
+pick 8f99a4f # E
 
-expecting success of 3070.368 'pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'': 
-				>expect &&
-				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 368 - pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'
+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 3070.369 'ipathmatch: no match 'foo/bar' 'foo/**/**/bar'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' 'foo/**/**/bar'
-		
-ok 369 - ipathmatch: no match 'foo/bar' 'foo/**/**/bar'
+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^
+	)
 
-expecting success of 3070.370 'ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 370 - ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'
+Already on 'primary'
+rebase -i script before editing:
+pick 8f99a4f # E
 
-expecting success of 3070.371 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 371 - cleanup after previous file test
+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 3070.372 'setup match file test for foo/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 372 - setup match file test for foo/bar
+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
 
-expecting success of 3070.373 'wildmatch: no match 'foo/bar' 'foo?bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo?bar'
-		
-ok 373 - wildmatch: no match 'foo/bar' 'foo?bar'
+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 3070.374 'wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 374 - wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
+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
 
-expecting success of 3070.375 'iwildmatch: no match 'foo/bar' 'foo?bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo?bar'
-		
-ok 375 - iwildmatch: no match 'foo/bar' 'foo?bar'
+Already on 'primary'
+rebase -i script before editing:
+pick 8f99a4f # E
 
-expecting success of 3070.376 'iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 376 - iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
+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
 
-expecting success of 3070.377 'pathmatch: match 'foo/bar' 'foo?bar'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo?bar'
-		
-ok 377 - pathmatch: match 'foo/bar' 'foo?bar'
+  git rebase --continue
 
-expecting success of 3070.378 'pathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 378 - pathmatch (via ls-files): match 'foo?bar' 'foo/bar'
 
-expecting success of 3070.379 'ipathmatch: match 'foo/bar' 'foo?bar'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo?bar'
-		
-ok 379 - ipathmatch: match 'foo/bar' 'foo?bar'
+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 3070.380 'ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 380 - ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'
+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
 
-expecting success of 3070.381 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 381 - cleanup after previous file test
+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
 
-expecting success of 3070.382 'setup match file test for foo/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 382 - setup match file test for foo/bar
+  git rebase --continue
 
-expecting success of 3070.383 'wildmatch: no match 'foo/bar' 'foo[/]bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[/]bar'
-		
-ok 383 - wildmatch: no match 'foo/bar' 'foo[/]bar'
 
-expecting success of 3070.384 'wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 384 - wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
+Previous HEAD position was 0547e3f D
+Switched to branch 'primary'
+ok 9 - cherry-pick works with rebase --exec
 
-expecting success of 3070.385 'iwildmatch: no match 'foo/bar' 'foo[/]bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[/]bar'
-		
-ok 385 - iwildmatch: no match 'foo/bar' 'foo[/]bar'
+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
 
-expecting success of 3070.386 'iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 386 - iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
+fatal: no rebase in progress
+ok 10 - rebase -x with empty command fails
 
-expecting success of 3070.387 'pathmatch: match 'foo/bar' 'foo[/]bar'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo[/]bar'
-		
-ok 387 - pathmatch: match 'foo/bar' 'foo[/]bar'
+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
 
-expecting success of 3070.388 'pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 388 - pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
+fatal: no rebase in progress
+ok 11 - rebase -x with newline in command fails
 
-expecting success of 3070.389 'ipathmatch: match 'foo/bar' 'foo[/]bar'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo[/]bar'
-		
-ok 389 - ipathmatch: match 'foo/bar' 'foo[/]bar'
+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
 
-expecting success of 3070.390 'ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 390 - ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
+Already on 'primary'
+ok 12 - rebase -i with exec of inexistent command
 
-expecting success of 3070.391 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 391 - cleanup after previous file test
+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" @^
 
-expecting success of 3070.392 'setup match file test for foo/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 392 - setup match file test for foo/bar
+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 3070.393 'wildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[^a-z]bar'
-		
-ok 393 - wildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+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 3070.394 'wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 394 - wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
+Switched to branch 'branch2'
+Successfully rebased and updated refs/heads/branch2.
+ok 14 - no changes are a nop
 
-expecting success of 3070.395 'iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[^a-z]bar'
-		
-ok 395 - iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+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
 
-expecting success of 3070.396 'iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 396 - iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
+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 3070.397 'pathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo[^a-z]bar'
-		
-ok 397 - pathmatch: match 'foo/bar' 'foo[^a-z]bar'
+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 3070.398 'pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 398 - pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
+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 3070.399 'ipathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo[^a-z]bar'
-		
-ok 399 - ipathmatch: match 'foo/bar' 'foo[^a-z]bar'
+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
 
-expecting success of 3070.400 'ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 400 - ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
+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 3070.401 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 401 - cleanup after previous file test
+expecting success of 3404.18 'reflog for the branch shows state before rebase': 
+	test_cmp_rev branch1@{1} original-branch1
 
-expecting success of 3070.402 'setup match file test for foo/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 402 - setup match file test for foo/bar
+ok 18 - reflog for the branch shows state before rebase
 
-expecting success of 3070.403 'wildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
-		
-ok 403 - wildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+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 3070.404 'wildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 404 - wildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
+ok 19 - reflog for the branch shows correct finish message
 
-expecting success of 3070.405 'iwildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
-		
-ok 405 - iwildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+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)
 
-expecting success of 3070.406 'iwildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 406 - iwildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
+rebase -i script before editing:
+pick ae8f65e # G
+pick f5f5249 # H
 
-expecting success of 3070.407 'pathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
-		
-ok 407 - pathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+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 3070.408 'pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 408 - pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
+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)
 
-expecting success of 3070.409 'ipathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
-		
-ok 409 - ipathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+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 3070.410 'ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 410 - ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
+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 3070.411 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 411 - cleanup after previous file test
+trace: run_command: git show REBASE_HEAD --
+trace: start_command: /build/reproducible-path/git-2.51.0/git show REBASE_HEAD --
+trace: built-in: git show REBASE_HEAD --
+ok 22 - show conflicted patch
 
-expecting success of 3070.412 'setup match file test for foo-bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 412 - setup match file test for foo-bar
+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
 
-expecting success of 3070.413 'wildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test-tool wildmatch wildmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
-		
-ok 413 - wildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+ok 23 - abort
 
-expecting success of 3070.414 'wildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
-				printf '%s' 'foo-bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 414 - wildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
+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^
 
-expecting success of 3070.415 'iwildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test-tool wildmatch iwildmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
-		
-ok 415 - iwildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+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 3070.416 'iwildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
-				printf '%s' 'foo-bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 416 - iwildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
+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
 
-expecting success of 3070.417 'pathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test-tool wildmatch pathmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
-		
-ok 417 - pathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+[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 3070.418 'pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
-				printf '%s' 'foo-bar' >expect &&
-				git ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 418 - pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
+expecting success of 3404.26 'retain authorship w/ conflicts': 
+	oGIT_AUTHOR_NAME=$GIT_AUTHOR_NAME &&
+	test_when_finished "GIT_AUTHOR_NAME=\$oGIT_AUTHOR_NAME" &&
 
-expecting success of 3070.419 'ipathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test-tool wildmatch ipathmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
-		
-ok 419 - ipathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+	git reset --hard twerp &&
+	test_commit a conflict a conflict-a &&
+	git reset --hard twerp &&
 
-expecting success of 3070.420 'ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
-				printf '%s' 'foo-bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 420 - ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
+	GIT_AUTHOR_NAME=AttributeMe &&
+	export GIT_AUTHOR_NAME &&
+	test_commit b conflict b conflict-b &&
+	GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME &&
 
-expecting success of 3070.421 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo-bar
-ok 421 - cleanup after previous file test
+	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
 
-expecting success of 3070.422 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 422 - setup match file test for foo
+HEAD is now at 2596307 different author
+[branch1 748a43d] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+HEAD is now at 2596307 different author
+[branch1 34d1a6c] b
+ Author: AttributeMe <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+Rebasing (1/1)
Auto-merging conflict
+CONFLICT (add/add): Merge conflict in conflict
+error: could not apply 34d1a6c... 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 34d1a6c... # b
+[detached HEAD 7866b12] b
+ Author: AttributeMe <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/branch1.
+Author: AttributeMe <author@example.com>
+ok 26 - retain authorship w/ conflicts
 
-expecting success of 3070.423 'wildmatch: match 'foo' '**/foo'': 
-			test-tool wildmatch wildmatch 'foo' '**/foo'
-		
-ok 423 - wildmatch: match 'foo' '**/foo'
+expecting success of 3404.27 'squash': 
+	git reset --hard twerp &&
+	echo B > file7 &&
+	test_tick &&
+	GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
+	echo "******************************" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
+			git rebase -i --onto primary HEAD~2
+	) &&
+	test B = $(cat file7) &&
+	test_cmp_rev HEAD^ primary
 
-expecting success of 3070.424 'wildmatch (via ls-files): match '**/foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 424 - wildmatch (via ls-files): match '**/foo' 'foo'
+HEAD is now at 2596307 different author
+[branch1 cdf577a] nitfol
+ Author: Nitfol <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+******************************
+rebase -i script before editing:
+pick 2596307 # different author
+pick cdf577a # nitfol
 
-expecting success of 3070.425 'iwildmatch: match 'foo' '**/foo'': 
-			test-tool wildmatch iwildmatch 'foo' '**/foo'
-		
-ok 425 - iwildmatch: match 'foo' '**/foo'
+rebase -i script after editing:
+pick 2596307 # different author
+squash cdf577a # nitfol
+Rebasing (1/2)
Rebasing (2/2)
[detached HEAD d2d5ba7] different author
+ Author: Twerp Snog <author@example.com>
+ Date: Thu Apr 7 15:33:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+Successfully rebased and updated refs/heads/branch1.
+ok 27 - squash
 
-expecting success of 3070.426 'iwildmatch (via ls-files): match '**/foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 426 - iwildmatch (via ls-files): match '**/foo' 'foo'
+expecting success of 3404.28 'retain authorship when squashing': 
+	git show HEAD >actual &&
+	grep "^Author: Twerp Snog" actual
 
-expecting success of 3070.427 'pathmatch: no match 'foo' '**/foo'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '**/foo'
-		
-ok 427 - pathmatch: no match 'foo' '**/foo'
+Author: Twerp Snog <author@example.com>
+ok 28 - retain authorship when squashing
 
-expecting success of 3070.428 'pathmatch (via ls-files): no match '**/foo' 'foo'': 
-				>expect &&
-				git ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 428 - pathmatch (via ls-files): no match '**/foo' 'foo'
+expecting success of 3404.29 '--continue tries to commit': 
+	git reset --hard D &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
+		echo resolved > file1 &&
+		git add file1 &&
+		FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
+	) &&
+	test_cmp_rev HEAD^ new-branch1 &&
+	git show HEAD >actual &&
+	grep chouette actual
 
-expecting success of 3070.429 'ipathmatch: no match 'foo' '**/foo'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '**/foo'
-		
-ok 429 - ipathmatch: no match 'foo' '**/foo'
+HEAD is now at 0547e3f D
+Rebasing (1/1)
Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 0547e3f... D
+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 0547e3f... # D
+[detached HEAD e986ac9] chouette!
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/branch1.
+    chouette!
+ok 29 - --continue tries to commit
 
-expecting success of 3070.430 'ipathmatch (via ls-files): no match '**/foo' 'foo'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 430 - ipathmatch (via ls-files): no match '**/foo' 'foo'
+expecting success of 3404.30 'verbose flag is heeded, even after --continue': 
+	git reset --hard primary@{1} &&
+	test_tick &&
+	test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
+	echo resolved > file1 &&
+	git add file1 &&
+	git rebase --continue > output &&
+	grep "^ file1 | 2 +-$" output
 
-expecting success of 3070.431 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 431 - cleanup after previous file test
+HEAD is now at 0547e3f D
+Changes from 6e62bf890e21973b771e4e6fc28f5ade62edb4bc to 5d18e5414f663da21d1363c271f2d684aeda7b5b:
+ file1 | 2 +-
+ file4 | 1 +
+ file5 | 1 +
+ file6 | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
+ create mode 100644 file4
+ create mode 100644 file5
+ create mode 100644 file6
+Rebasing (1/1)
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 0547e3f... D
+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 0547e3f... # D
+Successfully rebased and updated refs/heads/branch1.
+ file1 | 2 +-
+ok 30 - verbose flag is heeded, even after --continue
 
-expecting success of 3070.432 'setup match file test for XXX/foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 432 - setup match file test for XXX/foo
+expecting success of 3404.31 'multi-squash only fires up editor once': 
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="1 squash 2 squash 3 squash 4" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
+	test $base = $(git rev-parse HEAD^) &&
+	git show >output &&
+	grep ONCE output >actual &&
+	test_line_count = 1 actual
 
-expecting success of 3070.433 'wildmatch: match 'XXX/foo' '**/foo'': 
-			test-tool wildmatch wildmatch 'XXX/foo' '**/foo'
-		
-ok 433 - wildmatch: match 'XXX/foo' '**/foo'
+rebase -i script before editing:
+pick 615be62 # I
+pick 0626e8d # H
+pick 5d18e54 # G
+pick 7384ee8 # D
 
-expecting success of 3070.434 'wildmatch (via ls-files): match '**/foo' 'XXX/foo'': 
-				printf '%s' 'XXX/foo' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 434 - wildmatch (via ls-files): match '**/foo' 'XXX/foo'
+rebase -i script after editing:
+pick 615be62 # I
+squash 0626e8d # H
+squash 5d18e54 # G
+squash 7384ee8 # D
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 450e393] I
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 file5
+ create mode 100644 file6
+Successfully rebased and updated refs/heads/branch1.
+ok 31 - multi-squash only fires up editor once
 
-expecting success of 3070.435 'iwildmatch: match 'XXX/foo' '**/foo'': 
-			test-tool wildmatch iwildmatch 'XXX/foo' '**/foo'
-		
-ok 435 - iwildmatch: match 'XXX/foo' '**/foo'
+expecting success of 3404.32 'multi-fixup does not fire up editor': 
+	git checkout -b multi-fixup E &&
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="NEVER" \
+			FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
+			git rebase -i $base
+	) &&
+	test $base = $(git rev-parse HEAD^) &&
+	git show >output &&
+	! grep NEVER output &&
+	git checkout @{-1} &&
+	git branch -D multi-fixup
 
-expecting success of 3070.436 'iwildmatch (via ls-files): match '**/foo' 'XXX/foo'': 
-				printf '%s' 'XXX/foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 436 - iwildmatch (via ls-files): match '**/foo' 'XXX/foo'
+Switched to a new branch 'multi-fixup'
+rebase -i script before editing:
+pick 313fe96 # B
+pick d0f65f2 # C
+pick 0547e3f # D
+pick 8f99a4f # E
 
-expecting success of 3070.437 'pathmatch: match 'XXX/foo' '**/foo'': 
-			test-tool wildmatch pathmatch 'XXX/foo' '**/foo'
-		
-ok 437 - pathmatch: match 'XXX/foo' '**/foo'
+rebase -i script after editing:
+pick 313fe96 # B
+fixup d0f65f2 # C
+fixup 0547e3f # D
+fixup 8f99a4f # E
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/multi-fixup.
+Switched to branch 'branch1'
+Deleted branch multi-fixup (was b72b875).
+ok 32 - multi-fixup does not fire up editor
 
-expecting success of 3070.438 'pathmatch (via ls-files): match '**/foo' 'XXX/foo'': 
-				printf '%s' 'XXX/foo' >expect &&
-				git ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 438 - pathmatch (via ls-files): match '**/foo' 'XXX/foo'
+expecting success of 3404.33 'commit message used after conflict': 
+	git checkout -b conflict-fixup conflict-branch &&
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" \
+			git rebase -i $base &&
+		echo three > conflict &&
+		git add conflict &&
+		FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
+			git rebase --continue
+	) &&
+	test $base = $(git rev-parse HEAD^) &&
+	git show >output &&
+	grep ONCE output >actual &&
+	test_line_count = 1 actual &&
+	git checkout @{-1} &&
+	git branch -D conflict-fixup
 
-expecting success of 3070.439 'ipathmatch: match 'XXX/foo' '**/foo'': 
-			test-tool wildmatch ipathmatch 'XXX/foo' '**/foo'
-		
-ok 439 - ipathmatch: match 'XXX/foo' '**/foo'
+Switched to a new branch 'conflict-fixup'
+rebase -i script before editing:
+pick b895952 # one
+pick 766a798 # two
+pick 1eadf03 # three
+pick f91a2b3 # four
 
-expecting success of 3070.440 'ipathmatch (via ls-files): match '**/foo' 'XXX/foo'': 
-				printf '%s' 'XXX/foo' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 440 - ipathmatch (via ls-files): match '**/foo' 'XXX/foo'
+rebase -i script after editing:
+pick b895952 # one
+fixup 1eadf03 # three
+fixup f91a2b3 # four
+Rebasing (2/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 1eadf03... three
+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 1eadf03... # three
+[detached HEAD 0894a89] one
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+Rebasing (3/3)
Successfully rebased and updated refs/heads/conflict-fixup.
+Switched to branch 'branch1'
+Deleted branch conflict-fixup (was 72b9a95).
+ok 33 - commit message used after conflict
 
-expecting success of 3070.441 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing XXX/
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 441 - cleanup after previous file test
+expecting success of 3404.34 'commit message retained after conflict': 
+	git checkout -b conflict-squash conflict-branch &&
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 fixup 3 squash 4" \
+			git rebase -i $base &&
+		echo three > conflict &&
+		git add conflict &&
+		FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
+			git rebase --continue
+	) &&
+	test $base = $(git rev-parse HEAD^) &&
+	git show >output &&
+	grep TWICE output >actual &&
+	test_line_count = 2 actual &&
+	git checkout @{-1} &&
+	git branch -D conflict-squash
 
-expecting success of 3070.442 'setup match file test for bar/baz/foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 442 - setup match file test for bar/baz/foo
+Switched to a new branch 'conflict-squash'
+rebase -i script before editing:
+pick b895952 # one
+pick 766a798 # two
+pick 1eadf03 # three
+pick f91a2b3 # four
 
-expecting success of 3070.443 'wildmatch: match 'bar/baz/foo' '**/foo'': 
-			test-tool wildmatch wildmatch 'bar/baz/foo' '**/foo'
-		
-ok 443 - wildmatch: match 'bar/baz/foo' '**/foo'
+rebase -i script after editing:
+pick b895952 # one
+fixup 1eadf03 # three
+squash f91a2b3 # four
+Rebasing (2/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 1eadf03... three
+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 1eadf03... # three
+[detached HEAD f044f69] one
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+Rebasing (3/3)
[detached HEAD e98a2cf] one
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+Successfully rebased and updated refs/heads/conflict-squash.
+Switched to branch 'branch1'
+Deleted branch conflict-squash (was e98a2cf).
+ok 34 - commit message retained after conflict
 
-expecting success of 3070.444 'wildmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
-				printf '%s' 'bar/baz/foo' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 444 - wildmatch (via ls-files): match '**/foo' 'bar/baz/foo'
+expecting success of 3404.35 'squash and fixup generate correct log messages': 
+	cat >expect-squash-fixup <<-\EOF &&
+	B
 
-expecting success of 3070.445 'iwildmatch: match 'bar/baz/foo' '**/foo'': 
-			test-tool wildmatch iwildmatch 'bar/baz/foo' '**/foo'
-		
-ok 445 - iwildmatch: match 'bar/baz/foo' '**/foo'
+	D
 
-expecting success of 3070.446 'iwildmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
-				printf '%s' 'bar/baz/foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 446 - iwildmatch (via ls-files): match '**/foo' 'bar/baz/foo'
+	ONCE
+	EOF
+	git checkout -b squash-fixup E &&
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
+	git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
+	test_cmp expect-squash-fixup actual-squash-fixup &&
+	git cat-file commit HEAD@{2} >actual &&
+	grep "^# This is a combination of 3 commits\." actual &&
+	git cat-file commit HEAD@{3} >actual &&
+	grep "^# This is a combination of 2 commits\." actual  &&
+	git checkout @{-1} &&
+	git branch -D squash-fixup
 
-expecting success of 3070.447 'pathmatch: match 'bar/baz/foo' '**/foo'': 
-			test-tool wildmatch pathmatch 'bar/baz/foo' '**/foo'
-		
-ok 447 - pathmatch: match 'bar/baz/foo' '**/foo'
+Switched to a new branch 'squash-fixup'
+rebase -i script before editing:
+pick 313fe96 # B
+pick d0f65f2 # C
+pick 0547e3f # D
+pick 8f99a4f # E
 
-expecting success of 3070.448 'pathmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
-				printf '%s' 'bar/baz/foo' >expect &&
-				git ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 448 - pathmatch (via ls-files): match '**/foo' 'bar/baz/foo'
+rebase -i script after editing:
+pick 313fe96 # B
+fixup d0f65f2 # C
+squash 0547e3f # D
+fixup 8f99a4f # E
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 2e14af9] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+ create mode 100644 file3
+Successfully rebased and updated refs/heads/squash-fixup.
+# This is a combination of 3 commits.
+# This is a combination of 2 commits.
+Switched to branch 'branch1'
+Deleted branch squash-fixup (was 2e14af9).
+ok 35 - squash and fixup generate correct log messages
 
-expecting success of 3070.449 'ipathmatch: match 'bar/baz/foo' '**/foo'': 
-			test-tool wildmatch ipathmatch 'bar/baz/foo' '**/foo'
-		
-ok 449 - ipathmatch: match 'bar/baz/foo' '**/foo'
+expecting success of 3404.36 'squash ignores comments': 
+	git checkout -b skip-comments E &&
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
+	test $base = $(git rev-parse HEAD^) &&
+	git show >output &&
+	grep ONCE output >actual &&
+	test_line_count = 1 actual &&
+	git checkout @{-1} &&
+	git branch -D skip-comments
 
-expecting success of 3070.450 'ipathmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
-				printf '%s' 'bar/baz/foo' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 450 - ipathmatch (via ls-files): match '**/foo' 'bar/baz/foo'
+Switched to a new branch 'skip-comments'
+rebase -i script before editing:
+pick 313fe96 # B
+pick d0f65f2 # C
+pick 0547e3f # D
+pick 8f99a4f # E
 
-expecting success of 3070.451 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing bar/
-Removing expect
-ok 451 - cleanup after previous file test
+rebase -i script after editing:
+# comment
+pick 313fe96 # B
+# comment
+squash d0f65f2 # C
+# comment
+squash 0547e3f # D
+# comment
+squash 8f99a4f # E
+# comment
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD c7441e9] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+ create mode 100644 file3
+Successfully rebased and updated refs/heads/skip-comments.
+Switched to branch 'branch1'
+Deleted branch skip-comments (was c7441e9).
+ok 36 - squash ignores comments
 
-expecting success of 3070.452 'setup match file test for bar/baz/foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 452 - setup match file test for bar/baz/foo
+expecting success of 3404.37 'squash ignores blank lines': 
+	git checkout -b skip-blank-lines E &&
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
+	test $base = $(git rev-parse HEAD^) &&
+	git show >output &&
+	grep ONCE output >actual &&
+	test_line_count = 1 actual &&
+	git checkout @{-1} &&
+	git branch -D skip-blank-lines
 
-expecting success of 3070.453 'wildmatch: no match 'bar/baz/foo' '*/foo'': 
-			test_must_fail test-tool wildmatch wildmatch 'bar/baz/foo' '*/foo'
-		
-ok 453 - wildmatch: no match 'bar/baz/foo' '*/foo'
+Switched to a new branch 'skip-blank-lines'
+rebase -i script before editing:
+pick 313fe96 # B
+pick d0f65f2 # C
+pick 0547e3f # D
+pick 8f99a4f # E
 
-expecting success of 3070.454 'wildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 454 - wildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'
+rebase -i script after editing:
 
-expecting success of 3070.455 'iwildmatch: no match 'bar/baz/foo' '*/foo'': 
-			test_must_fail test-tool wildmatch iwildmatch 'bar/baz/foo' '*/foo'
-		
-ok 455 - iwildmatch: no match 'bar/baz/foo' '*/foo'
+pick 313fe96 # B
 
-expecting success of 3070.456 'iwildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 456 - iwildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'
+squash d0f65f2 # C
 
-expecting success of 3070.457 'pathmatch: match 'bar/baz/foo' '*/foo'': 
-			test-tool wildmatch pathmatch 'bar/baz/foo' '*/foo'
-		
-ok 457 - pathmatch: match 'bar/baz/foo' '*/foo'
+squash 0547e3f # D
 
-expecting success of 3070.458 'pathmatch (via ls-files): match '*/foo' 'bar/baz/foo'': 
-				printf '%s' 'bar/baz/foo' >expect &&
-				git ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 458 - pathmatch (via ls-files): match '*/foo' 'bar/baz/foo'
+squash 8f99a4f # E
 
-expecting success of 3070.459 'ipathmatch: match 'bar/baz/foo' '*/foo'': 
-			test-tool wildmatch ipathmatch 'bar/baz/foo' '*/foo'
-		
-ok 459 - ipathmatch: match 'bar/baz/foo' '*/foo'
+Rebasing (3/4)
Rebasing (4/4)
Rebasing (5/4)
[detached HEAD c7441e9] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+ create mode 100644 file3
+Successfully rebased and updated refs/heads/skip-blank-lines.
+Switched to branch 'branch1'
+Deleted branch skip-blank-lines (was c7441e9).
+ok 37 - squash ignores blank lines
 
-expecting success of 3070.460 'ipathmatch (via ls-files): match '*/foo' 'bar/baz/foo'': 
-				printf '%s' 'bar/baz/foo' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 460 - ipathmatch (via ls-files): match '*/foo' 'bar/baz/foo'
+expecting success of 3404.38 'squash works as expected': 
+	git checkout -b squash-works no-conflict-branch &&
+	one=$(git rev-parse HEAD~3) &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 git rebase -i HEAD~3
+	) &&
+	test $one = $(git rev-parse HEAD~2)
 
-expecting success of 3070.461 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing bar/
-Removing expect
-ok 461 - cleanup after previous file test
+Switched to a new branch 'squash-works'
+rebase -i script before editing:
+pick 265b89e # K
+pick 6b0f5e6 # L
+pick 3389558 # M
 
-expecting success of 3070.462 'setup match file test for foo/bar/baz': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 462 - setup match file test for foo/bar/baz
+rebase -i script after editing:
+pick 265b89e # K
+s 3389558 # M
+pick 6b0f5e6 # L
+Rebasing (2/3)
[detached HEAD b352334] K
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:27:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileK
+ create mode 100644 fileM
+Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-works.
+ok 38 - squash works as expected
 
-expecting success of 3070.463 'wildmatch: no match 'foo/bar/baz' '**/bar*'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar/baz' '**/bar*'
-		
-ok 463 - wildmatch: no match 'foo/bar/baz' '**/bar*'
+expecting success of 3404.39 'interrupted squash works as expected': 
+	git checkout -b interrupted-squash conflict-branch &&
+	one=$(git rev-parse HEAD~3) &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 squash 3 2" \
+			git rebase -i HEAD~3
+	) &&
+	test_write_lines one two four > conflict &&
+	git add conflict &&
+	test_must_fail git rebase --continue &&
+	echo resolved > conflict &&
+	git add conflict &&
+	git rebase --continue &&
+	test $one = $(git rev-parse HEAD~2)
 
-expecting success of 3070.464 'wildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 464 - wildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'
+Switched to a new branch 'interrupted-squash'
+rebase -i script before editing:
+pick 766a798 # two
+pick 1eadf03 # three
+pick f91a2b3 # four
 
-expecting success of 3070.465 'iwildmatch: no match 'foo/bar/baz' '**/bar*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar/baz' '**/bar*'
-		
-ok 465 - iwildmatch: no match 'foo/bar/baz' '**/bar*'
+rebase -i script after editing:
+pick 766a798 # two
+squash f91a2b3 # four
+pick 1eadf03 # three
+Rebasing (2/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply f91a2b3... four
+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 f91a2b3... # four
+[detached HEAD a2f4578] two
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Rebasing (3/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 1eadf03... three
+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 1eadf03... # three
+[detached HEAD 6b76c65] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+Successfully rebased and updated refs/heads/interrupted-squash.
+ok 39 - interrupted squash works as expected
 
-expecting success of 3070.466 'iwildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 466 - iwildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'
+expecting success of 3404.40 'interrupted squash works as expected (case 2)': 
+	git checkout -b interrupted-squash2 conflict-branch &&
+	one=$(git rev-parse HEAD~3) &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="3 squash 1 2" \
+			git rebase -i HEAD~3
+	) &&
+	test_write_lines one four > conflict &&
+	git add conflict &&
+	test_must_fail git rebase --continue &&
+	test_write_lines one two four > conflict &&
+	git add conflict &&
+	test_must_fail git rebase --continue &&
+	echo resolved > conflict &&
+	git add conflict &&
+	git rebase --continue &&
+	test $one = $(git rev-parse HEAD~2)
 
-expecting success of 3070.467 'pathmatch: match 'foo/bar/baz' '**/bar*'': 
-			test-tool wildmatch pathmatch 'foo/bar/baz' '**/bar*'
-		
-ok 467 - pathmatch: match 'foo/bar/baz' '**/bar*'
+Switched to a new branch 'interrupted-squash2'
+rebase -i script before editing:
+pick 766a798 # two
+pick 1eadf03 # three
+pick f91a2b3 # four
 
-expecting success of 3070.468 'pathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'': 
-				printf '%s' 'foo/bar/baz' >expect &&
-				git ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 468 - pathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'
+rebase -i script after editing:
+pick f91a2b3 # four
+squash 766a798 # two
+pick 1eadf03 # three
+Rebasing (1/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply f91a2b3... four
+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 f91a2b3... # four
+[detached HEAD d1badcc] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 766a798... 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 766a798... # two
+[detached HEAD 13f7405] four
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:25:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Rebasing (3/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 1eadf03... three
+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 1eadf03... # three
+[detached HEAD 6785ad5] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+Successfully rebased and updated refs/heads/interrupted-squash2.
+ok 40 - interrupted squash works as expected (case 2)
 
-expecting success of 3070.469 'ipathmatch: match 'foo/bar/baz' '**/bar*'': 
-			test-tool wildmatch ipathmatch 'foo/bar/baz' '**/bar*'
-		
-ok 469 - ipathmatch: match 'foo/bar/baz' '**/bar*'
+expecting success of 3404.41 '--continue tries to commit, even for "edit"': 
+	echo unrelated > file7 &&
+	git add file7 &&
+	test_tick &&
+	git commit -m "unrelated change" &&
+	parent=$(git rev-parse HEAD^) &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		echo edited > file7 &&
+		git add file7 &&
+		FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
+	) &&
+	test edited = $(git show HEAD:file7) &&
+	git show HEAD >actual &&
+	grep chouette actual &&
+	test $parent = $(git rev-parse HEAD^)
 
-expecting success of 3070.470 'ipathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'': 
-				printf '%s' 'foo/bar/baz' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 470 - ipathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'
+[interrupted-squash2 98947cc] unrelated change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+rebase -i script before editing:
+pick 98947cc # unrelated change
 
-expecting success of 3070.471 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 471 - cleanup after previous file test
+rebase -i script after editing:
+edit 98947cc # unrelated change
+Rebasing (1/1)
Stopped at 98947cc...  # unrelated change
+You can amend the commit now, with
 
-expecting success of 3070.472 'setup match file test for deep/foo/bar/baz': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 472 - setup match file test for deep/foo/bar/baz
+  git commit --amend 
 
-expecting success of 3070.473 'wildmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
-			test-tool wildmatch wildmatch 'deep/foo/bar/baz' '**/bar/*'
-		
-ok 473 - wildmatch: match 'deep/foo/bar/baz' '**/bar/*'
+Once you are satisfied with your changes, run
 
-expecting success of 3070.474 'wildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
-				printf '%s' 'deep/foo/bar/baz' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 474 - wildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
+  git rebase --continue
+[detached HEAD 9483ccd] chouette!
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:39:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+Successfully rebased and updated refs/heads/interrupted-squash2.
+    chouette!
+ok 41 - --continue tries to commit, even for "edit"
 
-expecting success of 3070.475 'iwildmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
-			test-tool wildmatch iwildmatch 'deep/foo/bar/baz' '**/bar/*'
-		
-ok 475 - iwildmatch: match 'deep/foo/bar/baz' '**/bar/*'
+expecting success of 3404.42 'aborted --continue does not squash commits after "edit"': 
+	old=$(git rev-parse HEAD) &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		echo "edited again" > file7 &&
+		git add file7 &&
+		test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue
+	) &&
+	test $old = $(git rev-parse HEAD) &&
+	git rebase --abort
 
-expecting success of 3070.476 'iwildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
-				printf '%s' 'deep/foo/bar/baz' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 476 - iwildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
+rebase -i script before editing:
+pick 9483ccd # chouette!
 
-expecting success of 3070.477 'pathmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz' '**/bar/*'
-		
-ok 477 - pathmatch: match 'deep/foo/bar/baz' '**/bar/*'
+rebase -i script after editing:
+edit 9483ccd # chouette!
+Rebasing (1/1)
Stopped at 9483ccd...  # chouette!
+You can amend the commit now, with
 
-expecting success of 3070.478 'pathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
-				printf '%s' 'deep/foo/bar/baz' >expect &&
-				git ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 478 - pathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
+  git commit --amend 
 
-expecting success of 3070.479 'ipathmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz' '**/bar/*'
-		
-ok 479 - ipathmatch: match 'deep/foo/bar/baz' '**/bar/*'
+Once you are satisfied with your changes, run
 
-expecting success of 3070.480 'ipathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
-				printf '%s' 'deep/foo/bar/baz' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 480 - ipathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
+  git rebase --continue
+Aborting commit due to empty commit message.
+error: could not commit staged changes.
+ok 42 - aborted --continue does not squash commits after "edit"
 
-expecting success of 3070.481 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing deep/
-Removing expect
-ok 481 - cleanup after previous file test
+expecting success of 3404.43 'auto-amend only edited commits after "edit"': 
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		echo "edited again" > file7 &&
+		git add file7 &&
+		FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
+		echo "and again" > file7 &&
+		git add file7 &&
+		test_tick &&
+		test_must_fail env FAKE_COMMIT_MESSAGE="and again" \
+			git rebase --continue
+	) &&
+	git rebase --abort
 
-expecting success of 3070.482 'setup match file test for deep/foo/bar/baz/': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 482 - setup match file test for deep/foo/bar/baz/
+rebase -i script before editing:
+pick 9483ccd # chouette!
 
-expecting success of 3070.483 'wildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar/baz/' '**/bar/*'
-		
-ok 483 - wildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'
+rebase -i script after editing:
+edit 9483ccd # chouette!
+Rebasing (1/1)
Stopped at 9483ccd...  # chouette!
+You can amend the commit now, with
 
-checking known breakage of 3070.484 'wildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/'': false
-not ok 484 - wildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+  git commit --amend 
 
-expecting success of 3070.485 'iwildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar/baz/' '**/bar/*'
-		
-ok 485 - iwildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'
+Once you are satisfied with your changes, run
 
-checking known breakage of 3070.486 'iwildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/'': false
-not ok 486 - iwildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+  git rebase --continue
+[detached HEAD 9b7064d] edited file7 again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: 
+You have uncommitted changes in your working tree. Please, commit them
+first and then run 'git rebase --continue' again.
+ok 43 - auto-amend only edited commits after "edit"
 
-expecting success of 3070.487 'pathmatch: match 'deep/foo/bar/baz/' '**/bar/*'': 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz/' '**/bar/*'
-		
-ok 487 - pathmatch: match 'deep/foo/bar/baz/' '**/bar/*'
+expecting success of 3404.44 'clean error after failed "exec"': 
+	test_tick &&
+	test_when_finished "git rebase --abort || :" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^
+	) &&
+	echo "edited again" > file7 &&
+	git add file7 &&
+	test_must_fail git rebase --continue 2>error &&
+	test_grep "you have staged changes in your working tree" error &&
+	test_grep ! "could not open.*for reading" error
 
-checking known breakage of 3070.488 'pathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/'': false
-not ok 488 - pathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+rebase -i script before editing:
+pick 9483ccd # chouette!
 
-expecting success of 3070.489 'ipathmatch: match 'deep/foo/bar/baz/' '**/bar/*'': 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/' '**/bar/*'
-		
-ok 489 - ipathmatch: match 'deep/foo/bar/baz/' '**/bar/*'
+rebase -i script after editing:
+pick 9483ccd # chouette!
+exec false
+Rebasing (2/2)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
 
-checking known breakage of 3070.490 'ipathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/'': false
-not ok 490 - ipathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+  git rebase --continue
 
-expecting success of 3070.491 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-ok 491 - cleanup after previous file test
 
-expecting success of 3070.492 'setup match file test for deep/foo/bar/baz/': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 492 - setup match file test for deep/foo/bar/baz/
+error: you have staged changes in your working tree
+ok 44 - clean error after failed "exec"
 
-expecting success of 3070.493 'wildmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
-			test-tool wildmatch wildmatch 'deep/foo/bar/baz/' '**/bar/**'
-		
-ok 493 - wildmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+expecting success of 3404.45 'rebase a detached HEAD': 
+	grandparent=$(git rev-parse HEAD~2) &&
+	git checkout $(git rev-parse HEAD) &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1" git rebase -i HEAD~2
+	) &&
+	test $grandparent = $(git rev-parse HEAD~2)
 
-checking known breakage of 3070.494 'wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
-not ok 494 - wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+Note: switching to '9483ccdd3462028242a62a4b10b5300681f344d7'.
 
-expecting success of 3070.495 'iwildmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
-			test-tool wildmatch iwildmatch 'deep/foo/bar/baz/' '**/bar/**'
-		
-ok 495 - iwildmatch: match 'deep/foo/bar/baz/' '**/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.
 
-checking known breakage of 3070.496 'iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
-not ok 496 - iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # 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 3070.497 'pathmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz/' '**/bar/**'
-		
-ok 497 - pathmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+  git switch -c <new-branch-name>
 
-checking known breakage of 3070.498 'pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
-not ok 498 - pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+Or undo this operation with:
 
-expecting success of 3070.499 'ipathmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/' '**/bar/**'
-		
-ok 499 - ipathmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+  git switch -
 
-checking known breakage of 3070.500 'ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
-not ok 500 - ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.501 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-ok 501 - cleanup after previous file test
+HEAD is now at 9483ccd chouette!
+rebase -i script before editing:
+pick 6785ad5 # three
+pick 9483ccd # chouette!
 
-expecting success of 3070.502 'setup match file test for deep/foo/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 502 - setup match file test for deep/foo/bar
+rebase -i script after editing:
+pick 9483ccd # chouette!
+pick 6785ad5 # three
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 45 - rebase a detached HEAD
 
-expecting success of 3070.503 'wildmatch: no match 'deep/foo/bar' '**/bar/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar' '**/bar/*'
-		
-ok 503 - wildmatch: no match 'deep/foo/bar' '**/bar/*'
+expecting success of 3404.46 'rebase a commit violating pre-commit': 
+	test_hook pre-commit <<-\EOF &&
+	test -z "$(git diff --cached --check)"
+	EOF
+	echo "monde! " >> file1 &&
+	test_tick &&
+	test_must_fail git commit -m doesnt-verify file1 &&
+	git commit -m doesnt-verify --no-verify file1 &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES=2 git rebase -i HEAD~2
+	)
 
-expecting success of 3070.504 'wildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 504 - wildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
+[detached HEAD c2de550] doesnt-verify
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+rebase -i script before editing:
+pick 2a5c937 # three
+pick c2de550 # doesnt-verify
 
-expecting success of 3070.505 'iwildmatch: no match 'deep/foo/bar' '**/bar/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar' '**/bar/*'
-		
-ok 505 - iwildmatch: no match 'deep/foo/bar' '**/bar/*'
+rebase -i script after editing:
+pick c2de550 # doesnt-verify
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 46 - rebase a commit violating pre-commit
 
-expecting success of 3070.506 'iwildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 506 - iwildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
+expecting success of 3404.47 'rebase with a file named HEAD in worktree': 
+	git reset --hard &&
+	git checkout -b branch3 A &&
 
-expecting success of 3070.507 'pathmatch: no match 'deep/foo/bar' '**/bar/*'': 
-			test_must_fail test-tool wildmatch pathmatch 'deep/foo/bar' '**/bar/*'
-		
-ok 507 - pathmatch: no match 'deep/foo/bar' '**/bar/*'
+	(
+		GIT_AUTHOR_NAME="Squashed Away" &&
+		export GIT_AUTHOR_NAME &&
+		>HEAD &&
+		git add HEAD &&
+		git commit -m "Add head" &&
+		>BODY &&
+		git add BODY &&
+		git commit -m "Add body"
+	) &&
 
-expecting success of 3070.508 'pathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
-				>expect &&
-				git ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 508 - pathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 squash 2" git rebase -i @{-1}
+	) &&
+	test "$(git show -s --pretty=format:%an)" = "Squashed Away"
 
-expecting success of 3070.509 'ipathmatch: no match 'deep/foo/bar' '**/bar/*'': 
-			test_must_fail test-tool wildmatch ipathmatch 'deep/foo/bar' '**/bar/*'
-		
-ok 509 - ipathmatch: no match 'deep/foo/bar' '**/bar/*'
 
-expecting success of 3070.510 'ipathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 510 - ipathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
+HEAD is now at 772e3c6 doesnt-verify
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 3070.511 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing deep/
-Removing expect
-ok 511 - cleanup after previous file test
+  772e3c6 doesnt-verify
+  82d2839 chouette!
 
-expecting success of 3070.512 'setup match file test for deep/foo/bar/': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 512 - setup match file test for deep/foo/bar/
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3070.513 'wildmatch: match 'deep/foo/bar/' '**/bar/**'': 
-			test-tool wildmatch wildmatch 'deep/foo/bar/' '**/bar/**'
-		
-ok 513 - wildmatch: match 'deep/foo/bar/' '**/bar/**'
+ git branch <new-branch-name> 772e3c6
 
-checking known breakage of 3070.514 'wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
-not ok 514 - wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+Switched to a new branch 'branch3'
+[branch3 838aee5] Add head
+ Author: Squashed Away <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 HEAD
+[branch3 271c26d] Add body
+ Author: Squashed Away <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 BODY
+rebase -i script before editing:
+pick 838aee5 # Add head
+pick 271c26d # Add body
 
-expecting success of 3070.515 'iwildmatch: match 'deep/foo/bar/' '**/bar/**'': 
-			test-tool wildmatch iwildmatch 'deep/foo/bar/' '**/bar/**'
-		
-ok 515 - iwildmatch: match 'deep/foo/bar/' '**/bar/**'
+rebase -i script after editing:
+pick 838aee5 # Add head
+squash 271c26d # Add body
+Rebasing (1/2)
Rebasing (2/2)
[detached HEAD b224944] Add head
+ Author: Squashed Away <author@example.com>
+ Date: Thu Apr 7 15:46:13 2005 -0700
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 BODY
+ create mode 100644 HEAD
+Successfully rebased and updated refs/heads/branch3.
+ok 47 - rebase with a file named HEAD in worktree
 
-checking known breakage of 3070.516 'iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
-not ok 516 - iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+expecting success of 3404.48 'do "noop" when there is nothing to cherry-pick': 
 
-expecting success of 3070.517 'pathmatch: match 'deep/foo/bar/' '**/bar/**'': 
-			test-tool wildmatch pathmatch 'deep/foo/bar/' '**/bar/**'
-		
-ok 517 - pathmatch: match 'deep/foo/bar/' '**/bar/**'
+	git checkout -b branch4 HEAD &&
+	GIT_EDITOR=: git commit --amend \
+		--author="Somebody else <somebody@else.com>" &&
+	test $(git rev-parse branch3) != $(git rev-parse branch4) &&
+	git rebase -i branch3 &&
+	test_cmp_rev branch3 branch4
 
-checking known breakage of 3070.518 'pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
-not ok 518 - pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
 
-expecting success of 3070.519 'ipathmatch: match 'deep/foo/bar/' '**/bar/**'': 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/' '**/bar/**'
-		
-ok 519 - ipathmatch: match 'deep/foo/bar/' '**/bar/**'
+Switched to a new branch 'branch4'
+[branch4 beb8dd6] Add head
+ Author: Somebody else <somebody@else.com>
+ Date: Thu Apr 7 15:46:13 2005 -0700
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 BODY
+ create mode 100644 HEAD
+warning: skipped previously applied commit beb8dd6
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Successfully rebased and updated refs/heads/branch4.
+ok 48 - do "noop" when there is nothing to cherry-pick
 
-checking known breakage of 3070.520 'ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
-not ok 520 - ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+expecting success of 3404.49 'submodule rebase setup': 
+	git checkout A &&
+	mkdir sub &&
+	(
+		cd sub && git init && >elif &&
+		git add elif && git commit -m "submodule initial"
+	) &&
+	echo 1 >file1 &&
+	git add file1 sub &&
+	test_tick &&
+	git commit -m "One" &&
+	echo 2 >file1 &&
+	test_tick &&
+	git commit -a -m "Two" &&
+	(
+		cd sub && echo 3 >elif &&
+		git commit -a -m "submodule second"
+	) &&
+	test_tick &&
+	git commit -a -m "Three changes submodule"
 
-expecting success of 3070.521 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-ok 521 - cleanup after previous file test
+Note: switching to 'A'.
 
-expecting success of 3070.522 'setup match file test for foo/bar/baz': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 522 - setup match file test for foo/bar/baz
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 3070.523 'wildmatch: no match 'foo/bar/baz' '**/bar**'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar/baz' '**/bar**'
-		
-ok 523 - wildmatch: no match 'foo/bar/baz' '**/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:
 
-expecting success of 3070.524 'wildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 524 - wildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'
+  git switch -c <new-branch-name>
 
-expecting success of 3070.525 'iwildmatch: no match 'foo/bar/baz' '**/bar**'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar/baz' '**/bar**'
-		
-ok 525 - iwildmatch: no match 'foo/bar/baz' '**/bar**'
+Or undo this operation with:
 
-expecting success of 3070.526 'iwildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 526 - iwildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'
+  git switch -
 
-expecting success of 3070.527 'pathmatch: match 'foo/bar/baz' '**/bar**'': 
-			test-tool wildmatch pathmatch 'foo/bar/baz' '**/bar**'
-		
-ok 527 - pathmatch: match 'foo/bar/baz' '**/bar**'
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.528 'pathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'': 
-				printf '%s' 'foo/bar/baz' >expect &&
-				git ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 528 - pathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'
+HEAD is now at 6e62bf8 A
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive/sub/.git/
+[master (root-commit) 6795896] submodule initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 elif
+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"
+[detached HEAD 068ccfe] One
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 160000 sub
+[detached HEAD 8cd1639] Two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 628e79e] submodule second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD d80ae32] Three changes submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 49 - submodule rebase setup
 
-expecting success of 3070.529 'ipathmatch: match 'foo/bar/baz' '**/bar**'': 
-			test-tool wildmatch ipathmatch 'foo/bar/baz' '**/bar**'
-		
-ok 529 - ipathmatch: match 'foo/bar/baz' '**/bar**'
+expecting success of 3404.50 'submodule rebase -i': 
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 squash 2 3" git rebase -i A
+	)
 
-expecting success of 3070.530 'ipathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'': 
-				printf '%s' 'foo/bar/baz' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 530 - ipathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'
+rebase -i script before editing:
+pick 068ccfe # One
+pick 8cd1639 # Two
+pick d80ae32 # Three changes submodule
 
-expecting success of 3070.531 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 531 - cleanup after previous file test
+rebase -i script after editing:
+pick 068ccfe # One
+squash 8cd1639 # Two
+pick d80ae32 # Three changes submodule
+Rebasing (2/3)
[detached HEAD 1dab715] One
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:47:13 2005 -0700
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 160000 sub
+Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 50 - submodule rebase -i
 
-expecting success of 3070.532 'setup match file test for foo/bar/baz/x': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 532 - setup match file test for foo/bar/baz/x
+expecting success of 3404.51 'submodule conflict setup': 
+	git tag submodule-base &&
+	git checkout HEAD^ &&
+	(
+		cd sub && git checkout HEAD^ && echo 4 >elif &&
+		git add elif && git commit -m "submodule conflict"
+	) &&
+	git add sub &&
+	test_tick &&
+	git commit -m "Conflict in submodule" &&
+	git tag submodule-topic
 
-expecting success of 3070.533 'wildmatch: match 'foo/bar/baz/x' '*/bar/**'': 
-			test-tool wildmatch wildmatch 'foo/bar/baz/x' '*/bar/**'
-		
-ok 533 - wildmatch: match 'foo/bar/baz/x' '*/bar/**'
+Previous HEAD position was b1c1bea Three changes submodule
+HEAD is now at 1dab715 One
+M	sub
+Note: switching to 'HEAD^'.
 
-expecting success of 3070.534 'wildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
-				printf '%s' 'foo/bar/baz/x' >expect &&
-				git --glob-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 534 - wildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/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.
 
-expecting success of 3070.535 'iwildmatch: match 'foo/bar/baz/x' '*/bar/**'': 
-			test-tool wildmatch iwildmatch 'foo/bar/baz/x' '*/bar/**'
-		
-ok 535 - iwildmatch: match 'foo/bar/baz/x' '*/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:
 
-expecting success of 3070.536 'iwildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
-				printf '%s' 'foo/bar/baz/x' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 536 - iwildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
+  git switch -c <new-branch-name>
 
-expecting success of 3070.537 'pathmatch: match 'foo/bar/baz/x' '*/bar/**'': 
-			test-tool wildmatch pathmatch 'foo/bar/baz/x' '*/bar/**'
-		
-ok 537 - pathmatch: match 'foo/bar/baz/x' '*/bar/**'
+Or undo this operation with:
 
-expecting success of 3070.538 'pathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
-				printf '%s' 'foo/bar/baz/x' >expect &&
-				git ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 538 - pathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
+  git switch -
 
-expecting success of 3070.539 'ipathmatch: match 'foo/bar/baz/x' '*/bar/**'': 
-			test-tool wildmatch ipathmatch 'foo/bar/baz/x' '*/bar/**'
-		
-ok 539 - ipathmatch: match 'foo/bar/baz/x' '*/bar/**'
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.540 'ipathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
-				printf '%s' 'foo/bar/baz/x' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 540 - ipathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
+HEAD is now at 6795896 submodule initial
+[detached HEAD c3aa4c8] submodule conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD 2f8239b] Conflict in submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 51 - submodule conflict setup
 
-expecting success of 3070.541 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 541 - cleanup after previous file test
+expecting success of 3404.52 'rebase -i continue with only submodule staged': 
+	test_must_fail git rebase -i submodule-base &&
+	git add sub &&
+	git rebase --continue &&
+	test $(git rev-parse submodule-base) != $(git rev-parse HEAD)
 
-expecting success of 3070.542 'setup match file test for deep/foo/bar/baz/x': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 542 - setup match file test for deep/foo/bar/baz/x
+Rebasing (1/1)
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 c3aa4c8
+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
+CONFLICT (submodule): Merge conflict in sub
+error: could not apply 2f8239b... Conflict in submodule
+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 2f8239b... # Conflict in submodule
+[detached HEAD e05ea42] Conflict in submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated detached HEAD.
+ok 52 - rebase -i continue with only submodule staged
 
-expecting success of 3070.543 'wildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'': 
-			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar/baz/x' '*/bar/**'
-		
-ok 543 - wildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'
+expecting success of 3404.53 'rebase -i continue with unstaged submodule': 
+	git checkout submodule-topic &&
+	git reset --hard &&
+	test_must_fail git rebase -i submodule-base &&
+	git reset &&
+	git rebase --continue &&
+	test_cmp_rev submodule-base HEAD
 
-expecting success of 3070.544 'wildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 544 - wildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.545 'iwildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'': 
-			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar/baz/x' '*/bar/**'
-		
-ok 545 - iwildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'
+  e05ea42 Conflict in submodule
 
-expecting success of 3070.546 'iwildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 546 - iwildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3070.547 'pathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'': 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz/x' '*/bar/**'
-		
-ok 547 - pathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'
+ git branch <new-branch-name> e05ea42
 
-expecting success of 3070.548 'pathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'': 
-				printf '%s' 'deep/foo/bar/baz/x' >expect &&
-				git ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 548 - pathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'
+HEAD is now at 2f8239b Conflict in submodule
+HEAD is now at 2f8239b Conflict in submodule
+Rebasing (1/1)
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 c3aa4c8
+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
+CONFLICT (submodule): Merge conflict in sub
+error: could not apply 2f8239b... Conflict in submodule
+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 2f8239b... # Conflict in submodule
+Unstaged changes after reset:
+M	sub
+Successfully rebased and updated detached HEAD.
+ok 53 - rebase -i continue with unstaged submodule
 
-expecting success of 3070.549 'ipathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'': 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/x' '*/bar/**'
-		
-ok 549 - ipathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'
+expecting success of 3404.54 'avoid unnecessary reset': 
+	git checkout primary &&
+	git reset --hard &&
+	test-tool chmtime =123456789 file3 &&
+	git update-index --refresh &&
+	HEAD=$(git rev-parse HEAD) &&
+	git rebase -i HEAD~4 &&
+	test $HEAD = $(git rev-parse HEAD) &&
+	MTIME=$(test-tool chmtime --get file3) &&
+	test 123456789 = $MTIME
 
-expecting success of 3070.550 'ipathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'': 
-				printf '%s' 'deep/foo/bar/baz/x' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 550 - ipathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'
+warning: unable to rmdir 'sub': Directory not empty
+Previous HEAD position was b1c1bea Three changes submodule
+Switched to branch 'primary'
+HEAD is now at 8f99a4f E
+Successfully rebased and updated refs/heads/primary.
+ok 54 - avoid unnecessary reset
 
-expecting success of 3070.551 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing deep/
-Removing expect
-ok 551 - cleanup after previous file test
+expecting success of 3404.55 'reword': 
+	git checkout -b reword-branch primary &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" \
+			git rebase -i A &&
+		git show HEAD >actual &&
+		grep "E changed" actual &&
+		test $(git rev-parse primary) != $(git rev-parse HEAD) &&
+		test_cmp_rev primary^ HEAD^ &&
+		FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" \
+			git rebase -i A &&
+		git show HEAD^ >actual &&
+		grep "D changed" actual &&
+		FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" \
+			git rebase -i A &&
+		git show HEAD~3 >actual &&
+		grep "B changed" actual &&
+		FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" \
+			git rebase -i A
+	) &&
+	git show HEAD~2 >actual &&
+	grep "C changed" actual
 
-expecting success of 3070.552 'setup match file test for deep/foo/bar/baz/x': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 552 - setup match file test for deep/foo/bar/baz/x
+Switched to a new branch 'reword-branch'
+rebase -i script before editing:
+pick 313fe96 # B
+pick d0f65f2 # C
+pick 0547e3f # D
+pick 8f99a4f # E
 
-expecting success of 3070.553 'wildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
-			test-tool wildmatch wildmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
-		
-ok 553 - wildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+rebase -i script after editing:
+pick 313fe96 # B
+pick d0f65f2 # C
+pick 0547e3f # D
+reword 8f99a4f # E
+Rebasing (4/4)
[detached HEAD 7045bc0] E changed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Successfully rebased and updated refs/heads/reword-branch.
+    E changed
+rebase -i script before editing:
+pick 313fe96 # B
+pick d0f65f2 # C
+pick 0547e3f # D
+pick 7045bc0 # E changed
 
-expecting success of 3070.554 'wildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
-				printf '%s' 'deep/foo/bar/baz/x' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 554 - wildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
+rebase -i script after editing:
+pick 313fe96 # B
+pick d0f65f2 # C
+reword 0547e3f # D
+pick 7045bc0 # E changed
+Rebasing (3/4)
[detached HEAD ffc34d0] D changed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (4/4)
Successfully rebased and updated refs/heads/reword-branch.
+    D changed
+rebase -i script before editing:
+pick 313fe96 # B
+pick d0f65f2 # C
+pick ffc34d0 # D changed
+pick 4804c05 # E changed
 
-expecting success of 3070.555 'iwildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
-			test-tool wildmatch iwildmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
-		
-ok 555 - iwildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+rebase -i script after editing:
+reword 313fe96 # B
+pick d0f65f2 # C
+pick ffc34d0 # D changed
+pick 4804c05 # E changed
+Rebasing (1/4)
[detached HEAD ff0628d] B changed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/reword-branch.
+    B changed
+rebase -i script before editing:
+pick ff0628d # B changed
+pick e73c68c # C
+pick fb271b0 # D changed
+pick a55d41c # E changed
 
-expecting success of 3070.556 'iwildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
-				printf '%s' 'deep/foo/bar/baz/x' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 556 - iwildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
+rebase -i script after editing:
+pick ff0628d # B changed
+r e73c68c # C
+pick fb271b0 # D changed
+p a55d41c # E changed
+Rebasing (2/4)
[detached HEAD 234d360] C changed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/reword-branch.
+    C changed
+ok 55 - reword
 
-expecting success of 3070.557 'pathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
-		
-ok 557 - pathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+expecting success of 3404.56 'reword fast-forwarded empty commit': 
+	git commit --allow-empty -m "empty commit" --only &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND=edited FAKE_LINES="reword 1" \
+			git rebase -i HEAD^
+	) &&
+	test_commit_message HEAD <<-\EOF
+	empty commit
 
-expecting success of 3070.558 'pathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
-				printf '%s' 'deep/foo/bar/baz/x' >expect &&
-				git ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 558 - pathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
+	edited
+	EOF
 
-expecting success of 3070.559 'ipathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
-		
-ok 559 - ipathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+[reword-branch 52f95ec] empty commit
+ Author: A U Thor <author@example.com>
+rebase -i script before editing:
+pick 52f95ec # empty commit # empty
 
-expecting success of 3070.560 'ipathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
-				printf '%s' 'deep/foo/bar/baz/x' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 560 - ipathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
+rebase -i script after editing:
+reword 52f95ec # empty commit # empty
+Rebasing (1/1)
[detached HEAD 019411f] empty commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:50:13 2005 -0700
+Successfully rebased and updated refs/heads/reword-branch.
+ok 56 - reword fast-forwarded empty commit
 
-expecting success of 3070.561 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing deep/
-Removing expect
-ok 561 - cleanup after previous file test
+expecting success of 3404.57 'no uncommitted changes when rewording and the todo list is reloaded': 
+	git checkout E &&
+	test_when_finished "git checkout @{-1}" &&
+	(
+		set_fake_editor &&
+		GIT_SEQUENCE_EDITOR="\"$PWD/fake-editor.sh\"" &&
+		export GIT_SEQUENCE_EDITOR &&
+		set_reword_editor &&
+		FAKE_LINES="reword 1 reword 2" git rebase -i C
+	) &&
+	check_reworded_commits D E
 
-expecting success of 3070.562 'setup match file test for acrt': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 562 - setup match file test for acrt
+Note: switching to 'E'.
 
-expecting success of 3070.563 'wildmatch: no match 'acrt' 'a[c-c]st'': 
-			test_must_fail test-tool wildmatch wildmatch 'acrt' 'a[c-c]st'
-		
-ok 563 - wildmatch: no match 'acrt' 'a[c-c]st'
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 3070.564 'wildmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 564 - wildmatch (via ls-files): no match 'a[c-c]st' 'acrt'
+If you want to 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 3070.565 'iwildmatch: no match 'acrt' 'a[c-c]st'': 
-			test_must_fail test-tool wildmatch iwildmatch 'acrt' 'a[c-c]st'
-		
-ok 565 - iwildmatch: no match 'acrt' 'a[c-c]st'
+  git switch -c <new-branch-name>
 
-expecting success of 3070.566 'iwildmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 566 - iwildmatch (via ls-files): no match 'a[c-c]st' 'acrt'
+Or undo this operation with:
 
-expecting success of 3070.567 'pathmatch: no match 'acrt' 'a[c-c]st'': 
-			test_must_fail test-tool wildmatch pathmatch 'acrt' 'a[c-c]st'
-		
-ok 567 - pathmatch: no match 'acrt' 'a[c-c]st'
+  git switch -
 
-expecting success of 3070.568 'pathmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
-				>expect &&
-				git ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 568 - pathmatch (via ls-files): no match 'a[c-c]st' 'acrt'
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.569 'ipathmatch: no match 'acrt' 'a[c-c]st'': 
-			test_must_fail test-tool wildmatch ipathmatch 'acrt' 'a[c-c]st'
-		
-ok 569 - ipathmatch: no match 'acrt' 'a[c-c]st'
+HEAD is now at 8f99a4f E
+rebase -i script before editing:
+pick 0547e3f # D
+pick 8f99a4f # E
 
-expecting success of 3070.570 'ipathmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 570 - ipathmatch (via ls-files): no match 'a[c-c]st' 'acrt'
+rebase -i script after editing:
+reword 0547e3f # D
+reword 8f99a4f # E
+Rebasing (1/2)
[detached HEAD af7a1e6] D
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
+Rebasing (3/3)
[detached HEAD d9fff5f] E
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Rebasing (4/4)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
+Successfully rebased and updated detached HEAD.
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 3070.571 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing acrt
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 571 - cleanup after previous file test
+  d9fff5f E
+  af7a1e6 D
 
-expecting success of 3070.572 'setup match file test for acrt': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 572 - setup match file test for acrt
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3070.573 'wildmatch: match 'acrt' 'a[c-c]rt'': 
-			test-tool wildmatch wildmatch 'acrt' 'a[c-c]rt'
-		
-ok 573 - wildmatch: match 'acrt' 'a[c-c]rt'
+ git branch <new-branch-name> d9fff5f
 
-expecting success of 3070.574 'wildmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
-				printf '%s' 'acrt' >expect &&
-				git --glob-pathspecs ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 574 - wildmatch (via ls-files): match 'a[c-c]rt' 'acrt'
+Switched to branch 'reword-branch'
+ok 57 - no uncommitted changes when rewording and the todo list is reloaded
 
-expecting success of 3070.575 'iwildmatch: match 'acrt' 'a[c-c]rt'': 
-			test-tool wildmatch iwildmatch 'acrt' 'a[c-c]rt'
-		
-ok 575 - iwildmatch: match 'acrt' 'a[c-c]rt'
+expecting success of 3404.58 'rebase -i can copy notes': 
+	git config notes.rewrite.rebase true &&
+	git config notes.rewriteRef "refs/notes/*" &&
+	test_commit n1 &&
+	test_commit n2 &&
+	test_commit n3 &&
+	git notes add -m"a note" n3 &&
+	git rebase -i --onto n1 n2 &&
+	test "a note" = "$(git notes show HEAD)"
 
-expecting success of 3070.576 'iwildmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
-				printf '%s' 'acrt' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 576 - iwildmatch (via ls-files): match 'a[c-c]rt' 'acrt'
+[reword-branch f191fb6] n1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n1.t
+[reword-branch 0b4d587] n2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n2.t
+[reword-branch 66ece83] n3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n3.t
+Rebasing (1/1)
Successfully rebased and updated refs/heads/reword-branch.
+ok 58 - rebase -i can copy notes
 
-expecting success of 3070.577 'pathmatch: match 'acrt' 'a[c-c]rt'': 
-			test-tool wildmatch pathmatch 'acrt' 'a[c-c]rt'
-		
-ok 577 - pathmatch: match 'acrt' 'a[c-c]rt'
+expecting success of 3404.59 'rebase -i can copy notes over a fixup': 
+	cat >expect <<-\EOF &&
+	an earlier note
 
-expecting success of 3070.578 'pathmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
-				printf '%s' 'acrt' >expect &&
-				git ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 578 - pathmatch (via ls-files): match 'a[c-c]rt' 'acrt'
+	a note
+	EOF
+	git reset --hard n3 &&
+	git notes add -m"an earlier note" n2 &&
+	(
+		set_fake_editor &&
+		GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 f 2" \
+			git rebase -i n1
+	) &&
+	git notes show > output &&
+	test_cmp expect output
 
-expecting success of 3070.579 'ipathmatch: match 'acrt' 'a[c-c]rt'': 
-			test-tool wildmatch ipathmatch 'acrt' 'a[c-c]rt'
-		
-ok 579 - ipathmatch: match 'acrt' 'a[c-c]rt'
+HEAD is now at 66ece83 n3
+rebase -i script before editing:
+pick 0b4d587 # n2
+pick 66ece83 # n3
 
-expecting success of 3070.580 'ipathmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
-				printf '%s' 'acrt' >expect &&
-				git --icase-pathspecs ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 580 - ipathmatch (via ls-files): match 'a[c-c]rt' 'acrt'
+rebase -i script after editing:
+pick 0b4d587 # n2
+f 66ece83 # n3
+Rebasing (2/2)
Successfully rebased and updated refs/heads/reword-branch.
+ok 59 - rebase -i can copy notes over a fixup
 
-expecting success of 3070.581 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing acrt
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 581 - cleanup after previous file test
+expecting success of 3404.60 'rebase while detaching HEAD': 
+	git symbolic-ref HEAD &&
+	grandparent=$(git rev-parse HEAD~2) &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0
+	) &&
+	test $grandparent = $(git rev-parse HEAD~2) &&
+	test_must_fail git symbolic-ref HEAD
 
-expecting success of 3070.582 'setup match file test for ]': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 582 - setup match file test for ]
+refs/heads/reword-branch
+rebase -i script before editing:
+pick f191fb6 # n1
+pick 8594c3b # n2
 
-expecting success of 3070.583 'wildmatch: no match ']' '[!]-]'': 
-			test_must_fail test-tool wildmatch wildmatch ']' '[!]-]'
-		
-ok 583 - wildmatch: no match ']' '[!]-]'
+rebase -i script after editing:
+pick 8594c3b # n2
+pick f191fb6 # n1
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+fatal: ref HEAD is not a symbolic ref
+ok 60 - rebase while detaching HEAD
 
-expecting success of 3070.584 'wildmatch (via ls-files): no match '[!]-]' ']'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 584 - wildmatch (via ls-files): no match '[!]-]' ']'
+expecting success of 3404.61 'always cherry-pick with --no-ff': 
+	git checkout no-ff-branch &&
+	git tag original-no-ff-branch &&
+	git rebase -i --no-ff A &&
+	for p in 0 1 2
+	do
+		test ! $(git rev-parse HEAD~$p) = $(git rev-parse original-no-ff-branch~$p) &&
+		git diff HEAD~$p original-no-ff-branch~$p > out &&
+		test_must_be_empty out || return 1
+	done &&
+	test_cmp_rev HEAD~3 original-no-ff-branch~3 &&
+	git diff HEAD~3 original-no-ff-branch~3 > out &&
+	test_must_be_empty out
 
-expecting success of 3070.585 'iwildmatch: no match ']' '[!]-]'': 
-			test_must_fail test-tool wildmatch iwildmatch ']' '[!]-]'
-		
-ok 585 - iwildmatch: no match ']' '[!]-]'
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 3070.586 'iwildmatch (via ls-files): no match '[!]-]' ']'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 586 - iwildmatch (via ls-files): no match '[!]-]' ']'
+  496279b n1
+  4897a92 n2
 
-expecting success of 3070.587 'pathmatch: no match ']' '[!]-]'': 
-			test_must_fail test-tool wildmatch pathmatch ']' '[!]-]'
-		
-ok 587 - pathmatch: no match ']' '[!]-]'
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3070.588 'pathmatch (via ls-files): no match '[!]-]' ']'': 
-				>expect &&
-				git ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 588 - pathmatch (via ls-files): no match '[!]-]' ']'
+ git branch <new-branch-name> 496279b
 
-expecting success of 3070.589 'ipathmatch: no match ']' '[!]-]'': 
-			test_must_fail test-tool wildmatch ipathmatch ']' '[!]-]'
-		
-ok 589 - ipathmatch: no match ']' '[!]-]'
+Switched to branch 'no-ff-branch'
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/no-ff-branch.
+ok 61 - always cherry-pick with --no-ff
 
-expecting success of 3070.590 'ipathmatch (via ls-files): no match '[!]-]' ']'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 590 - ipathmatch (via ls-files): no match '[!]-]' ']'
+expecting success of 3404.62 'set up commits with funny messages': 
+	git checkout -b funny A &&
+	echo >>file1 &&
+	test_tick &&
+	git commit -a -m "end with slash\\" &&
+	echo >>file1 &&
+	test_tick &&
+	git commit -a -m "something (\000) that looks like octal" &&
+	echo >>file1 &&
+	test_tick &&
+	git commit -a -m "something (\n) that looks like a newline" &&
+	echo >>file1 &&
+	test_tick &&
+	git commit -a -m "another commit"
 
-expecting success of 3070.591 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 591 - cleanup after previous file test
+Switched to a new branch 'funny'
+[funny f317e30] end with slash\
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[funny d68f8aa] something (\000) that looks like octal
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[funny 495c640] something (\n) that looks like a newline
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[funny 3a6cc5d] another commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 62 - set up commits with funny messages
 
-expecting success of 3070.592 'setup match file test for a': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 592 - setup match file test for a
+expecting success of 3404.63 'rebase-i history with funny messages': 
+	git rev-list A..funny >expect &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 4" git rebase -i A
+	) &&
+	git rev-list A.. >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.593 'wildmatch: match 'a' '[!]-]'': 
-			test-tool wildmatch wildmatch 'a' '[!]-]'
-		
-ok 593 - wildmatch: match 'a' '[!]-]'
+rebase -i script before editing:
+pick f317e30 # end with slash\
+pick d68f8aa # something (\000) that looks like octal
+pick 495c640 # something (\n) that looks like a newline
+pick 3a6cc5d # another commit
 
-expecting success of 3070.594 'wildmatch (via ls-files): match '[!]-]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 594 - wildmatch (via ls-files): match '[!]-]' 'a'
+rebase -i script after editing:
+pick f317e30 # end with slash\
+pick d68f8aa # something (\000) that looks like octal
+pick 495c640 # something (\n) that looks like a newline
+pick 3a6cc5d # another commit
+Successfully rebased and updated refs/heads/funny.
+ok 63 - rebase-i history with funny messages
 
-expecting success of 3070.595 'iwildmatch: match 'a' '[!]-]'': 
-			test-tool wildmatch iwildmatch 'a' '[!]-]'
-		
-ok 595 - iwildmatch: match 'a' '[!]-]'
+expecting success of 3404.64 'prepare for rebase -i --exec': 
+	git checkout primary &&
+	git checkout -b execute &&
+	test_commit one_exec main.txt one_exec &&
+	test_commit two_exec main.txt two_exec &&
+	test_commit three_exec main.txt three_exec
 
-expecting success of 3070.596 'iwildmatch (via ls-files): match '[!]-]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 596 - iwildmatch (via ls-files): match '[!]-]' 'a'
+Switched to branch 'primary'
+Switched to a new branch 'execute'
+[execute 1983bb3] one_exec
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main.txt
+[execute 2efd8a2] two_exec
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[execute 66ac40d] three_exec
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 64 - prepare for rebase -i --exec
 
-expecting success of 3070.597 'pathmatch: match 'a' '[!]-]'': 
-			test-tool wildmatch pathmatch 'a' '[!]-]'
-		
-ok 597 - pathmatch: match 'a' '[!]-]'
+expecting success of 3404.65 'running "git rebase -i --exec git show HEAD"': 
+	(
+		set_fake_editor &&
+		git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
+		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
+		export FAKE_LINES &&
+		git rebase -i HEAD~2 >expect
+	) &&
+	sed -e "1,9d" expect >expected &&
+	test_cmp expected actual
 
-expecting success of 3070.598 'pathmatch (via ls-files): match '[!]-]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 598 - pathmatch (via ls-files): match '[!]-]' 'a'
+Rebasing (2/4)
Executing: git show HEAD
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/execute.
+Rebasing (2/4)
Executing: git show HEAD
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/execute.
+ok 65 - running "git rebase -i --exec git show HEAD"
 
-expecting success of 3070.599 'ipathmatch: match 'a' '[!]-]'': 
-			test-tool wildmatch ipathmatch 'a' '[!]-]'
-		
-ok 599 - ipathmatch: match 'a' '[!]-]'
+expecting success of 3404.66 'running "git rebase --exec git show HEAD -i"': 
+	git reset --hard execute &&
+	(
+		set_fake_editor &&
+		git rebase --exec "git show HEAD" -i HEAD~2 >actual &&
+		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
+		export FAKE_LINES &&
+		git rebase -i HEAD~2 >expect
+	) &&
+	sed -e "1,9d" expect >expected &&
+	test_cmp expected actual
 
-expecting success of 3070.600 'ipathmatch (via ls-files): match '[!]-]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 600 - ipathmatch (via ls-files): match '[!]-]' 'a'
+HEAD is now at 66ac40d three_exec
+Rebasing (2/4)
Executing: git show HEAD
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/execute.
+Rebasing (2/4)
Executing: git show HEAD
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/execute.
+ok 66 - running "git rebase --exec git show HEAD -i"
 
-expecting success of 3070.601 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 601 - cleanup after previous file test
+expecting success of 3404.67 'running "git rebase -ix git show HEAD"': 
+	git reset --hard execute &&
+	(
+		set_fake_editor &&
+		git rebase -ix "git show HEAD" HEAD~2 >actual &&
+		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
+		export FAKE_LINES &&
+		git rebase -i HEAD~2 >expect
+	) &&
+	sed -e "1,9d" expect >expected &&
+	test_cmp expected actual
 
-expecting success of 3070.602 'setup match file test for ': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 602 - setup match file test for 
+HEAD is now at 66ac40d three_exec
+Rebasing (2/4)
Executing: git show HEAD
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/execute.
+Rebasing (2/4)
Executing: git show HEAD
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/execute.
+ok 67 - running "git rebase -ix git show HEAD"
 
-expecting success of 3070.603 'wildmatch: no match '' '\'': 
-			test_must_fail test-tool wildmatch wildmatch '' '\'
-		
-ok 603 - wildmatch: no match '' '\'
+expecting success of 3404.68 'rebase -ix with several <CMD>': 
+	git reset --hard execute &&
+	(
+		set_fake_editor &&
+		git rebase -ix "git show HEAD; pwd" HEAD~2 >actual &&
+		FAKE_LINES="1 exec_git_show_HEAD;_pwd 2 exec_git_show_HEAD;_pwd" &&
+		export FAKE_LINES &&
+		git rebase -i HEAD~2 >expect
+	) &&
+	sed -e "1,9d" expect >expected &&
+	test_cmp expected actual
 
-checking known breakage of 3070.604 'wildmatch (via ls-files): no match skip '\' ''': false
-not ok 604 - wildmatch (via ls-files): no match skip '\' '' # TODO known breakage
+HEAD is now at 66ac40d three_exec
+Rebasing (2/4)
Executing: git show HEAD; pwd
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD; pwd
+Successfully rebased and updated refs/heads/execute.
+Rebasing (2/4)
Executing: git show HEAD; pwd
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD; pwd
+Successfully rebased and updated refs/heads/execute.
+ok 68 - rebase -ix with several <CMD>
 
-expecting success of 3070.605 'iwildmatch: no match '' '\'': 
-			test_must_fail test-tool wildmatch iwildmatch '' '\'
-		
-ok 605 - iwildmatch: no match '' '\'
+expecting success of 3404.69 'rebase -ix with several instances of --exec': 
+	git reset --hard execute &&
+	(
+		set_fake_editor &&
+		git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual &&
+		FAKE_LINES="1 exec_git_show_HEAD exec_pwd 2
+				exec_git_show_HEAD exec_pwd" &&
+		export FAKE_LINES &&
+		git rebase -i HEAD~2 >expect
+	) &&
+	sed -e "1,11d" expect >expected &&
+	test_cmp expected actual
 
-checking known breakage of 3070.606 'iwildmatch (via ls-files): no match skip '\' ''': false
-not ok 606 - iwildmatch (via ls-files): no match skip '\' '' # TODO known breakage
+HEAD is now at 66ac40d three_exec
+Rebasing (2/6)
Executing: git show HEAD
+Rebasing (3/6)
Executing: pwd
+Rebasing (4/6)
Rebasing (5/6)
Executing: git show HEAD
+Rebasing (6/6)
Executing: pwd
+Successfully rebased and updated refs/heads/execute.
+Rebasing (2/6)
Executing: git show HEAD
+Rebasing (3/6)
Executing: pwd
+Rebasing (4/6)
Rebasing (5/6)
Executing: git show HEAD
+Rebasing (6/6)
Executing: pwd
+Successfully rebased and updated refs/heads/execute.
+ok 69 - rebase -ix with several instances of --exec
 
-expecting success of 3070.607 'pathmatch: no match '' '\'': 
-			test_must_fail test-tool wildmatch pathmatch '' '\'
-		
-ok 607 - pathmatch: no match '' '\'
+expecting success of 3404.70 'rebase -ix with --autosquash': 
+	git reset --hard execute &&
+	git checkout -b autosquash &&
+	echo second >second.txt &&
+	git add second.txt &&
+	git commit -m "fixup! two_exec" &&
+	echo bis >bis.txt &&
+	git add bis.txt &&
+	git commit -m "fixup! two_exec" &&
+	git checkout -b autosquash_actual &&
+	git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual &&
+	git checkout autosquash &&
+	(
+		set_fake_editor &&
+		git checkout -b autosquash_expected &&
+		FAKE_LINES="1 fixup 3 fixup 4 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
+		export FAKE_LINES &&
+		git rebase -i HEAD~4 >expect
+	) &&
+	sed -e "1,13d" expect >expected &&
+	test_cmp expected actual
 
-checking known breakage of 3070.608 'pathmatch (via ls-files): no match skip '\' ''': false
-not ok 608 - pathmatch (via ls-files): no match skip '\' '' # TODO known breakage
+HEAD is now at 66ac40d three_exec
+Switched to a new branch 'autosquash'
+[autosquash 1da6bea] fixup! two_exec
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.txt
+[autosquash 280ba53] fixup! two_exec
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bis.txt
+Switched to a new branch 'autosquash_actual'
+Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Executing: git show HEAD
+Rebasing (5/6)
Rebasing (6/6)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/autosquash_actual.
+Switched to branch 'autosquash'
+Switched to a new branch 'autosquash_expected'
+Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Executing: git show HEAD
+Rebasing (5/6)
Rebasing (6/6)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/autosquash_expected.
+ok 70 - rebase -ix with --autosquash
 
-expecting success of 3070.609 'ipathmatch: no match '' '\'': 
-			test_must_fail test-tool wildmatch ipathmatch '' '\'
-		
-ok 609 - ipathmatch: no match '' '\'
+expecting success of 3404.71 'rebase --exec works without -i ': 
+	git reset --hard execute &&
+	rm -rf exec_output &&
+	EDITOR="echo >invoked_editor" git rebase --exec "echo a line >>exec_output"  HEAD~2 2>actual &&
+	test_grep  "Successfully rebased and updated" actual &&
+	test_line_count = 2 exec_output &&
+	test_path_is_missing invoked_editor
 
-checking known breakage of 3070.610 'ipathmatch (via ls-files): no match skip '\' ''': false
-not ok 610 - ipathmatch (via ls-files): no match skip '\' '' # TODO known breakage
+HEAD is now at 66ac40d three_exec
+Successfully rebased and updated refs/heads/autosquash_expected.
+ok 71 - rebase --exec works without -i 
 
-expecting success of 3070.611 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-ok 611 - cleanup after previous file test
+expecting success of 3404.72 'rebase -i --exec without <CMD>': 
+	git reset --hard execute &&
+	test_must_fail git rebase -i --exec 2>actual &&
+	test_grep "requires a value" actual &&
+	git checkout primary
 
-expecting success of 3070.612 'setup match file test for \': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 612 - setup match file test for \
+HEAD is now at 66ac40d three_exec
+error: option `exec' requires a value
+Switched to branch 'primary'
+ok 72 - rebase -i --exec without <CMD>
 
-expecting success of 3070.613 'wildmatch: no match '\' '\'': 
-			test_must_fail test-tool wildmatch wildmatch '\' '\'
-		
-ok 613 - wildmatch: no match '\' '\'
+expecting success of 3404.73 'rebase -i --root re-order and drop commits': 
+	git checkout E &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="3 1 2 5" git rebase -i --root
+	) &&
+	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test B = $(git cat-file commit HEAD^ | sed -ne \$p) &&
+	test A = $(git cat-file commit HEAD^^ | sed -ne \$p) &&
+	test C = $(git cat-file commit HEAD^^^ | sed -ne \$p) &&
+	test 0 = $(git cat-file commit HEAD^^^ | grep -c ^parent\ )
 
-expecting success of 3070.614 'wildmatch (via ls-files): match '\' '\'': 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs ls-files -z -- '\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 614 - wildmatch (via ls-files): match '\' '\'
+Note: switching to 'E'.
 
-expecting success of 3070.615 'iwildmatch: no match '\' '\'': 
-			test_must_fail test-tool wildmatch iwildmatch '\' '\'
-		
-ok 615 - iwildmatch: no match '\' '\'
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 3070.616 'iwildmatch (via ls-files): match '\' '\'': 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 616 - iwildmatch (via ls-files): 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 3070.617 'pathmatch: no match '\' '\'': 
-			test_must_fail test-tool wildmatch pathmatch '\' '\'
-		
-ok 617 - pathmatch: no match '\' '\'
+  git switch -c <new-branch-name>
 
-expecting success of 3070.618 'pathmatch (via ls-files): match '\' '\'': 
-				printf '%s' '\' >expect &&
-				git ls-files -z -- '\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 618 - pathmatch (via ls-files): match '\' '\'
+Or undo this operation with:
 
-expecting success of 3070.619 'ipathmatch: no match '\' '\'': 
-			test_must_fail test-tool wildmatch ipathmatch '\' '\'
-		
-ok 619 - ipathmatch: no match '\' '\'
+  git switch -
 
-expecting success of 3070.620 'ipathmatch (via ls-files): match '\' '\'': 
-				printf '%s' '\' >expect &&
-				git --icase-pathspecs ls-files -z -- '\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 620 - ipathmatch (via ls-files): match '\' '\'
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.621 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing "\\"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 621 - cleanup after previous file test
+HEAD is now at 8f99a4f E
+rebase -i script before editing:
+pick 6e62bf8 # A
+pick 313fe96 # B
+pick d0f65f2 # C
+pick 0547e3f # D
+pick 8f99a4f # E
 
-expecting success of 3070.622 'setup match file test for XXX/\': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 622 - setup match file test for XXX/\
+rebase -i script after editing:
+pick d0f65f2 # C
+pick 6e62bf8 # A
+pick 313fe96 # B
+pick 8f99a4f # E
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 73 - rebase -i --root re-order and drop commits
 
-expecting success of 3070.623 'wildmatch: no match 'XXX/\' '*/\'': 
-			test_must_fail test-tool wildmatch wildmatch 'XXX/\' '*/\'
-		
-ok 623 - wildmatch: no match 'XXX/\' '*/\'
+expecting success of 3404.74 'rebase -i --root retain root commit author and message': 
+	git checkout A &&
+	echo B >file7 &&
+	git add file7 &&
+	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2" git rebase -i --root
+	) &&
+	git cat-file commit HEAD >output &&
+	grep -q "^author Twerp Snog" output &&
+	git cat-file commit HEAD >actual &&
+	grep -q "^different author$" actual
 
-expecting success of 3070.624 'wildmatch (via ls-files): no match '*/\' 'XXX/\'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*/\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 624 - wildmatch (via ls-files): no match '*/\' 'XXX/\'
+Warning: you are leaving 4 commits behind, not connected to
+any of your branches:
 
-expecting success of 3070.625 'iwildmatch: no match 'XXX/\' '*/\'': 
-			test_must_fail test-tool wildmatch iwildmatch 'XXX/\' '*/\'
-		
-ok 625 - iwildmatch: no match 'XXX/\' '*/\'
+  8ec5b24 E
+  0680f3e B
+  2e95b98 A
+  8676e2e C
 
-expecting success of 3070.626 'iwildmatch (via ls-files): no match '*/\' 'XXX/\'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 626 - iwildmatch (via ls-files): no match '*/\' 'XXX/\'
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3070.627 'pathmatch: no match 'XXX/\' '*/\'': 
-			test_must_fail test-tool wildmatch pathmatch 'XXX/\' '*/\'
-		
-ok 627 - pathmatch: no match 'XXX/\' '*/\'
+ git branch <new-branch-name> 8ec5b24
 
-expecting success of 3070.628 'pathmatch (via ls-files): no match '*/\' 'XXX/\'': 
-				>expect &&
-				git ls-files -z -- '*/\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 628 - pathmatch (via ls-files): no match '*/\' 'XXX/\'
+HEAD is now at 6e62bf8 A
+[detached HEAD 419a8fd] different author
+ Author: Twerp Snog <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+rebase -i script before editing:
+pick 6e62bf8 # A
+pick 419a8fd # different author
 
-expecting success of 3070.629 'ipathmatch: no match 'XXX/\' '*/\'': 
-			test_must_fail test-tool wildmatch ipathmatch 'XXX/\' '*/\'
-		
-ok 629 - ipathmatch: no match 'XXX/\' '*/\'
+rebase -i script after editing:
+pick 419a8fd # different author
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 74 - rebase -i --root retain root commit author and message
 
-expecting success of 3070.630 'ipathmatch (via ls-files): no match '*/\' 'XXX/\'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '*/\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 630 - ipathmatch (via ls-files): no match '*/\' 'XXX/\'
+expecting success of 3404.75 'rebase -i --root temporary sentinel commit': 
+	git checkout B &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="2" git rebase -i --root
+	) &&
+	git cat-file commit HEAD >actual &&
+	grep "^tree $EMPTY_TREE" actual &&
+	git rebase --abort
 
-expecting success of 3070.631 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing XXX/
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 631 - cleanup after previous file test
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.632 'setup match file test for XXX/\': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 632 - setup match file test for XXX/\
+  2b113fb different author
 
-expecting success of 3070.633 'wildmatch: match 'XXX/\' '*/\\'': 
-			test-tool wildmatch wildmatch 'XXX/\' '*/\\'
-		
-ok 633 - wildmatch: match 'XXX/\' '*/\\'
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3070.634 'wildmatch (via ls-files): match '*/\\' 'XXX/\'': 
-				printf '%s' 'XXX/\' >expect &&
-				git --glob-pathspecs ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 634 - wildmatch (via ls-files): match '*/\\' 'XXX/\'
+ git branch <new-branch-name> 2b113fb
 
-expecting success of 3070.635 'iwildmatch: match 'XXX/\' '*/\\'': 
-			test-tool wildmatch iwildmatch 'XXX/\' '*/\\'
-		
-ok 635 - iwildmatch: match 'XXX/\' '*/\\'
+HEAD is now at 313fe96 B
+rebase -i script before editing:
+pick 6e62bf8 # A
+pick 313fe96 # B
 
-expecting success of 3070.636 'iwildmatch (via ls-files): match '*/\\' 'XXX/\'': 
-				printf '%s' 'XXX/\' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 636 - iwildmatch (via ls-files): match '*/\\' 'XXX/\'
+rebase -i script after editing:
+pick 313fe96 # B
+Rebasing (1/1)
CONFLICT (modify/delete): file1 deleted in HEAD and modified in 313fe96 (B).  Version 313fe96 (B) of file1 left in tree.
+error: could not apply 313fe96... 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 313fe96... # B
+tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+ok 75 - rebase -i --root temporary sentinel commit
 
-expecting success of 3070.637 'pathmatch: match 'XXX/\' '*/\\'': 
-			test-tool wildmatch pathmatch 'XXX/\' '*/\\'
-		
-ok 637 - pathmatch: match 'XXX/\' '*/\\'
+expecting success of 3404.76 'rebase -i --root fixup root commit': 
+	git checkout B &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 fixup 2" git rebase -i --root
+	) &&
+	test A = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test B = $(git show HEAD:file1) &&
+	test 0 = $(git cat-file commit HEAD | grep -c ^parent\ )
 
-expecting success of 3070.638 'pathmatch (via ls-files): match '*/\\' 'XXX/\'': 
-				printf '%s' 'XXX/\' >expect &&
-				git ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 638 - pathmatch (via ls-files): match '*/\\' 'XXX/\'
+HEAD is now at 313fe96 B
+rebase -i script before editing:
+pick 6e62bf8 # A
+pick 313fe96 # B
 
-expecting success of 3070.639 'ipathmatch: match 'XXX/\' '*/\\'': 
-			test-tool wildmatch ipathmatch 'XXX/\' '*/\\'
-		
-ok 639 - ipathmatch: match 'XXX/\' '*/\\'
+rebase -i script after editing:
+pick 6e62bf8 # A
+fixup 313fe96 # B
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 76 - rebase -i --root fixup root commit
 
-expecting success of 3070.640 'ipathmatch (via ls-files): match '*/\\' 'XXX/\'': 
-				printf '%s' 'XXX/\' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 640 - ipathmatch (via ls-files): match '*/\\' 'XXX/\'
+expecting success of 3404.77 'rebase -i --root reword original root commit': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout -b reword-original-root-branch primary &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
+			git rebase -i --root
+	) &&
+	git show HEAD^ >actual &&
+	grep "A changed" actual &&
+	test -z "$(git show -s --format=%p HEAD^)"
 
-expecting success of 3070.641 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing XXX/
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 641 - cleanup after previous file test
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3070.642 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 642 - setup match file test for foo
+  558b876 A
 
-expecting success of 3070.643 'wildmatch: match 'foo' 'foo'': 
-			test-tool wildmatch wildmatch 'foo' 'foo'
-		
-ok 643 - wildmatch: match 'foo' 'foo'
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3070.644 'wildmatch (via ls-files): match 'foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 644 - wildmatch (via ls-files): match 'foo' 'foo'
+ git branch <new-branch-name> 558b876
 
-expecting success of 3070.645 'iwildmatch: match 'foo' 'foo'': 
-			test-tool wildmatch iwildmatch 'foo' 'foo'
-		
-ok 645 - iwildmatch: match 'foo' 'foo'
+Switched to a new branch 'reword-original-root-branch'
+rebase -i script before editing:
+pick 6e62bf8 # A
+pick 313fe96 # B
+pick d0f65f2 # C
+pick 0547e3f # D
+pick 8f99a4f # E
 
-expecting success of 3070.646 'iwildmatch (via ls-files): match 'foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 646 - iwildmatch (via ls-files): match 'foo' 'foo'
+rebase -i script after editing:
+reword 6e62bf8 # A
+pick 313fe96 # B
+Rebasing (1/2)
[detached HEAD 903b38e] A changed
+ 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
+Rebasing (2/2)
Successfully rebased and updated refs/heads/reword-original-root-branch.
+    A changed
+fatal: no rebase in progress
+ok 77 - rebase -i --root reword original root commit
 
-expecting success of 3070.647 'pathmatch: match 'foo' 'foo'': 
-			test-tool wildmatch pathmatch 'foo' 'foo'
-		
-ok 647 - pathmatch: match 'foo' 'foo'
+expecting success of 3404.78 'rebase -i --root reword new root commit': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout -b reword-now-root-branch primary &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \
+		git rebase -i --root
+	) &&
+	git show HEAD^ >actual &&
+	grep "C changed" actual &&
+	test -z "$(git show -s --format=%p HEAD^)"
 
-expecting success of 3070.648 'pathmatch (via ls-files): match 'foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 648 - pathmatch (via ls-files): match 'foo' 'foo'
+Switched to a new branch 'reword-now-root-branch'
+rebase -i script before editing:
+pick 6e62bf8 # A
+pick 313fe96 # B
+pick d0f65f2 # C
+pick 0547e3f # D
+pick 8f99a4f # E
 
-expecting success of 3070.649 'ipathmatch: match 'foo' 'foo'': 
-			test-tool wildmatch ipathmatch 'foo' 'foo'
-		
-ok 649 - ipathmatch: match 'foo' 'foo'
+rebase -i script after editing:
+reword d0f65f2 # C
+pick 6e62bf8 # A
+Rebasing (1/2)
[detached HEAD a808654] C changed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+Rebasing (2/2)
Successfully rebased and updated refs/heads/reword-now-root-branch.
+    C changed
+fatal: no rebase in progress
+ok 78 - rebase -i --root reword new root commit
 
-expecting success of 3070.650 'ipathmatch (via ls-files): match 'foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 650 - ipathmatch (via ls-files): match 'foo' 'foo'
+expecting success of 3404.79 'rebase -i --root when root has untracked file conflict': 
+	test_when_finished "reset_rebase" &&
+	git checkout -b failing-root-pick A &&
+	echo x >file2 &&
+	git rm file1 &&
+	git commit -m "remove file 1 add file 2" &&
+	echo z >file1 &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2" git rebase -i --root
+	) &&
+	rm file1 &&
+	git rebase --continue &&
+	test "$(git log -1 --format=%B)" = "remove file 1 add file 2" &&
+	test "$(git rev-list --count HEAD)" = 2
 
-expecting success of 3070.651 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
+Switched to a new branch 'failing-root-pick'
+rm 'file1'
+[failing-root-pick 71adfbc] remove file 1 add file 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file1
+rebase -i script before editing:
+pick 6e62bf8 # A
+pick 71adfbc # remove file 1 add file 2
+
+rebase -i script after editing:
+pick 6e62bf8 # A
+pick 71adfbc # remove file 1 add file 2
+Rebasing (1/2)
error: The following untracked working tree files would be overwritten by merge:
+	file1
+Please move or remove them before you merge.
+Aborting
+hint: Could not execute the todo command
+hint:
+hint:     pick 6e62bf890e21973b771e4e6fc28f5ade62edb4bc # A
+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 (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/failing-root-pick.
+fatal: no rebase in progress
+HEAD is now at 71adfbc remove file 1 add file 2
 Removing actual
-Removing actual.err
-Removing actual.raw
+Removing actual-squash-fixup
+Removing actual.msg
+Removing error
+Removing exec_output
 Removing expect
-Removing foo
-ok 651 - cleanup after previous file test
-
-expecting success of 3070.652 'setup match file test for @foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 652 - setup match file test for @foo
-
-expecting success of 3070.653 'wildmatch: match '@foo' '@foo'': 
-			test-tool wildmatch wildmatch '@foo' '@foo'
-		
-ok 653 - wildmatch: match '@foo' '@foo'
+Removing expect-squash-fixup
+Removing expect.msg
+Removing expect2
+Removing expected
+Removing fake-editor.sh
+Removing fake-sequence-editor.sh
+Removing file2
+Removing out
+Removing output
+Removing reword-actual
+Removing reword-editor.sh
+Removing reword-expected
+Removing reword-log
+Removing reword-oid
+Removing reword-sequence-editor.sh
+Removing script
+Removing stderr
+Removing todo
+Removing touch-subdir
+ok 79 - rebase -i --root when root has untracked file conflict
 
-expecting success of 3070.654 'wildmatch (via ls-files): match '@foo' '@foo'': 
-				printf '%s' '@foo' >expect &&
-				git --glob-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 654 - wildmatch (via ls-files): match '@foo' '@foo'
+expecting success of 3404.80 'rebase -i --root reword root when root has untracked file conflict': 
+	test_when_finished "reset_rebase" &&
+	echo z>file1 &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="reword 1 2" \
+			FAKE_COMMIT_MESSAGE="Modified A" git rebase -i --root &&
+		rm file1 &&
+		FAKE_COMMIT_MESSAGE="Reworded A" git rebase --continue
+	) &&
+	test "$(git log -1 --format=%B HEAD^)" = "Reworded A" &&
+	test "$(git rev-list --count HEAD)" = 2
 
-expecting success of 3070.655 'iwildmatch: match '@foo' '@foo'': 
-			test-tool wildmatch iwildmatch '@foo' '@foo'
-		
-ok 655 - iwildmatch: match '@foo' '@foo'
+rebase -i script before editing:
+pick 6e62bf8 # A
+pick 71adfbc # remove file 1 add file 2
 
-expecting success of 3070.656 'iwildmatch (via ls-files): match '@foo' '@foo'': 
-				printf '%s' '@foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 656 - iwildmatch (via ls-files): match '@foo' '@foo'
+rebase -i script after editing:
+reword 6e62bf8 # A
+pick 71adfbc # remove file 1 add file 2
+Rebasing (1/2)
error: The following untracked working tree files would be overwritten by merge:
+	file1
+Please move or remove them before you merge.
+Aborting
+hint: Could not execute the todo command
+hint:
+hint:     reword 6e62bf890e21973b771e4e6fc28f5ade62edb4bc # A
+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 (2/3)
[detached HEAD 1b0ccef] Reworded A
+ 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
+Rebasing (3/3)
Successfully rebased and updated refs/heads/failing-root-pick.
+fatal: no rebase in progress
+HEAD is now at 847f077 remove file 1 add file 2
+Removing fake-editor.sh
+ok 80 - rebase -i --root reword root when root has untracked file conflict
 
-expecting success of 3070.657 'pathmatch: match '@foo' '@foo'': 
-			test-tool wildmatch pathmatch '@foo' '@foo'
-		
-ok 657 - pathmatch: match '@foo' '@foo'
+expecting success of 3404.81 'rebase --edit-todo does not work on non-interactive rebase': 
+	git checkout reword-original-root-branch &&
+	git reset --hard &&
+	git checkout conflict-branch &&
+	(
+		set_fake_editor &&
+		test_must_fail git rebase -f --apply --onto HEAD~2 HEAD~ &&
+		test_must_fail git rebase --edit-todo
+	) &&
+	git rebase --abort
 
-expecting success of 3070.658 'pathmatch (via ls-files): match '@foo' '@foo'': 
-				printf '%s' '@foo' >expect &&
-				git ls-files -z -- '@foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 658 - pathmatch (via ls-files): match '@foo' '@foo'
+Switched to branch 'reword-original-root-branch'
+HEAD is now at c9dc22b B
+Switched to branch 'conflict-branch'
+First, rewinding head to replay your work on top of it...
+Applying: four
+Using index info to reconstruct a base tree...
+M	conflict
+Falling back to patching base and 3-way merge...
+Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+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 four
+fatal: The --edit-todo action can only be used during interactive rebase.
+ok 81 - rebase --edit-todo does not work on non-interactive rebase
 
-expecting success of 3070.659 'ipathmatch: match '@foo' '@foo'': 
-			test-tool wildmatch ipathmatch '@foo' '@foo'
-		
-ok 659 - ipathmatch: match '@foo' '@foo'
+expecting success of 3404.82 'rebase --edit-todo can be used to modify todo': 
+	git reset --hard &&
+	git checkout no-conflict-branch^0 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 &&
+		FAKE_LINES="2 1" git rebase --edit-todo &&
+		git rebase --continue
+	) &&
+	test M = $(git cat-file commit HEAD^ | sed -ne \$p) &&
+	test L = $(git cat-file commit HEAD | sed -ne \$p)
 
-expecting success of 3070.660 'ipathmatch (via ls-files): match '@foo' '@foo'': 
-				printf '%s' '@foo' >expect &&
-				git --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 660 - ipathmatch (via ls-files): match '@foo' '@foo'
+HEAD is now at f91a2b3 four
+Note: switching to 'no-conflict-branch^0'.
 
-expecting success of 3070.661 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing @foo
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 661 - cleanup after previous file test
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 3070.662 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 662 - setup match file test for foo
+If you want to 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 3070.663 'wildmatch: no match 'foo' '@foo'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo' '@foo'
-		
-ok 663 - wildmatch: no match 'foo' '@foo'
+  git switch -c <new-branch-name>
 
-expecting success of 3070.664 'wildmatch (via ls-files): no match '@foo' 'foo'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 664 - wildmatch (via ls-files): no match '@foo' 'foo'
+Or undo this operation with:
 
-expecting success of 3070.665 'iwildmatch: no match 'foo' '@foo'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' '@foo'
-		
-ok 665 - iwildmatch: no match 'foo' '@foo'
+  git switch -
 
-expecting success of 3070.666 'iwildmatch (via ls-files): no match '@foo' 'foo'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 666 - iwildmatch (via ls-files): no match '@foo' 'foo'
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.667 'pathmatch: no match 'foo' '@foo'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '@foo'
-		
-ok 667 - pathmatch: no match 'foo' '@foo'
+HEAD is now at 3389558 M
+rebase -i script before editing:
+pick 265b89e # K
+pick 6b0f5e6 # L
+pick 3389558 # M
 
-expecting success of 3070.668 'pathmatch (via ls-files): no match '@foo' 'foo'': 
-				>expect &&
-				git ls-files -z -- '@foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 668 - pathmatch (via ls-files): no match '@foo' 'foo'
+rebase -i script after editing:
+edit 265b89e # K
+pick 6b0f5e6 # L
+pick 3389558 # M
+Rebasing (1/3)
Stopped at 265b89e...  # K
+You can amend the commit now, with
 
-expecting success of 3070.669 'ipathmatch: no match 'foo' '@foo'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '@foo'
-		
-ok 669 - ipathmatch: no match 'foo' '@foo'
+  git commit --amend 
 
-expecting success of 3070.670 'ipathmatch (via ls-files): no match '@foo' 'foo'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 670 - ipathmatch (via ls-files): no match '@foo' 'foo'
+Once you are satisfied with your changes, run
 
-expecting success of 3070.671 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 671 - cleanup after previous file test
+  git rebase --continue
+rebase -i script before editing:
+pick 6b0f5e6 # L
+pick 3389558 # M
+rebase -i script after editing:
+pick 3389558 # M
+pick 6b0f5e6 # L
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 82 - rebase --edit-todo can be used to modify todo
 
-expecting success of 3070.672 'setup match file test for [ab]': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 672 - setup match file test for [ab]
+expecting success of 3404.83 'rebase -i produces readable reflog': 
+	git reset --hard &&
+	git branch -f branch-reflog-test H &&
+	git rebase -i --onto I F branch-reflog-test &&
+	cat >expect <<-\EOF &&
+	rebase (finish): returning to refs/heads/branch-reflog-test
+	rebase (pick): H
+	rebase (pick): G
+	rebase (start): checkout I
+	EOF
+	git reflog -n4 HEAD |
+	sed "s/[^:]*: //" >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.673 'wildmatch: match '[ab]' '\[ab]'': 
-			test-tool wildmatch wildmatch '[ab]' '\[ab]'
-		
-ok 673 - wildmatch: match '[ab]' '\[ab]'
+HEAD is now at e7ab20b L
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-reflog-test.
+ok 83 - rebase -i produces readable reflog
 
-expecting success of 3070.674 'wildmatch (via ls-files): match '\[ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 674 - wildmatch (via ls-files): match '\[ab]' '[ab]'
+expecting success of 3404.84 'rebase -i respects core.commentchar': 
+	git reset --hard &&
+	git checkout E^0 &&
+	test_config core.commentchar "\\" &&
+	write_script remove-all-but-first.sh <<-\EOF &&
+	sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" &&
+	mv "$1.tmp" "$1"
+	EOF
+	(
+		test_set_editor "$(pwd)/remove-all-but-first.sh" &&
+		git rebase -i B
+	) &&
+	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
 
-expecting success of 3070.675 'iwildmatch: match '[ab]' '\[ab]'': 
-			test-tool wildmatch iwildmatch '[ab]' '\[ab]'
-		
-ok 675 - iwildmatch: match '[ab]' '\[ab]'
+HEAD is now at d98957c H
+Note: switching to 'E^0'.
 
-expecting success of 3070.676 'iwildmatch (via ls-files): match '\[ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 676 - iwildmatch (via ls-files): match '\[ab]' '[ab]'
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 3070.677 'pathmatch: match '[ab]' '\[ab]'': 
-			test-tool wildmatch pathmatch '[ab]' '\[ab]'
-		
-ok 677 - pathmatch: match '[ab]' '\[ab]'
+If you want to 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 3070.678 'pathmatch (via ls-files): match '\[ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 678 - pathmatch (via ls-files): match '\[ab]' '[ab]'
+  git switch -c <new-branch-name>
 
-expecting success of 3070.679 'ipathmatch: match '[ab]' '\[ab]'': 
-			test-tool wildmatch ipathmatch '[ab]' '\[ab]'
-		
-ok 679 - ipathmatch: match '[ab]' '\[ab]'
+Or undo this operation with:
 
-expecting success of 3070.680 'ipathmatch (via ls-files): match '\[ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --icase-pathspecs ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 680 - ipathmatch (via ls-files): match '\[ab]' '[ab]'
+  git switch -
 
-expecting success of 3070.681 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing [ab]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 681 - cleanup after previous file test
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.682 'setup match file test for [ab]': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 682 - setup match file test for [ab]
+HEAD is now at 8f99a4f E
+Successfully rebased and updated detached HEAD.
+ok 84 - rebase -i respects core.commentchar
 
-expecting success of 3070.683 'wildmatch: match '[ab]' '[[]ab]'': 
-			test-tool wildmatch wildmatch '[ab]' '[[]ab]'
-		
-ok 683 - wildmatch: match '[ab]' '[[]ab]'
+expecting success of 3404.85 'rebase -i respects core.commentchar=auto': 
+	test_config core.commentchar auto &&
+	write_script copy-edit-script.sh <<-\EOF &&
+	cp "$1" edit-script
+	EOF
+	test_when_finished "git rebase --abort || :" &&
+	(
+		test_set_editor "$(pwd)/copy-edit-script.sh" &&
+		git rebase -i HEAD^
+	) &&
+	test -z "$(grep -ve "^#" -e "^\$" -e "^pick" edit-script)"
 
-expecting success of 3070.684 'wildmatch (via ls-files): match '[[]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 684 - wildmatch (via ls-files): match '[[]ab]' '[ab]'
+Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 85 - rebase -i respects core.commentchar=auto
 
-expecting success of 3070.685 'iwildmatch: match '[ab]' '[[]ab]'': 
-			test-tool wildmatch iwildmatch '[ab]' '[[]ab]'
-		
-ok 685 - iwildmatch: match '[ab]' '[[]ab]'
+expecting success of 3404.86 'rebase -i, with <onto> and <upstream> specified as :/quuxery': 
+	test_when_finished "git branch -D torebase" &&
+	git checkout -b torebase branch1 &&
+	upstream=$(git rev-parse ":/J") &&
+	onto=$(git rev-parse ":/A") &&
+	git rebase --onto $onto $upstream &&
+	git reset --hard branch1 &&
+	git rebase --onto ":/A" ":/J" &&
+	git checkout branch1
 
-expecting success of 3070.686 'iwildmatch (via ls-files): match '[[]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 686 - iwildmatch (via ls-files): match '[[]ab]' '[ab]'
+Previous HEAD position was d0f65f2 C
+Switched to a new branch 'torebase'
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/torebase.
+HEAD is now at 450e393 I
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/torebase.
+Switched to branch 'branch1'
+Deleted branch torebase (was 08e872c).
+ok 86 - rebase -i, with <onto> and <upstream> specified as :/quuxery
 
-expecting success of 3070.687 'pathmatch: match '[ab]' '[[]ab]'': 
-			test-tool wildmatch pathmatch '[ab]' '[[]ab]'
-		
-ok 687 - pathmatch: match '[ab]' '[[]ab]'
+expecting success of 3404.87 'rebase -i with --strategy and -X': 
+	git checkout -b conflict-merge-use-theirs conflict-branch &&
+	git reset --hard HEAD^ &&
+	echo five >conflict &&
+	echo Z >file1 &&
+	git commit -a -m "one file conflict" &&
+	EDITOR=true git rebase -i --strategy=recursive -Xours conflict-branch &&
+	test $(git show conflict-branch:conflict) = $(cat conflict) &&
+	test $(cat file1) = Z
 
-expecting success of 3070.688 'pathmatch (via ls-files): match '[[]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 688 - pathmatch (via ls-files): match '[[]ab]' '[ab]'
+Switched to a new branch 'conflict-merge-use-theirs'
+HEAD is now at 1eadf03 three
+[conflict-merge-use-theirs 1808efd] one file conflict
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Rebasing (1/1)
Successfully rebased and updated refs/heads/conflict-merge-use-theirs.
+ok 87 - rebase -i with --strategy and -X
 
-expecting success of 3070.689 'ipathmatch: match '[ab]' '[[]ab]'': 
-			test-tool wildmatch ipathmatch '[ab]' '[[]ab]'
-		
-ok 689 - ipathmatch: match '[ab]' '[[]ab]'
+expecting success of 3404.88 'interrupted rebase -i with --strategy and -X': 
+	git checkout -b conflict-merge-use-theirs-interrupted conflict-branch &&
+	git reset --hard HEAD^ &&
+	>breakpoint &&
+	git add breakpoint &&
+	git commit -m "breakpoint for interactive mode" &&
+	echo five >conflict &&
+	echo Z >file1 &&
+	git commit -a -m "one file conflict" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive \
+			-Xours conflict-branch
+	) &&
+	git rebase --continue &&
+	test $(git show conflict-branch:conflict) = $(cat conflict) &&
+	test $(cat file1) = Z
 
-expecting success of 3070.690 'ipathmatch (via ls-files): match '[[]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 690 - ipathmatch (via ls-files): match '[[]ab]' '[ab]'
+Switched to a new branch 'conflict-merge-use-theirs-interrupted'
+HEAD is now at 1eadf03 three
+[conflict-merge-use-theirs-interrupted 661680f] breakpoint for interactive mode
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 breakpoint
+[conflict-merge-use-theirs-interrupted 14f789b] one file conflict
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+rebase -i script before editing:
+pick 661680f # breakpoint for interactive mode
+pick 14f789b # one file conflict
 
-expecting success of 3070.691 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing [ab]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 691 - cleanup after previous file test
+rebase -i script after editing:
+edit 661680f # breakpoint for interactive mode
+pick 14f789b # one file conflict
+Rebasing (1/2)
Stopped at 661680f...  # breakpoint for interactive mode
+You can amend the commit now, with
 
-expecting success of 3070.692 'setup match file test for [ab]': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 692 - setup match file test for [ab]
+  git commit --amend 
 
-expecting success of 3070.693 'wildmatch: match '[ab]' '[[:]ab]'': 
-			test-tool wildmatch wildmatch '[ab]' '[[:]ab]'
-		
-ok 693 - wildmatch: match '[ab]' '[[:]ab]'
+Once you are satisfied with your changes, run
 
-expecting success of 3070.694 'wildmatch (via ls-files): match '[[:]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 694 - wildmatch (via ls-files): match '[[:]ab]' '[ab]'
+  git rebase --continue
+Rebasing (2/2)
Successfully rebased and updated refs/heads/conflict-merge-use-theirs-interrupted.
+ok 88 - interrupted rebase -i with --strategy and -X
 
-expecting success of 3070.695 'iwildmatch: match '[ab]' '[[:]ab]'': 
-			test-tool wildmatch iwildmatch '[ab]' '[[:]ab]'
-		
-ok 695 - iwildmatch: match '[ab]' '[[:]ab]'
+expecting success of 3404.89 'rebase -i error on commits with \ in message': 
+	current_head=$(git rev-parse HEAD) &&
+	test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" &&
+	test_commit TO-REMOVE will-conflict old-content &&
+	test_commit "\temp" will-conflict new-content dummy &&
+	test_must_fail env EDITOR=true git rebase -i HEAD^ --onto HEAD^^ 2>error &&
+	test_expect_code 1 grep  "	emp" error
 
-expecting success of 3070.696 'iwildmatch (via ls-files): match '[[:]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 696 - iwildmatch (via ls-files): match '[[:]ab]' '[ab]'
+[conflict-merge-use-theirs-interrupted 77c3fb4] TO-REMOVE
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 will-conflict
+[conflict-merge-use-theirs-interrupted 34a4968] \temp
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+CONFLICT (modify/delete): will-conflict deleted in HEAD and modified in 34a4968 (\temp).  Version 34a4968 (\temp) of will-conflict left in tree.
+HEAD is now at f36c680 one file conflict
+ok 89 - rebase -i error on commits with \ in message
 
-expecting success of 3070.697 'pathmatch: match '[ab]' '[[:]ab]'': 
-			test-tool wildmatch pathmatch '[ab]' '[[:]ab]'
-		
-ok 697 - pathmatch: match '[ab]' '[[:]ab]'
+expecting success of 3404.90 'short commit ID setup': 
+	test_when_finished "git checkout primary" &&
+	git checkout --orphan collide &&
+	git rm -rf . &&
+	(
+	unset test_tick &&
+	test_commit collide1 collide &&
+	test_commit --notick collide2 collide &&
+	test_commit --notick collide3 collide
+	)
 
-expecting success of 3070.698 'pathmatch (via ls-files): match '[[:]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 698 - pathmatch (via ls-files): match '[[:]ab]' '[ab]'
+Switched to a new branch 'collide'
+rm 'breakpoint'
+rm 'conflict'
+rm 'file1'
+[collide (root-commit) 674fc94] collide1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 collide
+[collide 0b53f45] collide2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[collide 6bcda37] collide3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'primary'
+ok 90 - short commit ID setup
 
-expecting success of 3070.699 'ipathmatch: match '[ab]' '[[:]ab]'': 
-			test-tool wildmatch ipathmatch '[ab]' '[[:]ab]'
-		
-ok 699 - ipathmatch: match '[ab]' '[[:]ab]'
+expecting success of 3404.91 'short commit ID collide': 
+	test_oid_cache <<-EOF &&
+	# collision-related constants
+	t3404_collision	sha1:6bcd
+	t3404_collision	sha256:0161
+	t3404_collider	sha1:ac4f2ee
+	t3404_collider	sha256:16697
+	EOF
+	test_when_finished "reset_rebase && git checkout primary" &&
+	git checkout collide &&
+	colliding_id=$(test_oid t3404_collision) &&
+	hexsz=$(test_oid hexsz) &&
+	test $colliding_id = "$(git rev-parse HEAD | cut -c 1-4)" &&
+	test_config core.abbrev 4 &&
+	(
+		unset test_tick &&
+		test_tick &&
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE="collide2 $(test_oid t3404_collider)" \
+		FAKE_LINES="reword 1 break 2" git rebase -i HEAD~2 &&
+		test $colliding_id = "$(git rev-parse HEAD | cut -c 1-4)" &&
+		grep "^pick $colliding_id " \
+			.git/rebase-merge/git-rebase-todo.tmp &&
+		grep -E "^pick [0-9a-f]{$hexsz}" \
+			.git/rebase-merge/git-rebase-todo &&
+		grep -E "^pick [0-9a-f]{$hexsz}" \
+			.git/rebase-merge/git-rebase-todo.backup &&
+		git rebase --continue
+	) &&
+	collide2="$(git rev-parse HEAD~1 | cut -c 1-4)" &&
+	collide3="$(git rev-parse collide3 | cut -c 1-4)" &&
+	test "$collide2" = "$collide3"
 
-expecting success of 3070.700 'ipathmatch (via ls-files): match '[[:]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 700 - ipathmatch (via ls-files): match '[[:]ab]' '[ab]'
+Switched to branch 'collide'
+rebase -i script before editing:
+pick 0b53 # collide2
+pick 6bcd # collide3
 
-expecting success of 3070.701 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing [ab]
+rebase -i script after editing:
+reword 0b53 # collide2
+break
+pick 6bcd # collide3
+Rebasing (1/3)
[detached HEAD 6bcda37f] collide2 ac4f2ee
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
Stopped at 6bcda37f (collide2 ac4f2ee)
+pick 6bcd # collide3
+pick 6bcda372b23d641debbf943e0b709349f72dcd92 # collide3
+pick 0b53f4541f74116336854697b0278cb818c448e2 # collide2
+pick 6bcda372b23d641debbf943e0b709349f72dcd92 # collide3
+Rebasing (3/3)
Successfully rebased and updated refs/heads/collide.
+fatal: no rebase in progress
+HEAD is now at fbe3cf5 collide3
 Removing actual
-Removing actual.err
-Removing actual.raw
+Removing copy-edit-script.sh
+Removing edit-script
 Removing expect
-ok 701 - cleanup after previous file test
-
-expecting success of 3070.702 'setup match file test for [ab]': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 702 - setup match file test for [ab]
-
-expecting success of 3070.703 'wildmatch: no match '[ab]' '[[::]ab]'': 
-			test_must_fail test-tool wildmatch wildmatch '[ab]' '[[::]ab]'
-		
-ok 703 - wildmatch: no match '[ab]' '[[::]ab]'
-
-expecting success of 3070.704 'wildmatch (via ls-files): no match '[[::]ab]' '[ab]'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 704 - wildmatch (via ls-files): no match '[[::]ab]' '[ab]'
-
-expecting success of 3070.705 'iwildmatch: no match '[ab]' '[[::]ab]'': 
-			test_must_fail test-tool wildmatch iwildmatch '[ab]' '[[::]ab]'
-		
-ok 705 - iwildmatch: no match '[ab]' '[[::]ab]'
-
-expecting success of 3070.706 'iwildmatch (via ls-files): no match '[[::]ab]' '[ab]'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 706 - iwildmatch (via ls-files): no match '[[::]ab]' '[ab]'
+Removing fake-editor.sh
+Removing remove-all-but-first.sh
+Switched to branch 'primary'
+ok 91 - short commit ID collide
 
-expecting success of 3070.707 'pathmatch: no match '[ab]' '[[::]ab]'': 
-			test_must_fail test-tool wildmatch pathmatch '[ab]' '[[::]ab]'
-		
-ok 707 - pathmatch: no match '[ab]' '[[::]ab]'
+expecting success of 3404.92 'respect core.abbrev': 
+	git config core.abbrev 12 &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i HEAD~4 >todo-list
+	) &&
+	test 4 = $(grep -c -E "pick [0-9a-f]{12,}" todo-list)
 
-expecting success of 3070.708 'pathmatch (via ls-files): no match '[[::]ab]' '[ab]'': 
-				>expect &&
-				git ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 708 - pathmatch (via ls-files): no match '[[::]ab]' '[ab]'
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+ok 92 - respect core.abbrev
 
-expecting success of 3070.709 'ipathmatch: no match '[ab]' '[[::]ab]'': 
-			test_must_fail test-tool wildmatch ipathmatch '[ab]' '[[::]ab]'
-		
-ok 709 - ipathmatch: no match '[ab]' '[[::]ab]'
+expecting success of 3404.93 'todo count': 
+	write_script dump-raw.sh <<-\EOF &&
+		cat "$1"
+	EOF
+	(
+		test_set_editor "$(pwd)/dump-raw.sh" &&
+		git rebase -i HEAD~4 >actual
+	) &&
+	test_grep "^# Rebase ..* onto ..* ([0-9]" actual
 
-expecting success of 3070.710 'ipathmatch (via ls-files): no match '[[::]ab]' '[ab]'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 710 - ipathmatch (via ls-files): no match '[[::]ab]' '[ab]'
+Successfully rebased and updated refs/heads/primary.
+# Rebase 6e62bf890e21..8f99a4f1fbbd onto 6e62bf890e21 (4 commands)
+ok 93 - todo count
 
-expecting success of 3070.711 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing [ab]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 711 - cleanup after previous file test
+expecting success of 3404.94 'rebase -i commits that overwrite untracked files (pick)': 
+	git checkout --force A &&
+	git clean -f &&
+	cat >todo <<-EOF &&
+	exec >file2
+	pick $(git rev-parse B) B
+	pick $(git rev-parse C) C
+	pick $(git rev-parse D) D
+	exec cat .git/rebase-merge/done >actual
+	EOF
+	(
+		set_replace_editor todo &&
+		test_must_fail git rebase -i A
+	) &&
+	test_cmp_rev HEAD B &&
+	test_cmp_rev REBASE_HEAD C &&
+	head -n3 todo >expect &&
+	test_cmp expect .git/rebase-merge/done &&
+	rm file2 &&
+	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 reset --hard HEAD &&
+	git rebase --continue &&
+	test_cmp_rev HEAD D &&
+	tail -n3 todo >>expect &&
+	test_cmp expect actual
 
-expecting success of 3070.712 'setup match file test for [ab]': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 712 - setup match file test for [ab]
+Note: switching to 'A'.
 
-expecting success of 3070.713 'wildmatch: match '[ab]' '[[:digit]ab]'': 
-			test-tool wildmatch wildmatch '[ab]' '[[:digit]ab]'
-		
-ok 713 - wildmatch: match '[ab]' '[[:digit]ab]'
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 3070.714 'wildmatch (via ls-files): match '[[:digit]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 714 - wildmatch (via ls-files): match '[[:digit]ab]' '[ab]'
+If you want to 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 3070.715 'iwildmatch: match '[ab]' '[[:digit]ab]'': 
-			test-tool wildmatch iwildmatch '[ab]' '[[:digit]ab]'
-		
-ok 715 - iwildmatch: match '[ab]' '[[:digit]ab]'
+  git switch -c <new-branch-name>
 
-expecting success of 3070.716 'iwildmatch (via ls-files): match '[[:digit]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 716 - iwildmatch (via ls-files): match '[[:digit]ab]' '[ab]'
+Or undo this operation with:
 
-expecting success of 3070.717 'pathmatch: match '[ab]' '[[:digit]ab]'': 
-			test-tool wildmatch pathmatch '[ab]' '[[:digit]ab]'
-		
-ok 717 - pathmatch: match '[ab]' '[[:digit]ab]'
+  git switch -
 
-expecting success of 3070.718 'pathmatch (via ls-files): match '[[:digit]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 718 - pathmatch (via ls-files): match '[[:digit]ab]' '[ab]'
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.719 'ipathmatch: match '[ab]' '[[:digit]ab]'': 
-			test-tool wildmatch ipathmatch '[ab]' '[[:digit]ab]'
-		
-ok 719 - ipathmatch: match '[ab]' '[[:digit]ab]'
+HEAD is now at 6e62bf890e21 A
+Removing actual
+Removing dump-raw.sh
+Removing fake-editor.sh
+Removing todo-list
+rebase -i script after editing:
+exec >file2
+pick 313fe965c0484313caa01fa597a77d2ad86d279e B
+pick d0f65f2f81ee9679b9f6e0748a682ddbf4351a33 C
+pick 0547e3f1350de154b309493b84e37dcd3097c587 D
+exec cat .git/rebase-merge/done >actual
+Rebasing (1/5)
Executing: >file2
+Rebasing (2/5)
Rebasing (3/5)
error: The following untracked working tree files would be overwritten by merge:
+	file2
+Please move or remove them before you merge.
+Aborting
+hint: Could not execute the todo command
+hint:
+hint:     pick d0f65f2f81ee9679b9f6e0748a682ddbf4351a33 C
+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
+error: you have staged changes in your working tree
+HEAD is now at 313fe965c048 B
+Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Executing: cat .git/rebase-merge/done >actual
+Successfully rebased and updated detached HEAD.
+ok 94 - rebase -i commits that overwrite untracked files (pick)
 
-expecting success of 3070.720 'ipathmatch (via ls-files): match '[[:digit]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 720 - ipathmatch (via ls-files): match '[[:digit]ab]' '[ab]'
+expecting success of 3404.95 'rebase -i commits that overwrite untracked files (squash)': 
+	git checkout --force branch2 &&
+	git clean -f &&
+	git tag original-branch2 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 squash 2" git rebase -i A
+	) &&
+	test_cmp_rev HEAD F &&
+	test_path_is_missing file6 &&
+	>file6 &&
+	test_must_fail git rebase --continue &&
+	test_cmp_rev HEAD F &&
+	test_cmp_rev REBASE_HEAD I &&
+	rm file6 &&
+	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 reset --hard HEAD &&
+	git rebase --continue &&
+	test $(git cat-file commit HEAD | sed -ne \$p) = I &&
+	git reset --hard original-branch2
 
-expecting success of 3070.721 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing [ab]
+Previous HEAD position was 0547e3f1350d D
+Switched to branch 'branch2'
 Removing actual
-Removing actual.err
-Removing actual.raw
+Removing err
 Removing expect
-ok 721 - cleanup after previous file test
+Removing fake-sequence-editor.sh
+Removing script
+Removing todo
+rebase -i script before editing:
+pick cfefd94ba3b7 # F
+pick 615be62cadc1 # I
 
-expecting success of 3070.722 'setup match file test for [ab]': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 722 - setup match file test for [ab]
+rebase -i script after editing:
+edit cfefd94ba3b7 # F
+squash 615be62cadc1 # I
+Rebasing (1/2)
Stopped at cfefd94ba3b7...  # F
+You can amend the commit now, with
 
-expecting success of 3070.723 'wildmatch: match '[ab]' '[\[:]ab]'': 
-			test-tool wildmatch wildmatch '[ab]' '[\[:]ab]'
-		
-ok 723 - wildmatch: match '[ab]' '[\[:]ab]'
+  git commit --amend 
 
-expecting success of 3070.724 'wildmatch (via ls-files): match '[\[:]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 724 - wildmatch (via ls-files): match '[\[:]ab]' '[ab]'
+Once you are satisfied with your changes, run
 
-expecting success of 3070.725 'iwildmatch: match '[ab]' '[\[:]ab]'': 
-			test-tool wildmatch iwildmatch '[ab]' '[\[:]ab]'
-		
-ok 725 - iwildmatch: match '[ab]' '[\[:]ab]'
+  git rebase --continue
+Rebasing (2/2)
error: The following untracked working tree files would be overwritten by merge:
+	file6
+Please move or remove them before you merge.
+Aborting
+hint: Could not execute the todo command
+hint:
+hint:     squash 615be62cadc1c85c6ac7d6974210b1aa1721c98f # I
+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
+error: you have staged changes in your working tree
+HEAD is now at cfefd94ba3b7 F
+Rebasing (3/3)
[detached HEAD 393f3ba68ddf] F
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file4
+ create mode 100644 file6
+Successfully rebased and updated refs/heads/branch2.
+HEAD is now at 615be62cadc1 I
+ok 95 - rebase -i commits that overwrite untracked files (squash)
 
-expecting success of 3070.726 'iwildmatch (via ls-files): match '[\[:]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 726 - iwildmatch (via ls-files): match '[\[:]ab]' '[ab]'
+expecting success of 3404.96 'rebase -i commits that overwrite untracked files (no ff)': 
+	git checkout --force branch2 &&
+	git clean -f &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2" git rebase -i --no-ff A
+	) &&
+	test $(git cat-file commit HEAD | sed -ne \$p) = F &&
+	test_path_is_missing file6 &&
+	>file6 &&
+	test_must_fail git rebase --continue &&
+	test $(git cat-file commit HEAD | sed -ne \$p) = F &&
+	test_cmp_rev REBASE_HEAD I &&
+	rm file6 &&
+	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 reset --hard HEAD &&
+	git rebase --continue &&
+	test $(git cat-file commit HEAD | sed -ne \$p) = I
 
-expecting success of 3070.727 'pathmatch: match '[ab]' '[\[:]ab]'': 
-			test-tool wildmatch pathmatch '[ab]' '[\[:]ab]'
-		
-ok 727 - pathmatch: match '[ab]' '[\[:]ab]'
+Already on 'branch2'
+Removing err
+Removing fake-editor.sh
+rebase -i script before editing:
+pick cfefd94ba3b7 # F
+pick 615be62cadc1 # I
 
-expecting success of 3070.728 'pathmatch (via ls-files): match '[\[:]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 728 - pathmatch (via ls-files): match '[\[:]ab]' '[ab]'
+rebase -i script after editing:
+edit cfefd94ba3b7 # F
+pick 615be62cadc1 # I
+Rebasing (1/2)
Stopped at cfefd94ba3b7...  # F
+You can amend the commit now, with
 
-expecting success of 3070.729 'ipathmatch: match '[ab]' '[\[:]ab]'': 
-			test-tool wildmatch ipathmatch '[ab]' '[\[:]ab]'
-		
-ok 729 - ipathmatch: match '[ab]' '[\[:]ab]'
+  git commit --amend 
 
-expecting success of 3070.730 'ipathmatch (via ls-files): match '[\[:]ab]' '[ab]'': 
-				printf '%s' '[ab]' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 730 - ipathmatch (via ls-files): match '[\[:]ab]' '[ab]'
+Once you are satisfied with your changes, run
 
-expecting success of 3070.731 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing [ab]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 731 - cleanup after previous file test
+  git rebase --continue
+Rebasing (2/2)
error: The following untracked working tree files would be overwritten by merge:
+	file6
+Please move or remove them before you merge.
+Aborting
+hint: Could not execute the todo command
+hint:
+hint:     pick 615be62cadc1c85c6ac7d6974210b1aa1721c98f # I
+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
+error: you have staged changes in your working tree
+HEAD is now at 1cadfd8b5eb1 F
+Rebasing (3/3)
Successfully rebased and updated refs/heads/branch2.
+ok 96 - rebase -i commits that overwrite untracked files (no ff)
 
-expecting success of 3070.732 'setup match file test for ?a?b': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 732 - setup match file test for ?a?b
+expecting success of 3404.97 'rebase --continue removes CHERRY_PICK_HEAD': 
+	git checkout -b commit-to-skip &&
+	for double in X 3 1
+	do
+		test_seq 5 | sed "s/$double/&&/" >seq &&
+		git add seq &&
+		test_tick &&
+		git commit -m seq-$double || return 1
+	done &&
+	git tag seq-onto &&
+	git reset --hard HEAD~2 &&
+	git cherry-pick seq-onto &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES= git rebase -i seq-onto
+	) &&
+	test -d .git/rebase-merge &&
+	git rebase --continue &&
+	git diff --exit-code seq-onto &&
+	test ! -d .git/rebase-merge &&
+	test ! -f .git/CHERRY_PICK_HEAD
 
-expecting success of 3070.733 'wildmatch: match '?a?b' '\??\?b'': 
-			test-tool wildmatch wildmatch '?a?b' '\??\?b'
-		
-ok 733 - wildmatch: match '?a?b' '\??\?b'
+Switched to a new branch 'commit-to-skip'
+[commit-to-skip 91baae341a52] seq-X
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 seq
+[commit-to-skip c6f9618a0f9b] seq-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[commit-to-skip 76d13d56f0bb] seq-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+HEAD is now at 91baae341a52 seq-X
+Auto-merging seq
+[commit-to-skip 43bbefaabe73] seq-1
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 16:08:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-expecting success of 3070.734 'wildmatch (via ls-files): match '\??\?b' '?a?b'': 
-				printf '%s' '?a?b' >expect &&
-				git --glob-pathspecs ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 734 - wildmatch (via ls-files): match '\??\?b' '?a?b'
+    git commit --allow-empty
 
-expecting success of 3070.735 'iwildmatch: match '?a?b' '\??\?b'': 
-			test-tool wildmatch iwildmatch '?a?b' '\??\?b'
-		
-ok 735 - iwildmatch: match '?a?b' '\??\?b'
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 76d13d56f0bb
+Last command done (1 command done):
+   pick 43bbefaabe73 # seq-1
+No commands remaining.
+You are currently rebasing branch 'commit-to-skip' on '76d13d56f0bb'.
+  (all conflicts fixed: run "git rebase --continue")
 
-expecting success of 3070.736 'iwildmatch (via ls-files): match '\??\?b' '?a?b'': 
-				printf '%s' '?a?b' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 736 - iwildmatch (via ls-files): match '\??\?b' '?a?b'
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
+	fake-editor.sh
+	sub/
 
-expecting success of 3070.737 'pathmatch: match '?a?b' '\??\?b'': 
-			test-tool wildmatch pathmatch '?a?b' '\??\?b'
-		
-ok 737 - pathmatch: match '?a?b' '\??\?b'
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply 43bbefaabe73... # seq-1
+Successfully rebased and updated refs/heads/commit-to-skip.
+ok 97 - rebase --continue removes CHERRY_PICK_HEAD
 
-expecting success of 3070.738 'pathmatch (via ls-files): match '\??\?b' '?a?b'': 
-				printf '%s' '?a?b' >expect &&
-				git ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 738 - pathmatch (via ls-files): match '\??\?b' '?a?b'
+expecting success of 3404.98 'drop': 
+	rebase_setup_and_clean drop-test &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 drop 2 3 d 4 5" git rebase -i --root
+	) &&
+	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test C = $(git cat-file commit HEAD^ | sed -ne \$p) &&
+	test A = $(git cat-file commit HEAD^^ | sed -ne \$p)
 
-expecting success of 3070.739 'ipathmatch: match '?a?b' '\??\?b'': 
-			test-tool wildmatch ipathmatch '?a?b' '\??\?b'
-		
-ok 739 - ipathmatch: match '?a?b' '\??\?b'
+Switched to a new branch 'drop-test'
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
 
-expecting success of 3070.740 'ipathmatch (via ls-files): match '\??\?b' '?a?b'': 
-				printf '%s' '?a?b' >expect &&
-				git --icase-pathspecs ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 740 - ipathmatch (via ls-files): match '\??\?b' '?a?b'
+rebase -i script after editing:
+pick 6e62bf890e21 # A
+drop 313fe965c048 # B
+pick d0f65f2f81ee # C
+d 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/drop-test.
+Switched to branch 'primary'
+Deleted branch drop-test (was 51a089e089a8).
+fatal: no rebase in progress
+ok 98 - drop
 
-expecting success of 3070.741 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ?a?b
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 741 - cleanup after previous file test
+expecting success of 3404.99 'rebase -i respects rebase.missingCommitsCheck = ignore': 
+	test_config rebase.missingCommitsCheck ignore &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_grep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
 
-expecting success of 3070.742 'setup match file test for abc': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 742 - setup match file test for abc
+Switched to a new branch 'missing-commit'
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
 
-expecting success of 3070.743 'wildmatch: match 'abc' '\a\b\c'': 
-			test-tool wildmatch wildmatch 'abc' '\a\b\c'
-		
-ok 743 - wildmatch: match 'abc' '\a\b\c'
+rebase -i script after editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/missing-commit.
+Switched to branch 'primary'
+Deleted branch missing-commit (was 0547e3f1350d).
+fatal: no rebase in progress
+ok 99 - rebase -i respects rebase.missingCommitsCheck = ignore
 
-expecting success of 3070.744 'wildmatch (via ls-files): match '\a\b\c' 'abc'': 
-				printf '%s' 'abc' >expect &&
-				git --glob-pathspecs ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 744 - wildmatch (via ls-files): match '\a\b\c' 'abc'
+expecting success of 3404.100 'rebase -i respects rebase.missingCommitsCheck = warn': 
+	cat >expect <<-EOF &&
+	Warning: some commits may have been dropped accidentally.
+	Dropped commits (newer to older):
+	 - $(git log --format="%h # %s" -1 primary)
+	To avoid this message, use "drop" to explicitly remove a commit.
+	EOF
+	test_config rebase.missingCommitsCheck warn &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual.2
+	) &&
+	head -n4 actual.2 >actual &&
+	test_cmp expect actual &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p)
 
-expecting success of 3070.745 'iwildmatch: match 'abc' '\a\b\c'': 
-			test-tool wildmatch iwildmatch 'abc' '\a\b\c'
-		
-ok 745 - iwildmatch: match 'abc' '\a\b\c'
+Switched to a new branch 'missing-commit'
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
 
-expecting success of 3070.746 'iwildmatch (via ls-files): match '\a\b\c' 'abc'': 
-				printf '%s' 'abc' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 746 - iwildmatch (via ls-files): match '\a\b\c' 'abc'
+rebase -i script after editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+Switched to branch 'primary'
+Deleted branch missing-commit (was 0547e3f1350d).
+fatal: no rebase in progress
+ok 100 - rebase -i respects rebase.missingCommitsCheck = warn
 
-expecting success of 3070.747 'pathmatch: match 'abc' '\a\b\c'': 
-			test-tool wildmatch pathmatch 'abc' '\a\b\c'
-		
-ok 747 - pathmatch: match 'abc' '\a\b\c'
+expecting success of 3404.101 'rebase -i respects rebase.missingCommitsCheck = error': 
+	cat >expect <<-EOF &&
+	Warning: some commits may have been dropped accidentally.
+	Dropped commits (newer to older):
+	 - $(git log --format="%h # %s" -1 primary)
+	 - $(git log --format="%h # %s" -1 primary~2)
+	To avoid this message, use "drop" to explicitly remove a commit.
 
-expecting success of 3070.748 'pathmatch (via ls-files): match '\a\b\c' 'abc'': 
-				printf '%s' 'abc' >expect &&
-				git ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 748 - pathmatch (via ls-files): match '\a\b\c' 'abc'
+	Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
+	The possible behaviours are: ignore, warn, error.
 
-expecting success of 3070.749 'ipathmatch: match 'abc' '\a\b\c'': 
-			test-tool wildmatch ipathmatch 'abc' '\a\b\c'
-		
-ok 749 - ipathmatch: match 'abc' '\a\b\c'
+	You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+	Or you can abort the rebase with 'git rebase --abort'.
+	EOF
+	test_config rebase.missingCommitsCheck error &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2 4" \
+			git rebase -i --root 2>actual &&
+		test_cmp expect actual &&
+		cp .git/rebase-merge/git-rebase-todo.backup \
+			.git/rebase-merge/git-rebase-todo &&
+		FAKE_LINES="1 2 drop 3 4 drop 5" git rebase --edit-todo
+	) &&
+	git rebase --continue &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
 
-expecting success of 3070.750 'ipathmatch (via ls-files): match '\a\b\c' 'abc'': 
-				printf '%s' 'abc' >expect &&
-				git --icase-pathspecs ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 750 - ipathmatch (via ls-files): match '\a\b\c' 'abc'
+Switched to a new branch 'missing-commit'
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
 
-expecting success of 3070.751 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing abc
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 751 - cleanup after previous file test
+rebase -i script after editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick 0547e3f1350d # D
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+rebase -i script after editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+drop d0f65f2f81ee # C
+pick 0547e3f1350d # D
+drop 8f99a4f1fbbd # E
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/missing-commit.
+Switched to branch 'primary'
+Deleted branch missing-commit (was 1c17f6d7b75f).
+fatal: no rebase in progress
+ok 101 - rebase -i respects rebase.missingCommitsCheck = error
 
-expecting success of 3070.752 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 752 - setup match file test for foo
-
-expecting success of 3070.753 'wildmatch: no match 'foo' ''': 
-			test_must_fail test-tool wildmatch wildmatch 'foo' ''
-		
-ok 753 - wildmatch: no match 'foo' ''
+expecting success of 3404.102 'rebase --edit-todo respects rebase.missingCommitsCheck = ignore': 
+	test_config rebase.missingCommitsCheck ignore &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="break 1 2 3 4 5" git rebase -i --root &&
+		FAKE_LINES="1 2 3 4" git rebase --edit-todo &&
+		git rebase --continue 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_grep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
 
-expecting success of 3070.754 'wildmatch (via ls-files): match dies on '' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				test_must_fail git --glob-pathspecs ls-files -z -- ''
-			
-fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
-ok 754 - wildmatch (via ls-files): match dies on '' 'foo'
+Switched to a new branch 'missing-commit'
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
 
-expecting success of 3070.755 'iwildmatch: no match 'foo' ''': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' ''
-		
-ok 755 - iwildmatch: no match 'foo' ''
+rebase -i script after editing:
+break
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+Rebasing (1/6)
Stopped at e64c99ec4da8 ()
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+rebase -i script after editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/missing-commit.
+Switched to branch 'primary'
+Deleted branch missing-commit (was 0547e3f1350d).
+fatal: no rebase in progress
+ok 102 - rebase --edit-todo respects rebase.missingCommitsCheck = ignore
 
-expecting success of 3070.756 'iwildmatch (via ls-files): match dies on '' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				test_must_fail git --glob-pathspecs --icase-pathspecs ls-files -z -- ''
-			
-fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
-ok 756 - iwildmatch (via ls-files): match dies on '' 'foo'
+expecting success of 3404.103 'rebase --edit-todo respects rebase.missingCommitsCheck = warn': 
+	cat >expect <<-EOF &&
+	error: invalid command 'pickled'
+	error: invalid line 1: pickled $(git log --format="%h # %s" -1 primary~4)
+	Warning: some commits may have been dropped accidentally.
+	Dropped commits (newer to older):
+	 - $(git log --format="%h # %s" -1 primary)
+	 - $(git log --format="%h # %s" -1 primary~4)
+	To avoid this message, use "drop" to explicitly remove a commit.
+	EOF
+	head -n5 expect >expect.2 &&
+	tail -n1 expect >>expect.2 &&
+	tail -n4 expect.2 >expect.3 &&
+	test_config rebase.missingCommitsCheck warn &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
+			git rebase -i --root &&
+		cp .git/rebase-merge/git-rebase-todo.backup orig &&
+		FAKE_LINES="2 3 4" git rebase --edit-todo 2>actual.2 &&
+		head -n7 actual.2 >actual &&
+		test_cmp expect actual &&
+		cp orig .git/rebase-merge/git-rebase-todo &&
+		FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual.2 &&
+		head -n4 actual.2 >actual &&
+		test_cmp expect.3 actual &&
+		git rebase --continue 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_grep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
 
-expecting success of 3070.757 'pathmatch: no match 'foo' ''': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' ''
-		
-ok 757 - pathmatch: no match 'foo' ''
+Switched to a new branch 'missing-commit'
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
 
-expecting success of 3070.758 'pathmatch (via ls-files): match dies on '' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				test_must_fail git ls-files -z -- ''
-			
-fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
-ok 758 - pathmatch (via ls-files): match dies on '' 'foo'
+rebase -i script after editing:
+pickled 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+error: invalid command 'pickled'
+error: invalid line 1: pickled 6e62bf890e21 # A
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+Or you can abort the rebase with 'git rebase --abort'.
+rebase -i script before editing:
+pickled 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+rebase -i script after editing:
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+rebase -i script after editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/missing-commit.
+Switched to branch 'primary'
+Deleted branch missing-commit (was 0547e3f1350d).
+fatal: no rebase in progress
+ok 103 - rebase --edit-todo respects rebase.missingCommitsCheck = warn
 
-expecting success of 3070.759 'ipathmatch: no match 'foo' ''': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' ''
-		
-ok 759 - ipathmatch: no match 'foo' ''
+expecting success of 3404.104 'rebase --edit-todo respects rebase.missingCommitsCheck = error': 
+	cat >expect <<-EOF &&
+	error: invalid command 'pickled'
+	error: invalid line 1: pickled $(git log --format="%h # %s" -1 primary~4)
+	Warning: some commits may have been dropped accidentally.
+	Dropped commits (newer to older):
+	 - $(git log --format="%h # %s" -1 primary)
+	 - $(git log --format="%h # %s" -1 primary~4)
+	To avoid this message, use "drop" to explicitly remove a commit.
 
-expecting success of 3070.760 'ipathmatch (via ls-files): match dies on '' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				test_must_fail git --icase-pathspecs ls-files -z -- ''
-			
-fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
-ok 760 - ipathmatch (via ls-files): match dies on '' 'foo'
+	Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
+	The possible behaviours are: ignore, warn, error.
 
-expecting success of 3070.761 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing expect
-Removing foo
-ok 761 - cleanup after previous file test
+	You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+	Or you can abort the rebase with 'git rebase --abort'.
+	EOF
+	tail -n11 expect >expect.2 &&
+	head -n3 expect.2 >expect.3 &&
+	tail -n7 expect.2 >>expect.3 &&
+	test_config rebase.missingCommitsCheck error &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
+			git rebase -i --root &&
+		cp .git/rebase-merge/git-rebase-todo.backup orig &&
+		test_must_fail env FAKE_LINES="2 3 4" \
+			git rebase --edit-todo 2>actual &&
+		test_cmp expect actual &&
+		test_must_fail git rebase --continue 2>actual &&
+		test_cmp expect.2 actual &&
+		test_must_fail git rebase --edit-todo &&
+		cp orig .git/rebase-merge/git-rebase-todo &&
+		test_must_fail env FAKE_LINES="1 2 3 4" \
+			git rebase --edit-todo 2>actual &&
+		test_cmp expect.3 actual &&
+		test_must_fail git rebase --continue 2>actual &&
+		test_cmp expect.3 actual &&
+		cp orig .git/rebase-merge/git-rebase-todo &&
+		FAKE_LINES="1 2 3 4 drop 5" git rebase --edit-todo &&
+		git rebase --continue 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_grep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
 
-expecting success of 3070.762 'setup match file test for foo/bar/baz/to': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 762 - setup match file test for foo/bar/baz/to
+Switched to a new branch 'missing-commit'
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
 
-expecting success of 3070.763 'wildmatch: match 'foo/bar/baz/to' '**/t[o]'': 
-			test-tool wildmatch wildmatch 'foo/bar/baz/to' '**/t[o]'
-		
-ok 763 - wildmatch: match 'foo/bar/baz/to' '**/t[o]'
+rebase -i script after editing:
+pickled 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+error: invalid command 'pickled'
+error: invalid line 1: pickled 6e62bf890e21 # A
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+Or you can abort the rebase with 'git rebase --abort'.
+rebase -i script before editing:
+pickled 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+rebase -i script after editing:
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+Warning: some commits may have been dropped accidentally.
+Dropped commits (newer to older):
+ - 8f99a4f1fbbd # E
+ - 6e62bf890e21 # A
+To avoid this message, use "drop" to explicitly remove a commit.
 
-expecting success of 3070.764 'wildmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'': 
-				printf '%s' 'foo/bar/baz/to' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 764 - wildmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
+Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
+The possible behaviours are: ignore, warn, error.
 
-expecting success of 3070.765 'iwildmatch: match 'foo/bar/baz/to' '**/t[o]'': 
-			test-tool wildmatch iwildmatch 'foo/bar/baz/to' '**/t[o]'
-		
-ok 765 - iwildmatch: match 'foo/bar/baz/to' '**/t[o]'
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+Or you can abort the rebase with 'git rebase --abort'.
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+rebase -i script after editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+rebase -i script after editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+drop 8f99a4f1fbbd # E
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/missing-commit.
+Switched to branch 'primary'
+Deleted branch missing-commit (was 0547e3f1350d).
+fatal: no rebase in progress
+ok 104 - rebase --edit-todo respects rebase.missingCommitsCheck = error
 
-expecting success of 3070.766 'iwildmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'': 
-				printf '%s' 'foo/bar/baz/to' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 766 - iwildmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
+expecting success of 3404.105 'rebase.missingCommitsCheck = error after resolving conflicts': 
+	test_config rebase.missingCommitsCheck error &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="drop 1 break 2 3 4" git rebase -i A E
+	) &&
+	git rebase --edit-todo &&
+	test_must_fail git rebase --continue &&
+	echo x >file1 &&
+	git add file1 &&
+	git rebase --continue
 
-expecting success of 3070.767 'pathmatch: match 'foo/bar/baz/to' '**/t[o]'': 
-			test-tool wildmatch pathmatch 'foo/bar/baz/to' '**/t[o]'
-		
-ok 767 - pathmatch: match 'foo/bar/baz/to' '**/t[o]'
+rebase -i script before editing:
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
 
-expecting success of 3070.768 'pathmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'': 
-				printf '%s' 'foo/bar/baz/to' >expect &&
-				git ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 768 - pathmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
+rebase -i script after editing:
+drop 313fe965c048 # B
+break
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+Rebasing (2/5)
Stopped at 6e62bf890e21 (A)
+Rebasing (3/5)
Rebasing (4/5)
Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 0547e3f1350d... D
+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 0547e3f1350d... # D
+[detached HEAD c2dad584937b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (5/5)
Successfully rebased and updated detached HEAD.
+ok 105 - rebase.missingCommitsCheck = error after resolving conflicts
 
-expecting success of 3070.769 'ipathmatch: match 'foo/bar/baz/to' '**/t[o]'': 
-			test-tool wildmatch ipathmatch 'foo/bar/baz/to' '**/t[o]'
-		
-ok 769 - ipathmatch: match 'foo/bar/baz/to' '**/t[o]'
+expecting success of 3404.106 'rebase.missingCommitsCheck = error when editing for a second time': 
+	test_config rebase.missingCommitsCheck error &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 break 2 3" git rebase -i A D &&
+		cp .git/rebase-merge/git-rebase-todo todo &&
+		test_must_fail env FAKE_LINES=2 git rebase --edit-todo &&
+		GIT_SEQUENCE_EDITOR="cp todo" git rebase --edit-todo &&
+		git rebase --continue
+	)
 
-expecting success of 3070.770 'ipathmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'': 
-				printf '%s' 'foo/bar/baz/to' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 770 - ipathmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
+rebase -i script before editing:
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
 
-expecting success of 3070.771 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 771 - cleanup after previous file test
+rebase -i script after editing:
+pick 313fe965c048 # B
+break
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+Rebasing (2/4)
Stopped at 313fe965c048 (B)
+rebase -i script before editing:
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+rebase -i script after editing:
+pick 0547e3f1350d # D
+Warning: some commits may have been dropped accidentally.
+Dropped commits (newer to older):
+ - d0f65f2f81ee # C
+To avoid this message, use "drop" to explicitly remove a commit.
 
-expecting success of 3070.772 'setup match file test for a1B': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 772 - setup match file test for a1B
+Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
+The possible behaviours are: ignore, warn, error.
 
-expecting success of 3070.773 'wildmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'': 
-			test-tool wildmatch wildmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
-		
-ok 773 - wildmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+Or you can abort the rebase with 'git rebase --abort'.
+Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 106 - rebase.missingCommitsCheck = error when editing for a second time
 
-expecting success of 3070.774 'wildmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'': 
-				printf '%s' 'a1B' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 774 - wildmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
+expecting success of 3404.107 'respects rebase.abbreviateCommands with fixup, squash and exec': 
+	rebase_setup_and_clean abbrevcmd &&
+	test_commit "first" file1.txt "first line" first &&
+	test_commit "second" file1.txt "another line" second &&
+	test_commit "fixup! first" file2.txt "first line again" first_fixup &&
+	test_commit "squash! second" file1.txt "another line here" second_squash &&
+	cat >expected <<-EOF &&
+	p $(git rev-list --abbrev-commit -1 first) # first
+	f $(git rev-list --abbrev-commit -1 first_fixup) # fixup! first
+	x git show HEAD
+	p $(git rev-list --abbrev-commit -1 second) # second
+	s $(git rev-list --abbrev-commit -1 second_squash) # squash! second
+	x git show HEAD
+	EOF
+	git checkout abbrevcmd &&
+	test_config rebase.abbreviateCommands true &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i --exec "git show HEAD" \
+			--autosquash primary >actual
+	) &&
+	test_cmp expected actual
 
-expecting success of 3070.775 'iwildmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'': 
-			test-tool wildmatch iwildmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
-		
-ok 775 - iwildmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+Previous HEAD position was 0547e3f1350d D
+Switched to a new branch 'abbrevcmd'
+[abbrevcmd 42b8f159a432] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1.txt
+[abbrevcmd 4d77de6c05df] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[abbrevcmd ecff34393bc3] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2.txt
+[abbrevcmd f772e337e29f] squash! second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Already on 'abbrevcmd'
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+Switched to branch 'primary'
+Deleted branch abbrevcmd (was f772e337e29f).
+fatal: no rebase in progress
+ok 107 - respects rebase.abbreviateCommands with fixup, squash and exec
 
-expecting success of 3070.776 'iwildmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'': 
-				printf '%s' 'a1B' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 776 - iwildmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
+expecting success of 3404.108 'static check of bad command': 
+	rebase_setup_and_clean bad-cmd &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
+		git rebase -i --root 2>actual &&
+		test_grep "pickled $(git log --format="%h # %s" -1 primary~1)" \
+				actual &&
+		test_grep "You can fix this with .git rebase --edit-todo.." \
+				actual &&
+		FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo
+	) &&
+	git rebase --continue &&
+	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test C = $(git cat-file commit HEAD^ | sed -ne \$p)
 
-expecting success of 3070.777 'pathmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'': 
-			test-tool wildmatch pathmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
-		
-ok 777 - pathmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+Switched to a new branch 'bad-cmd'
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
 
-expecting success of 3070.778 'pathmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'': 
-				printf '%s' 'a1B' >expect &&
-				git ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 778 - pathmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
+rebase -i script after editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pickled 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+error: invalid line 4: pickled 0547e3f1350d # D
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+error: invalid command 'pickled'
+error: invalid line 4: pickled 0547e3f1350d # D
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pickled 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+rebase -i script after editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+drop 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/bad-cmd.
+Switched to branch 'primary'
+Deleted branch bad-cmd (was 1c8ce10ab787).
+fatal: no rebase in progress
+ok 108 - static check of bad command
 
-expecting success of 3070.779 'ipathmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'': 
-			test-tool wildmatch ipathmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
-		
-ok 779 - ipathmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+expecting success of 3404.109 'the first command cannot be a fixup': 
+	rebase_setup_and_clean fixup-first &&
 
-expecting success of 3070.780 'ipathmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'': 
-				printf '%s' 'a1B' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 780 - ipathmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
+	cat >orig <<-EOF &&
+	fixup $(git log -1 --format="%h %s" B)
+	pick $(git log -1 --format="%h %s" C)
+	EOF
 
-expecting success of 3070.781 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a1B
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 781 - cleanup after previous file test
+	(
+		set_replace_editor orig &&
+		test_must_fail git rebase -i A 2>actual
+	) &&
+	grep "cannot .fixup. without a previous commit" actual &&
+	grep "You can fix this with .git rebase --edit-todo.." actual &&
+	# verify that the todo list has not been truncated
+	grep -v "^#" .git/rebase-merge/git-rebase-todo >actual &&
+	test_cmp orig actual &&
 
-expecting success of 3070.782 'setup match file test for a': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 782 - setup match file test for a
+	test_must_fail git rebase --edit-todo 2>actual &&
+	grep "cannot .fixup. without a previous commit" actual &&
+	grep "You can fix this with .git rebase --edit-todo.." actual &&
+	# verify that the todo list has not been truncated
+	grep -v "^#" .git/rebase-merge/git-rebase-todo >actual &&
+	test_cmp orig actual
 
-expecting success of 3070.783 'wildmatch: no match 'a' '[[:digit:][:upper:][:space:]]'': 
-			test_must_fail test-tool wildmatch wildmatch 'a' '[[:digit:][:upper:][:space:]]'
-		
-ok 783 - wildmatch: no match 'a' '[[:digit:][:upper:][:space:]]'
+Switched to a new branch 'fixup-first'
+rebase -i script after editing:
+fixup 313fe965c048 B
+pick d0f65f2f81ee C
+error: cannot 'fixup' without a previous commit
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+error: cannot 'fixup' without a previous commit
+error: cannot 'fixup' without a previous commit
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+Previous HEAD position was 6e62bf890e21 A
+Switched to branch 'primary'
+error: cannot delete branch 'fixup-first' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
+ok 109 - the first command cannot be a fixup
 
-expecting success of 3070.784 'wildmatch (via ls-files): no match '[[:digit:][:upper:][:space:]]' 'a'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 784 - wildmatch (via ls-files): no match '[[:digit:][:upper:][:space:]]' 'a'
+expecting success of 3404.110 'tabs and spaces are accepted in the todolist': 
+	rebase_setup_and_clean indented-comment &&
+	write_script add-indent.sh <<-\EOF &&
+	(
+		# Turn single spaces into space/tab mix
+		sed "1s/ /	/g; 2s/ /  /g; 3s/ / 	/g" "$1"
+		printf "\n\t# comment\n #more\n\t # comment\n"
+	) >"$1.new"
+	mv "$1.new" "$1"
+	EOF
+	(
+		test_set_editor "$(pwd)/add-indent.sh" &&
+		git rebase -i HEAD^^^
+	) &&
+	test E = $(git cat-file commit HEAD | sed -ne \$p)
 
-expecting success of 3070.785 'iwildmatch: match 'a' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch iwildmatch 'a' '[[:digit:][:upper:][:space:]]'
-		
-ok 785 - iwildmatch: match 'a' '[[:digit:][:upper:][:space:]]'
+Switched to a new branch 'indented-comment'
+Successfully rebased and updated refs/heads/indented-comment.
+Switched to branch 'primary'
+Deleted branch indented-comment (was 8f99a4f1fbbd).
+fatal: no rebase in progress
+ok 110 - tabs and spaces are accepted in the todolist
 
-expecting success of 3070.786 'iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 786 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'a'
+expecting success of 3404.111 'static check of bad SHA-1': 
+	rebase_setup_and_clean bad-sha &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
+			git rebase -i --root 2>actual &&
+			test_grep "edit XXXXXXX False commit" actual &&
+			test_grep "You can fix this with .git rebase --edit-todo.." \
+					actual &&
+		FAKE_LINES="1 2 4 5 6" git rebase --edit-todo
+	) &&
+	git rebase --continue &&
+	test E = $(git cat-file commit HEAD | sed -ne \$p)
 
-expecting success of 3070.787 'pathmatch: no match 'a' '[[:digit:][:upper:][:space:]]'': 
-			test_must_fail test-tool wildmatch pathmatch 'a' '[[:digit:][:upper:][:space:]]'
-		
-ok 787 - pathmatch: no match 'a' '[[:digit:][:upper:][:space:]]'
+Switched to a new branch 'bad-sha'
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
 
-expecting success of 3070.788 'pathmatch (via ls-files): no match '[[:digit:][:upper:][:space:]]' 'a'': 
-				>expect &&
-				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 788 - pathmatch (via ls-files): no match '[[:digit:][:upper:][:space:]]' 'a'
+rebase -i script after editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+edit XXXXXXX False commit
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+# comment
+error: invalid line 3: edit XXXXXXX False commit
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+error: could not parse 'XXXXXXX'
+error: invalid line 3: edit XXXXXXX False commit
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+edit XXXXXXX False commit
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+rebase -i script after editing:
+pick 6e62bf890e21 # A
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/bad-sha.
+Switched to branch 'primary'
+Deleted branch bad-sha (was 8f99a4f1fbbd).
+fatal: no rebase in progress
+ok 111 - static check of bad SHA-1
 
-expecting success of 3070.789 'ipathmatch: match 'a' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch ipathmatch 'a' '[[:digit:][:upper:][:space:]]'
-		
-ok 789 - ipathmatch: match 'a' '[[:digit:][:upper:][:space:]]'
+expecting success of 3404.112 'editor saves as CR/LF': 
+	git checkout -b with-crlf &&
+	write_script add-crs.sh <<-\EOF &&
+	sed -e "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new &&
+	mv -f "$1".new "$1"
+	EOF
+	(
+		test_set_editor "$(pwd)/add-crs.sh" &&
+		git rebase -i HEAD^
+	)
 
-expecting success of 3070.790 'ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 790 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'a'
+Switched to a new branch 'with-crlf'
+Successfully rebased and updated refs/heads/with-crlf.
+ok 112 - editor saves as CR/LF
 
-expecting success of 3070.791 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 791 - cleanup after previous file test
+expecting success of 3404.113 'rebase -i --gpg-sign=<key-id>': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
+			HEAD^ >out 2>err
+	) &&
+	test_grep "$SQ-S\"S I Gner\"$SQ" err
 
-expecting success of 3070.792 'setup match file test for A': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 792 - setup match file test for A
+  git commit --amend '-S"S I Gner"'
+ok 113 - rebase -i --gpg-sign=<key-id>
 
-expecting success of 3070.793 'wildmatch: match 'A' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch wildmatch 'A' '[[:digit:][:upper:][:space:]]'
-		
-ok 793 - wildmatch: match 'A' '[[:digit:][:upper:][:space:]]'
+expecting success of 3404.114 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	test_config commit.gpgsign true &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
+			HEAD^ >out 2>err
+	) &&
+	test_grep "$SQ-S\"S I Gner\"$SQ" err
 
-expecting success of 3070.794 'wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 794 - wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
+  git commit --amend '-S"S I Gner"'
+ok 114 - rebase -i --gpg-sign=<key-id> overrides commit.gpgSign
 
-expecting success of 3070.795 'iwildmatch: match 'A' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch iwildmatch 'A' '[[:digit:][:upper:][:space:]]'
-		
-ok 795 - iwildmatch: match 'A' '[[:digit:][:upper:][:space:]]'
+expecting success of 3404.115 'valid author header after --root swap': 
+	rebase_setup_and_clean author-header no-conflict-branch &&
+	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
+	git cat-file commit HEAD | grep ^author >expected &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="5 1" git rebase -i --root
+	) &&
+	git cat-file commit HEAD^ | grep ^author >actual &&
+	test_cmp expected actual
 
-expecting success of 3070.796 'iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 796 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
+Switched to a new branch 'author-header'
+[author-header d4dcc6d22bff] M
+ Author: Au 'thor <author@example.com>
+ Date: Thu Apr 7 15:29:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileM
+rebase -i script before editing:
+pick 6e62bf890e21 # A
+pick 808874f7b187 # J
+pick 265b89e813d4 # K
+pick 6b0f5e6c3e83 # L
+pick d4dcc6d22bff # M
 
-expecting success of 3070.797 'pathmatch: match 'A' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch pathmatch 'A' '[[:digit:][:upper:][:space:]]'
-		
-ok 797 - pathmatch: match 'A' '[[:digit:][:upper:][:space:]]'
+rebase -i script after editing:
+pick d4dcc6d22bff # M
+pick 6e62bf890e21 # A
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/author-header.
+Switched to branch 'primary'
+Deleted branch author-header (was 141d57bb9b25).
+fatal: no rebase in progress
+ok 115 - valid author header after --root swap
 
-expecting success of 3070.798 'pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 798 - pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
+expecting success of 3404.116 'valid author header when author contains single quote': 
+	rebase_setup_and_clean author-header no-conflict-branch &&
+	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
+	git cat-file commit HEAD | grep ^author >expected &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2" git rebase -i HEAD~2
+	) &&
+	git cat-file commit HEAD | grep ^author >actual &&
+	test_cmp expected actual
 
-expecting success of 3070.799 'ipathmatch: match 'A' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch ipathmatch 'A' '[[:digit:][:upper:][:space:]]'
-		
-ok 799 - ipathmatch: match 'A' '[[:digit:][:upper:][:space:]]'
+Switched to a new branch 'author-header'
+[author-header d4dcc6d22bff] M
+ Author: Au 'thor <author@example.com>
+ Date: Thu Apr 7 15:29:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileM
+rebase -i script before editing:
+pick 6b0f5e6c3e83 # L
+pick d4dcc6d22bff # M
 
-expecting success of 3070.800 'ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 800 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
+rebase -i script after editing:
+pick d4dcc6d22bff # M
+Rebasing (1/1)
Successfully rebased and updated refs/heads/author-header.
+Switched to branch 'primary'
+Deleted branch author-header (was b929a6a72971).
+fatal: no rebase in progress
+ok 116 - valid author header when author contains single quote
 
-expecting success of 3070.801 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing A
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 801 - cleanup after previous file test
+expecting success of 3404.117 'post-commit hook is called': 
+	>actual &&
+	test_hook post-commit <<-\EOS &&
+	git rev-parse HEAD >>actual
+	EOS
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E &&
+		echo x>file3 &&
+		git add file3 &&
+		FAKE_COMMIT_MESSAGE=edited git rebase --continue
+	) &&
+	git rev-parse HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} HEAD@{1} HEAD \
+		>expect &&
+	test_cmp expect actual
 
-expecting success of 3070.802 'setup match file test for 1': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 802 - setup match file test for 1
+rebase -i script before editing:
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
+pick 8f99a4f1fbbd # E
 
-expecting success of 3070.803 'wildmatch: match '1' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch wildmatch '1' '[[:digit:][:upper:][:space:]]'
-		
-ok 803 - wildmatch: match '1' '[[:digit:][:upper:][:space:]]'
+rebase -i script after editing:
+edit 8f99a4f1fbbd # E
+pick 313fe965c048 # B
+reword d0f65f2f81ee # C
+fixup 0547e3f1350d # D
+Rebasing (1/4)
Stopped at 8f99a4f1fbbd...  # E
+You can amend the commit now, with
 
-expecting success of 3070.804 'wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'': 
-				printf '%s' '1' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 804 - wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
+  git commit --amend 
 
-expecting success of 3070.805 'iwildmatch: match '1' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch iwildmatch '1' '[[:digit:][:upper:][:space:]]'
-		
-ok 805 - iwildmatch: match '1' '[[:digit:][:upper:][:space:]]'
+Once you are satisfied with your changes, run
 
-expecting success of 3070.806 'iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'': 
-				printf '%s' '1' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 806 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
+  git rebase --continue
+[detached HEAD bc867d3a07fd] edited
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Rebasing (2/4)
Rebasing (3/4)
[detached HEAD d54e5ab0b586] edited
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 117 - post-commit hook is called
 
-expecting success of 3070.807 'pathmatch: match '1' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch pathmatch '1' '[[:digit:][:upper:][:space:]]'
-		
-ok 807 - pathmatch: match '1' '[[:digit:][:upper:][:space:]]'
+expecting success of 3404.118 'correct error message for partial commit after empty pick': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1 1" &&
+		export FAKE_LINES &&
+		test_must_fail git rebase -i A D
+	) &&
+	echo x >file1 &&
+	test_must_fail git commit file1 2>err &&
+	test_grep "cannot do a partial commit during a rebase." err
 
-expecting success of 3070.808 'pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'': 
-				printf '%s' '1' >expect &&
-				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 808 - pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
+rebase -i script before editing:
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
 
-expecting success of 3070.809 'ipathmatch: match '1' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch ipathmatch '1' '[[:digit:][:upper:][:space:]]'
-		
-ok 809 - ipathmatch: match '1' '[[:digit:][:upper:][:space:]]'
+rebase -i script after editing:
+pick d0f65f2f81ee # C
+pick 313fe965c048 # B
+pick 313fe965c048 # B
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-expecting success of 3070.810 'ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'': 
-				printf '%s' '1' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 810 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
+    git commit --allow-empty
 
-expecting success of 3070.811 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing 1
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 811 - cleanup after previous file test
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 6e62bf890e21
+Last commands done (3 commands done):
+   pick 313fe965c048 # B
+   pick 313fe965c048 # B
+  (see more in file .git/rebase-merge/done)
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
 
-expecting success of 3070.812 'setup match file test for 1': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 812 - setup match file test for 1
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual.2
+	add-crs.sh
+	add-indent.sh
+	err
+	expect
+	expect.2
+	expect.3
+	expected
+	fake-editor.sh
+	fake-sequence-editor.sh
+	orig
+	out
+	script
+	sub/
+	todo
 
-expecting success of 3070.813 'wildmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'': 
-			test_must_fail test-tool wildmatch wildmatch '1' '[[:digit:][:upper:][:spaci:]]'
-		
-ok 813 - wildmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply 313fe965c048... # B
+fatal: cannot do a partial commit during a rebase.
+ok 118 - correct error message for partial commit after empty pick
 
-expecting success of 3070.814 'wildmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 814 - wildmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
+expecting success of 3404.119 'correct error message for commit --amend after empty pick': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 1" &&
+		export FAKE_LINES &&
+		test_must_fail git rebase -i A D
+	) &&
+	echo x>file1 &&
+	test_must_fail git commit -a --amend 2>err &&
+	test_grep "middle of a rebase -- cannot amend." err
 
-expecting success of 3070.815 'iwildmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'': 
-			test_must_fail test-tool wildmatch iwildmatch '1' '[[:digit:][:upper:][:spaci:]]'
-		
-ok 815 - iwildmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
+rebase -i script before editing:
+pick 313fe965c048 # B
+pick d0f65f2f81ee # C
+pick 0547e3f1350d # D
 
-expecting success of 3070.816 'iwildmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 816 - iwildmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
+rebase -i script after editing:
+pick 313fe965c048 # B
+pick 313fe965c048 # B
+Rebasing (2/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-expecting success of 3070.817 'pathmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'': 
-			test_must_fail test-tool wildmatch pathmatch '1' '[[:digit:][:upper:][:spaci:]]'
-		
-ok 817 - pathmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
+    git commit --allow-empty
 
-expecting success of 3070.818 'pathmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'': 
-				>expect &&
-				git ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 818 - pathmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 6e62bf890e21
+Last commands done (2 commands done):
+   pick 313fe965c048 # B
+   pick 313fe965c048 # B
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
 
-expecting success of 3070.819 'ipathmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'': 
-			test_must_fail test-tool wildmatch ipathmatch '1' '[[:digit:][:upper:][:spaci:]]'
-		
-ok 819 - ipathmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual.2
+	add-crs.sh
+	add-indent.sh
+	err
+	expect
+	expect.2
+	expect.3
+	expected
+	fake-editor.sh
+	fake-sequence-editor.sh
+	orig
+	out
+	script
+	sub/
+	todo
 
-expecting success of 3070.820 'ipathmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 820 - ipathmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply 313fe965c048... # B
+fatal: You are in the middle of a rebase -- cannot amend.
+ok 119 - correct error message for commit --amend after empty pick
 
-expecting success of 3070.821 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing 1
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 821 - cleanup after previous file test
+expecting success of 3404.120 'todo has correct onto hash': 
+	GIT_SEQUENCE_EDITOR=cat git rebase -i no-conflict-branch~4 no-conflict-branch >actual &&
+	onto=$(git rev-parse --short HEAD~4) &&
+	test_grep "^# Rebase ..* onto $onto" actual
 
-expecting success of 3070.822 'setup match file test for  ': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 822 - setup match file test for  
+Successfully rebased and updated refs/heads/no-conflict-branch.
+# Rebase 6e62bf890e21..33895580a3f9 onto 6e62bf890e21 (4 commands)
+ok 120 - todo has correct onto hash
 
-expecting success of 3070.823 'wildmatch: match ' ' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch wildmatch ' ' '[[:digit:][:upper:][:space:]]'
-		
-ok 823 - wildmatch: match ' ' '[[:digit:][:upper:][:space:]]'
+expecting success of 3404.121 'ORIG_HEAD is updated correctly': 
+	test_when_finished "git checkout primary && git branch -D test-orig-head" &&
+	git checkout -b test-orig-head A &&
+	git commit --allow-empty -m A1 &&
+	git commit --allow-empty -m A2 &&
+	git commit --allow-empty -m A3 &&
+	git commit --allow-empty -m A4 &&
+	git rebase primary &&
+	test_cmp_rev ORIG_HEAD test-orig-head@{1}
 
-expecting success of 3070.824 'wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '': 
-				printf '%s' ' ' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 824 - wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
+Switched to a new branch 'test-orig-head'
+[test-orig-head 988a45cf7c4d] A1
+ Author: A U Thor <author@example.com>
+[test-orig-head 001994977a57] A2
+ Author: A U Thor <author@example.com>
+[test-orig-head f8b037fdfd3c] A3
+ Author: A U Thor <author@example.com>
+[test-orig-head dee0c985c630] A4
+ Author: A U Thor <author@example.com>
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/test-orig-head.
+Switched to branch 'primary'
+Deleted branch test-orig-head (was 25c72c815b0c).
+ok 121 - ORIG_HEAD is updated correctly
 
-expecting success of 3070.825 'iwildmatch: match ' ' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch iwildmatch ' ' '[[:digit:][:upper:][:space:]]'
-		
-ok 825 - iwildmatch: match ' ' '[[:digit:][:upper:][:space:]]'
+expecting success of 3404.122 '--update-refs adds label and update-ref commands': 
+	git checkout -b update-refs no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	git commit --allow-empty --fixup=third &&
+	git branch -f is-not-reordered &&
+	git commit --allow-empty --fixup=HEAD~4 &&
+	git branch -f shared-tip &&
+	(
+		set_cat_todo_editor &&
 
-expecting success of 3070.826 'iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '': 
-				printf '%s' ' ' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 826 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
+		cat >expect <<-EOF &&
+		pick $(git log -1 --format=%h J) # J
+		fixup $(git log -1 --format=%h update-refs) # fixup! J # empty
+		update-ref refs/heads/second
+		update-ref refs/heads/first
+		pick $(git log -1 --format=%h K) # K
+		pick $(git log -1 --format=%h L) # L
+		fixup $(git log -1 --format=%h is-not-reordered) # fixup! L # empty
+		update-ref refs/heads/third
+		pick $(git log -1 --format=%h M) # M
+		update-ref refs/heads/no-conflict-branch
+		update-ref refs/heads/is-not-reordered
+		update-ref refs/heads/shared-tip
+		EOF
 
-expecting success of 3070.827 'pathmatch: match ' ' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch pathmatch ' ' '[[:digit:][:upper:][:space:]]'
-		
-ok 827 - pathmatch: match ' ' '[[:digit:][:upper:][:space:]]'
+		test_must_fail git rebase -i --autosquash --update-refs primary >todo &&
+		test_cmp expect todo &&
 
-expecting success of 3070.828 'pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '': 
-				printf '%s' ' ' >expect &&
-				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 828 - pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
+		test_must_fail git -c rebase.autosquash=true \
+				   -c rebase.updaterefs=true \
+				   rebase -i primary >todo &&
 
-expecting success of 3070.829 'ipathmatch: match ' ' '[[:digit:][:upper:][:space:]]'': 
-			test-tool wildmatch ipathmatch ' ' '[[:digit:][:upper:][:space:]]'
-		
-ok 829 - ipathmatch: match ' ' '[[:digit:][:upper:][:space:]]'
+		test_cmp expect todo
+	)
 
-expecting success of 3070.830 'ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '': 
-				printf '%s' ' ' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 830 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
+Switched to a new branch 'update-refs'
+[update-refs d580aa243c5a] fixup! L
+ Author: A U Thor <author@example.com>
+[update-refs 5921e09cdb84] fixup! J
+ 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"'
+ok 122 - --update-refs adds label and update-ref commands
 
-expecting success of 3070.831 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing  
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 831 - cleanup after previous file test
+expecting success of 3404.123 '--update-refs adds commands with --rebase-merges': 
+	git checkout -b update-refs-with-merge no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	git merge -m merge branch2 &&
+	git branch -f merge-branch &&
+	git commit --fixup=third --allow-empty &&
+	(
+		set_cat_todo_editor &&
 
-expecting success of 3070.832 'setup match file test for .': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 832 - setup match file test for .
+		cat >expect <<-EOF &&
+		label onto
+		reset onto
+		pick $(git log -1 --format=%h branch2~1) # F
+		pick $(git log -1 --format=%h branch2) # I
+		update-ref refs/heads/branch2
+		label branch2
+		reset onto
+		pick $(git log -1 --format=%h refs/heads/second) # J
+		update-ref refs/heads/second
+		update-ref refs/heads/first
+		pick $(git log -1 --format=%h refs/heads/third~1) # K
+		pick $(git log -1 --format=%h refs/heads/third) # L
+		fixup $(git log -1 --format=%h update-refs-with-merge) # fixup! L # empty
+		update-ref refs/heads/third
+		pick $(git log -1 --format=%h HEAD~2) # M
+		update-ref refs/heads/no-conflict-branch
+		merge -C $(git log -1 --format=%h HEAD~1) branch2 # merge
+		update-ref refs/heads/merge-branch
+		EOF
 
-expecting success of 3070.833 'wildmatch: no match '.' '[[:digit:][:upper:][:space:]]'': 
-			test_must_fail test-tool wildmatch wildmatch '.' '[[:digit:][:upper:][:space:]]'
-		
-ok 833 - wildmatch: no match '.' '[[:digit:][:upper:][:space:]]'
+		test_must_fail git rebase -i --autosquash \
+				   --rebase-merges=rebase-cousins \
+				   --update-refs primary >todo &&
 
-checking known breakage of 3070.834 'wildmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.'': false
-not ok 834 - wildmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
+		test_cmp expect todo &&
 
-expecting success of 3070.835 'iwildmatch: no match '.' '[[:digit:][:upper:][:space:]]'': 
-			test_must_fail test-tool wildmatch iwildmatch '.' '[[:digit:][:upper:][:space:]]'
-		
-ok 835 - iwildmatch: no match '.' '[[:digit:][:upper:][:space:]]'
+		test_must_fail git -c rebase.autosquash=true \
+				   -c rebase.updaterefs=true \
+				   rebase -i \
+				   --rebase-merges=rebase-cousins \
+				   primary >todo &&
 
-checking known breakage of 3070.836 'iwildmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.'': false
-not ok 836 - iwildmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
+		test_cmp expect todo
+	)
 
-expecting success of 3070.837 'pathmatch: no match '.' '[[:digit:][:upper:][:space:]]'': 
-			test_must_fail test-tool wildmatch pathmatch '.' '[[:digit:][:upper:][:space:]]'
-		
-ok 837 - pathmatch: no match '.' '[[:digit:][:upper:][:space:]]'
+Switched to a new branch 'update-refs-with-merge'
+Merge made by the 'ort' strategy.
+ file4 | 1 +
+ file6 | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file4
+ create mode 100644 file6
+[update-refs-with-merge 29fba79037a4] fixup! L
+ 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"'
+ok 123 - --update-refs adds commands with --rebase-merges
 
-checking known breakage of 3070.838 'pathmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.'': false
-not ok 838 - pathmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
+expecting success of 3404.124 '--update-refs updates refs correctly': 
+	git checkout -B update-refs no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	test_commit extra2 fileX &&
+	git commit --amend --fixup=L &&
 
-expecting success of 3070.839 'ipathmatch: no match '.' '[[:digit:][:upper:][:space:]]'': 
-			test_must_fail test-tool wildmatch ipathmatch '.' '[[:digit:][:upper:][:space:]]'
-		
-ok 839 - ipathmatch: no match '.' '[[:digit:][:upper:][:space:]]'
+	git rebase -i --autosquash --update-refs primary 2>err &&
 
-checking known breakage of 3070.840 'ipathmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.'': false
-not ok 840 - ipathmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
+	test_cmp_rev HEAD~3 refs/heads/first &&
+	test_cmp_rev HEAD~3 refs/heads/second &&
+	test_cmp_rev HEAD~1 refs/heads/third &&
+	test_cmp_rev HEAD refs/heads/no-conflict-branch &&
 
-expecting success of 3070.841 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-ok 841 - cleanup after previous file test
+	q_to_tab >expect <<-\EOF &&
+	Successfully rebased and updated refs/heads/update-refs.
+	Updated the following refs with --update-refs:
+	Qrefs/heads/first
+	Qrefs/heads/no-conflict-branch
+	Qrefs/heads/second
+	Qrefs/heads/third
+	EOF
 
-expecting success of 3070.842 'setup match file test for .': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 842 - setup match file test for .
+	# Clear "Rebasing (X/Y)" progress lines and drop leading tabs.
+	sed "s/Rebasing.*Successfully/Successfully/g" <err >err.trimmed &&
+	test_cmp expect err.trimmed
 
-expecting success of 3070.843 'wildmatch: match '.' '[[:digit:][:punct:][:space:]]'': 
-			test-tool wildmatch wildmatch '.' '[[:digit:][:punct:][:space:]]'
-		
-ok 843 - wildmatch: match '.' '[[:digit:][:punct:][:space:]]'
+Switched to and reset branch 'update-refs'
+[update-refs 9da56b161557] extra2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileX
+[update-refs c4f48e9a00f5] fixup! L
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileX
+ok 124 - --update-refs updates refs correctly
 
-checking known breakage of 3070.844 'wildmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.'': false
-not ok 844 - wildmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
+expecting success of 3404.125 'respect user edits to update-ref steps': 
+	git checkout -B update-refs-break no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	git branch -f unseen base &&
 
-expecting success of 3070.845 'iwildmatch: match '.' '[[:digit:][:punct:][:space:]]'': 
-			test-tool wildmatch iwildmatch '.' '[[:digit:][:punct:][:space:]]'
-		
-ok 845 - iwildmatch: match '.' '[[:digit:][:punct:][:space:]]'
+	# First, we will add breaks to the expected todo file
+	cat >fake-todo-1 <<-EOF &&
+	pick $(git rev-parse HEAD~3)
+	break
+	update-ref refs/heads/second
+	update-ref refs/heads/first
 
-checking known breakage of 3070.846 'iwildmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.'': false
-not ok 846 - iwildmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
+	pick $(git rev-parse HEAD~2)
+	pick $(git rev-parse HEAD~1)
+	update-ref refs/heads/third
 
-expecting success of 3070.847 'pathmatch: match '.' '[[:digit:][:punct:][:space:]]'': 
-			test-tool wildmatch pathmatch '.' '[[:digit:][:punct:][:space:]]'
-		
-ok 847 - pathmatch: match '.' '[[:digit:][:punct:][:space:]]'
+	pick $(git rev-parse HEAD)
+	update-ref refs/heads/no-conflict-branch
+	EOF
 
-checking known breakage of 3070.848 'pathmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.'': false
-not ok 848 - pathmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
+	# Second, we will drop some update-refs commands (and move one)
+	cat >fake-todo-2 <<-EOF &&
+	update-ref refs/heads/second
 
-expecting success of 3070.849 'ipathmatch: match '.' '[[:digit:][:punct:][:space:]]'': 
-			test-tool wildmatch ipathmatch '.' '[[:digit:][:punct:][:space:]]'
-		
-ok 849 - ipathmatch: match '.' '[[:digit:][:punct:][:space:]]'
+	pick $(git rev-parse HEAD~2)
+	update-ref refs/heads/third
+	pick $(git rev-parse HEAD~1)
+	break
 
-checking known breakage of 3070.850 'ipathmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.'': false
-not ok 850 - ipathmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
+	pick $(git rev-parse HEAD)
+	EOF
 
-expecting success of 3070.851 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-ok 851 - cleanup after previous file test
+	# Third, we will:
+	# * insert a new one (new-branch),
+	# * re-add an old one (first), and
+	# * add a second instance of a previously-stored one (second)
+	cat >fake-todo-3 <<-EOF &&
+	update-ref refs/heads/unseen
+	update-ref refs/heads/new-branch
+	pick $(git rev-parse HEAD)
+	update-ref refs/heads/first
+	update-ref refs/heads/second
+	EOF
 
-expecting success of 3070.852 'setup match file test for 5': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 852 - setup match file test for 5
+	(
+		set_replace_editor fake-todo-1 &&
+		git rebase -i --update-refs primary &&
 
-expecting success of 3070.853 'wildmatch: match '5' '[[:xdigit:]]'': 
-			test-tool wildmatch wildmatch '5' '[[:xdigit:]]'
-		
-ok 853 - wildmatch: match '5' '[[:xdigit:]]'
+		# These branches are currently locked.
+		for b in first second third no-conflict-branch
+		do
+			test_must_fail git branch -f $b base || return 1
+		done &&
 
-expecting success of 3070.854 'wildmatch (via ls-files): match '[[:xdigit:]]' '5'': 
-				printf '%s' '5' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 854 - wildmatch (via ls-files): match '[[:xdigit:]]' '5'
+		set_replace_editor fake-todo-2 &&
+		git rebase --edit-todo &&
 
-expecting success of 3070.855 'iwildmatch: match '5' '[[:xdigit:]]'': 
-			test-tool wildmatch iwildmatch '5' '[[:xdigit:]]'
-		
-ok 855 - iwildmatch: match '5' '[[:xdigit:]]'
+		# These branches are currently locked.
+		for b in second third
+		do
+			test_must_fail git branch -f $b base || return 1
+		done &&
 
-expecting success of 3070.856 'iwildmatch (via ls-files): match '[[:xdigit:]]' '5'': 
-				printf '%s' '5' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 856 - iwildmatch (via ls-files): match '[[:xdigit:]]' '5'
+		# These branches are currently unlocked for checkout.
+		for b in first no-conflict-branch
+		do
+			git worktree add wt-$b $b &&
+			git worktree remove wt-$b || return 1
+		done &&
 
-expecting success of 3070.857 'pathmatch: match '5' '[[:xdigit:]]'': 
-			test-tool wildmatch pathmatch '5' '[[:xdigit:]]'
-		
-ok 857 - pathmatch: match '5' '[[:xdigit:]]'
+		git rebase --continue &&
 
-expecting success of 3070.858 'pathmatch (via ls-files): match '[[:xdigit:]]' '5'': 
-				printf '%s' '5' >expect &&
-				git ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 858 - pathmatch (via ls-files): match '[[:xdigit:]]' '5'
+		set_replace_editor fake-todo-3 &&
+		git rebase --edit-todo &&
 
-expecting success of 3070.859 'ipathmatch: match '5' '[[:xdigit:]]'': 
-			test-tool wildmatch ipathmatch '5' '[[:xdigit:]]'
-		
-ok 859 - ipathmatch: match '5' '[[:xdigit:]]'
+		# These branches are currently locked.
+		for b in second third first unseen
+		do
+			test_must_fail git branch -f $b base || return 1
+		done &&
 
-expecting success of 3070.860 'ipathmatch (via ls-files): match '[[:xdigit:]]' '5'': 
-				printf '%s' '5' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 860 - ipathmatch (via ls-files): match '[[:xdigit:]]' '5'
+		# These branches are currently unlocked for checkout.
+		for b in no-conflict-branch
+		do
+			git worktree add wt-$b $b &&
+			git worktree remove wt-$b || return 1
+		done &&
 
-expecting success of 3070.861 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing 5
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 861 - cleanup after previous file test
+		git rebase --continue
+	) &&
 
-expecting success of 3070.862 'setup match file test for f': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 862 - setup match file test for f
+	test_cmp_rev HEAD~2 refs/heads/third &&
+	test_cmp_rev HEAD~1 refs/heads/unseen &&
+	test_cmp_rev HEAD~1 refs/heads/new-branch &&
+	test_cmp_rev HEAD refs/heads/first &&
+	test_cmp_rev HEAD refs/heads/second &&
+	test_cmp_rev HEAD refs/heads/no-conflict-branch
 
-expecting success of 3070.863 'wildmatch: match 'f' '[[:xdigit:]]'': 
-			test-tool wildmatch wildmatch 'f' '[[:xdigit:]]'
-		
-ok 863 - wildmatch: match 'f' '[[:xdigit:]]'
+Switched to a new branch 'update-refs-break'
+rebase -i script after editing:
+pick c49b6574f4e9659c4aef3cc10be848348dc1a0ee
+break
+update-ref refs/heads/second
+update-ref refs/heads/first
 
-expecting success of 3070.864 'wildmatch (via ls-files): match '[[:xdigit:]]' 'f'': 
-				printf '%s' 'f' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 864 - wildmatch (via ls-files): match '[[:xdigit:]]' 'f'
+pick e31be72ab52d740527956c171d40a832b63e68ca
+pick 34033109e5a0def540b16172943d8a7e2a8a712e
+update-ref refs/heads/third
 
-expecting success of 3070.865 'iwildmatch: match 'f' '[[:xdigit:]]'': 
-			test-tool wildmatch iwildmatch 'f' '[[:xdigit:]]'
-		
-ok 865 - iwildmatch: match 'f' '[[:xdigit:]]'
+pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
+update-ref refs/heads/no-conflict-branch
+Rebasing (2/9)
Stopped at c49b6574f4e9 (J)
+fatal: cannot force update the branch 'first' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'no-conflict-branch' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
+rebase -i script after editing:
+update-ref refs/heads/second
 
-expecting success of 3070.866 'iwildmatch (via ls-files): match '[[:xdigit:]]' 'f'': 
-				printf '%s' 'f' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 866 - iwildmatch (via ls-files): match '[[:xdigit:]]' 'f'
+pick e31be72ab52d740527956c171d40a832b63e68ca
+update-ref refs/heads/third
+pick 34033109e5a0def540b16172943d8a7e2a8a712e
+break
 
-expecting success of 3070.867 'pathmatch: match 'f' '[[:xdigit:]]'': 
-			test-tool wildmatch pathmatch 'f' '[[:xdigit:]]'
-		
-ok 867 - pathmatch: match 'f' '[[:xdigit:]]'
+pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
+fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
+warning: refname 'first' is ambiguous.
+warning: refname 'first' is ambiguous.
+Preparing worktree (checking out 'first')
+warning: refname 'first' is ambiguous.
+HEAD is now at c49b6574f4e9 J
+Preparing worktree (checking out 'no-conflict-branch')
+HEAD is now at fb069ba3d9b1 M
+Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Stopped at 34033109e5a0 (L)
+rebase -i script after editing:
+update-ref refs/heads/unseen
+update-ref refs/heads/new-branch
+pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
+update-ref refs/heads/first
+update-ref refs/heads/second
+fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'first' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'unseen' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
+Preparing worktree (checking out 'no-conflict-branch')
+HEAD is now at fb069ba3d9b1 M
+Rebasing (8/12)
Rebasing (9/12)
Rebasing (10/12)
Rebasing (11/12)
Rebasing (12/12)
Successfully rebased and updated refs/heads/update-refs-break.
+Updated the following refs with --update-refs:
+	refs/heads/first
+	refs/heads/new-branch
+	refs/heads/second
+	refs/heads/third
+	refs/heads/unseen
+ok 125 - respect user edits to update-ref steps
 
-expecting success of 3070.868 'pathmatch (via ls-files): match '[[:xdigit:]]' 'f'': 
-				printf '%s' 'f' >expect &&
-				git ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 868 - pathmatch (via ls-files): match '[[:xdigit:]]' 'f'
+expecting success of 3404.126 '--update-refs: all update-ref lines removed': 
+	git checkout -b test-refs-not-removed no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	git branch -f tip &&
 
-expecting success of 3070.869 'ipathmatch: match 'f' '[[:xdigit:]]'': 
-			test-tool wildmatch ipathmatch 'f' '[[:xdigit:]]'
-		
-ok 869 - ipathmatch: match 'f' '[[:xdigit:]]'
+	test_commit test-refs-not-removed &&
+	git commit --amend --fixup first &&
 
-expecting success of 3070.870 'ipathmatch (via ls-files): match '[[:xdigit:]]' 'f'': 
-				printf '%s' 'f' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 870 - ipathmatch (via ls-files): match '[[:xdigit:]]' 'f'
+	git rev-parse first second third tip no-conflict-branch >expect-oids &&
 
-expecting success of 3070.871 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing f
-ok 871 - cleanup after previous file test
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i --update-refs base >todo.raw &&
+		sed -e "/^update-ref/d" <todo.raw >todo
+	) &&
+	(
+		set_replace_editor todo &&
+		git rebase -i --update-refs base
+	) &&
 
-expecting success of 3070.872 'setup match file test for D': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 872 - setup match file test for D
+	# Ensure refs are not deleted and their OIDs have not changed
+	git rev-parse first second third tip no-conflict-branch >actual-oids &&
+	test_cmp expect-oids actual-oids
 
-expecting success of 3070.873 'wildmatch: match 'D' '[[:xdigit:]]'': 
-			test-tool wildmatch wildmatch 'D' '[[:xdigit:]]'
-		
-ok 873 - wildmatch: match 'D' '[[:xdigit:]]'
+Switched to a new branch 'test-refs-not-removed'
+[test-refs-not-removed adbf713ec8f3] test-refs-not-removed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-refs-not-removed.t
+warning: refname 'first' is ambiguous.
+[test-refs-not-removed 5ca2ca8d583e] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-refs-not-removed.t
+warning: refname 'first' is ambiguous.
+warning: refname 'second' is ambiguous.
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+rebase -i script after editing:
+pick c49b6574f4e9 # J
+pick e31be72ab52d # K
+pick 34033109e5a0 # L
+pick fb069ba3d9b1 # M
+pick 5ca2ca8d583e # fixup! first
+Successfully rebased and updated refs/heads/test-refs-not-removed.
+warning: refname 'first' is ambiguous.
+warning: refname 'second' is ambiguous.
+ok 126 - --update-refs: all update-ref lines removed
 
-expecting success of 3070.874 'wildmatch (via ls-files): match '[[:xdigit:]]' 'D'': 
-				printf '%s' 'D' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 874 - wildmatch (via ls-files): match '[[:xdigit:]]' 'D'
+expecting success of 3404.127 '--update-refs: all update-ref lines removed, then some re-added': 
+	git checkout -b test-refs-not-removed2 no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	git branch -f tip &&
 
-expecting success of 3070.875 'iwildmatch: match 'D' '[[:xdigit:]]'': 
-			test-tool wildmatch iwildmatch 'D' '[[:xdigit:]]'
-		
-ok 875 - iwildmatch: match 'D' '[[:xdigit:]]'
+	test_commit test-refs-not-removed2 &&
+	git commit --amend --fixup first &&
 
-expecting success of 3070.876 'iwildmatch (via ls-files): match '[[:xdigit:]]' 'D'': 
-				printf '%s' 'D' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 876 - iwildmatch (via ls-files): match '[[:xdigit:]]' 'D'
+	git rev-parse first second third >expect-oids &&
 
-expecting success of 3070.877 'pathmatch: match 'D' '[[:xdigit:]]'': 
-			test-tool wildmatch pathmatch 'D' '[[:xdigit:]]'
-		
-ok 877 - pathmatch: match 'D' '[[:xdigit:]]'
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i \
+			--autosquash --update-refs \
+			base >todo.raw &&
+		sed -e "/^update-ref/d" <todo.raw >todo
+	) &&
 
-expecting success of 3070.878 'pathmatch (via ls-files): match '[[:xdigit:]]' 'D'': 
-				printf '%s' 'D' >expect &&
-				git ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 878 - pathmatch (via ls-files): match '[[:xdigit:]]' 'D'
+	# Add a break to the end of the todo so we can edit later
+	echo "break" >>todo &&
 
-expecting success of 3070.879 'ipathmatch: match 'D' '[[:xdigit:]]'': 
-			test-tool wildmatch ipathmatch 'D' '[[:xdigit:]]'
-		
-ok 879 - ipathmatch: match 'D' '[[:xdigit:]]'
+	(
+		set_replace_editor todo &&
+		git rebase -i --autosquash --update-refs base &&
+		echo "update-ref refs/heads/tip" >todo &&
+		git rebase --edit-todo &&
+		git rebase --continue
+	) &&
 
-expecting success of 3070.880 'ipathmatch (via ls-files): match '[[:xdigit:]]' 'D'': 
-				printf '%s' 'D' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 880 - ipathmatch (via ls-files): match '[[:xdigit:]]' 'D'
+	# Ensure first/second/third are unchanged, but tip is updated
+	git rev-parse first second third >actual-oids &&
+	test_cmp expect-oids actual-oids &&
+	test_cmp_rev HEAD tip
 
-expecting success of 3070.881 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing D
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 881 - cleanup after previous file test
+Switched to a new branch 'test-refs-not-removed2'
+[test-refs-not-removed2 67d47c6fa009] test-refs-not-removed2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-refs-not-removed2.t
+warning: refname 'first' is ambiguous.
+[test-refs-not-removed2 04193a2c3f06] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-refs-not-removed2.t
+warning: refname 'first' is ambiguous.
+warning: refname 'second' is ambiguous.
+warning: refname 'first' is ambiguous.
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+warning: refname 'first' is ambiguous.
+rebase -i script after editing:
+pick c49b6574f4e9 # J
+pick e31be72ab52d # K
+pick 34033109e5a0 # L
+pick fb069ba3d9b1 # M
+pick 04193a2c3f06 # fixup! first
+break
+Rebasing (6/6)
Stopped at 04193a2c3f06 (fixup! first)
+rebase -i script after editing:
+update-ref refs/heads/tip
+Rebasing (7/7)
Successfully rebased and updated refs/heads/test-refs-not-removed2.
+Updated the following refs with --update-refs:
+	refs/heads/tip
+warning: refname 'first' is ambiguous.
+warning: refname 'second' is ambiguous.
+ok 127 - --update-refs: all update-ref lines removed, then some re-added
 
-expecting success of 3070.882 'setup match file test for _': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 882 - setup match file test for _
+expecting success of 3404.128 '--update-refs: --edit-todo with no update-ref lines': 
+	git checkout -b test-refs-not-removed3 no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	git branch -f tip &&
 
-expecting success of 3070.883 'wildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'': 
-			test-tool wildmatch wildmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
-		
-ok 883 - wildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+	test_commit test-refs-not-removed3 &&
+	git commit --amend --fixup first &&
 
-expecting success of 3070.884 'wildmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'': 
-				printf '%s' '_' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 884 - wildmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
+	git rev-parse first second third tip no-conflict-branch >expect-oids &&
 
-expecting success of 3070.885 'iwildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'': 
-			test-tool wildmatch iwildmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
-		
-ok 885 - iwildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i \
+			--autosquash --update-refs \
+			base >todo.raw &&
+		sed -e "/^update-ref/d" <todo.raw >todo
+	) &&
 
-expecting success of 3070.886 'iwildmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'': 
-				printf '%s' '_' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 886 - iwildmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
+	# Add a break to the beginning of the todo so we can resume with no
+	# update-ref lines
+	echo "break" >todo.new &&
+	cat todo >>todo.new &&
 
-expecting success of 3070.887 'pathmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'': 
-			test-tool wildmatch pathmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
-		
-ok 887 - pathmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+	(
+		set_replace_editor todo.new &&
+		git rebase -i --autosquash --update-refs base &&
 
-expecting success of 3070.888 'pathmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'': 
-				printf '%s' '_' >expect &&
-				git ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 888 - pathmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
+		# Make no changes when editing so update-refs is still empty
+		cat todo >todo.new &&
+		git rebase --edit-todo &&
+		git rebase --continue
+	) &&
 
-expecting success of 3070.889 'ipathmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'': 
-			test-tool wildmatch ipathmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
-		
-ok 889 - ipathmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+	# Ensure refs are not deleted and their OIDs have not changed
+	git rev-parse first second third tip no-conflict-branch >actual-oids &&
+	test_cmp expect-oids actual-oids
 
-expecting success of 3070.890 'ipathmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'': 
-				printf '%s' '_' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 890 - ipathmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
+Switched to a new branch 'test-refs-not-removed3'
+[test-refs-not-removed3 0495d4feaa2b] test-refs-not-removed3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-refs-not-removed3.t
+warning: refname 'first' is ambiguous.
+[test-refs-not-removed3 6fcb3c6ba86d] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-refs-not-removed3.t
+warning: refname 'first' is ambiguous.
+warning: refname 'second' is ambiguous.
+warning: refname 'first' is ambiguous.
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+warning: refname 'first' is ambiguous.
+rebase -i script after editing:
+break
+pick c49b6574f4e9 # J
+pick e31be72ab52d # K
+pick 34033109e5a0 # L
+pick fb069ba3d9b1 # M
+pick 6fcb3c6ba86d # fixup! first
+Rebasing (1/6)
Stopped at 8f99a4f1fbbd (E)
+rebase -i script after editing:
+pick c49b6574f4e9 # J
+pick e31be72ab52d # K
+pick 34033109e5a0 # L
+pick fb069ba3d9b1 # M
+pick 6fcb3c6ba86d # fixup! first
+Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/test-refs-not-removed3.
+warning: refname 'first' is ambiguous.
+warning: refname 'second' is ambiguous.
+ok 128 - --update-refs: --edit-todo with no update-ref lines
 
-expecting success of 3070.891 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing _
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 891 - cleanup after previous file test
+expecting success of 3404.129 '--update-refs: check failed ref update': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout -B update-refs-error no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~2 &&
+	git branch -f third HEAD~1 &&
 
-expecting success of 3070.892 'setup match file test for .': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 892 - setup match file test for .
+	cat >fake-todo <<-EOF &&
+	pick $(git rev-parse HEAD~3)
+	break
+	update-ref refs/heads/first
 
-expecting success of 3070.893 'wildmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'': 
-			test-tool wildmatch wildmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
-		
-ok 893 - wildmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+	pick $(git rev-parse HEAD~2)
+	update-ref refs/heads/second
 
-checking known breakage of 3070.894 'wildmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.'': false
-not ok 894 - wildmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
+	pick $(git rev-parse HEAD~1)
+	update-ref refs/heads/third
 
-expecting success of 3070.895 'iwildmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'': 
-			test-tool wildmatch iwildmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
-		
-ok 895 - iwildmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+	pick $(git rev-parse HEAD)
+	update-ref refs/heads/no-conflict-branch
+	EOF
 
-checking known breakage of 3070.896 'iwildmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.'': false
-not ok 896 - iwildmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
+	(
+		set_replace_editor fake-todo &&
+		git rebase -i --update-refs base
+	) &&
 
-expecting success of 3070.897 'pathmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'': 
-			test-tool wildmatch pathmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
-		
-ok 897 - pathmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+	# At this point, the values of first, second, and third are
+	# recorded in the update-refs file. We will force-update the
+	# "second" ref, but "git branch -f" will not work because of
+	# the lock in the update-refs file.
+	git update-ref refs/heads/second third &&
 
-checking known breakage of 3070.898 'pathmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.'': false
-not ok 898 - pathmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
+	test_must_fail git rebase --continue 2>err &&
+	grep "update_ref failed for ref 'refs/heads/second'" err &&
 
-expecting success of 3070.899 'ipathmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'': 
-			test-tool wildmatch ipathmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
-		
-ok 899 - ipathmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+	q_to_tab >expect <<-\EOF &&
+	Updated the following refs with --update-refs:
+	Qrefs/heads/first
+	Qrefs/heads/no-conflict-branch
+	Qrefs/heads/third
+	Failed to update the following refs with --update-refs:
+	Qrefs/heads/second
+	EOF
 
-checking known breakage of 3070.900 'ipathmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.'': false
-not ok 900 - ipathmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
+	# Clear "Rebasing (X/Y)" progress lines and drop leading tabs.
+	tail -n 6 err >err.last &&
+	sed "s/Rebasing.*Successfully/Successfully/g" <err.last >err.trimmed &&
+	test_cmp expect err.trimmed
 
-expecting success of 3070.901 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-ok 901 - cleanup after previous file test
+Switched to a new branch 'update-refs-error'
+rebase -i script after editing:
+pick c49b6574f4e9659c4aef3cc10be848348dc1a0ee
+break
+update-ref refs/heads/first
 
-expecting success of 3070.902 'setup match file test for 5': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 902 - setup match file test for 5
+pick e31be72ab52d740527956c171d40a832b63e68ca
+update-ref refs/heads/second
 
-expecting success of 3070.903 'wildmatch: match '5' '[a-c[:digit:]x-z]'': 
-			test-tool wildmatch wildmatch '5' '[a-c[:digit:]x-z]'
-		
-ok 903 - wildmatch: match '5' '[a-c[:digit:]x-z]'
+pick 34033109e5a0def540b16172943d8a7e2a8a712e
+update-ref refs/heads/third
 
-expecting success of 3070.904 'wildmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'': 
-				printf '%s' '5' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 904 - wildmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
+pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
+update-ref refs/heads/no-conflict-branch
+Rebasing (2/9)
Stopped at c49b6574f4e9 (J)
+error: update_ref failed for ref 'refs/heads/second': cannot lock ref 'refs/heads/second': is at 34033109e5a0def540b16172943d8a7e2a8a712e but expected e31be72ab52d740527956c171d40a832b63e68ca
+ok 129 - --update-refs: check failed ref update
 
-expecting success of 3070.905 'iwildmatch: match '5' '[a-c[:digit:]x-z]'': 
-			test-tool wildmatch iwildmatch '5' '[a-c[:digit:]x-z]'
-		
-ok 905 - iwildmatch: match '5' '[a-c[:digit:]x-z]'
+expecting success of 3404.130 'bad labels and refs rejected when parsing todo list': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	cat >todo <<-\EOF &&
+	exec >execed
+	label #
+	label :invalid
+	update-ref :bad
+	update-ref topic
+	EOF
+	rm -f execed &&
+	(
+		set_replace_editor todo &&
+		test_must_fail git rebase -i HEAD 2>err
+	) &&
+	grep "'#' is not a valid label" err &&
+	grep "':invalid' is not a valid label" err &&
+	grep "':bad' is not a valid refname" err &&
+	grep "update-ref requires a fully qualified refname e.g. refs/heads/topic" \
+		err &&
+	test_path_is_missing execed
 
-expecting success of 3070.906 'iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'': 
-				printf '%s' '5' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 906 - iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
+rebase -i script after editing:
+exec >execed
+label #
+label :invalid
+update-ref :bad
+update-ref topic
+error: '#' is not a valid label
+error: ':invalid' is not a valid label
+error: ':bad' is not a valid refname
+error: update-ref requires a fully qualified refname e.g. refs/heads/topic
+ok 130 - bad labels and refs rejected when parsing todo list
 
-expecting success of 3070.907 'pathmatch: match '5' '[a-c[:digit:]x-z]'': 
-			test-tool wildmatch pathmatch '5' '[a-c[:digit:]x-z]'
-		
-ok 907 - pathmatch: match '5' '[a-c[:digit:]x-z]'
+expecting success of 3404.131 'non-merge commands reject merge commits': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout E &&
+	git merge I &&
+	oid=$(git rev-parse HEAD) &&
+	cat >todo <<-EOF &&
+	pick $oid
+	reword $oid
+	edit $oid
+	fixup $oid
+	squash $oid
+	EOF
+	(
+		set_replace_editor todo &&
+		test_must_fail git rebase -i HEAD 2>actual
+	) &&
+	cat >expect <<-EOF &&
+	error: ${SQ}pick${SQ} does not accept merge commits
+	hint: ${SQ}pick${SQ} does not take a merge commit. If you wanted to
+	hint: replay the merge, use ${SQ}merge -C${SQ} on the commit.
+	hint: Disable this message with "git config set advice.rebaseTodoError false"
+	error: invalid line 1: pick $oid
+	error: ${SQ}reword${SQ} does not accept merge commits
+	hint: ${SQ}reword${SQ} does not take a merge commit. If you wanted to
+	hint: replay the merge and reword the commit message, use
+	hint: ${SQ}merge -c${SQ} on the commit
+	hint: Disable this message with "git config set advice.rebaseTodoError false"
+	error: invalid line 2: reword $oid
+	error: ${SQ}edit${SQ} does not accept merge commits
+	hint: ${SQ}edit${SQ} does not take a merge commit. If you wanted to
+	hint: replay the merge, use ${SQ}merge -C${SQ} on the commit, and then
+	hint: ${SQ}break${SQ} to give the control back to you so that you can
+	hint: do ${SQ}git commit --amend && git rebase --continue${SQ}.
+	hint: Disable this message with "git config set advice.rebaseTodoError false"
+	error: invalid line 3: edit $oid
+	error: cannot squash merge commit into another commit
+	error: invalid line 4: fixup $oid
+	error: cannot squash merge commit into another commit
+	error: invalid line 5: squash $oid
+	You can fix this with ${SQ}git rebase --edit-todo${SQ} and then run ${SQ}git rebase --continue${SQ}.
+	Or you can abort the rebase with ${SQ}git rebase --abort${SQ}.
+	EOF
+	test_cmp expect actual
 
-expecting success of 3070.908 'pathmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'': 
-				printf '%s' '5' >expect &&
-				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 908 - pathmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
+Note: switching to 'E'.
 
-expecting success of 3070.909 'ipathmatch: match '5' '[a-c[:digit:]x-z]'': 
-			test-tool wildmatch ipathmatch '5' '[a-c[:digit:]x-z]'
-		
-ok 909 - ipathmatch: match '5' '[a-c[:digit:]x-z]'
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 3070.910 'ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'': 
-				printf '%s' '5' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 910 - ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
+If you want to 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 3070.911 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing 5
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 911 - cleanup after previous file test
+  git switch -c <new-branch-name>
 
-expecting success of 3070.912 'setup match file test for b': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 912 - setup match file test for b
+Or undo this operation with:
 
-expecting success of 3070.913 'wildmatch: match 'b' '[a-c[:digit:]x-z]'': 
-			test-tool wildmatch wildmatch 'b' '[a-c[:digit:]x-z]'
-		
-ok 913 - wildmatch: match 'b' '[a-c[:digit:]x-z]'
+  git switch -
 
-expecting success of 3070.914 'wildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'': 
-				printf '%s' 'b' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 914 - wildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.915 'iwildmatch: match 'b' '[a-c[:digit:]x-z]'': 
-			test-tool wildmatch iwildmatch 'b' '[a-c[:digit:]x-z]'
-		
-ok 915 - iwildmatch: match 'b' '[a-c[:digit:]x-z]'
+HEAD is now at 8f99a4f1fbbd E
+Merge made by the 'ort' strategy.
+ file4 | 1 +
+ file6 | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file4
+ create mode 100644 file6
+rebase -i script after editing:
+pick e1787ed465883b1097349020e1a6efb9957df2e7
+reword e1787ed465883b1097349020e1a6efb9957df2e7
+edit e1787ed465883b1097349020e1a6efb9957df2e7
+fixup e1787ed465883b1097349020e1a6efb9957df2e7
+squash e1787ed465883b1097349020e1a6efb9957df2e7
+ok 131 - non-merge commands reject merge commits
 
-expecting success of 3070.916 'iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'': 
-				printf '%s' 'b' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 916 - iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
+expecting success of 3404.132 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
 
-expecting success of 3070.917 'pathmatch: match 'b' '[a-c[:digit:]x-z]'': 
-			test-tool wildmatch pathmatch 'b' '[a-c[:digit:]x-z]'
-		
-ok 917 - pathmatch: match 'b' '[a-c[:digit:]x-z]'
+ok 132 - $EDITOR and friends are unchanged
 
-expecting success of 3070.918 'pathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'': 
-				printf '%s' 'b' >expect &&
-				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 918 - pathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
+# passed all 132 test(s)
+1..132
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3650-replay-basics.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3650-replay-basics/.git/
+expecting success of 3650.1 'setup': 
+	test_commit A &&
+	test_commit B &&
 
-expecting success of 3070.919 'ipathmatch: match 'b' '[a-c[:digit:]x-z]'': 
-			test-tool wildmatch ipathmatch 'b' '[a-c[:digit:]x-z]'
-		
-ok 919 - ipathmatch: match 'b' '[a-c[:digit:]x-z]'
+	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 &&
 
-expecting success of 3070.920 'ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'': 
-				printf '%s' 'b' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 920 - ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
+	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 &&
 
-expecting success of 3070.921 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing b
-Removing expect
-ok 921 - cleanup after previous file test
+	git switch main &&
+	test_commit L &&
+	test_commit M &&
 
-expecting success of 3070.922 'setup match file test for y': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 922 - setup match file test for y
+	git switch -c conflict B &&
+	test_commit C.conflict C.t conflict
 
-expecting success of 3070.923 'wildmatch: match 'y' '[a-c[:digit:]x-z]'': 
-			test-tool wildmatch wildmatch 'y' '[a-c[:digit:]x-z]'
-		
-ok 923 - wildmatch: match 'y' '[a-c[:digit:]x-z]'
+[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 3070.924 'wildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'': 
-				printf '%s' 'y' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 924 - wildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
+expecting success of 3650.2 'setup bare': 
+	git clone --bare . bare
 
-expecting success of 3070.925 'iwildmatch: match 'y' '[a-c[:digit:]x-z]'': 
-			test-tool wildmatch iwildmatch 'y' '[a-c[:digit:]x-z]'
-		
-ok 925 - iwildmatch: match 'y' '[a-c[:digit:]x-z]'
+Cloning into bare repository 'bare'...
+done.
+ok 2 - setup bare
 
-expecting success of 3070.926 'iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'': 
-				printf '%s' 'y' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 926 - iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
+expecting success of 3650.3 'using replay to rebase two branches, one on top of other': 
+	git replay --onto main topic1..topic2 >result &&
 
-expecting success of 3070.927 'pathmatch: match 'y' '[a-c[:digit:]x-z]'': 
-			test-tool wildmatch pathmatch 'y' '[a-c[:digit:]x-z]'
-		
-ok 927 - pathmatch: match 'y' '[a-c[:digit:]x-z]'
+	test_line_count = 1 result &&
 
-expecting success of 3070.928 'pathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'': 
-				printf '%s' 'y' >expect &&
-				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 928 - pathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
+	git log --format=%s $(cut -f 3 -d " " result) >actual &&
+	test_write_lines E D M L B A >expect &&
+	test_cmp expect actual &&
 
-expecting success of 3070.929 'ipathmatch: match 'y' '[a-c[:digit:]x-z]'': 
-			test-tool wildmatch ipathmatch 'y' '[a-c[:digit:]x-z]'
-		
-ok 929 - ipathmatch: match 'y' '[a-c[:digit:]x-z]'
+	printf "update refs/heads/topic2 " >expect &&
+	printf "%s " $(cut -f 3 -d " " result) >>expect &&
+	git rev-parse topic2 >>expect &&
 
-expecting success of 3070.930 'ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'': 
-				printf '%s' 'y' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 930 - ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
+	test_cmp expect result
 
-expecting success of 3070.931 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing y
-ok 931 - cleanup after previous file test
+ok 3 - using replay to rebase two branches, one on top of other
 
-expecting success of 3070.932 'setup match file test for q': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 932 - setup match file test for q
+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
 
-expecting success of 3070.933 'wildmatch: no match 'q' '[a-c[:digit:]x-z]'': 
-			test_must_fail test-tool wildmatch wildmatch 'q' '[a-c[:digit:]x-z]'
-		
-ok 933 - wildmatch: no match 'q' '[a-c[:digit:]x-z]'
+ok 4 - using replay on bare repo to rebase two branches, one on top of other
 
-expecting success of 3070.934 'wildmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 934 - wildmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
+expecting success of 3650.5 'using replay to rebase with a conflict': 
+	test_expect_code 1 git replay --onto topic1 B..conflict
 
-expecting success of 3070.935 'iwildmatch: no match 'q' '[a-c[:digit:]x-z]'': 
-			test_must_fail test-tool wildmatch iwildmatch 'q' '[a-c[:digit:]x-z]'
-		
-ok 935 - iwildmatch: no match 'q' '[a-c[:digit:]x-z]'
+ok 5 - using replay to rebase with a conflict
 
-expecting success of 3070.936 'iwildmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 936 - iwildmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
+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
 
-expecting success of 3070.937 'pathmatch: no match 'q' '[a-c[:digit:]x-z]'': 
-			test_must_fail test-tool wildmatch pathmatch 'q' '[a-c[:digit:]x-z]'
-		
-ok 937 - pathmatch: no match 'q' '[a-c[:digit:]x-z]'
+ok 6 - using replay on bare repo to rebase with a conflict
 
-expecting success of 3070.938 'pathmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'': 
-				>expect &&
-				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 938 - pathmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
+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
 
-expecting success of 3070.939 'ipathmatch: no match 'q' '[a-c[:digit:]x-z]'': 
-			test_must_fail test-tool wildmatch ipathmatch 'q' '[a-c[:digit:]x-z]'
-		
-ok 939 - ipathmatch: no match 'q' '[a-c[:digit:]x-z]'
+	git replay --advance main topic1..topic2 >result &&
 
-expecting success of 3070.940 'ipathmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 940 - ipathmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
+	test_line_count = 1 result &&
 
-expecting success of 3070.941 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing q
-ok 941 - cleanup after previous file test
+	git log --format=%s $(cut -f 3 -d " " result) >actual &&
+	test_write_lines E D M L B A >expect &&
+	test_cmp expect actual &&
 
-expecting success of 3070.942 'setup match file test for ]': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 942 - setup match file test for ]
+	printf "update refs/heads/main " >expect &&
+	printf "%s " $(cut -f 3 -d " " result) >>expect &&
+	git rev-parse main >>expect &&
 
-expecting success of 3070.943 'wildmatch: match ']' '[\\-^]'': 
-			test-tool wildmatch wildmatch ']' '[\\-^]'
-		
-ok 943 - wildmatch: match ']' '[\\-^]'
+	test_cmp expect result
 
-expecting success of 3070.944 'wildmatch (via ls-files): match '[\\-^]' ']'': 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 944 - wildmatch (via ls-files): match '[\\-^]' ']'
+ok 7 - using replay to perform basic cherry-pick
 
-expecting success of 3070.945 'iwildmatch: match ']' '[\\-^]'': 
-			test-tool wildmatch iwildmatch ']' '[\\-^]'
-		
-ok 945 - iwildmatch: match ']' '[\\-^]'
+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
 
-expecting success of 3070.946 'iwildmatch (via ls-files): match '[\\-^]' ']'': 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 946 - iwildmatch (via ls-files): match '[\\-^]' ']'
+ok 8 - using replay on bare repo to perform basic cherry-pick
 
-expecting success of 3070.947 'pathmatch: match ']' '[\\-^]'': 
-			test-tool wildmatch pathmatch ']' '[\\-^]'
-		
-ok 947 - pathmatch: match ']' '[\\-^]'
+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
 
-expecting success of 3070.948 'pathmatch (via ls-files): match '[\\-^]' ']'': 
-				printf '%s' ']' >expect &&
-				git ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 948 - pathmatch (via ls-files): match '[\\-^]' ']'
+fatal: options '--onto' and '--advance' cannot be used together
+ok 9 - replay on bare repo fails with both --advance and --onto
 
-expecting success of 3070.949 'ipathmatch: match ']' '[\\-^]'': 
-			test-tool wildmatch ipathmatch ']' '[\\-^]'
-		
-ok 949 - ipathmatch: match ']' '[\\-^]'
+expecting success of 3650.10 'replay fails when both --advance and --onto are omitted': 
+	test_must_fail git replay topic1..topic2 >result
 
-expecting success of 3070.950 'ipathmatch (via ls-files): match '[\\-^]' ']'': 
-				printf '%s' ']' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 950 - ipathmatch (via ls-files): match '[\\-^]' ']'
+error: option --onto or --advance is mandatory
+usage: (EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance <branch>) <revision-range>...
 
-expecting success of 3070.951 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 951 - cleanup after previous file test
+    --[no-]advance <branch>
+                          make replay advance given branch
+    --[no-]onto <revision>
+                          replay onto given commit
+    --[no-]contained      advance all branches contained in revision-range
 
-expecting success of 3070.952 'setup match file test for [': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 952 - setup match file test for [
+ok 10 - replay fails when both --advance and --onto are omitted
 
-expecting success of 3070.953 'wildmatch: no match '[' '[\\-^]'': 
-			test_must_fail test-tool wildmatch wildmatch '[' '[\\-^]'
-		
-ok 953 - wildmatch: no match '[' '[\\-^]'
+expecting success of 3650.11 'using replay to also rebase a contained branch': 
+	git replay --contained --onto main main..topic3 >result &&
 
-expecting success of 3070.954 'wildmatch (via ls-files): no match '[\\-^]' '['': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 954 - wildmatch (via ls-files): no match '[\\-^]' '['
+	test_line_count = 2 result &&
+	cut -f 3 -d " " result >new-branch-tips &&
 
-expecting success of 3070.955 'iwildmatch: no match '[' '[\\-^]'': 
-			test_must_fail test-tool wildmatch iwildmatch '[' '[\\-^]'
-		
-ok 955 - iwildmatch: no match '[' '[\\-^]'
+	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 &&
 
-expecting success of 3070.956 'iwildmatch (via ls-files): no match '[\\-^]' '['': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 956 - iwildmatch (via ls-files): no match '[\\-^]' '['
+	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 &&
 
-expecting success of 3070.957 'pathmatch: no match '[' '[\\-^]'': 
-			test_must_fail test-tool wildmatch pathmatch '[' '[\\-^]'
-		
-ok 957 - pathmatch: no match '[' '[\\-^]'
+	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 &&
 
-expecting success of 3070.958 'pathmatch (via ls-files): no match '[\\-^]' '['': 
-				>expect &&
-				git ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 958 - pathmatch (via ls-files): no match '[\\-^]' '['
+	test_cmp expect result
 
-expecting success of 3070.959 'ipathmatch: no match '[' '[\\-^]'': 
-			test_must_fail test-tool wildmatch ipathmatch '[' '[\\-^]'
-		
-ok 959 - ipathmatch: no match '[' '[\\-^]'
+ok 11 - using replay to also rebase a contained branch
 
-expecting success of 3070.960 'ipathmatch (via ls-files): no match '[\\-^]' '['': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 960 - ipathmatch (via ls-files): no match '[\\-^]' '['
+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
 
-expecting success of 3070.961 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing [
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 961 - cleanup after previous file test
+ok 12 - using replay on bare repo to also rebase a contained branch
 
-expecting success of 3070.962 'setup match file test for -': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 962 - setup match file test for -
+expecting success of 3650.13 'using replay to rebase multiple divergent branches': 
+	git replay --onto main ^topic1 topic2 topic4 >result &&
 
-expecting success of 3070.963 'wildmatch: match '-' '[\-_]'': 
-			test-tool wildmatch wildmatch '-' '[\-_]'
-		
-ok 963 - wildmatch: match '-' '[\-_]'
+	test_line_count = 2 result &&
+	cut -f 3 -d " " result >new-branch-tips &&
 
-expecting success of 3070.964 'wildmatch (via ls-files): match '[\-_]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 964 - wildmatch (via ls-files): match '[\-_]' '-'
+	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 &&
 
-expecting success of 3070.965 'iwildmatch: match '-' '[\-_]'': 
-			test-tool wildmatch iwildmatch '-' '[\-_]'
-		
-ok 965 - iwildmatch: match '-' '[\-_]'
+	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 &&
 
-expecting success of 3070.966 'iwildmatch (via ls-files): match '[\-_]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 966 - iwildmatch (via ls-files): match '[\-_]' '-'
+	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 &&
 
-expecting success of 3070.967 'pathmatch: match '-' '[\-_]'': 
-			test-tool wildmatch pathmatch '-' '[\-_]'
-		
-ok 967 - pathmatch: match '-' '[\-_]'
+	test_cmp expect result
 
-expecting success of 3070.968 'pathmatch (via ls-files): match '[\-_]' '-'': 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 968 - pathmatch (via ls-files): match '[\-_]' '-'
+ok 13 - using replay to rebase multiple divergent branches
 
-expecting success of 3070.969 'ipathmatch: match '-' '[\-_]'': 
-			test-tool wildmatch ipathmatch '-' '[\-_]'
-		
-ok 969 - ipathmatch: match '-' '[\-_]'
+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 &&
 
-expecting success of 3070.970 'ipathmatch (via ls-files): match '[\-_]' '-'': 
-				printf '%s' '-' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 970 - ipathmatch (via ls-files): match '[\-_]' '-'
+	test_line_count = 4 result &&
+	cut -f 3 -d " " result >new-branch-tips &&
 
-expecting success of 3070.971 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 971 - cleanup after previous file test
+	>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 &&
 
-expecting success of 3070.972 'setup match file test for ]': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 972 - setup match file test for ]
+	test_cmp expect result &&
 
-expecting success of 3070.973 'wildmatch: match ']' '[\]]'': 
-			test-tool wildmatch wildmatch ']' '[\]]'
-		
-ok 973 - wildmatch: match ']' '[\]]'
+	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 &&
 
-expecting success of 3070.974 'wildmatch (via ls-files): match '[\]]' ']'': 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 974 - wildmatch (via ls-files): match '[\]]' ']'
+	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
 
-expecting success of 3070.975 'iwildmatch: match ']' '[\]]'': 
-			test-tool wildmatch iwildmatch ']' '[\]]'
-		
-ok 975 - iwildmatch: match ']' '[\]]'
+ok 14 - using replay on bare repo to rebase multiple divergent branches, including contained ones
 
-expecting success of 3070.976 'iwildmatch (via ls-files): match '[\]]' ']'': 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 976 - iwildmatch (via ls-files): match '[\]]' ']'
+expecting success of 3650.15 'merge.directoryRenames=false': 
+	# create a test case that stress-tests the rename caching
+	git switch -c rename-onto &&
 
-expecting success of 3070.977 'pathmatch: match ']' '[\]]'': 
-			test-tool wildmatch pathmatch ']' '[\]]'
-		
-ok 977 - pathmatch: match ']' '[\]]'
+	mkdir -p to-rename &&
+	test_commit to-rename/move &&
 
-expecting success of 3070.978 'pathmatch (via ls-files): match '[\]]' ']'': 
-				printf '%s' ']' >expect &&
-				git ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 978 - pathmatch (via ls-files): match '[\]]' ']'
+	mkdir -p renamed-directory &&
+	git mv to-rename/move* renamed-directory/ &&
+	test_tick &&
+	git commit -m renamed-directory &&
 
-expecting success of 3070.979 'ipathmatch: match ']' '[\]]'': 
-			test-tool wildmatch ipathmatch ']' '[\]]'
-		
-ok 979 - ipathmatch: match ']' '[\]]'
+	git switch -c rename-from HEAD^ &&
+	test_commit to-rename/add-a-file &&
+	echo modified >to-rename/add-a-file.t &&
+	test_tick &&
+	git commit -m modified to-rename/add-a-file.t &&
 
-expecting success of 3070.980 'ipathmatch (via ls-files): match '[\]]' ']'': 
-				printf '%s' ']' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 980 - ipathmatch (via ls-files): match '[\]]' ']'
+	git -c merge.directoryRenames=false replay \
+		--onto rename-onto rename-onto..rename-from
 
-expecting success of 3070.981 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 981 - cleanup after previous file test
+Switched to a new branch 'rename-onto'
+[rename-onto 547c5a2] to-rename/move
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to-rename/move.t
+[rename-onto d9b5db2] renamed-directory
+ Author: author@name <bogus@email@address>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {to-rename => renamed-directory}/move.t (100%)
+Switched to a new branch 'rename-from'
+[rename-from c05cd91] to-rename/add-a-file
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to-rename/add-a-file.t
+[rename-from 41c1220] modified
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+update refs/heads/rename-from b7a8c434456bf7daefc305c968c9d1b62808ba73 41c12201bdcb4d7aafa265361e3e913175a37340
+ok 15 - merge.directoryRenames=false
 
-expecting success of 3070.982 'setup match file test for \]': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 982 - setup match file test for \]
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3702-add-edit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3702-add-edit/.git/
+expecting success of 3702.1 'setup': 
 
-expecting success of 3070.983 'wildmatch: no match '\]' '[\]]'': 
-			test_must_fail test-tool wildmatch wildmatch '\]' '[\]]'
-		
-ok 983 - wildmatch: no match '\]' '[\]]'
+	git add file &&
+	test_tick &&
+	git commit -m initial file
 
-expecting success of 3070.984 'wildmatch (via ls-files): no match '[\]]' '\]'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 984 - wildmatch (via ls-files): no match '[\]]' '\]'
 
-expecting success of 3070.985 'iwildmatch: no match '\]' '[\]]'': 
-			test_must_fail test-tool wildmatch iwildmatch '\]' '[\]]'
-		
-ok 985 - iwildmatch: no match '\]' '[\]]'
+[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 3070.986 'iwildmatch (via ls-files): no match '[\]]' '\]'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 986 - iwildmatch (via ls-files): no match '[\]]' '\]'
+expecting success of 3702.2 'add -e': 
 
-expecting success of 3070.987 'pathmatch: no match '\]' '[\]]'': 
-			test_must_fail test-tool wildmatch pathmatch '\]' '[\]]'
-		
-ok 987 - pathmatch: no match '\]' '[\]]'
+	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
 
-expecting success of 3070.988 'pathmatch (via ls-files): no match '[\]]' '\]'': 
-				>expect &&
-				git ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 988 - pathmatch (via ls-files): no match '[\]]' '\]'
 
-expecting success of 3070.989 'ipathmatch: no match '\]' '[\]]'': 
-			test_must_fail test-tool wildmatch ipathmatch '\]' '[\]]'
-		
-ok 989 - ipathmatch: no match '\]' '[\]]'
+ok 2 - add -e
 
-expecting success of 3070.990 'ipathmatch (via ls-files): no match '[\]]' '\]'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 990 - ipathmatch (via ls-files): no match '[\]]' '\]'
+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
 
-expecting success of 3070.991 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing "\\]"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 991 - cleanup after previous file test
+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 3070.992 'setup match file test for \': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 992 - setup match file test for \
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3703-add-magic-pathspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3703-add-magic-pathspec/.git/
+expecting success of 3703.1 'setup': 
+	mkdir sub anothersub &&
+	: >sub/foo &&
+	: >anothersub/foo
 
-expecting success of 3070.993 'wildmatch: no match '\' '[\]]'': 
-			test_must_fail test-tool wildmatch wildmatch '\' '[\]]'
-		
-ok 993 - wildmatch: no match '\' '[\]]'
+ok 1 - setup
 
-expecting success of 3070.994 'wildmatch (via ls-files): no match '[\]]' '\'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 994 - wildmatch (via ls-files): no match '[\]]' '\'
+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
 
-expecting success of 3070.995 'iwildmatch: no match '\' '[\]]'': 
-			test_must_fail test-tool wildmatch iwildmatch '\' '[\]]'
-		
-ok 995 - iwildmatch: no match '\' '[\]]'
+ok 2 - add :/
 
-expecting success of 3070.996 'iwildmatch (via ls-files): no match '[\]]' '\'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 996 - iwildmatch (via ls-files): no match '[\]]' '\'
+expecting success of 3703.3 'add :/anothersub': 
+	(cd sub && git add -n :/anothersub >actual) &&
+	test_cmp expected sub/actual
 
-expecting success of 3070.997 'pathmatch: no match '\' '[\]]'': 
-			test_must_fail test-tool wildmatch pathmatch '\' '[\]]'
-		
-ok 997 - pathmatch: no match '\' '[\]]'
+ok 3 - add :/anothersub
 
-expecting success of 3070.998 'pathmatch (via ls-files): no match '[\]]' '\'': 
-				>expect &&
-				git ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 998 - pathmatch (via ls-files): no match '[\]]' '\'
+expecting success of 3703.4 'add :/non-existent': 
+	(cd sub && test_must_fail git add -n :/non-existent)
 
-expecting success of 3070.999 'ipathmatch: no match '\' '[\]]'': 
-			test_must_fail test-tool wildmatch ipathmatch '\' '[\]]'
-		
-ok 999 - ipathmatch: no match '\' '[\]]'
+fatal: pathspec ':/non-existent' did not match any files
+ok 4 - add :/non-existent
 
-expecting success of 3070.1000 'ipathmatch (via ls-files): no match '[\]]' '\'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1000 - ipathmatch (via ls-files): no match '[\]]' '\'
+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"
 
-expecting success of 3070.1001 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing "\\"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1001 - cleanup after previous file test
+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 3070.1002 'setup match file test for ab': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1002 - setup match file test for ab
+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"
 
-expecting success of 3070.1003 'wildmatch: no match 'ab' 'a[]b'': 
-			test_must_fail test-tool wildmatch wildmatch 'ab' 'a[]b'
-		
-ok 1003 - wildmatch: no match 'ab' 'a[]b'
+fatal: pathspec ':/bar' did not match any files
+add ':/bar'
+ok 6 - a file with the same (short) magic name exists
 
-expecting success of 3070.1004 'wildmatch (via ls-files): no match 'a[]b' 'ab'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1004 - wildmatch (via ls-files): no match 'a[]b' 'ab'
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t1092-sparse-checkout-compatibility.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
 
-expecting success of 3070.1005 'iwildmatch: no match 'ab' 'a[]b'': 
-			test_must_fail test-tool wildmatch iwildmatch 'ab' 'a[]b'
-		
-ok 1005 - iwildmatch: no match 'ab' 'a[]b'
+		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 3070.1006 'iwildmatch (via ls-files): no match 'a[]b' 'ab'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1006 - iwildmatch (via ls-files): no match 'a[]b' 'ab'
+		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/..." &&
 
-expecting success of 3070.1007 'pathmatch: no match 'ab' 'a[]b'': 
-			test_must_fail test-tool wildmatch pathmatch 'ab' 'a[]b'
-		
-ok 1007 - pathmatch: no match 'ab' 'a[]b'
+		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/..." &&
 
-expecting success of 3070.1008 'pathmatch (via ls-files): no match 'a[]b' 'ab'': 
-				>expect &&
-				git ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1008 - pathmatch (via ls-files): no match 'a[]b' 'ab'
+		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/..." &&
 
-expecting success of 3070.1009 'ipathmatch: no match 'ab' 'a[]b'': 
-			test_must_fail test-tool wildmatch ipathmatch 'ab' 'a[]b'
-		
-ok 1009 - ipathmatch: no match 'ab' 'a[]b'
+		git checkout -b df-conflict-1 base &&
+		rm -rf folder1 &&
+		echo content >folder1 &&
+		git add . &&
+		git commit -m "dir to file" &&
 
-expecting success of 3070.1010 'ipathmatch (via ls-files): no match 'a[]b' 'ab'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1010 - ipathmatch (via ls-files): no match 'a[]b' 'ab'
+		git checkout -b df-conflict-2 base &&
+		rm -rf folder2 &&
+		echo content >folder2 &&
+		git add . &&
+		git commit -m "dir to file" &&
 
-expecting success of 3070.1011 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1011 - cleanup after previous file test
+		git checkout -b fd-conflict base &&
+		rm a &&
+		mkdir a &&
+		echo content >a/a &&
+		git add . &&
+		git commit -m "file to dir" &&
 
-expecting success of 3070.1012 'setup match file test for a[]b': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1012 - setup match file test for a[]b
+		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 &&
 
-expecting success of 3070.1013 'wildmatch: no match 'a[]b' 'a[]b'': 
-			test_must_fail test-tool wildmatch wildmatch 'a[]b' 'a[]b'
-		
-ok 1013 - wildmatch: no match 'a[]b' 'a[]b'
+		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" &&
 
-expecting success of 3070.1014 'wildmatch (via ls-files): match 'a[]b' 'a[]b'': 
-				printf '%s' 'a[]b' >expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1014 - wildmatch (via ls-files): match 'a[]b' 'a[]b'
+		git checkout -f base &&
+		git reset --hard
+	)
 
-expecting success of 3070.1015 'iwildmatch: no match 'a[]b' 'a[]b'': 
-			test_must_fail test-tool wildmatch iwildmatch 'a[]b' 'a[]b'
-		
-ok 1015 - iwildmatch: no match 'a[]b' 'a[]b'
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+ 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
+ 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
+ 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 3070.1016 'iwildmatch (via ls-files): match 'a[]b' 'a[]b'': 
-				printf '%s' 'a[]b' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1016 - iwildmatch (via ls-files): match 'a[]b' 'a[]b'
+expecting success of 1092.2 'sparse-index contents': 
+	init_repos &&
 
-expecting success of 3070.1017 'pathmatch: no match 'a[]b' 'a[]b'': 
-			test_must_fail test-tool wildmatch pathmatch 'a[]b' 'a[]b'
-		
-ok 1017 - pathmatch: no match 'a[]b' 'a[]b'
+	# Remove deep, add three other directories.
+	test_sparse_checkout_set \
+		"folder1 folder2 x" \
+		"before deep" &&
 
-expecting success of 3070.1018 'pathmatch (via ls-files): match 'a[]b' 'a[]b'': 
-				printf '%s' 'a[]b' >expect &&
-				git ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1018 - pathmatch (via ls-files): match 'a[]b' 'a[]b'
+	# Remove folder1, add deep
+	test_sparse_checkout_set \
+		"deep folder2 x" \
+		"before folder1" &&
 
-expecting success of 3070.1019 'ipathmatch: no match 'a[]b' 'a[]b'': 
-			test_must_fail test-tool wildmatch ipathmatch 'a[]b' 'a[]b'
-		
-ok 1019 - ipathmatch: no match 'a[]b' 'a[]b'
+	# Replace deep with deep/deeper2 (dropping deep/deeper1)
+	# Add folder1
+	test_sparse_checkout_set \
+		"deep/deeper2 folder1 folder2 x" \
+		"before deep/deeper1" &&
 
-expecting success of 3070.1020 'ipathmatch (via ls-files): match 'a[]b' 'a[]b'': 
-				printf '%s' 'a[]b' >expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1020 - ipathmatch (via ls-files): match 'a[]b' 'a[]b'
+	# 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 3070.1021 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a[]b
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1021 - cleanup after previous file test
+	# Drop down to only files at root
+	test_sparse_checkout_set \
+		"" \
+		"before deep folder1 folder2 x" &&
 
-expecting success of 3070.1022 'setup match file test for ab[': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1022 - setup match file test for ab[
+	# 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 3070.1023 'wildmatch: no match 'ab[' 'ab['': 
-			test_must_fail test-tool wildmatch wildmatch 'ab[' 'ab['
-		
-ok 1023 - wildmatch: no match 'ab[' 'ab['
+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
 
-expecting success of 3070.1024 'wildmatch (via ls-files): match 'ab[' 'ab['': 
-				printf '%s' 'ab[' >expect &&
-				git --glob-pathspecs ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1024 - wildmatch (via ls-files): match 'ab[' 'ab['
+expecting success of 1092.3 'expanded in-memory index matches full index': 
+	init_repos &&
+	test_sparse_match git ls-files --stage
 
-expecting success of 3070.1025 'iwildmatch: no match 'ab[' 'ab['': 
-			test_must_fail test-tool wildmatch iwildmatch 'ab[' 'ab['
-		
-ok 1025 - iwildmatch: no match 'ab[' 'ab['
+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
 
-expecting success of 3070.1026 'iwildmatch (via ls-files): match 'ab[' 'ab['': 
-				printf '%s' 'ab[' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1026 - iwildmatch (via ls-files): match 'ab[' 'ab['
+expecting success of 1092.4 'root directory cannot be sparse': 
+	init_repos &&
 
-expecting success of 3070.1027 'pathmatch: no match 'ab[' 'ab['': 
-			test_must_fail test-tool wildmatch pathmatch 'ab[' 'ab['
-		
-ok 1027 - pathmatch: no match 'ab[' 'ab['
+	# 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 &&
 
-expecting success of 3070.1028 'pathmatch (via ls-files): match 'ab[' 'ab['': 
-				printf '%s' 'ab[' >expect &&
-				git ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1028 - pathmatch (via ls-files): match 'ab[' 'ab['
+	# 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 3070.1029 'ipathmatch: no match 'ab[' 'ab['': 
-			test_must_fail test-tool wildmatch ipathmatch 'ab[' 'ab['
-		
-ok 1029 - ipathmatch: no match 'ab[' 'ab['
+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 3070.1030 'ipathmatch (via ls-files): match 'ab[' 'ab['': 
-				printf '%s' 'ab[' >expect &&
-				git --icase-pathspecs ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1030 - ipathmatch (via ls-files): match 'ab[' 'ab['
+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
 
-expecting success of 3070.1031 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ab[
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1031 - cleanup after previous file test
+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 3070.1032 'setup match file test for ab': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1032 - setup match file test for ab
+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
 
-expecting success of 3070.1033 'wildmatch: no match 'ab' '[!'': 
-			test_must_fail test-tool wildmatch wildmatch 'ab' '[!'
-		
-ok 1033 - wildmatch: no match 'ab' '[!'
+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 3070.1034 'wildmatch (via ls-files): no match '[!' 'ab'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[!' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1034 - wildmatch (via ls-files): no match '[!' 'ab'
+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
 
-expecting success of 3070.1035 'iwildmatch: no match 'ab' '[!'': 
-			test_must_fail test-tool wildmatch iwildmatch 'ab' '[!'
-		
-ok 1035 - iwildmatch: no match 'ab' '[!'
+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
 
-expecting success of 3070.1036 'iwildmatch (via ls-files): no match '[!' 'ab'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1036 - iwildmatch (via ls-files): no match '[!' 'ab'
+expecting success of 1092.8 'add, commit, checkout': 
+	init_repos &&
 
-expecting success of 3070.1037 'pathmatch: no match 'ab' '[!'': 
-			test_must_fail test-tool wildmatch pathmatch 'ab' '[!'
-		
-ok 1037 - pathmatch: no match 'ab' '[!'
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+	run_on_all ../edit-contents README.md &&
 
-expecting success of 3070.1038 'pathmatch (via ls-files): no match '[!' 'ab'': 
-				>expect &&
-				git ls-files -z -- '[!' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1038 - pathmatch (via ls-files): no match '[!' 'ab'
+	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 3070.1039 'ipathmatch: no match 'ab' '[!'': 
-			test_must_fail test-tool wildmatch ipathmatch 'ab' '[!'
-		
-ok 1039 - ipathmatch: no match 'ab' '[!'
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout - &&
 
-expecting success of 3070.1040 'ipathmatch (via ls-files): no match '[!' 'ab'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[!' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1040 - ipathmatch (via ls-files): no match '[!' 'ab'
+	run_on_all ../edit-contents README.md &&
 
-expecting success of 3070.1041 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1041 - cleanup after previous file test
+	test_all_match git add -A &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "Extend README.md" &&
 
-expecting success of 3070.1042 'setup match file test for ab': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1042 - setup match file test for ab
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout - &&
 
-expecting success of 3070.1043 'wildmatch: no match 'ab' '[-'': 
-			test_must_fail test-tool wildmatch wildmatch 'ab' '[-'
-		
-ok 1043 - wildmatch: no match 'ab' '[-'
+	run_on_all ../edit-contents deep/newfile &&
 
-expecting success of 3070.1044 'wildmatch (via ls-files): no match '[-' 'ab'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1044 - wildmatch (via ls-files): no match '[-' 'ab'
+	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 3070.1045 'iwildmatch: no match 'ab' '[-'': 
-			test_must_fail test-tool wildmatch iwildmatch 'ab' '[-'
-		
-ok 1045 - iwildmatch: no match 'ab' '[-'
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout -
 
-expecting success of 3070.1046 'iwildmatch (via ls-files): no match '[-' 'ab'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1046 - iwildmatch (via ls-files): no match '[-' 'ab'
+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 3070.1047 'pathmatch: no match 'ab' '[-'': 
-			test_must_fail test-tool wildmatch pathmatch 'ab' '[-'
-		
-ok 1047 - pathmatch: no match 'ab' '[-'
+expecting success of 1092.9 'git add, checkout, and reset with -p': 
+	init_repos &&
 
-expecting success of 3070.1048 'pathmatch (via ls-files): no match '[-' 'ab'': 
-				>expect &&
-				git ls-files -z -- '[-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1048 - pathmatch (via ls-files): no match '[-' 'ab'
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-expecting success of 3070.1049 'ipathmatch: no match 'ab' '[-'': 
-			test_must_fail test-tool wildmatch ipathmatch 'ab' '[-'
-		
-ok 1049 - ipathmatch: no match 'ab' '[-'
+	# Does not expand when edits are within sparse checkout.
+	run_on_all ../edit-contents deep/a &&
+	run_on_all ../edit-contents deep/deeper1/a &&
 
-expecting success of 3070.1050 'ipathmatch (via ls-files): no match '[-' 'ab'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1050 - ipathmatch (via ls-files): no match '[-' 'ab'
+	test_write_lines y n >in &&
+	run_on_all git add -p <in &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git reset -p <in &&
 
-expecting success of 3070.1051 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1051 - cleanup after previous file test
+	test_write_lines u 1 "" q >in &&
+	run_on_all git add -i <in &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git reset --hard &&
 
-expecting success of 3070.1052 'setup match file test for -': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1052 - setup match file test for -
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all ../edit-contents folder1/a &&
+	test_write_lines y n y >in &&
+	run_on_all git add -p <in &&
+	test_sparse_match git status --porcelain=v2 &&
+	test_sparse_match git reset &&
+	test_write_lines u 2 3 "" q >in &&
+	run_on_all git add -i <in &&
+	test_sparse_match git status --porcelain=v2 &&
 
-expecting success of 3070.1053 'wildmatch: match '-' '[-]'': 
-			test-tool wildmatch wildmatch '-' '[-]'
-		
-ok 1053 - wildmatch: match '-' '[-]'
+	run_on_all git add --sparse folder1 &&
+	run_on_all git commit -m "take changes" &&
+	test_write_lines y n y >in &&
+	test_sparse_match git checkout HEAD~1 --patch <in &&
+	test_sparse_match git status --porcelain=v2
 
-expecting success of 3070.1054 'wildmatch (via ls-files): match '[-]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs ls-files -z -- '[-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1054 - wildmatch (via ls-files): match '[-]' '-'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 9 - git add, checkout, and reset with -p
 
-expecting success of 3070.1055 'iwildmatch: match '-' '[-]'': 
-			test-tool wildmatch iwildmatch '-' '[-]'
-		
-ok 1055 - iwildmatch: match '-' '[-]'
+expecting success of 1092.10 'deep changes during checkout': 
+	init_repos &&
 
-expecting success of 3070.1056 'iwildmatch (via ls-files): match '[-]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1056 - iwildmatch (via ls-files): match '[-]' '-'
+	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 3070.1057 'pathmatch: match '-' '[-]'': 
-			test-tool wildmatch pathmatch '-' '[-]'
-		
-ok 1057 - pathmatch: match '-' '[-]'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 10 - deep changes during checkout
 
-expecting success of 3070.1058 'pathmatch (via ls-files): match '[-]' '-'': 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1058 - pathmatch (via ls-files): match '[-]' '-'
+expecting success of 1092.11 'checkout with modified sparse directory': 
+	init_repos &&
 
-expecting success of 3070.1059 'ipathmatch: match '-' '[-]'': 
-			test-tool wildmatch ipathmatch '-' '[-]'
-		
-ok 1059 - ipathmatch: match '-' '[-]'
+	test_all_match git checkout rename-in-to-out -- . &&
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git checkout base
 
-expecting success of 3070.1060 'ipathmatch (via ls-files): match '[-]' '-'': 
-				printf '%s' '-' >expect &&
-				git --icase-pathspecs ls-files -z -- '[-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1060 - ipathmatch (via ls-files): match '[-]' '-'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 11 - checkout with modified sparse directory
 
-expecting success of 3070.1061 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1061 - cleanup after previous file test
+expecting success of 1092.12 'checkout orphan then non-orphan': 
+	init_repos &&
 
-expecting success of 3070.1062 'setup match file test for -': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1062 - setup match file test for -
+	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 3070.1063 'wildmatch: no match '-' '[a-'': 
-			test_must_fail test-tool wildmatch wildmatch '-' '[a-'
-		
-ok 1063 - wildmatch: no match '-' '[a-'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 12 - checkout orphan then non-orphan
 
-expecting success of 3070.1064 'wildmatch (via ls-files): no match '[a-' '-'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1064 - wildmatch (via ls-files): no match '[a-' '-'
+expecting success of 1092.13 'add outside sparse cone': 
+	init_repos &&
 
-expecting success of 3070.1065 'iwildmatch: no match '-' '[a-'': 
-			test_must_fail test-tool wildmatch iwildmatch '-' '[a-'
-		
-ok 1065 - iwildmatch: no match '-' '[a-'
+	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 3070.1066 'iwildmatch (via ls-files): no match '[a-' '-'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1066 - iwildmatch (via ls-files): no match '[a-' '-'
+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 13 - add outside sparse cone
 
-expecting success of 3070.1067 'pathmatch: no match '-' '[a-'': 
-			test_must_fail test-tool wildmatch pathmatch '-' '[a-'
-		
-ok 1067 - pathmatch: no match '-' '[a-'
+expecting success of 1092.14 'commit including unstaged changes': 
+	init_repos &&
 
-expecting success of 3070.1068 'pathmatch (via ls-files): no match '[a-' '-'': 
-				>expect &&
-				git ls-files -z -- '[a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1068 - pathmatch (via ls-files): no match '[a-' '-'
+	write_script edit-file <<-\EOF &&
+	echo $1 >$2
+	EOF
 
-expecting success of 3070.1069 'ipathmatch: no match '-' '[a-'': 
-			test_must_fail test-tool wildmatch ipathmatch '-' '[a-'
-		
-ok 1069 - ipathmatch: no match '-' '[a-'
+	run_on_all ../edit-file 1 a &&
+	run_on_all ../edit-file 1 deep/a &&
 
-expecting success of 3070.1070 'ipathmatch (via ls-files): no match '[a-' '-'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1070 - ipathmatch (via ls-files): no match '[a-' '-'
+	test_all_match git commit -m "-a" -a &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1071 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1071 - cleanup after previous file test
+	run_on_all ../edit-file 2 a &&
+	run_on_all ../edit-file 2 deep/a &&
 
-expecting success of 3070.1072 'setup match file test for -': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1072 - setup match file test for -
+	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 3070.1073 'wildmatch: no match '-' '[!a-'': 
-			test_must_fail test-tool wildmatch wildmatch '-' '[!a-'
-		
-ok 1073 - wildmatch: no match '-' '[!a-'
+	run_on_all ../edit-file 3 a &&
+	run_on_all ../edit-file 3 deep/a &&
 
-expecting success of 3070.1074 'wildmatch (via ls-files): no match '[!a-' '-'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1074 - wildmatch (via ls-files): no match '[!a-' '-'
+	test_all_match git commit -m "--amend" -a --amend &&
+	test_all_match git status --porcelain=v2
 
-expecting success of 3070.1075 'iwildmatch: no match '-' '[!a-'': 
-			test_must_fail test-tool wildmatch iwildmatch '-' '[!a-'
-		
-ok 1075 - iwildmatch: no match '-' '[!a-'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 14 - commit including unstaged changes
 
-expecting success of 3070.1076 'iwildmatch (via ls-files): no match '[!a-' '-'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1076 - iwildmatch (via ls-files): no match '[!a-' '-'
+expecting success of 1092.15 'status/add: outside sparse cone': 
+	init_repos &&
 
-expecting success of 3070.1077 'pathmatch: no match '-' '[!a-'': 
-			test_must_fail test-tool wildmatch pathmatch '-' '[!a-'
-		
-ok 1077 - pathmatch: no match '-' '[!a-'
+	# 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 3070.1078 'pathmatch (via ls-files): no match '[!a-' '-'': 
-				>expect &&
-				git ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1078 - pathmatch (via ls-files): no match '[!a-' '-'
+	test_sparse_match git status &&
 
-expecting success of 3070.1079 'ipathmatch: no match '-' '[!a-'': 
-			test_must_fail test-tool wildmatch ipathmatch '-' '[!a-'
-		
-ok 1079 - ipathmatch: no match '-' '[!a-'
+	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 3070.1080 'ipathmatch (via ls-files): no match '[!a-' '-'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1080 - ipathmatch (via ls-files): no match '[!a-' '-'
+	test_sparse_match git status --porcelain=v2 &&
 
-expecting success of 3070.1081 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1081 - cleanup after previous file test
+	# 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 3070.1082 'setup match file test for -': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1082 - setup match file test for -
+	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 3070.1083 'wildmatch: match '-' '[--A]'': 
-			test-tool wildmatch wildmatch '-' '[--A]'
-		
-ok 1083 - wildmatch: match '-' '[--A]'
+	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 3070.1084 'wildmatch (via ls-files): match '[--A]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1084 - wildmatch (via ls-files): match '[--A]' '-'
+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 15 - status/add: outside sparse cone
 
-expecting success of 3070.1085 'iwildmatch: match '-' '[--A]'': 
-			test-tool wildmatch iwildmatch '-' '[--A]'
-		
-ok 1085 - iwildmatch: match '-' '[--A]'
+expecting success of 1092.16 'checkout and reset --hard': 
+	init_repos &&
 
-expecting success of 3070.1086 'iwildmatch (via ls-files): match '[--A]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1086 - iwildmatch (via ls-files): match '[--A]' '-'
+	test_all_match git checkout update-folder1 &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1087 'pathmatch: match '-' '[--A]'': 
-			test-tool wildmatch pathmatch '-' '[--A]'
-		
-ok 1087 - pathmatch: match '-' '[--A]'
+	test_all_match git checkout update-deep &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1088 'pathmatch (via ls-files): match '[--A]' '-'': 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1088 - pathmatch (via ls-files): match '[--A]' '-'
+	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 3070.1089 'ipathmatch: match '-' '[--A]'': 
-			test-tool wildmatch ipathmatch '-' '[--A]'
-		
-ok 1089 - ipathmatch: match '-' '[--A]'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 16 - checkout and reset --hard
 
-expecting success of 3070.1090 'ipathmatch (via ls-files): match '[--A]' '-'': 
-				printf '%s' '-' >expect &&
-				git --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1090 - ipathmatch (via ls-files): match '[--A]' '-'
+expecting success of 1092.17 'diff --cached': 
+	init_repos &&
 
-expecting success of 3070.1091 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1091 - cleanup after previous file test
+	write_script edit-contents <<-\EOF &&
+	echo text >>README.md
+	EOF
+	run_on_all ../edit-contents &&
 
-expecting success of 3070.1092 'setup match file test for 5': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1092 - setup match file test for 5
+	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 3070.1093 'wildmatch: match '5' '[--A]'': 
-			test-tool wildmatch wildmatch '5' '[--A]'
-		
-ok 1093 - wildmatch: match '5' '[--A]'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 17 - diff --cached
 
-expecting success of 3070.1094 'wildmatch (via ls-files): match '[--A]' '5'': 
-				printf '%s' '5' >expect &&
-				git --glob-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1094 - wildmatch (via ls-files): match '[--A]' '5'
+expecting success of 1092.18 'diff with renames and conflicts': 
+	init_repos &&
 
-expecting success of 3070.1095 'iwildmatch: match '5' '[--A]'': 
-			test-tool wildmatch iwildmatch '5' '[--A]'
-		
-ok 1095 - iwildmatch: match '5' '[--A]'
+	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 3070.1096 'iwildmatch (via ls-files): match '[--A]' '5'': 
-				printf '%s' '5' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1096 - iwildmatch (via ls-files): match '[--A]' '5'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 18 - diff with renames and conflicts
 
-expecting success of 3070.1097 'pathmatch: match '5' '[--A]'': 
-			test-tool wildmatch pathmatch '5' '[--A]'
-		
-ok 1097 - pathmatch: match '5' '[--A]'
+expecting success of 1092.19 'diff with directory/file conflicts': 
+	init_repos &&
 
-expecting success of 3070.1098 'pathmatch (via ls-files): match '[--A]' '5'': 
-				printf '%s' '5' >expect &&
-				git ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1098 - pathmatch (via ls-files): match '[--A]' '5'
+	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 3070.1099 'ipathmatch: match '5' '[--A]'': 
-			test-tool wildmatch ipathmatch '5' '[--A]'
-		
-ok 1099 - ipathmatch: match '5' '[--A]'
+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 19 - diff with directory/file conflicts
 
-expecting success of 3070.1100 'ipathmatch (via ls-files): match '[--A]' '5'': 
-				printf '%s' '5' >expect &&
-				git --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1100 - ipathmatch (via ls-files): match '[--A]' '5'
+expecting success of 1092.20 'log with pathspec outside sparse definition': 
+	init_repos &&
 
-expecting success of 3070.1101 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing 5
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1101 - cleanup after previous file test
+	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 3070.1102 'setup match file test for  ': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1102 - setup match file test for  
+	test_all_match git checkout update-folder1 &&
+	test_all_match git log -- folder1/a
 
-expecting success of 3070.1103 'wildmatch: match ' ' '[ --]'': 
-			test-tool wildmatch wildmatch ' ' '[ --]'
-		
-ok 1103 - wildmatch: match ' ' '[ --]'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 20 - log with pathspec outside sparse definition
 
-expecting success of 3070.1104 'wildmatch (via ls-files): match '[ --]' ' '': 
-				printf '%s' ' ' >expect &&
-				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1104 - wildmatch (via ls-files): match '[ --]' ' '
+expecting success of 1092.21 'blame with pathspec inside sparse definition': 
+	init_repos &&
 
-expecting success of 3070.1105 'iwildmatch: match ' ' '[ --]'': 
-			test-tool wildmatch iwildmatch ' ' '[ --]'
-		
-ok 1105 - iwildmatch: match ' ' '[ --]'
+	for file in a \
+			deep/a \
+			deep/deeper1/a \
+			deep/deeper1/deepest/a
+	do
+		test_all_match git blame $file || return 1
+	done
 
-expecting success of 3070.1106 'iwildmatch (via ls-files): match '[ --]' ' '': 
-				printf '%s' ' ' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1106 - iwildmatch (via ls-files): match '[ --]' ' '
+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 inside sparse definition
 
-expecting success of 3070.1107 'pathmatch: match ' ' '[ --]'': 
-			test-tool wildmatch pathmatch ' ' '[ --]'
-		
-ok 1107 - pathmatch: match ' ' '[ --]'
+expecting success of 1092.22 'blame with pathspec outside sparse definition': 
+	init_repos &&
+	test_sparse_match git sparse-checkout set &&
 
-expecting success of 3070.1108 'pathmatch (via ls-files): match '[ --]' ' '': 
-				printf '%s' ' ' >expect &&
-				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1108 - pathmatch (via ls-files): match '[ --]' ' '
+	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 3070.1109 'ipathmatch: match ' ' '[ --]'': 
-			test-tool wildmatch ipathmatch ' ' '[ --]'
-		
-ok 1109 - ipathmatch: match ' ' '[ --]'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 22 - blame with pathspec outside sparse definition
 
-expecting success of 3070.1110 'ipathmatch (via ls-files): match '[ --]' ' '': 
-				printf '%s' ' ' >expect &&
-				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1110 - ipathmatch (via ls-files): match '[ --]' ' '
+expecting success of 1092.23 'checkout and reset (mixed)': 
+	init_repos &&
 
-expecting success of 3070.1111 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing  
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1111 - cleanup after previous file test
+	test_all_match git checkout -b reset-test update-deep &&
+	test_all_match git reset deepest &&
 
-expecting success of 3070.1112 'setup match file test for $': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1112 - setup match file test for $
+	# 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 3070.1113 'wildmatch: match '$' '[ --]'': 
-			test-tool wildmatch wildmatch '$' '[ --]'
-		
-ok 1113 - wildmatch: match '$' '[ --]'
+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 23 - checkout and reset (mixed)
 
-expecting success of 3070.1114 'wildmatch (via ls-files): match '[ --]' '$'': 
-				printf '%s' '$' >expect &&
-				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1114 - wildmatch (via ls-files): match '[ --]' '$'
+expecting success of 1092.24 'checkout and reset (merge)': 
+	init_repos &&
 
-expecting success of 3070.1115 'iwildmatch: match '$' '[ --]'': 
-			test-tool wildmatch iwildmatch '$' '[ --]'
-		
-ok 1115 - iwildmatch: match '$' '[ --]'
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-expecting success of 3070.1116 'iwildmatch (via ls-files): match '[ --]' '$'': 
-				printf '%s' '$' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1116 - iwildmatch (via ls-files): match '[ --]' '$'
+	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 &&
 
-expecting success of 3070.1117 'pathmatch: match '$' '[ --]'': 
-			test-tool wildmatch pathmatch '$' '[ --]'
-		
-ok 1117 - pathmatch: match '$' '[ --]'
+	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
 
-expecting success of 3070.1118 'pathmatch (via ls-files): match '[ --]' '$'': 
-				printf '%s' '$' >expect &&
-				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1118 - pathmatch (via ls-files): match '[ --]' '$'
+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 (merge)
 
-expecting success of 3070.1119 'ipathmatch: match '$' '[ --]'': 
-			test-tool wildmatch ipathmatch '$' '[ --]'
-		
-ok 1119 - ipathmatch: match '$' '[ --]'
+expecting success of 1092.25 'checkout and reset (keep)': 
+	init_repos &&
 
-expecting success of 3070.1120 'ipathmatch (via ls-files): match '[ --]' '$'': 
-				printf '%s' '$' >expect &&
-				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1120 - ipathmatch (via ls-files): match '[ --]' '$'
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-expecting success of 3070.1121 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing $
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1121 - cleanup after previous file test
+	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 3070.1122 'setup match file test for -': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1122 - setup match file test for -
+	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 3070.1123 'wildmatch: match '-' '[ --]'': 
-			test-tool wildmatch wildmatch '-' '[ --]'
-		
-ok 1123 - wildmatch: match '-' '[ --]'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 25 - checkout and reset (keep)
 
-expecting success of 3070.1124 'wildmatch (via ls-files): match '[ --]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1124 - wildmatch (via ls-files): match '[ --]' '-'
+expecting success of 1092.26 'reset with pathspecs inside sparse definition': 
+	init_repos &&
 
-expecting success of 3070.1125 'iwildmatch: match '-' '[ --]'': 
-			test-tool wildmatch iwildmatch '-' '[ --]'
-		
-ok 1125 - iwildmatch: match '-' '[ --]'
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-expecting success of 3070.1126 'iwildmatch (via ls-files): match '[ --]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1126 - iwildmatch (via ls-files): match '[ --]' '-'
+	test_all_match git checkout -b reset-test update-deep &&
+	run_on_all ../edit-contents deep/a &&
 
-expecting success of 3070.1127 'pathmatch: match '-' '[ --]'': 
-			test-tool wildmatch pathmatch '-' '[ --]'
-		
-ok 1127 - pathmatch: match '-' '[ --]'
+	test_all_match git reset base -- deep/a &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1128 'pathmatch (via ls-files): match '[ --]' '-'': 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1128 - pathmatch (via ls-files): match '[ --]' '-'
+	test_all_match git reset base -- nonexistent-file &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1129 'ipathmatch: match '-' '[ --]'': 
-			test-tool wildmatch ipathmatch '-' '[ --]'
-		
-ok 1129 - ipathmatch: match '-' '[ --]'
+	test_all_match git reset deepest -- deep &&
+	test_all_match git status --porcelain=v2
 
-expecting success of 3070.1130 'ipathmatch (via ls-files): match '[ --]' '-'': 
-				printf '%s' '-' >expect &&
-				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1130 - ipathmatch (via ls-files): match '[ --]' '-'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 26 - reset with pathspecs inside sparse definition
 
-expecting success of 3070.1131 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1131 - cleanup after previous file test
+expecting success of 1092.27 'reset with pathspecs outside sparse definition': 
+	init_repos &&
+	test_all_match git checkout -b reset-test base &&
 
-expecting success of 3070.1132 'setup match file test for 0': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1132 - setup match file test for 0
+	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 3070.1133 'wildmatch: no match '0' '[ --]'': 
-			test_must_fail test-tool wildmatch wildmatch '0' '[ --]'
-		
-ok 1133 - wildmatch: no match '0' '[ --]'
+	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 3070.1134 'wildmatch (via ls-files): no match '[ --]' '0'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1134 - wildmatch (via ls-files): no match '[ --]' '0'
+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 27 - reset with pathspecs outside sparse definition
 
-expecting success of 3070.1135 'iwildmatch: no match '0' '[ --]'': 
-			test_must_fail test-tool wildmatch iwildmatch '0' '[ --]'
-		
-ok 1135 - iwildmatch: no match '0' '[ --]'
+expecting success of 1092.28 'reset with wildcard pathspec': 
+	init_repos &&
 
-expecting success of 3070.1136 'iwildmatch (via ls-files): no match '[ --]' '0'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1136 - iwildmatch (via ls-files): no match '[ --]' '0'
+	test_all_match git reset update-deep -- deep\* &&
+	test_all_match git ls-files -s -- deep &&
 
-expecting success of 3070.1137 'pathmatch: no match '0' '[ --]'': 
-			test_must_fail test-tool wildmatch pathmatch '0' '[ --]'
-		
-ok 1137 - pathmatch: no match '0' '[ --]'
+	test_all_match git reset deepest -- deep\*\*\* &&
+	test_all_match git ls-files -s -- deep &&
 
-expecting success of 3070.1138 'pathmatch (via ls-files): no match '[ --]' '0'': 
-				>expect &&
-				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1138 - pathmatch (via ls-files): no match '[ --]' '0'
+	# 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 3070.1139 'ipathmatch: no match '0' '[ --]'': 
-			test_must_fail test-tool wildmatch ipathmatch '0' '[ --]'
-		
-ok 1139 - ipathmatch: no match '0' '[ --]'
+	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 3070.1140 'ipathmatch (via ls-files): no match '[ --]' '0'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1140 - ipathmatch (via ls-files): no match '[ --]' '0'
+	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 &&
 
-expecting success of 3070.1141 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing 0
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1141 - cleanup after previous file test
+	test_sparse_match git reset base -- folder1/\* &&
+	git -C full-checkout reset base -- folder1/\* &&
+	test_all_match git ls-files -s -- folder1
 
-expecting success of 3070.1142 'setup match file test for -': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1142 - setup match file test for -
+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 28 - reset with wildcard pathspec
 
-expecting success of 3070.1143 'wildmatch: match '-' '[---]'': 
-			test-tool wildmatch wildmatch '-' '[---]'
-		
-ok 1143 - wildmatch: match '-' '[---]'
+expecting success of 1092.29 'reset hard with removed sparse dir': 
+	init_repos &&
 
-expecting success of 3070.1144 'wildmatch (via ls-files): match '[---]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs ls-files -z -- '[---]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1144 - wildmatch (via ls-files): match '[---]' '-'
+	run_on_all git rm -r --sparse folder1 &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1145 'iwildmatch: match '-' '[---]'': 
-			test-tool wildmatch iwildmatch '-' '[---]'
-		
-ok 1145 - iwildmatch: match '-' '[---]'
+	test_all_match git reset --hard &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1146 'iwildmatch (via ls-files): match '[---]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[---]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1146 - iwildmatch (via ls-files): match '[---]' '-'
+	cat >expect <<-\EOF &&
+	folder1/
+	EOF
 
-expecting success of 3070.1147 'pathmatch: match '-' '[---]'': 
-			test-tool wildmatch pathmatch '-' '[---]'
-		
-ok 1147 - pathmatch: match '-' '[---]'
+	git -C sparse-index ls-files --sparse folder1 >out &&
+	test_cmp expect out
 
-expecting success of 3070.1148 'pathmatch (via ls-files): match '[---]' '-'': 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[---]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1148 - pathmatch (via ls-files): match '[---]' '-'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 29 - reset hard with removed sparse dir
 
-expecting success of 3070.1149 'ipathmatch: match '-' '[---]'': 
-			test-tool wildmatch ipathmatch '-' '[---]'
-		
-ok 1149 - ipathmatch: match '-' '[---]'
+expecting success of 1092.30 'update-index modify outside sparse definition': 
+	init_repos &&
 
-expecting success of 3070.1150 'ipathmatch (via ls-files): match '[---]' '-'': 
-				printf '%s' '-' >expect &&
-				git --icase-pathspecs ls-files -z -- '[---]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1150 - ipathmatch (via ls-files): match '[---]' '-'
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-expecting success of 3070.1151 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1151 - cleanup after previous file test
+	# 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 &&
 
-expecting success of 3070.1152 'setup match file test for -': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1152 - setup match file test for -
+	# 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 &&
 
-expecting success of 3070.1153 'wildmatch: match '-' '[------]'': 
-			test-tool wildmatch wildmatch '-' '[------]'
-		
-ok 1153 - wildmatch: match '-' '[------]'
+	# 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
 
-expecting success of 3070.1154 'wildmatch (via ls-files): match '[------]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs ls-files -z -- '[------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1154 - wildmatch (via ls-files): match '[------]' '-'
+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 modify outside sparse definition
 
-expecting success of 3070.1155 'iwildmatch: match '-' '[------]'': 
-			test-tool wildmatch iwildmatch '-' '[------]'
-		
-ok 1155 - iwildmatch: match '-' '[------]'
+expecting success of 1092.31 'update-index --add outside sparse definition': 
+	init_repos &&
 
-expecting success of 3070.1156 'iwildmatch (via ls-files): match '[------]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1156 - iwildmatch (via ls-files): match '[------]' '-'
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-expecting success of 3070.1157 'pathmatch: match '-' '[------]'': 
-			test-tool wildmatch pathmatch '-' '[------]'
-		
-ok 1157 - pathmatch: match '-' '[------]'
+	# Create folder1, add new file
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all ../edit-contents folder1/b &&
 
-expecting success of 3070.1158 'pathmatch (via ls-files): match '[------]' '-'': 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1158 - pathmatch (via ls-files): match '[------]' '-'
+	# 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
 
-expecting success of 3070.1159 'ipathmatch: match '-' '[------]'': 
-			test-tool wildmatch ipathmatch '-' '[------]'
-		
-ok 1159 - ipathmatch: match '-' '[------]'
+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 --add outside sparse definition
 
-expecting success of 3070.1160 'ipathmatch (via ls-files): match '[------]' '-'': 
-				printf '%s' '-' >expect &&
-				git --icase-pathspecs ls-files -z -- '[------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1160 - ipathmatch (via ls-files): match '[------]' '-'
+expecting success of 1092.32 'update-index --remove outside sparse definition': 
+	init_repos &&
 
-expecting success of 3070.1161 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1161 - cleanup after previous file test
+	# 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 &&
 
-expecting success of 3070.1162 'setup match file test for j': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1162 - setup match file test for j
+	test_sparse_match git diff-index --cached HEAD &&
 
-expecting success of 3070.1163 'wildmatch: no match 'j' '[a-e-n]'': 
-			test_must_fail test-tool wildmatch wildmatch 'j' '[a-e-n]'
-		
-ok 1163 - wildmatch: no match 'j' '[a-e-n]'
+	# Reset the state
+	test_all_match git reset --hard &&
 
-expecting success of 3070.1164 'wildmatch (via ls-files): no match '[a-e-n]' 'j'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1164 - wildmatch (via ls-files): no match '[a-e-n]' 'j'
+	# 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 &&
 
-expecting success of 3070.1165 'iwildmatch: no match 'j' '[a-e-n]'': 
-			test_must_fail test-tool wildmatch iwildmatch 'j' '[a-e-n]'
-		
-ok 1165 - iwildmatch: no match 'j' '[a-e-n]'
+	test_sparse_match git diff-index --cached HEAD &&
 
-expecting success of 3070.1166 'iwildmatch (via ls-files): no match '[a-e-n]' 'j'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1166 - iwildmatch (via ls-files): no match '[a-e-n]' 'j'
+	# Reset the state
+	test_all_match git reset --hard &&
 
-expecting success of 3070.1167 'pathmatch: no match 'j' '[a-e-n]'': 
-			test_must_fail test-tool wildmatch pathmatch 'j' '[a-e-n]'
-		
-ok 1167 - pathmatch: no match 'j' '[a-e-n]'
+	# --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 &&
 
-expecting success of 3070.1168 'pathmatch (via ls-files): no match '[a-e-n]' 'j'': 
-				>expect &&
-				git ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1168 - pathmatch (via ls-files): no match '[a-e-n]' 'j'
+	test_sparse_match git diff-index --cached HEAD
 
-expecting success of 3070.1169 'ipathmatch: no match 'j' '[a-e-n]'': 
-			test_must_fail test-tool wildmatch ipathmatch 'j' '[a-e-n]'
-		
-ok 1169 - ipathmatch: no match 'j' '[a-e-n]'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 32 - update-index --remove outside sparse definition
 
-expecting success of 3070.1170 'ipathmatch (via ls-files): no match '[a-e-n]' 'j'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1170 - ipathmatch (via ls-files): no match '[a-e-n]' 'j'
+expecting success of 1092.33 'update-index with directories': 
+	init_repos &&
 
-expecting success of 3070.1171 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing j
-ok 1171 - cleanup after previous file test
+	# 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 &&
 
-expecting success of 3070.1172 'setup match file test for -': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1172 - setup match file test for -
+	# 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 3070.1173 'wildmatch: match '-' '[a-e-n]'': 
-			test-tool wildmatch wildmatch '-' '[a-e-n]'
-		
-ok 1173 - wildmatch: match '-' '[a-e-n]'
+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 33 - update-index with directories
 
-expecting success of 3070.1174 'wildmatch (via ls-files): match '[a-e-n]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1174 - wildmatch (via ls-files): match '[a-e-n]' '-'
+expecting success of 1092.34 'update-index --again file outside sparse definition': 
+	init_repos &&
 
-expecting success of 3070.1175 'iwildmatch: match '-' '[a-e-n]'': 
-			test-tool wildmatch iwildmatch '-' '[a-e-n]'
-		
-ok 1175 - iwildmatch: match '-' '[a-e-n]'
+	test_all_match git checkout -b test-reupdate &&
 
-expecting success of 3070.1176 'iwildmatch (via ls-files): match '[a-e-n]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1176 - iwildmatch (via ls-files): match '[a-e-n]' '-'
+	# Update HEAD without modifying the index to introduce a difference in
+	# folder1/a
+	test_sparse_match git reset --soft update-folder1 &&
 
-expecting success of 3070.1177 'pathmatch: match '-' '[a-e-n]'': 
-			test-tool wildmatch pathmatch '-' '[a-e-n]'
-		
-ok 1177 - pathmatch: match '-' '[a-e-n]'
+	# 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 &&
 
-expecting success of 3070.1178 'pathmatch (via ls-files): match '[a-e-n]' '-'': 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1178 - pathmatch (via ls-files): match '[a-e-n]' '-'
+	cat >expect <<-EOF &&
+	D	folder1/a
+	EOF
+	test_sparse_match git diff --name-status &&
+	test_cmp expect sparse-checkout-out
 
-expecting success of 3070.1179 'ipathmatch: match '-' '[a-e-n]'': 
-			test-tool wildmatch ipathmatch '-' '[a-e-n]'
-		
-ok 1179 - ipathmatch: match '-' '[a-e-n]'
+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 --again file outside sparse definition
 
-expecting success of 3070.1180 'ipathmatch (via ls-files): match '[a-e-n]' '-'': 
-				printf '%s' '-' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1180 - ipathmatch (via ls-files): match '[a-e-n]' '-'
+expecting success of 1092.35 'update-index --cacheinfo': 
+	init_repos &&
 
-expecting success of 3070.1181 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1181 - cleanup after previous file test
+	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 3070.1182 'setup match file test for a': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1182 - setup match file test for a
+	test_all_match git update-index --cacheinfo 100644 $deep_a_oid deep/a &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1183 'wildmatch: match 'a' '[!------]'': 
-			test-tool wildmatch wildmatch 'a' '[!------]'
-		
-ok 1183 - wildmatch: match 'a' '[!------]'
+	# 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 3070.1184 'wildmatch (via ls-files): match '[!------]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1184 - wildmatch (via ls-files): match '[!------]' 'a'
+	# 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 3070.1185 'iwildmatch: match 'a' '[!------]'': 
-			test-tool wildmatch iwildmatch 'a' '[!------]'
-		
-ok 1185 - iwildmatch: match 'a' '[!------]'
+	# 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 3070.1186 'iwildmatch (via ls-files): match '[!------]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1186 - iwildmatch (via ls-files): match '[!------]' 'a'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 35 - update-index --cacheinfo
 
-expecting success of 3070.1187 'pathmatch: match 'a' '[!------]'': 
-			test-tool wildmatch pathmatch 'a' '[!------]'
-		
-ok 1187 - pathmatch: match 'a' '[!------]'
+expecting success of 1092.36 ''read-tree -mu base HEAD update-folder2' with files outside sparse definition': 
+		init_repos &&
 
-expecting success of 3070.1188 'pathmatch (via ls-files): match '[!------]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1188 - pathmatch (via ls-files): match '[!------]' 'a'
+		# 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 3070.1189 'ipathmatch: match 'a' '[!------]'': 
-			test-tool wildmatch ipathmatch 'a' '[!------]'
-		
-ok 1189 - ipathmatch: match 'a' '[!------]'
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1190 'ipathmatch (via ls-files): match '[!------]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1190 - ipathmatch (via ls-files): match '[!------]' 'a'
+		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 3070.1191 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
 	
-Removing a
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1191 - cleanup after previous file test
+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 base HEAD update-folder2' with files outside sparse definition
 
-expecting success of 3070.1192 'setup match file test for [': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1192 - setup match file test for [
+expecting success of 1092.37 ''read-tree -mu update-folder1 update-folder2' with files outside sparse definition': 
+		init_repos &&
 
-expecting success of 3070.1193 'wildmatch: no match '[' '[]-a]'': 
-			test_must_fail test-tool wildmatch wildmatch '[' '[]-a]'
-		
-ok 1193 - wildmatch: no match '[' '[]-a]'
+		# 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 3070.1194 'wildmatch (via ls-files): no match '[]-a]' '['': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1194 - wildmatch (via ls-files): no match '[]-a]' '['
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1195 'iwildmatch: no match '[' '[]-a]'': 
-			test_must_fail test-tool wildmatch iwildmatch '[' '[]-a]'
-		
-ok 1195 - iwildmatch: no match '[' '[]-a]'
+		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 3070.1196 'iwildmatch (via ls-files): no match '[]-a]' '['': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1196 - iwildmatch (via ls-files): no match '[]-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-folder1 update-folder2' with files outside sparse definition
 
-expecting success of 3070.1197 'pathmatch: no match '[' '[]-a]'': 
-			test_must_fail test-tool wildmatch pathmatch '[' '[]-a]'
-		
-ok 1197 - pathmatch: no match '[' '[]-a]'
+expecting success of 1092.38 ''read-tree -mu update-folder2' with files outside sparse definition': 
+		init_repos &&
 
-expecting success of 3070.1198 'pathmatch (via ls-files): no match '[]-a]' '['': 
-				>expect &&
-				git ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1198 - pathmatch (via ls-files): no match '[]-a]' '['
+		# 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 3070.1199 'ipathmatch: no match '[' '[]-a]'': 
-			test_must_fail test-tool wildmatch ipathmatch '[' '[]-a]'
-		
-ok 1199 - ipathmatch: no match '[' '[]-a]'
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1200 'ipathmatch (via ls-files): no match '[]-a]' '['': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1200 - ipathmatch (via ls-files): no match '[]-a]' '['
+		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 3070.1201 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
 	
-Removing [
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1201 - cleanup after previous file test
+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 -mu update-folder2' with files outside sparse definition
 
-expecting success of 3070.1202 'setup match file test for ^': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1202 - setup match file test for ^
+expecting success of 1092.39 'read-tree --merge with edit/edit conflicts in sparse directories': 
+	init_repos &&
 
-expecting success of 3070.1203 'wildmatch: match '^' '[]-a]'': 
-			test-tool wildmatch wildmatch '^' '[]-a]'
-		
-ok 1203 - wildmatch: match '^' '[]-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 &&
 
-expecting success of 3070.1204 'wildmatch (via ls-files): match '[]-a]' '^'': 
-				printf '%s' '^' >expect &&
-				git --glob-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1204 - wildmatch (via ls-files): match '[]-a]' '^'
+	test_all_match git reset --hard &&
 
-expecting success of 3070.1205 'iwildmatch: match '^' '[]-a]'': 
-			test-tool wildmatch iwildmatch '^' '[]-a]'
-		
-ok 1205 - iwildmatch: match '^' '[]-a]'
+	test_all_match git read-tree -mu rename-base update-folder2 &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1206 'iwildmatch (via ls-files): match '[]-a]' '^'': 
-				printf '%s' '^' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1206 - iwildmatch (via ls-files): match '[]-a]' '^'
+	test_all_match git reset --hard &&
 
-expecting success of 3070.1207 'pathmatch: match '^' '[]-a]'': 
-			test-tool wildmatch pathmatch '^' '[]-a]'
-		
-ok 1207 - pathmatch: match '^' '[]-a]'
+	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
 
-expecting success of 3070.1208 'pathmatch (via ls-files): match '[]-a]' '^'': 
-				printf '%s' '^' >expect &&
-				git ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1208 - pathmatch (via ls-files): match '[]-a]' '^'
+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 --merge with edit/edit conflicts in sparse directories
 
-expecting success of 3070.1209 'ipathmatch: match '^' '[]-a]'': 
-			test-tool wildmatch ipathmatch '^' '[]-a]'
-		
-ok 1209 - ipathmatch: match '^' '[]-a]'
+expecting success of 1092.40 'read-tree --prefix': 
+	init_repos &&
 
-expecting success of 3070.1210 'ipathmatch (via ls-files): match '[]-a]' '^'': 
-				printf '%s' '^' >expect &&
-				git --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1210 - ipathmatch (via ls-files): match '[]-a]' '^'
+	# 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 3070.1211 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ^
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1211 - cleanup after previous file test
+	# 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 &&
 
-expecting success of 3070.1212 'setup match file test for ^': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1212 - setup match file test for ^
+	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 &&
 
-expecting success of 3070.1213 'wildmatch: no match '^' '[!]-a]'': 
-			test_must_fail test-tool wildmatch wildmatch '^' '[!]-a]'
-		
-ok 1213 - wildmatch: no match '^' '[!]-a]'
+	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
 
-expecting success of 3070.1214 'wildmatch (via ls-files): no match '[!]-a]' '^'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1214 - wildmatch (via ls-files): no match '[!]-a]' '^'
+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 --prefix
 
-expecting success of 3070.1215 'iwildmatch: no match '^' '[!]-a]'': 
-			test_must_fail test-tool wildmatch iwildmatch '^' '[!]-a]'
-		
-ok 1215 - iwildmatch: no match '^' '[!]-a]'
+expecting success of 1092.41 'read-tree --merge with directory-file conflicts': 
+	init_repos &&
 
-expecting success of 3070.1216 'iwildmatch (via ls-files): no match '[!]-a]' '^'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1216 - iwildmatch (via ls-files): no match '[!]-a]' '^'
+	test_all_match git checkout -b test-branch rename-base &&
 
-expecting success of 3070.1217 'pathmatch: no match '^' '[!]-a]'': 
-			test_must_fail test-tool wildmatch pathmatch '^' '[!]-a]'
-		
-ok 1217 - pathmatch: no match '^' '[!]-a]'
+	# 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 &&
 
-expecting success of 3070.1218 'pathmatch (via ls-files): no match '[!]-a]' '^'': 
-				>expect &&
-				git ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1218 - pathmatch (via ls-files): no match '[!]-a]' '^'
+	test_sparse_match git read-tree --reset -u HEAD &&
+	test_sparse_match git status --porcelain=v2 &&
 
-expecting success of 3070.1219 'ipathmatch: no match '^' '[!]-a]'': 
-			test_must_fail test-tool wildmatch ipathmatch '^' '[!]-a]'
-		
-ok 1219 - ipathmatch: no match '^' '[!]-a]'
+	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
 
-expecting success of 3070.1220 'ipathmatch (via ls-files): no match '[!]-a]' '^'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1220 - ipathmatch (via ls-files): no match '[!]-a]' '^'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 41 - read-tree --merge with directory-file conflicts
 
-expecting success of 3070.1221 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ^
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1221 - cleanup after previous file test
+expecting success of 1092.42 'merge, cherry-pick, and rebase': 
+	init_repos &&
 
-expecting success of 3070.1222 'setup match file test for [': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1222 - setup match file test for [
+	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
 
-expecting success of 3070.1223 'wildmatch: match '[' '[!]-a]'': 
-			test-tool wildmatch wildmatch '[' '[!]-a]'
-		
-ok 1223 - wildmatch: match '[' '[!]-a]'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 42 - merge, cherry-pick, and rebase
 
-expecting success of 3070.1224 'wildmatch (via ls-files): match '[!]-a]' '['': 
-				printf '%s' '[' >expect &&
-				git --glob-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1224 - wildmatch (via ls-files): match '[!]-a]' '['
+expecting success of 1092.43 'merge with conflict outside cone': 
+	init_repos &&
 
-expecting success of 3070.1225 'iwildmatch: match '[' '[!]-a]'': 
-			test-tool wildmatch iwildmatch '[' '[!]-a]'
-		
-ok 1225 - iwildmatch: match '[' '[!]-a]'
+	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 &&
 
-expecting success of 3070.1226 'iwildmatch (via ls-files): match '[!]-a]' '['': 
-				printf '%s' '[' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1226 - iwildmatch (via ls-files): match '[!]-a]' '['
+	# 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 &&
 
-expecting success of 3070.1227 'pathmatch: match '[' '[!]-a]'': 
-			test-tool wildmatch pathmatch '[' '[!]-a]'
-		
-ok 1227 - pathmatch: match '[' '[!]-a]'
+	# 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 &&
 
-expecting success of 3070.1228 'pathmatch (via ls-files): match '[!]-a]' '['': 
-				printf '%s' '[' >expect &&
-				git ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1228 - pathmatch (via ls-files): match '[!]-a]' '['
+	# 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 &&
 
-expecting success of 3070.1229 'ipathmatch: match '[' '[!]-a]'': 
-			test-tool wildmatch ipathmatch '[' '[!]-a]'
-		
-ok 1229 - ipathmatch: match '[' '[!]-a]'
+	test_all_match git merge --continue &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git rev-parse HEAD^{tree}
 
-expecting success of 3070.1230 'ipathmatch (via ls-files): match '[!]-a]' '['': 
-				printf '%s' '[' >expect &&
-				git --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1230 - ipathmatch (via ls-files): match '[!]-a]' '['
+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 43 - merge with conflict outside cone
 
-expecting success of 3070.1231 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing [
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1231 - cleanup after previous file test
+expecting success of 1092.44 'cherry-pick/rebase with conflict outside cone': 
+	init_repos &&
 
-expecting success of 3070.1232 'setup match file test for ^': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1232 - setup match file test for ^
+	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 &&
 
-expecting success of 3070.1233 'wildmatch: match '^' '[a^bc]'': 
-			test-tool wildmatch wildmatch '^' '[a^bc]'
-		
-ok 1233 - wildmatch: match '^' '[a^bc]'
+		# 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 &&
 
-expecting success of 3070.1234 'wildmatch (via ls-files): match '[a^bc]' '^'': 
-				printf '%s' '^' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1234 - wildmatch (via ls-files): match '[a^bc]' '^'
+		# 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 &&
 
-expecting success of 3070.1235 'iwildmatch: match '^' '[a^bc]'': 
-			test-tool wildmatch iwildmatch '^' '[a^bc]'
-		
-ok 1235 - iwildmatch: match '^' '[a^bc]'
+		# 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 &&
 
-expecting success of 3070.1236 'iwildmatch (via ls-files): match '[a^bc]' '^'': 
-				printf '%s' '^' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1236 - iwildmatch (via ls-files): match '[a^bc]' '^'
+		test_all_match git $OPERATION --continue &&
+		test_all_match git status --porcelain=v2 &&
+		test_all_match git rev-parse HEAD^{tree} || return 1
+	done
 
-expecting success of 3070.1237 'pathmatch: match '^' '[a^bc]'': 
-			test-tool wildmatch pathmatch '^' '[a^bc]'
-		
-ok 1237 - pathmatch: match '^' '[a^bc]'
+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 44 - cherry-pick/rebase with conflict outside cone
 
-expecting success of 3070.1238 'pathmatch (via ls-files): match '[a^bc]' '^'': 
-				printf '%s' '^' >expect &&
-				git ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1238 - pathmatch (via ls-files): match '[a^bc]' '^'
+expecting success of 1092.45 'merge with outside renames': 
+	init_repos &&
 
-expecting success of 3070.1239 'ipathmatch: match '^' '[a^bc]'': 
-			test-tool wildmatch ipathmatch '^' '[a^bc]'
-		
-ok 1239 - ipathmatch: match '^' '[a^bc]'
+	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
 
-expecting success of 3070.1240 'ipathmatch (via ls-files): match '[a^bc]' '^'': 
-				printf '%s' '^' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1240 - ipathmatch (via ls-files): match '[a^bc]' '^'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 45 - merge with outside renames
 
-expecting success of 3070.1241 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ^
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1241 - cleanup after previous file test
+expecting success of 1092.46 'cherry-pick with conflicts': 
+	init_repos &&
 
-expecting success of 3070.1242 'setup match file test for -b]': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1242 - setup match file test for -b]
+	write_script edit-conflict <<-\EOF &&
+	echo $1 >conflict
+	EOF
 
-expecting success of 3070.1243 'wildmatch: match '-b]' '[a-]b]'': 
-			test-tool wildmatch wildmatch '-b]' '[a-]b]'
-		
-ok 1243 - wildmatch: match '-b]' '[a-]b]'
+	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" &&
 
-expecting success of 3070.1244 'wildmatch (via ls-files): match '[a-]b]' '-b]'': 
-				printf '%s' '-b]' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1244 - wildmatch (via ls-files): match '[a-]b]' '-b]'
+	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" &&
 
-expecting success of 3070.1245 'iwildmatch: match '-b]' '[a-]b]'': 
-			test-tool wildmatch iwildmatch '-b]' '[a-]b]'
-		
-ok 1245 - iwildmatch: match '-b]' '[a-]b]'
+	test_all_match test_must_fail git cherry-pick to-cherry-pick
 
-expecting success of 3070.1246 'iwildmatch (via ls-files): match '[a-]b]' '-b]'': 
-				printf '%s' '-b]' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1246 - iwildmatch (via ls-files): match '[a-]b]' '-b]'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 46 - cherry-pick with conflicts
 
-expecting success of 3070.1247 'pathmatch: match '-b]' '[a-]b]'': 
-			test-tool wildmatch pathmatch '-b]' '[a-]b]'
-		
-ok 1247 - pathmatch: match '-b]' '[a-]b]'
+expecting success of 1092.47 'stash': 
+	init_repos &&
 
-expecting success of 3070.1248 'pathmatch (via ls-files): match '[a-]b]' '-b]'': 
-				printf '%s' '-b]' >expect &&
-				git ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1248 - pathmatch (via ls-files): match '[a-]b]' '-b]'
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-expecting success of 3070.1249 'ipathmatch: match '-b]' '[a-]b]'': 
-			test-tool wildmatch ipathmatch '-b]' '[a-]b]'
-		
-ok 1249 - ipathmatch: match '-b]' '[a-]b]'
+	# 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 &&
 
-expecting success of 3070.1250 'ipathmatch (via ls-files): match '[a-]b]' '-b]'': 
-				printf '%s' '-b]' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1250 - ipathmatch (via ls-files): match '[a-]b]' '-b]'
+	# Apply the sparse directory stash without reinstating the index
+	test_all_match git stash apply -q &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1251 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing -b]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1251 - cleanup after previous file test
+	# 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 &&
 
-expecting success of 3070.1252 'setup match file test for \': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1252 - setup match file test for \
+	# Apply the sparse directory stash *with* reinstating the index
+	test_all_match git stash apply --index -q &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1253 'wildmatch: no match '\' '[\]'': 
-			test_must_fail test-tool wildmatch wildmatch '\' '[\]'
-		
-ok 1253 - wildmatch: no match '\' '[\]'
+	# 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 &&
 
-expecting success of 3070.1254 'wildmatch (via ls-files): no match '[\]' '\'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1254 - wildmatch (via ls-files): no match '[\]' '\'
+	# 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 &&
 
-expecting success of 3070.1255 'iwildmatch: no match '\' '[\]'': 
-			test_must_fail test-tool wildmatch iwildmatch '\' '[\]'
-		
-ok 1255 - iwildmatch: no match '\' '[\]'
+	# Reset to base branch
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git reset --hard base &&
 
-expecting success of 3070.1256 'iwildmatch (via ls-files): no match '[\]' '\'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1256 - iwildmatch (via ls-files): no match '[\]' '\'
+	# 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 &&
 
-expecting success of 3070.1257 'pathmatch: no match '\' '[\]'': 
-			test_must_fail test-tool wildmatch pathmatch '\' '[\]'
-		
-ok 1257 - pathmatch: no match '\' '[\]'
+	test_all_match git stash pop -q &&
+	test_all_match git status --porcelain=v2
 
-expecting success of 3070.1258 'pathmatch (via ls-files): no match '[\]' '\'': 
-				>expect &&
-				git ls-files -z -- '[\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1258 - pathmatch (via ls-files): no match '[\]' '\'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 47 - stash
 
-expecting success of 3070.1259 'ipathmatch: no match '\' '[\]'': 
-			test_must_fail test-tool wildmatch ipathmatch '\' '[\]'
-		
-ok 1259 - ipathmatch: no match '\' '[\]'
+expecting success of 1092.48 'checkout-index inside sparse definition': 
+	init_repos &&
 
-expecting success of 3070.1260 'ipathmatch (via ls-files): no match '[\]' '\'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1260 - ipathmatch (via ls-files): no match '[\]' '\'
+	run_on_all rm -f deep/a &&
+	test_all_match git checkout-index -- deep/a &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1261 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing "\\"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1261 - cleanup after previous file test
+	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
 
-expecting success of 3070.1262 'setup match file test for \': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1262 - setup match file test for \
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 48 - checkout-index inside sparse definition
 
-expecting success of 3070.1263 'wildmatch: match '\' '[\\]'': 
-			test-tool wildmatch wildmatch '\' '[\\]'
-		
-ok 1263 - wildmatch: match '\' '[\\]'
+expecting success of 1092.49 'checkout-index outside sparse definition': 
+	init_repos &&
 
-expecting success of 3070.1264 'wildmatch (via ls-files): match '[\\]' '\'': 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1264 - wildmatch (via ls-files): match '[\\]' '\'
+	# 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 &&
 
-expecting success of 3070.1265 'iwildmatch: match '\' '[\\]'': 
-			test-tool wildmatch iwildmatch '\' '[\\]'
-		
-ok 1265 - iwildmatch: match '\' '[\\]'
+	# 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 &&
 
-expecting success of 3070.1266 'iwildmatch (via ls-files): match '[\\]' '\'': 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1266 - iwildmatch (via ls-files): match '[\\]' '\'
+	run_on_sparse rm -rf folder1 &&
+	echo test >new-a &&
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all cp ../new-a folder1/a &&
 
-expecting success of 3070.1267 'pathmatch: match '\' '[\\]'': 
-			test-tool wildmatch pathmatch '\' '[\\]'
-		
-ok 1267 - pathmatch: match '\' '[\\]'
+	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
 
-expecting success of 3070.1268 'pathmatch (via ls-files): match '[\\]' '\'': 
-				printf '%s' '\' >expect &&
-				git ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1268 - pathmatch (via ls-files): match '[\\]' '\'
+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 49 - checkout-index outside sparse definition
 
-expecting success of 3070.1269 'ipathmatch: match '\' '[\\]'': 
-			test-tool wildmatch ipathmatch '\' '[\\]'
-		
-ok 1269 - ipathmatch: match '\' '[\\]'
+expecting success of 1092.50 'checkout-index with folders': 
+	init_repos &&
 
-expecting success of 3070.1270 'ipathmatch (via ls-files): match '[\\]' '\'': 
-				printf '%s' '\' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1270 - ipathmatch (via ls-files): match '[\\]' '\'
+	# Inside checkout definition
+	test_all_match test_must_fail git checkout-index -f -- deep/ &&
 
-expecting success of 3070.1271 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing "\\"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1271 - cleanup after previous file test
+	# 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
 
-expecting success of 3070.1272 'setup match file test for \': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1272 - setup match file test for \
+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-09-29 14:52:08.198548970 +0000
++++ sparse-index-err	2026-09-29 14:52:08.210548970 +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 50 - checkout-index with folders
 
-expecting success of 3070.1273 'wildmatch: no match '\' '[!\\]'': 
-			test_must_fail test-tool wildmatch wildmatch '\' '[!\\]'
-		
-ok 1273 - wildmatch: no match '\' '[!\\]'
+expecting success of 1092.51 'checkout-index --all': 
+	init_repos &&
 
-expecting success of 3070.1274 'wildmatch (via ls-files): no match '[!\\]' '\'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1274 - wildmatch (via ls-files): no match '[!\\]' '\'
+	test_all_match git checkout-index --all &&
+	test_sparse_match test_path_is_missing folder1 &&
 
-expecting success of 3070.1275 'iwildmatch: no match '\' '[!\\]'': 
-			test_must_fail test-tool wildmatch iwildmatch '\' '[!\\]'
-		
-ok 1275 - iwildmatch: no match '\' '[!\\]'
+	# --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
 
-expecting success of 3070.1276 'iwildmatch (via ls-files): no match '[!\\]' '\'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1276 - iwildmatch (via ls-files): no match '[!\\]' '\'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 51 - checkout-index --all
 
-expecting success of 3070.1277 'pathmatch: no match '\' '[!\\]'': 
-			test_must_fail test-tool wildmatch pathmatch '\' '[!\\]'
-		
-ok 1277 - pathmatch: no match '\' '[!\\]'
+expecting success of 1092.52 'clean': 
+	init_repos &&
 
-expecting success of 3070.1278 'pathmatch (via ls-files): no match '[!\\]' '\'': 
-				>expect &&
-				git ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1278 - pathmatch (via ls-files): no match '[!\\]' '\'
+	echo bogus >>.gitignore &&
+	run_on_all cp ../.gitignore . &&
+	test_all_match git add .gitignore &&
+	test_all_match git commit -m "ignore bogus files" &&
 
-expecting success of 3070.1279 'ipathmatch: no match '\' '[!\\]'': 
-			test_must_fail test-tool wildmatch ipathmatch '\' '[!\\]'
-		
-ok 1279 - ipathmatch: no match '\' '[!\\]'
+	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 &&
 
-expecting success of 3070.1280 'ipathmatch (via ls-files): no match '[!\\]' '\'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1280 - ipathmatch (via ls-files): no match '[!\\]' '\'
+	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 &&
 
-expecting success of 3070.1281 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing "\\"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1281 - cleanup after previous file test
+	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 &&
 
-expecting success of 3070.1282 'setup match file test for G': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1282 - setup match file test for G
+	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 &&
 
-expecting success of 3070.1283 'wildmatch: match 'G' '[A-\\]'': 
-			test-tool wildmatch wildmatch 'G' '[A-\\]'
-		
-ok 1283 - wildmatch: match 'G' '[A-\\]'
+	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 &&
 
-expecting success of 3070.1284 'wildmatch (via ls-files): match '[A-\\]' 'G'': 
-				printf '%s' 'G' >expect &&
-				git --glob-pathspecs ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1284 - wildmatch (via ls-files): match '[A-\\]' 'G'
+	test_sparse_match test_path_is_dir folder1
 
-expecting success of 3070.1285 'iwildmatch: match 'G' '[A-\\]'': 
-			test-tool wildmatch iwildmatch 'G' '[A-\\]'
-		
-ok 1285 - iwildmatch: match 'G' '[A-\\]'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 52 - clean
 
-expecting success of 3070.1286 'iwildmatch (via ls-files): match '[A-\\]' 'G'': 
-				printf '%s' 'G' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1286 - iwildmatch (via ls-files): match '[A-\\]' 'G'
+expecting success of 1092.53 'show (cached blobs/trees)': 
+		init_repos &&
 
-expecting success of 3070.1287 'pathmatch: match 'G' '[A-\\]'': 
-			test-tool wildmatch pathmatch 'G' '[A-\\]'
-		
-ok 1287 - pathmatch: match 'G' '[A-\\]'
+		test_all_match git show :a &&
+		test_all_match git show :deep/a &&
+		test_sparse_match git show :folder1/a &&
 
-expecting success of 3070.1288 'pathmatch (via ls-files): match '[A-\\]' 'G'': 
-				printf '%s' 'G' >expect &&
-				git ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1288 - pathmatch (via ls-files): match '[A-\\]' 'G'
+		# 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/ &&
 
-expecting success of 3070.1289 'ipathmatch: match 'G' '[A-\\]'': 
-			test-tool wildmatch ipathmatch 'G' '[A-\\]'
-		
-ok 1289 - ipathmatch: match 'G' '[A-\\]'
+		# Change the sparse cone for an extra case:
+		run_on_sparse git sparse-checkout set deep/deeper1 &&
 
-expecting success of 3070.1290 'ipathmatch (via ls-files): match '[A-\\]' 'G'': 
-				printf '%s' 'G' >expect &&
-				git --icase-pathspecs ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1290 - ipathmatch (via ls-files): match '[A-\\]' 'G'
+		# deep/deeper2 is a sparse directory in the sparse index.
+		test_sparse_match test_must_fail git show :deep/deeper2/ &&
 
-expecting success of 3070.1291 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		# 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/
 	
-Removing G
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1291 - cleanup after previous file test
+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 53 - show (cached blobs/trees)
 
-expecting success of 3070.1292 'setup match file test for aaabbb': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1292 - setup match file test for aaabbb
+expecting success of 1092.54 'rev-parse (cached blobs/trees)': 
+		init_repos &&
 
-expecting success of 3070.1293 'wildmatch: no match 'aaabbb' 'b*a'': 
-			test_must_fail test-tool wildmatch wildmatch 'aaabbb' 'b*a'
-		
-ok 1293 - wildmatch: no match 'aaabbb' 'b*a'
+		test_all_match git rev-parse :a &&
+		test_all_match git rev-parse :deep/a &&
+		test_sparse_match git rev-parse :folder1/a &&
 
-expecting success of 3070.1294 'wildmatch (via ls-files): no match 'b*a' 'aaabbb'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1294 - wildmatch (via ls-files): no match 'b*a' 'aaabbb'
+		# 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/ &&
 
-expecting success of 3070.1295 'iwildmatch: no match 'aaabbb' 'b*a'': 
-			test_must_fail test-tool wildmatch iwildmatch 'aaabbb' 'b*a'
-		
-ok 1295 - iwildmatch: no match 'aaabbb' 'b*a'
+		# Change the sparse cone for an extra case:
+		run_on_sparse git sparse-checkout set deep/deeper1 &&
 
-expecting success of 3070.1296 'iwildmatch (via ls-files): no match 'b*a' 'aaabbb'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1296 - iwildmatch (via ls-files): no match 'b*a' 'aaabbb'
+		# deep/deeper2 is a sparse directory in the sparse index.
+		test_sparse_match test_must_fail git rev-parse :deep/deeper2/ &&
 
-expecting success of 3070.1297 'pathmatch: no match 'aaabbb' 'b*a'': 
-			test_must_fail test-tool wildmatch pathmatch 'aaabbb' 'b*a'
-		
-ok 1297 - pathmatch: no match 'aaabbb' 'b*a'
+		# 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 54 - rev-parse (cached blobs/trees)
 
-expecting success of 3070.1298 'pathmatch (via ls-files): no match 'b*a' 'aaabbb'': 
-				>expect &&
-				git ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1298 - pathmatch (via ls-files): no match 'b*a' 'aaabbb'
+expecting success of 1092.55 'submodule handling': 
+	init_repos &&
 
-expecting success of 3070.1299 'ipathmatch: no match 'aaabbb' 'b*a'': 
-			test_must_fail test-tool wildmatch ipathmatch 'aaabbb' 'b*a'
-		
-ok 1299 - ipathmatch: no match 'aaabbb' 'b*a'
+	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" &&
 
-expecting success of 3070.1300 'ipathmatch (via ls-files): no match 'b*a' 'aaabbb'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1300 - ipathmatch (via ls-files): no match 'b*a' 'aaabbb'
+	test_config_global protocol.file.allow always &&
 
-expecting success of 3070.1301 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing aaabbb
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1301 - cleanup after previous file test
+	run_on_all git submodule add "$(pwd)/initial-repo" modules/sub &&
+	test_all_match git commit -m "add submodule" &&
 
-expecting success of 3070.1302 'setup match file test for aabcaa': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1302 - setup match file test for aabcaa
+	# 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
 
-expecting success of 3070.1303 'wildmatch: no match 'aabcaa' '*ba*'': 
-			test_must_fail test-tool wildmatch wildmatch 'aabcaa' '*ba*'
-		
-ok 1303 - wildmatch: no match 'aabcaa' '*ba*'
+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 55 - submodule handling
 
-expecting success of 3070.1304 'wildmatch (via ls-files): no match '*ba*' 'aabcaa'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1304 - wildmatch (via ls-files): no match '*ba*' 'aabcaa'
+expecting success of 1092.56 'git apply functionality': 
+	init_repos &&
 
-expecting success of 3070.1305 'iwildmatch: no match 'aabcaa' '*ba*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'aabcaa' '*ba*'
-		
-ok 1305 - iwildmatch: no match 'aabcaa' '*ba*'
+	test_all_match git checkout base &&
 
-expecting success of 3070.1306 'iwildmatch (via ls-files): no match '*ba*' 'aabcaa'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1306 - iwildmatch (via ls-files): no match '*ba*' 'aabcaa'
+	git -C full-checkout diff base..merge-right -- deep >patch-in-sparse &&
+	git -C full-checkout diff base..merge-right -- folder2 >patch-outside &&
 
-expecting success of 3070.1307 'pathmatch: no match 'aabcaa' '*ba*'': 
-			test_must_fail test-tool wildmatch pathmatch 'aabcaa' '*ba*'
-		
-ok 1307 - pathmatch: no match 'aabcaa' '*ba*'
+	# Apply a patch to a file inside the sparse definition
+	test_all_match git apply --index --stat ../patch-in-sparse &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3070.1308 'pathmatch (via ls-files): no match '*ba*' 'aabcaa'': 
-				>expect &&
-				git ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1308 - pathmatch (via ls-files): no match '*ba*' 'aabcaa'
+	# Apply a patch to a file outside the sparse definition
+	test_sparse_match test_must_fail git apply ../patch-outside &&
+	grep "No such file or directory" sparse-checkout-err &&
 
-expecting success of 3070.1309 'ipathmatch: no match 'aabcaa' '*ba*'': 
-			test_must_fail test-tool wildmatch ipathmatch 'aabcaa' '*ba*'
-		
-ok 1309 - ipathmatch: no match 'aabcaa' '*ba*'
+	# But it works with --index and --cached
+	test_all_match git apply --index --stat ../patch-outside &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git reset --hard &&
+	test_all_match git apply --cached --stat ../patch-outside &&
+	test_all_match git status --porcelain=v2
 
-expecting success of 3070.1310 'ipathmatch (via ls-files): no match '*ba*' 'aabcaa'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1310 - ipathmatch (via ls-files): no match '*ba*' 'aabcaa'
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+error: folder2/a: No such file or directory
+ok 56 - git apply functionality
 
-expecting success of 3070.1311 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing aabcaa
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1311 - cleanup after previous file test
+expecting success of 1092.57 'sparse-index is expanded and converted back': 
+	init_repos &&
 
-expecting success of 3070.1312 'setup match file test for ,': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1312 - setup match file test for ,
+	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 &&
 
-expecting success of 3070.1313 'wildmatch: match ',' '[,]'': 
-			test-tool wildmatch wildmatch ',' '[,]'
-		
-ok 1313 - wildmatch: match ',' '[,]'
+	# 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
 
-expecting success of 3070.1314 'wildmatch (via ls-files): match '[,]' ','': 
-				printf '%s' ',' >expect &&
-				git --glob-pathspecs ls-files -z -- '[,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1314 - wildmatch (via ls-files): match '[,]' ','
+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":"20260929T145210.874432Z-H5c947e1c-P0020b200","thread":"main","time":"2026-09-29T14:52:10.877096Z","file":"sparse-index.c","line":237,"repo":1,"nesting":1,"category":"index","label":"convert_to_sparse"}
+{"event":"region_leave","sid":"20260929T145210.874432Z-H5c947e1c-P0020b200","thread":"main","time":"2026-09-29T14:52:10.877220Z","file":"sparse-index.c","line":252,"repo":1,"t_rel":0.000125,"nesting":1,"category":"index","label":"convert_to_sparse"}
+{"event":"region_enter","sid":"20260929T145210.874432Z-H5c947e1c-P0020b200","thread":"main","time":"2026-09-29T14:52:10.875821Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145210.874432Z-H5c947e1c-P0020b200","thread":"main","time":"2026-09-29T14:52:10.877506Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145210.874432Z-H5c947e1c-P0020b200","thread":"main","time":"2026-09-29T14:52:10.876599Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000778,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145210.874432Z-H5c947e1c-P0020b200","thread":"main","time":"2026-09-29T14:52:10.877654Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000149,"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":"20260929T145210.892821Z-H5c947e1c-P0020b249","thread":"main","time":"2026-09-29T14:52:10.893686Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145210.892821Z-H5c947e1c-P0020b249","thread":"main","time":"2026-09-29T14:52:10.894567Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000881,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 57 - sparse-index is expanded and converted back
 
-expecting success of 3070.1315 'iwildmatch: match ',' '[,]'': 
-			test-tool wildmatch iwildmatch ',' '[,]'
-		
-ok 1315 - iwildmatch: match ',' '[,]'
+expecting success of 1092.58 'index.sparse disabled inline uses full index': 
+	init_repos &&
 
-expecting success of 3070.1316 'iwildmatch (via ls-files): match '[,]' ','': 
-				printf '%s' ',' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1316 - iwildmatch (via ls-files): match '[,]' ','
+	# 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 &&
 
-expecting success of 3070.1317 'pathmatch: match ',' '[,]'': 
-			test-tool wildmatch pathmatch ',' '[,]'
-		
-ok 1317 - pathmatch: match ',' '[,]'
+	# 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 &&
 
-expecting success of 3070.1318 'pathmatch (via ls-files): match '[,]' ','': 
-				printf '%s' ',' >expect &&
-				git ls-files -z -- '[,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1318 - pathmatch (via ls-files): match '[,]' ','
+	# 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
 
-expecting success of 3070.1319 'ipathmatch: match ',' '[,]'': 
-			test-tool wildmatch ipathmatch ',' '[,]'
-		
-ok 1319 - ipathmatch: match ',' '[,]'
+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.
 
-expecting success of 3070.1320 'ipathmatch (via ls-files): match '[,]' ','': 
-				printf '%s' ',' >expect &&
-				git --icase-pathspecs ls-files -z -- '[,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1320 - ipathmatch (via ls-files): match '[,]' ','
+nothing to commit, working tree clean
+{"event":"region_enter","sid":"20260929T145211.003118Z-H5c947e1c-P0020b3f1","thread":"main","time":"2026-09-29T14:52:11.003933Z","file":"sparse-index.c","line":372,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145211.003118Z-H5c947e1c-P0020b3f1","thread":"main","time":"2026-09-29T14:52:11.004785Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000852,"nesting":2,"category":"index","label":"ensure_full_index"}
+On branch base
+You are in a sparse checkout.
 
-expecting success of 3070.1321 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ,
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1321 - cleanup after previous file test
+nothing to commit, working tree clean
+{"event":"region_enter","sid":"20260929T145211.019234Z-H5c947e1c-P0020b441","thread":"main","time":"2026-09-29T14:52:11.021200Z","file":"sparse-index.c","line":237,"repo":1,"nesting":2,"category":"index","label":"convert_to_sparse"}
+{"event":"region_leave","sid":"20260929T145211.019234Z-H5c947e1c-P0020b441","thread":"main","time":"2026-09-29T14:52:11.021330Z","file":"sparse-index.c","line":252,"repo":1,"t_rel":0.000130,"nesting":2,"category":"index","label":"convert_to_sparse"}
+On branch base
+You are in a sparse checkout.
 
-expecting success of 3070.1322 'setup match file test for ,': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1322 - setup match file test for ,
+nothing to commit, working tree clean
+ok 58 - index.sparse disabled inline uses full index
 
-expecting success of 3070.1323 'wildmatch: match ',' '[\\,]'': 
-			test-tool wildmatch wildmatch ',' '[\\,]'
-		
-ok 1323 - wildmatch: match ',' '[\\,]'
+expecting success of 1092.59 'sparse-index is not expanded': 
+	init_repos &&
 
-expecting success of 3070.1324 'wildmatch (via ls-files): match '[\\,]' ','': 
-				printf '%s' ',' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1324 - wildmatch (via ls-files): match '[\\,]' ','
+	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 &&
 
-expecting success of 3070.1325 'iwildmatch: match ',' '[\\,]'': 
-			test-tool wildmatch iwildmatch ',' '[\\,]'
-		
-ok 1325 - iwildmatch: match ',' '[\\,]'
+	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 . &&
 
-expecting success of 3070.1326 'iwildmatch (via ls-files): match '[\\,]' ','': 
-				printf '%s' ',' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1326 - iwildmatch (via ls-files): match '[\\,]' ','
+	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 &&
 
-expecting success of 3070.1327 'pathmatch: match ',' '[\\,]'': 
-			test-tool wildmatch pathmatch ',' '[\\,]'
-		
-ok 1327 - pathmatch: match ',' '[\\,]'
+	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 &&
 
-expecting success of 3070.1328 'pathmatch (via ls-files): match '[\\,]' ','': 
-				printf '%s' ',' >expect &&
-				git ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1328 - pathmatch (via ls-files): match '[\\,]' ','
+	ensure_not_expanded reset base -- deep/a &&
+	ensure_not_expanded reset base -- nonexistent-file &&
+	ensure_not_expanded reset deepest -- deep &&
 
-expecting success of 3070.1329 'ipathmatch: match ',' '[\\,]'': 
-			test-tool wildmatch ipathmatch ',' '[\\,]'
-		
-ok 1329 - ipathmatch: match ',' '[\\,]'
+	# 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/ &&
 
-expecting success of 3070.1330 'ipathmatch (via ls-files): match '[\\,]' ','': 
-				printf '%s' ',' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1330 - ipathmatch (via ls-files): match '[\\,]' ','
+	# Wildcard identifies only in-cone files, no index expansion
+	ensure_not_expanded reset deepest -- deep/\* &&
 
-expecting success of 3070.1331 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ,
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1331 - cleanup after previous file test
+	# Wildcard identifies only full sparse directories, no index expansion
+	ensure_not_expanded reset deepest -- folder\* &&
 
-expecting success of 3070.1332 'setup match file test for \': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1332 - setup match file test for \
+	ensure_not_expanded clean -fd &&
 
-expecting success of 3070.1333 'wildmatch: match '\' '[\\,]'': 
-			test-tool wildmatch wildmatch '\' '[\\,]'
-		
-ok 1333 - wildmatch: match '\' '[\\,]'
+	ensure_not_expanded checkout -f update-deep &&
+	test_config -C sparse-index pull.twohead ort &&
+	(
+		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
+	)
 
-expecting success of 3070.1334 'wildmatch (via ls-files): match '[\\,]' '\'': 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1334 - wildmatch (via ls-files): match '[\\,]' '\'
+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
 
-expecting success of 3070.1335 'iwildmatch: match '\' '[\\,]'': 
-			test-tool wildmatch iwildmatch '\' '[\\,]'
-		
-ok 1335 - iwildmatch: match '\' '[\\,]'
+expecting success of 1092.60 'sparse-index is not expanded: merge conflict in cone': 
+	init_repos &&
 
-expecting success of 3070.1336 'iwildmatch (via ls-files): match '[\\,]' '\'': 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1336 - iwildmatch (via ls-files): match '[\\,]' '\'
+	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 &&
 
-expecting success of 3070.1337 'pathmatch: match '\' '[\\,]'': 
-			test-tool wildmatch pathmatch '\' '[\\,]'
-		
-ok 1337 - pathmatch: match '\' '[\\,]'
+	(
+		git -C sparse-index config pull.twohead ort &&
+		ensure_not_expanded ! merge -m merged expand-right
+	)
 
-expecting success of 3070.1338 'pathmatch (via ls-files): match '[\\,]' '\'': 
-				printf '%s' '\' >expect &&
-				git ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1338 - pathmatch (via ls-files): match '[\\,]' '\'
+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 60 - sparse-index is not expanded: merge conflict in cone
 
-expecting success of 3070.1339 'ipathmatch: match '\' '[\\,]'': 
-			test-tool wildmatch ipathmatch '\' '[\\,]'
-		
-ok 1339 - ipathmatch: match '\' '[\\,]'
+expecting success of 1092.61 'sparse-index is not expanded: stash': 
+	init_repos &&
 
-expecting success of 3070.1340 'ipathmatch (via ls-files): match '[\\,]' '\'': 
-				printf '%s' '\' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1340 - ipathmatch (via ls-files): match '[\\,]' '\'
+	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} &&
 
-expecting success of 3070.1341 'cleanup after previous file test': 
+	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 61 - sparse-index is not expanded: stash
+
+expecting success of 1092.62 '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 62 - describe tested on all
+
+expecting success of 1092.63 '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 63 - sparse-index is not expanded: describe
+
+expecting success of 1092.64 '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 64 - sparse index is not expanded: diff and diff-index
+
+expecting success of 1092.65 '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 65 - sparse index is not expanded: show and rev-parse
+
+expecting success of 1092.66 '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 66 - sparse index is not expanded: update-index
+
+expecting success of 1092.67 '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 67 - sparse index is not expanded: blame
+
+expecting success of 1092.68 '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 68 - sparse index is not expanded: fetch/pull
+
+expecting success of 1092.69 '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 69 - sparse index is not expanded: read-tree
+
+expecting success of 1092.70 '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 70 - ls-files
+
+expecting success of 1092.71 '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 71 - sparse index is not expanded: sparse-checkout
+
+expecting success of 1092.72 '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 72 - reset mixed and checkout orphan
+
+expecting success of 1092.73 '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 73 - add everything with deep new file
+
+expecting success of 1092.74 '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 74 - checkout behaves oddly with df-conflict-1
+
+expecting success of 1092.75 '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 75 - checkout behaves oddly with df-conflict-2
+
+expecting success of 1092.76 '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 76 - mv directory from out-of-cone to in-cone
+
+expecting success of 1092.77 '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 77 - rm pathspec inside sparse definition
+
+expecting success of 1092.78 '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 78 - rm pathspec outside sparse definition
+
+expecting success of 1092.79 '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":"20260929T145217.665782Z-H5c947e1c-P00212073","thread":"main","time":"2026-09-29T14:52:17.667143Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145217.665782Z-H5c947e1c-P00212073","thread":"main","time":"2026-09-29T14:52:17.668591Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145217.683069Z-H5c947e1c-P002120aa","thread":"main","time":"2026-09-29T14:52:17.683906Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145217.683069Z-H5c947e1c-P002120aa","thread":"main","time":"2026-09-29T14:52:17.685660Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145217.701390Z-H5c947e1c-P002120fe","thread":"main","time":"2026-09-29T14:52:17.702183Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145217.701390Z-H5c947e1c-P002120fe","thread":"main","time":"2026-09-29T14:52:17.703568Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 79 - rm pathspec expands index when necessary
+
+expecting success of 1092.80 '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 80 - sparse index is not expanded: rm
+
+expecting success of 1092.81 '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 81 - grep with and --cached
+
+expecting success of 1092.82 '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 82 - grep is not expanded
+
+checking known breakage of 1092.83 '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)
+full-checkout/folder1/a:a
+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"
+sparse-checkout/folder1/a:a
+sparse-index/folder1/a:a
+{"event":"region_enter","sid":"20260929T145218.687914Z-H5c947e1c-P002130a6","thread":"main","time":"2026-09-29T14:52:18.690754Z","file":"sparse-index.c","line":372,"repo":4,"nesting":2,"category":"index","label":"ensure_full_index"}
+not ok 83 - grep within submodules is not expanded # TODO known breakage
+
+expecting success of 1092.84 '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 84 - grep sparse directory within submodules
+
+expecting success of 1092.85 '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 85 - write-tree
+
+expecting success of 1092.86 '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 86 - sparse-index is not expanded: write-tree
+
+expecting success of 1092.87 '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 87 - diff-files with pathspec inside sparse definition
+
+expecting success of 1092.88 '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 88 - diff-files with pathspec outside sparse definition
+
+expecting success of 1092.89 '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 89 - sparse index is not expanded: diff-files
+
+expecting success of 1092.90 '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 90 - diff-tree
+
+expecting success of 1092.91 '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 91 - sparse-index is not expanded: diff-tree
+
+expecting success of 1092.92 '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 92 - worktree
+
+expecting success of 1092.93 '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 93 - worktree is not expanded
+
+expecting success of 1092.94 '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 94 - check-attr with pathspec inside sparse definition
+
+expecting success of 1092.95 '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 95 - check-attr with pathspec outside sparse definition
+
+checking known breakage of 1092.96 '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 96 - diff --check with pathspec outside sparse definition # TODO known breakage
+
+expecting success of 1092.97 '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 97 - sparse-index is not expanded: check-attr
+
+expecting success of 1092.98 'sparse-index is not expanded: git apply': 
+	init_repos &&
+
+	git -C sparse-index checkout base &&
+	git -C full-checkout diff base..merge-right -- deep >patch-in-sparse &&
+	git -C full-checkout diff base..merge-right -- folder2 >patch-outside &&
+
+	# Apply a patch to a file inside the sparse definition
+	ensure_not_expanded apply --index --stat ../patch-in-sparse &&
+
+	# Apply a patch to a file outside the sparse definition
+	# Fails when caring about the worktree.
+	ensure_not_expanded ! apply ../patch-outside &&
+
+	# Expands when using --index.
+	ensure_expanded apply --index ../patch-outside &&
+
+	# Does not when index is partially expanded.
+	git -C sparse-index reset --hard &&
+	ensure_not_expanded apply --cached ../patch-outside &&
+
+	# Try again with a reset and collapsed index.
+	git -C sparse-index reset --hard &&
+	git -C sparse-index sparse-checkout reapply &&
+
+	# Expands when index is collapsed.
+	ensure_expanded apply --cached ../patch-outside
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Already on 'base'
+{"event":"region_enter","sid":"20260929T145222.746182Z-H5c947e1c-P002167db","thread":"main","time":"2026-09-29T14:52:22.747099Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145222.746182Z-H5c947e1c-P002167db","thread":"main","time":"2026-09-29T14:52:22.749437Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145222.746182Z-H5c947e1c-P002167db","thread":"main","time":"2026-09-29T14:52:22.748005Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000905,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145222.746182Z-H5c947e1c-P002167db","thread":"main","time":"2026-09-29T14:52:22.749592Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000155,"nesting":1,"category":"index","label":"ensure_full_index"}
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+{"event":"region_enter","sid":"20260929T145222.791172Z-H5c947e1c-P00216857","thread":"main","time":"2026-09-29T14:52:22.792050Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145222.791172Z-H5c947e1c-P00216857","thread":"main","time":"2026-09-29T14:52:22.794027Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145222.791172Z-H5c947e1c-P00216857","thread":"main","time":"2026-09-29T14:52:22.793267Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.001217,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145222.791172Z-H5c947e1c-P00216857","thread":"main","time":"2026-09-29T14:52:22.794177Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000151,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 98 - sparse-index is not expanded: git apply
+
+expecting success of 1092.99 'sparse-index is not expanded: git add -p': 
+	init_repos &&
+
+	# Does not expand when edits are within sparse checkout.
+	echo "new content" >sparse-index/deep/a &&
+	echo "new content" >sparse-index/deep/deeper1/a &&
+	test_write_lines y n >in &&
+	ensure_not_expanded add -p <in &&
+	git -C sparse-index reset &&
+	ensure_not_expanded add -i <in &&
+
+	# -p does expand when edits are outside sparse checkout.
+	mkdir -p sparse-index/folder1 &&
+	echo "new content" >sparse-index/folder1/a &&
+	test_write_lines y n y >in &&
+	ensure_expanded add -p <in &&
+
+	# Fully reset the index.
+	git -C sparse-index reset --hard &&
+	git -C sparse-index sparse-checkout reapply &&
+
+	# -i does expand when edits are outside sparse checkout.
+	mkdir -p sparse-index/folder1 &&
+	echo "new content" >sparse-index/folder1/a &&
+	test_write_lines u 2 3 "" q >in &&
+	ensure_expanded add -i <in
+
+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	deep/a
+M	deep/deeper1/a
+{"event":"region_enter","sid":"20260929T145222.964540Z-H5c947e1c-P00216a6f","thread":"main","time":"2026-09-29T14:52:22.965403Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145222.964540Z-H5c947e1c-P00216a6f","thread":"main","time":"2026-09-29T14:52:22.967087Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145222.964540Z-H5c947e1c-P00216a6f","thread":"main","time":"2026-09-29T14:52:22.966277Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000874,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145222.964540Z-H5c947e1c-P00216a6f","thread":"main","time":"2026-09-29T14:52:22.967234Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000147,"nesting":1,"category":"index","label":"ensure_full_index"}
+HEAD is now at 703fd3e initial commit
+{"event":"region_enter","sid":"20260929T145223.004110Z-H5c947e1c-P00216af0","thread":"main","time":"2026-09-29T14:52:23.004965Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145223.004110Z-H5c947e1c-P00216af0","thread":"main","time":"2026-09-29T14:52:23.006607Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145223.004110Z-H5c947e1c-P00216af0","thread":"main","time":"2026-09-29T14:52:23.005795Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000830,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145223.004110Z-H5c947e1c-P00216af0","thread":"main","time":"2026-09-29T14:52:23.006752Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000145,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 99 - sparse-index is not expanded: git add -p
+
+expecting success of 1092.100 'sparse-index is not expanded: checkout -p, reset -p': 
+	init_repos &&
+
+	# Does not expand when edits are within sparse checkout.
+	echo "new content" >sparse-index/deep/a &&
+	echo "new content" >sparse-index/deep/deeper1/a &&
+	git -C sparse-index commit -a -m "inside-changes" &&
+
+	test_write_lines y y >in &&
+	ensure_not_expanded checkout HEAD~1 --patch <in &&
+
+	echo "new content" >sparse-index/deep/a &&
+	echo "new content" >sparse-index/deep/deeper1/a &&
+	git -C sparse-index add . &&
+	ensure_not_expanded reset --patch <in &&
+
+	# -p does expand when edits are outside sparse checkout.
+	mkdir -p sparse-index/folder1 &&
+	echo "new content" >sparse-index/folder1/a &&
+	git -C sparse-index add --sparse folder1 &&
+	git -C sparse-index sparse-checkout reapply &&
+	ensure_expanded reset --patch <in &&
+
+	# Fully reset the index.
+	mkdir -p sparse-index/folder1 &&
+	echo "new content" >sparse-index/folder1/a &&
+	git -C sparse-index add --sparse folder1 &&
+	git -C sparse-index commit -m "folder1 change" &&
+	git -C sparse-index sparse-checkout reapply &&
+	ensure_expanded checkout HEAD~1 --patch <in
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+[base caa4921] inside-changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+{"event":"region_enter","sid":"20260929T145223.213662Z-H5c947e1c-P00216d71/20260929T145223.229632Z-H5c947e1c-P00216da1","thread":"main","time":"2026-09-29T14:52:23.230620Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145223.213662Z-H5c947e1c-P00216d71/20260929T145223.229632Z-H5c947e1c-P00216da1","thread":"main","time":"2026-09-29T14:52:23.232381Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145223.213662Z-H5c947e1c-P00216d71/20260929T145223.229632Z-H5c947e1c-P00216da1","thread":"main","time":"2026-09-29T14:52:23.231539Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000919,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145223.213662Z-H5c947e1c-P00216d71/20260929T145223.229632Z-H5c947e1c-P00216da1","thread":"main","time":"2026-09-29T14:52:23.232554Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000173,"nesting":1,"category":"index","label":"ensure_full_index"}
+[base 022c8d0] folder1 change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+{"event":"region_enter","sid":"20260929T145223.275812Z-H5c947e1c-P00216e44/20260929T145223.284117Z-H5c947e1c-P00216e5f","thread":"main","time":"2026-09-29T14:52:23.285025Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145223.275812Z-H5c947e1c-P00216e44/20260929T145223.284117Z-H5c947e1c-P00216e5f","thread":"main","time":"2026-09-29T14:52:23.285939Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000914,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 100 - sparse-index is not expanded: checkout -p, reset -p
+
+expecting success of 1092.101 '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 101 - advice.sparseIndexExpanded
+
+expecting success of 1092.102 '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":"20260929T145223.661754Z-H5c947e1c-P002173ab","thread":"main","time":"2026-09-29T14:52:23.662687Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145223.661754Z-H5c947e1c-P002173ab","thread":"main","time":"2026-09-29T14:52:23.663601Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000914,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 102 - cat-file -p
+
+expecting success of 1092.103 '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":"20260929T145223.880954Z-H5c947e1c-P002176f9","thread":"main","time":"2026-09-29T14:52:23.881793Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145223.880954Z-H5c947e1c-P002176f9","thread":"main","time":"2026-09-29T14:52:23.882619Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000826,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145223.922208Z-H5c947e1c-P002177a8","thread":"main","time":"2026-09-29T14:52:23.923127Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145223.922208Z-H5c947e1c-P002177a8","thread":"main","time":"2026-09-29T14:52:23.923908Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000782,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 103 - cat-file --batch
+
+# still have 2 known breakage(s)
+# passed all remaining 101 test(s)
+1..103
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3510-cherry-pick-sequence.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3510-cherry-pick-sequence/.git/
+expecting success of 3510.1 'setup': 
+	git config set advice.detachedhead false &&
+	echo unrelated >unrelated &&
+	git add unrelated &&
+	test_commit initial foo a &&
+	test_commit base foo b &&
+	test_commit unrelatedpick unrelated reallyunrelated &&
+	test_commit picked foo c &&
+	test_commit anotherpick foo d &&
+	test_commit yetanotherpick foo e &&
+	pristine_detach initial &&
+	test_commit conflicting unrelated
+
+[master (root-commit) df2a63d] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 foo
+ create mode 100644 unrelated
+[master dc0113b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 24c5742] unrelatedpick
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master fdc0b12] picked
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 965fed4] anotherpick
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 55c7d12] yetanotherpick
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[detached HEAD d520364] conflicting
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 3510.2 'cherry-pick persists data on failure': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick -s base..anotherpick &&
+	test_path_is_dir .git/sequencer &&
+	test_path_is_file .git/sequencer/head &&
+	test_path_is_file .git/sequencer/todo &&
+	test_path_is_file .git/sequencer/opts
+
+Previous HEAD position was d520364 conflicting
+HEAD is now at df2a63d initial
+[detached HEAD 2fa73e8] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+ok 2 - cherry-pick persists data on failure
+
+expecting success of 3510.3 'cherry-pick mid-cherry-pick-sequence': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick base..anotherpick &&
+	test_cmp_rev picked CHERRY_PICK_HEAD &&
+	# "oops, I forgot that these patches rely on the change from base"
+	git checkout HEAD foo &&
+	git cherry-pick base &&
+	git cherry-pick picked &&
+	git cherry-pick --continue &&
+	git diff --exit-code anotherpick
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  2fa73e8 unrelatedpick
+
+HEAD is now at df2a63d initial
+[detached HEAD 7fdfeeb] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+Updated 1 path from a9867be
+[detached HEAD 28eafda] base
+ 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 4a5cd69] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 49d5115] anotherpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - cherry-pick mid-cherry-pick-sequence
+
+expecting success of 3510.4 'cherry-pick persists opts correctly': 
+	pristine_detach initial &&
+	# to make sure that the session to cherry-pick a sequence
+	# gets interrupted, use a high-enough number that is larger
+	# than the number of parents of any commit we have created
+	mainline=4 &&
+	test_expect_code 128 git cherry-pick -s -m $mainline --strategy=recursive -X patience -X ours --edit initial..anotherpick &&
+	test_path_is_dir .git/sequencer &&
+	test_path_is_file .git/sequencer/head &&
+	test_path_is_file .git/sequencer/todo &&
+	test_path_is_file .git/sequencer/opts &&
+	echo "true" >expect &&
+	git config --file=.git/sequencer/opts --get-all options.signoff >actual &&
+	test_cmp expect actual &&
+	echo "$mainline" >expect &&
+	git config --file=.git/sequencer/opts --get-all options.mainline >actual &&
+	test_cmp expect actual &&
+	echo "recursive" >expect &&
+	git config --file=.git/sequencer/opts --get-all options.strategy >actual &&
+	test_cmp expect actual &&
+	cat >expect <<-\EOF &&
+	patience
+	ours
+	EOF
+	git config --file=.git/sequencer/opts --get-all options.strategy-option >actual &&
+	test_cmp expect actual &&
+	echo "true" >expect &&
+	git config --file=.git/sequencer/opts --get-all options.edit >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 4 commits behind, not connected to
+any of your branches:
+
+  49d5115 anotherpick
+  4a5cd69 picked
+  28eafda base
+  7fdfeeb unrelatedpick
+
+HEAD is now at df2a63d initial
+error: commit dc0113b541050fbc624688af31e35b1d246f20fc does not have parent 4
+fatal: cherry-pick failed
+ok 4 - cherry-pick persists opts correctly
+
+expecting success of 3510.5 'cherry-pick persists --empty=stop correctly': 
+	pristine_detach yetanotherpick &&
+	# Picking `anotherpick` forces a conflict so that we stop. That
+	# commit is then skipped, after which we pick `yetanotherpick`
+	# while already on `yetanotherpick` to cause an empty commit
+	test_must_fail git cherry-pick --empty=stop anotherpick yetanotherpick &&
+	test_must_fail git cherry-pick --skip 2>msg &&
+	test_grep "The previous cherry-pick is now empty" msg &&
+	rm msg &&
+	git cherry-pick --abort
+
+Previous HEAD position was df2a63d initial
+HEAD is now at 55c7d12 yetanotherpick
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 965fed4... anotherpick
+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"
+HEAD detached at 55c7d12
+You are currently cherry-picking commit 55c7d12.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	msg
+
+nothing added to commit but untracked files present (use "git add" to track)
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+ok 5 - cherry-pick persists --empty=stop correctly
+
+expecting success of 3510.6 'cherry-pick persists --empty=drop correctly': 
+	pristine_detach yetanotherpick &&
+	# Picking `anotherpick` forces a conflict so that we stop. That
+	# commit is then skipped, after which we pick `yetanotherpick`
+	# while already on `yetanotherpick` to cause an empty commit
+	test_must_fail git cherry-pick --empty=drop anotherpick yetanotherpick &&
+	git cherry-pick --skip &&
+	test_cmp_rev yetanotherpick HEAD
+
+HEAD is now at 55c7d12 yetanotherpick
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 965fed4... anotherpick
+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"
+dropping 55c7d12676e46241f1279640f1bc977feab93361 yetanotherpick -- patch contents already upstream
+ok 6 - cherry-pick persists --empty=drop correctly
+
+expecting success of 3510.7 'cherry-pick persists --empty=keep correctly': 
+	pristine_detach yetanotherpick &&
+	# Picking `anotherpick` forces a conflict so that we stop. That
+	# commit is then skipped, after which we pick `yetanotherpick`
+	# while already on `yetanotherpick` to cause an empty commit
+	test_must_fail git cherry-pick --empty=keep anotherpick yetanotherpick &&
+	git cherry-pick --skip &&
+	test_cmp_rev yetanotherpick HEAD^
+
+HEAD is now at 55c7d12 yetanotherpick
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 965fed4... anotherpick
+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"
+[detached HEAD 3fb2aca] yetanotherpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ok 7 - cherry-pick persists --empty=keep correctly
+
+expecting success of 3510.8 'revert persists opts correctly': 
+	pristine_detach initial &&
+	# to make sure that the session to revert a sequence
+	# gets interrupted, revert commits that are not in the history
+	# of HEAD.
+	test_expect_code 1 git revert -s --strategy=recursive -X patience -X ours --no-edit picked yetanotherpick &&
+	test_path_is_dir .git/sequencer &&
+	test_path_is_file .git/sequencer/head &&
+	test_path_is_file .git/sequencer/todo &&
+	test_path_is_file .git/sequencer/opts &&
+	echo "true" >expect &&
+	git config --file=.git/sequencer/opts --get-all options.signoff >actual &&
+	test_cmp expect actual &&
+	echo "recursive" >expect &&
+	git config --file=.git/sequencer/opts --get-all options.strategy >actual &&
+	test_cmp expect actual &&
+	cat >expect <<-\EOF &&
+	patience
+	ours
+	EOF
+	git config --file=.git/sequencer/opts --get-all options.strategy-option >actual &&
+	test_cmp expect actual &&
+	echo "false" >expect &&
+	git config --file=.git/sequencer/opts --get-all options.edit >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  3fb2aca yetanotherpick
+
+HEAD is now at df2a63d initial
+Auto-merging foo
+HEAD detached at df2a63d
+Revert currently in progress.
+  (run "git revert --continue" to continue)
+  (use "git revert --skip" to skip this patch)
+  (use "git revert --abort" to cancel the revert operation)
+
+nothing to commit, working tree clean
+ok 8 - revert persists opts correctly
+
+expecting success of 3510.9 'cherry-pick cleans up sequencer state upon success': 
+	pristine_detach initial &&
+	git cherry-pick initial..picked &&
+	test_path_is_missing .git/sequencer
+
+HEAD is now at df2a63d initial
+[detached HEAD 86ee3fa] base
+ 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 2b8ae83] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD a222ac0] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 9 - cherry-pick cleans up sequencer state upon success
+
+expecting success of 3510.10 'cherry-pick --skip requires cherry-pick in progress': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick --skip
+
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
+
+  a222ac0 picked
+  2b8ae83 unrelatedpick
+  86ee3fa base
+
+HEAD is now at df2a63d initial
+error: no cherry-pick in progress
+fatal: cherry-pick failed
+ok 10 - cherry-pick --skip requires cherry-pick in progress
+
+expecting success of 3510.11 'revert --skip requires revert in progress': 
+	pristine_detach initial &&
+	test_must_fail git revert --skip
+
+HEAD is now at df2a63d initial
+error: no revert in progress
+fatal: revert failed
+ok 11 - revert --skip requires revert in progress
+
+expecting success of 3510.12 'cherry-pick --skip to skip commit': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick anotherpick &&
+	test_must_fail git revert --skip &&
+	git cherry-pick --skip &&
+	test_cmp_rev initial HEAD &&
+	test_path_is_missing .git/CHERRY_PICK_HEAD
+
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 965fed4... anotherpick
+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"
+error: no revert in progress
+fatal: revert failed
+ok 12 - cherry-pick --skip to skip commit
+
+expecting success of 3510.13 'revert --skip to skip commit': 
+	pristine_detach anotherpick &&
+	test_must_fail git revert anotherpick~1 &&
+	test_must_fail git cherry-pick --skip &&
+	git revert --skip &&
+	test_cmp_rev anotherpick HEAD
+
+Previous HEAD position was df2a63d initial
+HEAD is now at 965fed4 anotherpick
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert fdc0b12... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+error: no cherry-pick in progress
+fatal: cherry-pick failed
+ok 13 - revert --skip to skip commit
+
+expecting success of 3510.14 'skip "empty" commit': 
+	pristine_detach picked &&
+	test_commit dummy foo d &&
+	test_must_fail git cherry-pick anotherpick 2>err &&
+	test_grep "git cherry-pick --skip" err &&
+	git cherry-pick --skip &&
+	test_cmp_rev dummy HEAD
+
+Previous HEAD position was 965fed4 anotherpick
+HEAD is now at fdc0b12 picked
+[detached HEAD 4b36a1c] dummy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD detached from fdc0b12
+You are currently cherry-picking commit 965fed4.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+
+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)
+Otherwise, please use 'git cherry-pick --skip'
+ok 14 - skip "empty" commit
+
+expecting success of 3510.15 'skip a commit and check if rest of sequence is correct': 
+	pristine_detach initial &&
+	echo e >expect &&
+	cat >expect.log <<-EOF &&
+	OBJID
+	:100644 100644 OBJID OBJID M	foo
+	OBJID
+	:100644 100644 OBJID OBJID M	foo
+	OBJID
+	:100644 100644 OBJID OBJID M	unrelated
+	OBJID
+	:000000 100644 OBJID OBJID A	foo
+	:000000 100644 OBJID OBJID A	unrelated
+	EOF
+	test_must_fail git cherry-pick base..yetanotherpick &&
+	test_must_fail git cherry-pick --skip &&
+	echo d >foo &&
+	git add foo &&
+	git cherry-pick --continue &&
+	{
+		git rev-list HEAD |
+		git diff-tree --root --stdin |
+		sed "s/$OID_REGEX/OBJID/g"
+	} >actual.log &&
+	test_cmp expect foo &&
+	test_cmp expect.log actual.log
+
+Previous HEAD position was 4b36a1c dummy
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 965fed4... anotherpick
+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"
+[detached HEAD 612ff5e] anotherpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 61f8ec3] yetanotherpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 15 - skip a commit and check if rest of sequence is correct
+
+expecting success of 3510.16 'check advice when we move HEAD by committing': 
+	pristine_detach initial &&
+	cat >expect <<-EOF &&
+	error: there is nothing to skip
+	hint: have you committed already?
+	hint: try "git cherry-pick --continue"
+	fatal: cherry-pick failed
+	EOF
+	test_must_fail git cherry-pick base..yetanotherpick &&
+	echo c >foo &&
+	git commit -a &&
+	test_path_is_missing .git/CHERRY_PICK_HEAD &&
+	test_must_fail git cherry-pick --skip 2>advice &&
+	test_cmp expect advice
+
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
+
+  61f8ec3 yetanotherpick
+  612ff5e anotherpick
+  c738c4d unrelatedpick
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD 43fe10f] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 16 - check advice when we move HEAD by committing
+
+expecting success of 3510.17 'selectively advise --skip while launching another sequence': 
+	pristine_detach initial &&
+	cat >expect <<-EOF &&
+	error: cherry-pick is already in progress
+	hint: try "git cherry-pick (--continue | --skip | --abort | --quit)"
+	fatal: cherry-pick failed
+	EOF
+	test_must_fail git cherry-pick picked..yetanotherpick &&
+	test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
+	test_cmp expect advice &&
+	cat >expect <<-EOF &&
+	error: cherry-pick is already in progress
+	hint: try "git cherry-pick (--continue | --abort | --quit)"
+	fatal: cherry-pick failed
+	EOF
+	git reset --merge &&
+	test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
+	test_cmp expect advice
+
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  43fe10f picked
+  c738c4d unrelatedpick
+
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 965fed4... anotherpick
+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"
+ok 17 - selectively advise --skip while launching another sequence
+
+expecting success of 3510.18 'allow skipping commit but not abort for a new history': 
+	pristine_detach initial &&
+	cat >expect <<-EOF &&
+	error: cannot abort from a branch yet to be born
+	fatal: cherry-pick failed
+	EOF
+	git checkout --orphan new_disconnected &&
+	git reset --hard &&
+	test_must_fail git cherry-pick anotherpick &&
+	test_must_fail git cherry-pick --abort 2>advice &&
+	git cherry-pick --skip &&
+	test_cmp expect advice
+
+HEAD is now at df2a63d initial
+Switched to a new branch 'new_disconnected'
+CONFLICT (modify/delete): foo deleted in HEAD and modified in 965fed4 (anotherpick).  Version 965fed4 (anotherpick) of foo left in tree.
+error: could not apply 965fed4... anotherpick
+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"
+ok 18 - allow skipping commit but not abort for a new history
+
+expecting success of 3510.19 'allow skipping stopped cherry-pick because of untracked file modifications': 
+	test_when_finished "rm unrelated" &&
+	pristine_detach initial &&
+	git rm --cached unrelated &&
+	git commit -m "untrack unrelated" &&
+	test_must_fail git cherry-pick initial base &&
+	test_path_is_missing .git/CHERRY_PICK_HEAD &&
+	git cherry-pick --skip
+
+HEAD is now at df2a63d initial
+rm 'unrelated'
+[detached HEAD 44a5ca1] untrack unrelated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 unrelated
+error: The following untracked working tree files would be overwritten by merge:
+	unrelated
+Please move or remove them before you merge.
+Aborting
+fatal: cherry-pick failed
+[detached HEAD f847cb0] base
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 19 - allow skipping stopped cherry-pick because of untracked file modifications
+
+expecting success of 3510.20 '--quit does not complain when no cherry-pick is in progress': 
+	pristine_detach initial &&
+	git cherry-pick --quit
+
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  f847cb0 base
+  44a5ca1 untrack unrelated
+
+HEAD is now at df2a63d initial
+ok 20 - --quit does not complain when no cherry-pick is in progress
+
+expecting success of 3510.21 '--abort requires cherry-pick in progress': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick --abort
+
+HEAD is now at df2a63d initial
+error: no cherry-pick or revert in progress
+fatal: cherry-pick failed
+ok 21 - --abort requires cherry-pick in progress
+
+expecting success of 3510.22 '--quit cleans up sequencer state': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick base..picked &&
+	git cherry-pick --quit &&
+	test_path_is_missing .git/sequencer &&
+	test_path_is_missing .git/CHERRY_PICK_HEAD
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+ok 22 - --quit cleans up sequencer state
+
+expecting success of 3510.23 '--quit keeps HEAD and conflicted index intact': 
+	pristine_detach initial &&
+	cat >expect <<-\EOF &&
+	OBJID
+	:100644 100644 OBJID OBJID M	unrelated
+	OBJID
+	:000000 100644 OBJID OBJID A	foo
+	:000000 100644 OBJID OBJID A	unrelated
+	EOF
+	test_expect_code 1 git cherry-pick base..picked &&
+	git cherry-pick --quit &&
+	test_path_is_missing .git/sequencer &&
+	test_must_fail git update-index --refresh &&
+	{
+		git rev-list HEAD |
+		git diff-tree --root --stdin |
+		sed "s/$OID_REGEX/OBJID/g"
+	} >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  c738c4d unrelatedpick
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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: needs merge
+ok 23 - --quit keeps HEAD and conflicted index intact
+
+expecting success of 3510.24 '--abort to cancel multiple cherry-pick': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick base..anotherpick &&
+	git cherry-pick --abort &&
+	test_path_is_missing .git/sequencer &&
+	test_path_is_missing .git/CHERRY_PICK_HEAD &&
+	test_cmp_rev initial HEAD &&
+	git update-index --refresh &&
+	git diff-index --exit-code HEAD
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  c738c4d unrelatedpick
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+ok 24 - --abort to cancel multiple cherry-pick
+
+expecting success of 3510.25 '--abort to cancel single cherry-pick': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick picked &&
+	git cherry-pick --abort &&
+	test_path_is_missing .git/sequencer &&
+	test_path_is_missing .git/CHERRY_PICK_HEAD &&
+	test_cmp_rev initial HEAD &&
+	git update-index --refresh &&
+	git diff-index --exit-code HEAD
+
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+ok 25 - --abort to cancel single cherry-pick
+
+expecting success of 3510.26 '--abort does not unsafely change HEAD': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick picked anotherpick &&
+	git reset --hard base &&
+	test_must_fail git cherry-pick picked anotherpick &&
+	git cherry-pick --abort 2>actual &&
+	test_grep "You seem to have moved HEAD" actual &&
+	test_cmp_rev base HEAD
+
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+HEAD is now at dc0113b base
+error: cherry-pick is already in progress
+hint: try "git cherry-pick (--continue | --abort | --quit)"
+fatal: cherry-pick failed
+warning: You seem to have moved HEAD. Not rewinding, check your HEAD!
+ok 26 - --abort does not unsafely change HEAD
+
+expecting success of 3510.27 'cherry-pick --abort to cancel multiple revert': 
+	pristine_detach anotherpick &&
+	test_expect_code 1 git revert base..picked &&
+	git cherry-pick --abort &&
+	test_path_is_missing .git/sequencer &&
+	test_path_is_missing .git/CHERRY_PICK_HEAD &&
+	test_cmp_rev anotherpick HEAD &&
+	git update-index --refresh &&
+	git diff-index --exit-code HEAD
+
+Previous HEAD position was dc0113b base
+HEAD is now at 965fed4 anotherpick
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert fdc0b12... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 27 - cherry-pick --abort to cancel multiple revert
+
+expecting success of 3510.28 'revert --abort works, too': 
+	pristine_detach anotherpick &&
+	test_expect_code 1 git revert base..picked &&
+	git revert --abort &&
+	test_path_is_missing .git/sequencer &&
+	test_cmp_rev anotherpick HEAD
+
+HEAD is now at 965fed4 anotherpick
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert fdc0b12... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 28 - revert --abort works, too
+
+expecting success of 3510.29 '--abort to cancel single revert': 
+	pristine_detach anotherpick &&
+	test_expect_code 1 git revert picked &&
+	git revert --abort &&
+	test_path_is_missing .git/sequencer &&
+	test_cmp_rev anotherpick HEAD &&
+	git update-index --refresh &&
+	git diff-index --exit-code HEAD
+
+HEAD is now at 965fed4 anotherpick
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert fdc0b12... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 29 - --abort to cancel single revert
+
+expecting success of 3510.30 '--abort keeps unrelated change, easy case': 
+	pristine_detach unrelatedpick &&
+	echo changed >expect &&
+	test_expect_code 1 git cherry-pick picked..yetanotherpick &&
+	echo changed >unrelated &&
+	git cherry-pick --abort &&
+	test_cmp expect unrelated
+
+Previous HEAD position was 965fed4 anotherpick
+HEAD is now at 24c5742 unrelatedpick
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 965fed4... anotherpick
+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"
+ok 30 - --abort keeps unrelated change, easy case
+
+expecting success of 3510.31 '--abort refuses to clobber unrelated change, harder case': 
+	pristine_detach initial &&
+	echo changed >expect &&
+	test_expect_code 1 git cherry-pick base..anotherpick &&
+	echo changed >unrelated &&
+	test_must_fail git cherry-pick --abort &&
+	test_cmp expect unrelated &&
+	git rev-list HEAD >log &&
+	test_line_count = 2 log &&
+	test_must_fail git update-index --refresh &&
+
+	git checkout unrelated &&
+	git cherry-pick --abort &&
+	test_cmp_rev initial HEAD
+
+Previous HEAD position was 24c5742 unrelatedpick
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+error: Entry 'unrelated' not uptodate. Cannot merge.
+fatal: Could not reset index file to revision 'df2a63d8a410bba7d3f608203e12bb371c76d4a8'.
+fatal: cherry-pick failed
+foo: needs merge
+unrelated: needs update
+Updated 1 path from the index
+ok 31 - --abort refuses to clobber unrelated change, harder case
+
+expecting success of 3510.32 'cherry-pick still writes sequencer state when one commit is left': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick base..picked &&
+	test_path_is_dir .git/sequencer &&
+	echo "resolved" >foo &&
+	git add foo &&
+	git commit &&
+	{
+		git rev-list HEAD |
+		git diff-tree --root --stdin |
+		sed "s/$OID_REGEX/OBJID/g"
+	} >actual &&
+	cat >expect <<-\EOF &&
+	OBJID
+	:100644 100644 OBJID OBJID M	foo
+	OBJID
+	:100644 100644 OBJID OBJID M	unrelated
+	OBJID
+	:000000 100644 OBJID OBJID A	foo
+	:000000 100644 OBJID OBJID A	unrelated
+	EOF
+	test_cmp expect actual
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD 9781982] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 32 - cherry-pick still writes sequencer state when one commit is left
+
+expecting success of 3510.33 '--abort after last commit in sequence': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick base..picked &&
+	git cherry-pick --abort &&
+	test_path_is_missing .git/sequencer &&
+	test_path_is_missing .git/CHERRY_PICK_HEAD &&
+	test_cmp_rev initial HEAD &&
+	git update-index --refresh &&
+	git diff-index --exit-code HEAD
+
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  9781982 picked
+  c738c4d unrelatedpick
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+ok 33 - --abort after last commit in sequence
+
+expecting success of 3510.34 'cherry-pick does not implicitly stomp an existing operation': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick base..anotherpick &&
+	test-tool chmtime --get .git/sequencer >expect &&
+	test_expect_code 128 git cherry-pick unrelatedpick &&
+	test-tool chmtime --get .git/sequencer >actual &&
+	test_cmp expect actual
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+error: Cherry-picking 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: cherry-pick failed
+ok 34 - cherry-pick does not implicitly stomp an existing operation
+
+expecting success of 3510.35 '--continue complains when no cherry-pick is in progress': 
+	pristine_detach initial &&
+	test_expect_code 128 git cherry-pick --continue
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  c738c4d unrelatedpick
+
+HEAD is now at df2a63d initial
+error: no cherry-pick or revert in progress
+fatal: cherry-pick failed
+ok 35 - --continue complains when no cherry-pick is in progress
+
+expecting success of 3510.36 '--continue complains when there are unresolved conflicts': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick base..anotherpick &&
+	test_expect_code 128 git cherry-pick --continue
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+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	foo
+ok 36 - --continue complains when there are unresolved conflicts
+
+expecting success of 3510.37 '--continue of single cherry-pick': 
+	pristine_detach initial &&
+	echo c >expect &&
+	test_must_fail git cherry-pick picked &&
+	echo c >foo &&
+	git add foo &&
+	git cherry-pick --continue &&
+
+	test_cmp expect foo &&
+	test_cmp_rev initial HEAD^ &&
+	git diff --exit-code HEAD &&
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  c738c4d unrelatedpick
+
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD 9aabd79] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+ok 37 - --continue of single cherry-pick
+
+expecting success of 3510.38 '--continue of single revert': 
+	pristine_detach initial &&
+	echo resolved >expect &&
+	echo "Revert \"picked\"" >expect.msg &&
+	test_must_fail git revert picked &&
+	echo resolved >foo &&
+	git add foo &&
+	git cherry-pick --continue &&
+
+	git diff --exit-code HEAD &&
+	test_cmp expect foo &&
+	test_cmp_rev initial HEAD^ &&
+	git diff-tree -s --pretty=tformat:%s HEAD >msg &&
+	test_cmp expect.msg msg &&
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
+	test_must_fail git rev-parse --verify REVERT_HEAD
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  9aabd79 picked
+
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert fdc0b12... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+[detached HEAD 267eac8] Revert "picked"
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 38 - --continue of single revert
+
+expecting success of 3510.39 '--continue after resolving conflicts': 
+	pristine_detach initial &&
+	echo d >expect &&
+	cat >expect.log <<-\EOF &&
+	OBJID
+	:100644 100644 OBJID OBJID M	foo
+	OBJID
+	:100644 100644 OBJID OBJID M	foo
+	OBJID
+	:100644 100644 OBJID OBJID M	unrelated
+	OBJID
+	:000000 100644 OBJID OBJID A	foo
+	:000000 100644 OBJID OBJID A	unrelated
+	EOF
+	test_must_fail git cherry-pick base..anotherpick &&
+	echo c >foo &&
+	git add foo &&
+	git cherry-pick --continue &&
+	{
+		git rev-list HEAD |
+		git diff-tree --root --stdin |
+		sed "s/$OID_REGEX/OBJID/g"
+	} >actual.log &&
+	test_cmp expect foo &&
+	test_cmp expect.log actual.log
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  267eac8 Revert "picked"
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD 43fe10f] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 3b1768d] anotherpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 39 - --continue after resolving conflicts
+
+expecting success of 3510.40 '--continue after resolving conflicts and committing': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick base..anotherpick &&
+	echo "c" >foo &&
+	git add foo &&
+	git commit &&
+	git cherry-pick --continue &&
+	test_path_is_missing .git/sequencer &&
+	{
+		git rev-list HEAD |
+		git diff-tree --root --stdin |
+		sed "s/$OID_REGEX/OBJID/g"
+	} >actual &&
+	cat >expect <<-\EOF &&
+	OBJID
+	:100644 100644 OBJID OBJID M	foo
+	OBJID
+	:100644 100644 OBJID OBJID M	foo
+	OBJID
+	:100644 100644 OBJID OBJID M	unrelated
+	OBJID
+	:000000 100644 OBJID OBJID A	foo
+	:000000 100644 OBJID OBJID A	unrelated
+	EOF
+	test_cmp expect actual
+
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
+
+  3b1768d anotherpick
+  43fe10f picked
+  c738c4d unrelatedpick
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD 43fe10f] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 3b1768d] anotherpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 40 - --continue after resolving conflicts and committing
+
+expecting success of 3510.41 '--continue asks for help after resolving patch to nil': 
+	pristine_detach conflicting &&
+	test_must_fail git cherry-pick initial..picked &&
+
+	test_cmp_rev unrelatedpick CHERRY_PICK_HEAD &&
+	git checkout HEAD -- unrelated &&
+	test_must_fail git cherry-pick --continue 2>msg &&
+	test_grep "The previous cherry-pick is now empty" msg
+
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
+
+  3b1768d anotherpick
+  43fe10f picked
+  c738c4d unrelatedpick
+
+HEAD is now at d520364 conflicting
+[detached HEAD 838794c] base
+ 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 unrelated
+CONFLICT (content): Merge conflict in unrelated
+error: could not apply 24c5742... unrelatedpick
+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"
+HEAD detached from d520364
+You are currently cherry-picking commit 24c5742.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	msg
+
+nothing added to commit but untracked files present (use "git add" to track)
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+ok 41 - --continue asks for help after resolving patch to nil
+
+expecting success of 3510.42 'follow advice and skip nil patch': 
+	pristine_detach conflicting &&
+	test_must_fail git cherry-pick initial..picked &&
+
+	git checkout HEAD -- unrelated &&
+	test_must_fail git cherry-pick --continue &&
+	git reset &&
+	git cherry-pick --continue &&
+
+	git rev-list initial..HEAD >commits &&
+	test_line_count = 3 commits
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  838794c base
+
+HEAD is now at d520364 conflicting
+[detached HEAD 838794c] base
+ 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 unrelated
+CONFLICT (content): Merge conflict in unrelated
+error: could not apply 24c5742... unrelatedpick
+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"
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
+
+    git commit --allow-empty
+
+Otherwise, please use 'git cherry-pick --skip'
+HEAD detached from d520364
+You are currently cherry-picking commit 24c5742.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+
+nothing to commit, working tree clean
+[detached HEAD fef14ec] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 42 - follow advice and skip nil patch
+
+expecting success of 3510.43 '--continue respects opts': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick -x base..anotherpick &&
+	echo "c" >foo &&
+	git add foo &&
+	git commit &&
+	git cherry-pick --continue &&
+	test_path_is_missing .git/sequencer &&
+	git cat-file commit HEAD >anotherpick_msg &&
+	git cat-file commit HEAD~1 >picked_msg &&
+	git cat-file commit HEAD~2 >unrelatedpick_msg &&
+	git cat-file commit HEAD~3 >initial_msg &&
+	! grep "cherry picked from" initial_msg &&
+	grep "cherry picked from" unrelatedpick_msg &&
+	grep "cherry picked from" picked_msg &&
+	grep "cherry picked from" anotherpick_msg
+
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  fef14ec picked
+  838794c base
+
+HEAD is now at df2a63d initial
+[detached HEAD a731ebf] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD 4d735ac] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 3834c90] anotherpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+(cherry picked from commit 24c574226938b210285578b30b436ec6119f7a7d)
+(cherry picked from commit fdc0b12b2eb6de44c0df7d41b045ab2b44b6c37c)
+(cherry picked from commit 965fed4c41239668ada422bca0c600444cc00e82)
+ok 43 - --continue respects opts
+
+expecting success of 3510.44 '--continue of single-pick respects -x': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick -x picked &&
+	echo c >foo &&
+	git add foo &&
+	git cherry-pick --continue &&
+	test_path_is_missing .git/sequencer &&
+	git cat-file commit HEAD >msg &&
+	grep "cherry picked from" msg
+
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
+
+  3834c90 anotherpick
+  4d735ac picked
+  a731ebf unrelatedpick
+
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD 775318b] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+(cherry picked from commit fdc0b12b2eb6de44c0df7d41b045ab2b44b6c37c)
+ok 44 - --continue of single-pick respects -x
+
+expecting success of 3510.45 '--continue respects -x in first commit in multi-pick': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick -x picked anotherpick &&
+	echo c >foo &&
+	git add foo &&
+	git cherry-pick --continue &&
+	test_path_is_missing .git/sequencer &&
+	git cat-file commit HEAD^ >msg &&
+	picked=$(git rev-parse --verify picked) &&
+	grep "cherry picked from.*$picked" msg
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  775318b picked
+
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD 775318b] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD d310f74] anotherpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+(cherry picked from commit fdc0b12b2eb6de44c0df7d41b045ab2b44b6c37c)
+ok 45 - --continue respects -x in first commit in multi-pick
+
+checking known breakage of 3510.46 '--signoff is automatically propagated to resolved conflict': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick --signoff base..anotherpick &&
+	echo "c" >foo &&
+	git add foo &&
+	git commit &&
+	git cherry-pick --continue &&
+	test_path_is_missing .git/sequencer &&
+	git cat-file commit HEAD >anotherpick_msg &&
+	git cat-file commit HEAD~1 >picked_msg &&
+	git cat-file commit HEAD~2 >unrelatedpick_msg &&
+	git cat-file commit HEAD~3 >initial_msg &&
+	! grep "Signed-off-by:" initial_msg &&
+	grep "Signed-off-by:" unrelatedpick_msg &&
+	! grep "Signed-off-by:" picked_msg &&
+	grep "Signed-off-by:" anotherpick_msg
+
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  d310f74 anotherpick
+  775318b picked
+
+HEAD is now at df2a63d initial
+[detached HEAD 9b2cda6] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD f7bab3d] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD cf7cfba] anotherpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Signed-off-by: C O Mitter <committer@example.com>
+Signed-off-by: C O Mitter <committer@example.com>
+not ok 46 - --signoff is automatically propagated to resolved conflict # TODO known breakage
+
+checking known breakage of 3510.47 '--signoff dropped for implicit commit of resolution, multi-pick case': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick -s picked anotherpick &&
+	echo c >foo &&
+	git add foo &&
+	git cherry-pick --continue &&
+
+	git diff --exit-code HEAD &&
+	test_cmp_rev initial HEAD^^ &&
+	git cat-file commit HEAD^ >msg &&
+	! grep Signed-off-by: msg
+
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
+
+  cf7cfba anotherpick
+  f7bab3d picked
+  9b2cda6 unrelatedpick
+
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD c80a680] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD d9a8514] anotherpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Signed-off-by: C O Mitter <committer@example.com>
+not ok 47 - --signoff dropped for implicit commit of resolution, multi-pick case # TODO known breakage
+
+checking known breakage of 3510.48 'sign-off needs to be reaffirmed after conflict resolution, single-pick case': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick -s picked &&
+	echo c >foo &&
+	git add foo &&
+	git cherry-pick --continue &&
+
+	git diff --exit-code HEAD &&
+	test_cmp_rev initial HEAD^ &&
+	git cat-file commit HEAD >msg &&
+	! grep Signed-off-by: msg
+
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  d9a8514 anotherpick
+  c80a680 picked
+
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD c80a680] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Signed-off-by: C O Mitter <committer@example.com>
+not ok 48 - sign-off needs to be reaffirmed after conflict resolution, single-pick case # TODO known breakage
+
+expecting success of 3510.49 'malformed instruction sheet 1': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick base..anotherpick &&
+	echo "resolved" >foo &&
+	git add foo &&
+	git commit &&
+	sed "s/pick /pick/" .git/sequencer/todo >new_sheet &&
+	cp new_sheet .git/sequencer/todo &&
+	test_expect_code 128 git cherry-pick --continue
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  c80a680 picked
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD 9781982] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: invalid command 'pickfdc0b12'
+error: invalid line 1: pickfdc0b12 picked
+error: invalid command 'pick965fed4'
+error: invalid line 2: pick965fed4 anotherpick
+error: unusable instruction sheet: '.git/sequencer/todo'
+fatal: cherry-pick failed
+ok 49 - malformed instruction sheet 1
+
+expecting success of 3510.50 'malformed instruction sheet 2': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick base..anotherpick &&
+	echo "resolved" >foo &&
+	git add foo &&
+	git commit &&
+	sed "s/pick/revert/" .git/sequencer/todo >new_sheet &&
+	cp new_sheet .git/sequencer/todo &&
+	test_expect_code 128 git cherry-pick --continue
+
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  9781982 picked
+  c738c4d unrelatedpick
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD 9781982] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: cannot cherry-pick during a revert.
+fatal: cherry-pick failed
+ok 50 - malformed instruction sheet 2
+
+expecting success of 3510.51 'empty commit set (no commits to walk)': 
+	pristine_detach initial &&
+	test_expect_code 128 git cherry-pick base..base
+
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  9781982 picked
+  c738c4d unrelatedpick
+
+HEAD is now at df2a63d initial
+error: empty commit set passed
+fatal: cherry-pick failed
+ok 51 - empty commit set (no commits to walk)
+
+expecting success of 3510.52 'empty commit set (culled during walk)': 
+	pristine_detach initial &&
+	test_expect_code 128 git cherry-pick -2 --author=no.such.author base
+
+HEAD is now at df2a63d initial
+error: empty commit set passed
+fatal: cherry-pick failed
+ok 52 - empty commit set (culled during walk)
+
+expecting success of 3510.53 'malformed instruction sheet 3': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick base..anotherpick &&
+	echo "resolved" >foo &&
+	git add foo &&
+	git commit &&
+	sed "s/pick \([0-9a-f]*\)/pick $_r10/" .git/sequencer/todo >new_sheet &&
+	cp new_sheet .git/sequencer/todo &&
+	test_expect_code 128 git cherry-pick --continue
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD 9781982] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: could not parse 'fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12'
+error: invalid line 1: pick fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12 picked
+error: could not parse '965fed4965fed4965fed4965fed4965fed4965fed4965fed4965fed4965fed4965fed4'
+error: invalid line 2: pick 965fed4965fed4965fed4965fed4965fed4965fed4965fed4965fed4965fed4965fed4 anotherpick
+error: unusable instruction sheet: '.git/sequencer/todo'
+fatal: cherry-pick failed
+ok 53 - malformed instruction sheet 3
+
+expecting success of 3510.54 'instruction sheet, fat-fingers version': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick base..anotherpick &&
+	echo "c" >foo &&
+	git add foo &&
+	git commit &&
+	sed "s/pick \([0-9a-f]*\)/pick 	 \1 	/" .git/sequencer/todo >new_sheet &&
+	cp new_sheet .git/sequencer/todo &&
+	git cherry-pick --continue
+
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  9781982 picked
+  c738c4d unrelatedpick
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD 43fe10f] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 3b1768d] anotherpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 54 - instruction sheet, fat-fingers version
+
+expecting success of 3510.55 'commit descriptions in insn sheet are optional': 
+	pristine_detach initial &&
+	test_expect_code 1 git cherry-pick base..anotherpick &&
+	echo "c" >foo &&
+	git add foo &&
+	git commit &&
+	cut -d" " -f1,2 .git/sequencer/todo >new_sheet &&
+	cp new_sheet .git/sequencer/todo &&
+	git cherry-pick --continue &&
+	test_path_is_missing .git/sequencer &&
+	git rev-list HEAD >commits &&
+	test_line_count = 4 commits
+
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
+
+  3b1768d anotherpick
+  43fe10f picked
+  c738c4d unrelatedpick
+
+HEAD is now at df2a63d initial
+[detached HEAD c738c4d] unrelatedpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply fdc0b12... picked
+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"
+[detached HEAD 43fe10f] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 3b1768d] anotherpick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 55 - commit descriptions in insn sheet are optional
+
+# still have 3 known breakage(s)
+# passed all remaining 52 test(s)
+1..55
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3070-wildmatch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3070-wildmatch/.git/
+checking prerequisite: EXPENSIVE_ON_WINDOWS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE_ON_WINDOWS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE_ON_WINDOWS" &&
+	test_have_prereq EXPENSIVE || test_have_prereq !MINGW,!CYGWIN
+
+)
+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
+prerequisite EXPENSIVE_ON_WINDOWS ok
+expecting success of 3070.1 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing "\\"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1341 - cleanup after previous file test
+ok 1 - cleanup after previous file test
 
-expecting success of 3070.1342 'setup match file test for -': 
+expecting success of 3070.2 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -192566,83 +193877,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1342 - setup match file test for -
+ok 2 - setup match file test for foo
 
-expecting success of 3070.1343 'wildmatch: match '-' '[,-.]'': 
-			test-tool wildmatch wildmatch '-' '[,-.]'
+expecting success of 3070.3 'wildmatch: match 'foo' 'foo'': 
+			test-tool wildmatch wildmatch 'foo' 'foo'
 		
-ok 1343 - wildmatch: match '-' '[,-.]'
+ok 3 - wildmatch: match 'foo' 'foo'
 
-expecting success of 3070.1344 'wildmatch (via ls-files): match '[,-.]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+expecting success of 3070.4 'wildmatch (via ls-files): match 'foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1344 - wildmatch (via ls-files): match '[,-.]' '-'
+ok 4 - wildmatch (via ls-files): match 'foo' 'foo'
 
-expecting success of 3070.1345 'iwildmatch: match '-' '[,-.]'': 
-			test-tool wildmatch iwildmatch '-' '[,-.]'
+expecting success of 3070.5 'iwildmatch: match 'foo' 'foo'': 
+			test-tool wildmatch iwildmatch 'foo' 'foo'
 		
-ok 1345 - iwildmatch: match '-' '[,-.]'
+ok 5 - iwildmatch: match 'foo' 'foo'
 
-expecting success of 3070.1346 'iwildmatch (via ls-files): match '[,-.]' '-'': 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+expecting success of 3070.6 'iwildmatch (via ls-files): match 'foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1346 - iwildmatch (via ls-files): match '[,-.]' '-'
+ok 6 - iwildmatch (via ls-files): match 'foo' 'foo'
 
-expecting success of 3070.1347 'pathmatch: match '-' '[,-.]'': 
-			test-tool wildmatch pathmatch '-' '[,-.]'
+expecting success of 3070.7 'pathmatch: match 'foo' 'foo'': 
+			test-tool wildmatch pathmatch 'foo' 'foo'
 		
-ok 1347 - pathmatch: match '-' '[,-.]'
+ok 7 - pathmatch: match 'foo' 'foo'
 
-expecting success of 3070.1348 'pathmatch (via ls-files): match '[,-.]' '-'': 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+expecting success of 3070.8 'pathmatch (via ls-files): match 'foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git ls-files -z -- 'foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1348 - pathmatch (via ls-files): match '[,-.]' '-'
+ok 8 - pathmatch (via ls-files): match 'foo' 'foo'
 
-expecting success of 3070.1349 'ipathmatch: match '-' '[,-.]'': 
-			test-tool wildmatch ipathmatch '-' '[,-.]'
+expecting success of 3070.9 'ipathmatch: match 'foo' 'foo'': 
+			test-tool wildmatch ipathmatch 'foo' 'foo'
 		
-ok 1349 - ipathmatch: match '-' '[,-.]'
+ok 9 - ipathmatch: match 'foo' 'foo'
 
-expecting success of 3070.1350 'ipathmatch (via ls-files): match '[,-.]' '-'': 
-				printf '%s' '-' >expect &&
-				git --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+expecting success of 3070.10 'ipathmatch (via ls-files): match 'foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1350 - ipathmatch (via ls-files): match '[,-.]' '-'
+ok 10 - ipathmatch (via ls-files): match 'foo' 'foo'
 
-expecting success of 3070.1351 'cleanup after previous file test': 
+expecting success of 3070.11 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing -
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1351 - cleanup after previous file test
+Removing foo
+ok 11 - cleanup after previous file test
 
-expecting success of 3070.1352 'setup match file test for +': 
+expecting success of 3070.12 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -192661,83 +193972,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1352 - setup match file test for +
+ok 12 - setup match file test for foo
 
-expecting success of 3070.1353 'wildmatch: no match '+' '[,-.]'': 
-			test_must_fail test-tool wildmatch wildmatch '+' '[,-.]'
+expecting success of 3070.13 'wildmatch: no match 'foo' 'bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo' 'bar'
 		
-ok 1353 - wildmatch: no match '+' '[,-.]'
+ok 13 - wildmatch: no match 'foo' 'bar'
 
-expecting success of 3070.1354 'wildmatch (via ls-files): no match '[,-.]' '+'': 
+expecting success of 3070.14 'wildmatch (via ls-files): no match 'bar' 'foo'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- 'bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1354 - wildmatch (via ls-files): no match '[,-.]' '+'
+ok 14 - wildmatch (via ls-files): no match 'bar' 'foo'
 
-expecting success of 3070.1355 'iwildmatch: no match '+' '[,-.]'': 
-			test_must_fail test-tool wildmatch iwildmatch '+' '[,-.]'
+expecting success of 3070.15 'iwildmatch: no match 'foo' 'bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo' 'bar'
 		
-ok 1355 - iwildmatch: no match '+' '[,-.]'
+ok 15 - iwildmatch: no match 'foo' 'bar'
 
-expecting success of 3070.1356 'iwildmatch (via ls-files): no match '[,-.]' '+'': 
+expecting success of 3070.16 'iwildmatch (via ls-files): no match 'bar' 'foo'': 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1356 - iwildmatch (via ls-files): no match '[,-.]' '+'
+ok 16 - iwildmatch (via ls-files): no match 'bar' 'foo'
 
-expecting success of 3070.1357 'pathmatch: no match '+' '[,-.]'': 
-			test_must_fail test-tool wildmatch pathmatch '+' '[,-.]'
+expecting success of 3070.17 'pathmatch: no match 'foo' 'bar'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' 'bar'
 		
-ok 1357 - pathmatch: no match '+' '[,-.]'
+ok 17 - pathmatch: no match 'foo' 'bar'
 
-expecting success of 3070.1358 'pathmatch (via ls-files): no match '[,-.]' '+'': 
+expecting success of 3070.18 'pathmatch (via ls-files): no match 'bar' 'foo'': 
 				>expect &&
-				git ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				git ls-files -z -- 'bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1358 - pathmatch (via ls-files): no match '[,-.]' '+'
+ok 18 - pathmatch (via ls-files): no match 'bar' 'foo'
 
-expecting success of 3070.1359 'ipathmatch: no match '+' '[,-.]'': 
-			test_must_fail test-tool wildmatch ipathmatch '+' '[,-.]'
+expecting success of 3070.19 'ipathmatch: no match 'foo' 'bar'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' 'bar'
 		
-ok 1359 - ipathmatch: no match '+' '[,-.]'
+ok 19 - ipathmatch: no match 'foo' 'bar'
 
-expecting success of 3070.1360 'ipathmatch (via ls-files): no match '[,-.]' '+'': 
+expecting success of 3070.20 'ipathmatch (via ls-files): no match 'bar' 'foo'': 
 				>expect &&
-				git --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				git --icase-pathspecs ls-files -z -- 'bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1360 - ipathmatch (via ls-files): no match '[,-.]' '+'
+ok 20 - ipathmatch (via ls-files): no match 'bar' 'foo'
 
-expecting success of 3070.1361 'cleanup after previous file test': 
+expecting success of 3070.21 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing +
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1361 - cleanup after previous file test
+Removing foo
+ok 21 - cleanup after previous file test
 
-expecting success of 3070.1362 'setup match file test for -.]': 
+expecting success of 3070.22 'setup match file test for ': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -192756,83 +194067,50 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1362 - setup match file test for -.]
+ok 22 - setup match file test for 
 
-expecting success of 3070.1363 'wildmatch: no match '-.]' '[,-.]'': 
-			test_must_fail test-tool wildmatch wildmatch '-.]' '[,-.]'
+expecting success of 3070.23 'wildmatch: match '' ''': 
+			test-tool wildmatch wildmatch '' ''
 		
-ok 1363 - wildmatch: no match '-.]' '[,-.]'
+ok 23 - wildmatch: match '' ''
 
-expecting success of 3070.1364 'wildmatch (via ls-files): no match '[,-.]' '-.]'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1364 - wildmatch (via ls-files): no match '[,-.]' '-.]'
+checking known breakage of 3070.24 'wildmatch (via ls-files): match skip '' ''': false
+not ok 24 - wildmatch (via ls-files): match skip '' '' # TODO known breakage
 
-expecting success of 3070.1365 'iwildmatch: no match '-.]' '[,-.]'': 
-			test_must_fail test-tool wildmatch iwildmatch '-.]' '[,-.]'
+expecting success of 3070.25 'iwildmatch: match '' ''': 
+			test-tool wildmatch iwildmatch '' ''
 		
-ok 1365 - iwildmatch: no match '-.]' '[,-.]'
+ok 25 - iwildmatch: match '' ''
 
-expecting success of 3070.1366 'iwildmatch (via ls-files): no match '[,-.]' '-.]'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1366 - iwildmatch (via ls-files): no match '[,-.]' '-.]'
+checking known breakage of 3070.26 'iwildmatch (via ls-files): match skip '' ''': false
+not ok 26 - iwildmatch (via ls-files): match skip '' '' # TODO known breakage
 
-expecting success of 3070.1367 'pathmatch: no match '-.]' '[,-.]'': 
-			test_must_fail test-tool wildmatch pathmatch '-.]' '[,-.]'
+expecting success of 3070.27 'pathmatch: match '' ''': 
+			test-tool wildmatch pathmatch '' ''
 		
-ok 1367 - pathmatch: no match '-.]' '[,-.]'
+ok 27 - pathmatch: match '' ''
 
-expecting success of 3070.1368 'pathmatch (via ls-files): no match '[,-.]' '-.]'': 
-				>expect &&
-				git ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1368 - pathmatch (via ls-files): no match '[,-.]' '-.]'
+checking known breakage of 3070.28 'pathmatch (via ls-files): match skip '' ''': false
+not ok 28 - pathmatch (via ls-files): match skip '' '' # TODO known breakage
 
-expecting success of 3070.1369 'ipathmatch: no match '-.]' '[,-.]'': 
-			test_must_fail test-tool wildmatch ipathmatch '-.]' '[,-.]'
+expecting success of 3070.29 'ipathmatch: match '' ''': 
+			test-tool wildmatch ipathmatch '' ''
 		
-ok 1369 - ipathmatch: no match '-.]' '[,-.]'
+ok 29 - ipathmatch: match '' ''
 
-expecting success of 3070.1370 'ipathmatch (via ls-files): no match '[,-.]' '-.]'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1370 - ipathmatch (via ls-files): no match '[,-.]' '-.]'
+checking known breakage of 3070.30 'ipathmatch (via ls-files): match skip '' ''': false
+not ok 30 - ipathmatch (via ls-files): match skip '' '' # TODO known breakage
 
-expecting success of 3070.1371 'cleanup after previous file test': 
+expecting success of 3070.31 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing -.]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1371 - cleanup after previous file test
+ok 31 - cleanup after previous file test
 
-expecting success of 3070.1372 'setup match file test for 2': 
+expecting success of 3070.32 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -192851,83 +194129,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1372 - setup match file test for 2
+ok 32 - setup match file test for foo
 
-expecting success of 3070.1373 'wildmatch: match '2' '[\1-\3]'': 
-			test-tool wildmatch wildmatch '2' '[\1-\3]'
+expecting success of 3070.33 'wildmatch: match 'foo' '???'': 
+			test-tool wildmatch wildmatch 'foo' '???'
 		
-ok 1373 - wildmatch: match '2' '[\1-\3]'
+ok 33 - wildmatch: match 'foo' '???'
 
-expecting success of 3070.1374 'wildmatch (via ls-files): match '[\1-\3]' '2'': 
-				printf '%s' '2' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+expecting success of 3070.34 'wildmatch (via ls-files): match '???' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '???' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1374 - wildmatch (via ls-files): match '[\1-\3]' '2'
+ok 34 - wildmatch (via ls-files): match '???' 'foo'
 
-expecting success of 3070.1375 'iwildmatch: match '2' '[\1-\3]'': 
-			test-tool wildmatch iwildmatch '2' '[\1-\3]'
+expecting success of 3070.35 'iwildmatch: match 'foo' '???'': 
+			test-tool wildmatch iwildmatch 'foo' '???'
 		
-ok 1375 - iwildmatch: match '2' '[\1-\3]'
+ok 35 - iwildmatch: match 'foo' '???'
 
-expecting success of 3070.1376 'iwildmatch (via ls-files): match '[\1-\3]' '2'': 
-				printf '%s' '2' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+expecting success of 3070.36 'iwildmatch (via ls-files): match '???' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '???' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1376 - iwildmatch (via ls-files): match '[\1-\3]' '2'
+ok 36 - iwildmatch (via ls-files): match '???' 'foo'
 
-expecting success of 3070.1377 'pathmatch: match '2' '[\1-\3]'': 
-			test-tool wildmatch pathmatch '2' '[\1-\3]'
+expecting success of 3070.37 'pathmatch: match 'foo' '???'': 
+			test-tool wildmatch pathmatch 'foo' '???'
 		
-ok 1377 - pathmatch: match '2' '[\1-\3]'
+ok 37 - pathmatch: match 'foo' '???'
 
-expecting success of 3070.1378 'pathmatch (via ls-files): match '[\1-\3]' '2'': 
-				printf '%s' '2' >expect &&
-				git ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+expecting success of 3070.38 'pathmatch (via ls-files): match '???' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git ls-files -z -- '???' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1378 - pathmatch (via ls-files): match '[\1-\3]' '2'
+ok 38 - pathmatch (via ls-files): match '???' 'foo'
 
-expecting success of 3070.1379 'ipathmatch: match '2' '[\1-\3]'': 
-			test-tool wildmatch ipathmatch '2' '[\1-\3]'
+expecting success of 3070.39 'ipathmatch: match 'foo' '???'': 
+			test-tool wildmatch ipathmatch 'foo' '???'
 		
-ok 1379 - ipathmatch: match '2' '[\1-\3]'
+ok 39 - ipathmatch: match 'foo' '???'
 
-expecting success of 3070.1380 'ipathmatch (via ls-files): match '[\1-\3]' '2'': 
-				printf '%s' '2' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+expecting success of 3070.40 'ipathmatch (via ls-files): match '???' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '???' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1380 - ipathmatch (via ls-files): match '[\1-\3]' '2'
+ok 40 - ipathmatch (via ls-files): match '???' 'foo'
 
-expecting success of 3070.1381 'cleanup after previous file test': 
+expecting success of 3070.41 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing 2
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1381 - cleanup after previous file test
+Removing foo
+ok 41 - cleanup after previous file test
 
-expecting success of 3070.1382 'setup match file test for 3': 
+expecting success of 3070.42 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -192946,83 +194224,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1382 - setup match file test for 3
+ok 42 - setup match file test for foo
 
-expecting success of 3070.1383 'wildmatch: match '3' '[\1-\3]'': 
-			test-tool wildmatch wildmatch '3' '[\1-\3]'
+expecting success of 3070.43 'wildmatch: no match 'foo' '??'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo' '??'
 		
-ok 1383 - wildmatch: match '3' '[\1-\3]'
+ok 43 - wildmatch: no match 'foo' '??'
 
-expecting success of 3070.1384 'wildmatch (via ls-files): match '[\1-\3]' '3'': 
-				printf '%s' '3' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+expecting success of 3070.44 'wildmatch (via ls-files): no match '??' 'foo'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1384 - wildmatch (via ls-files): match '[\1-\3]' '3'
+ok 44 - wildmatch (via ls-files): no match '??' 'foo'
 
-expecting success of 3070.1385 'iwildmatch: match '3' '[\1-\3]'': 
-			test-tool wildmatch iwildmatch '3' '[\1-\3]'
+expecting success of 3070.45 'iwildmatch: no match 'foo' '??'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo' '??'
 		
-ok 1385 - iwildmatch: match '3' '[\1-\3]'
+ok 45 - iwildmatch: no match 'foo' '??'
 
-expecting success of 3070.1386 'iwildmatch (via ls-files): match '[\1-\3]' '3'': 
-				printf '%s' '3' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+expecting success of 3070.46 'iwildmatch (via ls-files): no match '??' 'foo'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1386 - iwildmatch (via ls-files): match '[\1-\3]' '3'
+ok 46 - iwildmatch (via ls-files): no match '??' 'foo'
 
-expecting success of 3070.1387 'pathmatch: match '3' '[\1-\3]'': 
-			test-tool wildmatch pathmatch '3' '[\1-\3]'
+expecting success of 3070.47 'pathmatch: no match 'foo' '??'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' '??'
 		
-ok 1387 - pathmatch: match '3' '[\1-\3]'
+ok 47 - pathmatch: no match 'foo' '??'
 
-expecting success of 3070.1388 'pathmatch (via ls-files): match '[\1-\3]' '3'': 
-				printf '%s' '3' >expect &&
-				git ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+expecting success of 3070.48 'pathmatch (via ls-files): no match '??' 'foo'': 
+				>expect &&
+				git ls-files -z -- '??' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1388 - pathmatch (via ls-files): match '[\1-\3]' '3'
+ok 48 - pathmatch (via ls-files): no match '??' 'foo'
 
-expecting success of 3070.1389 'ipathmatch: match '3' '[\1-\3]'': 
-			test-tool wildmatch ipathmatch '3' '[\1-\3]'
+expecting success of 3070.49 'ipathmatch: no match 'foo' '??'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '??'
 		
-ok 1389 - ipathmatch: match '3' '[\1-\3]'
+ok 49 - ipathmatch: no match 'foo' '??'
 
-expecting success of 3070.1390 'ipathmatch (via ls-files): match '[\1-\3]' '3'': 
-				printf '%s' '3' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+expecting success of 3070.50 'ipathmatch (via ls-files): no match '??' 'foo'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1390 - ipathmatch (via ls-files): match '[\1-\3]' '3'
+ok 50 - ipathmatch (via ls-files): no match '??' 'foo'
 
-expecting success of 3070.1391 'cleanup after previous file test': 
+expecting success of 3070.51 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing 3
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1391 - cleanup after previous file test
+Removing foo
+ok 51 - cleanup after previous file test
 
-expecting success of 3070.1392 'setup match file test for 4': 
+expecting success of 3070.52 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -193041,83 +194319,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1392 - setup match file test for 4
+ok 52 - setup match file test for foo
 
-expecting success of 3070.1393 'wildmatch: no match '4' '[\1-\3]'': 
-			test_must_fail test-tool wildmatch wildmatch '4' '[\1-\3]'
+expecting success of 3070.53 'wildmatch: match 'foo' '*'': 
+			test-tool wildmatch wildmatch 'foo' '*'
 		
-ok 1393 - wildmatch: no match '4' '[\1-\3]'
+ok 53 - wildmatch: match 'foo' '*'
 
-expecting success of 3070.1394 'wildmatch (via ls-files): no match '[\1-\3]' '4'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+expecting success of 3070.54 'wildmatch (via ls-files): match '*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1394 - wildmatch (via ls-files): no match '[\1-\3]' '4'
+ok 54 - wildmatch (via ls-files): match '*' 'foo'
 
-expecting success of 3070.1395 'iwildmatch: no match '4' '[\1-\3]'': 
-			test_must_fail test-tool wildmatch iwildmatch '4' '[\1-\3]'
+expecting success of 3070.55 'iwildmatch: match 'foo' '*'': 
+			test-tool wildmatch iwildmatch 'foo' '*'
 		
-ok 1395 - iwildmatch: no match '4' '[\1-\3]'
+ok 55 - iwildmatch: match 'foo' '*'
 
-expecting success of 3070.1396 'iwildmatch (via ls-files): no match '[\1-\3]' '4'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+expecting success of 3070.56 'iwildmatch (via ls-files): match '*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1396 - iwildmatch (via ls-files): no match '[\1-\3]' '4'
+ok 56 - iwildmatch (via ls-files): match '*' 'foo'
 
-expecting success of 3070.1397 'pathmatch: no match '4' '[\1-\3]'': 
-			test_must_fail test-tool wildmatch pathmatch '4' '[\1-\3]'
+expecting success of 3070.57 'pathmatch: match 'foo' '*'': 
+			test-tool wildmatch pathmatch 'foo' '*'
 		
-ok 1397 - pathmatch: no match '4' '[\1-\3]'
+ok 57 - pathmatch: match 'foo' '*'
 
-expecting success of 3070.1398 'pathmatch (via ls-files): no match '[\1-\3]' '4'': 
-				>expect &&
-				git ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+expecting success of 3070.58 'pathmatch (via ls-files): match '*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git ls-files -z -- '*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1398 - pathmatch (via ls-files): no match '[\1-\3]' '4'
+ok 58 - pathmatch (via ls-files): match '*' 'foo'
 
-expecting success of 3070.1399 'ipathmatch: no match '4' '[\1-\3]'': 
-			test_must_fail test-tool wildmatch ipathmatch '4' '[\1-\3]'
+expecting success of 3070.59 'ipathmatch: match 'foo' '*'': 
+			test-tool wildmatch ipathmatch 'foo' '*'
 		
-ok 1399 - ipathmatch: no match '4' '[\1-\3]'
+ok 59 - ipathmatch: match 'foo' '*'
 
-expecting success of 3070.1400 'ipathmatch (via ls-files): no match '[\1-\3]' '4'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+expecting success of 3070.60 'ipathmatch (via ls-files): match '*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1400 - ipathmatch (via ls-files): no match '[\1-\3]' '4'
+ok 60 - ipathmatch (via ls-files): match '*' 'foo'
 
-expecting success of 3070.1401 'cleanup after previous file test': 
+expecting success of 3070.61 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing 4
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1401 - cleanup after previous file test
+Removing foo
+ok 61 - cleanup after previous file test
 
-expecting success of 3070.1402 'setup match file test for \': 
+expecting success of 3070.62 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -193136,83 +194414,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1402 - setup match file test for \
+ok 62 - setup match file test for foo
 
-expecting success of 3070.1403 'wildmatch: match '\' '[[-\]]'': 
-			test-tool wildmatch wildmatch '\' '[[-\]]'
+expecting success of 3070.63 'wildmatch: match 'foo' 'f*'': 
+			test-tool wildmatch wildmatch 'foo' 'f*'
 		
-ok 1403 - wildmatch: match '\' '[[-\]]'
+ok 63 - wildmatch: match 'foo' 'f*'
 
-expecting success of 3070.1404 'wildmatch (via ls-files): match '[[-\]]' '\'': 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.64 'wildmatch (via ls-files): match 'f*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- 'f*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1404 - wildmatch (via ls-files): match '[[-\]]' '\'
+ok 64 - wildmatch (via ls-files): match 'f*' 'foo'
 
-expecting success of 3070.1405 'iwildmatch: match '\' '[[-\]]'': 
-			test-tool wildmatch iwildmatch '\' '[[-\]]'
+expecting success of 3070.65 'iwildmatch: match 'foo' 'f*'': 
+			test-tool wildmatch iwildmatch 'foo' 'f*'
 		
-ok 1405 - iwildmatch: match '\' '[[-\]]'
+ok 65 - iwildmatch: match 'foo' 'f*'
 
-expecting success of 3070.1406 'iwildmatch (via ls-files): match '[[-\]]' '\'': 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.66 'iwildmatch (via ls-files): match 'f*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1406 - iwildmatch (via ls-files): match '[[-\]]' '\'
+ok 66 - iwildmatch (via ls-files): match 'f*' 'foo'
 
-expecting success of 3070.1407 'pathmatch: match '\' '[[-\]]'': 
-			test-tool wildmatch pathmatch '\' '[[-\]]'
+expecting success of 3070.67 'pathmatch: match 'foo' 'f*'': 
+			test-tool wildmatch pathmatch 'foo' 'f*'
 		
-ok 1407 - pathmatch: match '\' '[[-\]]'
+ok 67 - pathmatch: match 'foo' 'f*'
 
-expecting success of 3070.1408 'pathmatch (via ls-files): match '[[-\]]' '\'': 
-				printf '%s' '\' >expect &&
-				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.68 'pathmatch (via ls-files): match 'f*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git ls-files -z -- 'f*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1408 - pathmatch (via ls-files): match '[[-\]]' '\'
+ok 68 - pathmatch (via ls-files): match 'f*' 'foo'
 
-expecting success of 3070.1409 'ipathmatch: match '\' '[[-\]]'': 
-			test-tool wildmatch ipathmatch '\' '[[-\]]'
+expecting success of 3070.69 'ipathmatch: match 'foo' 'f*'': 
+			test-tool wildmatch ipathmatch 'foo' 'f*'
 		
-ok 1409 - ipathmatch: match '\' '[[-\]]'
+ok 69 - ipathmatch: match 'foo' 'f*'
 
-expecting success of 3070.1410 'ipathmatch (via ls-files): match '[[-\]]' '\'': 
-				printf '%s' '\' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.70 'ipathmatch (via ls-files): match 'f*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --icase-pathspecs ls-files -z -- 'f*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1410 - ipathmatch (via ls-files): match '[[-\]]' '\'
+ok 70 - ipathmatch (via ls-files): match 'f*' 'foo'
 
-expecting success of 3070.1411 'cleanup after previous file test': 
+expecting success of 3070.71 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing "\\"
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1411 - cleanup after previous file test
+Removing foo
+ok 71 - cleanup after previous file test
 
-expecting success of 3070.1412 'setup match file test for [': 
+expecting success of 3070.72 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -193231,83 +194509,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1412 - setup match file test for [
+ok 72 - setup match file test for foo
 
-expecting success of 3070.1413 'wildmatch: match '[' '[[-\]]'': 
-			test-tool wildmatch wildmatch '[' '[[-\]]'
+expecting success of 3070.73 'wildmatch: no match 'foo' '*f'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo' '*f'
 		
-ok 1413 - wildmatch: match '[' '[[-\]]'
+ok 73 - wildmatch: no match 'foo' '*f'
 
-expecting success of 3070.1414 'wildmatch (via ls-files): match '[[-\]]' '['': 
-				printf '%s' '[' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.74 'wildmatch (via ls-files): no match '*f' 'foo'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*f' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1414 - wildmatch (via ls-files): match '[[-\]]' '['
+ok 74 - wildmatch (via ls-files): no match '*f' 'foo'
 
-expecting success of 3070.1415 'iwildmatch: match '[' '[[-\]]'': 
-			test-tool wildmatch iwildmatch '[' '[[-\]]'
+expecting success of 3070.75 'iwildmatch: no match 'foo' '*f'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo' '*f'
 		
-ok 1415 - iwildmatch: match '[' '[[-\]]'
+ok 75 - iwildmatch: no match 'foo' '*f'
 
-expecting success of 3070.1416 'iwildmatch (via ls-files): match '[[-\]]' '['': 
-				printf '%s' '[' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.76 'iwildmatch (via ls-files): no match '*f' 'foo'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*f' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1416 - iwildmatch (via ls-files): match '[[-\]]' '['
+ok 76 - iwildmatch (via ls-files): no match '*f' 'foo'
 
-expecting success of 3070.1417 'pathmatch: match '[' '[[-\]]'': 
-			test-tool wildmatch pathmatch '[' '[[-\]]'
+expecting success of 3070.77 'pathmatch: no match 'foo' '*f'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' '*f'
 		
-ok 1417 - pathmatch: match '[' '[[-\]]'
+ok 77 - pathmatch: no match 'foo' '*f'
 
-expecting success of 3070.1418 'pathmatch (via ls-files): match '[[-\]]' '['': 
-				printf '%s' '[' >expect &&
-				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.78 'pathmatch (via ls-files): no match '*f' 'foo'': 
+				>expect &&
+				git ls-files -z -- '*f' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1418 - pathmatch (via ls-files): match '[[-\]]' '['
+ok 78 - pathmatch (via ls-files): no match '*f' 'foo'
 
-expecting success of 3070.1419 'ipathmatch: match '[' '[[-\]]'': 
-			test-tool wildmatch ipathmatch '[' '[[-\]]'
+expecting success of 3070.79 'ipathmatch: no match 'foo' '*f'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '*f'
 		
-ok 1419 - ipathmatch: match '[' '[[-\]]'
+ok 79 - ipathmatch: no match 'foo' '*f'
 
-expecting success of 3070.1420 'ipathmatch (via ls-files): match '[[-\]]' '['': 
-				printf '%s' '[' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.80 'ipathmatch (via ls-files): no match '*f' 'foo'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '*f' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1420 - ipathmatch (via ls-files): match '[[-\]]' '['
+ok 80 - ipathmatch (via ls-files): no match '*f' 'foo'
 
-expecting success of 3070.1421 'cleanup after previous file test': 
+expecting success of 3070.81 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing [
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1421 - cleanup after previous file test
+Removing foo
+ok 81 - cleanup after previous file test
 
-expecting success of 3070.1422 'setup match file test for ]': 
+expecting success of 3070.82 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -193326,83 +194604,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1422 - setup match file test for ]
+ok 82 - setup match file test for foo
 
-expecting success of 3070.1423 'wildmatch: match ']' '[[-\]]'': 
-			test-tool wildmatch wildmatch ']' '[[-\]]'
+expecting success of 3070.83 'wildmatch: match 'foo' '*foo*'': 
+			test-tool wildmatch wildmatch 'foo' '*foo*'
 		
-ok 1423 - wildmatch: match ']' '[[-\]]'
+ok 83 - wildmatch: match 'foo' '*foo*'
 
-expecting success of 3070.1424 'wildmatch (via ls-files): match '[[-\]]' ']'': 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.84 'wildmatch (via ls-files): match '*foo*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1424 - wildmatch (via ls-files): match '[[-\]]' ']'
+ok 84 - wildmatch (via ls-files): match '*foo*' 'foo'
 
-expecting success of 3070.1425 'iwildmatch: match ']' '[[-\]]'': 
-			test-tool wildmatch iwildmatch ']' '[[-\]]'
+expecting success of 3070.85 'iwildmatch: match 'foo' '*foo*'': 
+			test-tool wildmatch iwildmatch 'foo' '*foo*'
 		
-ok 1425 - iwildmatch: match ']' '[[-\]]'
+ok 85 - iwildmatch: match 'foo' '*foo*'
 
-expecting success of 3070.1426 'iwildmatch (via ls-files): match '[[-\]]' ']'': 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.86 'iwildmatch (via ls-files): match '*foo*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1426 - iwildmatch (via ls-files): match '[[-\]]' ']'
+ok 86 - iwildmatch (via ls-files): match '*foo*' 'foo'
 
-expecting success of 3070.1427 'pathmatch: match ']' '[[-\]]'': 
-			test-tool wildmatch pathmatch ']' '[[-\]]'
+expecting success of 3070.87 'pathmatch: match 'foo' '*foo*'': 
+			test-tool wildmatch pathmatch 'foo' '*foo*'
 		
-ok 1427 - pathmatch: match ']' '[[-\]]'
+ok 87 - pathmatch: match 'foo' '*foo*'
 
-expecting success of 3070.1428 'pathmatch (via ls-files): match '[[-\]]' ']'': 
-				printf '%s' ']' >expect &&
-				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.88 'pathmatch (via ls-files): match '*foo*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1428 - pathmatch (via ls-files): match '[[-\]]' ']'
+ok 88 - pathmatch (via ls-files): match '*foo*' 'foo'
 
-expecting success of 3070.1429 'ipathmatch: match ']' '[[-\]]'': 
-			test-tool wildmatch ipathmatch ']' '[[-\]]'
+expecting success of 3070.89 'ipathmatch: match 'foo' '*foo*'': 
+			test-tool wildmatch ipathmatch 'foo' '*foo*'
 		
-ok 1429 - ipathmatch: match ']' '[[-\]]'
+ok 89 - ipathmatch: match 'foo' '*foo*'
 
-expecting success of 3070.1430 'ipathmatch (via ls-files): match '[[-\]]' ']'': 
-				printf '%s' ']' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.90 'ipathmatch (via ls-files): match '*foo*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1430 - ipathmatch (via ls-files): match '[[-\]]' ']'
+ok 90 - ipathmatch (via ls-files): match '*foo*' 'foo'
 
-expecting success of 3070.1431 'cleanup after previous file test': 
+expecting success of 3070.91 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing ]
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1431 - cleanup after previous file test
+Removing foo
+ok 91 - cleanup after previous file test
 
-expecting success of 3070.1432 'setup match file test for -': 
+expecting success of 3070.92 'setup match file test for foobar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -193421,83 +194699,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1432 - setup match file test for -
+ok 92 - setup match file test for foobar
 
-expecting success of 3070.1433 'wildmatch: no match '-' '[[-\]]'': 
-			test_must_fail test-tool wildmatch wildmatch '-' '[[-\]]'
+expecting success of 3070.93 'wildmatch: match 'foobar' '*ob*a*r*'': 
+			test-tool wildmatch wildmatch 'foobar' '*ob*a*r*'
 		
-ok 1433 - wildmatch: no match '-' '[[-\]]'
+ok 93 - wildmatch: match 'foobar' '*ob*a*r*'
 
-expecting success of 3070.1434 'wildmatch (via ls-files): no match '[[-\]]' '-'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.94 'wildmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
+				printf '%s' 'foobar' >expect &&
+				git --glob-pathspecs ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1434 - wildmatch (via ls-files): no match '[[-\]]' '-'
+ok 94 - wildmatch (via ls-files): match '*ob*a*r*' 'foobar'
 
-expecting success of 3070.1435 'iwildmatch: no match '-' '[[-\]]'': 
-			test_must_fail test-tool wildmatch iwildmatch '-' '[[-\]]'
+expecting success of 3070.95 'iwildmatch: match 'foobar' '*ob*a*r*'': 
+			test-tool wildmatch iwildmatch 'foobar' '*ob*a*r*'
 		
-ok 1435 - iwildmatch: no match '-' '[[-\]]'
+ok 95 - iwildmatch: match 'foobar' '*ob*a*r*'
 
-expecting success of 3070.1436 'iwildmatch (via ls-files): no match '[[-\]]' '-'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.96 'iwildmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
+				printf '%s' 'foobar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1436 - iwildmatch (via ls-files): no match '[[-\]]' '-'
+ok 96 - iwildmatch (via ls-files): match '*ob*a*r*' 'foobar'
 
-expecting success of 3070.1437 'pathmatch: no match '-' '[[-\]]'': 
-			test_must_fail test-tool wildmatch pathmatch '-' '[[-\]]'
+expecting success of 3070.97 'pathmatch: match 'foobar' '*ob*a*r*'': 
+			test-tool wildmatch pathmatch 'foobar' '*ob*a*r*'
 		
-ok 1437 - pathmatch: no match '-' '[[-\]]'
+ok 97 - pathmatch: match 'foobar' '*ob*a*r*'
 
-expecting success of 3070.1438 'pathmatch (via ls-files): no match '[[-\]]' '-'': 
-				>expect &&
-				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.98 'pathmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
+				printf '%s' 'foobar' >expect &&
+				git ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1438 - pathmatch (via ls-files): no match '[[-\]]' '-'
+ok 98 - pathmatch (via ls-files): match '*ob*a*r*' 'foobar'
 
-expecting success of 3070.1439 'ipathmatch: no match '-' '[[-\]]'': 
-			test_must_fail test-tool wildmatch ipathmatch '-' '[[-\]]'
+expecting success of 3070.99 'ipathmatch: match 'foobar' '*ob*a*r*'': 
+			test-tool wildmatch ipathmatch 'foobar' '*ob*a*r*'
 		
-ok 1439 - ipathmatch: no match '-' '[[-\]]'
+ok 99 - ipathmatch: match 'foobar' '*ob*a*r*'
 
-expecting success of 3070.1440 'ipathmatch (via ls-files): no match '[[-\]]' '-'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.100 'ipathmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
+				printf '%s' 'foobar' >expect &&
+				git --icase-pathspecs ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1440 - ipathmatch (via ls-files): no match '[[-\]]' '-'
+ok 100 - ipathmatch (via ls-files): match '*ob*a*r*' 'foobar'
 
-expecting success of 3070.1441 'cleanup after previous file test': 
+expecting success of 3070.101 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing -
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1441 - cleanup after previous file test
+Removing foobar
+ok 101 - cleanup after previous file test
 
-expecting success of 3070.1442 'setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1': 
+expecting success of 3070.102 'setup match file test for aaaaaaabababab': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -193516,83 +194794,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1442 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
+ok 102 - setup match file test for aaaaaaabababab
 
-expecting success of 3070.1443 'wildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.103 'wildmatch: match 'aaaaaaabababab' '*ab'': 
+			test-tool wildmatch wildmatch 'aaaaaaabababab' '*ab'
 		
-ok 1443 - wildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 103 - wildmatch: match 'aaaaaaabababab' '*ab'
 
-expecting success of 3070.1444 'wildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
-				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
-				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.104 'wildmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
+				printf '%s' 'aaaaaaabababab' >expect &&
+				git --glob-pathspecs ls-files -z -- '*ab' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1444 - wildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+ok 104 - wildmatch (via ls-files): match '*ab' 'aaaaaaabababab'
 
-expecting success of 3070.1445 'iwildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.105 'iwildmatch: match 'aaaaaaabababab' '*ab'': 
+			test-tool wildmatch iwildmatch 'aaaaaaabababab' '*ab'
 		
-ok 1445 - iwildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 105 - iwildmatch: match 'aaaaaaabababab' '*ab'
 
-expecting success of 3070.1446 'iwildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
-				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.106 'iwildmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
+				printf '%s' 'aaaaaaabababab' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*ab' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1446 - iwildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+ok 106 - iwildmatch (via ls-files): match '*ab' 'aaaaaaabababab'
 
-expecting success of 3070.1447 'pathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.107 'pathmatch: match 'aaaaaaabababab' '*ab'': 
+			test-tool wildmatch pathmatch 'aaaaaaabababab' '*ab'
 		
-ok 1447 - pathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 107 - pathmatch: match 'aaaaaaabababab' '*ab'
 
-expecting success of 3070.1448 'pathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
-				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
-				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.108 'pathmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
+				printf '%s' 'aaaaaaabababab' >expect &&
+				git ls-files -z -- '*ab' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1448 - pathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+ok 108 - pathmatch (via ls-files): match '*ab' 'aaaaaaabababab'
 
-expecting success of 3070.1449 'ipathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.109 'ipathmatch: match 'aaaaaaabababab' '*ab'': 
+			test-tool wildmatch ipathmatch 'aaaaaaabababab' '*ab'
 		
-ok 1449 - ipathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 109 - ipathmatch: match 'aaaaaaabababab' '*ab'
 
-expecting success of 3070.1450 'ipathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
-				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
-				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.110 'ipathmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
+				printf '%s' 'aaaaaaabababab' >expect &&
+				git --icase-pathspecs ls-files -z -- '*ab' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1450 - ipathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+ok 110 - ipathmatch (via ls-files): match '*ab' 'aaaaaaabababab'
 
-expecting success of 3070.1451 'cleanup after previous file test': 
+expecting success of 3070.111 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
+Removing aaaaaaabababab
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1451 - cleanup after previous file test
+ok 111 - cleanup after previous file test
 
-expecting success of 3070.1452 'setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1': 
+expecting success of 3070.112 'setup match file test for foo*': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -193611,83 +194889,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1452 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
+ok 112 - setup match file test for foo*
 
-expecting success of 3070.1453 'wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.113 'wildmatch: match 'foo*' 'foo\*'': 
+			test-tool wildmatch wildmatch 'foo*' 'foo\*'
 		
-ok 1453 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 113 - wildmatch: match 'foo*' 'foo\*'
 
-expecting success of 3070.1454 'wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.114 'wildmatch (via ls-files): match 'foo\*' 'foo*'': 
+				printf '%s' 'foo*' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1454 - wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+ok 114 - wildmatch (via ls-files): match 'foo\*' 'foo*'
 
-expecting success of 3070.1455 'iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.115 'iwildmatch: match 'foo*' 'foo\*'': 
+			test-tool wildmatch iwildmatch 'foo*' 'foo\*'
 		
-ok 1455 - iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 115 - iwildmatch: match 'foo*' 'foo\*'
 
-expecting success of 3070.1456 'iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.116 'iwildmatch (via ls-files): match 'foo\*' 'foo*'': 
+				printf '%s' 'foo*' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1456 - iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+ok 116 - iwildmatch (via ls-files): match 'foo\*' 'foo*'
 
-expecting success of 3070.1457 'pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.117 'pathmatch: match 'foo*' 'foo\*'': 
+			test-tool wildmatch pathmatch 'foo*' 'foo\*'
 		
-ok 1457 - pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 117 - pathmatch: match 'foo*' 'foo\*'
 
-expecting success of 3070.1458 'pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
-				>expect &&
-				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.118 'pathmatch (via ls-files): match 'foo\*' 'foo*'': 
+				printf '%s' 'foo*' >expect &&
+				git ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1458 - pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+ok 118 - pathmatch (via ls-files): match 'foo\*' 'foo*'
 
-expecting success of 3070.1459 'ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.119 'ipathmatch: match 'foo*' 'foo\*'': 
+			test-tool wildmatch ipathmatch 'foo*' 'foo\*'
 		
-ok 1459 - ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 119 - ipathmatch: match 'foo*' 'foo\*'
 
-expecting success of 3070.1460 'ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.120 'ipathmatch (via ls-files): match 'foo\*' 'foo*'': 
+				printf '%s' 'foo*' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1460 - ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+ok 120 - ipathmatch (via ls-files): match 'foo\*' 'foo*'
 
-expecting success of 3070.1461 'cleanup after previous file test': 
+expecting success of 3070.121 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1461 - cleanup after previous file test
+Removing foo*
+ok 121 - cleanup after previous file test
 
-expecting success of 3070.1462 'setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1': 
+expecting success of 3070.122 'setup match file test for foobar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -193706,83 +194984,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1462 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1
+ok 122 - setup match file test for foobar
 
-expecting success of 3070.1463 'wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.123 'wildmatch: no match 'foobar' 'foo\*bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foobar' 'foo\*bar'
 		
-ok 1463 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 123 - wildmatch: no match 'foobar' 'foo\*bar'
 
-expecting success of 3070.1464 'wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+expecting success of 3070.124 'wildmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1464 - wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+ok 124 - wildmatch (via ls-files): no match 'foo\*bar' 'foobar'
 
-expecting success of 3070.1465 'iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.125 'iwildmatch: no match 'foobar' 'foo\*bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foobar' 'foo\*bar'
 		
-ok 1465 - iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 125 - iwildmatch: no match 'foobar' 'foo\*bar'
 
-expecting success of 3070.1466 'iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+expecting success of 3070.126 'iwildmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1466 - iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+ok 126 - iwildmatch (via ls-files): no match 'foo\*bar' 'foobar'
 
-expecting success of 3070.1467 'pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.127 'pathmatch: no match 'foobar' 'foo\*bar'': 
+			test_must_fail test-tool wildmatch pathmatch 'foobar' 'foo\*bar'
 		
-ok 1467 - pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 127 - pathmatch: no match 'foobar' 'foo\*bar'
 
-expecting success of 3070.1468 'pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+expecting success of 3070.128 'pathmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
 				>expect &&
-				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				git ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1468 - pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+ok 128 - pathmatch (via ls-files): no match 'foo\*bar' 'foobar'
 
-expecting success of 3070.1469 'ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.129 'ipathmatch: no match 'foobar' 'foo\*bar'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foobar' 'foo\*bar'
 		
-ok 1469 - ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 129 - ipathmatch: no match 'foobar' 'foo\*bar'
 
-expecting success of 3070.1470 'ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+expecting success of 3070.130 'ipathmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
 				>expect &&
-				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				git --icase-pathspecs ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1470 - ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+ok 130 - ipathmatch (via ls-files): no match 'foo\*bar' 'foobar'
 
-expecting success of 3070.1471 'cleanup after previous file test': 
+expecting success of 3070.131 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing -adobe-courier-bold-o-normal--12-120-75-75-/
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1471 - cleanup after previous file test
+Removing foobar
+ok 131 - cleanup after previous file test
 
-expecting success of 3070.1472 'setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1': 
+expecting success of 3070.132 'setup match file test for f\oo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -193801,50 +195079,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1472 - setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1
+ok 132 - setup match file test for f\oo
 
-expecting success of 3070.1473 'wildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test-tool wildmatch wildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.133 'wildmatch: match 'f\oo' 'f\\oo'': 
+			test-tool wildmatch wildmatch 'f\oo' 'f\\oo'
 		
-ok 1473 - wildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 133 - wildmatch: match 'f\oo' 'f\\oo'
 
-checking known breakage of 3070.1474 'wildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
-not ok 1474 - wildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+expecting success of 3070.134 'wildmatch (via ls-files): match 'f\\oo' 'f\oo'': 
+				printf '%s' 'f\oo' >expect &&
+				git --glob-pathspecs ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 134 - wildmatch (via ls-files): match 'f\\oo' 'f\oo'
 
-expecting success of 3070.1475 'iwildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test-tool wildmatch iwildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.135 'iwildmatch: match 'f\oo' 'f\\oo'': 
+			test-tool wildmatch iwildmatch 'f\oo' 'f\\oo'
 		
-ok 1475 - iwildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 135 - iwildmatch: match 'f\oo' 'f\\oo'
 
-checking known breakage of 3070.1476 'iwildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
-not ok 1476 - iwildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+expecting success of 3070.136 'iwildmatch (via ls-files): match 'f\\oo' 'f\oo'': 
+				printf '%s' 'f\oo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 136 - iwildmatch (via ls-files): match 'f\\oo' 'f\oo'
 
-expecting success of 3070.1477 'pathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test-tool wildmatch pathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.137 'pathmatch: match 'f\oo' 'f\\oo'': 
+			test-tool wildmatch pathmatch 'f\oo' 'f\\oo'
 		
-ok 1477 - pathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 137 - pathmatch: match 'f\oo' 'f\\oo'
 
-checking known breakage of 3070.1478 'pathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
-not ok 1478 - pathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+expecting success of 3070.138 'pathmatch (via ls-files): match 'f\\oo' 'f\oo'': 
+				printf '%s' 'f\oo' >expect &&
+				git ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 138 - pathmatch (via ls-files): match 'f\\oo' 'f\oo'
 
-expecting success of 3070.1479 'ipathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test-tool wildmatch ipathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.139 'ipathmatch: match 'f\oo' 'f\\oo'': 
+			test-tool wildmatch ipathmatch 'f\oo' 'f\\oo'
 		
-ok 1479 - ipathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 139 - ipathmatch: match 'f\oo' 'f\\oo'
 
-checking known breakage of 3070.1480 'ipathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
-not ok 1480 - ipathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+expecting success of 3070.140 'ipathmatch (via ls-files): match 'f\\oo' 'f\oo'': 
+				printf '%s' 'f\oo' >expect &&
+				git --icase-pathspecs ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 140 - ipathmatch (via ls-files): match 'f\\oo' 'f\oo'
 
-expecting success of 3070.1481 'cleanup after previous file test': 
+expecting success of 3070.141 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-ok 1481 - cleanup after previous file test
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing "f\\oo"
+ok 141 - cleanup after previous file test
 
-expecting success of 3070.1482 'setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1': 
+expecting success of 3070.142 'setup match file test for ball': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -193863,50 +195174,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1482 - setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1
+ok 142 - setup match file test for ball
 
-expecting success of 3070.1483 'wildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.143 'wildmatch: match 'ball' '*[al]?'': 
+			test-tool wildmatch wildmatch 'ball' '*[al]?'
 		
-ok 1483 - wildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 143 - wildmatch: match 'ball' '*[al]?'
 
-checking known breakage of 3070.1484 'wildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
-not ok 1484 - wildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+expecting success of 3070.144 'wildmatch (via ls-files): match '*[al]?' 'ball'': 
+				printf '%s' 'ball' >expect &&
+				git --glob-pathspecs ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 144 - wildmatch (via ls-files): match '*[al]?' 'ball'
 
-expecting success of 3070.1485 'iwildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.145 'iwildmatch: match 'ball' '*[al]?'': 
+			test-tool wildmatch iwildmatch 'ball' '*[al]?'
 		
-ok 1485 - iwildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 145 - iwildmatch: match 'ball' '*[al]?'
 
-checking known breakage of 3070.1486 'iwildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
-not ok 1486 - iwildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+expecting success of 3070.146 'iwildmatch (via ls-files): match '*[al]?' 'ball'': 
+				printf '%s' 'ball' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 146 - iwildmatch (via ls-files): match '*[al]?' 'ball'
 
-expecting success of 3070.1487 'pathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test_must_fail test-tool wildmatch pathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.147 'pathmatch: match 'ball' '*[al]?'': 
+			test-tool wildmatch pathmatch 'ball' '*[al]?'
 		
-ok 1487 - pathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 147 - pathmatch: match 'ball' '*[al]?'
 
-checking known breakage of 3070.1488 'pathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
-not ok 1488 - pathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+expecting success of 3070.148 'pathmatch (via ls-files): match '*[al]?' 'ball'': 
+				printf '%s' 'ball' >expect &&
+				git ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 148 - pathmatch (via ls-files): match '*[al]?' 'ball'
 
-expecting success of 3070.1489 'ipathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test_must_fail test-tool wildmatch ipathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.149 'ipathmatch: match 'ball' '*[al]?'': 
+			test-tool wildmatch ipathmatch 'ball' '*[al]?'
 		
-ok 1489 - ipathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 149 - ipathmatch: match 'ball' '*[al]?'
 
-checking known breakage of 3070.1490 'ipathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
-not ok 1490 - ipathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+expecting success of 3070.150 'ipathmatch (via ls-files): match '*[al]?' 'ball'': 
+				printf '%s' 'ball' >expect &&
+				git --icase-pathspecs ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 150 - ipathmatch (via ls-files): match '*[al]?' 'ball'
 
-expecting success of 3070.1491 'cleanup after previous file test': 
+expecting success of 3070.151 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-ok 1491 - cleanup after previous file test
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing ball
+Removing expect
+ok 151 - cleanup after previous file test
 
-expecting success of 3070.1492 'setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt': 
+expecting success of 3070.152 'setup match file test for ten': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -193925,83 +195269,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1492 - setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt
+ok 152 - setup match file test for ten
 
-expecting success of 3070.1493 'wildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
-			test-tool wildmatch wildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+expecting success of 3070.153 'wildmatch: no match 'ten' '[ten]'': 
+			test_must_fail test-tool wildmatch wildmatch 'ten' '[ten]'
 		
-ok 1493 - wildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+ok 153 - wildmatch: no match 'ten' '[ten]'
 
-expecting success of 3070.1494 'wildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
-				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.154 'wildmatch (via ls-files): no match '[ten]' 'ten'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1494 - wildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+ok 154 - wildmatch (via ls-files): no match '[ten]' 'ten'
 
-expecting success of 3070.1495 'iwildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
-			test-tool wildmatch iwildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+expecting success of 3070.155 'iwildmatch: no match 'ten' '[ten]'': 
+			test_must_fail test-tool wildmatch iwildmatch 'ten' '[ten]'
 		
-ok 1495 - iwildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+ok 155 - iwildmatch: no match 'ten' '[ten]'
 
-expecting success of 3070.1496 'iwildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
-				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.156 'iwildmatch (via ls-files): no match '[ten]' 'ten'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1496 - iwildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+ok 156 - iwildmatch (via ls-files): no match '[ten]' 'ten'
 
-expecting success of 3070.1497 'pathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
-			test-tool wildmatch pathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+expecting success of 3070.157 'pathmatch: no match 'ten' '[ten]'': 
+			test_must_fail test-tool wildmatch pathmatch 'ten' '[ten]'
 		
-ok 1497 - pathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+ok 157 - pathmatch: no match 'ten' '[ten]'
 
-expecting success of 3070.1498 'pathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
-				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
-				git ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.158 'pathmatch (via ls-files): no match '[ten]' 'ten'': 
+				>expect &&
+				git ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1498 - pathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+ok 158 - pathmatch (via ls-files): no match '[ten]' 'ten'
 
-expecting success of 3070.1499 'ipathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
-			test-tool wildmatch ipathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+expecting success of 3070.159 'ipathmatch: no match 'ten' '[ten]'': 
+			test_must_fail test-tool wildmatch ipathmatch 'ten' '[ten]'
 		
-ok 1499 - ipathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+ok 159 - ipathmatch: no match 'ten' '[ten]'
 
-expecting success of 3070.1500 'ipathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
-				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.160 'ipathmatch (via ls-files): no match '[ten]' 'ten'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1500 - ipathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+ok 160 - ipathmatch (via ls-files): no match '[ten]' 'ten'
 
-expecting success of 3070.1501 'cleanup after previous file test': 
+expecting success of 3070.161 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing abcd/
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1501 - cleanup after previous file test
+Removing ten
+ok 161 - cleanup after previous file test
 
-expecting success of 3070.1502 'setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz': 
+expecting success of 3070.162 'setup match file test for ten': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -194020,83 +195364,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1502 - setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz
+ok 162 - setup match file test for ten
 
-expecting success of 3070.1503 'wildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
-			test_must_fail test-tool wildmatch wildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+expecting success of 3070.163 'wildmatch: match 'ten' '**[!te]'': 
+			test-tool wildmatch wildmatch 'ten' '**[!te]'
 		
-ok 1503 - wildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+ok 163 - wildmatch: match 'ten' '**[!te]'
 
-expecting success of 3070.1504 'wildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.164 'wildmatch (via ls-files): match '**[!te]' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git --glob-pathspecs ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1504 - wildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+ok 164 - wildmatch (via ls-files): match '**[!te]' 'ten'
 
-expecting success of 3070.1505 'iwildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
-			test_must_fail test-tool wildmatch iwildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+expecting success of 3070.165 'iwildmatch: match 'ten' '**[!te]'': 
+			test-tool wildmatch iwildmatch 'ten' '**[!te]'
 		
-ok 1505 - iwildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+ok 165 - iwildmatch: match 'ten' '**[!te]'
 
-expecting success of 3070.1506 'iwildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.166 'iwildmatch (via ls-files): match '**[!te]' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1506 - iwildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+ok 166 - iwildmatch (via ls-files): match '**[!te]' 'ten'
 
-expecting success of 3070.1507 'pathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
-			test_must_fail test-tool wildmatch pathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+expecting success of 3070.167 'pathmatch: match 'ten' '**[!te]'': 
+			test-tool wildmatch pathmatch 'ten' '**[!te]'
 		
-ok 1507 - pathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+ok 167 - pathmatch: match 'ten' '**[!te]'
 
-expecting success of 3070.1508 'pathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
-				>expect &&
-				git ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.168 'pathmatch (via ls-files): match '**[!te]' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1508 - pathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+ok 168 - pathmatch (via ls-files): match '**[!te]' 'ten'
 
-expecting success of 3070.1509 'ipathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
-			test_must_fail test-tool wildmatch ipathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+expecting success of 3070.169 'ipathmatch: match 'ten' '**[!te]'': 
+			test-tool wildmatch ipathmatch 'ten' '**[!te]'
 		
-ok 1509 - ipathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+ok 169 - ipathmatch: match 'ten' '**[!te]'
 
-expecting success of 3070.1510 'ipathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.170 'ipathmatch (via ls-files): match '**[!te]' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git --icase-pathspecs ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1510 - ipathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+ok 170 - ipathmatch (via ls-files): match '**[!te]' 'ten'
 
-expecting success of 3070.1511 'cleanup after previous file test': 
+expecting success of 3070.171 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing abcd/
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1511 - cleanup after previous file test
+Removing ten
+ok 171 - cleanup after previous file test
 
-expecting success of 3070.1512 'setup match file test for foo': 
+expecting success of 3070.172 'setup match file test for ten': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -194115,69 +195459,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1512 - setup match file test for foo
+ok 172 - setup match file test for ten
 
-expecting success of 3070.1513 'wildmatch: no match 'foo' '*/*/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo' '*/*/*'
+expecting success of 3070.173 'wildmatch: no match 'ten' '**[!ten]'': 
+			test_must_fail test-tool wildmatch wildmatch 'ten' '**[!ten]'
 		
-ok 1513 - wildmatch: no match 'foo' '*/*/*'
+ok 173 - wildmatch: no match 'ten' '**[!ten]'
 
-expecting success of 3070.1514 'wildmatch (via ls-files): no match '*/*/*' 'foo'': 
+expecting success of 3070.174 'wildmatch (via ls-files): no match '**[!ten]' 'ten'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1514 - wildmatch (via ls-files): no match '*/*/*' 'foo'
+ok 174 - wildmatch (via ls-files): no match '**[!ten]' 'ten'
 
-expecting success of 3070.1515 'iwildmatch: no match 'foo' '*/*/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' '*/*/*'
+expecting success of 3070.175 'iwildmatch: no match 'ten' '**[!ten]'': 
+			test_must_fail test-tool wildmatch iwildmatch 'ten' '**[!ten]'
 		
-ok 1515 - iwildmatch: no match 'foo' '*/*/*'
+ok 175 - iwildmatch: no match 'ten' '**[!ten]'
 
-expecting success of 3070.1516 'iwildmatch (via ls-files): no match '*/*/*' 'foo'': 
+expecting success of 3070.176 'iwildmatch (via ls-files): no match '**[!ten]' 'ten'': 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1516 - iwildmatch (via ls-files): no match '*/*/*' 'foo'
+ok 176 - iwildmatch (via ls-files): no match '**[!ten]' 'ten'
 
-expecting success of 3070.1517 'pathmatch: no match 'foo' '*/*/*'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '*/*/*'
+expecting success of 3070.177 'pathmatch: no match 'ten' '**[!ten]'': 
+			test_must_fail test-tool wildmatch pathmatch 'ten' '**[!ten]'
 		
-ok 1517 - pathmatch: no match 'foo' '*/*/*'
+ok 177 - pathmatch: no match 'ten' '**[!ten]'
 
-expecting success of 3070.1518 'pathmatch (via ls-files): no match '*/*/*' 'foo'': 
+expecting success of 3070.178 'pathmatch (via ls-files): no match '**[!ten]' 'ten'': 
 				>expect &&
-				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				git ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1518 - pathmatch (via ls-files): no match '*/*/*' 'foo'
+ok 178 - pathmatch (via ls-files): no match '**[!ten]' 'ten'
 
-expecting success of 3070.1519 'ipathmatch: no match 'foo' '*/*/*'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '*/*/*'
+expecting success of 3070.179 'ipathmatch: no match 'ten' '**[!ten]'': 
+			test_must_fail test-tool wildmatch ipathmatch 'ten' '**[!ten]'
 		
-ok 1519 - ipathmatch: no match 'foo' '*/*/*'
+ok 179 - ipathmatch: no match 'ten' '**[!ten]'
 
-expecting success of 3070.1520 'ipathmatch (via ls-files): no match '*/*/*' 'foo'': 
+expecting success of 3070.180 'ipathmatch (via ls-files): no match '**[!ten]' 'ten'': 
 				>expect &&
-				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				git --icase-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1520 - ipathmatch (via ls-files): no match '*/*/*' 'foo'
+ok 180 - ipathmatch (via ls-files): no match '**[!ten]' 'ten'
 
-expecting success of 3070.1521 'cleanup after previous file test': 
+expecting success of 3070.181 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -194188,10 +195532,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo
-ok 1521 - cleanup after previous file test
+Removing ten
+ok 181 - cleanup after previous file test
 
-expecting success of 3070.1522 'setup match file test for foo/bar': 
+expecting success of 3070.182 'setup match file test for ten': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -194210,69 +195554,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1522 - setup match file test for foo/bar
+ok 182 - setup match file test for ten
 
-expecting success of 3070.1523 'wildmatch: no match 'foo/bar' '*/*/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' '*/*/*'
+expecting success of 3070.183 'wildmatch: match 'ten' 't[a-g]n'': 
+			test-tool wildmatch wildmatch 'ten' 't[a-g]n'
 		
-ok 1523 - wildmatch: no match 'foo/bar' '*/*/*'
+ok 183 - wildmatch: match 'ten' 't[a-g]n'
 
-expecting success of 3070.1524 'wildmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.184 'wildmatch (via ls-files): match 't[a-g]n' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git --glob-pathspecs ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1524 - wildmatch (via ls-files): no match '*/*/*' 'foo/bar'
+ok 184 - wildmatch (via ls-files): match 't[a-g]n' 'ten'
 
-expecting success of 3070.1525 'iwildmatch: no match 'foo/bar' '*/*/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' '*/*/*'
+expecting success of 3070.185 'iwildmatch: match 'ten' 't[a-g]n'': 
+			test-tool wildmatch iwildmatch 'ten' 't[a-g]n'
 		
-ok 1525 - iwildmatch: no match 'foo/bar' '*/*/*'
+ok 185 - iwildmatch: match 'ten' 't[a-g]n'
 
-expecting success of 3070.1526 'iwildmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.186 'iwildmatch (via ls-files): match 't[a-g]n' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1526 - iwildmatch (via ls-files): no match '*/*/*' 'foo/bar'
+ok 186 - iwildmatch (via ls-files): match 't[a-g]n' 'ten'
 
-expecting success of 3070.1527 'pathmatch: no match 'foo/bar' '*/*/*'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bar' '*/*/*'
+expecting success of 3070.187 'pathmatch: match 'ten' 't[a-g]n'': 
+			test-tool wildmatch pathmatch 'ten' 't[a-g]n'
 		
-ok 1527 - pathmatch: no match 'foo/bar' '*/*/*'
+ok 187 - pathmatch: match 'ten' 't[a-g]n'
 
-expecting success of 3070.1528 'pathmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
-				>expect &&
-				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.188 'pathmatch (via ls-files): match 't[a-g]n' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1528 - pathmatch (via ls-files): no match '*/*/*' 'foo/bar'
+ok 188 - pathmatch (via ls-files): match 't[a-g]n' 'ten'
 
-expecting success of 3070.1529 'ipathmatch: no match 'foo/bar' '*/*/*'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' '*/*/*'
+expecting success of 3070.189 'ipathmatch: match 'ten' 't[a-g]n'': 
+			test-tool wildmatch ipathmatch 'ten' 't[a-g]n'
 		
-ok 1529 - ipathmatch: no match 'foo/bar' '*/*/*'
+ok 189 - ipathmatch: match 'ten' 't[a-g]n'
 
-expecting success of 3070.1530 'ipathmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.190 'ipathmatch (via ls-files): match 't[a-g]n' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git --icase-pathspecs ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1530 - ipathmatch (via ls-files): no match '*/*/*' 'foo/bar'
+ok 190 - ipathmatch (via ls-files): match 't[a-g]n' 'ten'
 
-expecting success of 3070.1531 'cleanup after previous file test': 
+expecting success of 3070.191 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -194283,10 +195627,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1531 - cleanup after previous file test
+Removing ten
+ok 191 - cleanup after previous file test
 
-expecting success of 3070.1532 'setup match file test for foo/bba/arr': 
+expecting success of 3070.192 'setup match file test for ten': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -194305,69 +195649,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1532 - setup match file test for foo/bba/arr
+ok 192 - setup match file test for ten
 
-expecting success of 3070.1533 'wildmatch: match 'foo/bba/arr' '*/*/*'': 
-			test-tool wildmatch wildmatch 'foo/bba/arr' '*/*/*'
+expecting success of 3070.193 'wildmatch: no match 'ten' 't[!a-g]n'': 
+			test_must_fail test-tool wildmatch wildmatch 'ten' 't[!a-g]n'
 		
-ok 1533 - wildmatch: match 'foo/bba/arr' '*/*/*'
+ok 193 - wildmatch: no match 'ten' 't[!a-g]n'
 
-expecting success of 3070.1534 'wildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.194 'wildmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1534 - wildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+ok 194 - wildmatch (via ls-files): no match 't[!a-g]n' 'ten'
 
-expecting success of 3070.1535 'iwildmatch: match 'foo/bba/arr' '*/*/*'': 
-			test-tool wildmatch iwildmatch 'foo/bba/arr' '*/*/*'
+expecting success of 3070.195 'iwildmatch: no match 'ten' 't[!a-g]n'': 
+			test_must_fail test-tool wildmatch iwildmatch 'ten' 't[!a-g]n'
 		
-ok 1535 - iwildmatch: match 'foo/bba/arr' '*/*/*'
+ok 195 - iwildmatch: no match 'ten' 't[!a-g]n'
 
-expecting success of 3070.1536 'iwildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.196 'iwildmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1536 - iwildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+ok 196 - iwildmatch (via ls-files): no match 't[!a-g]n' 'ten'
 
-expecting success of 3070.1537 'pathmatch: match 'foo/bba/arr' '*/*/*'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' '*/*/*'
+expecting success of 3070.197 'pathmatch: no match 'ten' 't[!a-g]n'': 
+			test_must_fail test-tool wildmatch pathmatch 'ten' 't[!a-g]n'
 		
-ok 1537 - pathmatch: match 'foo/bba/arr' '*/*/*'
+ok 197 - pathmatch: no match 'ten' 't[!a-g]n'
 
-expecting success of 3070.1538 'pathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.198 'pathmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
+				>expect &&
+				git ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1538 - pathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+ok 198 - pathmatch (via ls-files): no match 't[!a-g]n' 'ten'
 
-expecting success of 3070.1539 'ipathmatch: match 'foo/bba/arr' '*/*/*'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' '*/*/*'
+expecting success of 3070.199 'ipathmatch: no match 'ten' 't[!a-g]n'': 
+			test_must_fail test-tool wildmatch ipathmatch 'ten' 't[!a-g]n'
 		
-ok 1539 - ipathmatch: match 'foo/bba/arr' '*/*/*'
+ok 199 - ipathmatch: no match 'ten' 't[!a-g]n'
 
-expecting success of 3070.1540 'ipathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.200 'ipathmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1540 - ipathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+ok 200 - ipathmatch (via ls-files): no match 't[!a-g]n' 'ten'
 
-expecting success of 3070.1541 'cleanup after previous file test': 
+expecting success of 3070.201 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -194378,10 +195722,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1541 - cleanup after previous file test
+Removing ten
+ok 201 - cleanup after previous file test
 
-expecting success of 3070.1542 'setup match file test for foo/bb/aa/rr': 
+expecting success of 3070.202 'setup match file test for ton': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -194400,69 +195744,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1542 - setup match file test for foo/bb/aa/rr
+ok 202 - setup match file test for ton
 
-expecting success of 3070.1543 'wildmatch: no match 'foo/bb/aa/rr' '*/*/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bb/aa/rr' '*/*/*'
+expecting success of 3070.203 'wildmatch: match 'ton' 't[!a-g]n'': 
+			test-tool wildmatch wildmatch 'ton' 't[!a-g]n'
 		
-ok 1543 - wildmatch: no match 'foo/bb/aa/rr' '*/*/*'
+ok 203 - wildmatch: match 'ton' 't[!a-g]n'
 
-expecting success of 3070.1544 'wildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.204 'wildmatch (via ls-files): match 't[!a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git --glob-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1544 - wildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'
+ok 204 - wildmatch (via ls-files): match 't[!a-g]n' 'ton'
 
-expecting success of 3070.1545 'iwildmatch: no match 'foo/bb/aa/rr' '*/*/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bb/aa/rr' '*/*/*'
+expecting success of 3070.205 'iwildmatch: match 'ton' 't[!a-g]n'': 
+			test-tool wildmatch iwildmatch 'ton' 't[!a-g]n'
 		
-ok 1545 - iwildmatch: no match 'foo/bb/aa/rr' '*/*/*'
+ok 205 - iwildmatch: match 'ton' 't[!a-g]n'
 
-expecting success of 3070.1546 'iwildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.206 'iwildmatch (via ls-files): match 't[!a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1546 - iwildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'
+ok 206 - iwildmatch (via ls-files): match 't[!a-g]n' 'ton'
 
-expecting success of 3070.1547 'pathmatch: match 'foo/bb/aa/rr' '*/*/*'': 
-			test-tool wildmatch pathmatch 'foo/bb/aa/rr' '*/*/*'
+expecting success of 3070.207 'pathmatch: match 'ton' 't[!a-g]n'': 
+			test-tool wildmatch pathmatch 'ton' 't[!a-g]n'
 		
-ok 1547 - pathmatch: match 'foo/bb/aa/rr' '*/*/*'
+ok 207 - pathmatch: match 'ton' 't[!a-g]n'
 
-expecting success of 3070.1548 'pathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'': 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.208 'pathmatch (via ls-files): match 't[!a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1548 - pathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'
+ok 208 - pathmatch (via ls-files): match 't[!a-g]n' 'ton'
 
-expecting success of 3070.1549 'ipathmatch: match 'foo/bb/aa/rr' '*/*/*'': 
-			test-tool wildmatch ipathmatch 'foo/bb/aa/rr' '*/*/*'
+expecting success of 3070.209 'ipathmatch: match 'ton' 't[!a-g]n'': 
+			test-tool wildmatch ipathmatch 'ton' 't[!a-g]n'
 		
-ok 1549 - ipathmatch: match 'foo/bb/aa/rr' '*/*/*'
+ok 209 - ipathmatch: match 'ton' 't[!a-g]n'
 
-expecting success of 3070.1550 'ipathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'': 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.210 'ipathmatch (via ls-files): match 't[!a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1550 - ipathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'
+ok 210 - ipathmatch (via ls-files): match 't[!a-g]n' 'ton'
 
-expecting success of 3070.1551 'cleanup after previous file test': 
+expecting success of 3070.211 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -194473,10 +195817,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1551 - cleanup after previous file test
+Removing ton
+ok 211 - cleanup after previous file test
 
-expecting success of 3070.1552 'setup match file test for foo/bb/aa/rr': 
+expecting success of 3070.212 'setup match file test for ton': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -194495,69 +195839,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1552 - setup match file test for foo/bb/aa/rr
+ok 212 - setup match file test for ton
 
-expecting success of 3070.1553 'wildmatch: match 'foo/bb/aa/rr' '**/**/**'': 
-			test-tool wildmatch wildmatch 'foo/bb/aa/rr' '**/**/**'
+expecting success of 3070.213 'wildmatch: match 'ton' 't[^a-g]n'': 
+			test-tool wildmatch wildmatch 'ton' 't[^a-g]n'
 		
-ok 1553 - wildmatch: match 'foo/bb/aa/rr' '**/**/**'
+ok 213 - wildmatch: match 'ton' 't[^a-g]n'
 
-expecting success of 3070.1554 'wildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+expecting success of 3070.214 'wildmatch (via ls-files): match 't[^a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git --glob-pathspecs ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1554 - wildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+ok 214 - wildmatch (via ls-files): match 't[^a-g]n' 'ton'
 
-expecting success of 3070.1555 'iwildmatch: match 'foo/bb/aa/rr' '**/**/**'': 
-			test-tool wildmatch iwildmatch 'foo/bb/aa/rr' '**/**/**'
+expecting success of 3070.215 'iwildmatch: match 'ton' 't[^a-g]n'': 
+			test-tool wildmatch iwildmatch 'ton' 't[^a-g]n'
 		
-ok 1555 - iwildmatch: match 'foo/bb/aa/rr' '**/**/**'
+ok 215 - iwildmatch: match 'ton' 't[^a-g]n'
 
-expecting success of 3070.1556 'iwildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+expecting success of 3070.216 'iwildmatch (via ls-files): match 't[^a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1556 - iwildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+ok 216 - iwildmatch (via ls-files): match 't[^a-g]n' 'ton'
 
-expecting success of 3070.1557 'pathmatch: match 'foo/bb/aa/rr' '**/**/**'': 
-			test-tool wildmatch pathmatch 'foo/bb/aa/rr' '**/**/**'
+expecting success of 3070.217 'pathmatch: match 'ton' 't[^a-g]n'': 
+			test-tool wildmatch pathmatch 'ton' 't[^a-g]n'
 		
-ok 1557 - pathmatch: match 'foo/bb/aa/rr' '**/**/**'
+ok 217 - pathmatch: match 'ton' 't[^a-g]n'
 
-expecting success of 3070.1558 'pathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+expecting success of 3070.218 'pathmatch (via ls-files): match 't[^a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1558 - pathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+ok 218 - pathmatch (via ls-files): match 't[^a-g]n' 'ton'
 
-expecting success of 3070.1559 'ipathmatch: match 'foo/bb/aa/rr' '**/**/**'': 
-			test-tool wildmatch ipathmatch 'foo/bb/aa/rr' '**/**/**'
+expecting success of 3070.219 'ipathmatch: match 'ton' 't[^a-g]n'': 
+			test-tool wildmatch ipathmatch 'ton' 't[^a-g]n'
 		
-ok 1559 - ipathmatch: match 'foo/bb/aa/rr' '**/**/**'
+ok 219 - ipathmatch: match 'ton' 't[^a-g]n'
 
-expecting success of 3070.1560 'ipathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+expecting success of 3070.220 'ipathmatch (via ls-files): match 't[^a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git --icase-pathspecs ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1560 - ipathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+ok 220 - ipathmatch (via ls-files): match 't[^a-g]n' 'ton'
 
-expecting success of 3070.1561 'cleanup after previous file test': 
+expecting success of 3070.221 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -194568,10 +195912,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1561 - cleanup after previous file test
+Removing ton
+ok 221 - cleanup after previous file test
 
-expecting success of 3070.1562 'setup match file test for abcXdefXghi': 
+expecting success of 3070.222 'setup match file test for a]b': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -194590,83 +195934,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1562 - setup match file test for abcXdefXghi
+ok 222 - setup match file test for a]b
 
-expecting success of 3070.1563 'wildmatch: match 'abcXdefXghi' '*X*i'': 
-			test-tool wildmatch wildmatch 'abcXdefXghi' '*X*i'
+expecting success of 3070.223 'wildmatch: match 'a]b' 'a[]]b'': 
+			test-tool wildmatch wildmatch 'a]b' 'a[]]b'
 		
-ok 1563 - wildmatch: match 'abcXdefXghi' '*X*i'
+ok 223 - wildmatch: match 'a]b' 'a[]]b'
 
-expecting success of 3070.1564 'wildmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
-				printf '%s' 'abcXdefXghi' >expect &&
-				git --glob-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.224 'wildmatch (via ls-files): match 'a[]]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git --glob-pathspecs ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1564 - wildmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+ok 224 - wildmatch (via ls-files): match 'a[]]b' 'a]b'
 
-expecting success of 3070.1565 'iwildmatch: match 'abcXdefXghi' '*X*i'': 
-			test-tool wildmatch iwildmatch 'abcXdefXghi' '*X*i'
+expecting success of 3070.225 'iwildmatch: match 'a]b' 'a[]]b'': 
+			test-tool wildmatch iwildmatch 'a]b' 'a[]]b'
 		
-ok 1565 - iwildmatch: match 'abcXdefXghi' '*X*i'
+ok 225 - iwildmatch: match 'a]b' 'a[]]b'
 
-expecting success of 3070.1566 'iwildmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
-				printf '%s' 'abcXdefXghi' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.226 'iwildmatch (via ls-files): match 'a[]]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1566 - iwildmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+ok 226 - iwildmatch (via ls-files): match 'a[]]b' 'a]b'
 
-expecting success of 3070.1567 'pathmatch: match 'abcXdefXghi' '*X*i'': 
-			test-tool wildmatch pathmatch 'abcXdefXghi' '*X*i'
+expecting success of 3070.227 'pathmatch: match 'a]b' 'a[]]b'': 
+			test-tool wildmatch pathmatch 'a]b' 'a[]]b'
 		
-ok 1567 - pathmatch: match 'abcXdefXghi' '*X*i'
+ok 227 - pathmatch: match 'a]b' 'a[]]b'
 
-expecting success of 3070.1568 'pathmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
-				printf '%s' 'abcXdefXghi' >expect &&
-				git ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.228 'pathmatch (via ls-files): match 'a[]]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1568 - pathmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+ok 228 - pathmatch (via ls-files): match 'a[]]b' 'a]b'
 
-expecting success of 3070.1569 'ipathmatch: match 'abcXdefXghi' '*X*i'': 
-			test-tool wildmatch ipathmatch 'abcXdefXghi' '*X*i'
+expecting success of 3070.229 'ipathmatch: match 'a]b' 'a[]]b'': 
+			test-tool wildmatch ipathmatch 'a]b' 'a[]]b'
 		
-ok 1569 - ipathmatch: match 'abcXdefXghi' '*X*i'
+ok 229 - ipathmatch: match 'a]b' 'a[]]b'
 
-expecting success of 3070.1570 'ipathmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
-				printf '%s' 'abcXdefXghi' >expect &&
-				git --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.230 'ipathmatch (via ls-files): match 'a[]]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1570 - ipathmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+ok 230 - ipathmatch (via ls-files): match 'a[]]b' 'a]b'
 
-expecting success of 3070.1571 'cleanup after previous file test': 
+expecting success of 3070.231 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing abcXdefXghi
+Removing a]b
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1571 - cleanup after previous file test
+ok 231 - cleanup after previous file test
 
-expecting success of 3070.1572 'setup match file test for ab/cXd/efXg/hi': 
+expecting success of 3070.232 'setup match file test for a-b': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -194685,83 +196029,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1572 - setup match file test for ab/cXd/efXg/hi
+ok 232 - setup match file test for a-b
 
-expecting success of 3070.1573 'wildmatch: no match 'ab/cXd/efXg/hi' '*X*i'': 
-			test_must_fail test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*X*i'
+expecting success of 3070.233 'wildmatch: match 'a-b' 'a[]-]b'': 
+			test-tool wildmatch wildmatch 'a-b' 'a[]-]b'
 		
-ok 1573 - wildmatch: no match 'ab/cXd/efXg/hi' '*X*i'
+ok 233 - wildmatch: match 'a-b' 'a[]-]b'
 
-expecting success of 3070.1574 'wildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.234 'wildmatch (via ls-files): match 'a[]-]b' 'a-b'': 
+				printf '%s' 'a-b' >expect &&
+				git --glob-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1574 - wildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'
+ok 234 - wildmatch (via ls-files): match 'a[]-]b' 'a-b'
 
-expecting success of 3070.1575 'iwildmatch: no match 'ab/cXd/efXg/hi' '*X*i'': 
-			test_must_fail test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*X*i'
+expecting success of 3070.235 'iwildmatch: match 'a-b' 'a[]-]b'': 
+			test-tool wildmatch iwildmatch 'a-b' 'a[]-]b'
 		
-ok 1575 - iwildmatch: no match 'ab/cXd/efXg/hi' '*X*i'
+ok 235 - iwildmatch: match 'a-b' 'a[]-]b'
 
-expecting success of 3070.1576 'iwildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.236 'iwildmatch (via ls-files): match 'a[]-]b' 'a-b'': 
+				printf '%s' 'a-b' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1576 - iwildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'
+ok 236 - iwildmatch (via ls-files): match 'a[]-]b' 'a-b'
 
-expecting success of 3070.1577 'pathmatch: match 'ab/cXd/efXg/hi' '*X*i'': 
-			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*X*i'
+expecting success of 3070.237 'pathmatch: match 'a-b' 'a[]-]b'': 
+			test-tool wildmatch pathmatch 'a-b' 'a[]-]b'
 		
-ok 1577 - pathmatch: match 'ab/cXd/efXg/hi' '*X*i'
+ok 237 - pathmatch: match 'a-b' 'a[]-]b'
 
-expecting success of 3070.1578 'pathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.238 'pathmatch (via ls-files): match 'a[]-]b' 'a-b'': 
+				printf '%s' 'a-b' >expect &&
+				git ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1578 - pathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'
+ok 238 - pathmatch (via ls-files): match 'a[]-]b' 'a-b'
 
-expecting success of 3070.1579 'ipathmatch: match 'ab/cXd/efXg/hi' '*X*i'': 
-			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*X*i'
+expecting success of 3070.239 'ipathmatch: match 'a-b' 'a[]-]b'': 
+			test-tool wildmatch ipathmatch 'a-b' 'a[]-]b'
 		
-ok 1579 - ipathmatch: match 'ab/cXd/efXg/hi' '*X*i'
+ok 239 - ipathmatch: match 'a-b' 'a[]-]b'
 
-expecting success of 3070.1580 'ipathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.240 'ipathmatch (via ls-files): match 'a[]-]b' 'a-b'': 
+				printf '%s' 'a-b' >expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1580 - ipathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'
+ok 240 - ipathmatch (via ls-files): match 'a[]-]b' 'a-b'
 
-expecting success of 3070.1581 'cleanup after previous file test': 
+expecting success of 3070.241 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing ab/
+Removing a-b
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1581 - cleanup after previous file test
+ok 241 - cleanup after previous file test
 
-expecting success of 3070.1582 'setup match file test for ab/cXd/efXg/hi': 
+expecting success of 3070.242 'setup match file test for a]b': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -194780,83 +196124,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1582 - setup match file test for ab/cXd/efXg/hi
+ok 242 - setup match file test for a]b
 
-expecting success of 3070.1583 'wildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
-			test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+expecting success of 3070.243 'wildmatch: match 'a]b' 'a[]-]b'': 
+			test-tool wildmatch wildmatch 'a]b' 'a[]-]b'
 		
-ok 1583 - wildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+ok 243 - wildmatch: match 'a]b' 'a[]-]b'
 
-expecting success of 3070.1584 'wildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --glob-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.244 'wildmatch (via ls-files): match 'a[]-]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git --glob-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1584 - wildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+ok 244 - wildmatch (via ls-files): match 'a[]-]b' 'a]b'
 
-expecting success of 3070.1585 'iwildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
-			test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+expecting success of 3070.245 'iwildmatch: match 'a]b' 'a[]-]b'': 
+			test-tool wildmatch iwildmatch 'a]b' 'a[]-]b'
 		
-ok 1585 - iwildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+ok 245 - iwildmatch: match 'a]b' 'a[]-]b'
 
-expecting success of 3070.1586 'iwildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.246 'iwildmatch (via ls-files): match 'a[]-]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1586 - iwildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+ok 246 - iwildmatch (via ls-files): match 'a[]-]b' 'a]b'
 
-expecting success of 3070.1587 'pathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
-			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+expecting success of 3070.247 'pathmatch: match 'a]b' 'a[]-]b'': 
+			test-tool wildmatch pathmatch 'a]b' 'a[]-]b'
 		
-ok 1587 - pathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+ok 247 - pathmatch: match 'a]b' 'a[]-]b'
 
-expecting success of 3070.1588 'pathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.248 'pathmatch (via ls-files): match 'a[]-]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1588 - pathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+ok 248 - pathmatch (via ls-files): match 'a[]-]b' 'a]b'
 
-expecting success of 3070.1589 'ipathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
-			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+expecting success of 3070.249 'ipathmatch: match 'a]b' 'a[]-]b'': 
+			test-tool wildmatch ipathmatch 'a]b' 'a[]-]b'
 		
-ok 1589 - ipathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+ok 249 - ipathmatch: match 'a]b' 'a[]-]b'
 
-expecting success of 3070.1590 'ipathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.250 'ipathmatch (via ls-files): match 'a[]-]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1590 - ipathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+ok 250 - ipathmatch (via ls-files): match 'a[]-]b' 'a]b'
 
-expecting success of 3070.1591 'cleanup after previous file test': 
+expecting success of 3070.251 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing ab/
+Removing a]b
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1591 - cleanup after previous file test
+ok 251 - cleanup after previous file test
 
-expecting success of 3070.1592 'setup match file test for ab/cXd/efXg/hi': 
+expecting success of 3070.252 'setup match file test for aab': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -194875,83 +196219,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1592 - setup match file test for ab/cXd/efXg/hi
+ok 252 - setup match file test for aab
 
-expecting success of 3070.1593 'wildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
-			test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+expecting success of 3070.253 'wildmatch: no match 'aab' 'a[]-]b'': 
+			test_must_fail test-tool wildmatch wildmatch 'aab' 'a[]-]b'
 		
-ok 1593 - wildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+ok 253 - wildmatch: no match 'aab' 'a[]-]b'
 
-expecting success of 3070.1594 'wildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.254 'wildmatch (via ls-files): no match 'a[]-]b' 'aab'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1594 - wildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+ok 254 - wildmatch (via ls-files): no match 'a[]-]b' 'aab'
 
-expecting success of 3070.1595 'iwildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
-			test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+expecting success of 3070.255 'iwildmatch: no match 'aab' 'a[]-]b'': 
+			test_must_fail test-tool wildmatch iwildmatch 'aab' 'a[]-]b'
 		
-ok 1595 - iwildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+ok 255 - iwildmatch: no match 'aab' 'a[]-]b'
 
-expecting success of 3070.1596 'iwildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.256 'iwildmatch (via ls-files): no match 'a[]-]b' 'aab'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1596 - iwildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+ok 256 - iwildmatch (via ls-files): no match 'a[]-]b' 'aab'
 
-expecting success of 3070.1597 'pathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
-			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+expecting success of 3070.257 'pathmatch: no match 'aab' 'a[]-]b'': 
+			test_must_fail test-tool wildmatch pathmatch 'aab' 'a[]-]b'
 		
-ok 1597 - pathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+ok 257 - pathmatch: no match 'aab' 'a[]-]b'
 
-expecting success of 3070.1598 'pathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.258 'pathmatch (via ls-files): no match 'a[]-]b' 'aab'': 
+				>expect &&
+				git ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1598 - pathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+ok 258 - pathmatch (via ls-files): no match 'a[]-]b' 'aab'
 
-expecting success of 3070.1599 'ipathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
-			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+expecting success of 3070.259 'ipathmatch: no match 'aab' 'a[]-]b'': 
+			test_must_fail test-tool wildmatch ipathmatch 'aab' 'a[]-]b'
 		
-ok 1599 - ipathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+ok 259 - ipathmatch: no match 'aab' 'a[]-]b'
 
-expecting success of 3070.1600 'ipathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.260 'ipathmatch (via ls-files): no match 'a[]-]b' 'aab'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1600 - ipathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+ok 260 - ipathmatch (via ls-files): no match 'a[]-]b' 'aab'
 
-expecting success of 3070.1601 'cleanup after previous file test': 
+expecting success of 3070.261 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing ab/
+Removing aab
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1601 - cleanup after previous file test
+ok 261 - cleanup after previous file test
 
-expecting success of 3070.1602 'setup match file test for foo': 
+expecting success of 3070.262 'setup match file test for aab': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -194970,83 +196314,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1602 - setup match file test for foo
+ok 262 - setup match file test for aab
 
-expecting success of 3070.1603 'wildmatch: no match 'foo' 'fo'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo' 'fo'
+expecting success of 3070.263 'wildmatch: match 'aab' 'a[]a-]b'': 
+			test-tool wildmatch wildmatch 'aab' 'a[]a-]b'
 		
-ok 1603 - wildmatch: no match 'foo' 'fo'
+ok 263 - wildmatch: match 'aab' 'a[]a-]b'
 
-expecting success of 3070.1604 'wildmatch (via ls-files): no match 'fo' 'foo'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+expecting success of 3070.264 'wildmatch (via ls-files): match 'a[]a-]b' 'aab'': 
+				printf '%s' 'aab' >expect &&
+				git --glob-pathspecs ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1604 - wildmatch (via ls-files): no match 'fo' 'foo'
+ok 264 - wildmatch (via ls-files): match 'a[]a-]b' 'aab'
 
-expecting success of 3070.1605 'iwildmatch: no match 'foo' 'fo'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' 'fo'
+expecting success of 3070.265 'iwildmatch: match 'aab' 'a[]a-]b'': 
+			test-tool wildmatch iwildmatch 'aab' 'a[]a-]b'
 		
-ok 1605 - iwildmatch: no match 'foo' 'fo'
+ok 265 - iwildmatch: match 'aab' 'a[]a-]b'
 
-expecting success of 3070.1606 'iwildmatch (via ls-files): no match 'fo' 'foo'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+expecting success of 3070.266 'iwildmatch (via ls-files): match 'a[]a-]b' 'aab'': 
+				printf '%s' 'aab' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1606 - iwildmatch (via ls-files): no match 'fo' 'foo'
+ok 266 - iwildmatch (via ls-files): match 'a[]a-]b' 'aab'
 
-expecting success of 3070.1607 'pathmatch: no match 'foo' 'fo'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' 'fo'
+expecting success of 3070.267 'pathmatch: match 'aab' 'a[]a-]b'': 
+			test-tool wildmatch pathmatch 'aab' 'a[]a-]b'
 		
-ok 1607 - pathmatch: no match 'foo' 'fo'
+ok 267 - pathmatch: match 'aab' 'a[]a-]b'
 
-expecting success of 3070.1608 'pathmatch (via ls-files): no match 'fo' 'foo'': 
-				>expect &&
-				git ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+expecting success of 3070.268 'pathmatch (via ls-files): match 'a[]a-]b' 'aab'': 
+				printf '%s' 'aab' >expect &&
+				git ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1608 - pathmatch (via ls-files): no match 'fo' 'foo'
+ok 268 - pathmatch (via ls-files): match 'a[]a-]b' 'aab'
 
-expecting success of 3070.1609 'ipathmatch: no match 'foo' 'fo'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' 'fo'
+expecting success of 3070.269 'ipathmatch: match 'aab' 'a[]a-]b'': 
+			test-tool wildmatch ipathmatch 'aab' 'a[]a-]b'
 		
-ok 1609 - ipathmatch: no match 'foo' 'fo'
+ok 269 - ipathmatch: match 'aab' 'a[]a-]b'
 
-expecting success of 3070.1610 'ipathmatch (via ls-files): no match 'fo' 'foo'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+expecting success of 3070.270 'ipathmatch (via ls-files): match 'a[]a-]b' 'aab'': 
+				printf '%s' 'aab' >expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1610 - ipathmatch (via ls-files): no match 'fo' 'foo'
+ok 270 - ipathmatch (via ls-files): match 'a[]a-]b' 'aab'
 
-expecting success of 3070.1611 'cleanup after previous file test': 
+expecting success of 3070.271 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
+Removing aab
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo
-ok 1611 - cleanup after previous file test
+ok 271 - cleanup after previous file test
 
-expecting success of 3070.1612 'setup match file test for foo/bar': 
+expecting success of 3070.272 'setup match file test for ]': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -195065,83 +196409,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1612 - setup match file test for foo/bar
+ok 272 - setup match file test for ]
 
-expecting success of 3070.1613 'wildmatch: match 'foo/bar' 'foo/bar'': 
-			test-tool wildmatch wildmatch 'foo/bar' 'foo/bar'
+expecting success of 3070.273 'wildmatch: match ']' ']'': 
+			test-tool wildmatch wildmatch ']' ']'
 		
-ok 1613 - wildmatch: match 'foo/bar' 'foo/bar'
+ok 273 - wildmatch: match ']' ']'
 
-expecting success of 3070.1614 'wildmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.274 'wildmatch (via ls-files): match ']' ']'': 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1614 - wildmatch (via ls-files): match 'foo/bar' 'foo/bar'
+ok 274 - wildmatch (via ls-files): match ']' ']'
 
-expecting success of 3070.1615 'iwildmatch: match 'foo/bar' 'foo/bar'': 
-			test-tool wildmatch iwildmatch 'foo/bar' 'foo/bar'
+expecting success of 3070.275 'iwildmatch: match ']' ']'': 
+			test-tool wildmatch iwildmatch ']' ']'
 		
-ok 1615 - iwildmatch: match 'foo/bar' 'foo/bar'
+ok 275 - iwildmatch: match ']' ']'
 
-expecting success of 3070.1616 'iwildmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.276 'iwildmatch (via ls-files): match ']' ']'': 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1616 - iwildmatch (via ls-files): match 'foo/bar' 'foo/bar'
+ok 276 - iwildmatch (via ls-files): match ']' ']'
 
-expecting success of 3070.1617 'pathmatch: match 'foo/bar' 'foo/bar'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo/bar'
+expecting success of 3070.277 'pathmatch: match ']' ']'': 
+			test-tool wildmatch pathmatch ']' ']'
 		
-ok 1617 - pathmatch: match 'foo/bar' 'foo/bar'
+ok 277 - pathmatch: match ']' ']'
 
-expecting success of 3070.1618 'pathmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.278 'pathmatch (via ls-files): match ']' ']'': 
+				printf '%s' ']' >expect &&
+				git ls-files -z -- ']' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1618 - pathmatch (via ls-files): match 'foo/bar' 'foo/bar'
+ok 278 - pathmatch (via ls-files): match ']' ']'
 
-expecting success of 3070.1619 'ipathmatch: match 'foo/bar' 'foo/bar'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo/bar'
+expecting success of 3070.279 'ipathmatch: match ']' ']'': 
+			test-tool wildmatch ipathmatch ']' ']'
 		
-ok 1619 - ipathmatch: match 'foo/bar' 'foo/bar'
+ok 279 - ipathmatch: match ']' ']'
 
-expecting success of 3070.1620 'ipathmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.280 'ipathmatch (via ls-files): match ']' ']'': 
+				printf '%s' ']' >expect &&
+				git --icase-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1620 - ipathmatch (via ls-files): match 'foo/bar' 'foo/bar'
+ok 280 - ipathmatch (via ls-files): match ']' ']'
 
-expecting success of 3070.1621 'cleanup after previous file test': 
+expecting success of 3070.281 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
+Removing ]
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1621 - cleanup after previous file test
+ok 281 - cleanup after previous file test
 
-expecting success of 3070.1622 'setup match file test for foo/bar': 
+expecting success of 3070.282 'setup match file test for foo/baz/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -195160,69 +196504,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1622 - setup match file test for foo/bar
+ok 282 - setup match file test for foo/baz/bar
 
-expecting success of 3070.1623 'wildmatch: match 'foo/bar' 'foo/*'': 
-			test-tool wildmatch wildmatch 'foo/bar' 'foo/*'
+expecting success of 3070.283 'wildmatch: no match 'foo/baz/bar' 'foo*bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/baz/bar' 'foo*bar'
 		
-ok 1623 - wildmatch: match 'foo/bar' 'foo/*'
+ok 283 - wildmatch: no match 'foo/baz/bar' 'foo*bar'
 
-expecting success of 3070.1624 'wildmatch (via ls-files): match 'foo/*' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+expecting success of 3070.284 'wildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1624 - wildmatch (via ls-files): match 'foo/*' 'foo/bar'
+ok 284 - wildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'
 
-expecting success of 3070.1625 'iwildmatch: match 'foo/bar' 'foo/*'': 
-			test-tool wildmatch iwildmatch 'foo/bar' 'foo/*'
+expecting success of 3070.285 'iwildmatch: no match 'foo/baz/bar' 'foo*bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo*bar'
 		
-ok 1625 - iwildmatch: match 'foo/bar' 'foo/*'
+ok 285 - iwildmatch: no match 'foo/baz/bar' 'foo*bar'
 
-expecting success of 3070.1626 'iwildmatch (via ls-files): match 'foo/*' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+expecting success of 3070.286 'iwildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1626 - iwildmatch (via ls-files): match 'foo/*' 'foo/bar'
+ok 286 - iwildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'
 
-expecting success of 3070.1627 'pathmatch: match 'foo/bar' 'foo/*'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo/*'
+expecting success of 3070.287 'pathmatch: match 'foo/baz/bar' 'foo*bar'': 
+			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo*bar'
 		
-ok 1627 - pathmatch: match 'foo/bar' 'foo/*'
+ok 287 - pathmatch: match 'foo/baz/bar' 'foo*bar'
 
-expecting success of 3070.1628 'pathmatch (via ls-files): match 'foo/*' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+expecting success of 3070.288 'pathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1628 - pathmatch (via ls-files): match 'foo/*' 'foo/bar'
+ok 288 - pathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'
 
-expecting success of 3070.1629 'ipathmatch: match 'foo/bar' 'foo/*'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo/*'
+expecting success of 3070.289 'ipathmatch: match 'foo/baz/bar' 'foo*bar'': 
+			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo*bar'
 		
-ok 1629 - ipathmatch: match 'foo/bar' 'foo/*'
+ok 289 - ipathmatch: match 'foo/baz/bar' 'foo*bar'
 
-expecting success of 3070.1630 'ipathmatch (via ls-files): match 'foo/*' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+expecting success of 3070.290 'ipathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1630 - ipathmatch (via ls-files): match 'foo/*' 'foo/bar'
+ok 290 - ipathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'
 
-expecting success of 3070.1631 'cleanup after previous file test': 
+expecting success of 3070.291 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -195234,9 +196578,9 @@
 Removing actual.raw
 Removing expect
 Removing foo/
-ok 1631 - cleanup after previous file test
+ok 291 - cleanup after previous file test
 
-expecting success of 3070.1632 'setup match file test for foo/bba/arr': 
+expecting success of 3070.292 'setup match file test for foo/baz/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -195255,69 +196599,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1632 - setup match file test for foo/bba/arr
+ok 292 - setup match file test for foo/baz/bar
 
-expecting success of 3070.1633 'wildmatch: no match 'foo/bba/arr' 'foo/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*'
+expecting success of 3070.293 'wildmatch: no match 'foo/baz/bar' 'foo**bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/baz/bar' 'foo**bar'
 		
-ok 1633 - wildmatch: no match 'foo/bba/arr' 'foo/*'
+ok 293 - wildmatch: no match 'foo/baz/bar' 'foo**bar'
 
-expecting success of 3070.1634 'wildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'': 
+expecting success of 3070.294 'wildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1634 - wildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'
+ok 294 - wildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'
 
-expecting success of 3070.1635 'iwildmatch: no match 'foo/bba/arr' 'foo/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*'
+expecting success of 3070.295 'iwildmatch: no match 'foo/baz/bar' 'foo**bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo**bar'
 		
-ok 1635 - iwildmatch: no match 'foo/bba/arr' 'foo/*'
+ok 295 - iwildmatch: no match 'foo/baz/bar' 'foo**bar'
 
-expecting success of 3070.1636 'iwildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'': 
+expecting success of 3070.296 'iwildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'': 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1636 - iwildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'
+ok 296 - iwildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'
 
-expecting success of 3070.1637 'pathmatch: match 'foo/bba/arr' 'foo/*'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*'
+expecting success of 3070.297 'pathmatch: match 'foo/baz/bar' 'foo**bar'': 
+			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo**bar'
 		
-ok 1637 - pathmatch: match 'foo/bba/arr' 'foo/*'
+ok 297 - pathmatch: match 'foo/baz/bar' 'foo**bar'
 
-expecting success of 3070.1638 'pathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+expecting success of 3070.298 'pathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1638 - pathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'
+ok 298 - pathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'
 
-expecting success of 3070.1639 'ipathmatch: match 'foo/bba/arr' 'foo/*'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*'
+expecting success of 3070.299 'ipathmatch: match 'foo/baz/bar' 'foo**bar'': 
+			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo**bar'
 		
-ok 1639 - ipathmatch: match 'foo/bba/arr' 'foo/*'
+ok 299 - ipathmatch: match 'foo/baz/bar' 'foo**bar'
 
-expecting success of 3070.1640 'ipathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+expecting success of 3070.300 'ipathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1640 - ipathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'
+ok 300 - ipathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'
 
-expecting success of 3070.1641 'cleanup after previous file test': 
+expecting success of 3070.301 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -195329,9 +196673,9 @@
 Removing actual.raw
 Removing expect
 Removing foo/
-ok 1641 - cleanup after previous file test
+ok 301 - cleanup after previous file test
 
-expecting success of 3070.1642 'setup match file test for foo/bba/arr': 
+expecting success of 3070.302 'setup match file test for foobazbar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -195350,69 +196694,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1642 - setup match file test for foo/bba/arr
+ok 302 - setup match file test for foobazbar
 
-expecting success of 3070.1643 'wildmatch: match 'foo/bba/arr' 'foo/**'': 
-			test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**'
+expecting success of 3070.303 'wildmatch: match 'foobazbar' 'foo**bar'': 
+			test-tool wildmatch wildmatch 'foobazbar' 'foo**bar'
 		
-ok 1643 - wildmatch: match 'foo/bba/arr' 'foo/**'
+ok 303 - wildmatch: match 'foobazbar' 'foo**bar'
 
-expecting success of 3070.1644 'wildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+expecting success of 3070.304 'wildmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
+				printf '%s' 'foobazbar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1644 - wildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+ok 304 - wildmatch (via ls-files): match 'foo**bar' 'foobazbar'
 
-expecting success of 3070.1645 'iwildmatch: match 'foo/bba/arr' 'foo/**'': 
-			test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**'
+expecting success of 3070.305 'iwildmatch: match 'foobazbar' 'foo**bar'': 
+			test-tool wildmatch iwildmatch 'foobazbar' 'foo**bar'
 		
-ok 1645 - iwildmatch: match 'foo/bba/arr' 'foo/**'
+ok 305 - iwildmatch: match 'foobazbar' 'foo**bar'
 
-expecting success of 3070.1646 'iwildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+expecting success of 3070.306 'iwildmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
+				printf '%s' 'foobazbar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1646 - iwildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+ok 306 - iwildmatch (via ls-files): match 'foo**bar' 'foobazbar'
 
-expecting success of 3070.1647 'pathmatch: match 'foo/bba/arr' 'foo/**'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**'
+expecting success of 3070.307 'pathmatch: match 'foobazbar' 'foo**bar'': 
+			test-tool wildmatch pathmatch 'foobazbar' 'foo**bar'
 		
-ok 1647 - pathmatch: match 'foo/bba/arr' 'foo/**'
+ok 307 - pathmatch: match 'foobazbar' 'foo**bar'
 
-expecting success of 3070.1648 'pathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+expecting success of 3070.308 'pathmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
+				printf '%s' 'foobazbar' >expect &&
+				git ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1648 - pathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+ok 308 - pathmatch (via ls-files): match 'foo**bar' 'foobazbar'
 
-expecting success of 3070.1649 'ipathmatch: match 'foo/bba/arr' 'foo/**'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**'
+expecting success of 3070.309 'ipathmatch: match 'foobazbar' 'foo**bar'': 
+			test-tool wildmatch ipathmatch 'foobazbar' 'foo**bar'
 		
-ok 1649 - ipathmatch: match 'foo/bba/arr' 'foo/**'
+ok 309 - ipathmatch: match 'foobazbar' 'foo**bar'
 
-expecting success of 3070.1650 'ipathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+expecting success of 3070.310 'ipathmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
+				printf '%s' 'foobazbar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1650 - ipathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+ok 310 - ipathmatch (via ls-files): match 'foo**bar' 'foobazbar'
 
-expecting success of 3070.1651 'cleanup after previous file test': 
+expecting success of 3070.311 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -195423,10 +196767,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1651 - cleanup after previous file test
+Removing foobazbar
+ok 311 - cleanup after previous file test
 
-expecting success of 3070.1652 'setup match file test for foo/bba/arr': 
+expecting success of 3070.312 'setup match file test for foo/baz/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -195445,69 +196789,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1652 - setup match file test for foo/bba/arr
+ok 312 - setup match file test for foo/baz/bar
 
-expecting success of 3070.1653 'wildmatch: no match 'foo/bba/arr' 'foo*'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo*'
+expecting success of 3070.313 'wildmatch: match 'foo/baz/bar' 'foo/**/bar'': 
+			test-tool wildmatch wildmatch 'foo/baz/bar' 'foo/**/bar'
 		
-ok 1653 - wildmatch: no match 'foo/bba/arr' 'foo*'
+ok 313 - wildmatch: match 'foo/baz/bar' 'foo/**/bar'
 
-expecting success of 3070.1654 'wildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+expecting success of 3070.314 'wildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1654 - wildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'
+ok 314 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.1655 'iwildmatch: no match 'foo/bba/arr' 'foo*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo*'
+expecting success of 3070.315 'iwildmatch: match 'foo/baz/bar' 'foo/**/bar'': 
+			test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo/**/bar'
 		
-ok 1655 - iwildmatch: no match 'foo/bba/arr' 'foo*'
+ok 315 - iwildmatch: match 'foo/baz/bar' 'foo/**/bar'
 
-expecting success of 3070.1656 'iwildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+expecting success of 3070.316 'iwildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1656 - iwildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'
+ok 316 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.1657 'pathmatch: match 'foo/bba/arr' 'foo*'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo*'
+expecting success of 3070.317 'pathmatch: match 'foo/baz/bar' 'foo/**/bar'': 
+			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo/**/bar'
 		
-ok 1657 - pathmatch: match 'foo/bba/arr' 'foo*'
+ok 317 - pathmatch: match 'foo/baz/bar' 'foo/**/bar'
 
-expecting success of 3070.1658 'pathmatch (via ls-files): match 'foo*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+expecting success of 3070.318 'pathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1658 - pathmatch (via ls-files): match 'foo*' 'foo/bba/arr'
+ok 318 - pathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.1659 'ipathmatch: match 'foo/bba/arr' 'foo*'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo*'
+expecting success of 3070.319 'ipathmatch: match 'foo/baz/bar' 'foo/**/bar'': 
+			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo/**/bar'
 		
-ok 1659 - ipathmatch: match 'foo/bba/arr' 'foo*'
+ok 319 - ipathmatch: match 'foo/baz/bar' 'foo/**/bar'
 
-expecting success of 3070.1660 'ipathmatch (via ls-files): match 'foo*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+expecting success of 3070.320 'ipathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1660 - ipathmatch (via ls-files): match 'foo*' 'foo/bba/arr'
+ok 320 - ipathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.1661 'cleanup after previous file test': 
+expecting success of 3070.321 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -195519,9 +196863,9 @@
 Removing actual.raw
 Removing expect
 Removing foo/
-ok 1661 - cleanup after previous file test
+ok 321 - cleanup after previous file test
 
-expecting success of 3070.1662 'setup match file test for foo/bba/arr': 
+expecting success of 3070.322 'setup match file test for foo/baz/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -195540,69 +196884,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1662 - setup match file test for foo/bba/arr
+ok 322 - setup match file test for foo/baz/bar
 
-expecting success of 3070.1663 'wildmatch: no match 'foo/bba/arr' 'foo**'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo**'
+expecting success of 3070.323 'wildmatch: match 'foo/baz/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch wildmatch 'foo/baz/bar' 'foo/**/**/bar'
 		
-ok 1663 - wildmatch: no match 'foo/bba/arr' 'foo**'
+ok 323 - wildmatch: match 'foo/baz/bar' 'foo/**/**/bar'
 
-expecting success of 3070.1664 'wildmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+expecting success of 3070.324 'wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1664 - wildmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+ok 324 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.1665 'iwildmatch: no match 'foo/bba/arr' 'foo**'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo**'
+expecting success of 3070.325 'iwildmatch: match 'foo/baz/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo/**/**/bar'
 		
-ok 1665 - iwildmatch: no match 'foo/bba/arr' 'foo**'
+ok 325 - iwildmatch: match 'foo/baz/bar' 'foo/**/**/bar'
 
-expecting success of 3070.1666 'iwildmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+expecting success of 3070.326 'iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1666 - iwildmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+ok 326 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.1667 'pathmatch: match 'foo/bba/arr' 'foo**'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo**'
+expecting success of 3070.327 'pathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo/baz/bar' 'foo/**/**/bar'
 		
-ok 1667 - pathmatch: match 'foo/bba/arr' 'foo**'
+ok 327 - pathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'
 
-expecting success of 3070.1668 'pathmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+expecting success of 3070.328 'pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'': 
+				>expect &&
+				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1668 - pathmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+ok 328 - pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.1669 'ipathmatch: match 'foo/bba/arr' 'foo**'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo**'
+expecting success of 3070.329 'ipathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo/**/**/bar'
 		
-ok 1669 - ipathmatch: match 'foo/bba/arr' 'foo**'
+ok 329 - ipathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'
 
-expecting success of 3070.1670 'ipathmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+expecting success of 3070.330 'ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1670 - ipathmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+ok 330 - ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.1671 'cleanup after previous file test': 
+expecting success of 3070.331 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -195614,9 +196958,9 @@
 Removing actual.raw
 Removing expect
 Removing foo/
-ok 1671 - cleanup after previous file test
+ok 331 - cleanup after previous file test
 
-expecting success of 3070.1672 'setup match file test for foo/bba/arr': 
+expecting success of 3070.332 'setup match file test for foo/b/a/z/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -195635,69 +196979,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1672 - setup match file test for foo/bba/arr
+ok 332 - setup match file test for foo/b/a/z/bar
 
-expecting success of 3070.1673 'wildmatch: no match 'foo/bba/arr' 'foo/*arr'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*arr'
+expecting success of 3070.333 'wildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
+			test-tool wildmatch wildmatch 'foo/b/a/z/bar' 'foo/**/bar'
 		
-ok 1673 - wildmatch: no match 'foo/bba/arr' 'foo/*arr'
+ok 333 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
 
-expecting success of 3070.1674 'wildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+expecting success of 3070.334 'wildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1674 - wildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'
+ok 334 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.1675 'iwildmatch: no match 'foo/bba/arr' 'foo/*arr'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*arr'
+expecting success of 3070.335 'iwildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
+			test-tool wildmatch iwildmatch 'foo/b/a/z/bar' 'foo/**/bar'
 		
-ok 1675 - iwildmatch: no match 'foo/bba/arr' 'foo/*arr'
+ok 335 - iwildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
 
-expecting success of 3070.1676 'iwildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+expecting success of 3070.336 'iwildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1676 - iwildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'
+ok 336 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.1677 'pathmatch: match 'foo/bba/arr' 'foo/*arr'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*arr'
+expecting success of 3070.337 'pathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
+			test-tool wildmatch pathmatch 'foo/b/a/z/bar' 'foo/**/bar'
 		
-ok 1677 - pathmatch: match 'foo/bba/arr' 'foo/*arr'
+ok 337 - pathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
 
-expecting success of 3070.1678 'pathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+expecting success of 3070.338 'pathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1678 - pathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'
+ok 338 - pathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.1679 'ipathmatch: match 'foo/bba/arr' 'foo/*arr'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*arr'
+expecting success of 3070.339 'ipathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
+			test-tool wildmatch ipathmatch 'foo/b/a/z/bar' 'foo/**/bar'
 		
-ok 1679 - ipathmatch: match 'foo/bba/arr' 'foo/*arr'
+ok 339 - ipathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
 
-expecting success of 3070.1680 'ipathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+expecting success of 3070.340 'ipathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1680 - ipathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'
+ok 340 - ipathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.1681 'cleanup after previous file test': 
+expecting success of 3070.341 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -195709,9 +197053,9 @@
 Removing actual.raw
 Removing expect
 Removing foo/
-ok 1681 - cleanup after previous file test
+ok 341 - cleanup after previous file test
 
-expecting success of 3070.1682 'setup match file test for foo/bba/arr': 
+expecting success of 3070.342 'setup match file test for foo/b/a/z/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -195730,69 +197074,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1682 - setup match file test for foo/bba/arr
+ok 342 - setup match file test for foo/b/a/z/bar
 
-expecting success of 3070.1683 'wildmatch: no match 'foo/bba/arr' 'foo/**arr'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**arr'
+expecting success of 3070.343 'wildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch wildmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
 		
-ok 1683 - wildmatch: no match 'foo/bba/arr' 'foo/**arr'
+ok 343 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
 
-expecting success of 3070.1684 'wildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
+expecting success of 3070.344 'wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1684 - wildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'
+ok 344 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.1685 'iwildmatch: no match 'foo/bba/arr' 'foo/**arr'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**arr'
+expecting success of 3070.345 'iwildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch iwildmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
 		
-ok 1685 - iwildmatch: no match 'foo/bba/arr' 'foo/**arr'
+ok 345 - iwildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
 
-expecting success of 3070.1686 'iwildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
+expecting success of 3070.346 'iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1686 - iwildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'
+ok 346 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.1687 'pathmatch: match 'foo/bba/arr' 'foo/**arr'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**arr'
+expecting success of 3070.347 'pathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch pathmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
 		
-ok 1687 - pathmatch: match 'foo/bba/arr' 'foo/**arr'
+ok 347 - pathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
 
-expecting success of 3070.1688 'pathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
+expecting success of 3070.348 'pathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1688 - pathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'
+ok 348 - pathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.1689 'ipathmatch: match 'foo/bba/arr' 'foo/**arr'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**arr'
+expecting success of 3070.349 'ipathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch ipathmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
 		
-ok 1689 - ipathmatch: match 'foo/bba/arr' 'foo/**arr'
+ok 349 - ipathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
 
-expecting success of 3070.1690 'ipathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
+expecting success of 3070.350 'ipathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1690 - ipathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'
+ok 350 - ipathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.1691 'cleanup after previous file test': 
+expecting success of 3070.351 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -195804,9 +197148,9 @@
 Removing actual.raw
 Removing expect
 Removing foo/
-ok 1691 - cleanup after previous file test
+ok 351 - cleanup after previous file test
 
-expecting success of 3070.1692 'setup match file test for foo/bba/arr': 
+expecting success of 3070.352 'setup match file test for foo/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -195825,69 +197169,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1692 - setup match file test for foo/bba/arr
+ok 352 - setup match file test for foo/bar
 
-expecting success of 3070.1693 'wildmatch: no match 'foo/bba/arr' 'foo/*z'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*z'
+expecting success of 3070.353 'wildmatch: match 'foo/bar' 'foo/**/bar'': 
+			test-tool wildmatch wildmatch 'foo/bar' 'foo/**/bar'
 		
-ok 1693 - wildmatch: no match 'foo/bba/arr' 'foo/*z'
+ok 353 - wildmatch: match 'foo/bar' 'foo/**/bar'
 
-expecting success of 3070.1694 'wildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
+expecting success of 3070.354 'wildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1694 - wildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
+ok 354 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'
 
-expecting success of 3070.1695 'iwildmatch: no match 'foo/bba/arr' 'foo/*z'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*z'
+expecting success of 3070.355 'iwildmatch: match 'foo/bar' 'foo/**/bar'': 
+			test-tool wildmatch iwildmatch 'foo/bar' 'foo/**/bar'
 		
-ok 1695 - iwildmatch: no match 'foo/bba/arr' 'foo/*z'
+ok 355 - iwildmatch: match 'foo/bar' 'foo/**/bar'
 
-expecting success of 3070.1696 'iwildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
+expecting success of 3070.356 'iwildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1696 - iwildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
+ok 356 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'
 
-expecting success of 3070.1697 'pathmatch: no match 'foo/bba/arr' 'foo/*z'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*z'
+expecting success of 3070.357 'pathmatch: no match 'foo/bar' 'foo/**/bar'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo/bar' 'foo/**/bar'
 		
-ok 1697 - pathmatch: no match 'foo/bba/arr' 'foo/*z'
+ok 357 - pathmatch: no match 'foo/bar' 'foo/**/bar'
 
-expecting success of 3070.1698 'pathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
+expecting success of 3070.358 'pathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'': 
 				>expect &&
-				git ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
+				git ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1698 - pathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
+ok 358 - pathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'
 
-expecting success of 3070.1699 'ipathmatch: no match 'foo/bba/arr' 'foo/*z'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*z'
+expecting success of 3070.359 'ipathmatch: no match 'foo/bar' 'foo/**/bar'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' 'foo/**/bar'
 		
-ok 1699 - ipathmatch: no match 'foo/bba/arr' 'foo/*z'
+ok 359 - ipathmatch: no match 'foo/bar' 'foo/**/bar'
 
-expecting success of 3070.1700 'ipathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
+expecting success of 3070.360 'ipathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'': 
 				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
+				git --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1700 - ipathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
+ok 360 - ipathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'
 
-expecting success of 3070.1701 'cleanup after previous file test': 
+expecting success of 3070.361 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -195899,9 +197243,9 @@
 Removing actual.raw
 Removing expect
 Removing foo/
-ok 1701 - cleanup after previous file test
+ok 361 - cleanup after previous file test
 
-expecting success of 3070.1702 'setup match file test for foo/bba/arr': 
+expecting success of 3070.362 'setup match file test for foo/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -195920,69 +197264,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1702 - setup match file test for foo/bba/arr
+ok 362 - setup match file test for foo/bar
 
-expecting success of 3070.1703 'wildmatch: no match 'foo/bba/arr' 'foo/**z'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**z'
+expecting success of 3070.363 'wildmatch: match 'foo/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch wildmatch 'foo/bar' 'foo/**/**/bar'
 		
-ok 1703 - wildmatch: no match 'foo/bba/arr' 'foo/**z'
+ok 363 - wildmatch: match 'foo/bar' 'foo/**/**/bar'
 
-expecting success of 3070.1704 'wildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
+expecting success of 3070.364 'wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1704 - wildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
+ok 364 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'
 
-expecting success of 3070.1705 'iwildmatch: no match 'foo/bba/arr' 'foo/**z'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**z'
+expecting success of 3070.365 'iwildmatch: match 'foo/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch iwildmatch 'foo/bar' 'foo/**/**/bar'
 		
-ok 1705 - iwildmatch: no match 'foo/bba/arr' 'foo/**z'
+ok 365 - iwildmatch: match 'foo/bar' 'foo/**/**/bar'
 
-expecting success of 3070.1706 'iwildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
+expecting success of 3070.366 'iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1706 - iwildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
+ok 366 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'
 
-expecting success of 3070.1707 'pathmatch: no match 'foo/bba/arr' 'foo/**z'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**z'
+expecting success of 3070.367 'pathmatch: no match 'foo/bar' 'foo/**/**/bar'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo/bar' 'foo/**/**/bar'
 		
-ok 1707 - pathmatch: no match 'foo/bba/arr' 'foo/**z'
+ok 367 - pathmatch: no match 'foo/bar' 'foo/**/**/bar'
 
-expecting success of 3070.1708 'pathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
+expecting success of 3070.368 'pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'': 
 				>expect &&
-				git ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
+				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1708 - pathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
+ok 368 - pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'
 
-expecting success of 3070.1709 'ipathmatch: no match 'foo/bba/arr' 'foo/**z'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**z'
+expecting success of 3070.369 'ipathmatch: no match 'foo/bar' 'foo/**/**/bar'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' 'foo/**/**/bar'
 		
-ok 1709 - ipathmatch: no match 'foo/bba/arr' 'foo/**z'
+ok 369 - ipathmatch: no match 'foo/bar' 'foo/**/**/bar'
 
-expecting success of 3070.1710 'ipathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
+expecting success of 3070.370 'ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'': 
 				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
+				git --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1710 - ipathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
+ok 370 - ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'
 
-expecting success of 3070.1711 'cleanup after previous file test': 
+expecting success of 3070.371 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -195994,9 +197338,9 @@
 Removing actual.raw
 Removing expect
 Removing foo/
-ok 1711 - cleanup after previous file test
+ok 371 - cleanup after previous file test
 
-expecting success of 3070.1712 'setup match file test for foo/bar': 
+expecting success of 3070.372 'setup match file test for foo/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -196015,14 +197359,14 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1712 - setup match file test for foo/bar
+ok 372 - setup match file test for foo/bar
 
-expecting success of 3070.1713 'wildmatch: no match 'foo/bar' 'foo?bar'': 
+expecting success of 3070.373 'wildmatch: no match 'foo/bar' 'foo?bar'': 
 			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo?bar'
 		
-ok 1713 - wildmatch: no match 'foo/bar' 'foo?bar'
+ok 373 - wildmatch: no match 'foo/bar' 'foo?bar'
 
-expecting success of 3070.1714 'wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
+expecting success of 3070.374 'wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
 				>expect &&
 				git --glob-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
 				
@@ -196030,14 +197374,14 @@
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1714 - wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
+ok 374 - wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
 
-expecting success of 3070.1715 'iwildmatch: no match 'foo/bar' 'foo?bar'': 
+expecting success of 3070.375 'iwildmatch: no match 'foo/bar' 'foo?bar'': 
 			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo?bar'
 		
-ok 1715 - iwildmatch: no match 'foo/bar' 'foo?bar'
+ok 375 - iwildmatch: no match 'foo/bar' 'foo?bar'
 
-expecting success of 3070.1716 'iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
+expecting success of 3070.376 'iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
 				>expect &&
 				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
 				
@@ -196045,14 +197389,14 @@
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1716 - iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
+ok 376 - iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
 
-expecting success of 3070.1717 'pathmatch: match 'foo/bar' 'foo?bar'': 
+expecting success of 3070.377 'pathmatch: match 'foo/bar' 'foo?bar'': 
 			test-tool wildmatch pathmatch 'foo/bar' 'foo?bar'
 		
-ok 1717 - pathmatch: match 'foo/bar' 'foo?bar'
+ok 377 - pathmatch: match 'foo/bar' 'foo?bar'
 
-expecting success of 3070.1718 'pathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
+expecting success of 3070.378 'pathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
 				printf '%s' 'foo/bar' >expect &&
 				git ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
 				
@@ -196060,14 +197404,14 @@
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1718 - pathmatch (via ls-files): match 'foo?bar' 'foo/bar'
+ok 378 - pathmatch (via ls-files): match 'foo?bar' 'foo/bar'
 
-expecting success of 3070.1719 'ipathmatch: match 'foo/bar' 'foo?bar'': 
+expecting success of 3070.379 'ipathmatch: match 'foo/bar' 'foo?bar'': 
 			test-tool wildmatch ipathmatch 'foo/bar' 'foo?bar'
 		
-ok 1719 - ipathmatch: match 'foo/bar' 'foo?bar'
+ok 379 - ipathmatch: match 'foo/bar' 'foo?bar'
 
-expecting success of 3070.1720 'ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
+expecting success of 3070.380 'ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
 				printf '%s' 'foo/bar' >expect &&
 				git --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
 				
@@ -196075,9 +197419,9 @@
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1720 - ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'
+ok 380 - ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'
 
-expecting success of 3070.1721 'cleanup after previous file test': 
+expecting success of 3070.381 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -196089,9 +197433,9 @@
 Removing actual.raw
 Removing expect
 Removing foo/
-ok 1721 - cleanup after previous file test
+ok 381 - cleanup after previous file test
 
-expecting success of 3070.1722 'setup match file test for foo/bar': 
+expecting success of 3070.382 'setup match file test for foo/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -196110,14 +197454,14 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1722 - setup match file test for foo/bar
+ok 382 - setup match file test for foo/bar
 
-expecting success of 3070.1723 'wildmatch: no match 'foo/bar' 'foo[/]bar'': 
+expecting success of 3070.383 'wildmatch: no match 'foo/bar' 'foo[/]bar'': 
 			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[/]bar'
 		
-ok 1723 - wildmatch: no match 'foo/bar' 'foo[/]bar'
+ok 383 - wildmatch: no match 'foo/bar' 'foo[/]bar'
 
-expecting success of 3070.1724 'wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
+expecting success of 3070.384 'wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
 				>expect &&
 				git --glob-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
 				
@@ -196125,14 +197469,14 @@
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1724 - wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
+ok 384 - wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
 
-expecting success of 3070.1725 'iwildmatch: no match 'foo/bar' 'foo[/]bar'': 
+expecting success of 3070.385 'iwildmatch: no match 'foo/bar' 'foo[/]bar'': 
 			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[/]bar'
 		
-ok 1725 - iwildmatch: no match 'foo/bar' 'foo[/]bar'
+ok 385 - iwildmatch: no match 'foo/bar' 'foo[/]bar'
 
-expecting success of 3070.1726 'iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
+expecting success of 3070.386 'iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
 				>expect &&
 				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
 				
@@ -196140,14 +197484,14 @@
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1726 - iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
+ok 386 - iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
 
-expecting success of 3070.1727 'pathmatch: match 'foo/bar' 'foo[/]bar'': 
+expecting success of 3070.387 'pathmatch: match 'foo/bar' 'foo[/]bar'': 
 			test-tool wildmatch pathmatch 'foo/bar' 'foo[/]bar'
 		
-ok 1727 - pathmatch: match 'foo/bar' 'foo[/]bar'
+ok 387 - pathmatch: match 'foo/bar' 'foo[/]bar'
 
-expecting success of 3070.1728 'pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
+expecting success of 3070.388 'pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
 				printf '%s' 'foo/bar' >expect &&
 				git ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
 				
@@ -196155,14 +197499,14 @@
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1728 - pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
+ok 388 - pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
 
-expecting success of 3070.1729 'ipathmatch: match 'foo/bar' 'foo[/]bar'': 
+expecting success of 3070.389 'ipathmatch: match 'foo/bar' 'foo[/]bar'': 
 			test-tool wildmatch ipathmatch 'foo/bar' 'foo[/]bar'
 		
-ok 1729 - ipathmatch: match 'foo/bar' 'foo[/]bar'
+ok 389 - ipathmatch: match 'foo/bar' 'foo[/]bar'
 
-expecting success of 3070.1730 'ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
+expecting success of 3070.390 'ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
 				printf '%s' 'foo/bar' >expect &&
 				git --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
 				
@@ -196170,9 +197514,9 @@
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1730 - ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
+ok 390 - ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
 
-expecting success of 3070.1731 'cleanup after previous file test': 
+expecting success of 3070.391 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -196184,9 +197528,9 @@
 Removing actual.raw
 Removing expect
 Removing foo/
-ok 1731 - cleanup after previous file test
+ok 391 - cleanup after previous file test
 
-expecting success of 3070.1732 'setup match file test for foo/bar': 
+expecting success of 3070.392 'setup match file test for foo/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -196205,14 +197549,14 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1732 - setup match file test for foo/bar
+ok 392 - setup match file test for foo/bar
 
-expecting success of 3070.1733 'wildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
+expecting success of 3070.393 'wildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
 			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[^a-z]bar'
 		
-ok 1733 - wildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+ok 393 - wildmatch: no match 'foo/bar' 'foo[^a-z]bar'
 
-expecting success of 3070.1734 'wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
+expecting success of 3070.394 'wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
 				>expect &&
 				git --glob-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
 				
@@ -196220,14 +197564,14 @@
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1734 - wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
+ok 394 - wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
 
-expecting success of 3070.1735 'iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
+expecting success of 3070.395 'iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
 			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[^a-z]bar'
 		
-ok 1735 - iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+ok 395 - iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'
 
-expecting success of 3070.1736 'iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
+expecting success of 3070.396 'iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
 				>expect &&
 				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
 				
@@ -196235,14 +197579,14 @@
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1736 - iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
+ok 396 - iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
 
-expecting success of 3070.1737 'pathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
+expecting success of 3070.397 'pathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
 			test-tool wildmatch pathmatch 'foo/bar' 'foo[^a-z]bar'
 		
-ok 1737 - pathmatch: match 'foo/bar' 'foo[^a-z]bar'
+ok 397 - pathmatch: match 'foo/bar' 'foo[^a-z]bar'
 
-expecting success of 3070.1738 'pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
+expecting success of 3070.398 'pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
 				printf '%s' 'foo/bar' >expect &&
 				git ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
 				
@@ -196250,14 +197594,14 @@
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1738 - pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
+ok 398 - pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
 
-expecting success of 3070.1739 'ipathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
+expecting success of 3070.399 'ipathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
 			test-tool wildmatch ipathmatch 'foo/bar' 'foo[^a-z]bar'
 		
-ok 1739 - ipathmatch: match 'foo/bar' 'foo[^a-z]bar'
+ok 399 - ipathmatch: match 'foo/bar' 'foo[^a-z]bar'
 
-expecting success of 3070.1740 'ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
+expecting success of 3070.400 'ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
 				printf '%s' 'foo/bar' >expect &&
 				git --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
 				
@@ -196265,9 +197609,9 @@
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1740 - ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
+ok 400 - ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
 
-expecting success of 3070.1741 'cleanup after previous file test': 
+expecting success of 3070.401 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -196279,9 +197623,9 @@
 Removing actual.raw
 Removing expect
 Removing foo/
-ok 1741 - cleanup after previous file test
+ok 401 - cleanup after previous file test
 
-expecting success of 3070.1742 'setup match file test for ab/cXd/efXg/hi': 
+expecting success of 3070.402 'setup match file test for foo/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -196300,83 +197644,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1742 - setup match file test for ab/cXd/efXg/hi
+ok 402 - setup match file test for foo/bar
 
-expecting success of 3070.1743 'wildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'': 
-			test_must_fail test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*Xg*i'
+expecting success of 3070.403 'wildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 		
-ok 1743 - wildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'
+ok 403 - wildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 
-expecting success of 3070.1744 'wildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'': 
+expecting success of 3070.404 'wildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1744 - wildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'
+ok 404 - wildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
 
-expecting success of 3070.1745 'iwildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'': 
-			test_must_fail test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*Xg*i'
+expecting success of 3070.405 'iwildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 		
-ok 1745 - iwildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'
+ok 405 - iwildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 
-expecting success of 3070.1746 'iwildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'': 
+expecting success of 3070.406 'iwildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1746 - iwildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'
+ok 406 - iwildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
 
-expecting success of 3070.1747 'pathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'': 
-			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*Xg*i'
+expecting success of 3070.407 'pathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 		
-ok 1747 - pathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'
+ok 407 - pathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 
-expecting success of 3070.1748 'pathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
+expecting success of 3070.408 'pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1748 - pathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'
+ok 408 - pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
 
-expecting success of 3070.1749 'ipathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'': 
-			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*Xg*i'
+expecting success of 3070.409 'ipathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 		
-ok 1749 - ipathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'
+ok 409 - ipathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 
-expecting success of 3070.1750 'ipathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --icase-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
+expecting success of 3070.410 'ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1750 - ipathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'
+ok 410 - ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
 
-expecting success of 3070.1751 'cleanup after previous file test': 
+expecting success of 3070.411 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing ab/
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1751 - cleanup after previous file test
+Removing foo/
+ok 411 - cleanup after previous file test
 
-expecting success of 3070.1752 'setup match file test for a': 
+expecting success of 3070.412 'setup match file test for foo-bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -196395,83 +197739,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1752 - setup match file test for a
+ok 412 - setup match file test for foo-bar
 
-expecting success of 3070.1753 'wildmatch: no match 'a' '[A-Z]'': 
-			test_must_fail test-tool wildmatch wildmatch 'a' '[A-Z]'
+expecting success of 3070.413 'wildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test-tool wildmatch wildmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 		
-ok 1753 - wildmatch: no match 'a' '[A-Z]'
+ok 413 - wildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 
-expecting success of 3070.1754 'wildmatch (via ls-files): no match '[A-Z]' 'a'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+expecting success of 3070.414 'wildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
+				printf '%s' 'foo-bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1754 - wildmatch (via ls-files): no match '[A-Z]' 'a'
+ok 414 - wildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
 
-expecting success of 3070.1755 'iwildmatch: match 'a' '[A-Z]'': 
-			test-tool wildmatch iwildmatch 'a' '[A-Z]'
+expecting success of 3070.415 'iwildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test-tool wildmatch iwildmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 		
-ok 1755 - iwildmatch: match 'a' '[A-Z]'
+ok 415 - iwildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 
-expecting success of 3070.1756 'iwildmatch (via ls-files): match '[A-Z]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+expecting success of 3070.416 'iwildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
+				printf '%s' 'foo-bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1756 - iwildmatch (via ls-files): match '[A-Z]' 'a'
+ok 416 - iwildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
 
-expecting success of 3070.1757 'pathmatch: no match 'a' '[A-Z]'': 
-			test_must_fail test-tool wildmatch pathmatch 'a' '[A-Z]'
+expecting success of 3070.417 'pathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test-tool wildmatch pathmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 		
-ok 1757 - pathmatch: no match 'a' '[A-Z]'
+ok 417 - pathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 
-expecting success of 3070.1758 'pathmatch (via ls-files): no match '[A-Z]' 'a'': 
-				>expect &&
-				git ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+expecting success of 3070.418 'pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
+				printf '%s' 'foo-bar' >expect &&
+				git ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1758 - pathmatch (via ls-files): no match '[A-Z]' 'a'
+ok 418 - pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
 
-expecting success of 3070.1759 'ipathmatch: match 'a' '[A-Z]'': 
-			test-tool wildmatch ipathmatch 'a' '[A-Z]'
+expecting success of 3070.419 'ipathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test-tool wildmatch ipathmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 		
-ok 1759 - ipathmatch: match 'a' '[A-Z]'
+ok 419 - ipathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 
-expecting success of 3070.1760 'ipathmatch (via ls-files): match '[A-Z]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+expecting success of 3070.420 'ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
+				printf '%s' 'foo-bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1760 - ipathmatch (via ls-files): match '[A-Z]' 'a'
+ok 420 - ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
 
-expecting success of 3070.1761 'cleanup after previous file test': 
+expecting success of 3070.421 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1761 - cleanup after previous file test
+Removing foo-bar
+ok 421 - cleanup after previous file test
 
-expecting success of 3070.1762 'setup match file test for A': 
+expecting success of 3070.422 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -196490,83 +197834,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1762 - setup match file test for A
+ok 422 - setup match file test for foo
 
-expecting success of 3070.1763 'wildmatch: match 'A' '[A-Z]'': 
-			test-tool wildmatch wildmatch 'A' '[A-Z]'
+expecting success of 3070.423 'wildmatch: match 'foo' '**/foo'': 
+			test-tool wildmatch wildmatch 'foo' '**/foo'
 		
-ok 1763 - wildmatch: match 'A' '[A-Z]'
+ok 423 - wildmatch: match 'foo' '**/foo'
 
-expecting success of 3070.1764 'wildmatch (via ls-files): match '[A-Z]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+expecting success of 3070.424 'wildmatch (via ls-files): match '**/foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1764 - wildmatch (via ls-files): match '[A-Z]' 'A'
+ok 424 - wildmatch (via ls-files): match '**/foo' 'foo'
 
-expecting success of 3070.1765 'iwildmatch: match 'A' '[A-Z]'': 
-			test-tool wildmatch iwildmatch 'A' '[A-Z]'
+expecting success of 3070.425 'iwildmatch: match 'foo' '**/foo'': 
+			test-tool wildmatch iwildmatch 'foo' '**/foo'
 		
-ok 1765 - iwildmatch: match 'A' '[A-Z]'
+ok 425 - iwildmatch: match 'foo' '**/foo'
 
-expecting success of 3070.1766 'iwildmatch (via ls-files): match '[A-Z]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+expecting success of 3070.426 'iwildmatch (via ls-files): match '**/foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1766 - iwildmatch (via ls-files): match '[A-Z]' 'A'
+ok 426 - iwildmatch (via ls-files): match '**/foo' 'foo'
 
-expecting success of 3070.1767 'pathmatch: match 'A' '[A-Z]'': 
-			test-tool wildmatch pathmatch 'A' '[A-Z]'
+expecting success of 3070.427 'pathmatch: no match 'foo' '**/foo'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' '**/foo'
 		
-ok 1767 - pathmatch: match 'A' '[A-Z]'
+ok 427 - pathmatch: no match 'foo' '**/foo'
 
-expecting success of 3070.1768 'pathmatch (via ls-files): match '[A-Z]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+expecting success of 3070.428 'pathmatch (via ls-files): no match '**/foo' 'foo'': 
+				>expect &&
+				git ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1768 - pathmatch (via ls-files): match '[A-Z]' 'A'
+ok 428 - pathmatch (via ls-files): no match '**/foo' 'foo'
 
-expecting success of 3070.1769 'ipathmatch: match 'A' '[A-Z]'': 
-			test-tool wildmatch ipathmatch 'A' '[A-Z]'
+expecting success of 3070.429 'ipathmatch: no match 'foo' '**/foo'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '**/foo'
 		
-ok 1769 - ipathmatch: match 'A' '[A-Z]'
+ok 429 - ipathmatch: no match 'foo' '**/foo'
 
-expecting success of 3070.1770 'ipathmatch (via ls-files): match '[A-Z]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+expecting success of 3070.430 'ipathmatch (via ls-files): no match '**/foo' 'foo'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1770 - ipathmatch (via ls-files): match '[A-Z]' 'A'
+ok 430 - ipathmatch (via ls-files): no match '**/foo' 'foo'
 
-expecting success of 3070.1771 'cleanup after previous file test': 
+expecting success of 3070.431 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1771 - cleanup after previous file test
+Removing foo
+ok 431 - cleanup after previous file test
 
-expecting success of 3070.1772 'setup match file test for A': 
+expecting success of 3070.432 'setup match file test for XXX/foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -196585,83 +197929,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1772 - setup match file test for A
+ok 432 - setup match file test for XXX/foo
 
-expecting success of 3070.1773 'wildmatch: no match 'A' '[a-z]'': 
-			test_must_fail test-tool wildmatch wildmatch 'A' '[a-z]'
+expecting success of 3070.433 'wildmatch: match 'XXX/foo' '**/foo'': 
+			test-tool wildmatch wildmatch 'XXX/foo' '**/foo'
 		
-ok 1773 - wildmatch: no match 'A' '[a-z]'
+ok 433 - wildmatch: match 'XXX/foo' '**/foo'
 
-expecting success of 3070.1774 'wildmatch (via ls-files): no match '[a-z]' 'A'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+expecting success of 3070.434 'wildmatch (via ls-files): match '**/foo' 'XXX/foo'': 
+				printf '%s' 'XXX/foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1774 - wildmatch (via ls-files): no match '[a-z]' 'A'
+ok 434 - wildmatch (via ls-files): match '**/foo' 'XXX/foo'
 
-expecting success of 3070.1775 'iwildmatch: match 'A' '[a-z]'': 
-			test-tool wildmatch iwildmatch 'A' '[a-z]'
+expecting success of 3070.435 'iwildmatch: match 'XXX/foo' '**/foo'': 
+			test-tool wildmatch iwildmatch 'XXX/foo' '**/foo'
 		
-ok 1775 - iwildmatch: match 'A' '[a-z]'
+ok 435 - iwildmatch: match 'XXX/foo' '**/foo'
 
-expecting success of 3070.1776 'iwildmatch (via ls-files): match '[a-z]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+expecting success of 3070.436 'iwildmatch (via ls-files): match '**/foo' 'XXX/foo'': 
+				printf '%s' 'XXX/foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1776 - iwildmatch (via ls-files): match '[a-z]' 'A'
+ok 436 - iwildmatch (via ls-files): match '**/foo' 'XXX/foo'
 
-expecting success of 3070.1777 'pathmatch: no match 'A' '[a-z]'': 
-			test_must_fail test-tool wildmatch pathmatch 'A' '[a-z]'
+expecting success of 3070.437 'pathmatch: match 'XXX/foo' '**/foo'': 
+			test-tool wildmatch pathmatch 'XXX/foo' '**/foo'
 		
-ok 1777 - pathmatch: no match 'A' '[a-z]'
+ok 437 - pathmatch: match 'XXX/foo' '**/foo'
 
-expecting success of 3070.1778 'pathmatch (via ls-files): no match '[a-z]' 'A'': 
-				>expect &&
-				git ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+expecting success of 3070.438 'pathmatch (via ls-files): match '**/foo' 'XXX/foo'': 
+				printf '%s' 'XXX/foo' >expect &&
+				git ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1778 - pathmatch (via ls-files): no match '[a-z]' 'A'
+ok 438 - pathmatch (via ls-files): match '**/foo' 'XXX/foo'
 
-expecting success of 3070.1779 'ipathmatch: match 'A' '[a-z]'': 
-			test-tool wildmatch ipathmatch 'A' '[a-z]'
+expecting success of 3070.439 'ipathmatch: match 'XXX/foo' '**/foo'': 
+			test-tool wildmatch ipathmatch 'XXX/foo' '**/foo'
 		
-ok 1779 - ipathmatch: match 'A' '[a-z]'
+ok 439 - ipathmatch: match 'XXX/foo' '**/foo'
 
-expecting success of 3070.1780 'ipathmatch (via ls-files): match '[a-z]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+expecting success of 3070.440 'ipathmatch (via ls-files): match '**/foo' 'XXX/foo'': 
+				printf '%s' 'XXX/foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1780 - ipathmatch (via ls-files): match '[a-z]' 'A'
+ok 440 - ipathmatch (via ls-files): match '**/foo' 'XXX/foo'
 
-expecting success of 3070.1781 'cleanup after previous file test': 
+expecting success of 3070.441 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing A
+Removing XXX/
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1781 - cleanup after previous file test
+ok 441 - cleanup after previous file test
 
-expecting success of 3070.1782 'setup match file test for a': 
+expecting success of 3070.442 'setup match file test for bar/baz/foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -196680,83 +198024,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1782 - setup match file test for a
+ok 442 - setup match file test for bar/baz/foo
 
-expecting success of 3070.1783 'wildmatch: match 'a' '[a-z]'': 
-			test-tool wildmatch wildmatch 'a' '[a-z]'
+expecting success of 3070.443 'wildmatch: match 'bar/baz/foo' '**/foo'': 
+			test-tool wildmatch wildmatch 'bar/baz/foo' '**/foo'
 		
-ok 1783 - wildmatch: match 'a' '[a-z]'
+ok 443 - wildmatch: match 'bar/baz/foo' '**/foo'
 
-expecting success of 3070.1784 'wildmatch (via ls-files): match '[a-z]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+expecting success of 3070.444 'wildmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
+				printf '%s' 'bar/baz/foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1784 - wildmatch (via ls-files): match '[a-z]' 'a'
+ok 444 - wildmatch (via ls-files): match '**/foo' 'bar/baz/foo'
 
-expecting success of 3070.1785 'iwildmatch: match 'a' '[a-z]'': 
-			test-tool wildmatch iwildmatch 'a' '[a-z]'
+expecting success of 3070.445 'iwildmatch: match 'bar/baz/foo' '**/foo'': 
+			test-tool wildmatch iwildmatch 'bar/baz/foo' '**/foo'
 		
-ok 1785 - iwildmatch: match 'a' '[a-z]'
+ok 445 - iwildmatch: match 'bar/baz/foo' '**/foo'
 
-expecting success of 3070.1786 'iwildmatch (via ls-files): match '[a-z]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+expecting success of 3070.446 'iwildmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
+				printf '%s' 'bar/baz/foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1786 - iwildmatch (via ls-files): match '[a-z]' 'a'
+ok 446 - iwildmatch (via ls-files): match '**/foo' 'bar/baz/foo'
 
-expecting success of 3070.1787 'pathmatch: match 'a' '[a-z]'': 
-			test-tool wildmatch pathmatch 'a' '[a-z]'
+expecting success of 3070.447 'pathmatch: match 'bar/baz/foo' '**/foo'': 
+			test-tool wildmatch pathmatch 'bar/baz/foo' '**/foo'
 		
-ok 1787 - pathmatch: match 'a' '[a-z]'
+ok 447 - pathmatch: match 'bar/baz/foo' '**/foo'
 
-expecting success of 3070.1788 'pathmatch (via ls-files): match '[a-z]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+expecting success of 3070.448 'pathmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
+				printf '%s' 'bar/baz/foo' >expect &&
+				git ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1788 - pathmatch (via ls-files): match '[a-z]' 'a'
+ok 448 - pathmatch (via ls-files): match '**/foo' 'bar/baz/foo'
 
-expecting success of 3070.1789 'ipathmatch: match 'a' '[a-z]'': 
-			test-tool wildmatch ipathmatch 'a' '[a-z]'
+expecting success of 3070.449 'ipathmatch: match 'bar/baz/foo' '**/foo'': 
+			test-tool wildmatch ipathmatch 'bar/baz/foo' '**/foo'
 		
-ok 1789 - ipathmatch: match 'a' '[a-z]'
+ok 449 - ipathmatch: match 'bar/baz/foo' '**/foo'
 
-expecting success of 3070.1790 'ipathmatch (via ls-files): match '[a-z]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+expecting success of 3070.450 'ipathmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
+				printf '%s' 'bar/baz/foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1790 - ipathmatch (via ls-files): match '[a-z]' 'a'
+ok 450 - ipathmatch (via ls-files): match '**/foo' 'bar/baz/foo'
 
-expecting success of 3070.1791 'cleanup after previous file test': 
+expecting success of 3070.451 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
+Removing bar/
 Removing expect
-ok 1791 - cleanup after previous file test
+ok 451 - cleanup after previous file test
 
-expecting success of 3070.1792 'setup match file test for a': 
+expecting success of 3070.452 'setup match file test for bar/baz/foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -196775,83 +198119,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1792 - setup match file test for a
+ok 452 - setup match file test for bar/baz/foo
 
-expecting success of 3070.1793 'wildmatch: no match 'a' '[[:upper:]]'': 
-			test_must_fail test-tool wildmatch wildmatch 'a' '[[:upper:]]'
+expecting success of 3070.453 'wildmatch: no match 'bar/baz/foo' '*/foo'': 
+			test_must_fail test-tool wildmatch wildmatch 'bar/baz/foo' '*/foo'
 		
-ok 1793 - wildmatch: no match 'a' '[[:upper:]]'
+ok 453 - wildmatch: no match 'bar/baz/foo' '*/foo'
 
-expecting success of 3070.1794 'wildmatch (via ls-files): no match '[[:upper:]]' 'a'': 
+expecting success of 3070.454 'wildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1794 - wildmatch (via ls-files): no match '[[:upper:]]' 'a'
+ok 454 - wildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'
 
-expecting success of 3070.1795 'iwildmatch: match 'a' '[[:upper:]]'': 
-			test-tool wildmatch iwildmatch 'a' '[[:upper:]]'
+expecting success of 3070.455 'iwildmatch: no match 'bar/baz/foo' '*/foo'': 
+			test_must_fail test-tool wildmatch iwildmatch 'bar/baz/foo' '*/foo'
 		
-ok 1795 - iwildmatch: match 'a' '[[:upper:]]'
+ok 455 - iwildmatch: no match 'bar/baz/foo' '*/foo'
 
-expecting success of 3070.1796 'iwildmatch (via ls-files): match '[[:upper:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.456 'iwildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1796 - iwildmatch (via ls-files): match '[[:upper:]]' 'a'
+ok 456 - iwildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'
 
-expecting success of 3070.1797 'pathmatch: no match 'a' '[[:upper:]]'': 
-			test_must_fail test-tool wildmatch pathmatch 'a' '[[:upper:]]'
+expecting success of 3070.457 'pathmatch: match 'bar/baz/foo' '*/foo'': 
+			test-tool wildmatch pathmatch 'bar/baz/foo' '*/foo'
 		
-ok 1797 - pathmatch: no match 'a' '[[:upper:]]'
+ok 457 - pathmatch: match 'bar/baz/foo' '*/foo'
 
-expecting success of 3070.1798 'pathmatch (via ls-files): no match '[[:upper:]]' 'a'': 
-				>expect &&
-				git ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.458 'pathmatch (via ls-files): match '*/foo' 'bar/baz/foo'': 
+				printf '%s' 'bar/baz/foo' >expect &&
+				git ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1798 - pathmatch (via ls-files): no match '[[:upper:]]' 'a'
+ok 458 - pathmatch (via ls-files): match '*/foo' 'bar/baz/foo'
 
-expecting success of 3070.1799 'ipathmatch: match 'a' '[[:upper:]]'': 
-			test-tool wildmatch ipathmatch 'a' '[[:upper:]]'
+expecting success of 3070.459 'ipathmatch: match 'bar/baz/foo' '*/foo'': 
+			test-tool wildmatch ipathmatch 'bar/baz/foo' '*/foo'
 		
-ok 1799 - ipathmatch: match 'a' '[[:upper:]]'
+ok 459 - ipathmatch: match 'bar/baz/foo' '*/foo'
 
-expecting success of 3070.1800 'ipathmatch (via ls-files): match '[[:upper:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.460 'ipathmatch (via ls-files): match '*/foo' 'bar/baz/foo'': 
+				printf '%s' 'bar/baz/foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1800 - ipathmatch (via ls-files): match '[[:upper:]]' 'a'
+ok 460 - ipathmatch (via ls-files): match '*/foo' 'bar/baz/foo'
 
-expecting success of 3070.1801 'cleanup after previous file test': 
+expecting success of 3070.461 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
+Removing bar/
 Removing expect
-ok 1801 - cleanup after previous file test
+ok 461 - cleanup after previous file test
 
-expecting success of 3070.1802 'setup match file test for A': 
+expecting success of 3070.462 'setup match file test for foo/bar/baz': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -196870,83 +198214,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1802 - setup match file test for A
+ok 462 - setup match file test for foo/bar/baz
 
-expecting success of 3070.1803 'wildmatch: match 'A' '[[:upper:]]'': 
-			test-tool wildmatch wildmatch 'A' '[[:upper:]]'
+expecting success of 3070.463 'wildmatch: no match 'foo/bar/baz' '**/bar*'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar/baz' '**/bar*'
 		
-ok 1803 - wildmatch: match 'A' '[[:upper:]]'
+ok 463 - wildmatch: no match 'foo/bar/baz' '**/bar*'
 
-expecting success of 3070.1804 'wildmatch (via ls-files): match '[[:upper:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.464 'wildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1804 - wildmatch (via ls-files): match '[[:upper:]]' 'A'
+ok 464 - wildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'
 
-expecting success of 3070.1805 'iwildmatch: match 'A' '[[:upper:]]'': 
-			test-tool wildmatch iwildmatch 'A' '[[:upper:]]'
+expecting success of 3070.465 'iwildmatch: no match 'foo/bar/baz' '**/bar*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar/baz' '**/bar*'
 		
-ok 1805 - iwildmatch: match 'A' '[[:upper:]]'
+ok 465 - iwildmatch: no match 'foo/bar/baz' '**/bar*'
 
-expecting success of 3070.1806 'iwildmatch (via ls-files): match '[[:upper:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.466 'iwildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1806 - iwildmatch (via ls-files): match '[[:upper:]]' 'A'
+ok 466 - iwildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'
 
-expecting success of 3070.1807 'pathmatch: match 'A' '[[:upper:]]'': 
-			test-tool wildmatch pathmatch 'A' '[[:upper:]]'
+expecting success of 3070.467 'pathmatch: match 'foo/bar/baz' '**/bar*'': 
+			test-tool wildmatch pathmatch 'foo/bar/baz' '**/bar*'
 		
-ok 1807 - pathmatch: match 'A' '[[:upper:]]'
+ok 467 - pathmatch: match 'foo/bar/baz' '**/bar*'
 
-expecting success of 3070.1808 'pathmatch (via ls-files): match '[[:upper:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.468 'pathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'': 
+				printf '%s' 'foo/bar/baz' >expect &&
+				git ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1808 - pathmatch (via ls-files): match '[[:upper:]]' 'A'
+ok 468 - pathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'
 
-expecting success of 3070.1809 'ipathmatch: match 'A' '[[:upper:]]'': 
-			test-tool wildmatch ipathmatch 'A' '[[:upper:]]'
+expecting success of 3070.469 'ipathmatch: match 'foo/bar/baz' '**/bar*'': 
+			test-tool wildmatch ipathmatch 'foo/bar/baz' '**/bar*'
 		
-ok 1809 - ipathmatch: match 'A' '[[:upper:]]'
+ok 469 - ipathmatch: match 'foo/bar/baz' '**/bar*'
 
-expecting success of 3070.1810 'ipathmatch (via ls-files): match '[[:upper:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.470 'ipathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'': 
+				printf '%s' 'foo/bar/baz' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1810 - ipathmatch (via ls-files): match '[[:upper:]]' 'A'
+ok 470 - ipathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'
 
-expecting success of 3070.1811 'cleanup after previous file test': 
+expecting success of 3070.471 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1811 - cleanup after previous file test
+Removing foo/
+ok 471 - cleanup after previous file test
 
-expecting success of 3070.1812 'setup match file test for A': 
+expecting success of 3070.472 'setup match file test for deep/foo/bar/baz': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -196965,83 +198309,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1812 - setup match file test for A
+ok 472 - setup match file test for deep/foo/bar/baz
 
-expecting success of 3070.1813 'wildmatch: no match 'A' '[[:lower:]]'': 
-			test_must_fail test-tool wildmatch wildmatch 'A' '[[:lower:]]'
+expecting success of 3070.473 'wildmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
+			test-tool wildmatch wildmatch 'deep/foo/bar/baz' '**/bar/*'
 		
-ok 1813 - wildmatch: no match 'A' '[[:lower:]]'
+ok 473 - wildmatch: match 'deep/foo/bar/baz' '**/bar/*'
 
-expecting success of 3070.1814 'wildmatch (via ls-files): no match '[[:lower:]]' 'A'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.474 'wildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
+				printf '%s' 'deep/foo/bar/baz' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1814 - wildmatch (via ls-files): no match '[[:lower:]]' 'A'
+ok 474 - wildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
 
-expecting success of 3070.1815 'iwildmatch: match 'A' '[[:lower:]]'': 
-			test-tool wildmatch iwildmatch 'A' '[[:lower:]]'
+expecting success of 3070.475 'iwildmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
+			test-tool wildmatch iwildmatch 'deep/foo/bar/baz' '**/bar/*'
 		
-ok 1815 - iwildmatch: match 'A' '[[:lower:]]'
+ok 475 - iwildmatch: match 'deep/foo/bar/baz' '**/bar/*'
 
-expecting success of 3070.1816 'iwildmatch (via ls-files): match '[[:lower:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.476 'iwildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
+				printf '%s' 'deep/foo/bar/baz' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1816 - iwildmatch (via ls-files): match '[[:lower:]]' 'A'
+ok 476 - iwildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
 
-expecting success of 3070.1817 'pathmatch: no match 'A' '[[:lower:]]'': 
-			test_must_fail test-tool wildmatch pathmatch 'A' '[[:lower:]]'
+expecting success of 3070.477 'pathmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz' '**/bar/*'
 		
-ok 1817 - pathmatch: no match 'A' '[[:lower:]]'
+ok 477 - pathmatch: match 'deep/foo/bar/baz' '**/bar/*'
 
-expecting success of 3070.1818 'pathmatch (via ls-files): no match '[[:lower:]]' 'A'': 
-				>expect &&
-				git ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.478 'pathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
+				printf '%s' 'deep/foo/bar/baz' >expect &&
+				git ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1818 - pathmatch (via ls-files): no match '[[:lower:]]' 'A'
+ok 478 - pathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
 
-expecting success of 3070.1819 'ipathmatch: match 'A' '[[:lower:]]'': 
-			test-tool wildmatch ipathmatch 'A' '[[:lower:]]'
+expecting success of 3070.479 'ipathmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz' '**/bar/*'
 		
-ok 1819 - ipathmatch: match 'A' '[[:lower:]]'
+ok 479 - ipathmatch: match 'deep/foo/bar/baz' '**/bar/*'
 
-expecting success of 3070.1820 'ipathmatch (via ls-files): match '[[:lower:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.480 'ipathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
+				printf '%s' 'deep/foo/bar/baz' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1820 - ipathmatch (via ls-files): match '[[:lower:]]' 'A'
+ok 480 - ipathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
 
-expecting success of 3070.1821 'cleanup after previous file test': 
+expecting success of 3070.481 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
+Removing deep/
 Removing expect
-ok 1821 - cleanup after previous file test
+ok 481 - cleanup after previous file test
 
-expecting success of 3070.1822 'setup match file test for a': 
+expecting success of 3070.482 'setup match file test for deep/foo/bar/baz/': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -197060,83 +198404,207 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1822 - setup match file test for a
+ok 482 - setup match file test for deep/foo/bar/baz/
 
-expecting success of 3070.1823 'wildmatch: match 'a' '[[:lower:]]'': 
-			test-tool wildmatch wildmatch 'a' '[[:lower:]]'
+expecting success of 3070.483 'wildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar/baz/' '**/bar/*'
 		
-ok 1823 - wildmatch: match 'a' '[[:lower:]]'
+ok 483 - wildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'
 
-expecting success of 3070.1824 'wildmatch (via ls-files): match '[[:lower:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+checking known breakage of 3070.484 'wildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/'': false
+not ok 484 - wildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.485 'iwildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar/baz/' '**/bar/*'
+		
+ok 485 - iwildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'
+
+checking known breakage of 3070.486 'iwildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/'': false
+not ok 486 - iwildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.487 'pathmatch: match 'deep/foo/bar/baz/' '**/bar/*'': 
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz/' '**/bar/*'
+		
+ok 487 - pathmatch: match 'deep/foo/bar/baz/' '**/bar/*'
+
+checking known breakage of 3070.488 'pathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/'': false
+not ok 488 - pathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.489 'ipathmatch: match 'deep/foo/bar/baz/' '**/bar/*'': 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/' '**/bar/*'
+		
+ok 489 - ipathmatch: match 'deep/foo/bar/baz/' '**/bar/*'
+
+checking known breakage of 3070.490 'ipathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/'': false
+not ok 490 - ipathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.491 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 491 - cleanup after previous file test
+
+expecting success of 3070.492 'setup match file test for deep/foo/bar/baz/': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 492 - setup match file test for deep/foo/bar/baz/
+
+expecting success of 3070.493 'wildmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
+			test-tool wildmatch wildmatch 'deep/foo/bar/baz/' '**/bar/**'
+		
+ok 493 - wildmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+
+checking known breakage of 3070.494 'wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
+not ok 494 - wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.495 'iwildmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
+			test-tool wildmatch iwildmatch 'deep/foo/bar/baz/' '**/bar/**'
+		
+ok 495 - iwildmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+
+checking known breakage of 3070.496 'iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
+not ok 496 - iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.497 'pathmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz/' '**/bar/**'
+		
+ok 497 - pathmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+
+checking known breakage of 3070.498 'pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
+not ok 498 - pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.499 'ipathmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/' '**/bar/**'
+		
+ok 499 - ipathmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+
+checking known breakage of 3070.500 'ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
+not ok 500 - ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.501 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 501 - cleanup after previous file test
+
+expecting success of 3070.502 'setup match file test for deep/foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 502 - setup match file test for deep/foo/bar
+
+expecting success of 3070.503 'wildmatch: no match 'deep/foo/bar' '**/bar/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar' '**/bar/*'
+		
+ok 503 - wildmatch: no match 'deep/foo/bar' '**/bar/*'
+
+expecting success of 3070.504 'wildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1824 - wildmatch (via ls-files): match '[[:lower:]]' 'a'
+ok 504 - wildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
 
-expecting success of 3070.1825 'iwildmatch: match 'a' '[[:lower:]]'': 
-			test-tool wildmatch iwildmatch 'a' '[[:lower:]]'
+expecting success of 3070.505 'iwildmatch: no match 'deep/foo/bar' '**/bar/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar' '**/bar/*'
 		
-ok 1825 - iwildmatch: match 'a' '[[:lower:]]'
+ok 505 - iwildmatch: no match 'deep/foo/bar' '**/bar/*'
 
-expecting success of 3070.1826 'iwildmatch (via ls-files): match '[[:lower:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.506 'iwildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1826 - iwildmatch (via ls-files): match '[[:lower:]]' 'a'
+ok 506 - iwildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
 
-expecting success of 3070.1827 'pathmatch: match 'a' '[[:lower:]]'': 
-			test-tool wildmatch pathmatch 'a' '[[:lower:]]'
+expecting success of 3070.507 'pathmatch: no match 'deep/foo/bar' '**/bar/*'': 
+			test_must_fail test-tool wildmatch pathmatch 'deep/foo/bar' '**/bar/*'
 		
-ok 1827 - pathmatch: match 'a' '[[:lower:]]'
+ok 507 - pathmatch: no match 'deep/foo/bar' '**/bar/*'
 
-expecting success of 3070.1828 'pathmatch (via ls-files): match '[[:lower:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.508 'pathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
+				>expect &&
+				git ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1828 - pathmatch (via ls-files): match '[[:lower:]]' 'a'
+ok 508 - pathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
 
-expecting success of 3070.1829 'ipathmatch: match 'a' '[[:lower:]]'': 
-			test-tool wildmatch ipathmatch 'a' '[[:lower:]]'
+expecting success of 3070.509 'ipathmatch: no match 'deep/foo/bar' '**/bar/*'': 
+			test_must_fail test-tool wildmatch ipathmatch 'deep/foo/bar' '**/bar/*'
 		
-ok 1829 - ipathmatch: match 'a' '[[:lower:]]'
+ok 509 - ipathmatch: no match 'deep/foo/bar' '**/bar/*'
 
-expecting success of 3070.1830 'ipathmatch (via ls-files): match '[[:lower:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+expecting success of 3070.510 'ipathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1830 - ipathmatch (via ls-files): match '[[:lower:]]' 'a'
+ok 510 - ipathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
 
-expecting success of 3070.1831 'cleanup after previous file test': 
+expecting success of 3070.511 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
+Removing deep/
 Removing expect
-ok 1831 - cleanup after previous file test
+ok 511 - cleanup after previous file test
 
-expecting success of 3070.1832 'setup match file test for A': 
+expecting success of 3070.512 'setup match file test for deep/foo/bar/': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -197155,83 +198623,145 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1832 - setup match file test for A
+ok 512 - setup match file test for deep/foo/bar/
 
-expecting success of 3070.1833 'wildmatch: no match 'A' '[B-Za]'': 
-			test_must_fail test-tool wildmatch wildmatch 'A' '[B-Za]'
+expecting success of 3070.513 'wildmatch: match 'deep/foo/bar/' '**/bar/**'': 
+			test-tool wildmatch wildmatch 'deep/foo/bar/' '**/bar/**'
 		
-ok 1833 - wildmatch: no match 'A' '[B-Za]'
+ok 513 - wildmatch: match 'deep/foo/bar/' '**/bar/**'
 
-expecting success of 3070.1834 'wildmatch (via ls-files): no match '[B-Za]' 'A'': 
+checking known breakage of 3070.514 'wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
+not ok 514 - wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+
+expecting success of 3070.515 'iwildmatch: match 'deep/foo/bar/' '**/bar/**'': 
+			test-tool wildmatch iwildmatch 'deep/foo/bar/' '**/bar/**'
+		
+ok 515 - iwildmatch: match 'deep/foo/bar/' '**/bar/**'
+
+checking known breakage of 3070.516 'iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
+not ok 516 - iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+
+expecting success of 3070.517 'pathmatch: match 'deep/foo/bar/' '**/bar/**'': 
+			test-tool wildmatch pathmatch 'deep/foo/bar/' '**/bar/**'
+		
+ok 517 - pathmatch: match 'deep/foo/bar/' '**/bar/**'
+
+checking known breakage of 3070.518 'pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
+not ok 518 - pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+
+expecting success of 3070.519 'ipathmatch: match 'deep/foo/bar/' '**/bar/**'': 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/' '**/bar/**'
+		
+ok 519 - ipathmatch: match 'deep/foo/bar/' '**/bar/**'
+
+checking known breakage of 3070.520 'ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
+not ok 520 - ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+
+expecting success of 3070.521 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 521 - cleanup after previous file test
+
+expecting success of 3070.522 'setup match file test for foo/bar/baz': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 522 - setup match file test for foo/bar/baz
+
+expecting success of 3070.523 'wildmatch: no match 'foo/bar/baz' '**/bar**'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar/baz' '**/bar**'
+		
+ok 523 - wildmatch: no match 'foo/bar/baz' '**/bar**'
+
+expecting success of 3070.524 'wildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1834 - wildmatch (via ls-files): no match '[B-Za]' 'A'
+ok 524 - wildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'
 
-expecting success of 3070.1835 'iwildmatch: match 'A' '[B-Za]'': 
-			test-tool wildmatch iwildmatch 'A' '[B-Za]'
+expecting success of 3070.525 'iwildmatch: no match 'foo/bar/baz' '**/bar**'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar/baz' '**/bar**'
 		
-ok 1835 - iwildmatch: match 'A' '[B-Za]'
+ok 525 - iwildmatch: no match 'foo/bar/baz' '**/bar**'
 
-expecting success of 3070.1836 'iwildmatch (via ls-files): match '[B-Za]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+expecting success of 3070.526 'iwildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1836 - iwildmatch (via ls-files): match '[B-Za]' 'A'
+ok 526 - iwildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'
 
-expecting success of 3070.1837 'pathmatch: no match 'A' '[B-Za]'': 
-			test_must_fail test-tool wildmatch pathmatch 'A' '[B-Za]'
+expecting success of 3070.527 'pathmatch: match 'foo/bar/baz' '**/bar**'': 
+			test-tool wildmatch pathmatch 'foo/bar/baz' '**/bar**'
 		
-ok 1837 - pathmatch: no match 'A' '[B-Za]'
+ok 527 - pathmatch: match 'foo/bar/baz' '**/bar**'
 
-expecting success of 3070.1838 'pathmatch (via ls-files): no match '[B-Za]' 'A'': 
-				>expect &&
-				git ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+expecting success of 3070.528 'pathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'': 
+				printf '%s' 'foo/bar/baz' >expect &&
+				git ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1838 - pathmatch (via ls-files): no match '[B-Za]' 'A'
+ok 528 - pathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'
 
-expecting success of 3070.1839 'ipathmatch: match 'A' '[B-Za]'': 
-			test-tool wildmatch ipathmatch 'A' '[B-Za]'
+expecting success of 3070.529 'ipathmatch: match 'foo/bar/baz' '**/bar**'': 
+			test-tool wildmatch ipathmatch 'foo/bar/baz' '**/bar**'
 		
-ok 1839 - ipathmatch: match 'A' '[B-Za]'
+ok 529 - ipathmatch: match 'foo/bar/baz' '**/bar**'
 
-expecting success of 3070.1840 'ipathmatch (via ls-files): match '[B-Za]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+expecting success of 3070.530 'ipathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'': 
+				printf '%s' 'foo/bar/baz' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1840 - ipathmatch (via ls-files): match '[B-Za]' 'A'
+ok 530 - ipathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'
 
-expecting success of 3070.1841 'cleanup after previous file test': 
+expecting success of 3070.531 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1841 - cleanup after previous file test
+Removing foo/
+ok 531 - cleanup after previous file test
 
-expecting success of 3070.1842 'setup match file test for a': 
+expecting success of 3070.532 'setup match file test for foo/bar/baz/x': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -197250,83 +198780,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1842 - setup match file test for a
+ok 532 - setup match file test for foo/bar/baz/x
 
-expecting success of 3070.1843 'wildmatch: match 'a' '[B-Za]'': 
-			test-tool wildmatch wildmatch 'a' '[B-Za]'
+expecting success of 3070.533 'wildmatch: match 'foo/bar/baz/x' '*/bar/**'': 
+			test-tool wildmatch wildmatch 'foo/bar/baz/x' '*/bar/**'
 		
-ok 1843 - wildmatch: match 'a' '[B-Za]'
+ok 533 - wildmatch: match 'foo/bar/baz/x' '*/bar/**'
 
-expecting success of 3070.1844 'wildmatch (via ls-files): match '[B-Za]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+expecting success of 3070.534 'wildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
+				printf '%s' 'foo/bar/baz/x' >expect &&
+				git --glob-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1844 - wildmatch (via ls-files): match '[B-Za]' 'a'
+ok 534 - wildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
 
-expecting success of 3070.1845 'iwildmatch: match 'a' '[B-Za]'': 
-			test-tool wildmatch iwildmatch 'a' '[B-Za]'
+expecting success of 3070.535 'iwildmatch: match 'foo/bar/baz/x' '*/bar/**'': 
+			test-tool wildmatch iwildmatch 'foo/bar/baz/x' '*/bar/**'
 		
-ok 1845 - iwildmatch: match 'a' '[B-Za]'
+ok 535 - iwildmatch: match 'foo/bar/baz/x' '*/bar/**'
 
-expecting success of 3070.1846 'iwildmatch (via ls-files): match '[B-Za]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+expecting success of 3070.536 'iwildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
+				printf '%s' 'foo/bar/baz/x' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1846 - iwildmatch (via ls-files): match '[B-Za]' 'a'
+ok 536 - iwildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
 
-expecting success of 3070.1847 'pathmatch: match 'a' '[B-Za]'': 
-			test-tool wildmatch pathmatch 'a' '[B-Za]'
+expecting success of 3070.537 'pathmatch: match 'foo/bar/baz/x' '*/bar/**'': 
+			test-tool wildmatch pathmatch 'foo/bar/baz/x' '*/bar/**'
 		
-ok 1847 - pathmatch: match 'a' '[B-Za]'
+ok 537 - pathmatch: match 'foo/bar/baz/x' '*/bar/**'
 
-expecting success of 3070.1848 'pathmatch (via ls-files): match '[B-Za]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+expecting success of 3070.538 'pathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
+				printf '%s' 'foo/bar/baz/x' >expect &&
+				git ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1848 - pathmatch (via ls-files): match '[B-Za]' 'a'
+ok 538 - pathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
 
-expecting success of 3070.1849 'ipathmatch: match 'a' '[B-Za]'': 
-			test-tool wildmatch ipathmatch 'a' '[B-Za]'
+expecting success of 3070.539 'ipathmatch: match 'foo/bar/baz/x' '*/bar/**'': 
+			test-tool wildmatch ipathmatch 'foo/bar/baz/x' '*/bar/**'
 		
-ok 1849 - ipathmatch: match 'a' '[B-Za]'
+ok 539 - ipathmatch: match 'foo/bar/baz/x' '*/bar/**'
 
-expecting success of 3070.1850 'ipathmatch (via ls-files): match '[B-Za]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+expecting success of 3070.540 'ipathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
+				printf '%s' 'foo/bar/baz/x' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1850 - ipathmatch (via ls-files): match '[B-Za]' 'a'
+ok 540 - ipathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
 
-expecting success of 3070.1851 'cleanup after previous file test': 
+expecting success of 3070.541 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1851 - cleanup after previous file test
+Removing foo/
+ok 541 - cleanup after previous file test
 
-expecting success of 3070.1852 'setup match file test for A': 
+expecting success of 3070.542 'setup match file test for deep/foo/bar/baz/x': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -197345,83 +198875,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1852 - setup match file test for A
+ok 542 - setup match file test for deep/foo/bar/baz/x
 
-expecting success of 3070.1853 'wildmatch: no match 'A' '[B-a]'': 
-			test_must_fail test-tool wildmatch wildmatch 'A' '[B-a]'
+expecting success of 3070.543 'wildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'': 
+			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar/baz/x' '*/bar/**'
 		
-ok 1853 - wildmatch: no match 'A' '[B-a]'
+ok 543 - wildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'
 
-expecting success of 3070.1854 'wildmatch (via ls-files): no match '[B-a]' 'A'': 
+expecting success of 3070.544 'wildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1854 - wildmatch (via ls-files): no match '[B-a]' 'A'
+ok 544 - wildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'
 
-expecting success of 3070.1855 'iwildmatch: match 'A' '[B-a]'': 
-			test-tool wildmatch iwildmatch 'A' '[B-a]'
+expecting success of 3070.545 'iwildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'': 
+			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar/baz/x' '*/bar/**'
 		
-ok 1855 - iwildmatch: match 'A' '[B-a]'
+ok 545 - iwildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'
 
-expecting success of 3070.1856 'iwildmatch (via ls-files): match '[B-a]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+expecting success of 3070.546 'iwildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1856 - iwildmatch (via ls-files): match '[B-a]' 'A'
+ok 546 - iwildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'
 
-expecting success of 3070.1857 'pathmatch: no match 'A' '[B-a]'': 
-			test_must_fail test-tool wildmatch pathmatch 'A' '[B-a]'
+expecting success of 3070.547 'pathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'': 
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz/x' '*/bar/**'
 		
-ok 1857 - pathmatch: no match 'A' '[B-a]'
+ok 547 - pathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'
 
-expecting success of 3070.1858 'pathmatch (via ls-files): no match '[B-a]' 'A'': 
-				>expect &&
-				git ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+expecting success of 3070.548 'pathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'': 
+				printf '%s' 'deep/foo/bar/baz/x' >expect &&
+				git ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1858 - pathmatch (via ls-files): no match '[B-a]' 'A'
+ok 548 - pathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'
 
-expecting success of 3070.1859 'ipathmatch: match 'A' '[B-a]'': 
-			test-tool wildmatch ipathmatch 'A' '[B-a]'
+expecting success of 3070.549 'ipathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'': 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/x' '*/bar/**'
 		
-ok 1859 - ipathmatch: match 'A' '[B-a]'
+ok 549 - ipathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'
 
-expecting success of 3070.1860 'ipathmatch (via ls-files): match '[B-a]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+expecting success of 3070.550 'ipathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'': 
+				printf '%s' 'deep/foo/bar/baz/x' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1860 - ipathmatch (via ls-files): match '[B-a]' 'A'
+ok 550 - ipathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'
 
-expecting success of 3070.1861 'cleanup after previous file test': 
+expecting success of 3070.551 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
+Removing deep/
 Removing expect
-ok 1861 - cleanup after previous file test
+ok 551 - cleanup after previous file test
 
-expecting success of 3070.1862 'setup match file test for a': 
+expecting success of 3070.552 'setup match file test for deep/foo/bar/baz/x': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -197440,83 +198970,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1862 - setup match file test for a
+ok 552 - setup match file test for deep/foo/bar/baz/x
 
-expecting success of 3070.1863 'wildmatch: match 'a' '[B-a]'': 
-			test-tool wildmatch wildmatch 'a' '[B-a]'
+expecting success of 3070.553 'wildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
+			test-tool wildmatch wildmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
 		
-ok 1863 - wildmatch: match 'a' '[B-a]'
+ok 553 - wildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
 
-expecting success of 3070.1864 'wildmatch (via ls-files): match '[B-a]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+expecting success of 3070.554 'wildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
+				printf '%s' 'deep/foo/bar/baz/x' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1864 - wildmatch (via ls-files): match '[B-a]' 'a'
+ok 554 - wildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
 
-expecting success of 3070.1865 'iwildmatch: match 'a' '[B-a]'': 
-			test-tool wildmatch iwildmatch 'a' '[B-a]'
+expecting success of 3070.555 'iwildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
+			test-tool wildmatch iwildmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
 		
-ok 1865 - iwildmatch: match 'a' '[B-a]'
+ok 555 - iwildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
 
-expecting success of 3070.1866 'iwildmatch (via ls-files): match '[B-a]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+expecting success of 3070.556 'iwildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
+				printf '%s' 'deep/foo/bar/baz/x' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1866 - iwildmatch (via ls-files): match '[B-a]' 'a'
+ok 556 - iwildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
 
-expecting success of 3070.1867 'pathmatch: match 'a' '[B-a]'': 
-			test-tool wildmatch pathmatch 'a' '[B-a]'
+expecting success of 3070.557 'pathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
 		
-ok 1867 - pathmatch: match 'a' '[B-a]'
+ok 557 - pathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
 
-expecting success of 3070.1868 'pathmatch (via ls-files): match '[B-a]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+expecting success of 3070.558 'pathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
+				printf '%s' 'deep/foo/bar/baz/x' >expect &&
+				git ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1868 - pathmatch (via ls-files): match '[B-a]' 'a'
+ok 558 - pathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
 
-expecting success of 3070.1869 'ipathmatch: match 'a' '[B-a]'': 
-			test-tool wildmatch ipathmatch 'a' '[B-a]'
+expecting success of 3070.559 'ipathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
 		
-ok 1869 - ipathmatch: match 'a' '[B-a]'
+ok 559 - ipathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
 
-expecting success of 3070.1870 'ipathmatch (via ls-files): match '[B-a]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+expecting success of 3070.560 'ipathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
+				printf '%s' 'deep/foo/bar/baz/x' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1870 - ipathmatch (via ls-files): match '[B-a]' 'a'
+ok 560 - ipathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
 
-expecting success of 3070.1871 'cleanup after previous file test': 
+expecting success of 3070.561 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
+Removing deep/
 Removing expect
-ok 1871 - cleanup after previous file test
+ok 561 - cleanup after previous file test
 
-expecting success of 3070.1872 'setup match file test for z': 
+expecting success of 3070.562 'setup match file test for acrt': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -197535,83 +199065,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1872 - setup match file test for z
+ok 562 - setup match file test for acrt
 
-expecting success of 3070.1873 'wildmatch: no match 'z' '[Z-y]'': 
-			test_must_fail test-tool wildmatch wildmatch 'z' '[Z-y]'
+expecting success of 3070.563 'wildmatch: no match 'acrt' 'a[c-c]st'': 
+			test_must_fail test-tool wildmatch wildmatch 'acrt' 'a[c-c]st'
 		
-ok 1873 - wildmatch: no match 'z' '[Z-y]'
+ok 563 - wildmatch: no match 'acrt' 'a[c-c]st'
 
-expecting success of 3070.1874 'wildmatch (via ls-files): no match '[Z-y]' 'z'': 
+expecting success of 3070.564 'wildmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1874 - wildmatch (via ls-files): no match '[Z-y]' 'z'
+ok 564 - wildmatch (via ls-files): no match 'a[c-c]st' 'acrt'
 
-expecting success of 3070.1875 'iwildmatch: match 'z' '[Z-y]'': 
-			test-tool wildmatch iwildmatch 'z' '[Z-y]'
+expecting success of 3070.565 'iwildmatch: no match 'acrt' 'a[c-c]st'': 
+			test_must_fail test-tool wildmatch iwildmatch 'acrt' 'a[c-c]st'
 		
-ok 1875 - iwildmatch: match 'z' '[Z-y]'
+ok 565 - iwildmatch: no match 'acrt' 'a[c-c]st'
 
-expecting success of 3070.1876 'iwildmatch (via ls-files): match '[Z-y]' 'z'': 
-				printf '%s' 'z' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+expecting success of 3070.566 'iwildmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1876 - iwildmatch (via ls-files): match '[Z-y]' 'z'
+ok 566 - iwildmatch (via ls-files): no match 'a[c-c]st' 'acrt'
 
-expecting success of 3070.1877 'pathmatch: no match 'z' '[Z-y]'': 
-			test_must_fail test-tool wildmatch pathmatch 'z' '[Z-y]'
+expecting success of 3070.567 'pathmatch: no match 'acrt' 'a[c-c]st'': 
+			test_must_fail test-tool wildmatch pathmatch 'acrt' 'a[c-c]st'
 		
-ok 1877 - pathmatch: no match 'z' '[Z-y]'
+ok 567 - pathmatch: no match 'acrt' 'a[c-c]st'
 
-expecting success of 3070.1878 'pathmatch (via ls-files): no match '[Z-y]' 'z'': 
+expecting success of 3070.568 'pathmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
 				>expect &&
-				git ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				git ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1878 - pathmatch (via ls-files): no match '[Z-y]' 'z'
+ok 568 - pathmatch (via ls-files): no match 'a[c-c]st' 'acrt'
 
-expecting success of 3070.1879 'ipathmatch: match 'z' '[Z-y]'': 
-			test-tool wildmatch ipathmatch 'z' '[Z-y]'
+expecting success of 3070.569 'ipathmatch: no match 'acrt' 'a[c-c]st'': 
+			test_must_fail test-tool wildmatch ipathmatch 'acrt' 'a[c-c]st'
 		
-ok 1879 - ipathmatch: match 'z' '[Z-y]'
+ok 569 - ipathmatch: no match 'acrt' 'a[c-c]st'
 
-expecting success of 3070.1880 'ipathmatch (via ls-files): match '[Z-y]' 'z'': 
-				printf '%s' 'z' >expect &&
-				git --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+expecting success of 3070.570 'ipathmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1880 - ipathmatch (via ls-files): match '[Z-y]' 'z'
+ok 570 - ipathmatch (via ls-files): no match 'a[c-c]st' 'acrt'
 
-expecting success of 3070.1881 'cleanup after previous file test': 
+expecting success of 3070.571 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
+Removing acrt
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing z
-ok 1881 - cleanup after previous file test
+ok 571 - cleanup after previous file test
 
-expecting success of 3070.1882 'setup match file test for Z': 
+expecting success of 3070.572 'setup match file test for acrt': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -197630,11268 +199160,12316 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1882 - setup match file test for Z
+ok 572 - setup match file test for acrt
 
-expecting success of 3070.1883 'wildmatch: match 'Z' '[Z-y]'': 
-			test-tool wildmatch wildmatch 'Z' '[Z-y]'
+expecting success of 3070.573 'wildmatch: match 'acrt' 'a[c-c]rt'': 
+			test-tool wildmatch wildmatch 'acrt' 'a[c-c]rt'
 		
-ok 1883 - wildmatch: match 'Z' '[Z-y]'
+ok 573 - wildmatch: match 'acrt' 'a[c-c]rt'
 
-expecting success of 3070.1884 'wildmatch (via ls-files): match '[Z-y]' 'Z'': 
-				printf '%s' 'Z' >expect &&
-				git --glob-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+expecting success of 3070.574 'wildmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
+				printf '%s' 'acrt' >expect &&
+				git --glob-pathspecs ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1884 - wildmatch (via ls-files): match '[Z-y]' 'Z'
+ok 574 - wildmatch (via ls-files): match 'a[c-c]rt' 'acrt'
 
-expecting success of 3070.1885 'iwildmatch: match 'Z' '[Z-y]'': 
-			test-tool wildmatch iwildmatch 'Z' '[Z-y]'
+expecting success of 3070.575 'iwildmatch: match 'acrt' 'a[c-c]rt'': 
+			test-tool wildmatch iwildmatch 'acrt' 'a[c-c]rt'
 		
-ok 1885 - iwildmatch: match 'Z' '[Z-y]'
+ok 575 - iwildmatch: match 'acrt' 'a[c-c]rt'
 
-expecting success of 3070.1886 'iwildmatch (via ls-files): match '[Z-y]' 'Z'': 
-				printf '%s' 'Z' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+expecting success of 3070.576 'iwildmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
+				printf '%s' 'acrt' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1886 - iwildmatch (via ls-files): match '[Z-y]' 'Z'
+ok 576 - iwildmatch (via ls-files): match 'a[c-c]rt' 'acrt'
 
-expecting success of 3070.1887 'pathmatch: match 'Z' '[Z-y]'': 
-			test-tool wildmatch pathmatch 'Z' '[Z-y]'
+expecting success of 3070.577 'pathmatch: match 'acrt' 'a[c-c]rt'': 
+			test-tool wildmatch pathmatch 'acrt' 'a[c-c]rt'
 		
-ok 1887 - pathmatch: match 'Z' '[Z-y]'
+ok 577 - pathmatch: match 'acrt' 'a[c-c]rt'
 
-expecting success of 3070.1888 'pathmatch (via ls-files): match '[Z-y]' 'Z'': 
-				printf '%s' 'Z' >expect &&
-				git ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+expecting success of 3070.578 'pathmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
+				printf '%s' 'acrt' >expect &&
+				git ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1888 - pathmatch (via ls-files): match '[Z-y]' 'Z'
+ok 578 - pathmatch (via ls-files): match 'a[c-c]rt' 'acrt'
 
-expecting success of 3070.1889 'ipathmatch: match 'Z' '[Z-y]'': 
-			test-tool wildmatch ipathmatch 'Z' '[Z-y]'
+expecting success of 3070.579 'ipathmatch: match 'acrt' 'a[c-c]rt'': 
+			test-tool wildmatch ipathmatch 'acrt' 'a[c-c]rt'
 		
-ok 1889 - ipathmatch: match 'Z' '[Z-y]'
+ok 579 - ipathmatch: match 'acrt' 'a[c-c]rt'
 
-expecting success of 3070.1890 'ipathmatch (via ls-files): match '[Z-y]' 'Z'': 
-				printf '%s' 'Z' >expect &&
-				git --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+expecting success of 3070.580 'ipathmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
+				printf '%s' 'acrt' >expect &&
+				git --icase-pathspecs ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1890 - ipathmatch (via ls-files): match '[Z-y]' 'Z'
+ok 580 - ipathmatch (via ls-files): match 'a[c-c]rt' 'acrt'
 
-expecting success of 3070.1891 'matching does not exhibit exponential behavior': 
-	{
-		test-tool wildmatch wildmatch \
-			aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab \
-			"*a*a*a*a*a*a*a*a*a*a*a*a*a*a*a*a" &
-		pid=$!
-	} &&
-	sleep 2 &&
-	! kill $!
+expecting success of 3070.581 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing acrt
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 581 - cleanup after previous file test
 
-t3070-wildmatch.sh: 11: kill: No such process
+expecting success of 3070.582 'setup match file test for ]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 582 - setup match file test for ]
 
-ok 1891 - matching does not exhibit exponential behavior
+expecting success of 3070.583 'wildmatch: no match ']' '[!]-]'': 
+			test_must_fail test-tool wildmatch wildmatch ']' '[!]-]'
+		
+ok 583 - wildmatch: no match ']' '[!]-]'
 
-# still have 40 known breakage(s)
-# passed all remaining 1851 test(s)
-1..1891
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3514-cherry-pick-revert-gpg.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3514-cherry-pick-revert-gpg/.git/
-checking prerequisite: GPG
+expecting success of 3070.584 'wildmatch (via ls-files): no match '[!]-]' ']'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 584 - wildmatch (via ls-files): no match '[!]-]' ']'
 
-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 3070.585 'iwildmatch: no match ']' '[!]-]'': 
+			test_must_fail test-tool wildmatch iwildmatch ']' '[!]-]'
+		
+ok 585 - iwildmatch: no match ']' '[!]-]'
 
-	# 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
+expecting success of 3070.586 'iwildmatch (via ls-files): no match '[!]-]' ']'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 586 - iwildmatch (via ls-files): no match '[!]-]' ']'
 
-)
-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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3508-cherry-pick-many-commits.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3508-cherry-pick-many-commits/.git/
-expecting success of 3508.1 'setup': 
-	echo first > file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m "first" &&
-	git tag first &&
+expecting success of 3070.587 'pathmatch: no match ']' '[!]-]'': 
+			test_must_fail test-tool wildmatch pathmatch ']' '[!]-]'
+		
+ok 587 - pathmatch: no match ']' '[!]-]'
 
-	git checkout -b other &&
-	for val in second third fourth
-	do
-		echo $val >> file1 &&
-		git add file1 &&
-		test_tick &&
-		git commit -m "$val" &&
-		git tag $val || return 1
-	done
+expecting success of 3070.588 'pathmatch (via ls-files): no match '[!]-]' ']'': 
+				>expect &&
+				git ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 588 - pathmatch (via ls-files): no match '[!]-]' ']'
 
-[main (root-commit) 0c72e4f] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Switched to a new branch 'other'
-[other 453a047] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[other e85abe2] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[other 94d3184] fourth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
+expecting success of 3070.589 'ipathmatch: no match ']' '[!]-]'': 
+			test_must_fail test-tool wildmatch ipathmatch ']' '[!]-]'
+		
+ok 589 - ipathmatch: no match ']' '[!]-]'
 
-expecting success of 3508.2 'cherry-pick first..fourth works': 
-	git checkout -f main &&
-	git reset --hard first &&
-	test_tick &&
-	git cherry-pick first..fourth &&
-	git diff --quiet other &&
-	git diff --quiet HEAD other &&
-	check_head_differs_from fourth
+expecting success of 3070.590 'ipathmatch (via ls-files): no match '[!]-]' ']'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 590 - ipathmatch (via ls-files): no match '[!]-]' ']'
 
-Switched to branch 'main'
-HEAD is now at 0c72e4f first
-[main 9589776] second
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-[main 7ef563c] third
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
-[main 105ac0a] fourth
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 2 - cherry-pick first..fourth works
+expecting success of 3070.591 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 591 - cleanup after previous file test
 
-expecting success of 3508.3 'cherry-pick three one two works': 
-	git checkout -f first &&
-	test_commit one &&
-	test_commit two &&
-	test_commit three &&
-	git checkout -f main &&
-	git reset --hard first &&
-	git cherry-pick three one two &&
-	git diff --quiet three &&
-	git diff --quiet HEAD three &&
-	test "$(git log --reverse --format=%s first..)" = "three
-one
-two"
+expecting success of 3070.592 'setup match file test for a': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 592 - setup match file test for a
 
-Note: switching to 'first'.
+expecting success of 3070.593 'wildmatch: match 'a' '[!]-]'': 
+			test-tool wildmatch wildmatch 'a' '[!]-]'
+		
+ok 593 - wildmatch: match '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.
+expecting success of 3070.594 'wildmatch (via ls-files): match '[!]-]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 594 - wildmatch (via ls-files): match '[!]-]' 'a'
 
-If you want to 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 3070.595 'iwildmatch: match 'a' '[!]-]'': 
+			test-tool wildmatch iwildmatch 'a' '[!]-]'
+		
+ok 595 - iwildmatch: match 'a' '[!]-]'
 
-  git switch -c <new-branch-name>
+expecting success of 3070.596 'iwildmatch (via ls-files): match '[!]-]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 596 - iwildmatch (via ls-files): match '[!]-]' 'a'
 
-Or undo this operation with:
+expecting success of 3070.597 'pathmatch: match 'a' '[!]-]'': 
+			test-tool wildmatch pathmatch 'a' '[!]-]'
+		
+ok 597 - pathmatch: match 'a' '[!]-]'
 
-  git switch -
+expecting success of 3070.598 'pathmatch (via ls-files): match '[!]-]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 598 - pathmatch (via ls-files): match '[!]-]' 'a'
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3070.599 'ipathmatch: match 'a' '[!]-]'': 
+			test-tool wildmatch ipathmatch 'a' '[!]-]'
+		
+ok 599 - ipathmatch: match 'a' '[!]-]'
 
-HEAD is now at 0c72e4f first
-[detached HEAD 08ada56] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[detached HEAD 556e4fe] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[detached HEAD a4e9322] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Previous HEAD position was a4e9322 three
-Switched to branch 'main'
-HEAD is now at 0c72e4f first
-[main 124d016] three
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:20:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[main 6e6e64d] one
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 54c7896] two
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 3 - cherry-pick three one two works
+expecting success of 3070.600 'ipathmatch (via ls-files): match '[!]-]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 600 - ipathmatch (via ls-files): match '[!]-]' 'a'
 
-expecting success of 3508.4 'cherry-pick three one two: fails': 
-	git checkout -f main &&
-	git reset --hard first &&
-	test_must_fail git cherry-pick three one two:
+expecting success of 3070.601 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 601 - cleanup after previous file test
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-error: two:: can't cherry-pick a tree
-fatal: cherry-pick failed
-ok 4 - cherry-pick three one two: fails
+expecting success of 3070.602 'setup match file test for ': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 602 - setup match file test for 
 
-expecting success of 3508.5 'output to keep user entertained during multi-pick': 
-	cat <<-\EOF >expected &&
-	[main OBJID] second
-	 Author: A U Thor <author@example.com>
-	 Date: Thu Apr 7 15:14:13 2005 -0700
-	 1 file changed, 1 insertion(+)
-	[main OBJID] third
-	 Author: A U Thor <author@example.com>
-	 Date: Thu Apr 7 15:15:13 2005 -0700
-	 1 file changed, 1 insertion(+)
-	[main OBJID] fourth
-	 Author: A U Thor <author@example.com>
-	 Date: Thu Apr 7 15:16:13 2005 -0700
-	 1 file changed, 1 insertion(+)
-	EOF
+expecting success of 3070.603 'wildmatch: no match '' '\'': 
+			test_must_fail test-tool wildmatch wildmatch '' '\'
+		
+ok 603 - wildmatch: no match '' '\'
 
-	git checkout -f main &&
-	git reset --hard first &&
-	test_tick &&
-	git cherry-pick first..fourth >actual &&
-	sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
-	test_line_count -ge 3 actual.fuzzy &&
-	test_cmp expected actual.fuzzy
+checking known breakage of 3070.604 'wildmatch (via ls-files): no match skip '\' ''': false
+not ok 604 - wildmatch (via ls-files): no match skip '\' '' # TODO known breakage
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-ok 5 - output to keep user entertained during multi-pick
+expecting success of 3070.605 'iwildmatch: no match '' '\'': 
+			test_must_fail test-tool wildmatch iwildmatch '' '\'
+		
+ok 605 - iwildmatch: no match '' '\'
 
-expecting success of 3508.6 'cherry-pick --strategy resolve first..fourth works': 
-	git checkout -f main &&
-	git reset --hard first &&
-	test_tick &&
-	git cherry-pick --strategy resolve first..fourth &&
-	git diff --quiet other &&
-	git diff --quiet HEAD other &&
-	check_head_differs_from fourth
+checking known breakage of 3070.606 'iwildmatch (via ls-files): no match skip '\' ''': false
+not ok 606 - iwildmatch (via ls-files): no match skip '\' '' # TODO known breakage
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-Trying simple merge.
-[main 48c207c] second
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-Trying simple merge.
-[main 9dcf789] third
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
-Trying simple merge.
-[main 1f7167d] fourth
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 6 - cherry-pick --strategy resolve first..fourth works
+expecting success of 3070.607 'pathmatch: no match '' '\'': 
+			test_must_fail test-tool wildmatch pathmatch '' '\'
+		
+ok 607 - pathmatch: no match '' '\'
 
-expecting success of 3508.7 'output during multi-pick indicates merge strategy': 
-	cat <<-\EOF >expected &&
-	Trying simple merge.
-	[main OBJID] second
-	 Author: A U Thor <author@example.com>
-	 Date: Thu Apr 7 15:14:13 2005 -0700
-	 1 file changed, 1 insertion(+)
-	Trying simple merge.
-	[main OBJID] third
-	 Author: A U Thor <author@example.com>
-	 Date: Thu Apr 7 15:15:13 2005 -0700
-	 1 file changed, 1 insertion(+)
-	Trying simple merge.
-	[main OBJID] fourth
-	 Author: A U Thor <author@example.com>
-	 Date: Thu Apr 7 15:16:13 2005 -0700
-	 1 file changed, 1 insertion(+)
-	EOF
+checking known breakage of 3070.608 'pathmatch (via ls-files): no match skip '\' ''': false
+not ok 608 - pathmatch (via ls-files): no match skip '\' '' # TODO known breakage
 
-	git checkout -f main &&
-	git reset --hard first &&
-	test_tick &&
-	git cherry-pick --strategy resolve first..fourth >actual &&
-	sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
-	test_cmp expected actual.fuzzy
+expecting success of 3070.609 'ipathmatch: no match '' '\'': 
+			test_must_fail test-tool wildmatch ipathmatch '' '\'
+		
+ok 609 - ipathmatch: no match '' '\'
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-ok 7 - output during multi-pick indicates merge strategy
+checking known breakage of 3070.610 'ipathmatch (via ls-files): no match skip '\' ''': false
+not ok 610 - ipathmatch (via ls-files): no match skip '\' '' # TODO known breakage
 
-expecting success of 3508.8 'cherry-pick --ff first..fourth works': 
-	git checkout -f main &&
-	git reset --hard first &&
-	test_tick &&
-	git cherry-pick --ff first..fourth &&
-	git diff --quiet other &&
-	git diff --quiet HEAD other &&
-	check_head_equals fourth
+expecting success of 3070.611 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 611 - cleanup after previous file test
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-ok 8 - cherry-pick --ff first..fourth works
+expecting success of 3070.612 'setup match file test for \': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 612 - setup match file test for \
 
-expecting success of 3508.9 'cherry-pick -n first..fourth works': 
-	git checkout -f main &&
-	git reset --hard first &&
-	test_tick &&
-	git cherry-pick -n first..fourth &&
-	git diff --quiet other &&
-	git diff --cached --quiet other &&
-	git diff --quiet HEAD first
+expecting success of 3070.613 'wildmatch: no match '\' '\'': 
+			test_must_fail test-tool wildmatch wildmatch '\' '\'
+		
+ok 613 - wildmatch: no match '\' '\'
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-ok 9 - cherry-pick -n first..fourth works
+expecting success of 3070.614 'wildmatch (via ls-files): match '\' '\'': 
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs ls-files -z -- '\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 614 - wildmatch (via ls-files): match '\' '\'
 
-expecting success of 3508.10 'revert first..fourth works': 
-	git checkout -f main &&
-	git reset --hard fourth &&
-	test_tick &&
-	git revert first..fourth &&
-	git diff --quiet first &&
-	git diff --cached --quiet first &&
-	git diff --quiet HEAD first
+expecting success of 3070.615 'iwildmatch: no match '\' '\'': 
+			test_must_fail test-tool wildmatch iwildmatch '\' '\'
+		
+ok 615 - iwildmatch: no match '\' '\'
 
-Already on 'main'
-HEAD is now at 94d3184 fourth
-[main 9fd86ee] Revert "fourth"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:26:13 2005 -0700
- 1 file changed, 1 deletion(-)
-[main bcb892c] Revert "third"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:26:13 2005 -0700
- 1 file changed, 1 deletion(-)
-[main 6e2dda4] Revert "second"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:26:13 2005 -0700
- 1 file changed, 1 deletion(-)
-ok 10 - revert first..fourth works
+expecting success of 3070.616 'iwildmatch (via ls-files): match '\' '\'': 
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 616 - iwildmatch (via ls-files): match '\' '\'
 
-expecting success of 3508.11 'revert ^first fourth works': 
-	git checkout -f main &&
-	git reset --hard fourth &&
-	test_tick &&
-	git revert ^first fourth &&
-	git diff --quiet first &&
-	git diff --cached --quiet first &&
-	git diff --quiet HEAD first
+expecting success of 3070.617 'pathmatch: no match '\' '\'': 
+			test_must_fail test-tool wildmatch pathmatch '\' '\'
+		
+ok 617 - pathmatch: no match '\' '\'
 
-Already on 'main'
-HEAD is now at 94d3184 fourth
-[main e6761b3] Revert "fourth"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:27:13 2005 -0700
- 1 file changed, 1 deletion(-)
-[main 4940ca7] Revert "third"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:27:13 2005 -0700
- 1 file changed, 1 deletion(-)
-[main e06156e] Revert "second"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:27:13 2005 -0700
- 1 file changed, 1 deletion(-)
-ok 11 - revert ^first fourth works
+expecting success of 3070.618 'pathmatch (via ls-files): match '\' '\'': 
+				printf '%s' '\' >expect &&
+				git ls-files -z -- '\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 618 - pathmatch (via ls-files): match '\' '\'
 
-expecting success of 3508.12 'revert fourth fourth~1 fourth~2 works': 
-	git checkout -f main &&
-	git reset --hard fourth &&
-	test_tick &&
-	git revert fourth fourth~1 fourth~2 &&
-	git diff --quiet first &&
-	git diff --cached --quiet first &&
-	git diff --quiet HEAD first
+expecting success of 3070.619 'ipathmatch: no match '\' '\'': 
+			test_must_fail test-tool wildmatch ipathmatch '\' '\'
+		
+ok 619 - ipathmatch: no match '\' '\'
 
-Already on 'main'
-HEAD is now at 94d3184 fourth
-[main 8d9417a] Revert "fourth"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:28:13 2005 -0700
- 1 file changed, 1 deletion(-)
-[main 210e986] Revert "third"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:28:13 2005 -0700
- 1 file changed, 1 deletion(-)
-[main f77c534] Revert "second"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:28:13 2005 -0700
- 1 file changed, 1 deletion(-)
-ok 12 - revert fourth fourth~1 fourth~2 works
+expecting success of 3070.620 'ipathmatch (via ls-files): match '\' '\'': 
+				printf '%s' '\' >expect &&
+				git --icase-pathspecs ls-files -z -- '\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 620 - ipathmatch (via ls-files): match '\' '\'
 
-expecting success of 3508.13 'cherry-pick -3 fourth works': 
-	git checkout -f main &&
-	git reset --hard first &&
-	test_tick &&
-	git cherry-pick -3 fourth &&
-	git diff --quiet other &&
-	git diff --quiet HEAD other &&
-	check_head_differs_from fourth
+expecting success of 3070.621 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 621 - cleanup after previous file test
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-[main 0b92961] second
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-[main e4ba54b] third
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
-[main bb3aa41] fourth
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 13 - cherry-pick -3 fourth works
+expecting success of 3070.622 'setup match file test for XXX/\': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 622 - setup match file test for XXX/\
 
-expecting success of 3508.14 'cherry-pick --stdin works': 
-	git checkout -f main &&
-	git reset --hard first &&
-	test_tick &&
-	git rev-list --reverse first..fourth | git cherry-pick --stdin &&
-	git diff --quiet other &&
-	git diff --quiet HEAD other &&
-	check_head_differs_from fourth
+expecting success of 3070.623 'wildmatch: no match 'XXX/\' '*/\'': 
+			test_must_fail test-tool wildmatch wildmatch 'XXX/\' '*/\'
+		
+ok 623 - wildmatch: no match 'XXX/\' '*/\'
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-[main 026fdf1] second
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-[main 56d3171] third
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
-[main 2cef6d1] fourth
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 14 - cherry-pick --stdin works
+expecting success of 3070.624 'wildmatch (via ls-files): no match '*/\' 'XXX/\'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*/\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 624 - wildmatch (via ls-files): no match '*/\' 'XXX/\'
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3601-rm-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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" &&
+expecting success of 3070.625 'iwildmatch: no match 'XXX/\' '*/\'': 
+			test_must_fail test-tool wildmatch iwildmatch 'XXX/\' '*/\'
+		
+ok 625 - iwildmatch: no match 'XXX/\' '*/\'
 
-	git tag checkpoint
+expecting success of 3070.626 'iwildmatch (via ls-files): no match '*/\' 'XXX/\'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 626 - iwildmatch (via ls-files): no match '*/\' 'XXX/\'
 
-[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 3070.627 'pathmatch: no match 'XXX/\' '*/\'': 
+			test_must_fail test-tool wildmatch pathmatch 'XXX/\' '*/\'
+		
+ok 627 - pathmatch: no match 'XXX/\' '*/\'
 
-expecting success of 3601.2 'simplest': 
-	restore_checkpoint &&
+expecting success of 3070.628 'pathmatch (via ls-files): no match '*/\' 'XXX/\'': 
+				>expect &&
+				git ls-files -z -- '*/\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 628 - pathmatch (via ls-files): no match '*/\' 'XXX/\'
 
-	cat >expect <<-\EOF &&
-	D  fileA.t
-	EOF
+expecting success of 3070.629 'ipathmatch: no match 'XXX/\' '*/\'': 
+			test_must_fail test-tool wildmatch ipathmatch 'XXX/\' '*/\'
+		
+ok 629 - ipathmatch: no match 'XXX/\' '*/\'
 
-	echo fileA.t | git rm --pathspec-from-file=- &&
-	verify_expect
+expecting success of 3070.630 'ipathmatch (via ls-files): no match '*/\' 'XXX/\'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '*/\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 630 - ipathmatch (via ls-files): no match '*/\' 'XXX/\'
 
-HEAD is now at d32ab08 files
-rm 'fileA.t'
-ok 2 - simplest
+expecting success of 3070.631 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing XXX/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 631 - cleanup after previous file test
 
-expecting success of 3601.3 '--pathspec-file-nul': 
-	restore_checkpoint &&
+expecting success of 3070.632 'setup match file test for XXX/\': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 632 - setup match file test for XXX/\
 
-	cat >expect <<-\EOF &&
-	D  fileA.t
-	D  fileB.t
-	EOF
+expecting success of 3070.633 'wildmatch: match 'XXX/\' '*/\\'': 
+			test-tool wildmatch wildmatch 'XXX/\' '*/\\'
+		
+ok 633 - wildmatch: match 'XXX/\' '*/\\'
 
-	printf "fileA.t\0fileB.t\0" | git rm --pathspec-from-file=- --pathspec-file-nul &&
-	verify_expect
+expecting success of 3070.634 'wildmatch (via ls-files): match '*/\\' 'XXX/\'': 
+				printf '%s' 'XXX/\' >expect &&
+				git --glob-pathspecs ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 634 - wildmatch (via ls-files): match '*/\\' 'XXX/\'
 
-HEAD is now at d32ab08 files
-rm 'fileA.t'
-rm 'fileB.t'
-ok 3 - --pathspec-file-nul
+expecting success of 3070.635 'iwildmatch: match 'XXX/\' '*/\\'': 
+			test-tool wildmatch iwildmatch 'XXX/\' '*/\\'
+		
+ok 635 - iwildmatch: match 'XXX/\' '*/\\'
 
-expecting success of 3601.4 'only touches what was listed': 
-	restore_checkpoint &&
+expecting success of 3070.636 'iwildmatch (via ls-files): match '*/\\' 'XXX/\'': 
+				printf '%s' 'XXX/\' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 636 - iwildmatch (via ls-files): match '*/\\' 'XXX/\'
 
-	cat >expect <<-\EOF &&
-	D  fileB.t
-	D  fileC.t
-	EOF
+expecting success of 3070.637 'pathmatch: match 'XXX/\' '*/\\'': 
+			test-tool wildmatch pathmatch 'XXX/\' '*/\\'
+		
+ok 637 - pathmatch: match 'XXX/\' '*/\\'
 
-	printf "fileB.t\nfileC.t\n" | git rm --pathspec-from-file=- &&
-	verify_expect
+expecting success of 3070.638 'pathmatch (via ls-files): match '*/\\' 'XXX/\'': 
+				printf '%s' 'XXX/\' >expect &&
+				git ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 638 - pathmatch (via ls-files): match '*/\\' 'XXX/\'
 
-HEAD is now at d32ab08 files
-rm 'fileB.t'
-rm 'fileC.t'
-ok 4 - only touches what was listed
+expecting success of 3070.639 'ipathmatch: match 'XXX/\' '*/\\'': 
+			test-tool wildmatch ipathmatch 'XXX/\' '*/\\'
+		
+ok 639 - ipathmatch: match 'XXX/\' '*/\\'
 
-expecting success of 3601.5 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
+expecting success of 3070.640 'ipathmatch (via ls-files): match '*/\\' 'XXX/\'': 
+				printf '%s' 'XXX/\' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 640 - ipathmatch (via ls-files): match '*/\\' 'XXX/\'
 
-	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 3070.641 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing XXX/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 641 - cleanup after previous file test
 
-	test_must_fail git rm --pathspec-file-nul 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+expecting success of 3070.642 'setup match file test for foo': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 642 - setup match file test for foo
 
-	>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 3070.643 'wildmatch: match 'foo' 'foo'': 
+			test-tool wildmatch wildmatch 'foo' 'foo'
+		
+ok 643 - wildmatch: match 'foo' 'foo'
 
-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
+expecting success of 3070.644 'wildmatch (via ls-files): match 'foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 644 - wildmatch (via ls-files): match 'foo' 'foo'
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3511-cherry-pick-x.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3511-cherry-pick-x/.git/
-expecting success of 3511.1 'setup': 
-	git config set advice.detachedhead false &&
-	echo unrelated >unrelated &&
-	git add unrelated &&
-	test_commit initial foo a &&
-	test_commit "$mesg_one_line" foo b mesg-one-line &&
-	git reset --hard initial &&
-	test_commit "$mesg_no_footer" foo b mesg-no-footer &&
-	git reset --hard initial &&
-	test_commit "$mesg_broken_footer" foo b mesg-broken-footer &&
-	git reset --hard initial &&
-	test_commit "$mesg_with_footer" foo b mesg-with-footer &&
-	git reset --hard initial &&
-	test_commit "$mesg_with_footer_sob" foo b mesg-with-footer-sob &&
-	git reset --hard initial &&
-	test_commit "$mesg_with_cherry_footer" foo b mesg-with-cherry-footer &&
-	git reset --hard initial &&
-	test_config commit.cleanup verbatim &&
-	test_commit "$mesg_unclean" foo b mesg-unclean &&
-	test_unconfig commit.cleanup &&
-	pristine_detach initial &&
-	test_commit conflicting unrelated
+expecting success of 3070.645 'iwildmatch: match 'foo' 'foo'': 
+			test-tool wildmatch iwildmatch 'foo' 'foo'
+		
+ok 645 - iwildmatch: match 'foo' 'foo'
 
-[master (root-commit) df2a63d] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 foo
- create mode 100644 unrelated
-[master d18d4f3] base: commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at df2a63d initial
-[master e073909] base: commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at df2a63d initial
-[master 0353e8f] base: commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at df2a63d initial
-[master 3838485] base: commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at df2a63d initial
-[master d60edf0] base: commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at df2a63d initial
-[master d7a875c] base: commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at df2a63d initial
-[master 860e94a] base: commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at df2a63d initial
-[detached HEAD 823a98f] conflicting
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+expecting success of 3070.646 'iwildmatch (via ls-files): match 'foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 646 - iwildmatch (via ls-files): match 'foo' 'foo'
 
-expecting success of 3511.2 'cherry-pick -x inserts blank line after one line subject': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-one-line^0) &&
-	git cherry-pick -x mesg-one-line &&
-	cat <<-EOF >expect &&
-		$mesg_one_line
+expecting success of 3070.647 'pathmatch: match 'foo' 'foo'': 
+			test-tool wildmatch pathmatch 'foo' 'foo'
+		
+ok 647 - pathmatch: match 'foo' 'foo'
 
-		(cherry picked from commit $sha1)
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.648 'pathmatch (via ls-files): match 'foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git ls-files -z -- 'foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 648 - pathmatch (via ls-files): match 'foo' 'foo'
 
-Previous HEAD position was 823a98f conflicting
-HEAD is now at df2a63d initial
-[detached HEAD 6970a53] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - cherry-pick -x inserts blank line after one line subject
+expecting success of 3070.649 'ipathmatch: match 'foo' 'foo'': 
+			test-tool wildmatch ipathmatch 'foo' 'foo'
+		
+ok 649 - ipathmatch: match 'foo' 'foo'
 
-expecting success of 3511.3 'cherry-pick -s inserts blank line after one line subject': 
-	pristine_detach initial &&
-	git cherry-pick -s mesg-one-line &&
-	cat <<-EOF >expect &&
-		$mesg_one_line
+expecting success of 3070.650 'ipathmatch (via ls-files): match 'foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 650 - ipathmatch (via ls-files): match 'foo' 'foo'
 
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.651 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo
+ok 651 - cleanup after previous file test
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.652 'setup match file test for @foo': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 652 - setup match file test for @foo
 
-  6970a53 base: commit message
+expecting success of 3070.653 'wildmatch: match '@foo' '@foo'': 
+			test-tool wildmatch wildmatch '@foo' '@foo'
+		
+ok 653 - wildmatch: match '@foo' '@foo'
 
-HEAD is now at df2a63d initial
-[detached HEAD 0fda2e1] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - cherry-pick -s inserts blank line after one line subject
+expecting success of 3070.654 'wildmatch (via ls-files): match '@foo' '@foo'': 
+				printf '%s' '@foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 654 - wildmatch (via ls-files): match '@foo' '@foo'
 
-expecting success of 3511.4 'cherry-pick -s inserts blank line after non-conforming footer': 
-	pristine_detach initial &&
-	git cherry-pick -s mesg-broken-footer &&
-	cat <<-EOF >expect &&
-		$mesg_broken_footer
+expecting success of 3070.655 'iwildmatch: match '@foo' '@foo'': 
+			test-tool wildmatch iwildmatch '@foo' '@foo'
+		
+ok 655 - iwildmatch: match '@foo' '@foo'
 
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.656 'iwildmatch (via ls-files): match '@foo' '@foo'': 
+				printf '%s' '@foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 656 - iwildmatch (via ls-files): match '@foo' '@foo'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.657 'pathmatch: match '@foo' '@foo'': 
+			test-tool wildmatch pathmatch '@foo' '@foo'
+		
+ok 657 - pathmatch: match '@foo' '@foo'
 
-  0fda2e1 base: commit message
+expecting success of 3070.658 'pathmatch (via ls-files): match '@foo' '@foo'': 
+				printf '%s' '@foo' >expect &&
+				git ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 658 - pathmatch (via ls-files): match '@foo' '@foo'
 
-HEAD is now at df2a63d initial
-[detached HEAD 0cf5261] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - cherry-pick -s inserts blank line after non-conforming footer
+expecting success of 3070.659 'ipathmatch: match '@foo' '@foo'': 
+			test-tool wildmatch ipathmatch '@foo' '@foo'
+		
+ok 659 - ipathmatch: match '@foo' '@foo'
 
-expecting success of 3511.5 'cherry-pick -s recognizes trailer config': 
-	pristine_detach initial &&
-	git -c "trailer.Myfooter.ifexists=add" cherry-pick -s mesg-broken-footer &&
-	cat <<-EOF >expect &&
-		$mesg_broken_footer
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.660 'ipathmatch (via ls-files): match '@foo' '@foo'': 
+				printf '%s' '@foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 660 - ipathmatch (via ls-files): match '@foo' '@foo'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.661 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing @foo
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 661 - cleanup after previous file test
 
-  0cf5261 base: commit message
+expecting success of 3070.662 'setup match file test for foo': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 662 - setup match file test for foo
 
-HEAD is now at df2a63d initial
-[detached HEAD b95a0f7] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - cherry-pick -s recognizes trailer config
+expecting success of 3070.663 'wildmatch: no match 'foo' '@foo'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo' '@foo'
+		
+ok 663 - wildmatch: no match 'foo' '@foo'
 
-expecting success of 3511.6 'cherry-pick -x inserts blank line when conforming footer not found': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-no-footer^0) &&
-	git cherry-pick -x mesg-no-footer &&
-	cat <<-EOF >expect &&
-		$mesg_no_footer
+expecting success of 3070.664 'wildmatch (via ls-files): no match '@foo' 'foo'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 664 - wildmatch (via ls-files): no match '@foo' 'foo'
 
-		(cherry picked from commit $sha1)
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.665 'iwildmatch: no match 'foo' '@foo'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo' '@foo'
+		
+ok 665 - iwildmatch: no match 'foo' '@foo'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.666 'iwildmatch (via ls-files): no match '@foo' 'foo'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 666 - iwildmatch (via ls-files): no match '@foo' 'foo'
 
-  b95a0f7 base: commit message
+expecting success of 3070.667 'pathmatch: no match 'foo' '@foo'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' '@foo'
+		
+ok 667 - pathmatch: no match 'foo' '@foo'
 
-HEAD is now at df2a63d initial
-[detached HEAD 6f42e54] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - cherry-pick -x inserts blank line when conforming footer not found
+expecting success of 3070.668 'pathmatch (via ls-files): no match '@foo' 'foo'': 
+				>expect &&
+				git ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 668 - pathmatch (via ls-files): no match '@foo' 'foo'
 
-expecting success of 3511.7 'cherry-pick -s inserts blank line when conforming footer not found': 
-	pristine_detach initial &&
-	git cherry-pick -s mesg-no-footer &&
-	cat <<-EOF >expect &&
-		$mesg_no_footer
+expecting success of 3070.669 'ipathmatch: no match 'foo' '@foo'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '@foo'
+		
+ok 669 - ipathmatch: no match 'foo' '@foo'
 
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.670 'ipathmatch (via ls-files): no match '@foo' 'foo'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 670 - ipathmatch (via ls-files): no match '@foo' 'foo'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.671 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo
+ok 671 - cleanup after previous file test
 
-  6f42e54 base: commit message
+expecting success of 3070.672 'setup match file test for [ab]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 672 - setup match file test for [ab]
 
-HEAD is now at df2a63d initial
-[detached HEAD 32d2dda] base: commit message
- 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 - cherry-pick -s inserts blank line when conforming footer not found
+expecting success of 3070.673 'wildmatch: match '[ab]' '\[ab]'': 
+			test-tool wildmatch wildmatch '[ab]' '\[ab]'
+		
+ok 673 - wildmatch: match '[ab]' '\[ab]'
 
-expecting success of 3511.8 'cherry-pick -x -s inserts blank line when conforming footer not found': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-no-footer^0) &&
-	git cherry-pick -x -s mesg-no-footer &&
-	cat <<-EOF >expect &&
-		$mesg_no_footer
+expecting success of 3070.674 'wildmatch (via ls-files): match '\[ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 674 - wildmatch (via ls-files): match '\[ab]' '[ab]'
 
-		(cherry picked from commit $sha1)
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.675 'iwildmatch: match '[ab]' '\[ab]'': 
+			test-tool wildmatch iwildmatch '[ab]' '\[ab]'
+		
+ok 675 - iwildmatch: match '[ab]' '\[ab]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  32d2dda base: commit message
-
-HEAD is now at df2a63d initial
-[detached HEAD adaaef8] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 8 - cherry-pick -x -s inserts blank line when conforming footer not found
-
-expecting success of 3511.9 'cherry-pick -s adds sob when last sob doesnt match committer': 
-	pristine_detach initial &&
-	git cherry-pick -s mesg-with-footer &&
-	cat <<-EOF >expect &&
-		$mesg_with_footer
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.676 'iwildmatch (via ls-files): match '\[ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 676 - iwildmatch (via ls-files): match '\[ab]' '[ab]'
 
-  adaaef8 base: commit message
+expecting success of 3070.677 'pathmatch: match '[ab]' '\[ab]'': 
+			test-tool wildmatch pathmatch '[ab]' '\[ab]'
+		
+ok 677 - pathmatch: match '[ab]' '\[ab]'
 
-HEAD is now at df2a63d initial
-[detached HEAD b62bd75] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 9 - cherry-pick -s adds sob when last sob doesnt match committer
+expecting success of 3070.678 'pathmatch (via ls-files): match '\[ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 678 - pathmatch (via ls-files): match '\[ab]' '[ab]'
 
-expecting success of 3511.10 'cherry-pick -x -s adds sob when last sob doesnt match committer': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-with-footer^0) &&
-	git cherry-pick -x -s mesg-with-footer &&
-	cat <<-EOF >expect &&
-		$mesg_with_footer
-		(cherry picked from commit $sha1)
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.679 'ipathmatch: match '[ab]' '\[ab]'': 
+			test-tool wildmatch ipathmatch '[ab]' '\[ab]'
+		
+ok 679 - ipathmatch: match '[ab]' '\[ab]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.680 'ipathmatch (via ls-files): match '\[ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --icase-pathspecs ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 680 - ipathmatch (via ls-files): match '\[ab]' '[ab]'
 
-  b62bd75 base: commit message
+expecting success of 3070.681 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [ab]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 681 - cleanup after previous file test
 
-HEAD is now at df2a63d initial
-[detached HEAD 94e740a] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 10 - cherry-pick -x -s adds sob when last sob doesnt match committer
+expecting success of 3070.682 'setup match file test for [ab]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 682 - setup match file test for [ab]
 
-expecting success of 3511.11 'cherry-pick -s refrains from adding duplicate trailing sob': 
-	pristine_detach initial &&
-	git cherry-pick -s mesg-with-footer-sob &&
-	cat <<-EOF >expect &&
-		$mesg_with_footer_sob
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.683 'wildmatch: match '[ab]' '[[]ab]'': 
+			test-tool wildmatch wildmatch '[ab]' '[[]ab]'
+		
+ok 683 - wildmatch: match '[ab]' '[[]ab]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.684 'wildmatch (via ls-files): match '[[]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 684 - wildmatch (via ls-files): match '[[]ab]' '[ab]'
 
-  94e740a base: commit message
+expecting success of 3070.685 'iwildmatch: match '[ab]' '[[]ab]'': 
+			test-tool wildmatch iwildmatch '[ab]' '[[]ab]'
+		
+ok 685 - iwildmatch: match '[ab]' '[[]ab]'
 
-HEAD is now at df2a63d initial
-[detached HEAD a836c16] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 11 - cherry-pick -s refrains from adding duplicate trailing sob
+expecting success of 3070.686 'iwildmatch (via ls-files): match '[[]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 686 - iwildmatch (via ls-files): match '[[]ab]' '[ab]'
 
-expecting success of 3511.12 'cherry-pick -x -s adds sob even when trailing sob exists for committer': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-with-footer-sob^0) &&
-	git cherry-pick -x -s mesg-with-footer-sob &&
-	cat <<-EOF >expect &&
-		$mesg_with_footer_sob
-		(cherry picked from commit $sha1)
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.687 'pathmatch: match '[ab]' '[[]ab]'': 
+			test-tool wildmatch pathmatch '[ab]' '[[]ab]'
+		
+ok 687 - pathmatch: match '[ab]' '[[]ab]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.688 'pathmatch (via ls-files): match '[[]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 688 - pathmatch (via ls-files): match '[[]ab]' '[ab]'
 
-  a836c16 base: commit message
+expecting success of 3070.689 'ipathmatch: match '[ab]' '[[]ab]'': 
+			test-tool wildmatch ipathmatch '[ab]' '[[]ab]'
+		
+ok 689 - ipathmatch: match '[ab]' '[[]ab]'
 
-HEAD is now at df2a63d initial
-[detached HEAD 2d6e386] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 12 - cherry-pick -x -s adds sob even when trailing sob exists for committer
+expecting success of 3070.690 'ipathmatch (via ls-files): match '[[]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 690 - ipathmatch (via ls-files): match '[[]ab]' '[ab]'
 
-expecting success of 3511.13 'cherry-pick -x handles commits with no NL at end of message': 
-	pristine_detach initial &&
-	printf "title\n\nSigned-off-by: A <a@example.com>" >msg &&
-	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
-	git cherry-pick -x $sha1 &&
-	git log -1 --pretty=format:%B >actual &&
+expecting success of 3070.691 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [ab]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 691 - cleanup after previous file test
 
-	printf "\n(cherry picked from commit %s)\n" $sha1 >>msg &&
-	test_cmp msg actual
+expecting success of 3070.692 'setup match file test for [ab]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 692 - setup match file test for [ab]
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.693 'wildmatch: match '[ab]' '[[:]ab]'': 
+			test-tool wildmatch wildmatch '[ab]' '[[:]ab]'
+		
+ok 693 - wildmatch: match '[ab]' '[[:]ab]'
 
-  2d6e386 base: commit message
+expecting success of 3070.694 'wildmatch (via ls-files): match '[[:]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 694 - wildmatch (via ls-files): match '[[:]ab]' '[ab]'
 
-HEAD is now at df2a63d initial
-[detached HEAD 96716be] title
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 13 - cherry-pick -x handles commits with no NL at end of message
+expecting success of 3070.695 'iwildmatch: match '[ab]' '[[:]ab]'': 
+			test-tool wildmatch iwildmatch '[ab]' '[[:]ab]'
+		
+ok 695 - iwildmatch: match '[ab]' '[[:]ab]'
 
-expecting success of 3511.14 'cherry-pick -x handles commits with no footer and no NL at end of message': 
-	pristine_detach initial &&
-	printf "title\n\nnot a footer" >msg &&
-	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
-	git cherry-pick -x $sha1 &&
-	git log -1 --pretty=format:%B >actual &&
+expecting success of 3070.696 'iwildmatch (via ls-files): match '[[:]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 696 - iwildmatch (via ls-files): match '[[:]ab]' '[ab]'
 
-	printf "\n\n(cherry picked from commit %s)\n" $sha1 >>msg &&
-	test_cmp msg actual
+expecting success of 3070.697 'pathmatch: match '[ab]' '[[:]ab]'': 
+			test-tool wildmatch pathmatch '[ab]' '[[:]ab]'
+		
+ok 697 - pathmatch: match '[ab]' '[[:]ab]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.698 'pathmatch (via ls-files): match '[[:]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 698 - pathmatch (via ls-files): match '[[:]ab]' '[ab]'
 
-  96716be title
+expecting success of 3070.699 'ipathmatch: match '[ab]' '[[:]ab]'': 
+			test-tool wildmatch ipathmatch '[ab]' '[[:]ab]'
+		
+ok 699 - ipathmatch: match '[ab]' '[[:]ab]'
 
-HEAD is now at df2a63d initial
-[detached HEAD 8c5d63f] title
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 14 - cherry-pick -x handles commits with no footer and no NL at end of message
+expecting success of 3070.700 'ipathmatch (via ls-files): match '[[:]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 700 - ipathmatch (via ls-files): match '[[:]ab]' '[ab]'
 
-expecting success of 3511.15 'cherry-pick -s handles commits with no NL at end of message': 
-	pristine_detach initial &&
-	printf "title\n\nSigned-off-by: A <a@example.com>" >msg &&
-	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
-	git cherry-pick -s $sha1 &&
-	git log -1 --pretty=format:%B >actual &&
+expecting success of 3070.701 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [ab]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 701 - cleanup after previous file test
 
-	printf "\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
-	test_cmp msg actual
+expecting success of 3070.702 'setup match file test for [ab]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 702 - setup match file test for [ab]
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.703 'wildmatch: no match '[ab]' '[[::]ab]'': 
+			test_must_fail test-tool wildmatch wildmatch '[ab]' '[[::]ab]'
+		
+ok 703 - wildmatch: no match '[ab]' '[[::]ab]'
 
-  8c5d63f title
+expecting success of 3070.704 'wildmatch (via ls-files): no match '[[::]ab]' '[ab]'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 704 - wildmatch (via ls-files): no match '[[::]ab]' '[ab]'
 
-HEAD is now at df2a63d initial
-[detached HEAD 6671fda] title
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 15 - cherry-pick -s handles commits with no NL at end of message
+expecting success of 3070.705 'iwildmatch: no match '[ab]' '[[::]ab]'': 
+			test_must_fail test-tool wildmatch iwildmatch '[ab]' '[[::]ab]'
+		
+ok 705 - iwildmatch: no match '[ab]' '[[::]ab]'
 
-expecting success of 3511.16 'cherry-pick -s handles commits with no footer and no NL at end of message': 
-	pristine_detach initial &&
-	printf "title\n\nnot a footer" >msg &&
-	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
-	git cherry-pick -s $sha1 &&
-	git log -1 --pretty=format:%B >actual &&
+expecting success of 3070.706 'iwildmatch (via ls-files): no match '[[::]ab]' '[ab]'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 706 - iwildmatch (via ls-files): no match '[[::]ab]' '[ab]'
 
-	printf "\n\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
-	test_cmp msg actual
+expecting success of 3070.707 'pathmatch: no match '[ab]' '[[::]ab]'': 
+			test_must_fail test-tool wildmatch pathmatch '[ab]' '[[::]ab]'
+		
+ok 707 - pathmatch: no match '[ab]' '[[::]ab]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.708 'pathmatch (via ls-files): no match '[[::]ab]' '[ab]'': 
+				>expect &&
+				git ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 708 - pathmatch (via ls-files): no match '[[::]ab]' '[ab]'
 
-  6671fda title
+expecting success of 3070.709 'ipathmatch: no match '[ab]' '[[::]ab]'': 
+			test_must_fail test-tool wildmatch ipathmatch '[ab]' '[[::]ab]'
+		
+ok 709 - ipathmatch: no match '[ab]' '[[::]ab]'
 
-HEAD is now at df2a63d initial
-[detached HEAD 19f481d] title
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 16 - cherry-pick -s handles commits with no footer and no NL at end of message
+expecting success of 3070.710 'ipathmatch (via ls-files): no match '[[::]ab]' '[ab]'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 710 - ipathmatch (via ls-files): no match '[[::]ab]' '[ab]'
 
-expecting success of 3511.17 'cherry-pick -x treats "(cherry picked from..." line as part of footer': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-with-cherry-footer^0) &&
-	git cherry-pick -x mesg-with-cherry-footer &&
-	cat <<-EOF >expect &&
-		$mesg_with_cherry_footer
-		(cherry picked from commit $sha1)
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.711 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [ab]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 711 - cleanup after previous file test
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.712 'setup match file test for [ab]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 712 - setup match file test for [ab]
 
-  19f481d title
+expecting success of 3070.713 'wildmatch: match '[ab]' '[[:digit]ab]'': 
+			test-tool wildmatch wildmatch '[ab]' '[[:digit]ab]'
+		
+ok 713 - wildmatch: match '[ab]' '[[:digit]ab]'
 
-HEAD is now at df2a63d initial
-[detached HEAD 7b5eb6d] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 17 - cherry-pick -x treats "(cherry picked from..." line as part of footer
+expecting success of 3070.714 'wildmatch (via ls-files): match '[[:digit]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 714 - wildmatch (via ls-files): match '[[:digit]ab]' '[ab]'
 
-expecting success of 3511.18 'cherry-pick -s treats "(cherry picked from..." line as part of footer': 
-	pristine_detach initial &&
-	git cherry-pick -s mesg-with-cherry-footer &&
-	cat <<-EOF >expect &&
-		$mesg_with_cherry_footer
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.715 'iwildmatch: match '[ab]' '[[:digit]ab]'': 
+			test-tool wildmatch iwildmatch '[ab]' '[[:digit]ab]'
+		
+ok 715 - iwildmatch: match '[ab]' '[[:digit]ab]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.716 'iwildmatch (via ls-files): match '[[:digit]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 716 - iwildmatch (via ls-files): match '[[:digit]ab]' '[ab]'
 
-  7b5eb6d base: commit message
+expecting success of 3070.717 'pathmatch: match '[ab]' '[[:digit]ab]'': 
+			test-tool wildmatch pathmatch '[ab]' '[[:digit]ab]'
+		
+ok 717 - pathmatch: match '[ab]' '[[:digit]ab]'
 
-HEAD is now at df2a63d initial
-[detached HEAD b468a7b] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 18 - cherry-pick -s treats "(cherry picked from..." line as part of footer
+expecting success of 3070.718 'pathmatch (via ls-files): match '[[:digit]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 718 - pathmatch (via ls-files): match '[[:digit]ab]' '[ab]'
 
-expecting success of 3511.19 'cherry-pick -x -s treats "(cherry picked from..." line as part of footer': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-with-cherry-footer^0) &&
-	git cherry-pick -x -s mesg-with-cherry-footer &&
-	cat <<-EOF >expect &&
-		$mesg_with_cherry_footer
-		(cherry picked from commit $sha1)
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.719 'ipathmatch: match '[ab]' '[[:digit]ab]'': 
+			test-tool wildmatch ipathmatch '[ab]' '[[:digit]ab]'
+		
+ok 719 - ipathmatch: match '[ab]' '[[:digit]ab]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.720 'ipathmatch (via ls-files): match '[[:digit]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 720 - ipathmatch (via ls-files): match '[[:digit]ab]' '[ab]'
 
-  b468a7b base: commit message
+expecting success of 3070.721 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [ab]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 721 - cleanup after previous file test
 
-HEAD is now at df2a63d initial
-[detached HEAD c7c741c] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 19 - cherry-pick -x -s treats "(cherry picked from..." line as part of footer
+expecting success of 3070.722 'setup match file test for [ab]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 722 - setup match file test for [ab]
 
-expecting success of 3511.20 'cherry-pick preserves commit message': 
-	pristine_detach initial &&
-	printf "$mesg_unclean" >expect &&
-	git log -1 --pretty=format:%B mesg-unclean >actual &&
-	test_cmp expect actual &&
-	git cherry-pick mesg-unclean &&
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+expecting success of 3070.723 'wildmatch: match '[ab]' '[\[:]ab]'': 
+			test-tool wildmatch wildmatch '[ab]' '[\[:]ab]'
+		
+ok 723 - wildmatch: match '[ab]' '[\[:]ab]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.724 'wildmatch (via ls-files): match '[\[:]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 724 - wildmatch (via ls-files): match '[\[:]ab]' '[ab]'
 
-  c7c741c base: commit message
+expecting success of 3070.725 'iwildmatch: match '[ab]' '[\[:]ab]'': 
+			test-tool wildmatch iwildmatch '[ab]' '[\[:]ab]'
+		
+ok 725 - iwildmatch: match '[ab]' '[\[:]ab]'
 
-HEAD is now at df2a63d initial
-[detached HEAD 7a2ed43] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:20:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 20 - cherry-pick preserves commit message
+expecting success of 3070.726 'iwildmatch (via ls-files): match '[\[:]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 726 - iwildmatch (via ls-files): match '[\[:]ab]' '[ab]'
 
-expecting success of 3511.21 'cherry-pick -x cleans commit message': 
-	pristine_detach initial &&
-	git cherry-pick -x mesg-unclean &&
-	git log -1 --pretty=format:%B >actual &&
-	printf "%s\n(cherry picked from commit %s)\n" \
-		"$mesg_unclean" $(git rev-parse mesg-unclean) |
-			git stripspace >expect &&
-	test_cmp expect actual
+expecting success of 3070.727 'pathmatch: match '[ab]' '[\[:]ab]'': 
+			test-tool wildmatch pathmatch '[ab]' '[\[:]ab]'
+		
+ok 727 - pathmatch: match '[ab]' '[\[:]ab]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.728 'pathmatch (via ls-files): match '[\[:]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 728 - pathmatch (via ls-files): match '[\[:]ab]' '[ab]'
 
-  7a2ed43 base: commit message
+expecting success of 3070.729 'ipathmatch: match '[ab]' '[\[:]ab]'': 
+			test-tool wildmatch ipathmatch '[ab]' '[\[:]ab]'
+		
+ok 729 - ipathmatch: match '[ab]' '[\[:]ab]'
 
-HEAD is now at df2a63d initial
-[detached HEAD ad2d5bc] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:20:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 21 - cherry-pick -x cleans commit message
+expecting success of 3070.730 'ipathmatch (via ls-files): match '[\[:]ab]' '[ab]'': 
+				printf '%s' '[ab]' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 730 - ipathmatch (via ls-files): match '[\[:]ab]' '[ab]'
 
-expecting success of 3511.22 'cherry-pick -x respects commit.cleanup': 
-	pristine_detach initial &&
-	git -c commit.cleanup=strip cherry-pick -x mesg-unclean &&
-	git log -1 --pretty=format:%B >actual &&
-	printf "%s\n(cherry picked from commit %s)\n" \
-		"$mesg_unclean" $(git rev-parse mesg-unclean) |
-			git stripspace -s >expect &&
-	test_cmp expect actual
+expecting success of 3070.731 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [ab]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 731 - cleanup after previous file test
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.732 'setup match file test for ?a?b': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 732 - setup match file test for ?a?b
 
-  ad2d5bc base: commit message
+expecting success of 3070.733 'wildmatch: match '?a?b' '\??\?b'': 
+			test-tool wildmatch wildmatch '?a?b' '\??\?b'
+		
+ok 733 - wildmatch: match '?a?b' '\??\?b'
 
-HEAD is now at df2a63d initial
-[detached HEAD fd8c8fa] base: commit message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:20:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 22 - cherry-pick -x respects commit.cleanup
+expecting success of 3070.734 'wildmatch (via ls-files): match '\??\?b' '?a?b'': 
+				printf '%s' '?a?b' >expect &&
+				git --glob-pathspecs ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 734 - wildmatch (via ls-files): match '\??\?b' '?a?b'
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3507-cherry-pick-conflict.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3507-cherry-pick-conflict/.git/
-expecting success of 3507.1 'setup': 
+expecting success of 3070.735 'iwildmatch: match '?a?b' '\??\?b'': 
+			test-tool wildmatch iwildmatch '?a?b' '\??\?b'
+		
+ok 735 - iwildmatch: match '?a?b' '\??\?b'
 
-	echo unrelated >unrelated &&
-	git add unrelated &&
-	test_commit initial foo a &&
-	test_commit base foo b &&
-	test_commit picked foo c &&
-	test_commit --signoff picked-signed foo d &&
-	git checkout -b topic initial &&
-	test_commit redundant-pick foo c redundant &&
-	git commit --allow-empty --allow-empty-message &&
-	git tag empty &&
-	git checkout main &&
-	git config set advice.detachedhead false
+expecting success of 3070.736 'iwildmatch (via ls-files): match '\??\?b' '?a?b'': 
+				printf '%s' '?a?b' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 736 - iwildmatch (via ls-files): match '\??\?b' '?a?b'
 
+expecting success of 3070.737 'pathmatch: match '?a?b' '\??\?b'': 
+			test-tool wildmatch pathmatch '?a?b' '\??\?b'
+		
+ok 737 - pathmatch: match '?a?b' '\??\?b'
 
-[main (root-commit) df2a63d] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 foo
- create mode 100644 unrelated
-[main dc0113b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 7e6d412] picked
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main e4ca149] picked-signed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'topic'
-[topic 2aaca37] redundant-pick
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[topic c0ecbf1] 
- Author: A U Thor <author@example.com>
-Switched to branch 'main'
-ok 1 - setup
+expecting success of 3070.738 'pathmatch (via ls-files): match '\??\?b' '?a?b'': 
+				printf '%s' '?a?b' >expect &&
+				git ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 738 - pathmatch (via ls-files): match '\??\?b' '?a?b'
 
-expecting success of 3507.2 'failed cherry-pick does not advance HEAD': 
-	pristine_detach initial &&
+expecting success of 3070.739 'ipathmatch: match '?a?b' '\??\?b'': 
+			test-tool wildmatch ipathmatch '?a?b' '\??\?b'
+		
+ok 739 - ipathmatch: match '?a?b' '\??\?b'
 
-	head=$(git rev-parse HEAD) &&
-	test_must_fail git cherry-pick picked &&
-	newhead=$(git rev-parse HEAD) &&
+expecting success of 3070.740 'ipathmatch (via ls-files): match '\??\?b' '?a?b'': 
+				printf '%s' '?a?b' >expect &&
+				git --icase-pathspecs ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 740 - ipathmatch (via ls-files): match '\??\?b' '?a?b'
 
-	test "$head" = "$newhead"
+expecting success of 3070.741 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ?a?b
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 741 - cleanup after previous file test
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-ok 2 - failed cherry-pick does not advance HEAD
+expecting success of 3070.742 'setup match file test for abc': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 742 - setup match file test for abc
 
-expecting success of 3507.3 'advice from failed cherry-pick': 
-	pristine_detach initial &&
+expecting success of 3070.743 'wildmatch: match 'abc' '\a\b\c'': 
+			test-tool wildmatch wildmatch 'abc' '\a\b\c'
+		
+ok 743 - wildmatch: match 'abc' '\a\b\c'
 
-	picked=$(git rev-parse --short picked) &&
-	cat <<-EOF >expected &&
-	error: could not apply $picked... picked
-	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"
-	EOF
-	test_must_fail git cherry-pick picked 2>actual &&
+expecting success of 3070.744 'wildmatch (via ls-files): match '\a\b\c' 'abc'': 
+				printf '%s' 'abc' >expect &&
+				git --glob-pathspecs ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 744 - wildmatch (via ls-files): match '\a\b\c' 'abc'
 
-	test_cmp expected actual
+expecting success of 3070.745 'iwildmatch: match 'abc' '\a\b\c'': 
+			test-tool wildmatch iwildmatch 'abc' '\a\b\c'
+		
+ok 745 - iwildmatch: match 'abc' '\a\b\c'
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-ok 3 - advice from failed cherry-pick
+expecting success of 3070.746 'iwildmatch (via ls-files): match '\a\b\c' 'abc'': 
+				printf '%s' 'abc' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 746 - iwildmatch (via ls-files): match '\a\b\c' 'abc'
 
-expecting success of 3507.4 'advice from failed cherry-pick --no-commit': 
-	pristine_detach initial &&
+expecting success of 3070.747 'pathmatch: match 'abc' '\a\b\c'': 
+			test-tool wildmatch pathmatch 'abc' '\a\b\c'
+		
+ok 747 - pathmatch: match 'abc' '\a\b\c'
 
-	picked=$(git rev-parse --short picked) &&
-	cat <<-EOF >expected &&
-	error: could not apply $picked... picked
-	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"
-	EOF
-	test_must_fail git cherry-pick --no-commit picked 2>actual &&
+expecting success of 3070.748 'pathmatch (via ls-files): match '\a\b\c' 'abc'': 
+				printf '%s' 'abc' >expect &&
+				git ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 748 - pathmatch (via ls-files): match '\a\b\c' 'abc'
 
-	test_cmp expected actual
+expecting success of 3070.749 'ipathmatch: match 'abc' '\a\b\c'': 
+			test-tool wildmatch ipathmatch 'abc' '\a\b\c'
+		
+ok 749 - ipathmatch: match 'abc' '\a\b\c'
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-ok 4 - advice from failed cherry-pick --no-commit
+expecting success of 3070.750 'ipathmatch (via ls-files): match '\a\b\c' 'abc'': 
+				printf '%s' 'abc' >expect &&
+				git --icase-pathspecs ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 750 - ipathmatch (via ls-files): match '\a\b\c' 'abc'
 
-expecting success of 3507.5 'failed cherry-pick sets CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick picked &&
-	test_cmp_rev picked CHERRY_PICK_HEAD
+expecting success of 3070.751 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing abc
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 751 - cleanup after previous file test
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-ok 5 - failed cherry-pick sets CHERRY_PICK_HEAD
+expecting success of 3070.752 'setup match file test for foo': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 752 - setup match file test for foo
 
-expecting success of 3507.6 'successful cherry-pick does not set CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
-	git cherry-pick base &&
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+expecting success of 3070.753 'wildmatch: no match 'foo' ''': 
+			test_must_fail test-tool wildmatch wildmatch 'foo' ''
+		
+ok 753 - wildmatch: no match 'foo' ''
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-[detached HEAD ccd9cfc] base
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-ok 6 - successful cherry-pick does not set CHERRY_PICK_HEAD
+expecting success of 3070.754 'wildmatch (via ls-files): match dies on '' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				test_must_fail git --glob-pathspecs ls-files -z -- ''
+			
+fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
+ok 754 - wildmatch (via ls-files): match dies on '' 'foo'
 
-expecting success of 3507.7 'cherry-pick --no-commit does not set CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
-	git cherry-pick --no-commit base &&
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+expecting success of 3070.755 'iwildmatch: no match 'foo' ''': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo' ''
+		
+ok 755 - iwildmatch: no match 'foo' ''
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.756 'iwildmatch (via ls-files): match dies on '' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				test_must_fail git --glob-pathspecs --icase-pathspecs ls-files -z -- ''
+			
+fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
+ok 756 - iwildmatch (via ls-files): match dies on '' 'foo'
 
-  ccd9cfc base
+expecting success of 3070.757 'pathmatch: no match 'foo' ''': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' ''
+		
+ok 757 - pathmatch: no match 'foo' ''
 
-HEAD is now at df2a63d initial
-fatal: Needed a single revision
-ok 7 - cherry-pick --no-commit does not set CHERRY_PICK_HEAD
+expecting success of 3070.758 'pathmatch (via ls-files): match dies on '' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				test_must_fail git ls-files -z -- ''
+			
+fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
+ok 758 - pathmatch (via ls-files): match dies on '' 'foo'
 
-expecting success of 3507.8 'cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
-	echo foo >foo &&
-	test_must_fail git cherry-pick base &&
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+expecting success of 3070.759 'ipathmatch: no match 'foo' ''': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' ''
+		
+ok 759 - ipathmatch: no match 'foo' ''
 
-HEAD is now at df2a63d initial
-error: Your local changes to the following files would be overwritten by merge:
-	foo
-Please commit your changes or stash them before you merge.
-Aborting
-fatal: cherry-pick failed
-fatal: Needed a single revision
-ok 8 - cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD
+expecting success of 3070.760 'ipathmatch (via ls-files): match dies on '' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				test_must_fail git --icase-pathspecs ls-files -z -- ''
+			
+fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
+ok 760 - ipathmatch (via ls-files): match dies on '' 'foo'
 
-expecting success of 3507.9 'cherry-pick --strategy=resolve w/dirty tree does not set CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
-	echo foo >foo &&
-	test_must_fail git cherry-pick --strategy=resolve base &&
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+expecting success of 3070.761 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing expect
+Removing foo
+ok 761 - cleanup after previous file test
 
-HEAD is now at df2a63d initial
-error: Entry 'foo' not uptodate. Cannot merge.
-error: could not apply dc0113b... base
-fatal: Needed a single revision
-ok 9 - cherry-pick --strategy=resolve w/dirty tree does not set CHERRY_PICK_HEAD
+expecting success of 3070.762 'setup match file test for foo/bar/baz/to': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 762 - setup match file test for foo/bar/baz/to
 
-expecting success of 3507.10 'GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
-	(
-		GIT_CHERRY_PICK_HELP="and then do something else" &&
-		export GIT_CHERRY_PICK_HELP &&
-		test_must_fail git cherry-pick picked
-	) &&
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+expecting success of 3070.763 'wildmatch: match 'foo/bar/baz/to' '**/t[o]'': 
+			test-tool wildmatch wildmatch 'foo/bar/baz/to' '**/t[o]'
+		
+ok 763 - wildmatch: match 'foo/bar/baz/to' '**/t[o]'
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: and then do something else
-hint: Disable this message with "git config set advice.mergeConflict false"
-fatal: Needed a single revision
-ok 10 - GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD
+expecting success of 3070.764 'wildmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'': 
+				printf '%s' 'foo/bar/baz/to' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 764 - wildmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
 
-expecting success of 3507.11 'git reset clears CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
+expecting success of 3070.765 'iwildmatch: match 'foo/bar/baz/to' '**/t[o]'': 
+			test-tool wildmatch iwildmatch 'foo/bar/baz/to' '**/t[o]'
+		
+ok 765 - iwildmatch: match 'foo/bar/baz/to' '**/t[o]'
 
-	test_must_fail git cherry-pick picked &&
-	git reset &&
+expecting success of 3070.766 'iwildmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'': 
+				printf '%s' 'foo/bar/baz/to' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 766 - iwildmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
 
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+expecting success of 3070.767 'pathmatch: match 'foo/bar/baz/to' '**/t[o]'': 
+			test-tool wildmatch pathmatch 'foo/bar/baz/to' '**/t[o]'
+		
+ok 767 - pathmatch: match 'foo/bar/baz/to' '**/t[o]'
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-Unstaged changes after reset:
-M	foo
-fatal: Needed a single revision
-ok 11 - git reset clears CHERRY_PICK_HEAD
+expecting success of 3070.768 'pathmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'': 
+				printf '%s' 'foo/bar/baz/to' >expect &&
+				git ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 768 - pathmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
 
-expecting success of 3507.12 'failed commit does not clear CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
+expecting success of 3070.769 'ipathmatch: match 'foo/bar/baz/to' '**/t[o]'': 
+			test-tool wildmatch ipathmatch 'foo/bar/baz/to' '**/t[o]'
+		
+ok 769 - ipathmatch: match 'foo/bar/baz/to' '**/t[o]'
 
-	test_must_fail git cherry-pick picked &&
-	test_must_fail git commit &&
+expecting success of 3070.770 'ipathmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'': 
+				printf '%s' 'foo/bar/baz/to' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 770 - ipathmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
 
-	test_cmp_rev picked CHERRY_PICK_HEAD
+expecting success of 3070.771 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 771 - cleanup after previous file test
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-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	foo
-ok 12 - failed commit does not clear CHERRY_PICK_HEAD
+expecting success of 3070.772 'setup match file test for a1B': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 772 - setup match file test for a1B
 
-expecting success of 3507.13 'cancelled commit does not clear CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
+expecting success of 3070.773 'wildmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'': 
+			test-tool wildmatch wildmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+		
+ok 773 - wildmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
 
-	test_must_fail git cherry-pick picked &&
-	echo resolved >foo &&
-	git add foo &&
-	git update-index --refresh -q &&
-	test_must_fail git diff-index --exit-code HEAD &&
-	(
-		GIT_EDITOR=false &&
-		export GIT_EDITOR &&
-		test_must_fail git commit
-	) &&
+expecting success of 3070.774 'wildmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'': 
+				printf '%s' 'a1B' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 774 - wildmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
 
-	test_cmp_rev picked CHERRY_PICK_HEAD
+expecting success of 3070.775 'iwildmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'': 
+			test-tool wildmatch iwildmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+		
+ok 775 - iwildmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 2ab19ae607aabda796309682e0448237aab03047 M	foo
-error: there was a problem with the editor 'false'
-Please supply the message using either -m or -F option.
-ok 13 - cancelled commit does not clear CHERRY_PICK_HEAD
+expecting success of 3070.776 'iwildmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'': 
+				printf '%s' 'a1B' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 776 - iwildmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
 
-expecting success of 3507.14 'successful commit clears CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
+expecting success of 3070.777 'pathmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'': 
+			test-tool wildmatch pathmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+		
+ok 777 - pathmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
 
-	test_must_fail git cherry-pick picked &&
-	echo resolved >foo &&
-	git add foo &&
-	git commit &&
+expecting success of 3070.778 'pathmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'': 
+				printf '%s' 'a1B' >expect &&
+				git ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 778 - pathmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
 
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+expecting success of 3070.779 'ipathmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'': 
+			test-tool wildmatch ipathmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+		
+ok 779 - ipathmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-[detached HEAD a8c44c9] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-ok 14 - successful commit clears CHERRY_PICK_HEAD
+expecting success of 3070.780 'ipathmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'': 
+				printf '%s' 'a1B' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 780 - ipathmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
 
-expecting success of 3507.15 'partial commit of cherry-pick fails': 
-	pristine_detach initial &&
+expecting success of 3070.781 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a1B
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 781 - cleanup after previous file test
 
-	test_must_fail git cherry-pick picked &&
-	echo resolved >foo &&
-	git add foo &&
-	test_must_fail git commit foo 2>err &&
+expecting success of 3070.782 'setup match file test for a': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 782 - setup match file test for a
 
-	test_grep "cannot do a partial commit during a cherry-pick." err
+expecting success of 3070.783 'wildmatch: no match 'a' '[[:digit:][:upper:][:space:]]'': 
+			test_must_fail test-tool wildmatch wildmatch 'a' '[[:digit:][:upper:][:space:]]'
+		
+ok 783 - wildmatch: no match 'a' '[[:digit:][:upper:][:space:]]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.784 'wildmatch (via ls-files): no match '[[:digit:][:upper:][:space:]]' 'a'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 784 - wildmatch (via ls-files): no match '[[:digit:][:upper:][:space:]]' 'a'
 
-  a8c44c9 picked
+expecting success of 3070.785 'iwildmatch: match 'a' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch iwildmatch 'a' '[[:digit:][:upper:][:space:]]'
+		
+ok 785 - iwildmatch: match 'a' '[[:digit:][:upper:][:space:]]'
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-fatal: cannot do a partial commit during a cherry-pick.
-ok 15 - partial commit of cherry-pick fails
+expecting success of 3070.786 'iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 786 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'a'
 
-expecting success of 3507.16 'commit --amend of cherry-pick fails': 
-	pristine_detach initial &&
+expecting success of 3070.787 'pathmatch: no match 'a' '[[:digit:][:upper:][:space:]]'': 
+			test_must_fail test-tool wildmatch pathmatch 'a' '[[:digit:][:upper:][:space:]]'
+		
+ok 787 - pathmatch: no match 'a' '[[:digit:][:upper:][:space:]]'
 
-	test_must_fail git cherry-pick picked &&
-	echo resolved >foo &&
-	git add foo &&
-	test_must_fail git commit --amend 2>err &&
+expecting success of 3070.788 'pathmatch (via ls-files): no match '[[:digit:][:upper:][:space:]]' 'a'': 
+				>expect &&
+				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 788 - pathmatch (via ls-files): no match '[[:digit:][:upper:][:space:]]' 'a'
 
-	test_grep "in the middle of a cherry-pick -- cannot amend." err
+expecting success of 3070.789 'ipathmatch: match 'a' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch ipathmatch 'a' '[[:digit:][:upper:][:space:]]'
+		
+ok 789 - ipathmatch: match 'a' '[[:digit:][:upper:][:space:]]'
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-fatal: You are in the middle of a cherry-pick -- cannot amend.
-ok 16 - commit --amend of cherry-pick fails
+expecting success of 3070.790 'ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 790 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'a'
 
-expecting success of 3507.17 'successful final commit clears cherry-pick state': 
-	pristine_detach initial &&
+expecting success of 3070.791 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 791 - cleanup after previous file test
 
-	test_must_fail git cherry-pick base picked-signed &&
-	echo resolved >foo &&
-	test_path_is_file .git/sequencer/todo &&
-	git commit -a &&
-	test_path_is_missing .git/sequencer
+expecting success of 3070.792 'setup match file test for A': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 792 - setup match file test for A
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-[detached HEAD ccd9cfc] base
- 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 foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply e4ca149... picked-signed
-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"
-[detached HEAD 53c8c73] picked-signed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 17 - successful final commit clears cherry-pick state
+expecting success of 3070.793 'wildmatch: match 'A' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch wildmatch 'A' '[[:digit:][:upper:][:space:]]'
+		
+ok 793 - wildmatch: match 'A' '[[:digit:][:upper:][:space:]]'
 
-expecting success of 3507.18 'reset after final pick clears cherry-pick state': 
-	pristine_detach initial &&
+expecting success of 3070.794 'wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 794 - wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
 
-	test_must_fail git cherry-pick base picked-signed &&
-	echo resolved >foo &&
-	test_path_is_file .git/sequencer/todo &&
-	git reset &&
-	test_path_is_missing .git/sequencer
+expecting success of 3070.795 'iwildmatch: match 'A' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch iwildmatch 'A' '[[:digit:][:upper:][:space:]]'
+		
+ok 795 - iwildmatch: match 'A' '[[:digit:][:upper:][:space:]]'
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+expecting success of 3070.796 'iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 796 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
 
-  53c8c73 picked-signed
-  ccd9cfc base
+expecting success of 3070.797 'pathmatch: match 'A' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch pathmatch 'A' '[[:digit:][:upper:][:space:]]'
+		
+ok 797 - pathmatch: match 'A' '[[:digit:][:upper:][:space:]]'
 
-HEAD is now at df2a63d initial
-[detached HEAD ccd9cfc] base
- 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 foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply e4ca149... picked-signed
-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"
-Unstaged changes after reset:
-M	foo
-ok 18 - reset after final pick clears cherry-pick state
+expecting success of 3070.798 'pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 798 - pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
 
-expecting success of 3507.19 'failed cherry-pick produces dirty index': 
-	pristine_detach initial &&
+expecting success of 3070.799 'ipathmatch: match 'A' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch ipathmatch 'A' '[[:digit:][:upper:][:space:]]'
+		
+ok 799 - ipathmatch: match 'A' '[[:digit:][:upper:][:space:]]'
 
-	test_must_fail git cherry-pick picked &&
+expecting success of 3070.800 'ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 800 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
 
-	test_must_fail git update-index --refresh -q &&
-	test_must_fail git diff-index --exit-code HEAD
+expecting success of 3070.801 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 801 - cleanup after previous file test
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.802 'setup match file test for 1': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 802 - setup match file test for 1
 
-  ccd9cfc base
+expecting success of 3070.803 'wildmatch: match '1' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch wildmatch '1' '[[:digit:][:upper:][:space:]]'
+		
+ok 803 - wildmatch: match '1' '[[:digit:][:upper:][:space:]]'
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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: needs merge
-:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 0000000000000000000000000000000000000000 M	foo
-ok 19 - failed cherry-pick produces dirty index
+expecting success of 3070.804 'wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'': 
+				printf '%s' '1' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 804 - wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
 
-expecting success of 3507.20 'failed cherry-pick registers participants in index': 
-	pristine_detach initial &&
-	{
-		git checkout base -- foo &&
-		git ls-files --stage foo &&
-		git checkout initial -- foo &&
-		git ls-files --stage foo &&
-		git checkout picked -- foo &&
-		git ls-files --stage foo
-	} >stages &&
-	sed "
-		1 s/ 0	/ 1	/
-		2 s/ 0	/ 2	/
-		3 s/ 0	/ 3	/
-	" stages >expected &&
-	git read-tree -u --reset HEAD &&
+expecting success of 3070.805 'iwildmatch: match '1' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch iwildmatch '1' '[[:digit:][:upper:][:space:]]'
+		
+ok 805 - iwildmatch: match '1' '[[:digit:][:upper:][:space:]]'
 
-	test_must_fail git cherry-pick picked &&
-	git ls-files --stage --unmerged >actual &&
+expecting success of 3070.806 'iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'': 
+				printf '%s' '1' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 806 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
 
-	test_cmp expected actual
+expecting success of 3070.807 'pathmatch: match '1' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch pathmatch '1' '[[:digit:][:upper:][:space:]]'
+		
+ok 807 - pathmatch: match '1' '[[:digit:][:upper:][:space:]]'
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-ok 20 - failed cherry-pick registers participants in index
+expecting success of 3070.808 'pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'': 
+				printf '%s' '1' >expect &&
+				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 808 - pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
 
-expecting success of 3507.21 'cherry-pick conflict, ensure commit.cleanup = scissors places scissors line properly': 
-	pristine_detach initial &&
-	git config commit.cleanup scissors &&
-	cat <<-EOF >expected &&
-		picked
+expecting success of 3070.809 'ipathmatch: match '1' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch ipathmatch '1' '[[:digit:][:upper:][:space:]]'
+		
+ok 809 - ipathmatch: match '1' '[[:digit:][:upper:][:space:]]'
 
-		# ------------------------ >8 ------------------------
-		# Do not modify or remove the line above.
-		# Everything below it will be ignored.
-		#
-		# Conflicts:
-		#	foo
-		EOF
+expecting success of 3070.810 'ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'': 
+				printf '%s' '1' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 810 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
 
-	test_must_fail git cherry-pick picked &&
+expecting success of 3070.811 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing 1
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 811 - cleanup after previous file test
 
-	test_cmp expected .git/MERGE_MSG
+expecting success of 3070.812 'setup match file test for 1': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 812 - setup match file test for 1
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-ok 21 - cherry-pick conflict, ensure commit.cleanup = scissors places scissors line properly
+expecting success of 3070.813 'wildmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'': 
+			test_must_fail test-tool wildmatch wildmatch '1' '[[:digit:][:upper:][:spaci:]]'
+		
+ok 813 - wildmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
 
-expecting success of 3507.22 'cherry-pick conflict, ensure cleanup=scissors places scissors line properly': 
-	pristine_detach initial &&
-	git config --unset commit.cleanup &&
-	cat <<-EOF >expected &&
-		picked
+expecting success of 3070.814 'wildmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 814 - wildmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
 
-		# ------------------------ >8 ------------------------
-		# Do not modify or remove the line above.
-		# Everything below it will be ignored.
-		#
-		# Conflicts:
-		#	foo
-		EOF
+expecting success of 3070.815 'iwildmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'': 
+			test_must_fail test-tool wildmatch iwildmatch '1' '[[:digit:][:upper:][:spaci:]]'
+		
+ok 815 - iwildmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
 
-	test_must_fail git cherry-pick --cleanup=scissors picked &&
+expecting success of 3070.816 'iwildmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 816 - iwildmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
 
-	test_cmp expected .git/MERGE_MSG
+expecting success of 3070.817 'pathmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'': 
+			test_must_fail test-tool wildmatch pathmatch '1' '[[:digit:][:upper:][:spaci:]]'
+		
+ok 817 - pathmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-ok 22 - cherry-pick conflict, ensure cleanup=scissors places scissors line properly
+expecting success of 3070.818 'pathmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'': 
+				>expect &&
+				git ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 818 - pathmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
 
-expecting success of 3507.23 'failed cherry-pick describes conflict in work tree': 
-	pristine_detach initial &&
-	cat <<-EOF >expected &&
-	<<<<<<< HEAD
-	a
-	=======
-	c
-	>>>>>>> objid (picked)
-	EOF
+expecting success of 3070.819 'ipathmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'': 
+			test_must_fail test-tool wildmatch ipathmatch '1' '[[:digit:][:upper:][:spaci:]]'
+		
+ok 819 - ipathmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
 
-	test_must_fail git cherry-pick picked &&
+expecting success of 3070.820 'ipathmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 820 - ipathmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
 
-	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
-	test_cmp expected actual
+expecting success of 3070.821 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing 1
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 821 - cleanup after previous file test
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-ok 23 - failed cherry-pick describes conflict in work tree
+expecting success of 3070.822 'setup match file test for  ': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 822 - setup match file test for  
 
-expecting success of 3507.24 'diff3 -m style': 
-	pristine_detach initial &&
-	git config merge.conflictstyle diff3 &&
-	cat <<-EOF >expected &&
-	<<<<<<< HEAD
-	a
-	||||||| parent of objid (picked)
-	b
-	=======
-	c
-	>>>>>>> objid (picked)
-	EOF
+expecting success of 3070.823 'wildmatch: match ' ' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch wildmatch ' ' '[[:digit:][:upper:][:space:]]'
+		
+ok 823 - wildmatch: match ' ' '[[:digit:][:upper:][:space:]]'
 
-	test_must_fail git cherry-pick picked &&
+expecting success of 3070.824 'wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '': 
+				printf '%s' ' ' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 824 - wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
 
-	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
-	test_cmp expected actual
+expecting success of 3070.825 'iwildmatch: match ' ' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch iwildmatch ' ' '[[:digit:][:upper:][:space:]]'
+		
+ok 825 - iwildmatch: match ' ' '[[:digit:][:upper:][:space:]]'
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-ok 24 - diff3 -m style
+expecting success of 3070.826 'iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '': 
+				printf '%s' ' ' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 826 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
 
-expecting success of 3507.25 'revert also handles conflicts sanely': 
-	git config --unset merge.conflictstyle &&
-	pristine_detach initial &&
-	cat <<-EOF >expected &&
-	<<<<<<< HEAD
-	a
-	=======
-	b
-	>>>>>>> parent of objid (picked)
-	EOF
-	{
-		git checkout picked -- foo &&
-		git ls-files --stage foo &&
-		git checkout initial -- foo &&
-		git ls-files --stage foo &&
-		git checkout base -- foo &&
-		git ls-files --stage foo
-	} >stages &&
-	sed "
-		1 s/ 0	/ 1	/
-		2 s/ 0	/ 2	/
-		3 s/ 0	/ 3	/
-	" stages >expected-stages &&
-	git read-tree -u --reset HEAD &&
+expecting success of 3070.827 'pathmatch: match ' ' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch pathmatch ' ' '[[:digit:][:upper:][:space:]]'
+		
+ok 827 - pathmatch: match ' ' '[[:digit:][:upper:][:space:]]'
 
-	head=$(git rev-parse HEAD) &&
-	test_must_fail git revert picked &&
-	newhead=$(git rev-parse HEAD) &&
-	git ls-files --stage --unmerged >actual-stages &&
+expecting success of 3070.828 'pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '': 
+				printf '%s' ' ' >expect &&
+				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 828 - pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
 
-	test "$head" = "$newhead" &&
-	test_must_fail git update-index --refresh -q &&
-	test_must_fail git diff-index --exit-code HEAD &&
-	test_cmp expected-stages actual-stages &&
-	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
-	test_cmp expected actual
+expecting success of 3070.829 'ipathmatch: match ' ' '[[:digit:][:upper:][:space:]]'': 
+			test-tool wildmatch ipathmatch ' ' '[[:digit:][:upper:][:space:]]'
+		
+ok 829 - ipathmatch: match ' ' '[[:digit:][:upper:][:space:]]'
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-foo: needs merge
-:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 0000000000000000000000000000000000000000 M	foo
-ok 25 - revert also handles conflicts sanely
+expecting success of 3070.830 'ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '': 
+				printf '%s' ' ' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 830 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
 
-expecting success of 3507.26 'failed revert sets REVERT_HEAD': 
-	pristine_detach initial &&
-	test_must_fail git revert picked &&
-	test_cmp_rev picked REVERT_HEAD
+expecting success of 3070.831 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing  
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 831 - cleanup after previous file test
 
-HEAD is now at df2a63d initial
-warning: cancelling a revert in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 26 - failed revert sets REVERT_HEAD
+expecting success of 3070.832 'setup match file test for .': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 832 - setup match file test for .
 
-expecting success of 3507.27 'successful revert does not set REVERT_HEAD': 
-	pristine_detach base &&
-	git revert base &&
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
-	test_must_fail git rev-parse --verify REVERT_HEAD
+expecting success of 3070.833 'wildmatch: no match '.' '[[:digit:][:upper:][:space:]]'': 
+			test_must_fail test-tool wildmatch wildmatch '.' '[[:digit:][:upper:][:space:]]'
+		
+ok 833 - wildmatch: no match '.' '[[:digit:][:upper:][:space:]]'
 
-Previous HEAD position was df2a63d initial
-HEAD is now at dc0113b base
-warning: cancelling a revert in progress
-[detached HEAD feb2983] Revert "base"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 27 - successful revert does not set REVERT_HEAD
+checking known breakage of 3070.834 'wildmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.'': false
+not ok 834 - wildmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
 
-expecting success of 3507.28 'revert --no-commit sets REVERT_HEAD': 
-	pristine_detach base &&
-	git revert --no-commit base &&
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
-	test_cmp_rev base REVERT_HEAD
+expecting success of 3070.835 'iwildmatch: no match '.' '[[:digit:][:upper:][:space:]]'': 
+			test_must_fail test-tool wildmatch iwildmatch '.' '[[:digit:][:upper:][:space:]]'
+		
+ok 835 - iwildmatch: no match '.' '[[:digit:][:upper:][:space:]]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+checking known breakage of 3070.836 'iwildmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.'': false
+not ok 836 - iwildmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
 
-  feb2983 Revert "base"
+expecting success of 3070.837 'pathmatch: no match '.' '[[:digit:][:upper:][:space:]]'': 
+			test_must_fail test-tool wildmatch pathmatch '.' '[[:digit:][:upper:][:space:]]'
+		
+ok 837 - pathmatch: no match '.' '[[:digit:][:upper:][:space:]]'
 
-HEAD is now at dc0113b base
-fatal: Needed a single revision
-ok 28 - revert --no-commit sets REVERT_HEAD
+checking known breakage of 3070.838 'pathmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.'': false
+not ok 838 - pathmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
 
-expecting success of 3507.29 'revert w/dirty tree does not set REVERT_HEAD': 
-	pristine_detach base &&
-	echo foo >foo &&
-	test_must_fail git revert base &&
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
-	test_must_fail git rev-parse --verify REVERT_HEAD
+expecting success of 3070.839 'ipathmatch: no match '.' '[[:digit:][:upper:][:space:]]'': 
+			test_must_fail test-tool wildmatch ipathmatch '.' '[[:digit:][:upper:][:space:]]'
+		
+ok 839 - ipathmatch: no match '.' '[[:digit:][:upper:][:space:]]'
 
-HEAD is now at dc0113b base
-warning: cancelling a revert in progress
-error: Your local changes to the following files would be overwritten by merge:
-	foo
-Please commit your changes or stash them before you merge.
-Aborting
-fatal: revert failed
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 29 - revert w/dirty tree does not set REVERT_HEAD
+checking known breakage of 3070.840 'ipathmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.'': false
+not ok 840 - ipathmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
 
-expecting success of 3507.30 'GIT_CHERRY_PICK_HELP does not suppress REVERT_HEAD': 
-	pristine_detach initial &&
-	(
-		GIT_CHERRY_PICK_HELP="and then do something else" &&
-		GIT_REVERT_HELP="and then do something else, again" &&
-		export GIT_CHERRY_PICK_HELP GIT_REVERT_HELP &&
-		test_must_fail git revert picked
-	) &&
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
-	test_cmp_rev picked REVERT_HEAD
+expecting success of 3070.841 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 841 - cleanup after previous file test
 
-Previous HEAD position was dc0113b base
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: and then do something else
-hint: Disable this message with "git config set advice.mergeConflict false"
-fatal: Needed a single revision
-ok 30 - GIT_CHERRY_PICK_HELP does not suppress REVERT_HEAD
+expecting success of 3070.842 'setup match file test for .': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 842 - setup match file test for .
 
-expecting success of 3507.31 'git reset clears REVERT_HEAD': 
-	pristine_detach initial &&
-	test_must_fail git revert picked &&
-	git reset &&
-	test_must_fail git rev-parse --verify REVERT_HEAD
+expecting success of 3070.843 'wildmatch: match '.' '[[:digit:][:punct:][:space:]]'': 
+			test-tool wildmatch wildmatch '.' '[[:digit:][:punct:][:space:]]'
+		
+ok 843 - wildmatch: match '.' '[[:digit:][:punct:][:space:]]'
 
-HEAD is now at df2a63d initial
-warning: cancelling a revert in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Unstaged changes after reset:
-M	foo
-fatal: Needed a single revision
-ok 31 - git reset clears REVERT_HEAD
+checking known breakage of 3070.844 'wildmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.'': false
+not ok 844 - wildmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
 
-expecting success of 3507.32 'failed commit does not clear REVERT_HEAD': 
-	pristine_detach initial &&
-	test_must_fail git revert picked &&
-	test_must_fail git commit &&
-	test_cmp_rev picked REVERT_HEAD
+expecting success of 3070.845 'iwildmatch: match '.' '[[:digit:][:punct:][:space:]]'': 
+			test-tool wildmatch iwildmatch '.' '[[:digit:][:punct:][:space:]]'
+		
+ok 845 - iwildmatch: match '.' '[[:digit:][:punct:][:space:]]'
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-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	foo
-ok 32 - failed commit does not clear REVERT_HEAD
+checking known breakage of 3070.846 'iwildmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.'': false
+not ok 846 - iwildmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
 
-expecting success of 3507.33 'successful final commit clears revert state': 
-	pristine_detach picked-signed &&
+expecting success of 3070.847 'pathmatch: match '.' '[[:digit:][:punct:][:space:]]'': 
+			test-tool wildmatch pathmatch '.' '[[:digit:][:punct:][:space:]]'
+		
+ok 847 - pathmatch: match '.' '[[:digit:][:punct:][:space:]]'
 
-	test_must_fail git revert picked-signed base &&
-	echo resolved >foo &&
-	test_path_is_file .git/sequencer/todo &&
-	git commit -a &&
-	test_path_is_missing .git/sequencer
+checking known breakage of 3070.848 'pathmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.'': false
+not ok 848 - pathmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
 
-Previous HEAD position was df2a63d initial
-HEAD is now at e4ca149 picked-signed
-warning: cancelling a revert in progress
-[detached HEAD b940b09] Revert "picked-signed"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert dc0113b... base
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-[detached HEAD 7342963] Revert "base"
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 33 - successful final commit clears revert state
+expecting success of 3070.849 'ipathmatch: match '.' '[[:digit:][:punct:][:space:]]'': 
+			test-tool wildmatch ipathmatch '.' '[[:digit:][:punct:][:space:]]'
+		
+ok 849 - ipathmatch: match '.' '[[:digit:][:punct:][:space:]]'
 
-expecting success of 3507.34 'reset after final pick clears revert state': 
-	pristine_detach picked-signed &&
+checking known breakage of 3070.850 'ipathmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.'': false
+not ok 850 - ipathmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
 
-	test_must_fail git revert picked-signed base &&
-	echo resolved >foo &&
-	test_path_is_file .git/sequencer/todo &&
-	git reset &&
-	test_path_is_missing .git/sequencer
+expecting success of 3070.851 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 851 - cleanup after previous file test
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+expecting success of 3070.852 'setup match file test for 5': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 852 - setup match file test for 5
 
-  7342963 Revert "base"
-  b940b09 Revert "picked-signed"
+expecting success of 3070.853 'wildmatch: match '5' '[[:xdigit:]]'': 
+			test-tool wildmatch wildmatch '5' '[[:xdigit:]]'
+		
+ok 853 - wildmatch: match '5' '[[:xdigit:]]'
 
-HEAD is now at e4ca149 picked-signed
-[detached HEAD b940b09] Revert "picked-signed"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert dc0113b... base
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Unstaged changes after reset:
-M	foo
-ok 34 - reset after final pick clears revert state
+expecting success of 3070.854 'wildmatch (via ls-files): match '[[:xdigit:]]' '5'': 
+				printf '%s' '5' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 854 - wildmatch (via ls-files): match '[[:xdigit:]]' '5'
 
-expecting success of 3507.35 'revert conflict, diff3 -m style': 
-	pristine_detach initial &&
-	git config merge.conflictstyle diff3 &&
-	cat <<-EOF >expected &&
-	<<<<<<< HEAD
-	a
-	||||||| objid (picked)
-	c
-	=======
-	b
-	>>>>>>> parent of objid (picked)
-	EOF
+expecting success of 3070.855 'iwildmatch: match '5' '[[:xdigit:]]'': 
+			test-tool wildmatch iwildmatch '5' '[[:xdigit:]]'
+		
+ok 855 - iwildmatch: match '5' '[[:xdigit:]]'
 
-	test_must_fail git revert picked &&
+expecting success of 3070.856 'iwildmatch (via ls-files): match '[[:xdigit:]]' '5'': 
+				printf '%s' '5' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 856 - iwildmatch (via ls-files): match '[[:xdigit:]]' '5'
 
-	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
-	test_cmp expected actual
+expecting success of 3070.857 'pathmatch: match '5' '[[:xdigit:]]'': 
+			test-tool wildmatch pathmatch '5' '[[:xdigit:]]'
+		
+ok 857 - pathmatch: match '5' '[[:xdigit:]]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.858 'pathmatch (via ls-files): match '[[:xdigit:]]' '5'': 
+				printf '%s' '5' >expect &&
+				git ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 858 - pathmatch (via ls-files): match '[[:xdigit:]]' '5'
 
-  b940b09 Revert "picked-signed"
+expecting success of 3070.859 'ipathmatch: match '5' '[[:xdigit:]]'': 
+			test-tool wildmatch ipathmatch '5' '[[:xdigit:]]'
+		
+ok 859 - ipathmatch: match '5' '[[:xdigit:]]'
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 35 - revert conflict, diff3 -m style
+expecting success of 3070.860 'ipathmatch (via ls-files): match '[[:xdigit:]]' '5'': 
+				printf '%s' '5' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 860 - ipathmatch (via ls-files): match '[[:xdigit:]]' '5'
 
-expecting success of 3507.36 'revert conflict, ensure commit.cleanup = scissors places scissors line properly': 
-	pristine_detach initial &&
-	git config commit.cleanup scissors &&
-	cat >expected <<-EOF &&
-		Revert "picked"
+expecting success of 3070.861 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing 5
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 861 - cleanup after previous file test
 
-		This reverts commit OBJID.
+expecting success of 3070.862 'setup match file test for f': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 862 - setup match file test for f
 
-		# ------------------------ >8 ------------------------
-		# Do not modify or remove the line above.
-		# Everything below it will be ignored.
-		#
-		# Conflicts:
-		#	foo
-		EOF
+expecting success of 3070.863 'wildmatch: match 'f' '[[:xdigit:]]'': 
+			test-tool wildmatch wildmatch 'f' '[[:xdigit:]]'
+		
+ok 863 - wildmatch: match 'f' '[[:xdigit:]]'
 
-	test_must_fail git revert picked &&
+expecting success of 3070.864 'wildmatch (via ls-files): match '[[:xdigit:]]' 'f'': 
+				printf '%s' 'f' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 864 - wildmatch (via ls-files): match '[[:xdigit:]]' 'f'
 
-	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
-	test_cmp expected actual
+expecting success of 3070.865 'iwildmatch: match 'f' '[[:xdigit:]]'': 
+			test-tool wildmatch iwildmatch 'f' '[[:xdigit:]]'
+		
+ok 865 - iwildmatch: match 'f' '[[:xdigit:]]'
 
-HEAD is now at df2a63d initial
-warning: cancelling a revert in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 36 - revert conflict, ensure commit.cleanup = scissors places scissors line properly
+expecting success of 3070.866 'iwildmatch (via ls-files): match '[[:xdigit:]]' 'f'': 
+				printf '%s' 'f' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 866 - iwildmatch (via ls-files): match '[[:xdigit:]]' 'f'
 
-expecting success of 3507.37 'revert conflict, ensure cleanup=scissors places scissors line properly': 
-	pristine_detach initial &&
-	git config --unset commit.cleanup &&
-	cat >expected <<-EOF &&
-		Revert "picked"
+expecting success of 3070.867 'pathmatch: match 'f' '[[:xdigit:]]'': 
+			test-tool wildmatch pathmatch 'f' '[[:xdigit:]]'
+		
+ok 867 - pathmatch: match 'f' '[[:xdigit:]]'
 
-		This reverts commit OBJID.
+expecting success of 3070.868 'pathmatch (via ls-files): match '[[:xdigit:]]' 'f'': 
+				printf '%s' 'f' >expect &&
+				git ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 868 - pathmatch (via ls-files): match '[[:xdigit:]]' 'f'
 
-		# ------------------------ >8 ------------------------
-		# Do not modify or remove the line above.
-		# Everything below it will be ignored.
-		#
-		# Conflicts:
-		#	foo
-		EOF
+expecting success of 3070.869 'ipathmatch: match 'f' '[[:xdigit:]]'': 
+			test-tool wildmatch ipathmatch 'f' '[[:xdigit:]]'
+		
+ok 869 - ipathmatch: match 'f' '[[:xdigit:]]'
 
-	test_must_fail git revert --cleanup=scissors picked &&
+expecting success of 3070.870 'ipathmatch (via ls-files): match '[[:xdigit:]]' 'f'': 
+				printf '%s' 'f' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 870 - ipathmatch (via ls-files): match '[[:xdigit:]]' 'f'
 
-	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
-	test_cmp expected actual
+expecting success of 3070.871 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing f
+ok 871 - cleanup after previous file test
 
-HEAD is now at df2a63d initial
-warning: cancelling a revert in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 37 - revert conflict, ensure cleanup=scissors places scissors line properly
+expecting success of 3070.872 'setup match file test for D': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 872 - setup match file test for D
 
-expecting success of 3507.38 'failed cherry-pick does not forget -s': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick -s picked &&
-	test_grep -e "Signed-off-by" .git/MERGE_MSG
+expecting success of 3070.873 'wildmatch: match 'D' '[[:xdigit:]]'': 
+			test-tool wildmatch wildmatch 'D' '[[:xdigit:]]'
+		
+ok 873 - wildmatch: match 'D' '[[:xdigit:]]'
 
-HEAD is now at df2a63d initial
-warning: cancelling a revert in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-Signed-off-by: C O Mitter <committer@example.com>
-ok 38 - failed cherry-pick does not forget -s
+expecting success of 3070.874 'wildmatch (via ls-files): match '[[:xdigit:]]' 'D'': 
+				printf '%s' 'D' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 874 - wildmatch (via ls-files): match '[[:xdigit:]]' 'D'
 
-expecting success of 3507.39 'commit after failed cherry-pick does not add duplicated -s': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick -s picked-signed &&
-	git commit -a -s &&
-	test $(git show -s >tmp && grep -c "Signed-off-by" tmp && rm tmp) = 1
+expecting success of 3070.875 'iwildmatch: match 'D' '[[:xdigit:]]'': 
+			test-tool wildmatch iwildmatch 'D' '[[:xdigit:]]'
+		
+ok 875 - iwildmatch: match 'D' '[[:xdigit:]]'
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply e4ca149... picked-signed
-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"
-[detached HEAD ae79e40] picked-signed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 6 insertions(+)
-ok 39 - commit after failed cherry-pick does not add duplicated -s
+expecting success of 3070.876 'iwildmatch (via ls-files): match '[[:xdigit:]]' 'D'': 
+				printf '%s' 'D' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 876 - iwildmatch (via ls-files): match '[[:xdigit:]]' 'D'
 
-expecting success of 3507.40 'commit after failed cherry-pick adds -s at the right place': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick picked &&
+expecting success of 3070.877 'pathmatch: match 'D' '[[:xdigit:]]'': 
+			test-tool wildmatch pathmatch 'D' '[[:xdigit:]]'
+		
+ok 877 - pathmatch: match 'D' '[[:xdigit:]]'
 
-	git commit -a -s &&
+expecting success of 3070.878 'pathmatch (via ls-files): match '[[:xdigit:]]' 'D'': 
+				printf '%s' 'D' >expect &&
+				git ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 878 - pathmatch (via ls-files): match '[[:xdigit:]]' 'D'
 
-	# Do S-o-b and Conflicts appear in the right order?
-	cat <<-\EOF >expect &&
-	Signed-off-by: C O Mitter <committer@example.com>
-	# Conflicts:
-	EOF
-	grep -e "^# Conflicts:" -e "^Signed-off-by" .git/COMMIT_EDITMSG >actual &&
-	test_cmp expect actual &&
+expecting success of 3070.879 'ipathmatch: match 'D' '[[:xdigit:]]'': 
+			test-tool wildmatch ipathmatch 'D' '[[:xdigit:]]'
+		
+ok 879 - ipathmatch: match 'D' '[[:xdigit:]]'
 
-	cat <<-\EOF >expected &&
-	picked
+expecting success of 3070.880 'ipathmatch (via ls-files): match '[[:xdigit:]]' 'D'': 
+				printf '%s' 'D' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 880 - ipathmatch (via ls-files): match '[[:xdigit:]]' 'D'
 
-	Signed-off-by: C O Mitter <committer@example.com>
-	EOF
+expecting success of 3070.881 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing D
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 881 - cleanup after previous file test
 
-	git show -s --pretty=format:%B >actual &&
-	test_cmp expected actual
+expecting success of 3070.882 'setup match file test for _': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 882 - setup match file test for _
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.883 'wildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'': 
+			test-tool wildmatch wildmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+		
+ok 883 - wildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
 
-  ae79e40 picked-signed
+expecting success of 3070.884 'wildmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'': 
+				printf '%s' '_' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 884 - wildmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-[detached HEAD 56f790d] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 6 insertions(+)
-ok 40 - commit after failed cherry-pick adds -s at the right place
+expecting success of 3070.885 'iwildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'': 
+			test-tool wildmatch iwildmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+		
+ok 885 - iwildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
 
-expecting success of 3507.41 'commit --amend -s places the sign-off at the right place': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick picked &&
+expecting success of 3070.886 'iwildmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'': 
+				printf '%s' '_' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 886 - iwildmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
 
-	# emulate old-style conflicts block
-	mv .git/MERGE_MSG .git/MERGE_MSG+ &&
-	sed -e "/^# Conflicts:/,\$s/^# *//" .git/MERGE_MSG+ >.git/MERGE_MSG &&
+expecting success of 3070.887 'pathmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'': 
+			test-tool wildmatch pathmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+		
+ok 887 - pathmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
 
-	git commit -a &&
-	git commit --amend -s &&
+expecting success of 3070.888 'pathmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'': 
+				printf '%s' '_' >expect &&
+				git ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 888 - pathmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
 
-	# Do S-o-b and Conflicts appear in the right order?
-	cat <<-\EOF >expect &&
-	Signed-off-by: C O Mitter <committer@example.com>
-	Conflicts:
-	EOF
-	grep -e "^Conflicts:" -e "^Signed-off-by" .git/COMMIT_EDITMSG >actual &&
-	test_cmp expect actual
+expecting success of 3070.889 'ipathmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'': 
+			test-tool wildmatch ipathmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+		
+ok 889 - ipathmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3070.890 'ipathmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'': 
+				printf '%s' '_' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 890 - ipathmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
 
-  56f790d picked
+expecting success of 3070.891 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing _
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 891 - cleanup after previous file test
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-[detached HEAD a795bbb] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 6 insertions(+)
-[detached HEAD 91df379] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 6 insertions(+)
-ok 41 - commit --amend -s places the sign-off at the right place
+expecting success of 3070.892 'setup match file test for .': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 892 - setup match file test for .
 
-expecting success of 3507.42 'cherry-pick preserves sparse-checkout': 
-	pristine_detach initial &&
-	test_config core.sparseCheckout true &&
-	test_when_finished "
-		echo \"/*\" >.git/info/sparse-checkout
-		git read-tree --reset -u HEAD
-		rm .git/info/sparse-checkout" &&
-	mkdir .git/info &&
-	echo /unrelated >.git/info/sparse-checkout &&
-	git read-tree --reset -u HEAD &&
-	test_must_fail git cherry-pick -Xours picked>actual &&
-	test_grep ! "Changes not staged for commit:" actual
+expecting success of 3070.893 'wildmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'': 
+			test-tool wildmatch wildmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+		
+ok 893 - wildmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+checking known breakage of 3070.894 'wildmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.'': false
+not ok 894 - wildmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
 
-  91df379 picked
+expecting success of 3070.895 'iwildmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'': 
+			test-tool wildmatch iwildmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+		
+ok 895 - iwildmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
 
-HEAD is now at df2a63d initial
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+checking known breakage of 3070.896 'iwildmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.'': false
+not ok 896 - iwildmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
 
-    git commit --allow-empty
+expecting success of 3070.897 'pathmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'': 
+			test-tool wildmatch pathmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+		
+ok 897 - pathmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
 
-Otherwise, please use 'git cherry-pick --skip'
-ok 42 - cherry-pick preserves sparse-checkout
+checking known breakage of 3070.898 'pathmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.'': false
+not ok 898 - pathmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
 
-expecting success of 3507.43 'cherry-pick --continue remembers --keep-redundant-commits': 
-	test_when_finished "git cherry-pick --abort || :" &&
-	pristine_detach initial &&
-	test_must_fail git cherry-pick --keep-redundant-commits picked redundant &&
-	echo c >foo &&
-	git add foo &&
-	git cherry-pick --continue
+expecting success of 3070.899 'ipathmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'': 
+			test-tool wildmatch ipathmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+		
+ok 899 - ipathmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-[detached HEAD d9f497e] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 22de78d] redundant-pick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
-error: no cherry-pick or revert in progress
-fatal: cherry-pick failed
-ok 43 - cherry-pick --continue remembers --keep-redundant-commits
+checking known breakage of 3070.900 'ipathmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.'': false
+not ok 900 - ipathmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
 
-expecting success of 3507.44 'cherry-pick --continue remembers --allow-empty and --allow-empty-message': 
-	test_when_finished "git cherry-pick --abort || :" &&
-	pristine_detach initial &&
-	test_must_fail git cherry-pick --allow-empty --allow-empty-message \
-				       picked empty &&
-	echo c >foo &&
-	git add foo &&
-	git cherry-pick --continue
+expecting success of 3070.901 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 901 - cleanup after previous file test
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+expecting success of 3070.902 'setup match file test for 5': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 902 - setup match file test for 5
 
-  22de78d redundant-pick
-  d9f497e picked
+expecting success of 3070.903 'wildmatch: match '5' '[a-c[:digit:]x-z]'': 
+			test-tool wildmatch wildmatch '5' '[a-c[:digit:]x-z]'
+		
+ok 903 - wildmatch: match '5' '[a-c[:digit:]x-z]'
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-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"
-[detached HEAD d9f497e] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD d7f7844] 
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
-error: no cherry-pick or revert in progress
-fatal: cherry-pick failed
-ok 44 - cherry-pick --continue remembers --allow-empty and --allow-empty-message
+expecting success of 3070.904 'wildmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'': 
+				printf '%s' '5' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 904 - wildmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
 
-# passed all 44 test(s)
-1..44
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3602-rm-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
+expecting success of 3070.905 'iwildmatch: match '5' '[a-c[:digit:]x-z]'': 
+			test-tool wildmatch iwildmatch '5' '[a-c[:digit:]x-z]'
+		
+ok 905 - iwildmatch: match '5' '[a-c[:digit:]x-z]'
 
-	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
+expecting success of 3070.906 'iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'': 
+				printf '%s' '5' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 906 - iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
 
-	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
+expecting success of 3070.907 'pathmatch: match '5' '[a-c[:digit:]x-z]'': 
+			test-tool wildmatch pathmatch '5' '[a-c[:digit:]x-z]'
+		
+ok 907 - pathmatch: match '5' '[a-c[:digit:]x-z]'
 
-	echo b | cat sparse_error_header - >sparse_entry_b_error &&
-	cat sparse_entry_b_error sparse_hint >b_error_and_hint
+expecting success of 3070.908 'pathmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'': 
+				printf '%s' '5' >expect &&
+				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 908 - pathmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
 
-[master (root-commit) ff99497] files
- 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
-ok 1 - setup
+expecting success of 3070.909 'ipathmatch: match '5' '[a-c[:digit:]x-z]'': 
+			test-tool wildmatch ipathmatch '5' '[a-c[:digit:]x-z]'
+		
+ok 909 - ipathmatch: match '5' '[a-c[:digit:]x-z]'
 
-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 3070.910 'ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'': 
+				printf '%s' '5' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 910 - ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
 
-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
+expecting success of 3070.911 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-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
+Removing 5
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 911 - cleanup after previous file test
 
-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
+expecting success of 3070.912 'setup match file test for b': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-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 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 &&
-
-	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 912 - setup match file test for b
 
-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
+expecting success of 3070.913 'wildmatch: match 'b' '[a-c[:digit:]x-z]'': 
+			test-tool wildmatch wildmatch 'b' '[a-c[:digit:]x-z]'
+		
+ok 913 - wildmatch: match 'b' '[a-c[:digit:]x-z]'
 
-HEAD is now at ff99497 files
-rm 'sub/d'
-rm 'sub/dir/e'
-ok 6 - recursive rm --sparse removes sparse entries
+expecting success of 3070.914 'wildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'': 
+				printf '%s' 'b' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 914 - wildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
 
-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 3070.915 'iwildmatch: match 'b' '[a-c[:digit:]x-z]'': 
+			test-tool wildmatch iwildmatch 'b' '[a-c[:digit:]x-z]'
+		
+ok 915 - iwildmatch: match 'b' '[a-c[:digit:]x-z]'
 
-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
+expecting success of 3070.916 'iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'': 
+				printf '%s' 'b' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 916 - iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
 
-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 3070.917 'pathmatch: match 'b' '[a-c[:digit:]x-z]'': 
+			test-tool wildmatch pathmatch 'b' '[a-c[:digit:]x-z]'
+		
+ok 917 - pathmatch: match 'b' '[a-c[:digit:]x-z]'
 
-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
+expecting success of 3070.918 'pathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'': 
+				printf '%s' 'b' >expect &&
+				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 918 - pathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
 
-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 3070.919 'ipathmatch: match 'b' '[a-c[:digit:]x-z]'': 
+			test-tool wildmatch ipathmatch 'b' '[a-c[:digit:]x-z]'
+		
+ok 919 - ipathmatch: match 'b' '[a-c[:digit:]x-z]'
 
-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
+expecting success of 3070.920 'ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'': 
+				printf '%s' 'b' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 920 - ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
 
-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 3070.921 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing b
+Removing expect
+ok 921 - cleanup after previous file test
 
-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
+expecting success of 3070.922 'setup match file test for y': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 922 - setup match file test for y
 
-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 3070.923 'wildmatch: match 'y' '[a-c[:digit:]x-z]'': 
+			test-tool wildmatch wildmatch 'y' '[a-c[:digit:]x-z]'
+		
+ok 923 - wildmatch: match 'y' '[a-c[:digit:]x-z]'
 
-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
+expecting success of 3070.924 'wildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'': 
+				printf '%s' 'y' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 924 - wildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
 
-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 3070.925 'iwildmatch: match 'y' '[a-c[:digit:]x-z]'': 
+			test-tool wildmatch iwildmatch 'y' '[a-c[:digit:]x-z]'
+		
+ok 925 - iwildmatch: match 'y' '[a-c[:digit:]x-z]'
 
-	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
+expecting success of 3070.926 'iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'': 
+				printf '%s' 'y' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 926 - iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
 
-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 3070.927 'pathmatch: match 'y' '[a-c[:digit:]x-z]'': 
+			test-tool wildmatch pathmatch 'y' '[a-c[:digit:]x-z]'
+		
+ok 927 - pathmatch: match 'y' '[a-c[:digit:]x-z]'
 
-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 &&
+expecting success of 3070.928 'pathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'': 
+				printf '%s' 'y' >expect &&
+				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 928 - pathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
 
-	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
+expecting success of 3070.929 'ipathmatch: match 'y' '[a-c[:digit:]x-z]'': 
+			test-tool wildmatch ipathmatch 'y' '[a-c[:digit:]x-z]'
+		
+ok 929 - ipathmatch: match 'y' '[a-c[:digit:]x-z]'
 
-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
+expecting success of 3070.930 'ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'': 
+				printf '%s' 'y' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 930 - ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3404-rebase-interactive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+expecting success of 3070.931 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing y
+ok 931 - cleanup after previous file test
 
-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 3070.932 'setup match file test for q': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 932 - setup match file test for q
 
-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
+expecting success of 3070.933 'wildmatch: no match 'q' '[a-c[:digit:]x-z]'': 
+			test_must_fail test-tool wildmatch wildmatch 'q' '[a-c[:digit:]x-z]'
+		
+ok 933 - wildmatch: no match 'q' '[a-c[:digit:]x-z]'
 
-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 3070.934 'wildmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 934 - wildmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
 
-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 3070.935 'iwildmatch: no match 'q' '[a-c[:digit:]x-z]'': 
+			test_must_fail test-tool wildmatch iwildmatch 'q' '[a-c[:digit:]x-z]'
+		
+ok 935 - iwildmatch: no match 'q' '[a-c[:digit:]x-z]'
 
-ok 3 - rebase -i with empty todo list
+expecting success of 3070.936 'iwildmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 936 - iwildmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
 
-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-*
+expecting success of 3070.937 'pathmatch: no match 'q' '[a-c[:digit:]x-z]'': 
+			test_must_fail test-tool wildmatch pathmatch 'q' '[a-c[:digit:]x-z]'
+		
+ok 937 - pathmatch: no match 'q' '[a-c[:digit:]x-z]'
 
-Switched to branch 'primary'
-rebase -i script before editing:
-pick 313fe96 # B
-pick d0f65f2 # C
-pick 0547e3f # D
-pick 8f99a4f # E
+expecting success of 3070.938 'pathmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'': 
+				>expect &&
+				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 938 - pathmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
 
-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
+expecting success of 3070.939 'ipathmatch: no match 'q' '[a-c[:digit:]x-z]'': 
+			test_must_fail test-tool wildmatch ipathmatch 'q' '[a-c[:digit:]x-z]'
+		
+ok 939 - ipathmatch: no match 'q' '[a-c[:digit:]x-z]'
 
-  git rebase --continue
+expecting success of 3070.940 'ipathmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 940 - ipathmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
 
+expecting success of 3070.941 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing q
+ok 941 - cleanup after previous file test
 
-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 3070.942 'setup match file test for ]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 942 - setup match file test for ]
 
-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
+expecting success of 3070.943 'wildmatch: match ']' '[\\-^]'': 
+			test-tool wildmatch wildmatch ']' '[\\-^]'
+		
+ok 943 - wildmatch: match ']' '[\\-^]'
 
-Already on 'primary'
-rebase -i script before editing:
-pick 8f99a4f # E
+expecting success of 3070.944 'wildmatch (via ls-files): match '[\\-^]' ']'': 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 944 - wildmatch (via ls-files): match '[\\-^]' ']'
 
-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 3070.945 'iwildmatch: match ']' '[\\-^]'': 
+			test-tool wildmatch iwildmatch ']' '[\\-^]'
+		
+ok 945 - iwildmatch: match ']' '[\\-^]'
 
-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^
-	)
+expecting success of 3070.946 'iwildmatch (via ls-files): match '[\\-^]' ']'': 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 946 - iwildmatch (via ls-files): match '[\\-^]' ']'
 
-Already on 'primary'
-rebase -i script before editing:
-pick 8f99a4f # E
+expecting success of 3070.947 'pathmatch: match ']' '[\\-^]'': 
+			test-tool wildmatch pathmatch ']' '[\\-^]'
+		
+ok 947 - pathmatch: match ']' '[\\-^]'
 
-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 3070.948 'pathmatch (via ls-files): match '[\\-^]' ']'': 
+				printf '%s' ']' >expect &&
+				git ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 948 - pathmatch (via ls-files): match '[\\-^]' ']'
 
-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
+expecting success of 3070.949 'ipathmatch: match ']' '[\\-^]'': 
+			test-tool wildmatch ipathmatch ']' '[\\-^]'
+		
+ok 949 - ipathmatch: match ']' '[\\-^]'
 
-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 3070.950 'ipathmatch (via ls-files): match '[\\-^]' ']'': 
+				printf '%s' ']' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 950 - ipathmatch (via ls-files): match '[\\-^]' ']'
 
-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
+expecting success of 3070.951 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 951 - cleanup after previous file test
 
-Already on 'primary'
-rebase -i script before editing:
-pick 8f99a4f # E
+expecting success of 3070.952 'setup match file test for [': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 952 - setup match file test for [
 
-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
+expecting success of 3070.953 'wildmatch: no match '[' '[\\-^]'': 
+			test_must_fail test-tool wildmatch wildmatch '[' '[\\-^]'
+		
+ok 953 - wildmatch: no match '[' '[\\-^]'
 
-  git rebase --continue
+expecting success of 3070.954 'wildmatch (via ls-files): no match '[\\-^]' '['': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 954 - wildmatch (via ls-files): no match '[\\-^]' '['
 
+expecting success of 3070.955 'iwildmatch: no match '[' '[\\-^]'': 
+			test_must_fail test-tool wildmatch iwildmatch '[' '[\\-^]'
+		
+ok 955 - iwildmatch: no match '[' '[\\-^]'
 
-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 3070.956 'iwildmatch (via ls-files): no match '[\\-^]' '['': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 956 - iwildmatch (via ls-files): no match '[\\-^]' '['
 
-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
+expecting success of 3070.957 'pathmatch: no match '[' '[\\-^]'': 
+			test_must_fail test-tool wildmatch pathmatch '[' '[\\-^]'
+		
+ok 957 - pathmatch: no match '[' '[\\-^]'
 
-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
+expecting success of 3070.958 'pathmatch (via ls-files): no match '[\\-^]' '['': 
+				>expect &&
+				git ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 958 - pathmatch (via ls-files): no match '[\\-^]' '['
 
-  git rebase --continue
+expecting success of 3070.959 'ipathmatch: no match '[' '[\\-^]'': 
+			test_must_fail test-tool wildmatch ipathmatch '[' '[\\-^]'
+		
+ok 959 - ipathmatch: no match '[' '[\\-^]'
 
+expecting success of 3070.960 'ipathmatch (via ls-files): no match '[\\-^]' '['': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 960 - ipathmatch (via ls-files): no match '[\\-^]' '['
 
-Previous HEAD position was 0547e3f D
-Switched to branch 'primary'
-ok 9 - cherry-pick works with rebase --exec
+expecting success of 3070.961 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 961 - cleanup after previous file test
 
-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.51.0/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
-
-HEAD is now at 2596307 different author
-[branch1 748a43d] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-HEAD is now at 2596307 different author
-[branch1 34d1a6c] b
- Author: AttributeMe <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Rebasing (1/1)
Auto-merging conflict
-CONFLICT (add/add): Merge conflict in conflict
-error: could not apply 34d1a6c... 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 34d1a6c... # b
-[detached HEAD 7866b12] b
- Author: AttributeMe <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/branch1.
-Author: AttributeMe <author@example.com>
-ok 26 - retain authorship w/ conflicts
-
-expecting success of 3404.27 'squash': 
-	git reset --hard twerp &&
-	echo B > file7 &&
-	test_tick &&
-	GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
-	echo "******************************" &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
-			git rebase -i --onto primary HEAD~2
-	) &&
-	test B = $(cat file7) &&
-	test_cmp_rev HEAD^ primary
-
-HEAD is now at 2596307 different author
-[branch1 cdf577a] nitfol
- Author: Nitfol <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-******************************
-rebase -i script before editing:
-pick 2596307 # different author
-pick cdf577a # nitfol
-
-rebase -i script after editing:
-pick 2596307 # different author
-squash cdf577a # nitfol
-Rebasing (1/2)
Rebasing (2/2)
[detached HEAD d2d5ba7] different author
- Author: Twerp Snog <author@example.com>
- Date: Thu Apr 7 15:33:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-Successfully rebased and updated refs/heads/branch1.
-ok 27 - squash
-
-expecting success of 3404.28 'retain authorship when squashing': 
-	git show HEAD >actual &&
-	grep "^Author: Twerp Snog" actual
-
-Author: Twerp Snog <author@example.com>
-ok 28 - retain authorship when squashing
-
-expecting success of 3404.29 '--continue tries to commit': 
-	git reset --hard D &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
-		echo resolved > file1 &&
-		git add file1 &&
-		FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
-	) &&
-	test_cmp_rev HEAD^ new-branch1 &&
-	git show HEAD >actual &&
-	grep chouette actual
-
-HEAD is now at 0547e3f D
-Rebasing (1/1)
Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 0547e3f... D
-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 0547e3f... # D
-[detached HEAD e986ac9] chouette!
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/branch1.
-    chouette!
-ok 29 - --continue tries to commit
-
-expecting success of 3404.30 'verbose flag is heeded, even after --continue': 
-	git reset --hard primary@{1} &&
-	test_tick &&
-	test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
-	echo resolved > file1 &&
-	git add file1 &&
-	git rebase --continue > output &&
-	grep "^ file1 | 2 +-$" output
-
-HEAD is now at 0547e3f D
-Changes from 6e62bf890e21973b771e4e6fc28f5ade62edb4bc to 5d18e5414f663da21d1363c271f2d684aeda7b5b:
- file1 | 2 +-
- file4 | 1 +
- file5 | 1 +
- file6 | 1 +
- 4 files changed, 4 insertions(+), 1 deletion(-)
- create mode 100644 file4
- create mode 100644 file5
- create mode 100644 file6
-Rebasing (1/1)
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 0547e3f... D
-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 0547e3f... # D
-Successfully rebased and updated refs/heads/branch1.
- file1 | 2 +-
-ok 30 - verbose flag is heeded, even after --continue
-
-expecting success of 3404.31 'multi-squash only fires up editor once': 
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="ONCE" \
-			FAKE_LINES="1 squash 2 squash 3 squash 4" \
-			EXPECT_HEADER_COUNT=4 \
-			git rebase -i $base
-	) &&
-	test $base = $(git rev-parse HEAD^) &&
-	git show >output &&
-	grep ONCE output >actual &&
-	test_line_count = 1 actual
-
-rebase -i script before editing:
-pick 615be62 # I
-pick 0626e8d # H
-pick 5d18e54 # G
-pick 7384ee8 # D
-
-rebase -i script after editing:
-pick 615be62 # I
-squash 0626e8d # H
-squash 5d18e54 # G
-squash 7384ee8 # D
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 450e393] I
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 file5
- create mode 100644 file6
-Successfully rebased and updated refs/heads/branch1.
-ok 31 - multi-squash only fires up editor once
-
-expecting success of 3404.32 'multi-fixup does not fire up editor': 
-	git checkout -b multi-fixup E &&
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="NEVER" \
-			FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
-			git rebase -i $base
-	) &&
-	test $base = $(git rev-parse HEAD^) &&
-	git show >output &&
-	! grep NEVER output &&
-	git checkout @{-1} &&
-	git branch -D multi-fixup
-
-Switched to a new branch 'multi-fixup'
-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
-fixup d0f65f2 # C
-fixup 0547e3f # D
-fixup 8f99a4f # E
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/multi-fixup.
-Switched to branch 'branch1'
-Deleted branch multi-fixup (was b72b875).
-ok 32 - multi-fixup does not fire up editor
-
-expecting success of 3404.33 'commit message used after conflict': 
-	git checkout -b conflict-fixup conflict-branch &&
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" \
-			git rebase -i $base &&
-		echo three > conflict &&
-		git add conflict &&
-		FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
-			git rebase --continue
-	) &&
-	test $base = $(git rev-parse HEAD^) &&
-	git show >output &&
-	grep ONCE output >actual &&
-	test_line_count = 1 actual &&
-	git checkout @{-1} &&
-	git branch -D conflict-fixup
-
-Switched to a new branch 'conflict-fixup'
-rebase -i script before editing:
-pick b895952 # one
-pick 766a798 # two
-pick 1eadf03 # three
-pick f91a2b3 # four
-
-rebase -i script after editing:
-pick b895952 # one
-fixup 1eadf03 # three
-fixup f91a2b3 # four
-Rebasing (2/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 1eadf03... three
-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 1eadf03... # three
-[detached HEAD 0894a89] one
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Rebasing (3/3)
Successfully rebased and updated refs/heads/conflict-fixup.
-Switched to branch 'branch1'
-Deleted branch conflict-fixup (was 72b9a95).
-ok 33 - commit message used after conflict
-
-expecting success of 3404.34 'commit message retained after conflict': 
-	git checkout -b conflict-squash conflict-branch &&
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 fixup 3 squash 4" \
-			git rebase -i $base &&
-		echo three > conflict &&
-		git add conflict &&
-		FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
-			git rebase --continue
-	) &&
-	test $base = $(git rev-parse HEAD^) &&
-	git show >output &&
-	grep TWICE output >actual &&
-	test_line_count = 2 actual &&
-	git checkout @{-1} &&
-	git branch -D conflict-squash
-
-Switched to a new branch 'conflict-squash'
-rebase -i script before editing:
-pick b895952 # one
-pick 766a798 # two
-pick 1eadf03 # three
-pick f91a2b3 # four
-
-rebase -i script after editing:
-pick b895952 # one
-fixup 1eadf03 # three
-squash f91a2b3 # four
-Rebasing (2/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 1eadf03... three
-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 1eadf03... # three
-[detached HEAD f044f69] one
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Rebasing (3/3)
[detached HEAD e98a2cf] one
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Successfully rebased and updated refs/heads/conflict-squash.
-Switched to branch 'branch1'
-Deleted branch conflict-squash (was e98a2cf).
-ok 34 - commit message retained after conflict
-
-expecting success of 3404.35 'squash and fixup generate correct log messages': 
-	cat >expect-squash-fixup <<-\EOF &&
-	B
-
-	D
-
-	ONCE
-	EOF
-	git checkout -b squash-fixup E &&
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="ONCE" \
-			FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
-			EXPECT_HEADER_COUNT=4 \
-			git rebase -i $base
-	) &&
-	git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
-	test_cmp expect-squash-fixup actual-squash-fixup &&
-	git cat-file commit HEAD@{2} >actual &&
-	grep "^# This is a combination of 3 commits\." actual &&
-	git cat-file commit HEAD@{3} >actual &&
-	grep "^# This is a combination of 2 commits\." actual  &&
-	git checkout @{-1} &&
-	git branch -D squash-fixup
-
-Switched to a new branch 'squash-fixup'
-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
-fixup d0f65f2 # C
-squash 0547e3f # D
-fixup 8f99a4f # E
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 2e14af9] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 file2
- create mode 100644 file3
-Successfully rebased and updated refs/heads/squash-fixup.
-# This is a combination of 3 commits.
-# This is a combination of 2 commits.
-Switched to branch 'branch1'
-Deleted branch squash-fixup (was 2e14af9).
-ok 35 - squash and fixup generate correct log messages
-
-expecting success of 3404.36 'squash ignores comments': 
-	git checkout -b skip-comments E &&
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="ONCE" \
-			FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
-			EXPECT_HEADER_COUNT=4 \
-			git rebase -i $base
-	) &&
-	test $base = $(git rev-parse HEAD^) &&
-	git show >output &&
-	grep ONCE output >actual &&
-	test_line_count = 1 actual &&
-	git checkout @{-1} &&
-	git branch -D skip-comments
-
-Switched to a new branch 'skip-comments'
-rebase -i script before editing:
-pick 313fe96 # B
-pick d0f65f2 # C
-pick 0547e3f # D
-pick 8f99a4f # E
-
-rebase -i script after editing:
-# comment
-pick 313fe96 # B
-# comment
-squash d0f65f2 # C
-# comment
-squash 0547e3f # D
-# comment
-squash 8f99a4f # E
-# comment
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD c7441e9] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 file2
- create mode 100644 file3
-Successfully rebased and updated refs/heads/skip-comments.
-Switched to branch 'branch1'
-Deleted branch skip-comments (was c7441e9).
-ok 36 - squash ignores comments
-
-expecting success of 3404.37 'squash ignores blank lines': 
-	git checkout -b skip-blank-lines E &&
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="ONCE" \
-			FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
-			EXPECT_HEADER_COUNT=4 \
-			git rebase -i $base
-	) &&
-	test $base = $(git rev-parse HEAD^) &&
-	git show >output &&
-	grep ONCE output >actual &&
-	test_line_count = 1 actual &&
-	git checkout @{-1} &&
-	git branch -D skip-blank-lines
-
-Switched to a new branch 'skip-blank-lines'
-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
-
-squash d0f65f2 # C
-
-squash 0547e3f # D
-
-squash 8f99a4f # E
-
-Rebasing (3/4)
Rebasing (4/4)
Rebasing (5/4)
[detached HEAD c7441e9] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 file2
- create mode 100644 file3
-Successfully rebased and updated refs/heads/skip-blank-lines.
-Switched to branch 'branch1'
-Deleted branch skip-blank-lines (was c7441e9).
-ok 37 - squash ignores blank lines
-
-expecting success of 3404.38 'squash works as expected': 
-	git checkout -b squash-works no-conflict-branch &&
-	one=$(git rev-parse HEAD~3) &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 git rebase -i HEAD~3
-	) &&
-	test $one = $(git rev-parse HEAD~2)
-
-Switched to a new branch 'squash-works'
-rebase -i script before editing:
-pick 265b89e # K
-pick 6b0f5e6 # L
-pick 3389558 # M
-
-rebase -i script after editing:
-pick 265b89e # K
-s 3389558 # M
-pick 6b0f5e6 # L
-Rebasing (2/3)
[detached HEAD b352334] K
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:27:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 fileK
- create mode 100644 fileM
-Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-works.
-ok 38 - squash works as expected
-
-expecting success of 3404.39 'interrupted squash works as expected': 
-	git checkout -b interrupted-squash conflict-branch &&
-	one=$(git rev-parse HEAD~3) &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 squash 3 2" \
-			git rebase -i HEAD~3
-	) &&
-	test_write_lines one two four > conflict &&
-	git add conflict &&
-	test_must_fail git rebase --continue &&
-	echo resolved > conflict &&
-	git add conflict &&
-	git rebase --continue &&
-	test $one = $(git rev-parse HEAD~2)
-
-Switched to a new branch 'interrupted-squash'
-rebase -i script before editing:
-pick 766a798 # two
-pick 1eadf03 # three
-pick f91a2b3 # four
-
-rebase -i script after editing:
-pick 766a798 # two
-squash f91a2b3 # four
-pick 1eadf03 # three
-Rebasing (2/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply f91a2b3... four
-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 f91a2b3... # four
-[detached HEAD a2f4578] two
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Rebasing (3/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 1eadf03... three
-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 1eadf03... # three
-[detached HEAD 6b76c65] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 3 deletions(-)
-Successfully rebased and updated refs/heads/interrupted-squash.
-ok 39 - interrupted squash works as expected
-
-expecting success of 3404.40 'interrupted squash works as expected (case 2)': 
-	git checkout -b interrupted-squash2 conflict-branch &&
-	one=$(git rev-parse HEAD~3) &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="3 squash 1 2" \
-			git rebase -i HEAD~3
-	) &&
-	test_write_lines one four > conflict &&
-	git add conflict &&
-	test_must_fail git rebase --continue &&
-	test_write_lines one two four > conflict &&
-	git add conflict &&
-	test_must_fail git rebase --continue &&
-	echo resolved > conflict &&
-	git add conflict &&
-	git rebase --continue &&
-	test $one = $(git rev-parse HEAD~2)
-
-Switched to a new branch 'interrupted-squash2'
-rebase -i script before editing:
-pick 766a798 # two
-pick 1eadf03 # three
-pick f91a2b3 # four
-
-rebase -i script after editing:
-pick f91a2b3 # four
-squash 766a798 # two
-pick 1eadf03 # three
-Rebasing (1/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply f91a2b3... four
-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 f91a2b3... # four
-[detached HEAD d1badcc] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 766a798... 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 766a798... # two
-[detached HEAD 13f7405] four
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:25:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Rebasing (3/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 1eadf03... three
-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 1eadf03... # three
-[detached HEAD 6785ad5] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 3 deletions(-)
-Successfully rebased and updated refs/heads/interrupted-squash2.
-ok 40 - interrupted squash works as expected (case 2)
-
-expecting success of 3404.41 '--continue tries to commit, even for "edit"': 
-	echo unrelated > file7 &&
-	git add file7 &&
-	test_tick &&
-	git commit -m "unrelated change" &&
-	parent=$(git rev-parse HEAD^) &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-		echo edited > file7 &&
-		git add file7 &&
-		FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
-	) &&
-	test edited = $(git show HEAD:file7) &&
-	git show HEAD >actual &&
-	grep chouette actual &&
-	test $parent = $(git rev-parse HEAD^)
-
-[interrupted-squash2 98947cc] unrelated change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-rebase -i script before editing:
-pick 98947cc # unrelated change
-
-rebase -i script after editing:
-edit 98947cc # unrelated change
-Rebasing (1/1)
Stopped at 98947cc...  # unrelated change
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-[detached HEAD 9483ccd] chouette!
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:39:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-Successfully rebased and updated refs/heads/interrupted-squash2.
-    chouette!
-ok 41 - --continue tries to commit, even for "edit"
-
-expecting success of 3404.42 'aborted --continue does not squash commits after "edit"': 
-	old=$(git rev-parse HEAD) &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-		echo "edited again" > file7 &&
-		git add file7 &&
-		test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue
-	) &&
-	test $old = $(git rev-parse HEAD) &&
-	git rebase --abort
-
-rebase -i script before editing:
-pick 9483ccd # chouette!
-
-rebase -i script after editing:
-edit 9483ccd # chouette!
-Rebasing (1/1)
Stopped at 9483ccd...  # chouette!
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-Aborting commit due to empty commit message.
-error: could not commit staged changes.
-ok 42 - aborted --continue does not squash commits after "edit"
-
-expecting success of 3404.43 'auto-amend only edited commits after "edit"': 
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-		echo "edited again" > file7 &&
-		git add file7 &&
-		FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
-		echo "and again" > file7 &&
-		git add file7 &&
-		test_tick &&
-		test_must_fail env FAKE_COMMIT_MESSAGE="and again" \
-			git rebase --continue
-	) &&
-	git rebase --abort
-
-rebase -i script before editing:
-pick 9483ccd # chouette!
-
-rebase -i script after editing:
-edit 9483ccd # chouette!
-Rebasing (1/1)
Stopped at 9483ccd...  # chouette!
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-[detached HEAD 9b7064d] edited file7 again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: 
-You have uncommitted changes in your working tree. Please, commit them
-first and then run 'git rebase --continue' again.
-ok 43 - auto-amend only edited commits after "edit"
-
-expecting success of 3404.44 'clean error after failed "exec"': 
-	test_tick &&
-	test_when_finished "git rebase --abort || :" &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^
-	) &&
-	echo "edited again" > file7 &&
-	git add file7 &&
-	test_must_fail git rebase --continue 2>error &&
-	test_grep "you have staged changes in your working tree" error &&
-	test_grep ! "could not open.*for reading" error
-
-rebase -i script before editing:
-pick 9483ccd # chouette!
-
-rebase -i script after editing:
-pick 9483ccd # chouette!
-exec false
-Rebasing (2/2)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
-
-  git rebase --continue
-
-
-error: you have staged changes in your working tree
-ok 44 - clean error after failed "exec"
-
-expecting success of 3404.45 'rebase a detached HEAD': 
-	grandparent=$(git rev-parse HEAD~2) &&
-	git checkout $(git rev-parse HEAD) &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="2 1" git rebase -i HEAD~2
-	) &&
-	test $grandparent = $(git rev-parse HEAD~2)
-
-Note: switching to '9483ccdd3462028242a62a4b10b5300681f344d7'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 9483ccd chouette!
-rebase -i script before editing:
-pick 6785ad5 # three
-pick 9483ccd # chouette!
-
-rebase -i script after editing:
-pick 9483ccd # chouette!
-pick 6785ad5 # three
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 45 - rebase a detached HEAD
-
-expecting success of 3404.46 'rebase a commit violating pre-commit': 
-	test_hook pre-commit <<-\EOF &&
-	test -z "$(git diff --cached --check)"
-	EOF
-	echo "monde! " >> file1 &&
-	test_tick &&
-	test_must_fail git commit -m doesnt-verify file1 &&
-	git commit -m doesnt-verify --no-verify file1 &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES=2 git rebase -i HEAD~2
-	)
-
-[detached HEAD c2de550] doesnt-verify
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-rebase -i script before editing:
-pick 2a5c937 # three
-pick c2de550 # doesnt-verify
-
-rebase -i script after editing:
-pick c2de550 # doesnt-verify
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 46 - rebase a commit violating pre-commit
-
-expecting success of 3404.47 'rebase with a file named HEAD in worktree': 
-	git reset --hard &&
-	git checkout -b branch3 A &&
-
-	(
-		GIT_AUTHOR_NAME="Squashed Away" &&
-		export GIT_AUTHOR_NAME &&
-		>HEAD &&
-		git add HEAD &&
-		git commit -m "Add head" &&
-		>BODY &&
-		git add BODY &&
-		git commit -m "Add body"
-	) &&
-
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 squash 2" git rebase -i @{-1}
-	) &&
-	test "$(git show -s --pretty=format:%an)" = "Squashed Away"
-
-
-HEAD is now at 772e3c6 doesnt-verify
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  772e3c6 doesnt-verify
-  82d2839 chouette!
-
-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> 772e3c6
-
-Switched to a new branch 'branch3'
-[branch3 838aee5] Add head
- Author: Squashed Away <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 HEAD
-[branch3 271c26d] Add body
- Author: Squashed Away <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 BODY
-rebase -i script before editing:
-pick 838aee5 # Add head
-pick 271c26d # Add body
-
-rebase -i script after editing:
-pick 838aee5 # Add head
-squash 271c26d # Add body
-Rebasing (1/2)
Rebasing (2/2)
[detached HEAD b224944] Add head
- Author: Squashed Away <author@example.com>
- Date: Thu Apr 7 15:46:13 2005 -0700
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 BODY
- create mode 100644 HEAD
-Successfully rebased and updated refs/heads/branch3.
-ok 47 - rebase with a file named HEAD in worktree
-
-expecting success of 3404.48 'do "noop" when there is nothing to cherry-pick': 
-
-	git checkout -b branch4 HEAD &&
-	GIT_EDITOR=: git commit --amend \
-		--author="Somebody else <somebody@else.com>" &&
-	test $(git rev-parse branch3) != $(git rev-parse branch4) &&
-	git rebase -i branch3 &&
-	test_cmp_rev branch3 branch4
-
-
-Switched to a new branch 'branch4'
-[branch4 beb8dd6] Add head
- Author: Somebody else <somebody@else.com>
- Date: Thu Apr 7 15:46:13 2005 -0700
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 BODY
- create mode 100644 HEAD
-warning: skipped previously applied commit beb8dd6
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Successfully rebased and updated refs/heads/branch4.
-ok 48 - do "noop" when there is nothing to cherry-pick
-
-expecting success of 3404.49 'submodule rebase setup': 
-	git checkout A &&
-	mkdir sub &&
-	(
-		cd sub && git init && >elif &&
-		git add elif && git commit -m "submodule initial"
-	) &&
-	echo 1 >file1 &&
-	git add file1 sub &&
-	test_tick &&
-	git commit -m "One" &&
-	echo 2 >file1 &&
-	test_tick &&
-	git commit -a -m "Two" &&
-	(
-		cd sub && echo 3 >elif &&
-		git commit -a -m "submodule second"
-	) &&
-	test_tick &&
-	git commit -a -m "Three changes submodule"
-
-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
-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 6e62bf8 A
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive/sub/.git/
-[master (root-commit) 6795896] submodule initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 elif
-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"
-[detached HEAD 068ccfe] One
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 160000 sub
-[detached HEAD 8cd1639] Two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 628e79e] submodule second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[detached HEAD d80ae32] Three changes submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 49 - submodule rebase setup
-
-expecting success of 3404.50 'submodule rebase -i': 
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 squash 2 3" git rebase -i A
-	)
-
-rebase -i script before editing:
-pick 068ccfe # One
-pick 8cd1639 # Two
-pick d80ae32 # Three changes submodule
-
-rebase -i script after editing:
-pick 068ccfe # One
-squash 8cd1639 # Two
-pick d80ae32 # Three changes submodule
-Rebasing (2/3)
[detached HEAD 1dab715] One
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:47:13 2005 -0700
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 160000 sub
-Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 50 - submodule rebase -i
-
-expecting success of 3404.51 'submodule conflict setup': 
-	git tag submodule-base &&
-	git checkout HEAD^ &&
-	(
-		cd sub && git checkout HEAD^ && echo 4 >elif &&
-		git add elif && git commit -m "submodule conflict"
-	) &&
-	git add sub &&
-	test_tick &&
-	git commit -m "Conflict in submodule" &&
-	git tag submodule-topic
-
-Previous HEAD position was b1c1bea Three changes submodule
-HEAD is now at 1dab715 One
-M	sub
-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 6795896 submodule initial
-[detached HEAD c3aa4c8] submodule conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[detached HEAD 2f8239b] Conflict in submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 51 - submodule conflict setup
-
-expecting success of 3404.52 'rebase -i continue with only submodule staged': 
-	test_must_fail git rebase -i submodule-base &&
-	git add sub &&
-	git rebase --continue &&
-	test $(git rev-parse submodule-base) != $(git rev-parse HEAD)
-
-Rebasing (1/1)
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 c3aa4c8
-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
-CONFLICT (submodule): Merge conflict in sub
-error: could not apply 2f8239b... Conflict in submodule
-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 2f8239b... # Conflict in submodule
-[detached HEAD e05ea42] Conflict in submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated detached HEAD.
-ok 52 - rebase -i continue with only submodule staged
-
-expecting success of 3404.53 'rebase -i continue with unstaged submodule': 
-	git checkout submodule-topic &&
-	git reset --hard &&
-	test_must_fail git rebase -i submodule-base &&
-	git reset &&
-	git rebase --continue &&
-	test_cmp_rev submodule-base HEAD
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  e05ea42 Conflict in submodule
-
-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> e05ea42
-
-HEAD is now at 2f8239b Conflict in submodule
-HEAD is now at 2f8239b Conflict in submodule
-Rebasing (1/1)
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 c3aa4c8
-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
-CONFLICT (submodule): Merge conflict in sub
-error: could not apply 2f8239b... Conflict in submodule
-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 2f8239b... # Conflict in submodule
-Unstaged changes after reset:
-M	sub
-Successfully rebased and updated detached HEAD.
-ok 53 - rebase -i continue with unstaged submodule
-
-expecting success of 3404.54 'avoid unnecessary reset': 
-	git checkout primary &&
-	git reset --hard &&
-	test-tool chmtime =123456789 file3 &&
-	git update-index --refresh &&
-	HEAD=$(git rev-parse HEAD) &&
-	git rebase -i HEAD~4 &&
-	test $HEAD = $(git rev-parse HEAD) &&
-	MTIME=$(test-tool chmtime --get file3) &&
-	test 123456789 = $MTIME
-
-warning: unable to rmdir 'sub': Directory not empty
-Previous HEAD position was b1c1bea Three changes submodule
-Switched to branch 'primary'
-HEAD is now at 8f99a4f E
-Successfully rebased and updated refs/heads/primary.
-ok 54 - avoid unnecessary reset
-
-expecting success of 3404.55 'reword': 
-	git checkout -b reword-branch primary &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" \
-			git rebase -i A &&
-		git show HEAD >actual &&
-		grep "E changed" actual &&
-		test $(git rev-parse primary) != $(git rev-parse HEAD) &&
-		test_cmp_rev primary^ HEAD^ &&
-		FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" \
-			git rebase -i A &&
-		git show HEAD^ >actual &&
-		grep "D changed" actual &&
-		FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" \
-			git rebase -i A &&
-		git show HEAD~3 >actual &&
-		grep "B changed" actual &&
-		FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" \
-			git rebase -i A
-	) &&
-	git show HEAD~2 >actual &&
-	grep "C changed" actual
-
-Switched to a new branch 'reword-branch'
-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
-pick d0f65f2 # C
-pick 0547e3f # D
-reword 8f99a4f # E
-Rebasing (4/4)
[detached HEAD 7045bc0] E changed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Successfully rebased and updated refs/heads/reword-branch.
-    E changed
-rebase -i script before editing:
-pick 313fe96 # B
-pick d0f65f2 # C
-pick 0547e3f # D
-pick 7045bc0 # E changed
-
-rebase -i script after editing:
-pick 313fe96 # B
-pick d0f65f2 # C
-reword 0547e3f # D
-pick 7045bc0 # E changed
-Rebasing (3/4)
[detached HEAD ffc34d0] D changed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (4/4)
Successfully rebased and updated refs/heads/reword-branch.
-    D changed
-rebase -i script before editing:
-pick 313fe96 # B
-pick d0f65f2 # C
-pick ffc34d0 # D changed
-pick 4804c05 # E changed
-
-rebase -i script after editing:
-reword 313fe96 # B
-pick d0f65f2 # C
-pick ffc34d0 # D changed
-pick 4804c05 # E changed
-Rebasing (1/4)
[detached HEAD ff0628d] B changed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/reword-branch.
-    B changed
-rebase -i script before editing:
-pick ff0628d # B changed
-pick e73c68c # C
-pick fb271b0 # D changed
-pick a55d41c # E changed
-
-rebase -i script after editing:
-pick ff0628d # B changed
-r e73c68c # C
-pick fb271b0 # D changed
-p a55d41c # E changed
-Rebasing (2/4)
[detached HEAD 234d360] C changed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/reword-branch.
-    C changed
-ok 55 - reword
-
-expecting success of 3404.56 'reword fast-forwarded empty commit': 
-	git commit --allow-empty -m "empty commit" --only &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND=edited FAKE_LINES="reword 1" \
-			git rebase -i HEAD^
-	) &&
-	test_commit_message HEAD <<-\EOF
-	empty commit
-
-	edited
-	EOF
-
-[reword-branch 52f95ec] empty commit
- Author: A U Thor <author@example.com>
-rebase -i script before editing:
-pick 52f95ec # empty commit # empty
-
-rebase -i script after editing:
-reword 52f95ec # empty commit # empty
-Rebasing (1/1)
[detached HEAD 019411f] empty commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:50:13 2005 -0700
-Successfully rebased and updated refs/heads/reword-branch.
-ok 56 - reword fast-forwarded empty commit
-
-expecting success of 3404.57 'no uncommitted changes when rewording and the todo list is reloaded': 
-	git checkout E &&
-	test_when_finished "git checkout @{-1}" &&
-	(
-		set_fake_editor &&
-		GIT_SEQUENCE_EDITOR="\"$PWD/fake-editor.sh\"" &&
-		export GIT_SEQUENCE_EDITOR &&
-		set_reword_editor &&
-		FAKE_LINES="reword 1 reword 2" git rebase -i C
-	) &&
-	check_reworded_commits D E
-
-Note: switching to 'E'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 8f99a4f E
-rebase -i script before editing:
-pick 0547e3f # D
-pick 8f99a4f # E
-
-rebase -i script after editing:
-reword 0547e3f # D
-reword 8f99a4f # E
-Rebasing (1/2)
[detached HEAD af7a1e6] D
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
-Rebasing (3/3)
[detached HEAD d9fff5f] E
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Rebasing (4/4)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
-Successfully rebased and updated detached HEAD.
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  d9fff5f E
-  af7a1e6 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> d9fff5f
-
-Switched to branch 'reword-branch'
-ok 57 - no uncommitted changes when rewording and the todo list is reloaded
-
-expecting success of 3404.58 'rebase -i can copy notes': 
-	git config notes.rewrite.rebase true &&
-	git config notes.rewriteRef "refs/notes/*" &&
-	test_commit n1 &&
-	test_commit n2 &&
-	test_commit n3 &&
-	git notes add -m"a note" n3 &&
-	git rebase -i --onto n1 n2 &&
-	test "a note" = "$(git notes show HEAD)"
-
-[reword-branch f191fb6] n1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 n1.t
-[reword-branch 0b4d587] n2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 n2.t
-[reword-branch 66ece83] n3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 n3.t
-Rebasing (1/1)
Successfully rebased and updated refs/heads/reword-branch.
-ok 58 - rebase -i can copy notes
-
-expecting success of 3404.59 'rebase -i can copy notes over a fixup': 
-	cat >expect <<-\EOF &&
-	an earlier note
-
-	a note
-	EOF
-	git reset --hard n3 &&
-	git notes add -m"an earlier note" n2 &&
-	(
-		set_fake_editor &&
-		GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 f 2" \
-			git rebase -i n1
-	) &&
-	git notes show > output &&
-	test_cmp expect output
-
-HEAD is now at 66ece83 n3
-rebase -i script before editing:
-pick 0b4d587 # n2
-pick 66ece83 # n3
-
-rebase -i script after editing:
-pick 0b4d587 # n2
-f 66ece83 # n3
-Rebasing (2/2)
Successfully rebased and updated refs/heads/reword-branch.
-ok 59 - rebase -i can copy notes over a fixup
-
-expecting success of 3404.60 'rebase while detaching HEAD': 
-	git symbolic-ref HEAD &&
-	grandparent=$(git rev-parse HEAD~2) &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0
-	) &&
-	test $grandparent = $(git rev-parse HEAD~2) &&
-	test_must_fail git symbolic-ref HEAD
-
-refs/heads/reword-branch
-rebase -i script before editing:
-pick f191fb6 # n1
-pick 8594c3b # n2
-
-rebase -i script after editing:
-pick 8594c3b # n2
-pick f191fb6 # n1
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-fatal: ref HEAD is not a symbolic ref
-ok 60 - rebase while detaching HEAD
-
-expecting success of 3404.61 'always cherry-pick with --no-ff': 
-	git checkout no-ff-branch &&
-	git tag original-no-ff-branch &&
-	git rebase -i --no-ff A &&
-	for p in 0 1 2
-	do
-		test ! $(git rev-parse HEAD~$p) = $(git rev-parse original-no-ff-branch~$p) &&
-		git diff HEAD~$p original-no-ff-branch~$p > out &&
-		test_must_be_empty out || return 1
-	done &&
-	test_cmp_rev HEAD~3 original-no-ff-branch~3 &&
-	git diff HEAD~3 original-no-ff-branch~3 > out &&
-	test_must_be_empty out
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  496279b n1
-  4897a92 n2
-
-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> 496279b
-
-Switched to branch 'no-ff-branch'
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/no-ff-branch.
-ok 61 - always cherry-pick with --no-ff
-
-expecting success of 3404.62 'set up commits with funny messages': 
-	git checkout -b funny A &&
-	echo >>file1 &&
-	test_tick &&
-	git commit -a -m "end with slash\\" &&
-	echo >>file1 &&
-	test_tick &&
-	git commit -a -m "something (\000) that looks like octal" &&
-	echo >>file1 &&
-	test_tick &&
-	git commit -a -m "something (\n) that looks like a newline" &&
-	echo >>file1 &&
-	test_tick &&
-	git commit -a -m "another commit"
-
-Switched to a new branch 'funny'
-[funny f317e30] end with slash\
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[funny d68f8aa] something (\000) that looks like octal
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[funny 495c640] something (\n) that looks like a newline
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[funny 3a6cc5d] another commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 62 - set up commits with funny messages
-
-expecting success of 3404.63 'rebase-i history with funny messages': 
-	git rev-list A..funny >expect &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 2 3 4" git rebase -i A
-	) &&
-	git rev-list A.. >actual &&
-	test_cmp expect actual
-
-rebase -i script before editing:
-pick f317e30 # end with slash\
-pick d68f8aa # something (\000) that looks like octal
-pick 495c640 # something (\n) that looks like a newline
-pick 3a6cc5d # another commit
-
-rebase -i script after editing:
-pick f317e30 # end with slash\
-pick d68f8aa # something (\000) that looks like octal
-pick 495c640 # something (\n) that looks like a newline
-pick 3a6cc5d # another commit
-Successfully rebased and updated refs/heads/funny.
-ok 63 - rebase-i history with funny messages
-
-expecting success of 3404.64 'prepare for rebase -i --exec': 
-	git checkout primary &&
-	git checkout -b execute &&
-	test_commit one_exec main.txt one_exec &&
-	test_commit two_exec main.txt two_exec &&
-	test_commit three_exec main.txt three_exec
-
-Switched to branch 'primary'
-Switched to a new branch 'execute'
-[execute 1983bb3] one_exec
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main.txt
-[execute 2efd8a2] two_exec
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[execute 66ac40d] three_exec
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 64 - prepare for rebase -i --exec
-
-expecting success of 3404.65 'running "git rebase -i --exec git show HEAD"': 
-	(
-		set_fake_editor &&
-		git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
-		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
-		export FAKE_LINES &&
-		git rebase -i HEAD~2 >expect
-	) &&
-	sed -e "1,9d" expect >expected &&
-	test_cmp expected actual
-
-Rebasing (2/4)
Executing: git show HEAD
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/execute.
-Rebasing (2/4)
Executing: git show HEAD
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/execute.
-ok 65 - running "git rebase -i --exec git show HEAD"
-
-expecting success of 3404.66 'running "git rebase --exec git show HEAD -i"': 
-	git reset --hard execute &&
-	(
-		set_fake_editor &&
-		git rebase --exec "git show HEAD" -i HEAD~2 >actual &&
-		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
-		export FAKE_LINES &&
-		git rebase -i HEAD~2 >expect
-	) &&
-	sed -e "1,9d" expect >expected &&
-	test_cmp expected actual
-
-HEAD is now at 66ac40d three_exec
-Rebasing (2/4)
Executing: git show HEAD
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/execute.
-Rebasing (2/4)
Executing: git show HEAD
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/execute.
-ok 66 - running "git rebase --exec git show HEAD -i"
-
-expecting success of 3404.67 'running "git rebase -ix git show HEAD"': 
-	git reset --hard execute &&
-	(
-		set_fake_editor &&
-		git rebase -ix "git show HEAD" HEAD~2 >actual &&
-		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
-		export FAKE_LINES &&
-		git rebase -i HEAD~2 >expect
-	) &&
-	sed -e "1,9d" expect >expected &&
-	test_cmp expected actual
-
-HEAD is now at 66ac40d three_exec
-Rebasing (2/4)
Executing: git show HEAD
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/execute.
-Rebasing (2/4)
Executing: git show HEAD
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/execute.
-ok 67 - running "git rebase -ix git show HEAD"
-
-expecting success of 3404.68 'rebase -ix with several <CMD>': 
-	git reset --hard execute &&
-	(
-		set_fake_editor &&
-		git rebase -ix "git show HEAD; pwd" HEAD~2 >actual &&
-		FAKE_LINES="1 exec_git_show_HEAD;_pwd 2 exec_git_show_HEAD;_pwd" &&
-		export FAKE_LINES &&
-		git rebase -i HEAD~2 >expect
-	) &&
-	sed -e "1,9d" expect >expected &&
-	test_cmp expected actual
-
-HEAD is now at 66ac40d three_exec
-Rebasing (2/4)
Executing: git show HEAD; pwd
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD; pwd
-Successfully rebased and updated refs/heads/execute.
-Rebasing (2/4)
Executing: git show HEAD; pwd
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD; pwd
-Successfully rebased and updated refs/heads/execute.
-ok 68 - rebase -ix with several <CMD>
-
-expecting success of 3404.69 'rebase -ix with several instances of --exec': 
-	git reset --hard execute &&
-	(
-		set_fake_editor &&
-		git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual &&
-		FAKE_LINES="1 exec_git_show_HEAD exec_pwd 2
-				exec_git_show_HEAD exec_pwd" &&
-		export FAKE_LINES &&
-		git rebase -i HEAD~2 >expect
-	) &&
-	sed -e "1,11d" expect >expected &&
-	test_cmp expected actual
-
-HEAD is now at 66ac40d three_exec
-Rebasing (2/6)
Executing: git show HEAD
-Rebasing (3/6)
Executing: pwd
-Rebasing (4/6)
Rebasing (5/6)
Executing: git show HEAD
-Rebasing (6/6)
Executing: pwd
-Successfully rebased and updated refs/heads/execute.
-Rebasing (2/6)
Executing: git show HEAD
-Rebasing (3/6)
Executing: pwd
-Rebasing (4/6)
Rebasing (5/6)
Executing: git show HEAD
-Rebasing (6/6)
Executing: pwd
-Successfully rebased and updated refs/heads/execute.
-ok 69 - rebase -ix with several instances of --exec
-
-expecting success of 3404.70 'rebase -ix with --autosquash': 
-	git reset --hard execute &&
-	git checkout -b autosquash &&
-	echo second >second.txt &&
-	git add second.txt &&
-	git commit -m "fixup! two_exec" &&
-	echo bis >bis.txt &&
-	git add bis.txt &&
-	git commit -m "fixup! two_exec" &&
-	git checkout -b autosquash_actual &&
-	git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual &&
-	git checkout autosquash &&
-	(
-		set_fake_editor &&
-		git checkout -b autosquash_expected &&
-		FAKE_LINES="1 fixup 3 fixup 4 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
-		export FAKE_LINES &&
-		git rebase -i HEAD~4 >expect
-	) &&
-	sed -e "1,13d" expect >expected &&
-	test_cmp expected actual
-
-HEAD is now at 66ac40d three_exec
-Switched to a new branch 'autosquash'
-[autosquash 1da6bea] fixup! two_exec
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.txt
-[autosquash 280ba53] fixup! two_exec
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bis.txt
-Switched to a new branch 'autosquash_actual'
-Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Executing: git show HEAD
-Rebasing (5/6)
Rebasing (6/6)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/autosquash_actual.
-Switched to branch 'autosquash'
-Switched to a new branch 'autosquash_expected'
-Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Executing: git show HEAD
-Rebasing (5/6)
Rebasing (6/6)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/autosquash_expected.
-ok 70 - rebase -ix with --autosquash
-
-expecting success of 3404.71 'rebase --exec works without -i ': 
-	git reset --hard execute &&
-	rm -rf exec_output &&
-	EDITOR="echo >invoked_editor" git rebase --exec "echo a line >>exec_output"  HEAD~2 2>actual &&
-	test_grep  "Successfully rebased and updated" actual &&
-	test_line_count = 2 exec_output &&
-	test_path_is_missing invoked_editor
-
-HEAD is now at 66ac40d three_exec
-Successfully rebased and updated refs/heads/autosquash_expected.
-ok 71 - rebase --exec works without -i 
-
-expecting success of 3404.72 'rebase -i --exec without <CMD>': 
-	git reset --hard execute &&
-	test_must_fail git rebase -i --exec 2>actual &&
-	test_grep "requires a value" actual &&
-	git checkout primary
-
-HEAD is now at 66ac40d three_exec
-error: option `exec' requires a value
-Switched to branch 'primary'
-ok 72 - rebase -i --exec without <CMD>
-
-expecting success of 3404.73 'rebase -i --root re-order and drop commits': 
-	git checkout E &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="3 1 2 5" git rebase -i --root
-	) &&
-	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test B = $(git cat-file commit HEAD^ | sed -ne \$p) &&
-	test A = $(git cat-file commit HEAD^^ | sed -ne \$p) &&
-	test C = $(git cat-file commit HEAD^^^ | sed -ne \$p) &&
-	test 0 = $(git cat-file commit HEAD^^^ | grep -c ^parent\ )
-
-Note: switching to 'E'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 8f99a4f E
-rebase -i script before editing:
-pick 6e62bf8 # A
-pick 313fe96 # B
-pick d0f65f2 # C
-pick 0547e3f # D
-pick 8f99a4f # E
-
-rebase -i script after editing:
-pick d0f65f2 # C
-pick 6e62bf8 # A
-pick 313fe96 # B
-pick 8f99a4f # E
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 73 - rebase -i --root re-order and drop commits
-
-expecting success of 3404.74 'rebase -i --root retain root commit author and message': 
-	git checkout A &&
-	echo B >file7 &&
-	git add file7 &&
-	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="2" git rebase -i --root
-	) &&
-	git cat-file commit HEAD >output &&
-	grep -q "^author Twerp Snog" output &&
-	git cat-file commit HEAD >actual &&
-	grep -q "^different author$" actual
-
-Warning: you are leaving 4 commits behind, not connected to
-any of your branches:
-
-  8ec5b24 E
-  0680f3e B
-  2e95b98 A
-  8676e2e C
-
-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> 8ec5b24
-
-HEAD is now at 6e62bf8 A
-[detached HEAD 419a8fd] different author
- Author: Twerp Snog <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-rebase -i script before editing:
-pick 6e62bf8 # A
-pick 419a8fd # different author
-
-rebase -i script after editing:
-pick 419a8fd # different author
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 74 - rebase -i --root retain root commit author and message
-
-expecting success of 3404.75 'rebase -i --root temporary sentinel commit': 
-	git checkout B &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="2" git rebase -i --root
-	) &&
-	git cat-file commit HEAD >actual &&
-	grep "^tree $EMPTY_TREE" actual &&
-	git rebase --abort
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  2b113fb different author
-
-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> 2b113fb
-
-HEAD is now at 313fe96 B
-rebase -i script before editing:
-pick 6e62bf8 # A
-pick 313fe96 # B
-
-rebase -i script after editing:
-pick 313fe96 # B
-Rebasing (1/1)
CONFLICT (modify/delete): file1 deleted in HEAD and modified in 313fe96 (B).  Version 313fe96 (B) of file1 left in tree.
-error: could not apply 313fe96... 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 313fe96... # B
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 75 - rebase -i --root temporary sentinel commit
-
-expecting success of 3404.76 'rebase -i --root fixup root commit': 
-	git checkout B &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 fixup 2" git rebase -i --root
-	) &&
-	test A = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test B = $(git show HEAD:file1) &&
-	test 0 = $(git cat-file commit HEAD | grep -c ^parent\ )
-
-HEAD is now at 313fe96 B
-rebase -i script before editing:
-pick 6e62bf8 # A
-pick 313fe96 # B
-
-rebase -i script after editing:
-pick 6e62bf8 # A
-fixup 313fe96 # B
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 76 - rebase -i --root fixup root commit
-
-expecting success of 3404.77 'rebase -i --root reword original root commit': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -b reword-original-root-branch primary &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
-			git rebase -i --root
-	) &&
-	git show HEAD^ >actual &&
-	grep "A changed" actual &&
-	test -z "$(git show -s --format=%p HEAD^)"
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  558b876 A
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 3070.962 'setup match file test for -': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 962 - setup match file test for -
 
- git branch <new-branch-name> 558b876
+expecting success of 3070.963 'wildmatch: match '-' '[\-_]'': 
+			test-tool wildmatch wildmatch '-' '[\-_]'
+		
+ok 963 - wildmatch: match '-' '[\-_]'
 
-Switched to a new branch 'reword-original-root-branch'
-rebase -i script before editing:
-pick 6e62bf8 # A
-pick 313fe96 # B
-pick d0f65f2 # C
-pick 0547e3f # D
-pick 8f99a4f # E
+expecting success of 3070.964 'wildmatch (via ls-files): match '[\-_]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 964 - wildmatch (via ls-files): match '[\-_]' '-'
 
-rebase -i script after editing:
-reword 6e62bf8 # A
-pick 313fe96 # B
-Rebasing (1/2)
[detached HEAD 903b38e] A changed
- 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
-Rebasing (2/2)
Successfully rebased and updated refs/heads/reword-original-root-branch.
-    A changed
-fatal: no rebase in progress
-ok 77 - rebase -i --root reword original root commit
+expecting success of 3070.965 'iwildmatch: match '-' '[\-_]'': 
+			test-tool wildmatch iwildmatch '-' '[\-_]'
+		
+ok 965 - iwildmatch: match '-' '[\-_]'
 
-expecting success of 3404.78 'rebase -i --root reword new root commit': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -b reword-now-root-branch primary &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \
-		git rebase -i --root
-	) &&
-	git show HEAD^ >actual &&
-	grep "C changed" actual &&
-	test -z "$(git show -s --format=%p HEAD^)"
+expecting success of 3070.966 'iwildmatch (via ls-files): match '[\-_]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 966 - iwildmatch (via ls-files): match '[\-_]' '-'
 
-Switched to a new branch 'reword-now-root-branch'
-rebase -i script before editing:
-pick 6e62bf8 # A
-pick 313fe96 # B
-pick d0f65f2 # C
-pick 0547e3f # D
-pick 8f99a4f # E
+expecting success of 3070.967 'pathmatch: match '-' '[\-_]'': 
+			test-tool wildmatch pathmatch '-' '[\-_]'
+		
+ok 967 - pathmatch: match '-' '[\-_]'
 
-rebase -i script after editing:
-reword d0f65f2 # C
-pick 6e62bf8 # A
-Rebasing (1/2)
[detached HEAD a808654] C changed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Rebasing (2/2)
Successfully rebased and updated refs/heads/reword-now-root-branch.
-    C changed
-fatal: no rebase in progress
-ok 78 - rebase -i --root reword new root commit
+expecting success of 3070.968 'pathmatch (via ls-files): match '[\-_]' '-'': 
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 968 - pathmatch (via ls-files): match '[\-_]' '-'
 
-expecting success of 3404.79 'rebase -i --root when root has untracked file conflict': 
-	test_when_finished "reset_rebase" &&
-	git checkout -b failing-root-pick A &&
-	echo x >file2 &&
-	git rm file1 &&
-	git commit -m "remove file 1 add file 2" &&
-	echo z >file1 &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 2" git rebase -i --root
-	) &&
-	rm file1 &&
-	git rebase --continue &&
-	test "$(git log -1 --format=%B)" = "remove file 1 add file 2" &&
-	test "$(git rev-list --count HEAD)" = 2
+expecting success of 3070.969 'ipathmatch: match '-' '[\-_]'': 
+			test-tool wildmatch ipathmatch '-' '[\-_]'
+		
+ok 969 - ipathmatch: match '-' '[\-_]'
 
-Switched to a new branch 'failing-root-pick'
-rm 'file1'
-[failing-root-pick 71adfbc] remove file 1 add file 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file1
-rebase -i script before editing:
-pick 6e62bf8 # A
-pick 71adfbc # remove file 1 add file 2
+expecting success of 3070.970 'ipathmatch (via ls-files): match '[\-_]' '-'': 
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 970 - ipathmatch (via ls-files): match '[\-_]' '-'
 
-rebase -i script after editing:
-pick 6e62bf8 # A
-pick 71adfbc # remove file 1 add file 2
-Rebasing (1/2)
error: The following untracked working tree files would be overwritten by merge:
-	file1
-Please move or remove them before you merge.
-Aborting
-hint: Could not execute the todo command
-hint:
-hint:     pick 6e62bf890e21973b771e4e6fc28f5ade62edb4bc # A
-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 (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/failing-root-pick.
-fatal: no rebase in progress
-HEAD is now at 71adfbc remove file 1 add file 2
+expecting success of 3070.971 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -
 Removing actual
-Removing actual-squash-fixup
-Removing actual.msg
-Removing error
-Removing exec_output
+Removing actual.err
+Removing actual.raw
 Removing expect
-Removing expect-squash-fixup
-Removing expect.msg
-Removing expect2
-Removing expected
-Removing fake-editor.sh
-Removing fake-sequence-editor.sh
-Removing file2
-Removing out
-Removing output
-Removing reword-actual
-Removing reword-editor.sh
-Removing reword-expected
-Removing reword-log
-Removing reword-oid
-Removing reword-sequence-editor.sh
-Removing script
-Removing stderr
-Removing todo
-Removing touch-subdir
-ok 79 - rebase -i --root when root has untracked file conflict
-
-expecting success of 3404.80 'rebase -i --root reword root when root has untracked file conflict': 
-	test_when_finished "reset_rebase" &&
-	echo z>file1 &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="reword 1 2" \
-			FAKE_COMMIT_MESSAGE="Modified A" git rebase -i --root &&
-		rm file1 &&
-		FAKE_COMMIT_MESSAGE="Reworded A" git rebase --continue
-	) &&
-	test "$(git log -1 --format=%B HEAD^)" = "Reworded A" &&
-	test "$(git rev-list --count HEAD)" = 2
-
-rebase -i script before editing:
-pick 6e62bf8 # A
-pick 71adfbc # remove file 1 add file 2
-
-rebase -i script after editing:
-reword 6e62bf8 # A
-pick 71adfbc # remove file 1 add file 2
-Rebasing (1/2)
error: The following untracked working tree files would be overwritten by merge:
-	file1
-Please move or remove them before you merge.
-Aborting
-hint: Could not execute the todo command
-hint:
-hint:     reword 6e62bf890e21973b771e4e6fc28f5ade62edb4bc # A
-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 (2/3)
[detached HEAD 1b0ccef] Reworded A
- 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
-Rebasing (3/3)
Successfully rebased and updated refs/heads/failing-root-pick.
-fatal: no rebase in progress
-HEAD is now at 847f077 remove file 1 add file 2
-Removing fake-editor.sh
-ok 80 - rebase -i --root reword root when root has untracked file conflict
-
-expecting success of 3404.81 'rebase --edit-todo does not work on non-interactive rebase': 
-	git checkout reword-original-root-branch &&
-	git reset --hard &&
-	git checkout conflict-branch &&
-	(
-		set_fake_editor &&
-		test_must_fail git rebase -f --apply --onto HEAD~2 HEAD~ &&
-		test_must_fail git rebase --edit-todo
-	) &&
-	git rebase --abort
-
-Switched to branch 'reword-original-root-branch'
-HEAD is now at c9dc22b B
-Switched to branch 'conflict-branch'
-First, rewinding head to replay your work on top of it...
-Applying: four
-Using index info to reconstruct a base tree...
-M	conflict
-Falling back to patching base and 3-way merge...
-Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-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 four
-fatal: The --edit-todo action can only be used during interactive rebase.
-ok 81 - rebase --edit-todo does not work on non-interactive rebase
-
-expecting success of 3404.82 'rebase --edit-todo can be used to modify todo': 
-	git reset --hard &&
-	git checkout no-conflict-branch^0 &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 &&
-		FAKE_LINES="2 1" git rebase --edit-todo &&
-		git rebase --continue
-	) &&
-	test M = $(git cat-file commit HEAD^ | sed -ne \$p) &&
-	test L = $(git cat-file commit HEAD | sed -ne \$p)
-
-HEAD is now at f91a2b3 four
-Note: switching to 'no-conflict-branch^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 3389558 M
-rebase -i script before editing:
-pick 265b89e # K
-pick 6b0f5e6 # L
-pick 3389558 # M
-
-rebase -i script after editing:
-edit 265b89e # K
-pick 6b0f5e6 # L
-pick 3389558 # M
-Rebasing (1/3)
Stopped at 265b89e...  # K
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-rebase -i script before editing:
-pick 6b0f5e6 # L
-pick 3389558 # M
-rebase -i script after editing:
-pick 3389558 # M
-pick 6b0f5e6 # L
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 82 - rebase --edit-todo can be used to modify todo
-
-expecting success of 3404.83 'rebase -i produces readable reflog': 
-	git reset --hard &&
-	git branch -f branch-reflog-test H &&
-	git rebase -i --onto I F branch-reflog-test &&
-	cat >expect <<-\EOF &&
-	rebase (finish): returning to refs/heads/branch-reflog-test
-	rebase (pick): H
-	rebase (pick): G
-	rebase (start): checkout I
-	EOF
-	git reflog -n4 HEAD |
-	sed "s/[^:]*: //" >actual &&
-	test_cmp expect actual
-
-HEAD is now at e7ab20b L
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-reflog-test.
-ok 83 - rebase -i produces readable reflog
-
-expecting success of 3404.84 'rebase -i respects core.commentchar': 
-	git reset --hard &&
-	git checkout E^0 &&
-	test_config core.commentchar "\\" &&
-	write_script remove-all-but-first.sh <<-\EOF &&
-	sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" &&
-	mv "$1.tmp" "$1"
-	EOF
-	(
-		test_set_editor "$(pwd)/remove-all-but-first.sh" &&
-		git rebase -i B
-	) &&
-	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
-
-HEAD is now at d98957c H
-Note: switching to 'E^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 8f99a4f E
-Successfully rebased and updated detached HEAD.
-ok 84 - rebase -i respects core.commentchar
-
-expecting success of 3404.85 'rebase -i respects core.commentchar=auto': 
-	test_config core.commentchar auto &&
-	write_script copy-edit-script.sh <<-\EOF &&
-	cp "$1" edit-script
-	EOF
-	test_when_finished "git rebase --abort || :" &&
-	(
-		test_set_editor "$(pwd)/copy-edit-script.sh" &&
-		git rebase -i HEAD^
-	) &&
-	test -z "$(grep -ve "^#" -e "^\$" -e "^pick" edit-script)"
-
-Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 85 - rebase -i respects core.commentchar=auto
-
-expecting success of 3404.86 'rebase -i, with <onto> and <upstream> specified as :/quuxery': 
-	test_when_finished "git branch -D torebase" &&
-	git checkout -b torebase branch1 &&
-	upstream=$(git rev-parse ":/J") &&
-	onto=$(git rev-parse ":/A") &&
-	git rebase --onto $onto $upstream &&
-	git reset --hard branch1 &&
-	git rebase --onto ":/A" ":/J" &&
-	git checkout branch1
-
-Previous HEAD position was d0f65f2 C
-Switched to a new branch 'torebase'
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/torebase.
-HEAD is now at 450e393 I
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/torebase.
-Switched to branch 'branch1'
-Deleted branch torebase (was 08e872c).
-ok 86 - rebase -i, with <onto> and <upstream> specified as :/quuxery
-
-expecting success of 3404.87 'rebase -i with --strategy and -X': 
-	git checkout -b conflict-merge-use-theirs conflict-branch &&
-	git reset --hard HEAD^ &&
-	echo five >conflict &&
-	echo Z >file1 &&
-	git commit -a -m "one file conflict" &&
-	EDITOR=true git rebase -i --strategy=recursive -Xours conflict-branch &&
-	test $(git show conflict-branch:conflict) = $(cat conflict) &&
-	test $(cat file1) = Z
-
-Switched to a new branch 'conflict-merge-use-theirs'
-HEAD is now at 1eadf03 three
-[conflict-merge-use-theirs 1808efd] one file conflict
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Rebasing (1/1)
Successfully rebased and updated refs/heads/conflict-merge-use-theirs.
-ok 87 - rebase -i with --strategy and -X
-
-expecting success of 3404.88 'interrupted rebase -i with --strategy and -X': 
-	git checkout -b conflict-merge-use-theirs-interrupted conflict-branch &&
-	git reset --hard HEAD^ &&
-	>breakpoint &&
-	git add breakpoint &&
-	git commit -m "breakpoint for interactive mode" &&
-	echo five >conflict &&
-	echo Z >file1 &&
-	git commit -a -m "one file conflict" &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive \
-			-Xours conflict-branch
-	) &&
-	git rebase --continue &&
-	test $(git show conflict-branch:conflict) = $(cat conflict) &&
-	test $(cat file1) = Z
-
-Switched to a new branch 'conflict-merge-use-theirs-interrupted'
-HEAD is now at 1eadf03 three
-[conflict-merge-use-theirs-interrupted 661680f] breakpoint for interactive mode
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 breakpoint
-[conflict-merge-use-theirs-interrupted 14f789b] one file conflict
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-rebase -i script before editing:
-pick 661680f # breakpoint for interactive mode
-pick 14f789b # one file conflict
-
-rebase -i script after editing:
-edit 661680f # breakpoint for interactive mode
-pick 14f789b # one file conflict
-Rebasing (1/2)
Stopped at 661680f...  # breakpoint for interactive mode
-You can amend the commit now, with
+ok 971 - cleanup after previous file test
 
-  git commit --amend 
+expecting success of 3070.972 'setup match file test for ]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 972 - setup match file test for ]
 
-Once you are satisfied with your changes, run
+expecting success of 3070.973 'wildmatch: match ']' '[\]]'': 
+			test-tool wildmatch wildmatch ']' '[\]]'
+		
+ok 973 - wildmatch: match ']' '[\]]'
 
-  git rebase --continue
-Rebasing (2/2)
Successfully rebased and updated refs/heads/conflict-merge-use-theirs-interrupted.
-ok 88 - interrupted rebase -i with --strategy and -X
+expecting success of 3070.974 'wildmatch (via ls-files): match '[\]]' ']'': 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 974 - wildmatch (via ls-files): match '[\]]' ']'
 
-expecting success of 3404.89 'rebase -i error on commits with \ in message': 
-	current_head=$(git rev-parse HEAD) &&
-	test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" &&
-	test_commit TO-REMOVE will-conflict old-content &&
-	test_commit "\temp" will-conflict new-content dummy &&
-	test_must_fail env EDITOR=true git rebase -i HEAD^ --onto HEAD^^ 2>error &&
-	test_expect_code 1 grep  "	emp" error
+expecting success of 3070.975 'iwildmatch: match ']' '[\]]'': 
+			test-tool wildmatch iwildmatch ']' '[\]]'
+		
+ok 975 - iwildmatch: match ']' '[\]]'
 
-[conflict-merge-use-theirs-interrupted 77c3fb4] TO-REMOVE
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 will-conflict
-[conflict-merge-use-theirs-interrupted 34a4968] \temp
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-CONFLICT (modify/delete): will-conflict deleted in HEAD and modified in 34a4968 (\temp).  Version 34a4968 (\temp) of will-conflict left in tree.
-HEAD is now at f36c680 one file conflict
-ok 89 - rebase -i error on commits with \ in message
+expecting success of 3070.976 'iwildmatch (via ls-files): match '[\]]' ']'': 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 976 - iwildmatch (via ls-files): match '[\]]' ']'
 
-expecting success of 3404.90 'short commit ID setup': 
-	test_when_finished "git checkout primary" &&
-	git checkout --orphan collide &&
-	git rm -rf . &&
-	(
-	unset test_tick &&
-	test_commit collide1 collide &&
-	test_commit --notick collide2 collide &&
-	test_commit --notick collide3 collide
-	)
+expecting success of 3070.977 'pathmatch: match ']' '[\]]'': 
+			test-tool wildmatch pathmatch ']' '[\]]'
+		
+ok 977 - pathmatch: match ']' '[\]]'
 
-Switched to a new branch 'collide'
-rm 'breakpoint'
-rm 'conflict'
-rm 'file1'
-[collide (root-commit) 674fc94] collide1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 collide
-[collide 0b53f45] collide2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[collide 6bcda37] collide3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'primary'
-ok 90 - short commit ID setup
+expecting success of 3070.978 'pathmatch (via ls-files): match '[\]]' ']'': 
+				printf '%s' ']' >expect &&
+				git ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 978 - pathmatch (via ls-files): match '[\]]' ']'
 
-expecting success of 3404.91 'short commit ID collide': 
-	test_oid_cache <<-EOF &&
-	# collision-related constants
-	t3404_collision	sha1:6bcd
-	t3404_collision	sha256:0161
-	t3404_collider	sha1:ac4f2ee
-	t3404_collider	sha256:16697
-	EOF
-	test_when_finished "reset_rebase && git checkout primary" &&
-	git checkout collide &&
-	colliding_id=$(test_oid t3404_collision) &&
-	hexsz=$(test_oid hexsz) &&
-	test $colliding_id = "$(git rev-parse HEAD | cut -c 1-4)" &&
-	test_config core.abbrev 4 &&
-	(
-		unset test_tick &&
-		test_tick &&
-		set_fake_editor &&
-		FAKE_COMMIT_MESSAGE="collide2 $(test_oid t3404_collider)" \
-		FAKE_LINES="reword 1 break 2" git rebase -i HEAD~2 &&
-		test $colliding_id = "$(git rev-parse HEAD | cut -c 1-4)" &&
-		grep "^pick $colliding_id " \
-			.git/rebase-merge/git-rebase-todo.tmp &&
-		grep -E "^pick [0-9a-f]{$hexsz}" \
-			.git/rebase-merge/git-rebase-todo &&
-		grep -E "^pick [0-9a-f]{$hexsz}" \
-			.git/rebase-merge/git-rebase-todo.backup &&
-		git rebase --continue
-	) &&
-	collide2="$(git rev-parse HEAD~1 | cut -c 1-4)" &&
-	collide3="$(git rev-parse collide3 | cut -c 1-4)" &&
-	test "$collide2" = "$collide3"
+expecting success of 3070.979 'ipathmatch: match ']' '[\]]'': 
+			test-tool wildmatch ipathmatch ']' '[\]]'
+		
+ok 979 - ipathmatch: match ']' '[\]]'
 
-Switched to branch 'collide'
-rebase -i script before editing:
-pick 0b53 # collide2
-pick 6bcd # collide3
+expecting success of 3070.980 'ipathmatch (via ls-files): match '[\]]' ']'': 
+				printf '%s' ']' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 980 - ipathmatch (via ls-files): match '[\]]' ']'
 
-rebase -i script after editing:
-reword 0b53 # collide2
-break
-pick 6bcd # collide3
-Rebasing (1/3)
[detached HEAD 6bcda37f] collide2 ac4f2ee
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
Stopped at 6bcda37f (collide2 ac4f2ee)
-pick 6bcd # collide3
-pick 6bcda372b23d641debbf943e0b709349f72dcd92 # collide3
-pick 0b53f4541f74116336854697b0278cb818c448e2 # collide2
-pick 6bcda372b23d641debbf943e0b709349f72dcd92 # collide3
-Rebasing (3/3)
Successfully rebased and updated refs/heads/collide.
-fatal: no rebase in progress
-HEAD is now at fbe3cf5 collide3
+expecting success of 3070.981 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ]
 Removing actual
-Removing copy-edit-script.sh
-Removing edit-script
+Removing actual.err
+Removing actual.raw
 Removing expect
-Removing fake-editor.sh
-Removing remove-all-but-first.sh
-Switched to branch 'primary'
-ok 91 - short commit ID collide
-
-expecting success of 3404.92 'respect core.abbrev': 
-	git config core.abbrev 12 &&
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i HEAD~4 >todo-list
-	) &&
-	test 4 = $(grep -c -E "pick [0-9a-f]{12,}" todo-list)
-
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-ok 92 - respect core.abbrev
-
-expecting success of 3404.93 'todo count': 
-	write_script dump-raw.sh <<-\EOF &&
-		cat "$1"
-	EOF
-	(
-		test_set_editor "$(pwd)/dump-raw.sh" &&
-		git rebase -i HEAD~4 >actual
-	) &&
-	test_grep "^# Rebase ..* onto ..* ([0-9]" actual
-
-Successfully rebased and updated refs/heads/primary.
-# Rebase 6e62bf890e21..8f99a4f1fbbd onto 6e62bf890e21 (4 commands)
-ok 93 - todo count
-
-expecting success of 3404.94 'rebase -i commits that overwrite untracked files (pick)': 
-	git checkout --force A &&
-	git clean -f &&
-	cat >todo <<-EOF &&
-	exec >file2
-	pick $(git rev-parse B) B
-	pick $(git rev-parse C) C
-	pick $(git rev-parse D) D
-	exec cat .git/rebase-merge/done >actual
-	EOF
-	(
-		set_replace_editor todo &&
-		test_must_fail git rebase -i A
-	) &&
-	test_cmp_rev HEAD B &&
-	test_cmp_rev REBASE_HEAD C &&
-	head -n3 todo >expect &&
-	test_cmp expect .git/rebase-merge/done &&
-	rm file2 &&
-	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 reset --hard HEAD &&
-	git rebase --continue &&
-	test_cmp_rev HEAD D &&
-	tail -n3 todo >>expect &&
-	test_cmp expect actual
+ok 981 - cleanup after previous file test
 
-Note: switching to 'A'.
+expecting success of 3070.982 'setup match file test for \]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 982 - setup match file test for \]
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 3070.983 'wildmatch: no match '\]' '[\]]'': 
+			test_must_fail test-tool wildmatch wildmatch '\]' '[\]]'
+		
+ok 983 - wildmatch: no 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 3070.984 'wildmatch (via ls-files): no match '[\]]' '\]'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 984 - wildmatch (via ls-files): no match '[\]]' '\]'
 
-  git switch -c <new-branch-name>
+expecting success of 3070.985 'iwildmatch: no match '\]' '[\]]'': 
+			test_must_fail test-tool wildmatch iwildmatch '\]' '[\]]'
+		
+ok 985 - iwildmatch: no match '\]' '[\]]'
 
-Or undo this operation with:
+expecting success of 3070.986 'iwildmatch (via ls-files): no match '[\]]' '\]'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 986 - iwildmatch (via ls-files): no match '[\]]' '\]'
 
-  git switch -
+expecting success of 3070.987 'pathmatch: no match '\]' '[\]]'': 
+			test_must_fail test-tool wildmatch pathmatch '\]' '[\]]'
+		
+ok 987 - pathmatch: no match '\]' '[\]]'
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3070.988 'pathmatch (via ls-files): no match '[\]]' '\]'': 
+				>expect &&
+				git ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 988 - pathmatch (via ls-files): no match '[\]]' '\]'
 
-HEAD is now at 6e62bf890e21 A
-Removing actual
-Removing dump-raw.sh
-Removing fake-editor.sh
-Removing todo-list
-rebase -i script after editing:
-exec >file2
-pick 313fe965c0484313caa01fa597a77d2ad86d279e B
-pick d0f65f2f81ee9679b9f6e0748a682ddbf4351a33 C
-pick 0547e3f1350de154b309493b84e37dcd3097c587 D
-exec cat .git/rebase-merge/done >actual
-Rebasing (1/5)
Executing: >file2
-Rebasing (2/5)
Rebasing (3/5)
error: The following untracked working tree files would be overwritten by merge:
-	file2
-Please move or remove them before you merge.
-Aborting
-hint: Could not execute the todo command
-hint:
-hint:     pick d0f65f2f81ee9679b9f6e0748a682ddbf4351a33 C
-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
-error: you have staged changes in your working tree
-HEAD is now at 313fe965c048 B
-Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Executing: cat .git/rebase-merge/done >actual
-Successfully rebased and updated detached HEAD.
-ok 94 - rebase -i commits that overwrite untracked files (pick)
+expecting success of 3070.989 'ipathmatch: no match '\]' '[\]]'': 
+			test_must_fail test-tool wildmatch ipathmatch '\]' '[\]]'
+		
+ok 989 - ipathmatch: no match '\]' '[\]]'
 
-expecting success of 3404.95 'rebase -i commits that overwrite untracked files (squash)': 
-	git checkout --force branch2 &&
-	git clean -f &&
-	git tag original-branch2 &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1 squash 2" git rebase -i A
-	) &&
-	test_cmp_rev HEAD F &&
-	test_path_is_missing file6 &&
-	>file6 &&
-	test_must_fail git rebase --continue &&
-	test_cmp_rev HEAD F &&
-	test_cmp_rev REBASE_HEAD I &&
-	rm file6 &&
-	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 reset --hard HEAD &&
-	git rebase --continue &&
-	test $(git cat-file commit HEAD | sed -ne \$p) = I &&
-	git reset --hard original-branch2
+expecting success of 3070.990 'ipathmatch (via ls-files): no match '[\]]' '\]'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 990 - ipathmatch (via ls-files): no match '[\]]' '\]'
 
-Previous HEAD position was 0547e3f1350d D
-Switched to branch 'branch2'
+expecting success of 3070.991 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing "\\]"
 Removing actual
-Removing err
+Removing actual.err
+Removing actual.raw
 Removing expect
-Removing fake-sequence-editor.sh
-Removing script
-Removing todo
-rebase -i script before editing:
-pick cfefd94ba3b7 # F
-pick 615be62cadc1 # I
-
-rebase -i script after editing:
-edit cfefd94ba3b7 # F
-squash 615be62cadc1 # I
-Rebasing (1/2)
Stopped at cfefd94ba3b7...  # F
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-Rebasing (2/2)
error: The following untracked working tree files would be overwritten by merge:
-	file6
-Please move or remove them before you merge.
-Aborting
-hint: Could not execute the todo command
-hint:
-hint:     squash 615be62cadc1c85c6ac7d6974210b1aa1721c98f # I
-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
-error: you have staged changes in your working tree
-HEAD is now at cfefd94ba3b7 F
-Rebasing (3/3)
[detached HEAD 393f3ba68ddf] F
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file4
- create mode 100644 file6
-Successfully rebased and updated refs/heads/branch2.
-HEAD is now at 615be62cadc1 I
-ok 95 - rebase -i commits that overwrite untracked files (squash)
-
-expecting success of 3404.96 'rebase -i commits that overwrite untracked files (no ff)': 
-	git checkout --force branch2 &&
-	git clean -f &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1 2" git rebase -i --no-ff A
-	) &&
-	test $(git cat-file commit HEAD | sed -ne \$p) = F &&
-	test_path_is_missing file6 &&
-	>file6 &&
-	test_must_fail git rebase --continue &&
-	test $(git cat-file commit HEAD | sed -ne \$p) = F &&
-	test_cmp_rev REBASE_HEAD I &&
-	rm file6 &&
-	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 reset --hard HEAD &&
-	git rebase --continue &&
-	test $(git cat-file commit HEAD | sed -ne \$p) = I
-
-Already on 'branch2'
-Removing err
-Removing fake-editor.sh
-rebase -i script before editing:
-pick cfefd94ba3b7 # F
-pick 615be62cadc1 # I
-
-rebase -i script after editing:
-edit cfefd94ba3b7 # F
-pick 615be62cadc1 # I
-Rebasing (1/2)
Stopped at cfefd94ba3b7...  # F
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-Rebasing (2/2)
error: The following untracked working tree files would be overwritten by merge:
-	file6
-Please move or remove them before you merge.
-Aborting
-hint: Could not execute the todo command
-hint:
-hint:     pick 615be62cadc1c85c6ac7d6974210b1aa1721c98f # I
-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
-error: you have staged changes in your working tree
-HEAD is now at 1cadfd8b5eb1 F
-Rebasing (3/3)
Successfully rebased and updated refs/heads/branch2.
-ok 96 - rebase -i commits that overwrite untracked files (no ff)
+ok 991 - cleanup after previous file test
 
-expecting success of 3404.97 'rebase --continue removes CHERRY_PICK_HEAD': 
-	git checkout -b commit-to-skip &&
-	for double in X 3 1
-	do
-		test_seq 5 | sed "s/$double/&&/" >seq &&
-		git add seq &&
-		test_tick &&
-		git commit -m seq-$double || return 1
-	done &&
-	git tag seq-onto &&
-	git reset --hard HEAD~2 &&
-	git cherry-pick seq-onto &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES= git rebase -i seq-onto
-	) &&
-	test -d .git/rebase-merge &&
-	git rebase --continue &&
-	git diff --exit-code seq-onto &&
-	test ! -d .git/rebase-merge &&
-	test ! -f .git/CHERRY_PICK_HEAD
+expecting success of 3070.992 'setup match file test for \': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 992 - setup match file test for \
 
-Switched to a new branch 'commit-to-skip'
-[commit-to-skip 91baae341a52] seq-X
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 seq
-[commit-to-skip c6f9618a0f9b] seq-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[commit-to-skip 76d13d56f0bb] seq-1
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-HEAD is now at 91baae341a52 seq-X
-Auto-merging seq
-[commit-to-skip 43bbefaabe73] seq-1
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 16:08:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+expecting success of 3070.993 'wildmatch: no match '\' '[\]]'': 
+			test_must_fail test-tool wildmatch wildmatch '\' '[\]]'
+		
+ok 993 - wildmatch: no match '\' '[\]]'
 
-    git commit --allow-empty
+expecting success of 3070.994 'wildmatch (via ls-files): no match '[\]]' '\'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 994 - wildmatch (via ls-files): no match '[\]]' '\'
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 76d13d56f0bb
-Last command done (1 command done):
-   pick 43bbefaabe73 # seq-1
-No commands remaining.
-You are currently rebasing branch 'commit-to-skip' on '76d13d56f0bb'.
-  (all conflicts fixed: run "git rebase --continue")
+expecting success of 3070.995 'iwildmatch: no match '\' '[\]]'': 
+			test_must_fail test-tool wildmatch iwildmatch '\' '[\]]'
+		
+ok 995 - iwildmatch: no match '\' '[\]]'
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
-	fake-editor.sh
-	sub/
+expecting success of 3070.996 'iwildmatch (via ls-files): no match '[\]]' '\'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 996 - iwildmatch (via ls-files): no match '[\]]' '\'
 
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply 43bbefaabe73... # seq-1
-Successfully rebased and updated refs/heads/commit-to-skip.
-ok 97 - rebase --continue removes CHERRY_PICK_HEAD
+expecting success of 3070.997 'pathmatch: no match '\' '[\]]'': 
+			test_must_fail test-tool wildmatch pathmatch '\' '[\]]'
+		
+ok 997 - pathmatch: no match '\' '[\]]'
 
-expecting success of 3404.98 'drop': 
-	rebase_setup_and_clean drop-test &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 drop 2 3 d 4 5" git rebase -i --root
-	) &&
-	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test C = $(git cat-file commit HEAD^ | sed -ne \$p) &&
-	test A = $(git cat-file commit HEAD^^ | sed -ne \$p)
+expecting success of 3070.998 'pathmatch (via ls-files): no match '[\]]' '\'': 
+				>expect &&
+				git ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 998 - pathmatch (via ls-files): no match '[\]]' '\'
 
-Switched to a new branch 'drop-test'
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
+expecting success of 3070.999 'ipathmatch: no match '\' '[\]]'': 
+			test_must_fail test-tool wildmatch ipathmatch '\' '[\]]'
+		
+ok 999 - ipathmatch: no match '\' '[\]]'
 
-rebase -i script after editing:
-pick 6e62bf890e21 # A
-drop 313fe965c048 # B
-pick d0f65f2f81ee # C
-d 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/drop-test.
-Switched to branch 'primary'
-Deleted branch drop-test (was 51a089e089a8).
-fatal: no rebase in progress
-ok 98 - drop
+expecting success of 3070.1000 'ipathmatch (via ls-files): no match '[\]]' '\'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1000 - ipathmatch (via ls-files): no match '[\]]' '\'
 
-expecting success of 3404.99 'rebase -i respects rebase.missingCommitsCheck = ignore': 
-	test_config rebase.missingCommitsCheck ignore &&
-	rebase_setup_and_clean missing-commit &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual
-	) &&
-	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test_grep \
-		"Successfully rebased and updated refs/heads/missing-commit" \
-		actual
+expecting success of 3070.1001 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1001 - cleanup after previous file test
 
-Switched to a new branch 'missing-commit'
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
+expecting success of 3070.1002 'setup match file test for ab': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1002 - setup match file test for ab
 
-rebase -i script after editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/missing-commit.
-Switched to branch 'primary'
-Deleted branch missing-commit (was 0547e3f1350d).
-fatal: no rebase in progress
-ok 99 - rebase -i respects rebase.missingCommitsCheck = ignore
+expecting success of 3070.1003 'wildmatch: no match 'ab' 'a[]b'': 
+			test_must_fail test-tool wildmatch wildmatch 'ab' 'a[]b'
+		
+ok 1003 - wildmatch: no match 'ab' 'a[]b'
 
-expecting success of 3404.100 'rebase -i respects rebase.missingCommitsCheck = warn': 
-	cat >expect <<-EOF &&
-	Warning: some commits may have been dropped accidentally.
-	Dropped commits (newer to older):
-	 - $(git log --format="%h # %s" -1 primary)
-	To avoid this message, use "drop" to explicitly remove a commit.
-	EOF
-	test_config rebase.missingCommitsCheck warn &&
-	rebase_setup_and_clean missing-commit &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual.2
-	) &&
-	head -n4 actual.2 >actual &&
-	test_cmp expect actual &&
-	test D = $(git cat-file commit HEAD | sed -ne \$p)
+expecting success of 3070.1004 'wildmatch (via ls-files): no match 'a[]b' 'ab'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1004 - wildmatch (via ls-files): no match 'a[]b' 'ab'
 
-Switched to a new branch 'missing-commit'
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
+expecting success of 3070.1005 'iwildmatch: no match 'ab' 'a[]b'': 
+			test_must_fail test-tool wildmatch iwildmatch 'ab' 'a[]b'
+		
+ok 1005 - iwildmatch: no match 'ab' 'a[]b'
 
-rebase -i script after editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-Switched to branch 'primary'
-Deleted branch missing-commit (was 0547e3f1350d).
-fatal: no rebase in progress
-ok 100 - rebase -i respects rebase.missingCommitsCheck = warn
+expecting success of 3070.1006 'iwildmatch (via ls-files): no match 'a[]b' 'ab'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1006 - iwildmatch (via ls-files): no match 'a[]b' 'ab'
 
-expecting success of 3404.101 'rebase -i respects rebase.missingCommitsCheck = error': 
-	cat >expect <<-EOF &&
-	Warning: some commits may have been dropped accidentally.
-	Dropped commits (newer to older):
-	 - $(git log --format="%h # %s" -1 primary)
-	 - $(git log --format="%h # %s" -1 primary~2)
-	To avoid this message, use "drop" to explicitly remove a commit.
+expecting success of 3070.1007 'pathmatch: no match 'ab' 'a[]b'': 
+			test_must_fail test-tool wildmatch pathmatch 'ab' 'a[]b'
+		
+ok 1007 - pathmatch: no match 'ab' 'a[]b'
 
-	Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
-	The possible behaviours are: ignore, warn, error.
+expecting success of 3070.1008 'pathmatch (via ls-files): no match 'a[]b' 'ab'': 
+				>expect &&
+				git ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1008 - pathmatch (via ls-files): no match 'a[]b' 'ab'
 
-	You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-	Or you can abort the rebase with 'git rebase --abort'.
-	EOF
-	test_config rebase.missingCommitsCheck error &&
-	rebase_setup_and_clean missing-commit &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 2 4" \
-			git rebase -i --root 2>actual &&
-		test_cmp expect actual &&
-		cp .git/rebase-merge/git-rebase-todo.backup \
-			.git/rebase-merge/git-rebase-todo &&
-		FAKE_LINES="1 2 drop 3 4 drop 5" git rebase --edit-todo
-	) &&
-	git rebase --continue &&
-	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
+expecting success of 3070.1009 'ipathmatch: no match 'ab' 'a[]b'': 
+			test_must_fail test-tool wildmatch ipathmatch 'ab' 'a[]b'
+		
+ok 1009 - ipathmatch: no match 'ab' 'a[]b'
 
-Switched to a new branch 'missing-commit'
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
+expecting success of 3070.1010 'ipathmatch (via ls-files): no match 'a[]b' 'ab'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1010 - ipathmatch (via ls-files): no match 'a[]b' 'ab'
 
-rebase -i script after editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick 0547e3f1350d # D
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-rebase -i script after editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-drop d0f65f2f81ee # C
-pick 0547e3f1350d # D
-drop 8f99a4f1fbbd # E
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/missing-commit.
-Switched to branch 'primary'
-Deleted branch missing-commit (was 1c17f6d7b75f).
-fatal: no rebase in progress
-ok 101 - rebase -i respects rebase.missingCommitsCheck = error
+expecting success of 3070.1011 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ab
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1011 - cleanup after previous file test
 
-expecting success of 3404.102 'rebase --edit-todo respects rebase.missingCommitsCheck = ignore': 
-	test_config rebase.missingCommitsCheck ignore &&
-	rebase_setup_and_clean missing-commit &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="break 1 2 3 4 5" git rebase -i --root &&
-		FAKE_LINES="1 2 3 4" git rebase --edit-todo &&
-		git rebase --continue 2>actual
-	) &&
-	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test_grep \
-		"Successfully rebased and updated refs/heads/missing-commit" \
-		actual
+expecting success of 3070.1012 'setup match file test for a[]b': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1012 - setup match file test for a[]b
 
-Switched to a new branch 'missing-commit'
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
+expecting success of 3070.1013 'wildmatch: no match 'a[]b' 'a[]b'': 
+			test_must_fail test-tool wildmatch wildmatch 'a[]b' 'a[]b'
+		
+ok 1013 - wildmatch: no match 'a[]b' 'a[]b'
 
-rebase -i script after editing:
-break
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-Rebasing (1/6)
Stopped at e64c99ec4da8 ()
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-rebase -i script after editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/missing-commit.
-Switched to branch 'primary'
-Deleted branch missing-commit (was 0547e3f1350d).
-fatal: no rebase in progress
-ok 102 - rebase --edit-todo respects rebase.missingCommitsCheck = ignore
+expecting success of 3070.1014 'wildmatch (via ls-files): match 'a[]b' 'a[]b'': 
+				printf '%s' 'a[]b' >expect &&
+				git --glob-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1014 - wildmatch (via ls-files): match 'a[]b' 'a[]b'
 
-expecting success of 3404.103 'rebase --edit-todo respects rebase.missingCommitsCheck = warn': 
-	cat >expect <<-EOF &&
-	error: invalid command 'pickled'
-	error: invalid line 1: pickled $(git log --format="%h # %s" -1 primary~4)
-	Warning: some commits may have been dropped accidentally.
-	Dropped commits (newer to older):
-	 - $(git log --format="%h # %s" -1 primary)
-	 - $(git log --format="%h # %s" -1 primary~4)
-	To avoid this message, use "drop" to explicitly remove a commit.
-	EOF
-	head -n5 expect >expect.2 &&
-	tail -n1 expect >>expect.2 &&
-	tail -n4 expect.2 >expect.3 &&
-	test_config rebase.missingCommitsCheck warn &&
-	rebase_setup_and_clean missing-commit &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
-			git rebase -i --root &&
-		cp .git/rebase-merge/git-rebase-todo.backup orig &&
-		FAKE_LINES="2 3 4" git rebase --edit-todo 2>actual.2 &&
-		head -n7 actual.2 >actual &&
-		test_cmp expect actual &&
-		cp orig .git/rebase-merge/git-rebase-todo &&
-		FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual.2 &&
-		head -n4 actual.2 >actual &&
-		test_cmp expect.3 actual &&
-		git rebase --continue 2>actual
-	) &&
-	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test_grep \
-		"Successfully rebased and updated refs/heads/missing-commit" \
-		actual
+expecting success of 3070.1015 'iwildmatch: no match 'a[]b' 'a[]b'': 
+			test_must_fail test-tool wildmatch iwildmatch 'a[]b' 'a[]b'
+		
+ok 1015 - iwildmatch: no match 'a[]b' 'a[]b'
 
-Switched to a new branch 'missing-commit'
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
+expecting success of 3070.1016 'iwildmatch (via ls-files): match 'a[]b' 'a[]b'': 
+				printf '%s' 'a[]b' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1016 - iwildmatch (via ls-files): match 'a[]b' 'a[]b'
 
-rebase -i script after editing:
-pickled 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-error: invalid command 'pickled'
-error: invalid line 1: pickled 6e62bf890e21 # A
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Or you can abort the rebase with 'git rebase --abort'.
-rebase -i script before editing:
-pickled 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-rebase -i script after editing:
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-rebase -i script after editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/missing-commit.
-Switched to branch 'primary'
-Deleted branch missing-commit (was 0547e3f1350d).
-fatal: no rebase in progress
-ok 103 - rebase --edit-todo respects rebase.missingCommitsCheck = warn
+expecting success of 3070.1017 'pathmatch: no match 'a[]b' 'a[]b'': 
+			test_must_fail test-tool wildmatch pathmatch 'a[]b' 'a[]b'
+		
+ok 1017 - pathmatch: no match 'a[]b' 'a[]b'
 
-expecting success of 3404.104 'rebase --edit-todo respects rebase.missingCommitsCheck = error': 
-	cat >expect <<-EOF &&
-	error: invalid command 'pickled'
-	error: invalid line 1: pickled $(git log --format="%h # %s" -1 primary~4)
-	Warning: some commits may have been dropped accidentally.
-	Dropped commits (newer to older):
-	 - $(git log --format="%h # %s" -1 primary)
-	 - $(git log --format="%h # %s" -1 primary~4)
-	To avoid this message, use "drop" to explicitly remove a commit.
+expecting success of 3070.1018 'pathmatch (via ls-files): match 'a[]b' 'a[]b'': 
+				printf '%s' 'a[]b' >expect &&
+				git ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1018 - pathmatch (via ls-files): match 'a[]b' 'a[]b'
 
-	Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
-	The possible behaviours are: ignore, warn, error.
+expecting success of 3070.1019 'ipathmatch: no match 'a[]b' 'a[]b'': 
+			test_must_fail test-tool wildmatch ipathmatch 'a[]b' 'a[]b'
+		
+ok 1019 - ipathmatch: no match 'a[]b' 'a[]b'
 
-	You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-	Or you can abort the rebase with 'git rebase --abort'.
-	EOF
-	tail -n11 expect >expect.2 &&
-	head -n3 expect.2 >expect.3 &&
-	tail -n7 expect.2 >>expect.3 &&
-	test_config rebase.missingCommitsCheck error &&
-	rebase_setup_and_clean missing-commit &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
-			git rebase -i --root &&
-		cp .git/rebase-merge/git-rebase-todo.backup orig &&
-		test_must_fail env FAKE_LINES="2 3 4" \
-			git rebase --edit-todo 2>actual &&
-		test_cmp expect actual &&
-		test_must_fail git rebase --continue 2>actual &&
-		test_cmp expect.2 actual &&
-		test_must_fail git rebase --edit-todo &&
-		cp orig .git/rebase-merge/git-rebase-todo &&
-		test_must_fail env FAKE_LINES="1 2 3 4" \
-			git rebase --edit-todo 2>actual &&
-		test_cmp expect.3 actual &&
-		test_must_fail git rebase --continue 2>actual &&
-		test_cmp expect.3 actual &&
-		cp orig .git/rebase-merge/git-rebase-todo &&
-		FAKE_LINES="1 2 3 4 drop 5" git rebase --edit-todo &&
-		git rebase --continue 2>actual
-	) &&
-	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test_grep \
-		"Successfully rebased and updated refs/heads/missing-commit" \
-		actual
+expecting success of 3070.1020 'ipathmatch (via ls-files): match 'a[]b' 'a[]b'': 
+				printf '%s' 'a[]b' >expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1020 - ipathmatch (via ls-files): match 'a[]b' 'a[]b'
 
-Switched to a new branch 'missing-commit'
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
+expecting success of 3070.1021 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a[]b
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1021 - cleanup after previous file test
 
-rebase -i script after editing:
-pickled 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-error: invalid command 'pickled'
-error: invalid line 1: pickled 6e62bf890e21 # A
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Or you can abort the rebase with 'git rebase --abort'.
-rebase -i script before editing:
-pickled 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-rebase -i script after editing:
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-Warning: some commits may have been dropped accidentally.
-Dropped commits (newer to older):
- - 8f99a4f1fbbd # E
- - 6e62bf890e21 # A
-To avoid this message, use "drop" to explicitly remove a commit.
+expecting success of 3070.1022 'setup match file test for ab[': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1022 - setup match file test for ab[
 
-Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
-The possible behaviours are: ignore, warn, error.
+expecting success of 3070.1023 'wildmatch: no match 'ab[' 'ab['': 
+			test_must_fail test-tool wildmatch wildmatch 'ab[' 'ab['
+		
+ok 1023 - wildmatch: no match 'ab[' 'ab['
 
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Or you can abort the rebase with 'git rebase --abort'.
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-rebase -i script after editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-rebase -i script after editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-drop 8f99a4f1fbbd # E
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/missing-commit.
-Switched to branch 'primary'
-Deleted branch missing-commit (was 0547e3f1350d).
-fatal: no rebase in progress
-ok 104 - rebase --edit-todo respects rebase.missingCommitsCheck = error
+expecting success of 3070.1024 'wildmatch (via ls-files): match 'ab[' 'ab['': 
+				printf '%s' 'ab[' >expect &&
+				git --glob-pathspecs ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1024 - wildmatch (via ls-files): match 'ab[' 'ab['
 
-expecting success of 3404.105 'rebase.missingCommitsCheck = error after resolving conflicts': 
-	test_config rebase.missingCommitsCheck error &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="drop 1 break 2 3 4" git rebase -i A E
-	) &&
-	git rebase --edit-todo &&
-	test_must_fail git rebase --continue &&
-	echo x >file1 &&
-	git add file1 &&
-	git rebase --continue
+expecting success of 3070.1025 'iwildmatch: no match 'ab[' 'ab['': 
+			test_must_fail test-tool wildmatch iwildmatch 'ab[' 'ab['
+		
+ok 1025 - iwildmatch: no match 'ab[' 'ab['
 
-rebase -i script before editing:
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
+expecting success of 3070.1026 'iwildmatch (via ls-files): match 'ab[' 'ab['': 
+				printf '%s' 'ab[' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1026 - iwildmatch (via ls-files): match 'ab[' 'ab['
 
-rebase -i script after editing:
-drop 313fe965c048 # B
-break
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-Rebasing (2/5)
Stopped at 6e62bf890e21 (A)
-Rebasing (3/5)
Rebasing (4/5)
Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 0547e3f1350d... D
-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 0547e3f1350d... # D
-[detached HEAD c2dad584937b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (5/5)
Successfully rebased and updated detached HEAD.
-ok 105 - rebase.missingCommitsCheck = error after resolving conflicts
+expecting success of 3070.1027 'pathmatch: no match 'ab[' 'ab['': 
+			test_must_fail test-tool wildmatch pathmatch 'ab[' 'ab['
+		
+ok 1027 - pathmatch: no match 'ab[' 'ab['
 
-expecting success of 3404.106 'rebase.missingCommitsCheck = error when editing for a second time': 
-	test_config rebase.missingCommitsCheck error &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 break 2 3" git rebase -i A D &&
-		cp .git/rebase-merge/git-rebase-todo todo &&
-		test_must_fail env FAKE_LINES=2 git rebase --edit-todo &&
-		GIT_SEQUENCE_EDITOR="cp todo" git rebase --edit-todo &&
-		git rebase --continue
-	)
+expecting success of 3070.1028 'pathmatch (via ls-files): match 'ab[' 'ab['': 
+				printf '%s' 'ab[' >expect &&
+				git ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1028 - pathmatch (via ls-files): match 'ab[' 'ab['
 
-rebase -i script before editing:
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
+expecting success of 3070.1029 'ipathmatch: no match 'ab[' 'ab['': 
+			test_must_fail test-tool wildmatch ipathmatch 'ab[' 'ab['
+		
+ok 1029 - ipathmatch: no match 'ab[' 'ab['
 
-rebase -i script after editing:
-pick 313fe965c048 # B
-break
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-Rebasing (2/4)
Stopped at 313fe965c048 (B)
-rebase -i script before editing:
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-rebase -i script after editing:
-pick 0547e3f1350d # D
-Warning: some commits may have been dropped accidentally.
-Dropped commits (newer to older):
- - d0f65f2f81ee # C
-To avoid this message, use "drop" to explicitly remove a commit.
+expecting success of 3070.1030 'ipathmatch (via ls-files): match 'ab[' 'ab['': 
+				printf '%s' 'ab[' >expect &&
+				git --icase-pathspecs ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1030 - ipathmatch (via ls-files): match 'ab[' 'ab['
 
-Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
-The possible behaviours are: ignore, warn, error.
+expecting success of 3070.1031 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ab[
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1031 - cleanup after previous file test
 
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Or you can abort the rebase with 'git rebase --abort'.
-Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 106 - rebase.missingCommitsCheck = error when editing for a second time
+expecting success of 3070.1032 'setup match file test for ab': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1032 - setup match file test for ab
 
-expecting success of 3404.107 'respects rebase.abbreviateCommands with fixup, squash and exec': 
-	rebase_setup_and_clean abbrevcmd &&
-	test_commit "first" file1.txt "first line" first &&
-	test_commit "second" file1.txt "another line" second &&
-	test_commit "fixup! first" file2.txt "first line again" first_fixup &&
-	test_commit "squash! second" file1.txt "another line here" second_squash &&
-	cat >expected <<-EOF &&
-	p $(git rev-list --abbrev-commit -1 first) # first
-	f $(git rev-list --abbrev-commit -1 first_fixup) # fixup! first
-	x git show HEAD
-	p $(git rev-list --abbrev-commit -1 second) # second
-	s $(git rev-list --abbrev-commit -1 second_squash) # squash! second
-	x git show HEAD
-	EOF
-	git checkout abbrevcmd &&
-	test_config rebase.abbreviateCommands true &&
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i --exec "git show HEAD" \
-			--autosquash primary >actual
-	) &&
-	test_cmp expected actual
+expecting success of 3070.1033 'wildmatch: no match 'ab' '[!'': 
+			test_must_fail test-tool wildmatch wildmatch 'ab' '[!'
+		
+ok 1033 - wildmatch: no match 'ab' '[!'
 
-Previous HEAD position was 0547e3f1350d D
-Switched to a new branch 'abbrevcmd'
-[abbrevcmd 42b8f159a432] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1.txt
-[abbrevcmd 4d77de6c05df] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[abbrevcmd ecff34393bc3] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2.txt
-[abbrevcmd f772e337e29f] squash! second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Already on 'abbrevcmd'
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-Switched to branch 'primary'
-Deleted branch abbrevcmd (was f772e337e29f).
-fatal: no rebase in progress
-ok 107 - respects rebase.abbreviateCommands with fixup, squash and exec
+expecting success of 3070.1034 'wildmatch (via ls-files): no match '[!' 'ab'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[!' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1034 - wildmatch (via ls-files): no match '[!' 'ab'
 
-expecting success of 3404.108 'static check of bad command': 
-	rebase_setup_and_clean bad-cmd &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
-		git rebase -i --root 2>actual &&
-		test_grep "pickled $(git log --format="%h # %s" -1 primary~1)" \
-				actual &&
-		test_grep "You can fix this with .git rebase --edit-todo.." \
-				actual &&
-		FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo
-	) &&
-	git rebase --continue &&
-	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test C = $(git cat-file commit HEAD^ | sed -ne \$p)
+expecting success of 3070.1035 'iwildmatch: no match 'ab' '[!'': 
+			test_must_fail test-tool wildmatch iwildmatch 'ab' '[!'
+		
+ok 1035 - iwildmatch: no match 'ab' '[!'
 
-Switched to a new branch 'bad-cmd'
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
+expecting success of 3070.1036 'iwildmatch (via ls-files): no match '[!' 'ab'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1036 - iwildmatch (via ls-files): no match '[!' 'ab'
 
-rebase -i script after editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pickled 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-error: invalid line 4: pickled 0547e3f1350d # D
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-error: invalid command 'pickled'
-error: invalid line 4: pickled 0547e3f1350d # D
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pickled 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-rebase -i script after editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-drop 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/bad-cmd.
-Switched to branch 'primary'
-Deleted branch bad-cmd (was 1c8ce10ab787).
-fatal: no rebase in progress
-ok 108 - static check of bad command
+expecting success of 3070.1037 'pathmatch: no match 'ab' '[!'': 
+			test_must_fail test-tool wildmatch pathmatch 'ab' '[!'
+		
+ok 1037 - pathmatch: no match 'ab' '[!'
 
-expecting success of 3404.109 'the first command cannot be a fixup': 
-	rebase_setup_and_clean fixup-first &&
+expecting success of 3070.1038 'pathmatch (via ls-files): no match '[!' 'ab'': 
+				>expect &&
+				git ls-files -z -- '[!' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1038 - pathmatch (via ls-files): no match '[!' 'ab'
 
-	cat >orig <<-EOF &&
-	fixup $(git log -1 --format="%h %s" B)
-	pick $(git log -1 --format="%h %s" C)
-	EOF
+expecting success of 3070.1039 'ipathmatch: no match 'ab' '[!'': 
+			test_must_fail test-tool wildmatch ipathmatch 'ab' '[!'
+		
+ok 1039 - ipathmatch: no match 'ab' '[!'
 
-	(
-		set_replace_editor orig &&
-		test_must_fail git rebase -i A 2>actual
-	) &&
-	grep "cannot .fixup. without a previous commit" actual &&
-	grep "You can fix this with .git rebase --edit-todo.." actual &&
-	# verify that the todo list has not been truncated
-	grep -v "^#" .git/rebase-merge/git-rebase-todo >actual &&
-	test_cmp orig actual &&
+expecting success of 3070.1040 'ipathmatch (via ls-files): no match '[!' 'ab'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[!' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1040 - ipathmatch (via ls-files): no match '[!' 'ab'
 
-	test_must_fail git rebase --edit-todo 2>actual &&
-	grep "cannot .fixup. without a previous commit" actual &&
-	grep "You can fix this with .git rebase --edit-todo.." actual &&
-	# verify that the todo list has not been truncated
-	grep -v "^#" .git/rebase-merge/git-rebase-todo >actual &&
-	test_cmp orig actual
+expecting success of 3070.1041 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ab
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1041 - cleanup after previous file test
 
-Switched to a new branch 'fixup-first'
-rebase -i script after editing:
-fixup 313fe965c048 B
-pick d0f65f2f81ee C
-error: cannot 'fixup' without a previous commit
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-error: cannot 'fixup' without a previous commit
-error: cannot 'fixup' without a previous commit
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Previous HEAD position was 6e62bf890e21 A
-Switched to branch 'primary'
-error: cannot delete branch 'fixup-first' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
-ok 109 - the first command cannot be a fixup
+expecting success of 3070.1042 'setup match file test for ab': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1042 - setup match file test for ab
 
-expecting success of 3404.110 'tabs and spaces are accepted in the todolist': 
-	rebase_setup_and_clean indented-comment &&
-	write_script add-indent.sh <<-\EOF &&
-	(
-		# Turn single spaces into space/tab mix
-		sed "1s/ /	/g; 2s/ /  /g; 3s/ / 	/g" "$1"
-		printf "\n\t# comment\n #more\n\t # comment\n"
-	) >"$1.new"
-	mv "$1.new" "$1"
-	EOF
-	(
-		test_set_editor "$(pwd)/add-indent.sh" &&
-		git rebase -i HEAD^^^
-	) &&
-	test E = $(git cat-file commit HEAD | sed -ne \$p)
+expecting success of 3070.1043 'wildmatch: no match 'ab' '[-'': 
+			test_must_fail test-tool wildmatch wildmatch 'ab' '[-'
+		
+ok 1043 - wildmatch: no match 'ab' '[-'
 
-Switched to a new branch 'indented-comment'
-Successfully rebased and updated refs/heads/indented-comment.
-Switched to branch 'primary'
-Deleted branch indented-comment (was 8f99a4f1fbbd).
-fatal: no rebase in progress
-ok 110 - tabs and spaces are accepted in the todolist
+expecting success of 3070.1044 'wildmatch (via ls-files): no match '[-' 'ab'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1044 - wildmatch (via ls-files): no match '[-' 'ab'
 
-expecting success of 3404.111 'static check of bad SHA-1': 
-	rebase_setup_and_clean bad-sha &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
-			git rebase -i --root 2>actual &&
-			test_grep "edit XXXXXXX False commit" actual &&
-			test_grep "You can fix this with .git rebase --edit-todo.." \
-					actual &&
-		FAKE_LINES="1 2 4 5 6" git rebase --edit-todo
-	) &&
-	git rebase --continue &&
-	test E = $(git cat-file commit HEAD | sed -ne \$p)
+expecting success of 3070.1045 'iwildmatch: no match 'ab' '[-'': 
+			test_must_fail test-tool wildmatch iwildmatch 'ab' '[-'
+		
+ok 1045 - iwildmatch: no match 'ab' '[-'
 
-Switched to a new branch 'bad-sha'
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
+expecting success of 3070.1046 'iwildmatch (via ls-files): no match '[-' 'ab'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1046 - iwildmatch (via ls-files): no match '[-' 'ab'
 
-rebase -i script after editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-edit XXXXXXX False commit
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-# comment
-error: invalid line 3: edit XXXXXXX False commit
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-error: could not parse 'XXXXXXX'
-error: invalid line 3: edit XXXXXXX False commit
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-edit XXXXXXX False commit
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-rebase -i script after editing:
-pick 6e62bf890e21 # A
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/bad-sha.
-Switched to branch 'primary'
-Deleted branch bad-sha (was 8f99a4f1fbbd).
-fatal: no rebase in progress
-ok 111 - static check of bad SHA-1
+expecting success of 3070.1047 'pathmatch: no match 'ab' '[-'': 
+			test_must_fail test-tool wildmatch pathmatch 'ab' '[-'
+		
+ok 1047 - pathmatch: no match 'ab' '[-'
 
-expecting success of 3404.112 'editor saves as CR/LF': 
-	git checkout -b with-crlf &&
-	write_script add-crs.sh <<-\EOF &&
-	sed -e "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new &&
-	mv -f "$1".new "$1"
-	EOF
-	(
-		test_set_editor "$(pwd)/add-crs.sh" &&
-		git rebase -i HEAD^
-	)
+expecting success of 3070.1048 'pathmatch (via ls-files): no match '[-' 'ab'': 
+				>expect &&
+				git ls-files -z -- '[-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1048 - pathmatch (via ls-files): no match '[-' 'ab'
 
-Switched to a new branch 'with-crlf'
-Successfully rebased and updated refs/heads/with-crlf.
-ok 112 - editor saves as CR/LF
+expecting success of 3070.1049 'ipathmatch: no match 'ab' '[-'': 
+			test_must_fail test-tool wildmatch ipathmatch 'ab' '[-'
+		
+ok 1049 - ipathmatch: no match 'ab' '[-'
 
-expecting success of 3404.113 'rebase -i --gpg-sign=<key-id>': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
-			HEAD^ >out 2>err
-	) &&
-	test_grep "$SQ-S\"S I Gner\"$SQ" err
+expecting success of 3070.1050 'ipathmatch (via ls-files): no match '[-' 'ab'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1050 - ipathmatch (via ls-files): no match '[-' 'ab'
 
-  git commit --amend '-S"S I Gner"'
-ok 113 - rebase -i --gpg-sign=<key-id>
+expecting success of 3070.1051 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ab
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1051 - cleanup after previous file test
 
-expecting success of 3404.114 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	test_config commit.gpgsign true &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
-			HEAD^ >out 2>err
-	) &&
-	test_grep "$SQ-S\"S I Gner\"$SQ" err
+expecting success of 3070.1052 'setup match file test for -': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1052 - setup match file test for -
 
-  git commit --amend '-S"S I Gner"'
-ok 114 - rebase -i --gpg-sign=<key-id> overrides commit.gpgSign
+expecting success of 3070.1053 'wildmatch: match '-' '[-]'': 
+			test-tool wildmatch wildmatch '-' '[-]'
+		
+ok 1053 - wildmatch: match '-' '[-]'
 
-expecting success of 3404.115 'valid author header after --root swap': 
-	rebase_setup_and_clean author-header no-conflict-branch &&
-	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
-	git cat-file commit HEAD | grep ^author >expected &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="5 1" git rebase -i --root
-	) &&
-	git cat-file commit HEAD^ | grep ^author >actual &&
-	test_cmp expected actual
+expecting success of 3070.1054 'wildmatch (via ls-files): match '[-]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1054 - wildmatch (via ls-files): match '[-]' '-'
 
-Switched to a new branch 'author-header'
-[author-header d4dcc6d22bff] M
- Author: Au 'thor <author@example.com>
- Date: Thu Apr 7 15:29:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 fileM
-rebase -i script before editing:
-pick 6e62bf890e21 # A
-pick 808874f7b187 # J
-pick 265b89e813d4 # K
-pick 6b0f5e6c3e83 # L
-pick d4dcc6d22bff # M
+expecting success of 3070.1055 'iwildmatch: match '-' '[-]'': 
+			test-tool wildmatch iwildmatch '-' '[-]'
+		
+ok 1055 - iwildmatch: match '-' '[-]'
 
-rebase -i script after editing:
-pick d4dcc6d22bff # M
-pick 6e62bf890e21 # A
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/author-header.
-Switched to branch 'primary'
-Deleted branch author-header (was 141d57bb9b25).
-fatal: no rebase in progress
-ok 115 - valid author header after --root swap
+expecting success of 3070.1056 'iwildmatch (via ls-files): match '[-]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1056 - iwildmatch (via ls-files): match '[-]' '-'
 
-expecting success of 3404.116 'valid author header when author contains single quote': 
-	rebase_setup_and_clean author-header no-conflict-branch &&
-	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
-	git cat-file commit HEAD | grep ^author >expected &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="2" git rebase -i HEAD~2
-	) &&
-	git cat-file commit HEAD | grep ^author >actual &&
-	test_cmp expected actual
+expecting success of 3070.1057 'pathmatch: match '-' '[-]'': 
+			test-tool wildmatch pathmatch '-' '[-]'
+		
+ok 1057 - pathmatch: match '-' '[-]'
 
-Switched to a new branch 'author-header'
-[author-header d4dcc6d22bff] M
- Author: Au 'thor <author@example.com>
- Date: Thu Apr 7 15:29:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 fileM
-rebase -i script before editing:
-pick 6b0f5e6c3e83 # L
-pick d4dcc6d22bff # M
+expecting success of 3070.1058 'pathmatch (via ls-files): match '[-]' '-'': 
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1058 - pathmatch (via ls-files): match '[-]' '-'
 
-rebase -i script after editing:
-pick d4dcc6d22bff # M
-Rebasing (1/1)
Successfully rebased and updated refs/heads/author-header.
-Switched to branch 'primary'
-Deleted branch author-header (was b929a6a72971).
-fatal: no rebase in progress
-ok 116 - valid author header when author contains single quote
+expecting success of 3070.1059 'ipathmatch: match '-' '[-]'': 
+			test-tool wildmatch ipathmatch '-' '[-]'
+		
+ok 1059 - ipathmatch: match '-' '[-]'
 
-expecting success of 3404.117 'post-commit hook is called': 
-	>actual &&
-	test_hook post-commit <<-\EOS &&
-	git rev-parse HEAD >>actual
-	EOS
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E &&
-		echo x>file3 &&
-		git add file3 &&
-		FAKE_COMMIT_MESSAGE=edited git rebase --continue
-	) &&
-	git rev-parse HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} HEAD@{1} HEAD \
-		>expect &&
-	test_cmp expect actual
+expecting success of 3070.1060 'ipathmatch (via ls-files): match '[-]' '-'': 
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1060 - ipathmatch (via ls-files): match '[-]' '-'
 
-rebase -i script before editing:
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
-pick 8f99a4f1fbbd # E
+expecting success of 3070.1061 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1061 - cleanup after previous file test
 
-rebase -i script after editing:
-edit 8f99a4f1fbbd # E
-pick 313fe965c048 # B
-reword d0f65f2f81ee # C
-fixup 0547e3f1350d # D
-Rebasing (1/4)
Stopped at 8f99a4f1fbbd...  # E
-You can amend the commit now, with
+expecting success of 3070.1062 'setup match file test for -': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1062 - setup match file test for -
 
-  git commit --amend 
+expecting success of 3070.1063 'wildmatch: no match '-' '[a-'': 
+			test_must_fail test-tool wildmatch wildmatch '-' '[a-'
+		
+ok 1063 - wildmatch: no match '-' '[a-'
 
-Once you are satisfied with your changes, run
+expecting success of 3070.1064 'wildmatch (via ls-files): no match '[a-' '-'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1064 - wildmatch (via ls-files): no match '[a-' '-'
 
-  git rebase --continue
-[detached HEAD bc867d3a07fd] edited
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Rebasing (2/4)
Rebasing (3/4)
[detached HEAD d54e5ab0b586] edited
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 117 - post-commit hook is called
+expecting success of 3070.1065 'iwildmatch: no match '-' '[a-'': 
+			test_must_fail test-tool wildmatch iwildmatch '-' '[a-'
+		
+ok 1065 - iwildmatch: no match '-' '[a-'
 
-expecting success of 3404.118 'correct error message for partial commit after empty pick': 
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="2 1 1" &&
-		export FAKE_LINES &&
-		test_must_fail git rebase -i A D
-	) &&
-	echo x >file1 &&
-	test_must_fail git commit file1 2>err &&
-	test_grep "cannot do a partial commit during a rebase." err
+expecting success of 3070.1066 'iwildmatch (via ls-files): no match '[a-' '-'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1066 - iwildmatch (via ls-files): no match '[a-' '-'
 
-rebase -i script before editing:
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
+expecting success of 3070.1067 'pathmatch: no match '-' '[a-'': 
+			test_must_fail test-tool wildmatch pathmatch '-' '[a-'
+		
+ok 1067 - pathmatch: no match '-' '[a-'
 
-rebase -i script after editing:
-pick d0f65f2f81ee # C
-pick 313fe965c048 # B
-pick 313fe965c048 # B
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+expecting success of 3070.1068 'pathmatch (via ls-files): no match '[a-' '-'': 
+				>expect &&
+				git ls-files -z -- '[a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1068 - pathmatch (via ls-files): no match '[a-' '-'
 
-    git commit --allow-empty
+expecting success of 3070.1069 'ipathmatch: no match '-' '[a-'': 
+			test_must_fail test-tool wildmatch ipathmatch '-' '[a-'
+		
+ok 1069 - ipathmatch: no match '-' '[a-'
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 6e62bf890e21
-Last commands done (3 commands done):
-   pick 313fe965c048 # B
-   pick 313fe965c048 # B
-  (see more in file .git/rebase-merge/done)
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+expecting success of 3070.1070 'ipathmatch (via ls-files): no match '[a-' '-'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1070 - ipathmatch (via ls-files): no match '[a-' '-'
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual.2
-	add-crs.sh
-	add-indent.sh
-	err
-	expect
-	expect.2
-	expect.3
-	expected
-	fake-editor.sh
-	fake-sequence-editor.sh
-	orig
-	out
-	script
-	sub/
-	todo
+expecting success of 3070.1071 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1071 - cleanup after previous file test
 
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply 313fe965c048... # B
-fatal: cannot do a partial commit during a rebase.
-ok 118 - correct error message for partial commit after empty pick
+expecting success of 3070.1072 'setup match file test for -': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1072 - setup match file test for -
 
-expecting success of 3404.119 'correct error message for commit --amend after empty pick': 
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 1" &&
-		export FAKE_LINES &&
-		test_must_fail git rebase -i A D
-	) &&
-	echo x>file1 &&
-	test_must_fail git commit -a --amend 2>err &&
-	test_grep "middle of a rebase -- cannot amend." err
+expecting success of 3070.1073 'wildmatch: no match '-' '[!a-'': 
+			test_must_fail test-tool wildmatch wildmatch '-' '[!a-'
+		
+ok 1073 - wildmatch: no match '-' '[!a-'
 
-rebase -i script before editing:
-pick 313fe965c048 # B
-pick d0f65f2f81ee # C
-pick 0547e3f1350d # D
+expecting success of 3070.1074 'wildmatch (via ls-files): no match '[!a-' '-'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1074 - wildmatch (via ls-files): no match '[!a-' '-'
 
-rebase -i script after editing:
-pick 313fe965c048 # B
-pick 313fe965c048 # B
-Rebasing (2/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+expecting success of 3070.1075 'iwildmatch: no match '-' '[!a-'': 
+			test_must_fail test-tool wildmatch iwildmatch '-' '[!a-'
+		
+ok 1075 - iwildmatch: no match '-' '[!a-'
 
-    git commit --allow-empty
+expecting success of 3070.1076 'iwildmatch (via ls-files): no match '[!a-' '-'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1076 - iwildmatch (via ls-files): no match '[!a-' '-'
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 6e62bf890e21
-Last commands done (2 commands done):
-   pick 313fe965c048 # B
-   pick 313fe965c048 # B
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+expecting success of 3070.1077 'pathmatch: no match '-' '[!a-'': 
+			test_must_fail test-tool wildmatch pathmatch '-' '[!a-'
+		
+ok 1077 - pathmatch: no match '-' '[!a-'
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual.2
-	add-crs.sh
-	add-indent.sh
-	err
-	expect
-	expect.2
-	expect.3
-	expected
-	fake-editor.sh
-	fake-sequence-editor.sh
-	orig
-	out
-	script
-	sub/
-	todo
+expecting success of 3070.1078 'pathmatch (via ls-files): no match '[!a-' '-'': 
+				>expect &&
+				git ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1078 - pathmatch (via ls-files): no match '[!a-' '-'
 
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply 313fe965c048... # B
-fatal: You are in the middle of a rebase -- cannot amend.
-ok 119 - correct error message for commit --amend after empty pick
+expecting success of 3070.1079 'ipathmatch: no match '-' '[!a-'': 
+			test_must_fail test-tool wildmatch ipathmatch '-' '[!a-'
+		
+ok 1079 - ipathmatch: no match '-' '[!a-'
 
-expecting success of 3404.120 'todo has correct onto hash': 
-	GIT_SEQUENCE_EDITOR=cat git rebase -i no-conflict-branch~4 no-conflict-branch >actual &&
-	onto=$(git rev-parse --short HEAD~4) &&
-	test_grep "^# Rebase ..* onto $onto" actual
+expecting success of 3070.1080 'ipathmatch (via ls-files): no match '[!a-' '-'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1080 - ipathmatch (via ls-files): no match '[!a-' '-'
 
-Successfully rebased and updated refs/heads/no-conflict-branch.
-# Rebase 6e62bf890e21..33895580a3f9 onto 6e62bf890e21 (4 commands)
-ok 120 - todo has correct onto hash
+expecting success of 3070.1081 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1081 - cleanup after previous file test
 
-expecting success of 3404.121 'ORIG_HEAD is updated correctly': 
-	test_when_finished "git checkout primary && git branch -D test-orig-head" &&
-	git checkout -b test-orig-head A &&
-	git commit --allow-empty -m A1 &&
-	git commit --allow-empty -m A2 &&
-	git commit --allow-empty -m A3 &&
-	git commit --allow-empty -m A4 &&
-	git rebase primary &&
-	test_cmp_rev ORIG_HEAD test-orig-head@{1}
+expecting success of 3070.1082 'setup match file test for -': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1082 - setup match file test for -
 
-Switched to a new branch 'test-orig-head'
-[test-orig-head 988a45cf7c4d] A1
- Author: A U Thor <author@example.com>
-[test-orig-head 001994977a57] A2
- Author: A U Thor <author@example.com>
-[test-orig-head f8b037fdfd3c] A3
- Author: A U Thor <author@example.com>
-[test-orig-head dee0c985c630] A4
- Author: A U Thor <author@example.com>
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/test-orig-head.
-Switched to branch 'primary'
-Deleted branch test-orig-head (was 25c72c815b0c).
-ok 121 - ORIG_HEAD is updated correctly
+expecting success of 3070.1083 'wildmatch: match '-' '[--A]'': 
+			test-tool wildmatch wildmatch '-' '[--A]'
+		
+ok 1083 - wildmatch: match '-' '[--A]'
 
-expecting success of 3404.122 '--update-refs adds label and update-ref commands': 
-	git checkout -b update-refs no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	git commit --allow-empty --fixup=third &&
-	git branch -f is-not-reordered &&
-	git commit --allow-empty --fixup=HEAD~4 &&
-	git branch -f shared-tip &&
-	(
-		set_cat_todo_editor &&
+expecting success of 3070.1084 'wildmatch (via ls-files): match '[--A]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1084 - wildmatch (via ls-files): match '[--A]' '-'
 
-		cat >expect <<-EOF &&
-		pick $(git log -1 --format=%h J) # J
-		fixup $(git log -1 --format=%h update-refs) # fixup! J # empty
-		update-ref refs/heads/second
-		update-ref refs/heads/first
-		pick $(git log -1 --format=%h K) # K
-		pick $(git log -1 --format=%h L) # L
-		fixup $(git log -1 --format=%h is-not-reordered) # fixup! L # empty
-		update-ref refs/heads/third
-		pick $(git log -1 --format=%h M) # M
-		update-ref refs/heads/no-conflict-branch
-		update-ref refs/heads/is-not-reordered
-		update-ref refs/heads/shared-tip
-		EOF
+expecting success of 3070.1085 'iwildmatch: match '-' '[--A]'': 
+			test-tool wildmatch iwildmatch '-' '[--A]'
+		
+ok 1085 - iwildmatch: match '-' '[--A]'
 
-		test_must_fail git rebase -i --autosquash --update-refs primary >todo &&
-		test_cmp expect todo &&
+expecting success of 3070.1086 'iwildmatch (via ls-files): match '[--A]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1086 - iwildmatch (via ls-files): match '[--A]' '-'
 
-		test_must_fail git -c rebase.autosquash=true \
-				   -c rebase.updaterefs=true \
-				   rebase -i primary >todo &&
+expecting success of 3070.1087 'pathmatch: match '-' '[--A]'': 
+			test-tool wildmatch pathmatch '-' '[--A]'
+		
+ok 1087 - pathmatch: match '-' '[--A]'
 
-		test_cmp expect todo
-	)
+expecting success of 3070.1088 'pathmatch (via ls-files): match '[--A]' '-'': 
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1088 - pathmatch (via ls-files): match '[--A]' '-'
 
-Switched to a new branch 'update-refs'
-[update-refs d580aa243c5a] fixup! L
- Author: A U Thor <author@example.com>
-[update-refs 5921e09cdb84] fixup! J
- 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"'
-ok 122 - --update-refs adds label and update-ref commands
+expecting success of 3070.1089 'ipathmatch: match '-' '[--A]'': 
+			test-tool wildmatch ipathmatch '-' '[--A]'
+		
+ok 1089 - ipathmatch: match '-' '[--A]'
 
-expecting success of 3404.123 '--update-refs adds commands with --rebase-merges': 
-	git checkout -b update-refs-with-merge no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	git merge -m merge branch2 &&
-	git branch -f merge-branch &&
-	git commit --fixup=third --allow-empty &&
-	(
-		set_cat_todo_editor &&
+expecting success of 3070.1090 'ipathmatch (via ls-files): match '[--A]' '-'': 
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1090 - ipathmatch (via ls-files): match '[--A]' '-'
 
-		cat >expect <<-EOF &&
-		label onto
-		reset onto
-		pick $(git log -1 --format=%h branch2~1) # F
-		pick $(git log -1 --format=%h branch2) # I
-		update-ref refs/heads/branch2
-		label branch2
-		reset onto
-		pick $(git log -1 --format=%h refs/heads/second) # J
-		update-ref refs/heads/second
-		update-ref refs/heads/first
-		pick $(git log -1 --format=%h refs/heads/third~1) # K
-		pick $(git log -1 --format=%h refs/heads/third) # L
-		fixup $(git log -1 --format=%h update-refs-with-merge) # fixup! L # empty
-		update-ref refs/heads/third
-		pick $(git log -1 --format=%h HEAD~2) # M
-		update-ref refs/heads/no-conflict-branch
-		merge -C $(git log -1 --format=%h HEAD~1) branch2 # merge
-		update-ref refs/heads/merge-branch
-		EOF
+expecting success of 3070.1091 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1091 - cleanup after previous file test
 
-		test_must_fail git rebase -i --autosquash \
-				   --rebase-merges=rebase-cousins \
-				   --update-refs primary >todo &&
+expecting success of 3070.1092 'setup match file test for 5': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1092 - setup match file test for 5
 
-		test_cmp expect todo &&
+expecting success of 3070.1093 'wildmatch: match '5' '[--A]'': 
+			test-tool wildmatch wildmatch '5' '[--A]'
+		
+ok 1093 - wildmatch: match '5' '[--A]'
 
-		test_must_fail git -c rebase.autosquash=true \
-				   -c rebase.updaterefs=true \
-				   rebase -i \
-				   --rebase-merges=rebase-cousins \
-				   primary >todo &&
+expecting success of 3070.1094 'wildmatch (via ls-files): match '[--A]' '5'': 
+				printf '%s' '5' >expect &&
+				git --glob-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1094 - wildmatch (via ls-files): match '[--A]' '5'
 
-		test_cmp expect todo
-	)
+expecting success of 3070.1095 'iwildmatch: match '5' '[--A]'': 
+			test-tool wildmatch iwildmatch '5' '[--A]'
+		
+ok 1095 - iwildmatch: match '5' '[--A]'
 
-Switched to a new branch 'update-refs-with-merge'
-Merge made by the 'ort' strategy.
- file4 | 1 +
- file6 | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 file4
- create mode 100644 file6
-[update-refs-with-merge 29fba79037a4] fixup! L
- 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"'
-ok 123 - --update-refs adds commands with --rebase-merges
+expecting success of 3070.1096 'iwildmatch (via ls-files): match '[--A]' '5'': 
+				printf '%s' '5' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1096 - iwildmatch (via ls-files): match '[--A]' '5'
 
-expecting success of 3404.124 '--update-refs updates refs correctly': 
-	git checkout -B update-refs no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	test_commit extra2 fileX &&
-	git commit --amend --fixup=L &&
+expecting success of 3070.1097 'pathmatch: match '5' '[--A]'': 
+			test-tool wildmatch pathmatch '5' '[--A]'
+		
+ok 1097 - pathmatch: match '5' '[--A]'
 
-	git rebase -i --autosquash --update-refs primary 2>err &&
+expecting success of 3070.1098 'pathmatch (via ls-files): match '[--A]' '5'': 
+				printf '%s' '5' >expect &&
+				git ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1098 - pathmatch (via ls-files): match '[--A]' '5'
 
-	test_cmp_rev HEAD~3 refs/heads/first &&
-	test_cmp_rev HEAD~3 refs/heads/second &&
-	test_cmp_rev HEAD~1 refs/heads/third &&
-	test_cmp_rev HEAD refs/heads/no-conflict-branch &&
+expecting success of 3070.1099 'ipathmatch: match '5' '[--A]'': 
+			test-tool wildmatch ipathmatch '5' '[--A]'
+		
+ok 1099 - ipathmatch: match '5' '[--A]'
 
-	q_to_tab >expect <<-\EOF &&
-	Successfully rebased and updated refs/heads/update-refs.
-	Updated the following refs with --update-refs:
-	Qrefs/heads/first
-	Qrefs/heads/no-conflict-branch
-	Qrefs/heads/second
-	Qrefs/heads/third
-	EOF
+expecting success of 3070.1100 'ipathmatch (via ls-files): match '[--A]' '5'': 
+				printf '%s' '5' >expect &&
+				git --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1100 - ipathmatch (via ls-files): match '[--A]' '5'
 
-	# Clear "Rebasing (X/Y)" progress lines and drop leading tabs.
-	sed "s/Rebasing.*Successfully/Successfully/g" <err >err.trimmed &&
-	test_cmp expect err.trimmed
+expecting success of 3070.1101 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing 5
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1101 - cleanup after previous file test
 
-Switched to and reset branch 'update-refs'
-[update-refs 9da56b161557] extra2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileX
-[update-refs c4f48e9a00f5] fixup! L
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileX
-ok 124 - --update-refs updates refs correctly
+expecting success of 3070.1102 'setup match file test for  ': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1102 - setup match file test for  
 
-expecting success of 3404.125 'respect user edits to update-ref steps': 
-	git checkout -B update-refs-break no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	git branch -f unseen base &&
+expecting success of 3070.1103 'wildmatch: match ' ' '[ --]'': 
+			test-tool wildmatch wildmatch ' ' '[ --]'
+		
+ok 1103 - wildmatch: match ' ' '[ --]'
 
-	# First, we will add breaks to the expected todo file
-	cat >fake-todo-1 <<-EOF &&
-	pick $(git rev-parse HEAD~3)
-	break
-	update-ref refs/heads/second
-	update-ref refs/heads/first
+expecting success of 3070.1104 'wildmatch (via ls-files): match '[ --]' ' '': 
+				printf '%s' ' ' >expect &&
+				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1104 - wildmatch (via ls-files): match '[ --]' ' '
 
-	pick $(git rev-parse HEAD~2)
-	pick $(git rev-parse HEAD~1)
-	update-ref refs/heads/third
+expecting success of 3070.1105 'iwildmatch: match ' ' '[ --]'': 
+			test-tool wildmatch iwildmatch ' ' '[ --]'
+		
+ok 1105 - iwildmatch: match ' ' '[ --]'
 
-	pick $(git rev-parse HEAD)
-	update-ref refs/heads/no-conflict-branch
-	EOF
+expecting success of 3070.1106 'iwildmatch (via ls-files): match '[ --]' ' '': 
+				printf '%s' ' ' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1106 - iwildmatch (via ls-files): match '[ --]' ' '
 
-	# Second, we will drop some update-refs commands (and move one)
-	cat >fake-todo-2 <<-EOF &&
-	update-ref refs/heads/second
+expecting success of 3070.1107 'pathmatch: match ' ' '[ --]'': 
+			test-tool wildmatch pathmatch ' ' '[ --]'
+		
+ok 1107 - pathmatch: match ' ' '[ --]'
 
-	pick $(git rev-parse HEAD~2)
-	update-ref refs/heads/third
-	pick $(git rev-parse HEAD~1)
-	break
+expecting success of 3070.1108 'pathmatch (via ls-files): match '[ --]' ' '': 
+				printf '%s' ' ' >expect &&
+				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1108 - pathmatch (via ls-files): match '[ --]' ' '
 
-	pick $(git rev-parse HEAD)
-	EOF
+expecting success of 3070.1109 'ipathmatch: match ' ' '[ --]'': 
+			test-tool wildmatch ipathmatch ' ' '[ --]'
+		
+ok 1109 - ipathmatch: match ' ' '[ --]'
 
-	# Third, we will:
-	# * insert a new one (new-branch),
-	# * re-add an old one (first), and
-	# * add a second instance of a previously-stored one (second)
-	cat >fake-todo-3 <<-EOF &&
-	update-ref refs/heads/unseen
-	update-ref refs/heads/new-branch
-	pick $(git rev-parse HEAD)
-	update-ref refs/heads/first
-	update-ref refs/heads/second
-	EOF
+expecting success of 3070.1110 'ipathmatch (via ls-files): match '[ --]' ' '': 
+				printf '%s' ' ' >expect &&
+				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1110 - ipathmatch (via ls-files): match '[ --]' ' '
 
-	(
-		set_replace_editor fake-todo-1 &&
-		git rebase -i --update-refs primary &&
+expecting success of 3070.1111 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing  
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1111 - cleanup after previous file test
 
-		# These branches are currently locked.
-		for b in first second third no-conflict-branch
-		do
-			test_must_fail git branch -f $b base || return 1
-		done &&
+expecting success of 3070.1112 'setup match file test for $': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1112 - setup match file test for $
 
-		set_replace_editor fake-todo-2 &&
-		git rebase --edit-todo &&
+expecting success of 3070.1113 'wildmatch: match '$' '[ --]'': 
+			test-tool wildmatch wildmatch '$' '[ --]'
+		
+ok 1113 - wildmatch: match '$' '[ --]'
 
-		# These branches are currently locked.
-		for b in second third
-		do
-			test_must_fail git branch -f $b base || return 1
-		done &&
+expecting success of 3070.1114 'wildmatch (via ls-files): match '[ --]' '$'': 
+				printf '%s' '$' >expect &&
+				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1114 - wildmatch (via ls-files): match '[ --]' '$'
 
-		# These branches are currently unlocked for checkout.
-		for b in first no-conflict-branch
-		do
-			git worktree add wt-$b $b &&
-			git worktree remove wt-$b || return 1
-		done &&
+expecting success of 3070.1115 'iwildmatch: match '$' '[ --]'': 
+			test-tool wildmatch iwildmatch '$' '[ --]'
+		
+ok 1115 - iwildmatch: match '$' '[ --]'
 
-		git rebase --continue &&
+expecting success of 3070.1116 'iwildmatch (via ls-files): match '[ --]' '$'': 
+				printf '%s' '$' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1116 - iwildmatch (via ls-files): match '[ --]' '$'
 
-		set_replace_editor fake-todo-3 &&
-		git rebase --edit-todo &&
+expecting success of 3070.1117 'pathmatch: match '$' '[ --]'': 
+			test-tool wildmatch pathmatch '$' '[ --]'
+		
+ok 1117 - pathmatch: match '$' '[ --]'
 
-		# These branches are currently locked.
-		for b in second third first unseen
-		do
-			test_must_fail git branch -f $b base || return 1
-		done &&
+expecting success of 3070.1118 'pathmatch (via ls-files): match '[ --]' '$'': 
+				printf '%s' '$' >expect &&
+				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1118 - pathmatch (via ls-files): match '[ --]' '$'
 
-		# These branches are currently unlocked for checkout.
-		for b in no-conflict-branch
-		do
-			git worktree add wt-$b $b &&
-			git worktree remove wt-$b || return 1
-		done &&
+expecting success of 3070.1119 'ipathmatch: match '$' '[ --]'': 
+			test-tool wildmatch ipathmatch '$' '[ --]'
+		
+ok 1119 - ipathmatch: match '$' '[ --]'
 
-		git rebase --continue
-	) &&
+expecting success of 3070.1120 'ipathmatch (via ls-files): match '[ --]' '$'': 
+				printf '%s' '$' >expect &&
+				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1120 - ipathmatch (via ls-files): match '[ --]' '$'
 
-	test_cmp_rev HEAD~2 refs/heads/third &&
-	test_cmp_rev HEAD~1 refs/heads/unseen &&
-	test_cmp_rev HEAD~1 refs/heads/new-branch &&
-	test_cmp_rev HEAD refs/heads/first &&
-	test_cmp_rev HEAD refs/heads/second &&
-	test_cmp_rev HEAD refs/heads/no-conflict-branch
+expecting success of 3070.1121 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing $
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1121 - cleanup after previous file test
 
-Switched to a new branch 'update-refs-break'
-rebase -i script after editing:
-pick c49b6574f4e9659c4aef3cc10be848348dc1a0ee
-break
-update-ref refs/heads/second
-update-ref refs/heads/first
+expecting success of 3070.1122 'setup match file test for -': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1122 - setup match file test for -
 
-pick e31be72ab52d740527956c171d40a832b63e68ca
-pick 34033109e5a0def540b16172943d8a7e2a8a712e
-update-ref refs/heads/third
+expecting success of 3070.1123 'wildmatch: match '-' '[ --]'': 
+			test-tool wildmatch wildmatch '-' '[ --]'
+		
+ok 1123 - wildmatch: match '-' '[ --]'
 
-pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
-update-ref refs/heads/no-conflict-branch
-Rebasing (2/9)
Stopped at c49b6574f4e9 (J)
-fatal: cannot force update the branch 'first' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'no-conflict-branch' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
-rebase -i script after editing:
-update-ref refs/heads/second
+expecting success of 3070.1124 'wildmatch (via ls-files): match '[ --]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1124 - wildmatch (via ls-files): match '[ --]' '-'
 
-pick e31be72ab52d740527956c171d40a832b63e68ca
-update-ref refs/heads/third
-pick 34033109e5a0def540b16172943d8a7e2a8a712e
-break
+expecting success of 3070.1125 'iwildmatch: match '-' '[ --]'': 
+			test-tool wildmatch iwildmatch '-' '[ --]'
+		
+ok 1125 - iwildmatch: match '-' '[ --]'
 
-pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
-fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
-warning: refname 'first' is ambiguous.
-warning: refname 'first' is ambiguous.
-Preparing worktree (checking out 'first')
-warning: refname 'first' is ambiguous.
-HEAD is now at c49b6574f4e9 J
-Preparing worktree (checking out 'no-conflict-branch')
-HEAD is now at fb069ba3d9b1 M
-Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Stopped at 34033109e5a0 (L)
-rebase -i script after editing:
-update-ref refs/heads/unseen
-update-ref refs/heads/new-branch
-pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
-update-ref refs/heads/first
-update-ref refs/heads/second
-fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'first' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'unseen' used by worktree at '/build/reproducible-path/git-2.51.0/t/trash directory.t3404-rebase-interactive'
-Preparing worktree (checking out 'no-conflict-branch')
-HEAD is now at fb069ba3d9b1 M
-Rebasing (8/12)
Rebasing (9/12)
Rebasing (10/12)
Rebasing (11/12)
Rebasing (12/12)
Successfully rebased and updated refs/heads/update-refs-break.
-Updated the following refs with --update-refs:
-	refs/heads/first
-	refs/heads/new-branch
-	refs/heads/second
-	refs/heads/third
-	refs/heads/unseen
-ok 125 - respect user edits to update-ref steps
+expecting success of 3070.1126 'iwildmatch (via ls-files): match '[ --]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1126 - iwildmatch (via ls-files): match '[ --]' '-'
 
-expecting success of 3404.126 '--update-refs: all update-ref lines removed': 
-	git checkout -b test-refs-not-removed no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	git branch -f tip &&
+expecting success of 3070.1127 'pathmatch: match '-' '[ --]'': 
+			test-tool wildmatch pathmatch '-' '[ --]'
+		
+ok 1127 - pathmatch: match '-' '[ --]'
 
-	test_commit test-refs-not-removed &&
-	git commit --amend --fixup first &&
+expecting success of 3070.1128 'pathmatch (via ls-files): match '[ --]' '-'': 
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1128 - pathmatch (via ls-files): match '[ --]' '-'
 
-	git rev-parse first second third tip no-conflict-branch >expect-oids &&
+expecting success of 3070.1129 'ipathmatch: match '-' '[ --]'': 
+			test-tool wildmatch ipathmatch '-' '[ --]'
+		
+ok 1129 - ipathmatch: match '-' '[ --]'
 
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i --update-refs base >todo.raw &&
-		sed -e "/^update-ref/d" <todo.raw >todo
-	) &&
-	(
-		set_replace_editor todo &&
-		git rebase -i --update-refs base
-	) &&
+expecting success of 3070.1130 'ipathmatch (via ls-files): match '[ --]' '-'': 
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1130 - ipathmatch (via ls-files): match '[ --]' '-'
 
-	# Ensure refs are not deleted and their OIDs have not changed
-	git rev-parse first second third tip no-conflict-branch >actual-oids &&
-	test_cmp expect-oids actual-oids
+expecting success of 3070.1131 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1131 - cleanup after previous file test
 
-Switched to a new branch 'test-refs-not-removed'
-[test-refs-not-removed adbf713ec8f3] test-refs-not-removed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-refs-not-removed.t
-warning: refname 'first' is ambiguous.
-[test-refs-not-removed 5ca2ca8d583e] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-refs-not-removed.t
-warning: refname 'first' is ambiguous.
-warning: refname 'second' is ambiguous.
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-rebase -i script after editing:
-pick c49b6574f4e9 # J
-pick e31be72ab52d # K
-pick 34033109e5a0 # L
-pick fb069ba3d9b1 # M
-pick 5ca2ca8d583e # fixup! first
-Successfully rebased and updated refs/heads/test-refs-not-removed.
-warning: refname 'first' is ambiguous.
-warning: refname 'second' is ambiguous.
-ok 126 - --update-refs: all update-ref lines removed
+expecting success of 3070.1132 'setup match file test for 0': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1132 - setup match file test for 0
 
-expecting success of 3404.127 '--update-refs: all update-ref lines removed, then some re-added': 
-	git checkout -b test-refs-not-removed2 no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	git branch -f tip &&
+expecting success of 3070.1133 'wildmatch: no match '0' '[ --]'': 
+			test_must_fail test-tool wildmatch wildmatch '0' '[ --]'
+		
+ok 1133 - wildmatch: no match '0' '[ --]'
 
-	test_commit test-refs-not-removed2 &&
-	git commit --amend --fixup first &&
+expecting success of 3070.1134 'wildmatch (via ls-files): no match '[ --]' '0'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1134 - wildmatch (via ls-files): no match '[ --]' '0'
 
-	git rev-parse first second third >expect-oids &&
+expecting success of 3070.1135 'iwildmatch: no match '0' '[ --]'': 
+			test_must_fail test-tool wildmatch iwildmatch '0' '[ --]'
+		
+ok 1135 - iwildmatch: no match '0' '[ --]'
 
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i \
-			--autosquash --update-refs \
-			base >todo.raw &&
-		sed -e "/^update-ref/d" <todo.raw >todo
-	) &&
+expecting success of 3070.1136 'iwildmatch (via ls-files): no match '[ --]' '0'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1136 - iwildmatch (via ls-files): no match '[ --]' '0'
 
-	# Add a break to the end of the todo so we can edit later
-	echo "break" >>todo &&
+expecting success of 3070.1137 'pathmatch: no match '0' '[ --]'': 
+			test_must_fail test-tool wildmatch pathmatch '0' '[ --]'
+		
+ok 1137 - pathmatch: no match '0' '[ --]'
 
-	(
-		set_replace_editor todo &&
-		git rebase -i --autosquash --update-refs base &&
-		echo "update-ref refs/heads/tip" >todo &&
-		git rebase --edit-todo &&
-		git rebase --continue
-	) &&
+expecting success of 3070.1138 'pathmatch (via ls-files): no match '[ --]' '0'': 
+				>expect &&
+				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1138 - pathmatch (via ls-files): no match '[ --]' '0'
 
-	# Ensure first/second/third are unchanged, but tip is updated
-	git rev-parse first second third >actual-oids &&
-	test_cmp expect-oids actual-oids &&
-	test_cmp_rev HEAD tip
+expecting success of 3070.1139 'ipathmatch: no match '0' '[ --]'': 
+			test_must_fail test-tool wildmatch ipathmatch '0' '[ --]'
+		
+ok 1139 - ipathmatch: no match '0' '[ --]'
 
-Switched to a new branch 'test-refs-not-removed2'
-[test-refs-not-removed2 67d47c6fa009] test-refs-not-removed2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-refs-not-removed2.t
-warning: refname 'first' is ambiguous.
-[test-refs-not-removed2 04193a2c3f06] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-refs-not-removed2.t
-warning: refname 'first' is ambiguous.
-warning: refname 'second' is ambiguous.
-warning: refname 'first' is ambiguous.
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-warning: refname 'first' is ambiguous.
-rebase -i script after editing:
-pick c49b6574f4e9 # J
-pick e31be72ab52d # K
-pick 34033109e5a0 # L
-pick fb069ba3d9b1 # M
-pick 04193a2c3f06 # fixup! first
-break
-Rebasing (6/6)
Stopped at 04193a2c3f06 (fixup! first)
-rebase -i script after editing:
-update-ref refs/heads/tip
-Rebasing (7/7)
Successfully rebased and updated refs/heads/test-refs-not-removed2.
-Updated the following refs with --update-refs:
-	refs/heads/tip
-warning: refname 'first' is ambiguous.
-warning: refname 'second' is ambiguous.
-ok 127 - --update-refs: all update-ref lines removed, then some re-added
+expecting success of 3070.1140 'ipathmatch (via ls-files): no match '[ --]' '0'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1140 - ipathmatch (via ls-files): no match '[ --]' '0'
 
-expecting success of 3404.128 '--update-refs: --edit-todo with no update-ref lines': 
-	git checkout -b test-refs-not-removed3 no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	git branch -f tip &&
+expecting success of 3070.1141 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing 0
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1141 - cleanup after previous file test
 
-	test_commit test-refs-not-removed3 &&
-	git commit --amend --fixup first &&
+expecting success of 3070.1142 'setup match file test for -': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1142 - setup match file test for -
 
-	git rev-parse first second third tip no-conflict-branch >expect-oids &&
+expecting success of 3070.1143 'wildmatch: match '-' '[---]'': 
+			test-tool wildmatch wildmatch '-' '[---]'
+		
+ok 1143 - wildmatch: match '-' '[---]'
 
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i \
-			--autosquash --update-refs \
-			base >todo.raw &&
-		sed -e "/^update-ref/d" <todo.raw >todo
-	) &&
+expecting success of 3070.1144 'wildmatch (via ls-files): match '[---]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[---]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1144 - wildmatch (via ls-files): match '[---]' '-'
 
-	# Add a break to the beginning of the todo so we can resume with no
-	# update-ref lines
-	echo "break" >todo.new &&
-	cat todo >>todo.new &&
+expecting success of 3070.1145 'iwildmatch: match '-' '[---]'': 
+			test-tool wildmatch iwildmatch '-' '[---]'
+		
+ok 1145 - iwildmatch: match '-' '[---]'
 
-	(
-		set_replace_editor todo.new &&
-		git rebase -i --autosquash --update-refs base &&
+expecting success of 3070.1146 'iwildmatch (via ls-files): match '[---]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[---]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1146 - iwildmatch (via ls-files): match '[---]' '-'
 
-		# Make no changes when editing so update-refs is still empty
-		cat todo >todo.new &&
-		git rebase --edit-todo &&
-		git rebase --continue
-	) &&
+expecting success of 3070.1147 'pathmatch: match '-' '[---]'': 
+			test-tool wildmatch pathmatch '-' '[---]'
+		
+ok 1147 - pathmatch: match '-' '[---]'
 
-	# Ensure refs are not deleted and their OIDs have not changed
-	git rev-parse first second third tip no-conflict-branch >actual-oids &&
-	test_cmp expect-oids actual-oids
+expecting success of 3070.1148 'pathmatch (via ls-files): match '[---]' '-'': 
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[---]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1148 - pathmatch (via ls-files): match '[---]' '-'
 
-Switched to a new branch 'test-refs-not-removed3'
-[test-refs-not-removed3 0495d4feaa2b] test-refs-not-removed3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-refs-not-removed3.t
-warning: refname 'first' is ambiguous.
-[test-refs-not-removed3 6fcb3c6ba86d] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-refs-not-removed3.t
-warning: refname 'first' is ambiguous.
-warning: refname 'second' is ambiguous.
-warning: refname 'first' is ambiguous.
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-warning: refname 'first' is ambiguous.
-rebase -i script after editing:
-break
-pick c49b6574f4e9 # J
-pick e31be72ab52d # K
-pick 34033109e5a0 # L
-pick fb069ba3d9b1 # M
-pick 6fcb3c6ba86d # fixup! first
-Rebasing (1/6)
Stopped at 8f99a4f1fbbd (E)
-rebase -i script after editing:
-pick c49b6574f4e9 # J
-pick e31be72ab52d # K
-pick 34033109e5a0 # L
-pick fb069ba3d9b1 # M
-pick 6fcb3c6ba86d # fixup! first
-Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/test-refs-not-removed3.
-warning: refname 'first' is ambiguous.
-warning: refname 'second' is ambiguous.
-ok 128 - --update-refs: --edit-todo with no update-ref lines
+expecting success of 3070.1149 'ipathmatch: match '-' '[---]'': 
+			test-tool wildmatch ipathmatch '-' '[---]'
+		
+ok 1149 - ipathmatch: match '-' '[---]'
 
-expecting success of 3404.129 '--update-refs: check failed ref update': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -B update-refs-error no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~2 &&
-	git branch -f third HEAD~1 &&
+expecting success of 3070.1150 'ipathmatch (via ls-files): match '[---]' '-'': 
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[---]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1150 - ipathmatch (via ls-files): match '[---]' '-'
 
-	cat >fake-todo <<-EOF &&
-	pick $(git rev-parse HEAD~3)
-	break
-	update-ref refs/heads/first
+expecting success of 3070.1151 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1151 - cleanup after previous file test
 
-	pick $(git rev-parse HEAD~2)
-	update-ref refs/heads/second
+expecting success of 3070.1152 'setup match file test for -': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1152 - setup match file test for -
 
-	pick $(git rev-parse HEAD~1)
-	update-ref refs/heads/third
+expecting success of 3070.1153 'wildmatch: match '-' '[------]'': 
+			test-tool wildmatch wildmatch '-' '[------]'
+		
+ok 1153 - wildmatch: match '-' '[------]'
 
-	pick $(git rev-parse HEAD)
-	update-ref refs/heads/no-conflict-branch
-	EOF
+expecting success of 3070.1154 'wildmatch (via ls-files): match '[------]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1154 - wildmatch (via ls-files): match '[------]' '-'
 
-	(
-		set_replace_editor fake-todo &&
-		git rebase -i --update-refs base
-	) &&
+expecting success of 3070.1155 'iwildmatch: match '-' '[------]'': 
+			test-tool wildmatch iwildmatch '-' '[------]'
+		
+ok 1155 - iwildmatch: match '-' '[------]'
 
-	# At this point, the values of first, second, and third are
-	# recorded in the update-refs file. We will force-update the
-	# "second" ref, but "git branch -f" will not work because of
-	# the lock in the update-refs file.
-	git update-ref refs/heads/second third &&
+expecting success of 3070.1156 'iwildmatch (via ls-files): match '[------]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1156 - iwildmatch (via ls-files): match '[------]' '-'
 
-	test_must_fail git rebase --continue 2>err &&
-	grep "update_ref failed for ref 'refs/heads/second'" err &&
+expecting success of 3070.1157 'pathmatch: match '-' '[------]'': 
+			test-tool wildmatch pathmatch '-' '[------]'
+		
+ok 1157 - pathmatch: match '-' '[------]'
 
-	q_to_tab >expect <<-\EOF &&
-	Updated the following refs with --update-refs:
-	Qrefs/heads/first
-	Qrefs/heads/no-conflict-branch
-	Qrefs/heads/third
-	Failed to update the following refs with --update-refs:
-	Qrefs/heads/second
-	EOF
+expecting success of 3070.1158 'pathmatch (via ls-files): match '[------]' '-'': 
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1158 - pathmatch (via ls-files): match '[------]' '-'
 
-	# Clear "Rebasing (X/Y)" progress lines and drop leading tabs.
-	tail -n 6 err >err.last &&
-	sed "s/Rebasing.*Successfully/Successfully/g" <err.last >err.trimmed &&
-	test_cmp expect err.trimmed
+expecting success of 3070.1159 'ipathmatch: match '-' '[------]'': 
+			test-tool wildmatch ipathmatch '-' '[------]'
+		
+ok 1159 - ipathmatch: match '-' '[------]'
 
-Switched to a new branch 'update-refs-error'
-rebase -i script after editing:
-pick c49b6574f4e9659c4aef3cc10be848348dc1a0ee
-break
-update-ref refs/heads/first
+expecting success of 3070.1160 'ipathmatch (via ls-files): match '[------]' '-'': 
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1160 - ipathmatch (via ls-files): match '[------]' '-'
 
-pick e31be72ab52d740527956c171d40a832b63e68ca
-update-ref refs/heads/second
+expecting success of 3070.1161 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1161 - cleanup after previous file test
 
-pick 34033109e5a0def540b16172943d8a7e2a8a712e
-update-ref refs/heads/third
+expecting success of 3070.1162 'setup match file test for j': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1162 - setup match file test for j
 
-pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
-update-ref refs/heads/no-conflict-branch
-Rebasing (2/9)
Stopped at c49b6574f4e9 (J)
-error: update_ref failed for ref 'refs/heads/second': cannot lock ref 'refs/heads/second': is at 34033109e5a0def540b16172943d8a7e2a8a712e but expected e31be72ab52d740527956c171d40a832b63e68ca
-ok 129 - --update-refs: check failed ref update
+expecting success of 3070.1163 'wildmatch: no match 'j' '[a-e-n]'': 
+			test_must_fail test-tool wildmatch wildmatch 'j' '[a-e-n]'
+		
+ok 1163 - wildmatch: no match 'j' '[a-e-n]'
 
-expecting success of 3404.130 'bad labels and refs rejected when parsing todo list': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	cat >todo <<-\EOF &&
-	exec >execed
-	label #
-	label :invalid
-	update-ref :bad
-	update-ref topic
-	EOF
-	rm -f execed &&
-	(
-		set_replace_editor todo &&
-		test_must_fail git rebase -i HEAD 2>err
-	) &&
-	grep "'#' is not a valid label" err &&
-	grep "':invalid' is not a valid label" err &&
-	grep "':bad' is not a valid refname" err &&
-	grep "update-ref requires a fully qualified refname e.g. refs/heads/topic" \
-		err &&
-	test_path_is_missing execed
+expecting success of 3070.1164 'wildmatch (via ls-files): no match '[a-e-n]' 'j'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1164 - wildmatch (via ls-files): no match '[a-e-n]' 'j'
 
-rebase -i script after editing:
-exec >execed
-label #
-label :invalid
-update-ref :bad
-update-ref topic
-error: '#' is not a valid label
-error: ':invalid' is not a valid label
-error: ':bad' is not a valid refname
-error: update-ref requires a fully qualified refname e.g. refs/heads/topic
-ok 130 - bad labels and refs rejected when parsing todo list
+expecting success of 3070.1165 'iwildmatch: no match 'j' '[a-e-n]'': 
+			test_must_fail test-tool wildmatch iwildmatch 'j' '[a-e-n]'
+		
+ok 1165 - iwildmatch: no match 'j' '[a-e-n]'
 
-expecting success of 3404.131 'non-merge commands reject merge commits': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout E &&
-	git merge I &&
-	oid=$(git rev-parse HEAD) &&
-	cat >todo <<-EOF &&
-	pick $oid
-	reword $oid
-	edit $oid
-	fixup $oid
-	squash $oid
-	EOF
-	(
-		set_replace_editor todo &&
-		test_must_fail git rebase -i HEAD 2>actual
-	) &&
-	cat >expect <<-EOF &&
-	error: ${SQ}pick${SQ} does not accept merge commits
-	hint: ${SQ}pick${SQ} does not take a merge commit. If you wanted to
-	hint: replay the merge, use ${SQ}merge -C${SQ} on the commit.
-	hint: Disable this message with "git config set advice.rebaseTodoError false"
-	error: invalid line 1: pick $oid
-	error: ${SQ}reword${SQ} does not accept merge commits
-	hint: ${SQ}reword${SQ} does not take a merge commit. If you wanted to
-	hint: replay the merge and reword the commit message, use
-	hint: ${SQ}merge -c${SQ} on the commit
-	hint: Disable this message with "git config set advice.rebaseTodoError false"
-	error: invalid line 2: reword $oid
-	error: ${SQ}edit${SQ} does not accept merge commits
-	hint: ${SQ}edit${SQ} does not take a merge commit. If you wanted to
-	hint: replay the merge, use ${SQ}merge -C${SQ} on the commit, and then
-	hint: ${SQ}break${SQ} to give the control back to you so that you can
-	hint: do ${SQ}git commit --amend && git rebase --continue${SQ}.
-	hint: Disable this message with "git config set advice.rebaseTodoError false"
-	error: invalid line 3: edit $oid
-	error: cannot squash merge commit into another commit
-	error: invalid line 4: fixup $oid
-	error: cannot squash merge commit into another commit
-	error: invalid line 5: squash $oid
-	You can fix this with ${SQ}git rebase --edit-todo${SQ} and then run ${SQ}git rebase --continue${SQ}.
-	Or you can abort the rebase with ${SQ}git rebase --abort${SQ}.
-	EOF
-	test_cmp expect actual
+expecting success of 3070.1166 'iwildmatch (via ls-files): no match '[a-e-n]' 'j'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1166 - iwildmatch (via ls-files): no match '[a-e-n]' 'j'
 
-Note: switching to 'E'.
+expecting success of 3070.1167 'pathmatch: no match 'j' '[a-e-n]'': 
+			test_must_fail test-tool wildmatch pathmatch 'j' '[a-e-n]'
+		
+ok 1167 - pathmatch: no match 'j' '[a-e-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.
+expecting success of 3070.1168 'pathmatch (via ls-files): no match '[a-e-n]' 'j'': 
+				>expect &&
+				git ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1168 - pathmatch (via ls-files): no match '[a-e-n]' 'j'
 
-If you want to 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 3070.1169 'ipathmatch: no match 'j' '[a-e-n]'': 
+			test_must_fail test-tool wildmatch ipathmatch 'j' '[a-e-n]'
+		
+ok 1169 - ipathmatch: no match 'j' '[a-e-n]'
 
-  git switch -c <new-branch-name>
+expecting success of 3070.1170 'ipathmatch (via ls-files): no match '[a-e-n]' 'j'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1170 - ipathmatch (via ls-files): no match '[a-e-n]' 'j'
 
-Or undo this operation with:
+expecting success of 3070.1171 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing j
+ok 1171 - cleanup after previous file test
 
-  git switch -
+expecting success of 3070.1172 'setup match file test for -': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1172 - setup match file test for -
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3070.1173 'wildmatch: match '-' '[a-e-n]'': 
+			test-tool wildmatch wildmatch '-' '[a-e-n]'
+		
+ok 1173 - wildmatch: match '-' '[a-e-n]'
 
-HEAD is now at 8f99a4f1fbbd E
-Merge made by the 'ort' strategy.
- file4 | 1 +
- file6 | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 file4
- create mode 100644 file6
-rebase -i script after editing:
-pick e1787ed465883b1097349020e1a6efb9957df2e7
-reword e1787ed465883b1097349020e1a6efb9957df2e7
-edit e1787ed465883b1097349020e1a6efb9957df2e7
-fixup e1787ed465883b1097349020e1a6efb9957df2e7
-squash e1787ed465883b1097349020e1a6efb9957df2e7
-ok 131 - non-merge commands reject merge commits
+expecting success of 3070.1174 'wildmatch (via ls-files): match '[a-e-n]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1174 - wildmatch (via ls-files): match '[a-e-n]' '-'
 
-expecting success of 3404.132 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
+expecting success of 3070.1175 'iwildmatch: match '-' '[a-e-n]'': 
+			test-tool wildmatch iwildmatch '-' '[a-e-n]'
+		
+ok 1175 - iwildmatch: match '-' '[a-e-n]'
 
-ok 132 - $EDITOR and friends are unchanged
+expecting success of 3070.1176 'iwildmatch (via ls-files): match '[a-e-n]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1176 - iwildmatch (via ls-files): match '[a-e-n]' '-'
 
-# passed all 132 test(s)
-1..132
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3650-replay-basics.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3650-replay-basics/.git/
-expecting success of 3650.1 'setup': 
-	test_commit A &&
-	test_commit B &&
+expecting success of 3070.1177 'pathmatch: match '-' '[a-e-n]'': 
+			test-tool wildmatch pathmatch '-' '[a-e-n]'
+		
+ok 1177 - pathmatch: match '-' '[a-e-n]'
 
-	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 &&
+expecting success of 3070.1178 'pathmatch (via ls-files): match '[a-e-n]' '-'': 
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1178 - pathmatch (via ls-files): match '[a-e-n]' '-'
 
-	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 &&
+expecting success of 3070.1179 'ipathmatch: match '-' '[a-e-n]'': 
+			test-tool wildmatch ipathmatch '-' '[a-e-n]'
+		
+ok 1179 - ipathmatch: match '-' '[a-e-n]'
 
-	git switch main &&
-	test_commit L &&
-	test_commit M &&
+expecting success of 3070.1180 'ipathmatch (via ls-files): match '[a-e-n]' '-'': 
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1180 - ipathmatch (via ls-files): match '[a-e-n]' '-'
 
-	git switch -c conflict B &&
-	test_commit C.conflict C.t conflict
+expecting success of 3070.1181 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1181 - cleanup after previous file test
 
-[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 3070.1182 'setup match file test for a': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1182 - setup match file test for a
 
-expecting success of 3650.2 'setup bare': 
-	git clone --bare . bare
+expecting success of 3070.1183 'wildmatch: match 'a' '[!------]'': 
+			test-tool wildmatch wildmatch 'a' '[!------]'
+		
+ok 1183 - wildmatch: match 'a' '[!------]'
 
-Cloning into bare repository 'bare'...
-done.
-ok 2 - setup bare
+expecting success of 3070.1184 'wildmatch (via ls-files): match '[!------]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1184 - wildmatch (via ls-files): match '[!------]' 'a'
 
-expecting success of 3650.3 'using replay to rebase two branches, one on top of other': 
-	git replay --onto main topic1..topic2 >result &&
+expecting success of 3070.1185 'iwildmatch: match 'a' '[!------]'': 
+			test-tool wildmatch iwildmatch 'a' '[!------]'
+		
+ok 1185 - iwildmatch: match 'a' '[!------]'
 
-	test_line_count = 1 result &&
+expecting success of 3070.1186 'iwildmatch (via ls-files): match '[!------]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1186 - iwildmatch (via ls-files): match '[!------]' 'a'
 
-	git log --format=%s $(cut -f 3 -d " " result) >actual &&
-	test_write_lines E D M L B A >expect &&
-	test_cmp expect actual &&
+expecting success of 3070.1187 'pathmatch: match 'a' '[!------]'': 
+			test-tool wildmatch pathmatch 'a' '[!------]'
+		
+ok 1187 - pathmatch: match 'a' '[!------]'
 
-	printf "update refs/heads/topic2 " >expect &&
-	printf "%s " $(cut -f 3 -d " " result) >>expect &&
-	git rev-parse topic2 >>expect &&
+expecting success of 3070.1188 'pathmatch (via ls-files): match '[!------]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1188 - pathmatch (via ls-files): match '[!------]' 'a'
 
-	test_cmp expect result
+expecting success of 3070.1189 'ipathmatch: match 'a' '[!------]'': 
+			test-tool wildmatch ipathmatch 'a' '[!------]'
+		
+ok 1189 - ipathmatch: match 'a' '[!------]'
 
-ok 3 - using replay to rebase two branches, one on top of other
+expecting success of 3070.1190 'ipathmatch (via ls-files): match '[!------]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1190 - ipathmatch (via ls-files): match '[!------]' 'a'
 
-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
+expecting success of 3070.1191 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1191 - cleanup after previous file test
 
-ok 4 - using replay on bare repo to rebase two branches, one on top of other
+expecting success of 3070.1192 'setup match file test for [': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1192 - setup match file test for [
 
-expecting success of 3650.5 'using replay to rebase with a conflict': 
-	test_expect_code 1 git replay --onto topic1 B..conflict
+expecting success of 3070.1193 'wildmatch: no match '[' '[]-a]'': 
+			test_must_fail test-tool wildmatch wildmatch '[' '[]-a]'
+		
+ok 1193 - wildmatch: no match '[' '[]-a]'
 
-ok 5 - using replay to rebase with a conflict
+expecting success of 3070.1194 'wildmatch (via ls-files): no match '[]-a]' '['': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1194 - wildmatch (via ls-files): no match '[]-a]' '['
 
-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
+expecting success of 3070.1195 'iwildmatch: no match '[' '[]-a]'': 
+			test_must_fail test-tool wildmatch iwildmatch '[' '[]-a]'
+		
+ok 1195 - iwildmatch: no match '[' '[]-a]'
 
-ok 6 - using replay on bare repo to rebase with a conflict
+expecting success of 3070.1196 'iwildmatch (via ls-files): no match '[]-a]' '['': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1196 - iwildmatch (via ls-files): no match '[]-a]' '['
 
-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
+expecting success of 3070.1197 'pathmatch: no match '[' '[]-a]'': 
+			test_must_fail test-tool wildmatch pathmatch '[' '[]-a]'
+		
+ok 1197 - pathmatch: no match '[' '[]-a]'
 
-	git replay --advance main topic1..topic2 >result &&
+expecting success of 3070.1198 'pathmatch (via ls-files): no match '[]-a]' '['': 
+				>expect &&
+				git ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1198 - pathmatch (via ls-files): no match '[]-a]' '['
 
-	test_line_count = 1 result &&
+expecting success of 3070.1199 'ipathmatch: no match '[' '[]-a]'': 
+			test_must_fail test-tool wildmatch ipathmatch '[' '[]-a]'
+		
+ok 1199 - ipathmatch: no match '[' '[]-a]'
 
-	git log --format=%s $(cut -f 3 -d " " result) >actual &&
-	test_write_lines E D M L B A >expect &&
-	test_cmp expect actual &&
+expecting success of 3070.1200 'ipathmatch (via ls-files): no match '[]-a]' '['': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1200 - ipathmatch (via ls-files): no match '[]-a]' '['
 
-	printf "update refs/heads/main " >expect &&
-	printf "%s " $(cut -f 3 -d " " result) >>expect &&
-	git rev-parse main >>expect &&
+expecting success of 3070.1201 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1201 - cleanup after previous file test
 
-	test_cmp expect result
+expecting success of 3070.1202 'setup match file test for ^': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1202 - setup match file test for ^
 
-ok 7 - using replay to perform basic cherry-pick
+expecting success of 3070.1203 'wildmatch: match '^' '[]-a]'': 
+			test-tool wildmatch wildmatch '^' '[]-a]'
+		
+ok 1203 - wildmatch: match '^' '[]-a]'
 
-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
+expecting success of 3070.1204 'wildmatch (via ls-files): match '[]-a]' '^'': 
+				printf '%s' '^' >expect &&
+				git --glob-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1204 - wildmatch (via ls-files): match '[]-a]' '^'
 
-ok 8 - using replay on bare repo to perform basic cherry-pick
+expecting success of 3070.1205 'iwildmatch: match '^' '[]-a]'': 
+			test-tool wildmatch iwildmatch '^' '[]-a]'
+		
+ok 1205 - iwildmatch: match '^' '[]-a]'
 
-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
+expecting success of 3070.1206 'iwildmatch (via ls-files): match '[]-a]' '^'': 
+				printf '%s' '^' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1206 - iwildmatch (via ls-files): match '[]-a]' '^'
 
-fatal: options '--onto' and '--advance' cannot be used together
-ok 9 - replay on bare repo fails with both --advance and --onto
+expecting success of 3070.1207 'pathmatch: match '^' '[]-a]'': 
+			test-tool wildmatch pathmatch '^' '[]-a]'
+		
+ok 1207 - pathmatch: match '^' '[]-a]'
 
-expecting success of 3650.10 'replay fails when both --advance and --onto are omitted': 
-	test_must_fail git replay topic1..topic2 >result
+expecting success of 3070.1208 'pathmatch (via ls-files): match '[]-a]' '^'': 
+				printf '%s' '^' >expect &&
+				git ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1208 - pathmatch (via ls-files): match '[]-a]' '^'
 
-error: option --onto or --advance is mandatory
-usage: (EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance <branch>) <revision-range>...
+expecting success of 3070.1209 'ipathmatch: match '^' '[]-a]'': 
+			test-tool wildmatch ipathmatch '^' '[]-a]'
+		
+ok 1209 - ipathmatch: match '^' '[]-a]'
 
-    --[no-]advance <branch>
-                          make replay advance given branch
-    --[no-]onto <revision>
-                          replay onto given commit
-    --[no-]contained      advance all branches contained in revision-range
+expecting success of 3070.1210 'ipathmatch (via ls-files): match '[]-a]' '^'': 
+				printf '%s' '^' >expect &&
+				git --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1210 - ipathmatch (via ls-files): match '[]-a]' '^'
 
-ok 10 - replay fails when both --advance and --onto are omitted
+expecting success of 3070.1211 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ^
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1211 - cleanup after previous file test
 
-expecting success of 3650.11 'using replay to also rebase a contained branch': 
-	git replay --contained --onto main main..topic3 >result &&
+expecting success of 3070.1212 'setup match file test for ^': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1212 - setup match file test for ^
 
-	test_line_count = 2 result &&
-	cut -f 3 -d " " result >new-branch-tips &&
+expecting success of 3070.1213 'wildmatch: no match '^' '[!]-a]'': 
+			test_must_fail test-tool wildmatch wildmatch '^' '[!]-a]'
+		
+ok 1213 - wildmatch: no match '^' '[!]-a]'
 
-	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 &&
+expecting success of 3070.1214 'wildmatch (via ls-files): no match '[!]-a]' '^'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1214 - wildmatch (via ls-files): no match '[!]-a]' '^'
 
-	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 &&
+expecting success of 3070.1215 'iwildmatch: no match '^' '[!]-a]'': 
+			test_must_fail test-tool wildmatch iwildmatch '^' '[!]-a]'
+		
+ok 1215 - iwildmatch: no match '^' '[!]-a]'
 
-	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 &&
+expecting success of 3070.1216 'iwildmatch (via ls-files): no match '[!]-a]' '^'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1216 - iwildmatch (via ls-files): no match '[!]-a]' '^'
 
-	test_cmp expect result
+expecting success of 3070.1217 'pathmatch: no match '^' '[!]-a]'': 
+			test_must_fail test-tool wildmatch pathmatch '^' '[!]-a]'
+		
+ok 1217 - pathmatch: no match '^' '[!]-a]'
 
-ok 11 - using replay to also rebase a contained branch
+expecting success of 3070.1218 'pathmatch (via ls-files): no match '[!]-a]' '^'': 
+				>expect &&
+				git ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1218 - pathmatch (via ls-files): no match '[!]-a]' '^'
 
-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
+expecting success of 3070.1219 'ipathmatch: no match '^' '[!]-a]'': 
+			test_must_fail test-tool wildmatch ipathmatch '^' '[!]-a]'
+		
+ok 1219 - ipathmatch: no match '^' '[!]-a]'
 
-ok 12 - using replay on bare repo to also rebase a contained branch
+expecting success of 3070.1220 'ipathmatch (via ls-files): no match '[!]-a]' '^'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1220 - ipathmatch (via ls-files): no match '[!]-a]' '^'
 
-expecting success of 3650.13 'using replay to rebase multiple divergent branches': 
-	git replay --onto main ^topic1 topic2 topic4 >result &&
+expecting success of 3070.1221 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ^
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1221 - cleanup after previous file test
 
-	test_line_count = 2 result &&
-	cut -f 3 -d " " result >new-branch-tips &&
+expecting success of 3070.1222 'setup match file test for [': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1222 - setup match file test for [
 
-	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 &&
+expecting success of 3070.1223 'wildmatch: match '[' '[!]-a]'': 
+			test-tool wildmatch wildmatch '[' '[!]-a]'
+		
+ok 1223 - wildmatch: match '[' '[!]-a]'
 
-	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 &&
+expecting success of 3070.1224 'wildmatch (via ls-files): match '[!]-a]' '['': 
+				printf '%s' '[' >expect &&
+				git --glob-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1224 - wildmatch (via ls-files): match '[!]-a]' '['
 
-	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 &&
+expecting success of 3070.1225 'iwildmatch: match '[' '[!]-a]'': 
+			test-tool wildmatch iwildmatch '[' '[!]-a]'
+		
+ok 1225 - iwildmatch: match '[' '[!]-a]'
 
-	test_cmp expect result
+expecting success of 3070.1226 'iwildmatch (via ls-files): match '[!]-a]' '['': 
+				printf '%s' '[' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1226 - iwildmatch (via ls-files): match '[!]-a]' '['
 
-ok 13 - using replay to rebase multiple divergent branches
+expecting success of 3070.1227 'pathmatch: match '[' '[!]-a]'': 
+			test-tool wildmatch pathmatch '[' '[!]-a]'
+		
+ok 1227 - pathmatch: match '[' '[!]-a]'
 
-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 &&
+expecting success of 3070.1228 'pathmatch (via ls-files): match '[!]-a]' '['': 
+				printf '%s' '[' >expect &&
+				git ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1228 - pathmatch (via ls-files): match '[!]-a]' '['
 
-	test_line_count = 4 result &&
-	cut -f 3 -d " " result >new-branch-tips &&
+expecting success of 3070.1229 'ipathmatch: match '[' '[!]-a]'': 
+			test-tool wildmatch ipathmatch '[' '[!]-a]'
+		
+ok 1229 - ipathmatch: match '[' '[!]-a]'
 
-	>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 &&
+expecting success of 3070.1230 'ipathmatch (via ls-files): match '[!]-a]' '['': 
+				printf '%s' '[' >expect &&
+				git --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1230 - ipathmatch (via ls-files): match '[!]-a]' '['
 
-	test_cmp expect result &&
+expecting success of 3070.1231 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1231 - cleanup after previous file test
 
-	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 &&
+expecting success of 3070.1232 'setup match file test for ^': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1232 - setup match file test for ^
 
-	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
+expecting success of 3070.1233 'wildmatch: match '^' '[a^bc]'': 
+			test-tool wildmatch wildmatch '^' '[a^bc]'
+		
+ok 1233 - wildmatch: match '^' '[a^bc]'
 
-ok 14 - using replay on bare repo to rebase multiple divergent branches, including contained ones
+expecting success of 3070.1234 'wildmatch (via ls-files): match '[a^bc]' '^'': 
+				printf '%s' '^' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1234 - wildmatch (via ls-files): match '[a^bc]' '^'
 
-expecting success of 3650.15 'merge.directoryRenames=false': 
-	# create a test case that stress-tests the rename caching
-	git switch -c rename-onto &&
+expecting success of 3070.1235 'iwildmatch: match '^' '[a^bc]'': 
+			test-tool wildmatch iwildmatch '^' '[a^bc]'
+		
+ok 1235 - iwildmatch: match '^' '[a^bc]'
 
-	mkdir -p to-rename &&
-	test_commit to-rename/move &&
+expecting success of 3070.1236 'iwildmatch (via ls-files): match '[a^bc]' '^'': 
+				printf '%s' '^' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1236 - iwildmatch (via ls-files): match '[a^bc]' '^'
 
-	mkdir -p renamed-directory &&
-	git mv to-rename/move* renamed-directory/ &&
-	test_tick &&
-	git commit -m renamed-directory &&
+expecting success of 3070.1237 'pathmatch: match '^' '[a^bc]'': 
+			test-tool wildmatch pathmatch '^' '[a^bc]'
+		
+ok 1237 - pathmatch: match '^' '[a^bc]'
 
-	git switch -c rename-from HEAD^ &&
-	test_commit to-rename/add-a-file &&
-	echo modified >to-rename/add-a-file.t &&
-	test_tick &&
-	git commit -m modified to-rename/add-a-file.t &&
+expecting success of 3070.1238 'pathmatch (via ls-files): match '[a^bc]' '^'': 
+				printf '%s' '^' >expect &&
+				git ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1238 - pathmatch (via ls-files): match '[a^bc]' '^'
 
-	git -c merge.directoryRenames=false replay \
-		--onto rename-onto rename-onto..rename-from
+expecting success of 3070.1239 'ipathmatch: match '^' '[a^bc]'': 
+			test-tool wildmatch ipathmatch '^' '[a^bc]'
+		
+ok 1239 - ipathmatch: match '^' '[a^bc]'
 
-Switched to a new branch 'rename-onto'
-[rename-onto 547c5a2] to-rename/move
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-rename/move.t
-[rename-onto d9b5db2] renamed-directory
- Author: author@name <bogus@email@address>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {to-rename => renamed-directory}/move.t (100%)
-Switched to a new branch 'rename-from'
-[rename-from c05cd91] to-rename/add-a-file
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-rename/add-a-file.t
-[rename-from 41c1220] modified
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-update refs/heads/rename-from b7a8c434456bf7daefc305c968c9d1b62808ba73 41c12201bdcb4d7aafa265361e3e913175a37340
-ok 15 - merge.directoryRenames=false
+expecting success of 3070.1240 'ipathmatch (via ls-files): match '[a^bc]' '^'': 
+				printf '%s' '^' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1240 - ipathmatch (via ls-files): match '[a^bc]' '^'
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3702-add-edit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3702-add-edit/.git/
-expecting success of 3702.1 'setup': 
+expecting success of 3070.1241 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ^
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1241 - cleanup after previous file test
 
-	git add file &&
-	test_tick &&
-	git commit -m initial file
+expecting success of 3070.1242 'setup match file test for -b]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1242 - setup match file test for -b]
 
+expecting success of 3070.1243 'wildmatch: match '-b]' '[a-]b]'': 
+			test-tool wildmatch wildmatch '-b]' '[a-]b]'
+		
+ok 1243 - wildmatch: match '-b]' '[a-]b]'
 
-[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 3070.1244 'wildmatch (via ls-files): match '[a-]b]' '-b]'': 
+				printf '%s' '-b]' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1244 - wildmatch (via ls-files): match '[a-]b]' '-b]'
 
-expecting success of 3702.2 'add -e': 
+expecting success of 3070.1245 'iwildmatch: match '-b]' '[a-]b]'': 
+			test-tool wildmatch iwildmatch '-b]' '[a-]b]'
+		
+ok 1245 - iwildmatch: match '-b]' '[a-]b]'
 
-	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
+expecting success of 3070.1246 'iwildmatch (via ls-files): match '[a-]b]' '-b]'': 
+				printf '%s' '-b]' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1246 - iwildmatch (via ls-files): match '[a-]b]' '-b]'
 
+expecting success of 3070.1247 'pathmatch: match '-b]' '[a-]b]'': 
+			test-tool wildmatch pathmatch '-b]' '[a-]b]'
+		
+ok 1247 - pathmatch: match '-b]' '[a-]b]'
 
-ok 2 - add -e
+expecting success of 3070.1248 'pathmatch (via ls-files): match '[a-]b]' '-b]'': 
+				printf '%s' '-b]' >expect &&
+				git ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1248 - pathmatch (via ls-files): match '[a-]b]' '-b]'
 
-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
+expecting success of 3070.1249 'ipathmatch: match '-b]' '[a-]b]'': 
+			test-tool wildmatch ipathmatch '-b]' '[a-]b]'
+		
+ok 1249 - ipathmatch: match '-b]' '[a-]b]'
 
-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 3070.1250 'ipathmatch (via ls-files): match '[a-]b]' '-b]'': 
+				printf '%s' '-b]' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1250 - ipathmatch (via ls-files): match '[a-]b]' '-b]'
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3703-add-magic-pathspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3703-add-magic-pathspec/.git/
-expecting success of 3703.1 'setup': 
-	mkdir sub anothersub &&
-	: >sub/foo &&
-	: >anothersub/foo
+expecting success of 3070.1251 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -b]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1251 - cleanup after previous file test
 
-ok 1 - setup
+expecting success of 3070.1252 'setup match file test for \': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1252 - setup match file test for \
 
-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
+expecting success of 3070.1253 'wildmatch: no match '\' '[\]'': 
+			test_must_fail test-tool wildmatch wildmatch '\' '[\]'
+		
+ok 1253 - wildmatch: no match '\' '[\]'
 
-ok 2 - add :/
+expecting success of 3070.1254 'wildmatch (via ls-files): no match '[\]' '\'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1254 - wildmatch (via ls-files): no match '[\]' '\'
 
-expecting success of 3703.3 'add :/anothersub': 
-	(cd sub && git add -n :/anothersub >actual) &&
-	test_cmp expected sub/actual
+expecting success of 3070.1255 'iwildmatch: no match '\' '[\]'': 
+			test_must_fail test-tool wildmatch iwildmatch '\' '[\]'
+		
+ok 1255 - iwildmatch: no match '\' '[\]'
 
-ok 3 - add :/anothersub
+expecting success of 3070.1256 'iwildmatch (via ls-files): no match '[\]' '\'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1256 - iwildmatch (via ls-files): no match '[\]' '\'
 
-expecting success of 3703.4 'add :/non-existent': 
-	(cd sub && test_must_fail git add -n :/non-existent)
+expecting success of 3070.1257 'pathmatch: no match '\' '[\]'': 
+			test_must_fail test-tool wildmatch pathmatch '\' '[\]'
+		
+ok 1257 - pathmatch: no match '\' '[\]'
 
-fatal: pathspec ':/non-existent' did not match any files
-ok 4 - add :/non-existent
+expecting success of 3070.1258 'pathmatch (via ls-files): no match '[\]' '\'': 
+				>expect &&
+				git ls-files -z -- '[\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1258 - pathmatch (via ls-files): no match '[\]' '\'
 
-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"
+expecting success of 3070.1259 'ipathmatch: no match '\' '[\]'': 
+			test_must_fail test-tool wildmatch ipathmatch '\' '[\]'
+		
+ok 1259 - ipathmatch: no match '\' '[\]'
 
-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 3070.1260 'ipathmatch (via ls-files): no match '[\]' '\'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1260 - ipathmatch (via ls-files): no match '[\]' '\'
 
-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"
+expecting success of 3070.1261 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1261 - cleanup after previous file test
 
-fatal: pathspec ':/bar' did not match any files
-add ':/bar'
-ok 6 - a file with the same (short) magic name exists
+expecting success of 3070.1262 'setup match file test for \': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1262 - setup match file test for \
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t1092-sparse-checkout-compatibility.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
+expecting success of 3070.1263 'wildmatch: match '\' '[\\]'': 
+			test-tool wildmatch wildmatch '\' '[\\]'
+		
+ok 1263 - wildmatch: match '\' '[\\]'
 
-		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 3070.1264 'wildmatch (via ls-files): match '[\\]' '\'': 
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1264 - wildmatch (via ls-files): match '[\\]' '\'
 
-		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/..." &&
+expecting success of 3070.1265 'iwildmatch: match '\' '[\\]'': 
+			test-tool wildmatch iwildmatch '\' '[\\]'
+		
+ok 1265 - iwildmatch: match '\' '[\\]'
 
-		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/..." &&
+expecting success of 3070.1266 'iwildmatch (via ls-files): match '[\\]' '\'': 
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1266 - iwildmatch (via ls-files): match '[\\]' '\'
 
-		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/..." &&
+expecting success of 3070.1267 'pathmatch: match '\' '[\\]'': 
+			test-tool wildmatch pathmatch '\' '[\\]'
+		
+ok 1267 - pathmatch: match '\' '[\\]'
 
-		git checkout -b df-conflict-1 base &&
-		rm -rf folder1 &&
-		echo content >folder1 &&
-		git add . &&
-		git commit -m "dir to file" &&
+expecting success of 3070.1268 'pathmatch (via ls-files): match '[\\]' '\'': 
+				printf '%s' '\' >expect &&
+				git ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1268 - pathmatch (via ls-files): match '[\\]' '\'
 
-		git checkout -b df-conflict-2 base &&
-		rm -rf folder2 &&
-		echo content >folder2 &&
-		git add . &&
-		git commit -m "dir to file" &&
+expecting success of 3070.1269 'ipathmatch: match '\' '[\\]'': 
+			test-tool wildmatch ipathmatch '\' '[\\]'
+		
+ok 1269 - ipathmatch: match '\' '[\\]'
 
-		git checkout -b fd-conflict base &&
-		rm a &&
-		mkdir a &&
-		echo content >a/a &&
-		git add . &&
-		git commit -m "file to dir" &&
+expecting success of 3070.1270 'ipathmatch (via ls-files): match '[\\]' '\'': 
+				printf '%s' '\' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1270 - ipathmatch (via ls-files): match '[\\]' '\'
 
-		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 &&
+expecting success of 3070.1271 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1271 - cleanup after previous file test
 
-		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" &&
+expecting success of 3070.1272 'setup match file test for \': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1272 - setup match file test for \
 
-		git checkout -f base &&
-		git reset --hard
-	)
+expecting success of 3070.1273 'wildmatch: no match '\' '[!\\]'': 
+			test_must_fail test-tool wildmatch wildmatch '\' '[!\\]'
+		
+ok 1273 - wildmatch: no match '\' '[!\\]'
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
- 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
- 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
- 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 3070.1274 'wildmatch (via ls-files): no match '[!\\]' '\'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1274 - wildmatch (via ls-files): no match '[!\\]' '\'
 
-expecting success of 1092.2 'sparse-index contents': 
-	init_repos &&
+expecting success of 3070.1275 'iwildmatch: no match '\' '[!\\]'': 
+			test_must_fail test-tool wildmatch iwildmatch '\' '[!\\]'
+		
+ok 1275 - iwildmatch: no match '\' '[!\\]'
 
-	# Remove deep, add three other directories.
-	test_sparse_checkout_set \
-		"folder1 folder2 x" \
-		"before deep" &&
+expecting success of 3070.1276 'iwildmatch (via ls-files): no match '[!\\]' '\'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1276 - iwildmatch (via ls-files): no match '[!\\]' '\'
 
-	# Remove folder1, add deep
-	test_sparse_checkout_set \
-		"deep folder2 x" \
-		"before folder1" &&
+expecting success of 3070.1277 'pathmatch: no match '\' '[!\\]'': 
+			test_must_fail test-tool wildmatch pathmatch '\' '[!\\]'
+		
+ok 1277 - pathmatch: no match '\' '[!\\]'
 
-	# Replace deep with deep/deeper2 (dropping deep/deeper1)
-	# Add folder1
-	test_sparse_checkout_set \
-		"deep/deeper2 folder1 folder2 x" \
-		"before deep/deeper1" &&
+expecting success of 3070.1278 'pathmatch (via ls-files): no match '[!\\]' '\'': 
+				>expect &&
+				git ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1278 - pathmatch (via ls-files): no match '[!\\]' '\'
 
-	# 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 3070.1279 'ipathmatch: no match '\' '[!\\]'': 
+			test_must_fail test-tool wildmatch ipathmatch '\' '[!\\]'
+		
+ok 1279 - ipathmatch: no match '\' '[!\\]'
 
-	# Drop down to only files at root
-	test_sparse_checkout_set \
-		"" \
-		"before deep folder1 folder2 x" &&
+expecting success of 3070.1280 'ipathmatch (via ls-files): no match '[!\\]' '\'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1280 - ipathmatch (via ls-files): no match '[!\\]' '\'
 
-	# 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 3070.1281 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1281 - cleanup after previous file test
 
-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
+expecting success of 3070.1282 'setup match file test for G': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1282 - setup match file test for G
 
-expecting success of 1092.3 'expanded in-memory index matches full index': 
-	init_repos &&
-	test_sparse_match git ls-files --stage
+expecting success of 3070.1283 'wildmatch: match 'G' '[A-\\]'': 
+			test-tool wildmatch wildmatch 'G' '[A-\\]'
+		
+ok 1283 - wildmatch: match 'G' '[A-\\]'
 
-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
+expecting success of 3070.1284 'wildmatch (via ls-files): match '[A-\\]' 'G'': 
+				printf '%s' 'G' >expect &&
+				git --glob-pathspecs ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1284 - wildmatch (via ls-files): match '[A-\\]' 'G'
 
-expecting success of 1092.4 'root directory cannot be sparse': 
-	init_repos &&
+expecting success of 3070.1285 'iwildmatch: match 'G' '[A-\\]'': 
+			test-tool wildmatch iwildmatch 'G' '[A-\\]'
+		
+ok 1285 - iwildmatch: match 'G' '[A-\\]'
 
-	# 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 &&
+expecting success of 3070.1286 'iwildmatch (via ls-files): match '[A-\\]' 'G'': 
+				printf '%s' 'G' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1286 - iwildmatch (via ls-files): match '[A-\\]' 'G'
 
-	# 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 3070.1287 'pathmatch: match 'G' '[A-\\]'': 
+			test-tool wildmatch pathmatch 'G' '[A-\\]'
+		
+ok 1287 - pathmatch: match 'G' '[A-\\]'
 
-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 3070.1288 'pathmatch (via ls-files): match '[A-\\]' 'G'': 
+				printf '%s' 'G' >expect &&
+				git ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1288 - pathmatch (via ls-files): match '[A-\\]' 'G'
 
-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
+expecting success of 3070.1289 'ipathmatch: match 'G' '[A-\\]'': 
+			test-tool wildmatch ipathmatch 'G' '[A-\\]'
+		
+ok 1289 - ipathmatch: match 'G' '[A-\\]'
 
-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 3070.1290 'ipathmatch (via ls-files): match '[A-\\]' 'G'': 
+				printf '%s' 'G' >expect &&
+				git --icase-pathspecs ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1290 - ipathmatch (via ls-files): match '[A-\\]' 'G'
 
-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
+expecting success of 3070.1291 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing G
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1291 - cleanup after previous file test
 
-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 3070.1292 'setup match file test for aaabbb': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1292 - setup match file test for aaabbb
 
-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
+expecting success of 3070.1293 'wildmatch: no match 'aaabbb' 'b*a'': 
+			test_must_fail test-tool wildmatch wildmatch 'aaabbb' 'b*a'
+		
+ok 1293 - wildmatch: no match 'aaabbb' 'b*a'
 
-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
+expecting success of 3070.1294 'wildmatch (via ls-files): no match 'b*a' 'aaabbb'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1294 - wildmatch (via ls-files): no match 'b*a' 'aaabbb'
 
-expecting success of 1092.8 'add, commit, checkout': 
-	init_repos &&
+expecting success of 3070.1295 'iwildmatch: no match 'aaabbb' 'b*a'': 
+			test_must_fail test-tool wildmatch iwildmatch 'aaabbb' 'b*a'
+		
+ok 1295 - iwildmatch: no match 'aaabbb' 'b*a'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-	run_on_all ../edit-contents README.md &&
+expecting success of 3070.1296 'iwildmatch (via ls-files): no match 'b*a' 'aaabbb'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1296 - iwildmatch (via ls-files): no match 'b*a' 'aaabbb'
 
-	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 3070.1297 'pathmatch: no match 'aaabbb' 'b*a'': 
+			test_must_fail test-tool wildmatch pathmatch 'aaabbb' 'b*a'
+		
+ok 1297 - pathmatch: no match 'aaabbb' 'b*a'
 
-	test_all_match git checkout HEAD~1 &&
-	test_all_match git checkout - &&
+expecting success of 3070.1298 'pathmatch (via ls-files): no match 'b*a' 'aaabbb'': 
+				>expect &&
+				git ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1298 - pathmatch (via ls-files): no match 'b*a' 'aaabbb'
 
-	run_on_all ../edit-contents README.md &&
+expecting success of 3070.1299 'ipathmatch: no match 'aaabbb' 'b*a'': 
+			test_must_fail test-tool wildmatch ipathmatch 'aaabbb' 'b*a'
+		
+ok 1299 - ipathmatch: no match 'aaabbb' 'b*a'
 
-	test_all_match git add -A &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git commit -m "Extend README.md" &&
+expecting success of 3070.1300 'ipathmatch (via ls-files): no match 'b*a' 'aaabbb'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1300 - ipathmatch (via ls-files): no match 'b*a' 'aaabbb'
 
-	test_all_match git checkout HEAD~1 &&
-	test_all_match git checkout - &&
+expecting success of 3070.1301 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing aaabbb
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1301 - cleanup after previous file test
 
-	run_on_all ../edit-contents deep/newfile &&
+expecting success of 3070.1302 'setup match file test for aabcaa': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1302 - setup match file test for aabcaa
 
-	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 3070.1303 'wildmatch: no match 'aabcaa' '*ba*'': 
+			test_must_fail test-tool wildmatch wildmatch 'aabcaa' '*ba*'
+		
+ok 1303 - wildmatch: no match 'aabcaa' '*ba*'
 
-	test_all_match git checkout HEAD~1 &&
-	test_all_match git checkout -
+expecting success of 3070.1304 'wildmatch (via ls-files): no match '*ba*' 'aabcaa'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1304 - wildmatch (via ls-files): no match '*ba*' 'aabcaa'
 
-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 3070.1305 'iwildmatch: no match 'aabcaa' '*ba*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'aabcaa' '*ba*'
+		
+ok 1305 - iwildmatch: no match 'aabcaa' '*ba*'
 
-expecting success of 1092.9 'git add, checkout, and reset with -p': 
-	init_repos &&
+expecting success of 3070.1306 'iwildmatch (via ls-files): no match '*ba*' 'aabcaa'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1306 - iwildmatch (via ls-files): no match '*ba*' 'aabcaa'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
+expecting success of 3070.1307 'pathmatch: no match 'aabcaa' '*ba*'': 
+			test_must_fail test-tool wildmatch pathmatch 'aabcaa' '*ba*'
+		
+ok 1307 - pathmatch: no match 'aabcaa' '*ba*'
 
-	# Does not expand when edits are within sparse checkout.
-	run_on_all ../edit-contents deep/a &&
-	run_on_all ../edit-contents deep/deeper1/a &&
+expecting success of 3070.1308 'pathmatch (via ls-files): no match '*ba*' 'aabcaa'': 
+				>expect &&
+				git ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1308 - pathmatch (via ls-files): no match '*ba*' 'aabcaa'
 
-	test_write_lines y n >in &&
-	run_on_all git add -p <in &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git reset -p <in &&
+expecting success of 3070.1309 'ipathmatch: no match 'aabcaa' '*ba*'': 
+			test_must_fail test-tool wildmatch ipathmatch 'aabcaa' '*ba*'
+		
+ok 1309 - ipathmatch: no match 'aabcaa' '*ba*'
 
-	test_write_lines u 1 "" q >in &&
-	run_on_all git add -i <in &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git reset --hard &&
+expecting success of 3070.1310 'ipathmatch (via ls-files): no match '*ba*' 'aabcaa'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1310 - ipathmatch (via ls-files): no match '*ba*' 'aabcaa'
 
-	run_on_sparse mkdir -p folder1 &&
-	run_on_all ../edit-contents folder1/a &&
-	test_write_lines y n y >in &&
-	run_on_all git add -p <in &&
-	test_sparse_match git status --porcelain=v2 &&
-	test_sparse_match git reset &&
-	test_write_lines u 2 3 "" q >in &&
-	run_on_all git add -i <in &&
-	test_sparse_match git status --porcelain=v2 &&
+expecting success of 3070.1311 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing aabcaa
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1311 - cleanup after previous file test
 
-	run_on_all git add --sparse folder1 &&
-	run_on_all git commit -m "take changes" &&
-	test_write_lines y n y >in &&
-	test_sparse_match git checkout HEAD~1 --patch <in &&
-	test_sparse_match git status --porcelain=v2
+expecting success of 3070.1312 'setup match file test for ,': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1312 - setup match file test for ,
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 9 - git add, checkout, and reset with -p
+expecting success of 3070.1313 'wildmatch: match ',' '[,]'': 
+			test-tool wildmatch wildmatch ',' '[,]'
+		
+ok 1313 - wildmatch: match ',' '[,]'
 
-expecting success of 1092.10 'deep changes during checkout': 
-	init_repos &&
+expecting success of 3070.1314 'wildmatch (via ls-files): match '[,]' ','': 
+				printf '%s' ',' >expect &&
+				git --glob-pathspecs ls-files -z -- '[,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1314 - wildmatch (via ls-files): match '[,]' ','
 
-	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 3070.1315 'iwildmatch: match ',' '[,]'': 
+			test-tool wildmatch iwildmatch ',' '[,]'
+		
+ok 1315 - iwildmatch: match ',' '[,]'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 10 - deep changes during checkout
+expecting success of 3070.1316 'iwildmatch (via ls-files): match '[,]' ','': 
+				printf '%s' ',' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1316 - iwildmatch (via ls-files): match '[,]' ','
 
-expecting success of 1092.11 'checkout with modified sparse directory': 
-	init_repos &&
+expecting success of 3070.1317 'pathmatch: match ',' '[,]'': 
+			test-tool wildmatch pathmatch ',' '[,]'
+		
+ok 1317 - pathmatch: match ',' '[,]'
 
-	test_all_match git checkout rename-in-to-out -- . &&
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git checkout base
+expecting success of 3070.1318 'pathmatch (via ls-files): match '[,]' ','': 
+				printf '%s' ',' >expect &&
+				git ls-files -z -- '[,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1318 - pathmatch (via ls-files): match '[,]' ','
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 11 - checkout with modified sparse directory
+expecting success of 3070.1319 'ipathmatch: match ',' '[,]'': 
+			test-tool wildmatch ipathmatch ',' '[,]'
+		
+ok 1319 - ipathmatch: match ',' '[,]'
 
-expecting success of 1092.12 'checkout orphan then non-orphan': 
-	init_repos &&
+expecting success of 3070.1320 'ipathmatch (via ls-files): match '[,]' ','': 
+				printf '%s' ',' >expect &&
+				git --icase-pathspecs ls-files -z -- '[,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1320 - ipathmatch (via ls-files): match '[,]' ','
 
-	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 3070.1321 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ,
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1321 - cleanup after previous file test
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 12 - checkout orphan then non-orphan
+expecting success of 3070.1322 'setup match file test for ,': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1322 - setup match file test for ,
 
-expecting success of 1092.13 'add outside sparse cone': 
-	init_repos &&
+expecting success of 3070.1323 'wildmatch: match ',' '[\\,]'': 
+			test-tool wildmatch wildmatch ',' '[\\,]'
+		
+ok 1323 - wildmatch: match ',' '[\\,]'
 
-	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 3070.1324 'wildmatch (via ls-files): match '[\\,]' ','': 
+				printf '%s' ',' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1324 - wildmatch (via ls-files): match '[\\,]' ','
 
-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 13 - add outside sparse cone
+expecting success of 3070.1325 'iwildmatch: match ',' '[\\,]'': 
+			test-tool wildmatch iwildmatch ',' '[\\,]'
+		
+ok 1325 - iwildmatch: match ',' '[\\,]'
 
-expecting success of 1092.14 'commit including unstaged changes': 
-	init_repos &&
+expecting success of 3070.1326 'iwildmatch (via ls-files): match '[\\,]' ','': 
+				printf '%s' ',' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1326 - iwildmatch (via ls-files): match '[\\,]' ','
 
-	write_script edit-file <<-\EOF &&
-	echo $1 >$2
-	EOF
+expecting success of 3070.1327 'pathmatch: match ',' '[\\,]'': 
+			test-tool wildmatch pathmatch ',' '[\\,]'
+		
+ok 1327 - pathmatch: match ',' '[\\,]'
 
-	run_on_all ../edit-file 1 a &&
-	run_on_all ../edit-file 1 deep/a &&
+expecting success of 3070.1328 'pathmatch (via ls-files): match '[\\,]' ','': 
+				printf '%s' ',' >expect &&
+				git ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1328 - pathmatch (via ls-files): match '[\\,]' ','
 
-	test_all_match git commit -m "-a" -a &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1329 'ipathmatch: match ',' '[\\,]'': 
+			test-tool wildmatch ipathmatch ',' '[\\,]'
+		
+ok 1329 - ipathmatch: match ',' '[\\,]'
 
-	run_on_all ../edit-file 2 a &&
-	run_on_all ../edit-file 2 deep/a &&
+expecting success of 3070.1330 'ipathmatch (via ls-files): match '[\\,]' ','': 
+				printf '%s' ',' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1330 - ipathmatch (via ls-files): match '[\\,]' ','
 
-	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 3070.1331 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ,
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1331 - cleanup after previous file test
 
-	run_on_all ../edit-file 3 a &&
-	run_on_all ../edit-file 3 deep/a &&
+expecting success of 3070.1332 'setup match file test for \': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1332 - setup match file test for \
 
-	test_all_match git commit -m "--amend" -a --amend &&
-	test_all_match git status --porcelain=v2
+expecting success of 3070.1333 'wildmatch: match '\' '[\\,]'': 
+			test-tool wildmatch wildmatch '\' '[\\,]'
+		
+ok 1333 - wildmatch: match '\' '[\\,]'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 14 - commit including unstaged changes
+expecting success of 3070.1334 'wildmatch (via ls-files): match '[\\,]' '\'': 
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1334 - wildmatch (via ls-files): match '[\\,]' '\'
 
-expecting success of 1092.15 'status/add: outside sparse cone': 
-	init_repos &&
+expecting success of 3070.1335 'iwildmatch: match '\' '[\\,]'': 
+			test-tool wildmatch iwildmatch '\' '[\\,]'
+		
+ok 1335 - iwildmatch: match '\' '[\\,]'
 
-	# 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 3070.1336 'iwildmatch (via ls-files): match '[\\,]' '\'': 
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1336 - iwildmatch (via ls-files): match '[\\,]' '\'
 
-	test_sparse_match git status &&
+expecting success of 3070.1337 'pathmatch: match '\' '[\\,]'': 
+			test-tool wildmatch pathmatch '\' '[\\,]'
+		
+ok 1337 - pathmatch: match '\' '[\\,]'
 
-	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 3070.1338 'pathmatch (via ls-files): match '[\\,]' '\'': 
+				printf '%s' '\' >expect &&
+				git ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1338 - pathmatch (via ls-files): match '[\\,]' '\'
 
-	test_sparse_match git status --porcelain=v2 &&
+expecting success of 3070.1339 'ipathmatch: match '\' '[\\,]'': 
+			test-tool wildmatch ipathmatch '\' '[\\,]'
+		
+ok 1339 - ipathmatch: match '\' '[\\,]'
 
-	# 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 3070.1340 'ipathmatch (via ls-files): match '[\\,]' '\'': 
+				printf '%s' '\' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1340 - ipathmatch (via ls-files): match '[\\,]' '\'
 
-	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 3070.1341 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1341 - cleanup after previous file test
 
-	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 3070.1342 'setup match file test for -': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1342 - setup match file test for -
 
-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 15 - status/add: outside sparse cone
+expecting success of 3070.1343 'wildmatch: match '-' '[,-.]'': 
+			test-tool wildmatch wildmatch '-' '[,-.]'
+		
+ok 1343 - wildmatch: match '-' '[,-.]'
 
-expecting success of 1092.16 'checkout and reset --hard': 
-	init_repos &&
+expecting success of 3070.1344 'wildmatch (via ls-files): match '[,-.]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1344 - wildmatch (via ls-files): match '[,-.]' '-'
 
-	test_all_match git checkout update-folder1 &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1345 'iwildmatch: match '-' '[,-.]'': 
+			test-tool wildmatch iwildmatch '-' '[,-.]'
+		
+ok 1345 - iwildmatch: match '-' '[,-.]'
 
-	test_all_match git checkout update-deep &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1346 'iwildmatch (via ls-files): match '[,-.]' '-'': 
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1346 - iwildmatch (via ls-files): match '[,-.]' '-'
 
-	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 3070.1347 'pathmatch: match '-' '[,-.]'': 
+			test-tool wildmatch pathmatch '-' '[,-.]'
+		
+ok 1347 - pathmatch: match '-' '[,-.]'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 16 - checkout and reset --hard
+expecting success of 3070.1348 'pathmatch (via ls-files): match '[,-.]' '-'': 
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1348 - pathmatch (via ls-files): match '[,-.]' '-'
 
-expecting success of 1092.17 'diff --cached': 
-	init_repos &&
+expecting success of 3070.1349 'ipathmatch: match '-' '[,-.]'': 
+			test-tool wildmatch ipathmatch '-' '[,-.]'
+		
+ok 1349 - ipathmatch: match '-' '[,-.]'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>README.md
-	EOF
-	run_on_all ../edit-contents &&
+expecting success of 3070.1350 'ipathmatch (via ls-files): match '[,-.]' '-'': 
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1350 - ipathmatch (via ls-files): match '[,-.]' '-'
 
-	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 3070.1351 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1351 - cleanup after previous file test
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 17 - diff --cached
+expecting success of 3070.1352 'setup match file test for +': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1352 - setup match file test for +
 
-expecting success of 1092.18 'diff with renames and conflicts': 
-	init_repos &&
+expecting success of 3070.1353 'wildmatch: no match '+' '[,-.]'': 
+			test_must_fail test-tool wildmatch wildmatch '+' '[,-.]'
+		
+ok 1353 - wildmatch: no match '+' '[,-.]'
 
-	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 3070.1354 'wildmatch (via ls-files): no match '[,-.]' '+'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1354 - wildmatch (via ls-files): no match '[,-.]' '+'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 18 - diff with renames and conflicts
+expecting success of 3070.1355 'iwildmatch: no match '+' '[,-.]'': 
+			test_must_fail test-tool wildmatch iwildmatch '+' '[,-.]'
+		
+ok 1355 - iwildmatch: no match '+' '[,-.]'
 
-expecting success of 1092.19 'diff with directory/file conflicts': 
-	init_repos &&
+expecting success of 3070.1356 'iwildmatch (via ls-files): no match '[,-.]' '+'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1356 - iwildmatch (via ls-files): no match '[,-.]' '+'
 
-	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 3070.1357 'pathmatch: no match '+' '[,-.]'': 
+			test_must_fail test-tool wildmatch pathmatch '+' '[,-.]'
+		
+ok 1357 - pathmatch: no match '+' '[,-.]'
 
-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 19 - diff with directory/file conflicts
+expecting success of 3070.1358 'pathmatch (via ls-files): no match '[,-.]' '+'': 
+				>expect &&
+				git ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1358 - pathmatch (via ls-files): no match '[,-.]' '+'
 
-expecting success of 1092.20 'log with pathspec outside sparse definition': 
-	init_repos &&
+expecting success of 3070.1359 'ipathmatch: no match '+' '[,-.]'': 
+			test_must_fail test-tool wildmatch ipathmatch '+' '[,-.]'
+		
+ok 1359 - ipathmatch: no match '+' '[,-.]'
 
-	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 3070.1360 'ipathmatch (via ls-files): no match '[,-.]' '+'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1360 - ipathmatch (via ls-files): no match '[,-.]' '+'
 
-	test_all_match git checkout update-folder1 &&
-	test_all_match git log -- folder1/a
+expecting success of 3070.1361 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing +
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1361 - cleanup after previous file test
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 20 - log with pathspec outside sparse definition
+expecting success of 3070.1362 'setup match file test for -.]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1362 - setup match file test for -.]
 
-expecting success of 1092.21 'blame with pathspec inside sparse definition': 
-	init_repos &&
+expecting success of 3070.1363 'wildmatch: no match '-.]' '[,-.]'': 
+			test_must_fail test-tool wildmatch wildmatch '-.]' '[,-.]'
+		
+ok 1363 - wildmatch: no match '-.]' '[,-.]'
 
-	for file in a \
-			deep/a \
-			deep/deeper1/a \
-			deep/deeper1/deepest/a
-	do
-		test_all_match git blame $file || return 1
-	done
+expecting success of 3070.1364 'wildmatch (via ls-files): no match '[,-.]' '-.]'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1364 - wildmatch (via ls-files): no match '[,-.]' '-.]'
 
-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 inside sparse definition
+expecting success of 3070.1365 'iwildmatch: no match '-.]' '[,-.]'': 
+			test_must_fail test-tool wildmatch iwildmatch '-.]' '[,-.]'
+		
+ok 1365 - iwildmatch: no match '-.]' '[,-.]'
 
-expecting success of 1092.22 'blame with pathspec outside sparse definition': 
-	init_repos &&
-	test_sparse_match git sparse-checkout set &&
+expecting success of 3070.1366 'iwildmatch (via ls-files): no match '[,-.]' '-.]'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1366 - iwildmatch (via ls-files): no match '[,-.]' '-.]'
 
-	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 3070.1367 'pathmatch: no match '-.]' '[,-.]'': 
+			test_must_fail test-tool wildmatch pathmatch '-.]' '[,-.]'
+		
+ok 1367 - pathmatch: no match '-.]' '[,-.]'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 22 - blame with pathspec outside sparse definition
+expecting success of 3070.1368 'pathmatch (via ls-files): no match '[,-.]' '-.]'': 
+				>expect &&
+				git ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1368 - pathmatch (via ls-files): no match '[,-.]' '-.]'
 
-expecting success of 1092.23 'checkout and reset (mixed)': 
-	init_repos &&
+expecting success of 3070.1369 'ipathmatch: no match '-.]' '[,-.]'': 
+			test_must_fail test-tool wildmatch ipathmatch '-.]' '[,-.]'
+		
+ok 1369 - ipathmatch: no match '-.]' '[,-.]'
 
-	test_all_match git checkout -b reset-test update-deep &&
-	test_all_match git reset deepest &&
+expecting success of 3070.1370 'ipathmatch (via ls-files): no match '[,-.]' '-.]'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1370 - ipathmatch (via ls-files): no match '[,-.]' '-.]'
 
-	# 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 3070.1371 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -.]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1371 - cleanup after previous file test
 
-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 23 - checkout and reset (mixed)
+expecting success of 3070.1372 'setup match file test for 2': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1372 - setup match file test for 2
 
-expecting success of 1092.24 'checkout and reset (merge)': 
-	init_repos &&
+expecting success of 3070.1373 'wildmatch: match '2' '[\1-\3]'': 
+			test-tool wildmatch wildmatch '2' '[\1-\3]'
+		
+ok 1373 - wildmatch: match '2' '[\1-\3]'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
+expecting success of 3070.1374 'wildmatch (via ls-files): match '[\1-\3]' '2'': 
+				printf '%s' '2' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1374 - wildmatch (via ls-files): match '[\1-\3]' '2'
 
-	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 &&
+expecting success of 3070.1375 'iwildmatch: match '2' '[\1-\3]'': 
+			test-tool wildmatch iwildmatch '2' '[\1-\3]'
+		
+ok 1375 - iwildmatch: match '2' '[\1-\3]'
 
-	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
+expecting success of 3070.1376 'iwildmatch (via ls-files): match '[\1-\3]' '2'': 
+				printf '%s' '2' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1376 - iwildmatch (via ls-files): match '[\1-\3]' '2'
 
-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 (merge)
+expecting success of 3070.1377 'pathmatch: match '2' '[\1-\3]'': 
+			test-tool wildmatch pathmatch '2' '[\1-\3]'
+		
+ok 1377 - pathmatch: match '2' '[\1-\3]'
 
-expecting success of 1092.25 'checkout and reset (keep)': 
-	init_repos &&
+expecting success of 3070.1378 'pathmatch (via ls-files): match '[\1-\3]' '2'': 
+				printf '%s' '2' >expect &&
+				git ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1378 - pathmatch (via ls-files): match '[\1-\3]' '2'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
+expecting success of 3070.1379 'ipathmatch: match '2' '[\1-\3]'': 
+			test-tool wildmatch ipathmatch '2' '[\1-\3]'
+		
+ok 1379 - ipathmatch: match '2' '[\1-\3]'
 
-	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 3070.1380 'ipathmatch (via ls-files): match '[\1-\3]' '2'': 
+				printf '%s' '2' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1380 - ipathmatch (via ls-files): match '[\1-\3]' '2'
 
-	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 3070.1381 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing 2
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1381 - cleanup after previous file test
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 25 - checkout and reset (keep)
+expecting success of 3070.1382 'setup match file test for 3': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1382 - setup match file test for 3
 
-expecting success of 1092.26 'reset with pathspecs inside sparse definition': 
-	init_repos &&
+expecting success of 3070.1383 'wildmatch: match '3' '[\1-\3]'': 
+			test-tool wildmatch wildmatch '3' '[\1-\3]'
+		
+ok 1383 - wildmatch: match '3' '[\1-\3]'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
+expecting success of 3070.1384 'wildmatch (via ls-files): match '[\1-\3]' '3'': 
+				printf '%s' '3' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1384 - wildmatch (via ls-files): match '[\1-\3]' '3'
 
-	test_all_match git checkout -b reset-test update-deep &&
-	run_on_all ../edit-contents deep/a &&
+expecting success of 3070.1385 'iwildmatch: match '3' '[\1-\3]'': 
+			test-tool wildmatch iwildmatch '3' '[\1-\3]'
+		
+ok 1385 - iwildmatch: match '3' '[\1-\3]'
 
-	test_all_match git reset base -- deep/a &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1386 'iwildmatch (via ls-files): match '[\1-\3]' '3'': 
+				printf '%s' '3' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1386 - iwildmatch (via ls-files): match '[\1-\3]' '3'
 
-	test_all_match git reset base -- nonexistent-file &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1387 'pathmatch: match '3' '[\1-\3]'': 
+			test-tool wildmatch pathmatch '3' '[\1-\3]'
+		
+ok 1387 - pathmatch: match '3' '[\1-\3]'
 
-	test_all_match git reset deepest -- deep &&
-	test_all_match git status --porcelain=v2
+expecting success of 3070.1388 'pathmatch (via ls-files): match '[\1-\3]' '3'': 
+				printf '%s' '3' >expect &&
+				git ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1388 - pathmatch (via ls-files): match '[\1-\3]' '3'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 26 - reset with pathspecs inside sparse definition
+expecting success of 3070.1389 'ipathmatch: match '3' '[\1-\3]'': 
+			test-tool wildmatch ipathmatch '3' '[\1-\3]'
+		
+ok 1389 - ipathmatch: match '3' '[\1-\3]'
 
-expecting success of 1092.27 'reset with pathspecs outside sparse definition': 
-	init_repos &&
-	test_all_match git checkout -b reset-test base &&
+expecting success of 3070.1390 'ipathmatch (via ls-files): match '[\1-\3]' '3'': 
+				printf '%s' '3' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1390 - ipathmatch (via ls-files): match '[\1-\3]' '3'
 
-	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 3070.1391 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing 3
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1391 - cleanup after previous file test
 
-	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 3070.1392 'setup match file test for 4': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1392 - setup match file test for 4
 
-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 27 - reset with pathspecs outside sparse definition
+expecting success of 3070.1393 'wildmatch: no match '4' '[\1-\3]'': 
+			test_must_fail test-tool wildmatch wildmatch '4' '[\1-\3]'
+		
+ok 1393 - wildmatch: no match '4' '[\1-\3]'
 
-expecting success of 1092.28 'reset with wildcard pathspec': 
-	init_repos &&
+expecting success of 3070.1394 'wildmatch (via ls-files): no match '[\1-\3]' '4'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1394 - wildmatch (via ls-files): no match '[\1-\3]' '4'
 
-	test_all_match git reset update-deep -- deep\* &&
-	test_all_match git ls-files -s -- deep &&
+expecting success of 3070.1395 'iwildmatch: no match '4' '[\1-\3]'': 
+			test_must_fail test-tool wildmatch iwildmatch '4' '[\1-\3]'
+		
+ok 1395 - iwildmatch: no match '4' '[\1-\3]'
 
-	test_all_match git reset deepest -- deep\*\*\* &&
-	test_all_match git ls-files -s -- deep &&
+expecting success of 3070.1396 'iwildmatch (via ls-files): no match '[\1-\3]' '4'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1396 - iwildmatch (via ls-files): no match '[\1-\3]' '4'
 
-	# 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 3070.1397 'pathmatch: no match '4' '[\1-\3]'': 
+			test_must_fail test-tool wildmatch pathmatch '4' '[\1-\3]'
+		
+ok 1397 - pathmatch: no match '4' '[\1-\3]'
 
-	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 3070.1398 'pathmatch (via ls-files): no match '[\1-\3]' '4'': 
+				>expect &&
+				git ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1398 - pathmatch (via ls-files): no match '[\1-\3]' '4'
 
-	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 &&
+expecting success of 3070.1399 'ipathmatch: no match '4' '[\1-\3]'': 
+			test_must_fail test-tool wildmatch ipathmatch '4' '[\1-\3]'
+		
+ok 1399 - ipathmatch: no match '4' '[\1-\3]'
 
-	test_sparse_match git reset base -- folder1/\* &&
-	git -C full-checkout reset base -- folder1/\* &&
-	test_all_match git ls-files -s -- folder1
+expecting success of 3070.1400 'ipathmatch (via ls-files): no match '[\1-\3]' '4'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1400 - ipathmatch (via ls-files): no match '[\1-\3]' '4'
 
-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 28 - reset with wildcard pathspec
+expecting success of 3070.1401 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing 4
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1401 - cleanup after previous file test
 
-expecting success of 1092.29 'reset hard with removed sparse dir': 
-	init_repos &&
+expecting success of 3070.1402 'setup match file test for \': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1402 - setup match file test for \
 
-	run_on_all git rm -r --sparse folder1 &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1403 'wildmatch: match '\' '[[-\]]'': 
+			test-tool wildmatch wildmatch '\' '[[-\]]'
+		
+ok 1403 - wildmatch: match '\' '[[-\]]'
 
-	test_all_match git reset --hard &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1404 'wildmatch (via ls-files): match '[[-\]]' '\'': 
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1404 - wildmatch (via ls-files): match '[[-\]]' '\'
 
-	cat >expect <<-\EOF &&
-	folder1/
-	EOF
+expecting success of 3070.1405 'iwildmatch: match '\' '[[-\]]'': 
+			test-tool wildmatch iwildmatch '\' '[[-\]]'
+		
+ok 1405 - iwildmatch: match '\' '[[-\]]'
 
-	git -C sparse-index ls-files --sparse folder1 >out &&
-	test_cmp expect out
+expecting success of 3070.1406 'iwildmatch (via ls-files): match '[[-\]]' '\'': 
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1406 - iwildmatch (via ls-files): match '[[-\]]' '\'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 29 - reset hard with removed sparse dir
+expecting success of 3070.1407 'pathmatch: match '\' '[[-\]]'': 
+			test-tool wildmatch pathmatch '\' '[[-\]]'
+		
+ok 1407 - pathmatch: match '\' '[[-\]]'
 
-expecting success of 1092.30 'update-index modify outside sparse definition': 
-	init_repos &&
+expecting success of 3070.1408 'pathmatch (via ls-files): match '[[-\]]' '\'': 
+				printf '%s' '\' >expect &&
+				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1408 - pathmatch (via ls-files): match '[[-\]]' '\'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
+expecting success of 3070.1409 'ipathmatch: match '\' '[[-\]]'': 
+			test-tool wildmatch ipathmatch '\' '[[-\]]'
+		
+ok 1409 - ipathmatch: match '\' '[[-\]]'
 
-	# 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 &&
+expecting success of 3070.1410 'ipathmatch (via ls-files): match '[[-\]]' '\'': 
+				printf '%s' '\' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1410 - ipathmatch (via ls-files): match '[[-\]]' '\'
 
-	# 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 &&
+expecting success of 3070.1411 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1411 - cleanup after previous file test
 
-	# 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
+expecting success of 3070.1412 'setup match file test for [': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1412 - setup match file test for [
 
-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 modify outside sparse definition
+expecting success of 3070.1413 'wildmatch: match '[' '[[-\]]'': 
+			test-tool wildmatch wildmatch '[' '[[-\]]'
+		
+ok 1413 - wildmatch: match '[' '[[-\]]'
 
-expecting success of 1092.31 'update-index --add outside sparse definition': 
-	init_repos &&
+expecting success of 3070.1414 'wildmatch (via ls-files): match '[[-\]]' '['': 
+				printf '%s' '[' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1414 - wildmatch (via ls-files): match '[[-\]]' '['
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
+expecting success of 3070.1415 'iwildmatch: match '[' '[[-\]]'': 
+			test-tool wildmatch iwildmatch '[' '[[-\]]'
+		
+ok 1415 - iwildmatch: match '[' '[[-\]]'
 
-	# Create folder1, add new file
-	run_on_sparse mkdir -p folder1 &&
-	run_on_all ../edit-contents folder1/b &&
+expecting success of 3070.1416 'iwildmatch (via ls-files): match '[[-\]]' '['': 
+				printf '%s' '[' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1416 - iwildmatch (via ls-files): match '[[-\]]' '['
 
-	# 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
+expecting success of 3070.1417 'pathmatch: match '[' '[[-\]]'': 
+			test-tool wildmatch pathmatch '[' '[[-\]]'
+		
+ok 1417 - pathmatch: match '[' '[[-\]]'
 
-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 --add outside sparse definition
+expecting success of 3070.1418 'pathmatch (via ls-files): match '[[-\]]' '['': 
+				printf '%s' '[' >expect &&
+				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1418 - pathmatch (via ls-files): match '[[-\]]' '['
 
-expecting success of 1092.32 'update-index --remove outside sparse definition': 
-	init_repos &&
+expecting success of 3070.1419 'ipathmatch: match '[' '[[-\]]'': 
+			test-tool wildmatch ipathmatch '[' '[[-\]]'
+		
+ok 1419 - ipathmatch: match '[' '[[-\]]'
 
-	# 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 &&
+expecting success of 3070.1420 'ipathmatch (via ls-files): match '[[-\]]' '['': 
+				printf '%s' '[' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1420 - ipathmatch (via ls-files): match '[[-\]]' '['
 
-	test_sparse_match git diff-index --cached HEAD &&
+expecting success of 3070.1421 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1421 - cleanup after previous file test
 
-	# Reset the state
-	test_all_match git reset --hard &&
+expecting success of 3070.1422 'setup match file test for ]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1422 - setup match file test for ]
 
-	# 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 &&
+expecting success of 3070.1423 'wildmatch: match ']' '[[-\]]'': 
+			test-tool wildmatch wildmatch ']' '[[-\]]'
+		
+ok 1423 - wildmatch: match ']' '[[-\]]'
 
-	test_sparse_match git diff-index --cached HEAD &&
+expecting success of 3070.1424 'wildmatch (via ls-files): match '[[-\]]' ']'': 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1424 - wildmatch (via ls-files): match '[[-\]]' ']'
 
-	# Reset the state
-	test_all_match git reset --hard &&
+expecting success of 3070.1425 'iwildmatch: match ']' '[[-\]]'': 
+			test-tool wildmatch iwildmatch ']' '[[-\]]'
+		
+ok 1425 - iwildmatch: match ']' '[[-\]]'
 
-	# --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 &&
+expecting success of 3070.1426 'iwildmatch (via ls-files): match '[[-\]]' ']'': 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1426 - iwildmatch (via ls-files): match '[[-\]]' ']'
 
-	test_sparse_match git diff-index --cached HEAD
+expecting success of 3070.1427 'pathmatch: match ']' '[[-\]]'': 
+			test-tool wildmatch pathmatch ']' '[[-\]]'
+		
+ok 1427 - pathmatch: match ']' '[[-\]]'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 32 - update-index --remove outside sparse definition
+expecting success of 3070.1428 'pathmatch (via ls-files): match '[[-\]]' ']'': 
+				printf '%s' ']' >expect &&
+				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1428 - pathmatch (via ls-files): match '[[-\]]' ']'
 
-expecting success of 1092.33 'update-index with directories': 
-	init_repos &&
+expecting success of 3070.1429 'ipathmatch: match ']' '[[-\]]'': 
+			test-tool wildmatch ipathmatch ']' '[[-\]]'
+		
+ok 1429 - ipathmatch: match ']' '[[-\]]'
 
-	# 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 &&
+expecting success of 3070.1430 'ipathmatch (via ls-files): match '[[-\]]' ']'': 
+				printf '%s' ']' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1430 - ipathmatch (via ls-files): match '[[-\]]' ']'
 
-	# 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 3070.1431 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1431 - cleanup after previous file test
 
-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 33 - update-index with directories
+expecting success of 3070.1432 'setup match file test for -': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1432 - setup match file test for -
 
-expecting success of 1092.34 'update-index --again file outside sparse definition': 
-	init_repos &&
+expecting success of 3070.1433 'wildmatch: no match '-' '[[-\]]'': 
+			test_must_fail test-tool wildmatch wildmatch '-' '[[-\]]'
+		
+ok 1433 - wildmatch: no match '-' '[[-\]]'
 
-	test_all_match git checkout -b test-reupdate &&
+expecting success of 3070.1434 'wildmatch (via ls-files): no match '[[-\]]' '-'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1434 - wildmatch (via ls-files): no match '[[-\]]' '-'
 
-	# Update HEAD without modifying the index to introduce a difference in
-	# folder1/a
-	test_sparse_match git reset --soft update-folder1 &&
+expecting success of 3070.1435 'iwildmatch: no match '-' '[[-\]]'': 
+			test_must_fail test-tool wildmatch iwildmatch '-' '[[-\]]'
+		
+ok 1435 - iwildmatch: no match '-' '[[-\]]'
 
-	# 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 &&
+expecting success of 3070.1436 'iwildmatch (via ls-files): no match '[[-\]]' '-'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1436 - iwildmatch (via ls-files): no match '[[-\]]' '-'
 
-	cat >expect <<-EOF &&
-	D	folder1/a
-	EOF
-	test_sparse_match git diff --name-status &&
-	test_cmp expect sparse-checkout-out
+expecting success of 3070.1437 'pathmatch: no match '-' '[[-\]]'': 
+			test_must_fail test-tool wildmatch pathmatch '-' '[[-\]]'
+		
+ok 1437 - pathmatch: no match '-' '[[-\]]'
 
-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 --again file outside sparse definition
+expecting success of 3070.1438 'pathmatch (via ls-files): no match '[[-\]]' '-'': 
+				>expect &&
+				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1438 - pathmatch (via ls-files): no match '[[-\]]' '-'
 
-expecting success of 1092.35 'update-index --cacheinfo': 
-	init_repos &&
+expecting success of 3070.1439 'ipathmatch: no match '-' '[[-\]]'': 
+			test_must_fail test-tool wildmatch ipathmatch '-' '[[-\]]'
+		
+ok 1439 - ipathmatch: no match '-' '[[-\]]'
 
-	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 3070.1440 'ipathmatch (via ls-files): no match '[[-\]]' '-'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1440 - ipathmatch (via ls-files): no match '[[-\]]' '-'
+
+expecting success of 3070.1441 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1441 - cleanup after previous file test
+
+expecting success of 3070.1442 'setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1442 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
 
-	test_all_match git update-index --cacheinfo 100644 $deep_a_oid deep/a &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1443 'wildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1443 - wildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
-	# 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 3070.1444 'wildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
+				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
+				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1444 - wildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
 
-	# 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 3070.1445 'iwildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1445 - iwildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
-	# 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 3070.1446 'iwildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
+				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1446 - iwildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 35 - update-index --cacheinfo
+expecting success of 3070.1447 'pathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1447 - pathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
-expecting success of 1092.36 ''read-tree -mu base HEAD update-folder2' with files outside sparse definition': 
-		init_repos &&
+expecting success of 3070.1448 'pathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
+				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
+				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1448 - pathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
 
-		# 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 3070.1449 'ipathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1449 - ipathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
-		test_all_match git read-tree --reset -u HEAD &&
-		test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1450 'ipathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
+				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
+				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1450 - ipathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
 
-		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 3070.1451 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1451 - cleanup after previous file test
 
+expecting success of 3070.1452 'setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-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 base HEAD update-folder2' with files outside sparse definition
+ok 1452 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
 
-expecting success of 1092.37 ''read-tree -mu update-folder1 update-folder2' with files outside sparse definition': 
-		init_repos &&
+expecting success of 3070.1453 'wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1453 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
-		# 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 3070.1454 'wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1454 - wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
 
-		test_all_match git read-tree --reset -u HEAD &&
-		test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1455 'iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1455 - iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
-		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 3070.1456 'iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1456 - iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
 
-	
-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-folder1 update-folder2' with files outside sparse definition
+expecting success of 3070.1457 'pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1457 - pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
-expecting success of 1092.38 ''read-tree -mu update-folder2' with files outside sparse definition': 
-		init_repos &&
+expecting success of 3070.1458 'pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
+				>expect &&
+				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1458 - pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
 
-		# 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 3070.1459 'ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1459 - ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
-		test_all_match git read-tree --reset -u HEAD &&
-		test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1460 'ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1460 - ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
 
-		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 3070.1461 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1461 - cleanup after previous file test
 
+expecting success of 3070.1462 'setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-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 -mu update-folder2' with files outside sparse definition
+ok 1462 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1
 
-expecting success of 1092.39 'read-tree --merge with edit/edit conflicts in sparse directories': 
-	init_repos &&
+expecting success of 3070.1463 'wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1463 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
-	# 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 &&
+expecting success of 3070.1464 'wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1464 - wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
 
-	test_all_match git reset --hard &&
+expecting success of 3070.1465 'iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1465 - iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
-	test_all_match git read-tree -mu rename-base update-folder2 &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1466 'iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1466 - iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
 
-	test_all_match git reset --hard &&
+expecting success of 3070.1467 'pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1467 - pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
-	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
+expecting success of 3070.1468 'pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+				>expect &&
+				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1468 - pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
 
-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 --merge with edit/edit conflicts in sparse directories
+expecting success of 3070.1469 'ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1469 - ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
-expecting success of 1092.40 'read-tree --prefix': 
-	init_repos &&
+expecting success of 3070.1470 'ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1470 - ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
 
-	# 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 3070.1471 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -adobe-courier-bold-o-normal--12-120-75-75-/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1471 - cleanup after previous file test
 
-	# 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 &&
+expecting success of 3070.1472 'setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1472 - setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1
 
-	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 &&
+expecting success of 3070.1473 'wildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test-tool wildmatch wildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1473 - wildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-	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
+checking known breakage of 3070.1474 'wildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
+not ok 1474 - wildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # 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 40 - read-tree --prefix
+expecting success of 3070.1475 'iwildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test-tool wildmatch iwildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1475 - iwildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-expecting success of 1092.41 'read-tree --merge with directory-file conflicts': 
-	init_repos &&
+checking known breakage of 3070.1476 'iwildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
+not ok 1476 - iwildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
 
-	test_all_match git checkout -b test-branch rename-base &&
+expecting success of 3070.1477 'pathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test-tool wildmatch pathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1477 - pathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-	# 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 &&
+checking known breakage of 3070.1478 'pathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
+not ok 1478 - pathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
 
-	test_sparse_match git read-tree --reset -u HEAD &&
-	test_sparse_match git status --porcelain=v2 &&
+expecting success of 3070.1479 'ipathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test-tool wildmatch ipathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1479 - ipathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-	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
+checking known breakage of 3070.1480 'ipathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
+not ok 1480 - ipathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # 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 41 - read-tree --merge with directory-file conflicts
+expecting success of 3070.1481 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 1481 - cleanup after previous file test
 
-expecting success of 1092.42 'merge, cherry-pick, and rebase': 
-	init_repos &&
+expecting success of 3070.1482 'setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1482 - setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1
 
-	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
+expecting success of 3070.1483 'wildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1483 - wildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 42 - merge, cherry-pick, and rebase
+checking known breakage of 3070.1484 'wildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
+not ok 1484 - wildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
 
-expecting success of 1092.43 'merge with conflict outside cone': 
-	init_repos &&
+expecting success of 3070.1485 'iwildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1485 - iwildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-	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 &&
+checking known breakage of 3070.1486 'iwildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
+not ok 1486 - iwildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
 
-	# 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 &&
+expecting success of 3070.1487 'pathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test_must_fail test-tool wildmatch pathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1487 - pathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-	# 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 &&
+checking known breakage of 3070.1488 'pathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
+not ok 1488 - pathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
 
-	# 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 &&
+expecting success of 3070.1489 'ipathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test_must_fail test-tool wildmatch ipathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1489 - ipathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-	test_all_match git merge --continue &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git rev-parse HEAD^{tree}
+checking known breakage of 3070.1490 'ipathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
+not ok 1490 - ipathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
 
-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 43 - merge with conflict outside cone
+expecting success of 3070.1491 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 1491 - cleanup after previous file test
 
-expecting success of 1092.44 'cherry-pick/rebase with conflict outside cone': 
-	init_repos &&
+expecting success of 3070.1492 'setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1492 - setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt
 
-	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 &&
+expecting success of 3070.1493 'wildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
+			test-tool wildmatch wildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		
+ok 1493 - wildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
 
-		# 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 &&
+expecting success of 3070.1494 'wildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
+				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1494 - wildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
 
-		# 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 &&
+expecting success of 3070.1495 'iwildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
+			test-tool wildmatch iwildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		
+ok 1495 - iwildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
 
-		# 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 &&
+expecting success of 3070.1496 'iwildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
+				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1496 - iwildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
 
-		test_all_match git $OPERATION --continue &&
-		test_all_match git status --porcelain=v2 &&
-		test_all_match git rev-parse HEAD^{tree} || return 1
-	done
+expecting success of 3070.1497 'pathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
+			test-tool wildmatch pathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		
+ok 1497 - pathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
 
-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 44 - cherry-pick/rebase with conflict outside cone
+expecting success of 3070.1498 'pathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
+				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
+				git ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1498 - pathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
 
-expecting success of 1092.45 'merge with outside renames': 
-	init_repos &&
+expecting success of 3070.1499 'ipathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
+			test-tool wildmatch ipathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		
+ok 1499 - ipathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
 
-	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
+expecting success of 3070.1500 'ipathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
+				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1500 - ipathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 45 - merge with outside renames
+expecting success of 3070.1501 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing abcd/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1501 - cleanup after previous file test
 
-expecting success of 1092.46 'cherry-pick with conflicts': 
-	init_repos &&
+expecting success of 3070.1502 'setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1502 - setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz
 
-	write_script edit-conflict <<-\EOF &&
-	echo $1 >conflict
-	EOF
+expecting success of 3070.1503 'wildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
+			test_must_fail test-tool wildmatch wildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		
+ok 1503 - wildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
 
-	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" &&
+expecting success of 3070.1504 'wildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1504 - wildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
 
-	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" &&
+expecting success of 3070.1505 'iwildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
+			test_must_fail test-tool wildmatch iwildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		
+ok 1505 - iwildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
 
-	test_all_match test_must_fail git cherry-pick to-cherry-pick
+expecting success of 3070.1506 'iwildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1506 - iwildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 46 - cherry-pick with conflicts
+expecting success of 3070.1507 'pathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
+			test_must_fail test-tool wildmatch pathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		
+ok 1507 - pathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
 
-expecting success of 1092.47 'stash': 
-	init_repos &&
+expecting success of 3070.1508 'pathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
+				>expect &&
+				git ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1508 - pathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
+expecting success of 3070.1509 'ipathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
+			test_must_fail test-tool wildmatch ipathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		
+ok 1509 - ipathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
 
-	# 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 &&
+expecting success of 3070.1510 'ipathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1510 - ipathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
 
-	# Apply the sparse directory stash without reinstating the index
-	test_all_match git stash apply -q &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1511 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing abcd/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1511 - cleanup after previous file test
 
-	# 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 &&
+expecting success of 3070.1512 'setup match file test for foo': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1512 - setup match file test for foo
 
-	# Apply the sparse directory stash *with* reinstating the index
-	test_all_match git stash apply --index -q &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1513 'wildmatch: no match 'foo' '*/*/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo' '*/*/*'
+		
+ok 1513 - wildmatch: no match 'foo' '*/*/*'
 
-	# 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 &&
+expecting success of 3070.1514 'wildmatch (via ls-files): no match '*/*/*' 'foo'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1514 - wildmatch (via ls-files): no match '*/*/*' 'foo'
 
-	# 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 &&
+expecting success of 3070.1515 'iwildmatch: no match 'foo' '*/*/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo' '*/*/*'
+		
+ok 1515 - iwildmatch: no match 'foo' '*/*/*'
 
-	# Reset to base branch
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git reset --hard base &&
+expecting success of 3070.1516 'iwildmatch (via ls-files): no match '*/*/*' 'foo'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1516 - iwildmatch (via ls-files): no match '*/*/*' 'foo'
 
-	# 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 &&
+expecting success of 3070.1517 'pathmatch: no match 'foo' '*/*/*'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' '*/*/*'
+		
+ok 1517 - pathmatch: no match 'foo' '*/*/*'
 
-	test_all_match git stash pop -q &&
-	test_all_match git status --porcelain=v2
+expecting success of 3070.1518 'pathmatch (via ls-files): no match '*/*/*' 'foo'': 
+				>expect &&
+				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1518 - pathmatch (via ls-files): no match '*/*/*' 'foo'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 47 - stash
+expecting success of 3070.1519 'ipathmatch: no match 'foo' '*/*/*'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '*/*/*'
+		
+ok 1519 - ipathmatch: no match 'foo' '*/*/*'
 
-expecting success of 1092.48 'checkout-index inside sparse definition': 
-	init_repos &&
+expecting success of 3070.1520 'ipathmatch (via ls-files): no match '*/*/*' 'foo'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1520 - ipathmatch (via ls-files): no match '*/*/*' 'foo'
 
-	run_on_all rm -f deep/a &&
-	test_all_match git checkout-index -- deep/a &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1521 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo
+ok 1521 - cleanup after previous file test
 
-	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
+expecting success of 3070.1522 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1522 - setup match file test for foo/bar
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 48 - checkout-index inside sparse definition
+expecting success of 3070.1523 'wildmatch: no match 'foo/bar' '*/*/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' '*/*/*'
+		
+ok 1523 - wildmatch: no match 'foo/bar' '*/*/*'
 
-expecting success of 1092.49 'checkout-index outside sparse definition': 
-	init_repos &&
+expecting success of 3070.1524 'wildmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1524 - wildmatch (via ls-files): no match '*/*/*' 'foo/bar'
 
-	# 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 &&
+expecting success of 3070.1525 'iwildmatch: no match 'foo/bar' '*/*/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' '*/*/*'
+		
+ok 1525 - iwildmatch: no match 'foo/bar' '*/*/*'
 
-	# 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 &&
+expecting success of 3070.1526 'iwildmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1526 - iwildmatch (via ls-files): no match '*/*/*' 'foo/bar'
 
-	run_on_sparse rm -rf folder1 &&
-	echo test >new-a &&
-	run_on_sparse mkdir -p folder1 &&
-	run_on_all cp ../new-a folder1/a &&
+expecting success of 3070.1527 'pathmatch: no match 'foo/bar' '*/*/*'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo/bar' '*/*/*'
+		
+ok 1527 - pathmatch: no match 'foo/bar' '*/*/*'
 
-	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
+expecting success of 3070.1528 'pathmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
+				>expect &&
+				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1528 - pathmatch (via ls-files): no match '*/*/*' 'foo/bar'
 
-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 49 - checkout-index outside sparse definition
+expecting success of 3070.1529 'ipathmatch: no match 'foo/bar' '*/*/*'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' '*/*/*'
+		
+ok 1529 - ipathmatch: no match 'foo/bar' '*/*/*'
 
-expecting success of 1092.50 'checkout-index with folders': 
-	init_repos &&
+expecting success of 3070.1530 'ipathmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1530 - ipathmatch (via ls-files): no match '*/*/*' 'foo/bar'
 
-	# Inside checkout definition
-	test_all_match test_must_fail git checkout-index -f -- deep/ &&
+expecting success of 3070.1531 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1531 - cleanup after previous file test
 
-	# 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
+expecting success of 3070.1532 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1532 - setup match file test for foo/bba/arr
 
-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-08-27 08:20:33.031487540 +0000
-+++ sparse-index-err	2025-08-27 08:20:33.063487751 +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 50 - checkout-index with folders
+expecting success of 3070.1533 'wildmatch: match 'foo/bba/arr' '*/*/*'': 
+			test-tool wildmatch wildmatch 'foo/bba/arr' '*/*/*'
+		
+ok 1533 - wildmatch: match 'foo/bba/arr' '*/*/*'
 
-expecting success of 1092.51 'checkout-index --all': 
-	init_repos &&
+expecting success of 3070.1534 'wildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1534 - wildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
 
-	test_all_match git checkout-index --all &&
-	test_sparse_match test_path_is_missing folder1 &&
+expecting success of 3070.1535 'iwildmatch: match 'foo/bba/arr' '*/*/*'': 
+			test-tool wildmatch iwildmatch 'foo/bba/arr' '*/*/*'
+		
+ok 1535 - iwildmatch: match 'foo/bba/arr' '*/*/*'
 
-	# --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
+expecting success of 3070.1536 'iwildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1536 - iwildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 51 - checkout-index --all
+expecting success of 3070.1537 'pathmatch: match 'foo/bba/arr' '*/*/*'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' '*/*/*'
+		
+ok 1537 - pathmatch: match 'foo/bba/arr' '*/*/*'
 
-expecting success of 1092.52 'clean': 
-	init_repos &&
+expecting success of 3070.1538 'pathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1538 - pathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
 
-	echo bogus >>.gitignore &&
-	run_on_all cp ../.gitignore . &&
-	test_all_match git add .gitignore &&
-	test_all_match git commit -m "ignore bogus files" &&
+expecting success of 3070.1539 'ipathmatch: match 'foo/bba/arr' '*/*/*'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' '*/*/*'
+		
+ok 1539 - ipathmatch: match 'foo/bba/arr' '*/*/*'
 
-	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 &&
+expecting success of 3070.1540 'ipathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1540 - ipathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
 
-	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 &&
+expecting success of 3070.1541 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1541 - cleanup after previous file test
 
-	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 &&
+expecting success of 3070.1542 'setup match file test for foo/bb/aa/rr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1542 - setup match file test for foo/bb/aa/rr
 
-	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 &&
+expecting success of 3070.1543 'wildmatch: no match 'foo/bb/aa/rr' '*/*/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bb/aa/rr' '*/*/*'
+		
+ok 1543 - wildmatch: no match 'foo/bb/aa/rr' '*/*/*'
 
-	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 &&
+expecting success of 3070.1544 'wildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1544 - wildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'
 
-	test_sparse_match test_path_is_dir folder1
+expecting success of 3070.1545 'iwildmatch: no match 'foo/bb/aa/rr' '*/*/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bb/aa/rr' '*/*/*'
+		
+ok 1545 - iwildmatch: no match 'foo/bb/aa/rr' '*/*/*'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 52 - clean
+expecting success of 3070.1546 'iwildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1546 - iwildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'
 
-expecting success of 1092.53 'show (cached blobs/trees)': 
-		init_repos &&
+expecting success of 3070.1547 'pathmatch: match 'foo/bb/aa/rr' '*/*/*'': 
+			test-tool wildmatch pathmatch 'foo/bb/aa/rr' '*/*/*'
+		
+ok 1547 - pathmatch: match 'foo/bb/aa/rr' '*/*/*'
 
-		test_all_match git show :a &&
-		test_all_match git show :deep/a &&
-		test_sparse_match git show :folder1/a &&
+expecting success of 3070.1548 'pathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'': 
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1548 - pathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'
 
-		# 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/ &&
+expecting success of 3070.1549 'ipathmatch: match 'foo/bb/aa/rr' '*/*/*'': 
+			test-tool wildmatch ipathmatch 'foo/bb/aa/rr' '*/*/*'
+		
+ok 1549 - ipathmatch: match 'foo/bb/aa/rr' '*/*/*'
 
-		# Change the sparse cone for an extra case:
-		run_on_sparse git sparse-checkout set deep/deeper1 &&
+expecting success of 3070.1550 'ipathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'': 
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1550 - ipathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'
 
-		# deep/deeper2 is a sparse directory in the sparse index.
-		test_sparse_match test_must_fail git show :deep/deeper2/ &&
+expecting success of 3070.1551 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1551 - cleanup after previous file test
 
-		# 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/
+expecting success of 3070.1552 'setup match file test for foo/bb/aa/rr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-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 53 - show (cached blobs/trees)
+ok 1552 - setup match file test for foo/bb/aa/rr
 
-expecting success of 1092.54 'rev-parse (cached blobs/trees)': 
-		init_repos &&
+expecting success of 3070.1553 'wildmatch: match 'foo/bb/aa/rr' '**/**/**'': 
+			test-tool wildmatch wildmatch 'foo/bb/aa/rr' '**/**/**'
+		
+ok 1553 - wildmatch: match 'foo/bb/aa/rr' '**/**/**'
 
-		test_all_match git rev-parse :a &&
-		test_all_match git rev-parse :deep/a &&
-		test_sparse_match git rev-parse :folder1/a &&
+expecting success of 3070.1554 'wildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1554 - wildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
 
-		# 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/ &&
+expecting success of 3070.1555 'iwildmatch: match 'foo/bb/aa/rr' '**/**/**'': 
+			test-tool wildmatch iwildmatch 'foo/bb/aa/rr' '**/**/**'
+		
+ok 1555 - iwildmatch: match 'foo/bb/aa/rr' '**/**/**'
 
-		# Change the sparse cone for an extra case:
-		run_on_sparse git sparse-checkout set deep/deeper1 &&
+expecting success of 3070.1556 'iwildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1556 - iwildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
 
-		# deep/deeper2 is a sparse directory in the sparse index.
-		test_sparse_match test_must_fail git rev-parse :deep/deeper2/ &&
+expecting success of 3070.1557 'pathmatch: match 'foo/bb/aa/rr' '**/**/**'': 
+			test-tool wildmatch pathmatch 'foo/bb/aa/rr' '**/**/**'
+		
+ok 1557 - pathmatch: match 'foo/bb/aa/rr' '**/**/**'
 
-		# 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 54 - rev-parse (cached blobs/trees)
+expecting success of 3070.1558 'pathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1558 - pathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
 
-expecting success of 1092.55 'submodule handling': 
-	init_repos &&
+expecting success of 3070.1559 'ipathmatch: match 'foo/bb/aa/rr' '**/**/**'': 
+			test-tool wildmatch ipathmatch 'foo/bb/aa/rr' '**/**/**'
+		
+ok 1559 - ipathmatch: match 'foo/bb/aa/rr' '**/**/**'
 
-	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" &&
+expecting success of 3070.1560 'ipathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1560 - ipathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
 
-	test_config_global protocol.file.allow always &&
+expecting success of 3070.1561 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1561 - cleanup after previous file test
 
-	run_on_all git submodule add "$(pwd)/initial-repo" modules/sub &&
-	test_all_match git commit -m "add submodule" &&
+expecting success of 3070.1562 'setup match file test for abcXdefXghi': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1562 - setup match file test for abcXdefXghi
 
-	# 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
+expecting success of 3070.1563 'wildmatch: match 'abcXdefXghi' '*X*i'': 
+			test-tool wildmatch wildmatch 'abcXdefXghi' '*X*i'
+		
+ok 1563 - wildmatch: match 'abcXdefXghi' '*X*i'
 
-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 55 - submodule handling
+expecting success of 3070.1564 'wildmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
+				printf '%s' 'abcXdefXghi' >expect &&
+				git --glob-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1564 - wildmatch (via ls-files): match '*X*i' 'abcXdefXghi'
 
-expecting success of 1092.56 'git apply functionality': 
-	init_repos &&
+expecting success of 3070.1565 'iwildmatch: match 'abcXdefXghi' '*X*i'': 
+			test-tool wildmatch iwildmatch 'abcXdefXghi' '*X*i'
+		
+ok 1565 - iwildmatch: match 'abcXdefXghi' '*X*i'
 
-	test_all_match git checkout base &&
+expecting success of 3070.1566 'iwildmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
+				printf '%s' 'abcXdefXghi' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1566 - iwildmatch (via ls-files): match '*X*i' 'abcXdefXghi'
 
-	git -C full-checkout diff base..merge-right -- deep >patch-in-sparse &&
-	git -C full-checkout diff base..merge-right -- folder2 >patch-outside &&
+expecting success of 3070.1567 'pathmatch: match 'abcXdefXghi' '*X*i'': 
+			test-tool wildmatch pathmatch 'abcXdefXghi' '*X*i'
+		
+ok 1567 - pathmatch: match 'abcXdefXghi' '*X*i'
 
-	# Apply a patch to a file inside the sparse definition
-	test_all_match git apply --index --stat ../patch-in-sparse &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1568 'pathmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
+				printf '%s' 'abcXdefXghi' >expect &&
+				git ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1568 - pathmatch (via ls-files): match '*X*i' 'abcXdefXghi'
 
-	# Apply a patch to a file outside the sparse definition
-	test_sparse_match test_must_fail git apply ../patch-outside &&
-	grep "No such file or directory" sparse-checkout-err &&
+expecting success of 3070.1569 'ipathmatch: match 'abcXdefXghi' '*X*i'': 
+			test-tool wildmatch ipathmatch 'abcXdefXghi' '*X*i'
+		
+ok 1569 - ipathmatch: match 'abcXdefXghi' '*X*i'
 
-	# But it works with --index and --cached
-	test_all_match git apply --index --stat ../patch-outside &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git reset --hard &&
-	test_all_match git apply --cached --stat ../patch-outside &&
-	test_all_match git status --porcelain=v2
+expecting success of 3070.1570 'ipathmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
+				printf '%s' 'abcXdefXghi' >expect &&
+				git --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1570 - ipathmatch (via ls-files): match '*X*i' 'abcXdefXghi'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-error: folder2/a: No such file or directory
-ok 56 - git apply functionality
+expecting success of 3070.1571 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing abcXdefXghi
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1571 - cleanup after previous file test
 
-expecting success of 1092.57 'sparse-index is expanded and converted back': 
-	init_repos &&
+expecting success of 3070.1572 'setup match file test for ab/cXd/efXg/hi': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1572 - setup match file test for ab/cXd/efXg/hi
 
-	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 &&
+expecting success of 3070.1573 'wildmatch: no match 'ab/cXd/efXg/hi' '*X*i'': 
+			test_must_fail test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*X*i'
+		
+ok 1573 - wildmatch: no match 'ab/cXd/efXg/hi' '*X*i'
 
-	# 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
+expecting success of 3070.1574 'wildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1574 - wildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'
 
-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":"20250827T082037.509973Z-Hcf858c9d-P00075e6a","thread":"main","time":"2025-08-27T08:20:37.512417Z","file":"sparse-index.c","line":237,"repo":1,"nesting":1,"category":"index","label":"convert_to_sparse"}
-{"event":"region_leave","sid":"20250827T082037.509973Z-Hcf858c9d-P00075e6a","thread":"main","time":"2025-08-27T08:20:37.516651Z","file":"sparse-index.c","line":252,"repo":1,"t_rel":0.004234,"nesting":1,"category":"index","label":"convert_to_sparse"}
-{"event":"region_enter","sid":"20250827T082037.509973Z-Hcf858c9d-P00075e6a","thread":"main","time":"2025-08-27T08:20:37.511303Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082037.509973Z-Hcf858c9d-P00075e6a","thread":"main","time":"2025-08-27T08:20:37.516967Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082037.509973Z-Hcf858c9d-P00075e6a","thread":"main","time":"2025-08-27T08:20:37.511959Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000657,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082037.509973Z-Hcf858c9d-P00075e6a","thread":"main","time":"2025-08-27T08:20:37.517125Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000157,"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":"20250827T082037.568010Z-Hcf858c9d-P00075ee3","thread":"main","time":"2025-08-27T08:20:37.578877Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082037.568010Z-Hcf858c9d-P00075ee3","thread":"main","time":"2025-08-27T08:20:37.579700Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000823,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 57 - sparse-index is expanded and converted back
+expecting success of 3070.1575 'iwildmatch: no match 'ab/cXd/efXg/hi' '*X*i'': 
+			test_must_fail test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*X*i'
+		
+ok 1575 - iwildmatch: no match 'ab/cXd/efXg/hi' '*X*i'
 
-expecting success of 1092.58 'index.sparse disabled inline uses full index': 
-	init_repos &&
+expecting success of 3070.1576 'iwildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1576 - iwildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'
 
-	# 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 &&
+expecting success of 3070.1577 'pathmatch: match 'ab/cXd/efXg/hi' '*X*i'': 
+			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*X*i'
+		
+ok 1577 - pathmatch: match 'ab/cXd/efXg/hi' '*X*i'
 
-	# 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 &&
+expecting success of 3070.1578 'pathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1578 - pathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'
 
-	# 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
+expecting success of 3070.1579 'ipathmatch: match 'ab/cXd/efXg/hi' '*X*i'': 
+			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*X*i'
+		
+ok 1579 - ipathmatch: match 'ab/cXd/efXg/hi' '*X*i'
 
-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.
+expecting success of 3070.1580 'ipathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1580 - ipathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'
 
-nothing to commit, working tree clean
-{"event":"region_enter","sid":"20250827T082037.790300Z-Hcf858c9d-P0007610b","thread":"main","time":"2025-08-27T08:20:37.791181Z","file":"sparse-index.c","line":372,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082037.790300Z-Hcf858c9d-P0007610b","thread":"main","time":"2025-08-27T08:20:37.792050Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000869,"nesting":2,"category":"index","label":"ensure_full_index"}
-On branch base
-You are in a sparse checkout.
+expecting success of 3070.1581 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ab/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1581 - cleanup after previous file test
 
-nothing to commit, working tree clean
-{"event":"region_enter","sid":"20250827T082037.820615Z-Hcf858c9d-P0007614c","thread":"main","time":"2025-08-27T08:20:37.821462Z","file":"sparse-index.c","line":237,"repo":1,"nesting":2,"category":"index","label":"convert_to_sparse"}
-{"event":"region_leave","sid":"20250827T082037.820615Z-Hcf858c9d-P0007614c","thread":"main","time":"2025-08-27T08:20:37.821589Z","file":"sparse-index.c","line":252,"repo":1,"t_rel":0.000128,"nesting":2,"category":"index","label":"convert_to_sparse"}
-On branch base
-You are in a sparse checkout.
+expecting success of 3070.1582 'setup match file test for ab/cXd/efXg/hi': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1582 - setup match file test for ab/cXd/efXg/hi
 
-nothing to commit, working tree clean
-ok 58 - index.sparse disabled inline uses full index
+expecting success of 3070.1583 'wildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
+			test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+		
+ok 1583 - wildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
 
-expecting success of 1092.59 'sparse-index is not expanded': 
-	init_repos &&
+expecting success of 3070.1584 'wildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --glob-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1584 - wildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
 
-	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 &&
+expecting success of 3070.1585 'iwildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
+			test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+		
+ok 1585 - iwildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
 
-	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 . &&
+expecting success of 3070.1586 'iwildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1586 - iwildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
 
-	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 &&
+expecting success of 3070.1587 'pathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
+			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+		
+ok 1587 - pathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
 
-	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 &&
+expecting success of 3070.1588 'pathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1588 - pathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
 
-	ensure_not_expanded reset base -- deep/a &&
-	ensure_not_expanded reset base -- nonexistent-file &&
-	ensure_not_expanded reset deepest -- deep &&
+expecting success of 3070.1589 'ipathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
+			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+		
+ok 1589 - ipathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
 
-	# 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/ &&
+expecting success of 3070.1590 'ipathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1590 - ipathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
 
-	# Wildcard identifies only in-cone files, no index expansion
-	ensure_not_expanded reset deepest -- deep/\* &&
+expecting success of 3070.1591 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ab/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1591 - cleanup after previous file test
 
-	# Wildcard identifies only full sparse directories, no index expansion
-	ensure_not_expanded reset deepest -- folder\* &&
+expecting success of 3070.1592 'setup match file test for ab/cXd/efXg/hi': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1592 - setup match file test for ab/cXd/efXg/hi
 
-	ensure_not_expanded clean -fd &&
+expecting success of 3070.1593 'wildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
+			test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+		
+ok 1593 - wildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
 
-	ensure_not_expanded checkout -f update-deep &&
-	test_config -C sparse-index pull.twohead ort &&
-	(
-		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
-	)
+expecting success of 3070.1594 'wildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1594 - wildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
 
-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
+expecting success of 3070.1595 'iwildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
+			test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+		
+ok 1595 - iwildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
 
-expecting success of 1092.60 'sparse-index is not expanded: merge conflict in cone': 
-	init_repos &&
+expecting success of 3070.1596 'iwildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1596 - iwildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
 
-	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 &&
+expecting success of 3070.1597 'pathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
+			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+		
+ok 1597 - pathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
 
-	(
-		git -C sparse-index config pull.twohead ort &&
-		ensure_not_expanded ! merge -m merged expand-right
-	)
+expecting success of 3070.1598 'pathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1598 - pathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
 
-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 60 - sparse-index is not expanded: merge conflict in cone
+expecting success of 3070.1599 'ipathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
+			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+		
+ok 1599 - ipathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
 
-expecting success of 1092.61 'sparse-index is not expanded: stash': 
-	init_repos &&
+expecting success of 3070.1600 'ipathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1600 - ipathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
 
-	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} &&
+expecting success of 3070.1601 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ab/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1601 - cleanup after previous file test
 
-	echo >>sparse-index/deep/new &&
-	ensure_not_expanded stash -u &&
-	(
-		WITHOUT_UNTRACKED_TXT=1 &&
-		ensure_not_expanded stash pop
-	) &&
+expecting success of 3070.1602 'setup match file test for foo': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1602 - setup match file test for foo
 
-	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
+expecting success of 3070.1603 'wildmatch: no match 'foo' 'fo'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo' 'fo'
+		
+ok 1603 - wildmatch: no match 'foo' 'fo'
 
-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: stash
+expecting success of 3070.1604 'wildmatch (via ls-files): no match 'fo' 'foo'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1604 - wildmatch (via ls-files): no match 'fo' 'foo'
 
-expecting success of 1092.62 'describe tested on all': 
-	init_repos &&
+expecting success of 3070.1605 'iwildmatch: no match 'foo' 'fo'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo' 'fo'
+		
+ok 1605 - iwildmatch: no match 'foo' 'fo'
 
-	# Add tag to be read by describe
+expecting success of 3070.1606 'iwildmatch (via ls-files): no match 'fo' 'foo'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1606 - iwildmatch (via ls-files): no match 'fo' 'foo'
 
-	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
+expecting success of 3070.1607 'pathmatch: no match 'foo' 'fo'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' 'fo'
+		
+ok 1607 - pathmatch: no match 'foo' 'fo'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 62 - describe tested on all
+expecting success of 3070.1608 'pathmatch (via ls-files): no match 'fo' 'foo'': 
+				>expect &&
+				git ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1608 - pathmatch (via ls-files): no match 'fo' 'foo'
 
-expecting success of 1092.63 'sparse-index is not expanded: describe': 
-	init_repos &&
+expecting success of 3070.1609 'ipathmatch: no match 'foo' 'fo'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' 'fo'
+		
+ok 1609 - ipathmatch: no match 'foo' 'fo'
 
-	# Add tag to be read by describe
+expecting success of 3070.1610 'ipathmatch (via ls-files): no match 'fo' 'foo'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1610 - ipathmatch (via ls-files): no match 'fo' 'foo'
 
-	git -C sparse-index tag -a v1.0 -m "Version 1" &&
+expecting success of 3070.1611 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo
+ok 1611 - cleanup after previous file test
 
-	ensure_not_expanded describe --dirty &&
-	echo "test" >>sparse-index/g &&
-	ensure_not_expanded describe --dirty &&
-	ensure_not_expanded describe
+expecting success of 3070.1612 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1612 - setup match file test for foo/bar
 
-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: describe
+expecting success of 3070.1613 'wildmatch: match 'foo/bar' 'foo/bar'': 
+			test-tool wildmatch wildmatch 'foo/bar' 'foo/bar'
+		
+ok 1613 - wildmatch: match 'foo/bar' 'foo/bar'
 
-expecting success of 1092.64 'sparse index is not expanded: diff and diff-index': 
-	init_repos &&
+expecting success of 3070.1614 'wildmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1614 - wildmatch (via ls-files): match 'foo/bar' 'foo/bar'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
+expecting success of 3070.1615 'iwildmatch: match 'foo/bar' 'foo/bar'': 
+			test-tool wildmatch iwildmatch 'foo/bar' 'foo/bar'
+		
+ok 1615 - iwildmatch: match 'foo/bar' 'foo/bar'
 
-	# 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 &&
+expecting success of 3070.1616 'iwildmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1616 - iwildmatch (via ls-files): match 'foo/bar' 'foo/bar'
 
-	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 &&
+expecting success of 3070.1617 'pathmatch: match 'foo/bar' 'foo/bar'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo/bar'
+		
+ok 1617 - pathmatch: match 'foo/bar' 'foo/bar'
 
-	# 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 &&
+expecting success of 3070.1618 'pathmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1618 - pathmatch (via ls-files): match 'foo/bar' 'foo/bar'
 
-	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 &&
+expecting success of 3070.1619 'ipathmatch: match 'foo/bar' 'foo/bar'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo/bar'
+		
+ok 1619 - ipathmatch: match 'foo/bar' 'foo/bar'
 
-	# 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 &&
+expecting success of 3070.1620 'ipathmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1620 - ipathmatch (via ls-files): match 'foo/bar' 'foo/bar'
 
-	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
+expecting success of 3070.1621 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1621 - cleanup after previous file test
 
-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: diff and diff-index
+expecting success of 3070.1622 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1622 - setup match file test for foo/bar
 
-expecting success of 1092.65 'sparse index is not expanded: show and rev-parse': 
-	init_repos &&
+expecting success of 3070.1623 'wildmatch: match 'foo/bar' 'foo/*'': 
+			test-tool wildmatch wildmatch 'foo/bar' 'foo/*'
+		
+ok 1623 - wildmatch: match 'foo/bar' 'foo/*'
 
-	ensure_not_expanded show :a &&
-	ensure_not_expanded show :deep/a &&
-	ensure_not_expanded rev-parse :a &&
-	ensure_not_expanded rev-parse :deep/a
+expecting success of 3070.1624 'wildmatch (via ls-files): match 'foo/*' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1624 - wildmatch (via ls-files): match 'foo/*' 'foo/bar'
 
-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: show and rev-parse
+expecting success of 3070.1625 'iwildmatch: match 'foo/bar' 'foo/*'': 
+			test-tool wildmatch iwildmatch 'foo/bar' 'foo/*'
+		
+ok 1625 - iwildmatch: match 'foo/bar' 'foo/*'
 
-expecting success of 1092.66 'sparse index is not expanded: update-index': 
-	init_repos &&
+expecting success of 3070.1626 'iwildmatch (via ls-files): match 'foo/*' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1626 - iwildmatch (via ls-files): match 'foo/*' 'foo/bar'
 
-	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 &&
+expecting success of 3070.1627 'pathmatch: match 'foo/bar' 'foo/*'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo/*'
+		
+ok 1627 - pathmatch: match 'foo/bar' 'foo/*'
 
-	echo "test" >sparse-index/README.md &&
-	echo "test2" >sparse-index/a &&
-	rm -f sparse-index/deep/a &&
+expecting success of 3070.1628 'pathmatch (via ls-files): match 'foo/*' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1628 - pathmatch (via ls-files): match 'foo/*' 'foo/bar'
 
-	ensure_not_expanded update-index --add README.md &&
-	ensure_not_expanded update-index a &&
-	ensure_not_expanded update-index --remove deep/a &&
+expecting success of 3070.1629 'ipathmatch: match 'foo/bar' 'foo/*'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo/*'
+		
+ok 1629 - ipathmatch: match 'foo/bar' 'foo/*'
 
-	ensure_not_expanded reset --soft update-deep &&
-	ensure_not_expanded update-index --add --remove --again
+expecting success of 3070.1630 'ipathmatch (via ls-files): match 'foo/*' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1630 - ipathmatch (via ls-files): match 'foo/*' 'foo/bar'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 66 - sparse index is not expanded: update-index
+expecting success of 3070.1631 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1631 - cleanup after previous file test
 
-expecting success of 1092.67 'sparse index is not expanded: blame': 
-	init_repos &&
+expecting success of 3070.1632 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1632 - setup match file test for foo/bba/arr
 
-	for file in a \
-			deep/a \
-			deep/deeper1/a \
-			deep/deeper1/deepest/a
-	do
-		ensure_not_expanded blame $file || return 1
-	done
+expecting success of 3070.1633 'wildmatch: no match 'foo/bba/arr' 'foo/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*'
+		
+ok 1633 - wildmatch: no match 'foo/bba/arr' 'foo/*'
 
-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: blame
+expecting success of 3070.1634 'wildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1634 - wildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'
 
-expecting success of 1092.68 'sparse index is not expanded: fetch/pull': 
-	init_repos &&
+expecting success of 3070.1635 'iwildmatch: no match 'foo/bba/arr' 'foo/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*'
+		
+ok 1635 - iwildmatch: no match 'foo/bba/arr' 'foo/*'
 
-	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
+expecting success of 3070.1636 'iwildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1636 - iwildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'
 
-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 68 - sparse index is not expanded: fetch/pull
+expecting success of 3070.1637 'pathmatch: match 'foo/bba/arr' 'foo/*'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*'
+		
+ok 1637 - pathmatch: match 'foo/bba/arr' 'foo/*'
 
-expecting success of 1092.69 'sparse index is not expanded: read-tree': 
-	init_repos &&
+expecting success of 3070.1638 'pathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1638 - pathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'
 
-	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 &&
+expecting success of 3070.1639 'ipathmatch: match 'foo/bba/arr' 'foo/*'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*'
+		
+ok 1639 - ipathmatch: match 'foo/bba/arr' 'foo/*'
 
-	rm -rf sparse-index/deep/deeper2 &&
-	ensure_not_expanded add . &&
-	ensure_not_expanded commit -m "test" &&
+expecting success of 3070.1640 'ipathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1640 - ipathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'
 
-	ensure_not_expanded read-tree --prefix=deep/deeper2 -u deepest
+expecting success of 3070.1641 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1641 - cleanup after previous file test
 
-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: read-tree
+expecting success of 3070.1642 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1642 - setup match file test for foo/bba/arr
 
-expecting success of 1092.70 'ls-files': 
-	init_repos &&
+expecting success of 3070.1643 'wildmatch: match 'foo/bba/arr' 'foo/**'': 
+			test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**'
+		
+ok 1643 - wildmatch: match 'foo/bba/arr' 'foo/**'
 
-	# Use a smaller sparse-checkout for reduced output
-	test_sparse_match git sparse-checkout set &&
+expecting success of 3070.1644 'wildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1644 - wildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
 
-	# Behavior agrees by default. Sparse index is expanded.
-	test_all_match git ls-files &&
+expecting success of 3070.1645 'iwildmatch: match 'foo/bba/arr' 'foo/**'': 
+			test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**'
+		
+ok 1645 - iwildmatch: match 'foo/bba/arr' 'foo/**'
 
-	# With --sparse, the sparse index data changes behavior.
-	git -C sparse-index ls-files --sparse >actual &&
+expecting success of 3070.1646 'iwildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1646 - iwildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
 
-	cat >expect <<-\EOF &&
-	a
-	before/
-	deep/
-	e
-	folder1-
-	folder1.x
-	folder1/
-	folder10
-	folder2/
-	g
-	x/
-	z
-	EOF
+expecting success of 3070.1647 'pathmatch: match 'foo/bba/arr' 'foo/**'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**'
+		
+ok 1647 - pathmatch: match 'foo/bba/arr' 'foo/**'
 
-	test_cmp expect actual &&
+expecting success of 3070.1648 'pathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1648 - pathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
 
-	# 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 &&
+expecting success of 3070.1649 'ipathmatch: match 'foo/bba/arr' 'foo/**'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**'
+		
+ok 1649 - ipathmatch: match 'foo/bba/arr' 'foo/**'
 
-	# 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 &&
+expecting success of 3070.1650 'ipathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1650 - ipathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
 
-	test_all_match git ls-files --modified &&
+expecting success of 3070.1651 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1651 - cleanup after previous file test
 
-	git -C sparse-index ls-files --sparse --modified >sparse-index-out &&
-	cat >expect <<-\EOF &&
-	folder1/a
-	EOF
-	test_cmp expect sparse-index-out &&
+expecting success of 3070.1652 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1652 - setup match file test for foo/bba/arr
 
-	# 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 &&
+expecting success of 3070.1653 'wildmatch: no match 'foo/bba/arr' 'foo*'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo*'
+		
+ok 1653 - wildmatch: no match 'foo/bba/arr' 'foo*'
 
-	test_all_match git ls-files &&
-	git -C sparse-index ls-files --sparse >actual &&
+expecting success of 3070.1654 'wildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1654 - wildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'
 
-	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
+expecting success of 3070.1655 'iwildmatch: no match 'foo/bba/arr' 'foo*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo*'
+		
+ok 1655 - iwildmatch: no match 'foo/bba/arr' 'foo*'
 
-	test_cmp expect actual &&
+expecting success of 3070.1656 'iwildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1656 - iwildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'
 
-	# Double-check index expansion is avoided
-	ensure_not_expanded ls-files --sparse
+expecting success of 3070.1657 'pathmatch: match 'foo/bba/arr' 'foo*'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo*'
+		
+ok 1657 - pathmatch: match 'foo/bba/arr' 'foo*'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 70 - ls-files
+expecting success of 3070.1658 'pathmatch (via ls-files): match 'foo*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1658 - pathmatch (via ls-files): match 'foo*' 'foo/bba/arr'
 
-expecting success of 1092.71 'sparse index is not expanded: sparse-checkout': 
-	init_repos &&
+expecting success of 3070.1659 'ipathmatch: match 'foo/bba/arr' 'foo*'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo*'
+		
+ok 1659 - ipathmatch: match 'foo/bba/arr' 'foo*'
 
-	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 &&
+expecting success of 3070.1660 'ipathmatch (via ls-files): match 'foo*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1660 - ipathmatch (via ls-files): match 'foo*' 'foo/bba/arr'
 
-	# 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 &&
+expecting success of 3070.1661 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1661 - cleanup after previous file test
 
-	ensure_not_expanded sparse-checkout add folder1 &&
+expecting success of 3070.1662 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1662 - setup match file test for foo/bba/arr
 
-	# 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
+expecting success of 3070.1663 'wildmatch: no match 'foo/bba/arr' 'foo**'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo**'
+		
+ok 1663 - wildmatch: no match 'foo/bba/arr' 'foo**'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 71 - sparse index is not expanded: sparse-checkout
+expecting success of 3070.1664 'wildmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1664 - wildmatch (via ls-files): match 'foo**' 'foo/bba/arr'
 
-expecting success of 1092.72 'reset mixed and checkout orphan': 
-	init_repos &&
+expecting success of 3070.1665 'iwildmatch: no match 'foo/bba/arr' 'foo**'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo**'
+		
+ok 1665 - iwildmatch: no match 'foo/bba/arr' 'foo**'
 
-	test_all_match git checkout rename-out-to-in &&
+expecting success of 3070.1666 'iwildmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1666 - iwildmatch (via ls-files): match 'foo**' 'foo/bba/arr'
 
-	# 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 &&
+expecting success of 3070.1667 'pathmatch: match 'foo/bba/arr' 'foo**'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo**'
+		
+ok 1667 - pathmatch: match 'foo/bba/arr' 'foo**'
 
-	# 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
+expecting success of 3070.1668 'pathmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1668 - pathmatch (via ls-files): match 'foo**' 'foo/bba/arr'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 72 - reset mixed and checkout orphan
+expecting success of 3070.1669 'ipathmatch: match 'foo/bba/arr' 'foo**'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo**'
+		
+ok 1669 - ipathmatch: match 'foo/bba/arr' 'foo**'
 
-expecting success of 1092.73 'add everything with deep new file': 
-	init_repos &&
+expecting success of 3070.1670 'ipathmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1670 - ipathmatch (via ls-files): match 'foo**' 'foo/bba/arr'
 
-	run_on_sparse git sparse-checkout set deep/deeper1/deepest &&
+expecting success of 3070.1671 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1671 - cleanup after previous file test
 
-	run_on_all touch deep/deeper1/x &&
-	test_all_match git add . &&
-	test_all_match git status --porcelain=v2
+expecting success of 3070.1672 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1672 - setup match file test for foo/bba/arr
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 73 - add everything with deep new file
+expecting success of 3070.1673 'wildmatch: no match 'foo/bba/arr' 'foo/*arr'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*arr'
+		
+ok 1673 - wildmatch: no match 'foo/bba/arr' 'foo/*arr'
 
-expecting success of 1092.74 'checkout behaves oddly with df-conflict-1': 
-	init_repos &&
+expecting success of 3070.1674 'wildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1674 - wildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'
 
-	test_sparse_match git sparse-checkout disable &&
+expecting success of 3070.1675 'iwildmatch: no match 'foo/bba/arr' 'foo/*arr'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*arr'
+		
+ok 1675 - iwildmatch: no match 'foo/bba/arr' 'foo/*arr'
 
-	write_script edit-content <<-\EOF &&
-	echo content >>folder1/larger-content
-	git add folder1
-	EOF
+expecting success of 3070.1676 'iwildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1676 - iwildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'
 
-	run_on_all ../edit-content &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1677 'pathmatch: match 'foo/bba/arr' 'foo/*arr'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*arr'
+		
+ok 1677 - pathmatch: match 'foo/bba/arr' 'foo/*arr'
 
-	git -C sparse-checkout sparse-checkout init --cone &&
-	git -C sparse-index sparse-checkout init --cone --sparse-index &&
+expecting success of 3070.1678 'pathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1678 - pathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'
 
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1679 'ipathmatch: match 'foo/bba/arr' 'foo/*arr'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*arr'
+		
+ok 1679 - ipathmatch: match 'foo/bba/arr' 'foo/*arr'
 
-	# 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 &&
+expecting success of 3070.1680 'ipathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1680 - ipathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'
 
-	# 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 &&
+expecting success of 3070.1681 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1681 - cleanup after previous file test
 
-	# The sparse-index reports no output
-	test_must_be_empty sparse-index-out &&
+expecting success of 3070.1682 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1682 - setup match file test for foo/bba/arr
 
-	# stderr: Switched to branch df-conflict-1
-	test_cmp full-checkout-err sparse-checkout-err &&
-	test_cmp full-checkout-err sparse-checkout-err
+expecting success of 3070.1683 'wildmatch: no match 'foo/bba/arr' 'foo/**arr'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**arr'
+		
+ok 1683 - wildmatch: no match 'foo/bba/arr' 'foo/**arr'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 74 - checkout behaves oddly with df-conflict-1
+expecting success of 3070.1684 'wildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1684 - wildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'
 
-expecting success of 1092.75 'checkout behaves oddly with df-conflict-2': 
-	init_repos &&
+expecting success of 3070.1685 'iwildmatch: no match 'foo/bba/arr' 'foo/**arr'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**arr'
+		
+ok 1685 - iwildmatch: no match 'foo/bba/arr' 'foo/**arr'
 
-	test_sparse_match git sparse-checkout disable &&
+expecting success of 3070.1686 'iwildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1686 - iwildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'
 
-	write_script edit-content <<-\EOF &&
-	echo content >>folder2/larger-content
-	git add folder2
-	EOF
+expecting success of 3070.1687 'pathmatch: match 'foo/bba/arr' 'foo/**arr'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**arr'
+		
+ok 1687 - pathmatch: match 'foo/bba/arr' 'foo/**arr'
 
-	run_on_all ../edit-content &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1688 'pathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1688 - pathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'
 
-	git -C sparse-checkout sparse-checkout init --cone &&
-	git -C sparse-index sparse-checkout init --cone --sparse-index &&
+expecting success of 3070.1689 'ipathmatch: match 'foo/bba/arr' 'foo/**arr'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**arr'
+		
+ok 1689 - ipathmatch: match 'foo/bba/arr' 'foo/**arr'
 
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1690 'ipathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1690 - ipathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'
 
-	# 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 &&
+expecting success of 3070.1691 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1691 - cleanup after previous file test
 
-	# 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 &&
+expecting success of 3070.1692 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1692 - setup match file test for foo/bba/arr
 
-	# 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 &&
+expecting success of 3070.1693 'wildmatch: no match 'foo/bba/arr' 'foo/*z'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*z'
+		
+ok 1693 - wildmatch: no match 'foo/bba/arr' 'foo/*z'
 
-	# Switched to branch df-conflict-1
-	test_cmp full-checkout-err sparse-checkout-err &&
-	test_cmp full-checkout-err sparse-index-err
+expecting success of 3070.1694 'wildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1694 - wildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 75 - checkout behaves oddly with df-conflict-2
+expecting success of 3070.1695 'iwildmatch: no match 'foo/bba/arr' 'foo/*z'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*z'
+		
+ok 1695 - iwildmatch: no match 'foo/bba/arr' 'foo/*z'
 
-expecting success of 1092.76 'mv directory from out-of-cone to in-cone': 
-	init_repos &&
+expecting success of 3070.1696 'iwildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1696 - iwildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
 
-	# <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 &&
+expecting success of 3070.1697 'pathmatch: no match 'foo/bba/arr' 'foo/*z'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*z'
+		
+ok 1697 - pathmatch: no match 'foo/bba/arr' 'foo/*z'
 
-	test_all_match git reset --hard &&
+expecting success of 3070.1698 'pathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
+				>expect &&
+				git ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1698 - pathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
 
-	# <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
+expecting success of 3070.1699 'ipathmatch: no match 'foo/bba/arr' 'foo/*z'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*z'
+		
+ok 1699 - ipathmatch: no match 'foo/bba/arr' 'foo/*z'
 
-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 76 - mv directory from out-of-cone to in-cone
+expecting success of 3070.1700 'ipathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1700 - ipathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
 
-expecting success of 1092.77 'rm pathspec inside sparse definition': 
-	init_repos &&
+expecting success of 3070.1701 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1701 - cleanup after previous file test
 
-	test_all_match git rm deep/a &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1702 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1702 - setup match file test for foo/bba/arr
 
-	# test wildcard
-	run_on_all git reset --hard &&
-	test_all_match git rm deep/* &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3070.1703 'wildmatch: no match 'foo/bba/arr' 'foo/**z'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**z'
+		
+ok 1703 - wildmatch: no match 'foo/bba/arr' 'foo/**z'
 
-	# test recursive rm
-	run_on_all git reset --hard &&
-	test_all_match git rm -r deep &&
-	test_all_match git status --porcelain=v2
+expecting success of 3070.1704 'wildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1704 - wildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 77 - rm pathspec inside sparse definition
+expecting success of 3070.1705 'iwildmatch: no match 'foo/bba/arr' 'foo/**z'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**z'
+		
+ok 1705 - iwildmatch: no match 'foo/bba/arr' 'foo/**z'
 
-expecting success of 1092.78 'rm pathspec outside sparse definition': 
-	init_repos &&
+expecting success of 3070.1706 'iwildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1706 - iwildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
 
-	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 &&
+expecting success of 3070.1707 'pathmatch: no match 'foo/bba/arr' 'foo/**z'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**z'
+		
+ok 1707 - pathmatch: no match 'foo/bba/arr' 'foo/**z'
 
-	cat >folder1-full <<-EOF &&
-	rm ${SQ}folder1/0/0/0${SQ}
-	rm ${SQ}folder1/0/1${SQ}
-	rm ${SQ}folder1/a${SQ}
-	EOF
+expecting success of 3070.1708 'pathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
+				>expect &&
+				git ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1708 - pathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
 
-	cat >folder1-sparse <<-EOF &&
-	rm ${SQ}folder1/${SQ}
-	EOF
+expecting success of 3070.1709 'ipathmatch: no match 'foo/bba/arr' 'foo/**z'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**z'
+		
+ok 1709 - ipathmatch: no match 'foo/bba/arr' 'foo/**z'
 
-	# 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 &&
+expecting success of 3070.1710 'ipathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1710 - ipathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
 
-	# 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
+expecting success of 3070.1711 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1711 - cleanup after previous file test
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 78 - rm pathspec outside sparse definition
+expecting success of 3070.1712 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1712 - setup match file test for foo/bar
 
-expecting success of 1092.79 'rm pathspec expands index when necessary': 
-	init_repos &&
+expecting success of 3070.1713 'wildmatch: no match 'foo/bar' 'foo?bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo?bar'
+		
+ok 1713 - wildmatch: no match 'foo/bar' 'foo?bar'
 
-	# in-cone pathspec (do not expand)
-	ensure_not_expanded rm "deep/deep*" &&
-	test_must_be_empty sparse-index-err &&
+expecting success of 3070.1714 'wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1714 - wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
 
-	# out-of-cone pathspec (expand)
-	! ensure_not_expanded rm --sparse "folder1/a*" &&
-	test_must_be_empty sparse-index-err &&
+expecting success of 3070.1715 'iwildmatch: no match 'foo/bar' 'foo?bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo?bar'
+		
+ok 1715 - iwildmatch: no match 'foo/bar' 'foo?bar'
 
-	# pathspec that should expand index
-	! ensure_not_expanded rm "*/a" &&
-	test_must_be_empty sparse-index-err &&
+expecting success of 3070.1716 'iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1716 - iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
 
-	! ensure_not_expanded rm "**a" &&
-	test_must_be_empty sparse-index-err
+expecting success of 3070.1717 'pathmatch: match 'foo/bar' 'foo?bar'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo?bar'
+		
+ok 1717 - pathmatch: match 'foo/bar' 'foo?bar'
 
-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":"20250827T082049.443906Z-Hcf858c9d-P0007d055","thread":"main","time":"2025-08-27T08:20:49.445611Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082049.443906Z-Hcf858c9d-P0007d055","thread":"main","time":"2025-08-27T08:20:49.453592Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082049.463154Z-Hcf858c9d-P0007d099","thread":"main","time":"2025-08-27T08:20:49.464028Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082049.463154Z-Hcf858c9d-P0007d099","thread":"main","time":"2025-08-27T08:20:49.472562Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082049.491998Z-Hcf858c9d-P0007d0e4","thread":"main","time":"2025-08-27T08:20:49.492923Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082049.491998Z-Hcf858c9d-P0007d0e4","thread":"main","time":"2025-08-27T08:20:49.494226Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 79 - rm pathspec expands index when necessary
+expecting success of 3070.1718 'pathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1718 - pathmatch (via ls-files): match 'foo?bar' 'foo/bar'
 
-expecting success of 1092.80 'sparse index is not expanded: rm': 
-	init_repos &&
+expecting success of 3070.1719 'ipathmatch: match 'foo/bar' 'foo?bar'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo?bar'
+		
+ok 1719 - ipathmatch: match 'foo/bar' 'foo?bar'
 
-	ensure_not_expanded rm deep/a &&
+expecting success of 3070.1720 'ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1720 - ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'
 
-	# test in-cone wildcard
-	git -C sparse-index reset --hard &&
-	ensure_not_expanded rm deep/* &&
+expecting success of 3070.1721 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1721 - cleanup after previous file test
 
-	# test recursive rm
-	git -C sparse-index reset --hard &&
-	ensure_not_expanded rm -r deep
+expecting success of 3070.1722 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1722 - setup match file test for foo/bar
 
-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 80 - sparse index is not expanded: rm
+expecting success of 3070.1723 'wildmatch: no match 'foo/bar' 'foo[/]bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[/]bar'
+		
+ok 1723 - wildmatch: no match 'foo/bar' 'foo[/]bar'
 
-expecting success of 1092.81 'grep with and --cached': 
-	init_repos &&
+expecting success of 3070.1724 'wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1724 - wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
 
-	test_all_match git grep --cached a &&
-	test_all_match git grep --cached a -- "folder1/*"
+expecting success of 3070.1725 'iwildmatch: no match 'foo/bar' 'foo[/]bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[/]bar'
+		
+ok 1725 - iwildmatch: no match 'foo/bar' 'foo[/]bar'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 81 - grep with and --cached
+expecting success of 3070.1726 'iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1726 - iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
 
-expecting success of 1092.82 'grep is not expanded': 
-	init_repos &&
+expecting success of 3070.1727 'pathmatch: match 'foo/bar' 'foo[/]bar'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo[/]bar'
+		
+ok 1727 - pathmatch: match 'foo/bar' 'foo[/]bar'
 
-	ensure_not_expanded grep a &&
-	ensure_not_expanded grep a -- deep/* &&
+expecting success of 3070.1728 'pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1728 - pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
 
-	# All files within the folder1/* pathspec are sparse,
-	# so this command does not find any matches
-	ensure_not_expanded ! grep a -- folder1/* &&
+expecting success of 3070.1729 'ipathmatch: match 'foo/bar' 'foo[/]bar'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo[/]bar'
+		
+ok 1729 - ipathmatch: match 'foo/bar' 'foo[/]bar'
 
-	# test out-of-cone pathspec with or without wildcard
-	ensure_not_expanded grep --cached a -- "folder1/a" &&
-	ensure_not_expanded grep --cached a -- "folder1/*" &&
+expecting success of 3070.1730 'ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1730 - ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
 
-	# test in-cone pathspec with or without wildcard
-	ensure_not_expanded grep --cached a -- "deep/a" &&
-	ensure_not_expanded grep --cached a -- "deep/*"
+expecting success of 3070.1731 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1731 - cleanup after previous file test
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 82 - grep is not expanded
+expecting success of 3070.1732 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1732 - setup match file test for foo/bar
 
-checking known breakage of 1092.83 'grep within submodules is not expanded': 
-	init_repos_as_submodules &&
+expecting success of 3070.1733 'wildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 1733 - wildmatch: no match 'foo/bar' 'foo[^a-z]bar'
 
-	# 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
+expecting success of 3070.1734 'wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1734 - wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
 
-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":"20250827T082050.935675Z-Hcf858c9d-P0007e160","thread":"main","time":"2025-08-27T08:20:50.942966Z","file":"sparse-index.c","line":372,"repo":4,"nesting":2,"category":"index","label":"ensure_full_index"}
-not ok 83 - grep within submodules is not expanded # TODO known breakage
+expecting success of 3070.1735 'iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 1735 - iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'
 
-expecting success of 1092.84 'grep sparse directory within submodules': 
-	init_repos_as_submodules &&
+expecting success of 3070.1736 'iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1736 - iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
 
-	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
+expecting success of 3070.1737 'pathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 1737 - pathmatch: match 'foo/bar' 'foo[^a-z]bar'
 
-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 84 - grep sparse directory within submodules
+expecting success of 3070.1738 'pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1738 - pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
 
-expecting success of 1092.85 'write-tree': 
-	init_repos &&
+expecting success of 3070.1739 'ipathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 1739 - ipathmatch: match 'foo/bar' 'foo[^a-z]bar'
 
-	test_all_match git write-tree &&
+expecting success of 3070.1740 'ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1740 - ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
+expecting success of 3070.1741 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1741 - cleanup after previous file test
 
-	# 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 &&
+expecting success of 3070.1742 'setup match file test for ab/cXd/efXg/hi': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1742 - setup match file test for ab/cXd/efXg/hi
 
-	# 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 &&
+expecting success of 3070.1743 'wildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'': 
+			test_must_fail test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*Xg*i'
+		
+ok 1743 - wildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'
 
-	# check that SKIP_WORKTREE files are not materialized
-	test_path_is_missing sparse-checkout/folder2/a &&
-	test_path_is_missing sparse-index/folder2/a
+expecting success of 3070.1744 'wildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1744 - wildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 85 - write-tree
+expecting success of 3070.1745 'iwildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'': 
+			test_must_fail test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*Xg*i'
+		
+ok 1745 - iwildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'
 
-expecting success of 1092.86 'sparse-index is not expanded: write-tree': 
-	init_repos &&
+expecting success of 3070.1746 'iwildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1746 - iwildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'
 
-	ensure_not_expanded write-tree &&
+expecting success of 3070.1747 'pathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'': 
+			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*Xg*i'
+		
+ok 1747 - pathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'
 
-	echo "test1" >>sparse-index/a &&
-	git -C sparse-index update-index a &&
-	ensure_not_expanded write-tree
+expecting success of 3070.1748 'pathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1748 - pathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 86 - sparse-index is not expanded: write-tree
+expecting success of 3070.1749 'ipathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'': 
+			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*Xg*i'
+		
+ok 1749 - ipathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'
 
-expecting success of 1092.87 'diff-files with pathspec inside sparse definition': 
-	init_repos &&
+expecting success of 3070.1750 'ipathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --icase-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1750 - ipathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
+expecting success of 3070.1751 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ab/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1751 - cleanup after previous file test
 
-	run_on_all ../edit-contents deep/a &&
+expecting success of 3070.1752 'setup match file test for a': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1752 - setup match file test for a
 
-	test_all_match git diff-files &&
+expecting success of 3070.1753 'wildmatch: no match 'a' '[A-Z]'': 
+			test_must_fail test-tool wildmatch wildmatch 'a' '[A-Z]'
+		
+ok 1753 - wildmatch: no match 'a' '[A-Z]'
 
-	test_all_match git diff-files -- deep/a &&
+expecting success of 3070.1754 'wildmatch (via ls-files): no match '[A-Z]' 'a'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1754 - wildmatch (via ls-files): no match '[A-Z]' 'a'
 
-	# test wildcard
-	test_all_match git diff-files -- "deep/*"
+expecting success of 3070.1755 'iwildmatch: match 'a' '[A-Z]'': 
+			test-tool wildmatch iwildmatch 'a' '[A-Z]'
+		
+ok 1755 - iwildmatch: match 'a' '[A-Z]'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 87 - diff-files with pathspec inside sparse definition
+expecting success of 3070.1756 'iwildmatch (via ls-files): match '[A-Z]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1756 - iwildmatch (via ls-files): match '[A-Z]' 'a'
 
-expecting success of 1092.88 'diff-files with pathspec outside sparse definition': 
-	init_repos &&
+expecting success of 3070.1757 'pathmatch: no match 'a' '[A-Z]'': 
+			test_must_fail test-tool wildmatch pathmatch 'a' '[A-Z]'
+		
+ok 1757 - pathmatch: no match 'a' '[A-Z]'
 
-	test_sparse_match git diff-files -- folder2/a &&
+expecting success of 3070.1758 'pathmatch (via ls-files): no match '[A-Z]' 'a'': 
+				>expect &&
+				git ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1758 - pathmatch (via ls-files): no match '[A-Z]' 'a'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
+expecting success of 3070.1759 'ipathmatch: match 'a' '[A-Z]'': 
+			test-tool wildmatch ipathmatch 'a' '[A-Z]'
+		
+ok 1759 - ipathmatch: match 'a' '[A-Z]'
 
-	# 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 &&
+expecting success of 3070.1760 'ipathmatch (via ls-files): match '[A-Z]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1760 - ipathmatch (via ls-files): match '[A-Z]' '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"
+expecting success of 3070.1761 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1761 - cleanup after previous file test
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 88 - diff-files with pathspec outside sparse definition
+expecting success of 3070.1762 'setup match file test for A': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1762 - setup match file test for A
 
-expecting success of 1092.89 'sparse index is not expanded: diff-files': 
-	init_repos &&
+expecting success of 3070.1763 'wildmatch: match 'A' '[A-Z]'': 
+			test-tool wildmatch wildmatch 'A' '[A-Z]'
+		
+ok 1763 - wildmatch: match 'A' '[A-Z]'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
+expecting success of 3070.1764 'wildmatch (via ls-files): match '[A-Z]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1764 - wildmatch (via ls-files): match '[A-Z]' 'A'
 
-	run_on_all ../edit-contents deep/a &&
+expecting success of 3070.1765 'iwildmatch: match 'A' '[A-Z]'': 
+			test-tool wildmatch iwildmatch 'A' '[A-Z]'
+		
+ok 1765 - iwildmatch: match 'A' '[A-Z]'
 
-	ensure_not_expanded diff-files &&
-	ensure_not_expanded diff-files -- deep/a &&
-	ensure_not_expanded diff-files -- "deep/*"
+expecting success of 3070.1766 'iwildmatch (via ls-files): match '[A-Z]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1766 - iwildmatch (via ls-files): match '[A-Z]' '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-files
+expecting success of 3070.1767 'pathmatch: match 'A' '[A-Z]'': 
+			test-tool wildmatch pathmatch 'A' '[A-Z]'
+		
+ok 1767 - pathmatch: match 'A' '[A-Z]'
 
-expecting success of 1092.90 'diff-tree': 
-	init_repos &&
+expecting success of 3070.1768 'pathmatch (via ls-files): match '[A-Z]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1768 - pathmatch (via ls-files): match '[A-Z]' 'A'
 
-	# 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 &&
+expecting success of 3070.1769 'ipathmatch: match 'A' '[A-Z]'': 
+			test-tool wildmatch ipathmatch 'A' '[A-Z]'
+		
+ok 1769 - ipathmatch: match 'A' '[A-Z]'
 
-	# 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 &&
+expecting success of 3070.1770 'ipathmatch (via ls-files): match '[A-Z]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1770 - ipathmatch (via ls-files): match '[A-Z]' '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
+expecting success of 3070.1771 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1771 - cleanup after previous file test
+
+expecting success of 3070.1772 'setup match file test for A': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1772 - setup match file test for A
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 90 - diff-tree
+expecting success of 3070.1773 'wildmatch: no match 'A' '[a-z]'': 
+			test_must_fail test-tool wildmatch wildmatch 'A' '[a-z]'
+		
+ok 1773 - wildmatch: no match 'A' '[a-z]'
 
-expecting success of 1092.91 'sparse-index is not expanded: diff-tree': 
-	init_repos &&
+expecting success of 3070.1774 'wildmatch (via ls-files): no match '[a-z]' 'A'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1774 - wildmatch (via ls-files): no match '[a-z]' 'A'
 
-	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}) &&
+expecting success of 3070.1775 'iwildmatch: match 'A' '[a-z]'': 
+			test-tool wildmatch iwildmatch 'A' '[a-z]'
+		
+ok 1775 - iwildmatch: match 'A' '[a-z]'
 
-	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
+expecting success of 3070.1776 'iwildmatch (via ls-files): match '[a-z]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1776 - iwildmatch (via ls-files): match '[a-z]' 'A'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 91 - sparse-index is not expanded: diff-tree
+expecting success of 3070.1777 'pathmatch: no match 'A' '[a-z]'': 
+			test_must_fail test-tool wildmatch pathmatch 'A' '[a-z]'
+		
+ok 1777 - pathmatch: no match 'A' '[a-z]'
 
-expecting success of 1092.92 'worktree': 
-	init_repos &&
+expecting success of 3070.1778 'pathmatch (via ls-files): no match '[a-z]' 'A'': 
+				>expect &&
+				git ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1778 - pathmatch (via ls-files): no match '[a-z]' 'A'
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
+expecting success of 3070.1779 'ipathmatch: match 'A' '[a-z]'': 
+			test-tool wildmatch ipathmatch 'A' '[a-z]'
+		
+ok 1779 - ipathmatch: match 'A' '[a-z]'
 
-	for repo in full-checkout sparse-checkout sparse-index
-	do
-		worktree=${repo}-wt &&
-		git -C $repo worktree add ../$worktree &&
+expecting success of 3070.1780 'ipathmatch (via ls-files): match '[a-z]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1780 - ipathmatch (via ls-files): match '[a-z]' 'A'
 
-		# Compare worktree content with "ls"
-		(cd $repo && ls) >worktree_contents &&
-		(cd $worktree && ls) >new_worktree_contents &&
-		test_cmp worktree_contents new_worktree_contents &&
+expecting success of 3070.1781 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1781 - cleanup after previous file test
 
-		# 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 &&
+expecting success of 3070.1782 'setup match file test for a': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1782 - setup match file test for a
 
-		git -C $repo worktree remove ../$worktree || return 1
-	done &&
+expecting success of 3070.1783 'wildmatch: match 'a' '[a-z]'': 
+			test-tool wildmatch wildmatch 'a' '[a-z]'
+		
+ok 1783 - wildmatch: match 'a' '[a-z]'
 
-	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
+expecting success of 3070.1784 'wildmatch (via ls-files): match '[a-z]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1784 - wildmatch (via ls-files): match '[a-z]' 'a'
 
-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 92 - worktree
+expecting success of 3070.1785 'iwildmatch: match 'a' '[a-z]'': 
+			test-tool wildmatch iwildmatch 'a' '[a-z]'
+		
+ok 1785 - iwildmatch: match 'a' '[a-z]'
 
-expecting success of 1092.93 'worktree is not expanded': 
-	init_repos &&
+expecting success of 3070.1786 'iwildmatch (via ls-files): match '[a-z]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1786 - iwildmatch (via ls-files): match '[a-z]' 'a'
 
-	ensure_not_expanded worktree add .worktrees/hotfix &&
-	ensure_not_expanded worktree remove .worktrees/hotfix
+expecting success of 3070.1787 'pathmatch: match 'a' '[a-z]'': 
+			test-tool wildmatch pathmatch 'a' '[a-z]'
+		
+ok 1787 - pathmatch: match 'a' '[a-z]'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 93 - worktree is not expanded
+expecting success of 3070.1788 'pathmatch (via ls-files): match '[a-z]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1788 - pathmatch (via ls-files): match '[a-z]' 'a'
 
-expecting success of 1092.94 'check-attr with pathspec inside sparse definition': 
-	init_repos &&
+expecting success of 3070.1789 'ipathmatch: match 'a' '[a-z]'': 
+			test-tool wildmatch ipathmatch 'a' '[a-z]'
+		
+ok 1789 - ipathmatch: match 'a' '[a-z]'
 
-	echo "a -crlf myAttr" >>.gitattributes &&
-	run_on_all cp ../.gitattributes ./deep &&
+expecting success of 3070.1790 'ipathmatch (via ls-files): match '[a-z]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1790 - ipathmatch (via ls-files): match '[a-z]' 'a'
 
-	test_all_match git check-attr -a -- deep/a &&
+expecting success of 3070.1791 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1791 - cleanup after previous file test
 
-	test_all_match git add deep/.gitattributes &&
-	test_all_match git check-attr -a --cached -- deep/a
+expecting success of 3070.1792 'setup match file test for a': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1792 - setup match file test for a
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 94 - check-attr with pathspec inside sparse definition
+expecting success of 3070.1793 'wildmatch: no match 'a' '[[:upper:]]'': 
+			test_must_fail test-tool wildmatch wildmatch 'a' '[[:upper:]]'
+		
+ok 1793 - wildmatch: no match 'a' '[[:upper:]]'
 
-expecting success of 1092.95 'check-attr with pathspec outside sparse definition': 
-	init_repos &&
+expecting success of 3070.1794 'wildmatch (via ls-files): no match '[[:upper:]]' 'a'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1794 - wildmatch (via ls-files): no match '[[:upper:]]' 'a'
 
-	echo "a -crlf myAttr" >>.gitattributes &&
-	run_on_sparse mkdir folder1 &&
-	run_on_all cp ../.gitattributes ./folder1 &&
-	run_on_all cp a folder1/a &&
+expecting success of 3070.1795 'iwildmatch: match 'a' '[[:upper:]]'': 
+			test-tool wildmatch iwildmatch 'a' '[[:upper:]]'
+		
+ok 1795 - iwildmatch: match 'a' '[[:upper:]]'
 
-	test_all_match git check-attr -a -- folder1/a &&
+expecting success of 3070.1796 'iwildmatch (via ls-files): match '[[:upper:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1796 - iwildmatch (via ls-files): match '[[:upper:]]' '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
+expecting success of 3070.1797 'pathmatch: no match 'a' '[[:upper:]]'': 
+			test_must_fail test-tool wildmatch pathmatch 'a' '[[:upper:]]'
+		
+ok 1797 - pathmatch: no match 'a' '[[:upper:]]'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 95 - check-attr with pathspec outside sparse definition
+expecting success of 3070.1798 'pathmatch (via ls-files): no match '[[:upper:]]' 'a'': 
+				>expect &&
+				git ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1798 - pathmatch (via ls-files): no match '[[:upper:]]' 'a'
 
-checking known breakage of 1092.96 'diff --check with pathspec outside sparse definition': 
-	init_repos &&
+expecting success of 3070.1799 'ipathmatch: match 'a' '[[:upper:]]'': 
+			test-tool wildmatch ipathmatch 'a' '[[:upper:]]'
+		
+ok 1799 - ipathmatch: match 'a' '[[:upper:]]'
 
-	write_script edit-contents <<-\EOF &&
-	echo "a " >"$1"
-	EOF
+expecting success of 3070.1800 'ipathmatch (via ls-files): match '[[:upper:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1800 - ipathmatch (via ls-files): match '[[:upper:]]' 'a'
 
-	test_all_match git config core.whitespace -trailing-space,-space-before-tab &&
+expecting success of 3070.1801 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1801 - cleanup after previous file test
 
-	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 &&
+expecting success of 3070.1802 'setup match file test for A': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1802 - setup match file test for A
 
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match test_must_fail git diff --check --cached -- folder1/a
+expecting success of 3070.1803 'wildmatch: match 'A' '[[:upper:]]'': 
+			test-tool wildmatch wildmatch 'A' '[[:upper:]]'
+		
+ok 1803 - wildmatch: match 'A' '[[:upper:]]'
 
-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 96 - diff --check with pathspec outside sparse definition # TODO known breakage
+expecting success of 3070.1804 'wildmatch (via ls-files): match '[[:upper:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1804 - wildmatch (via ls-files): match '[[:upper:]]' 'A'
 
-expecting success of 1092.97 'sparse-index is not expanded: check-attr': 
-	init_repos &&
+expecting success of 3070.1805 'iwildmatch: match 'A' '[[:upper:]]'': 
+			test-tool wildmatch iwildmatch 'A' '[[:upper:]]'
+		
+ok 1805 - iwildmatch: match 'A' '[[:upper:]]'
 
-	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 &&
+expecting success of 3070.1806 'iwildmatch (via ls-files): match '[[:upper:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1806 - iwildmatch (via ls-files): match '[[:upper:]]' 'A'
 
-	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
+expecting success of 3070.1807 'pathmatch: match 'A' '[[:upper:]]'': 
+			test-tool wildmatch pathmatch 'A' '[[:upper:]]'
+		
+ok 1807 - pathmatch: match 'A' '[[:upper:]]'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 97 - sparse-index is not expanded: check-attr
+expecting success of 3070.1808 'pathmatch (via ls-files): match '[[:upper:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1808 - pathmatch (via ls-files): match '[[:upper:]]' 'A'
 
-expecting success of 1092.98 'sparse-index is not expanded: git apply': 
-	init_repos &&
+expecting success of 3070.1809 'ipathmatch: match 'A' '[[:upper:]]'': 
+			test-tool wildmatch ipathmatch 'A' '[[:upper:]]'
+		
+ok 1809 - ipathmatch: match 'A' '[[:upper:]]'
 
-	git -C sparse-index checkout base &&
-	git -C full-checkout diff base..merge-right -- deep >patch-in-sparse &&
-	git -C full-checkout diff base..merge-right -- folder2 >patch-outside &&
+expecting success of 3070.1810 'ipathmatch (via ls-files): match '[[:upper:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1810 - ipathmatch (via ls-files): match '[[:upper:]]' 'A'
 
-	# Apply a patch to a file inside the sparse definition
-	ensure_not_expanded apply --index --stat ../patch-in-sparse &&
+expecting success of 3070.1811 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1811 - cleanup after previous file test
 
-	# Apply a patch to a file outside the sparse definition
-	# Fails when caring about the worktree.
-	ensure_not_expanded ! apply ../patch-outside &&
+expecting success of 3070.1812 'setup match file test for A': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1812 - setup match file test for A
 
-	# Expands when using --index.
-	ensure_expanded apply --index ../patch-outside &&
+expecting success of 3070.1813 'wildmatch: no match 'A' '[[:lower:]]'': 
+			test_must_fail test-tool wildmatch wildmatch 'A' '[[:lower:]]'
+		
+ok 1813 - wildmatch: no match 'A' '[[:lower:]]'
 
-	# Does not when index is partially expanded.
-	git -C sparse-index reset --hard &&
-	ensure_not_expanded apply --cached ../patch-outside &&
+expecting success of 3070.1814 'wildmatch (via ls-files): no match '[[:lower:]]' 'A'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1814 - wildmatch (via ls-files): no match '[[:lower:]]' 'A'
 
-	# Try again with a reset and collapsed index.
-	git -C sparse-index reset --hard &&
-	git -C sparse-index sparse-checkout reapply &&
+expecting success of 3070.1815 'iwildmatch: match 'A' '[[:lower:]]'': 
+			test-tool wildmatch iwildmatch 'A' '[[:lower:]]'
+		
+ok 1815 - iwildmatch: match 'A' '[[:lower:]]'
 
-	# Expands when index is collapsed.
-	ensure_expanded apply --cached ../patch-outside
+expecting success of 3070.1816 'iwildmatch (via ls-files): match '[[:lower:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1816 - iwildmatch (via ls-files): match '[[:lower:]]' 'A'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Already on 'base'
-{"event":"region_enter","sid":"20250827T082056.919132Z-Hcf858c9d-P000819da","thread":"main","time":"2025-08-27T08:20:56.920019Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082056.919132Z-Hcf858c9d-P000819da","thread":"main","time":"2025-08-27T08:20:56.924706Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082056.919132Z-Hcf858c9d-P000819da","thread":"main","time":"2025-08-27T08:20:56.923260Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.003242,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082056.919132Z-Hcf858c9d-P000819da","thread":"main","time":"2025-08-27T08:20:56.924857Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000150,"nesting":1,"category":"index","label":"ensure_full_index"}
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-{"event":"region_enter","sid":"20250827T082057.018768Z-Hcf858c9d-P00081aa3","thread":"main","time":"2025-08-27T08:20:57.019672Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082057.018768Z-Hcf858c9d-P00081aa3","thread":"main","time":"2025-08-27T08:20:57.036895Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082057.018768Z-Hcf858c9d-P00081aa3","thread":"main","time":"2025-08-27T08:20:57.020424Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000752,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082057.018768Z-Hcf858c9d-P00081aa3","thread":"main","time":"2025-08-27T08:20:57.037050Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000156,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 98 - sparse-index is not expanded: git apply
+expecting success of 3070.1817 'pathmatch: no match 'A' '[[:lower:]]'': 
+			test_must_fail test-tool wildmatch pathmatch 'A' '[[:lower:]]'
+		
+ok 1817 - pathmatch: no match 'A' '[[:lower:]]'
 
-expecting success of 1092.99 'sparse-index is not expanded: git add -p': 
-	init_repos &&
+expecting success of 3070.1818 'pathmatch (via ls-files): no match '[[:lower:]]' 'A'': 
+				>expect &&
+				git ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1818 - pathmatch (via ls-files): no match '[[:lower:]]' 'A'
 
-	# Does not expand when edits are within sparse checkout.
-	echo "new content" >sparse-index/deep/a &&
-	echo "new content" >sparse-index/deep/deeper1/a &&
-	test_write_lines y n >in &&
-	ensure_not_expanded add -p <in &&
-	git -C sparse-index reset &&
-	ensure_not_expanded add -i <in &&
+expecting success of 3070.1819 'ipathmatch: match 'A' '[[:lower:]]'': 
+			test-tool wildmatch ipathmatch 'A' '[[:lower:]]'
+		
+ok 1819 - ipathmatch: match 'A' '[[:lower:]]'
 
-	# -p does expand when edits are outside sparse checkout.
-	mkdir -p sparse-index/folder1 &&
-	echo "new content" >sparse-index/folder1/a &&
-	test_write_lines y n y >in &&
-	ensure_expanded add -p <in &&
+expecting success of 3070.1820 'ipathmatch (via ls-files): match '[[:lower:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1820 - ipathmatch (via ls-files): match '[[:lower:]]' 'A'
 
-	# Fully reset the index.
-	git -C sparse-index reset --hard &&
-	git -C sparse-index sparse-checkout reapply &&
+expecting success of 3070.1821 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1821 - cleanup after previous file test
 
-	# -i does expand when edits are outside sparse checkout.
-	mkdir -p sparse-index/folder1 &&
-	echo "new content" >sparse-index/folder1/a &&
-	test_write_lines u 2 3 "" q >in &&
-	ensure_expanded add -i <in
+expecting success of 3070.1822 'setup match file test for a': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1822 - setup match file test for 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	deep/a
-M	deep/deeper1/a
-{"event":"region_enter","sid":"20250827T082057.471674Z-Hcf858c9d-P00081dcf","thread":"main","time":"2025-08-27T08:20:57.476632Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082057.471674Z-Hcf858c9d-P00081dcf","thread":"main","time":"2025-08-27T08:20:57.478383Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082057.471674Z-Hcf858c9d-P00081dcf","thread":"main","time":"2025-08-27T08:20:57.477553Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000921,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082057.471674Z-Hcf858c9d-P00081dcf","thread":"main","time":"2025-08-27T08:20:57.478530Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000147,"nesting":1,"category":"index","label":"ensure_full_index"}
-HEAD is now at 703fd3e initial commit
-{"event":"region_enter","sid":"20250827T082057.572114Z-Hcf858c9d-P00081e62","thread":"main","time":"2025-08-27T08:20:57.573527Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082057.572114Z-Hcf858c9d-P00081e62","thread":"main","time":"2025-08-27T08:20:57.575134Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082057.572114Z-Hcf858c9d-P00081e62","thread":"main","time":"2025-08-27T08:20:57.574320Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000794,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082057.572114Z-Hcf858c9d-P00081e62","thread":"main","time":"2025-08-27T08:20:57.575285Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000151,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 99 - sparse-index is not expanded: git add -p
+expecting success of 3070.1823 'wildmatch: match 'a' '[[:lower:]]'': 
+			test-tool wildmatch wildmatch 'a' '[[:lower:]]'
+		
+ok 1823 - wildmatch: match 'a' '[[:lower:]]'
 
-expecting success of 1092.100 'sparse-index is not expanded: checkout -p, reset -p': 
-	init_repos &&
+expecting success of 3070.1824 'wildmatch (via ls-files): match '[[:lower:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1824 - wildmatch (via ls-files): match '[[:lower:]]' 'a'
 
-	# Does not expand when edits are within sparse checkout.
-	echo "new content" >sparse-index/deep/a &&
-	echo "new content" >sparse-index/deep/deeper1/a &&
-	git -C sparse-index commit -a -m "inside-changes" &&
+expecting success of 3070.1825 'iwildmatch: match 'a' '[[:lower:]]'': 
+			test-tool wildmatch iwildmatch 'a' '[[:lower:]]'
+		
+ok 1825 - iwildmatch: match 'a' '[[:lower:]]'
 
-	test_write_lines y y >in &&
-	ensure_not_expanded checkout HEAD~1 --patch <in &&
+expecting success of 3070.1826 'iwildmatch (via ls-files): match '[[:lower:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1826 - iwildmatch (via ls-files): match '[[:lower:]]' 'a'
 
-	echo "new content" >sparse-index/deep/a &&
-	echo "new content" >sparse-index/deep/deeper1/a &&
-	git -C sparse-index add . &&
-	ensure_not_expanded reset --patch <in &&
+expecting success of 3070.1827 'pathmatch: match 'a' '[[:lower:]]'': 
+			test-tool wildmatch pathmatch 'a' '[[:lower:]]'
+		
+ok 1827 - pathmatch: match 'a' '[[:lower:]]'
 
-	# -p does expand when edits are outside sparse checkout.
-	mkdir -p sparse-index/folder1 &&
-	echo "new content" >sparse-index/folder1/a &&
-	git -C sparse-index add --sparse folder1 &&
-	git -C sparse-index sparse-checkout reapply &&
-	ensure_expanded reset --patch <in &&
+expecting success of 3070.1828 'pathmatch (via ls-files): match '[[:lower:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1828 - pathmatch (via ls-files): match '[[:lower:]]' 'a'
 
-	# Fully reset the index.
-	mkdir -p sparse-index/folder1 &&
-	echo "new content" >sparse-index/folder1/a &&
-	git -C sparse-index add --sparse folder1 &&
-	git -C sparse-index commit -m "folder1 change" &&
-	git -C sparse-index sparse-checkout reapply &&
-	ensure_expanded checkout HEAD~1 --patch <in
+expecting success of 3070.1829 'ipathmatch: match 'a' '[[:lower:]]'': 
+			test-tool wildmatch ipathmatch 'a' '[[:lower:]]'
+		
+ok 1829 - ipathmatch: match 'a' '[[:lower:]]'
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-[base caa4921] inside-changes
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-{"event":"region_enter","sid":"20250827T082058.161780Z-Hcf858c9d-P00082255/20250827T082058.194794Z-Hcf858c9d-P0008227b","thread":"main","time":"2025-08-27T08:20:58.201959Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082058.161780Z-Hcf858c9d-P00082255/20250827T082058.194794Z-Hcf858c9d-P0008227b","thread":"main","time":"2025-08-27T08:20:58.205246Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082058.161780Z-Hcf858c9d-P00082255/20250827T082058.194794Z-Hcf858c9d-P0008227b","thread":"main","time":"2025-08-27T08:20:58.204611Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.002651,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082058.161780Z-Hcf858c9d-P00082255/20250827T082058.194794Z-Hcf858c9d-P0008227b","thread":"main","time":"2025-08-27T08:20:58.205396Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000150,"nesting":1,"category":"index","label":"ensure_full_index"}
-[base 022c8d0] folder1 change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-{"event":"region_enter","sid":"20250827T082058.292431Z-Hcf858c9d-P00082322/20250827T082058.308638Z-Hcf858c9d-P00082340","thread":"main","time":"2025-08-27T08:20:58.309548Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082058.292431Z-Hcf858c9d-P00082322/20250827T082058.308638Z-Hcf858c9d-P00082340","thread":"main","time":"2025-08-27T08:20:58.310341Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000793,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 100 - sparse-index is not expanded: checkout -p, reset -p
+expecting success of 3070.1830 'ipathmatch (via ls-files): match '[[:lower:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1830 - ipathmatch (via ls-files): match '[[:lower:]]' 'a'
 
-expecting success of 1092.101 'advice.sparseIndexExpanded': 
-	init_repos &&
+expecting success of 3070.1831 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1831 - cleanup after previous file test
 
-	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 &&
+expecting success of 3070.1832 'setup match file test for A': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1832 - setup match file test for A
 
-	git -C sparse-index sparse-checkout disable 2>err &&
-	test_line_count = 0 err
+expecting success of 3070.1833 'wildmatch: no match 'A' '[B-Za]'': 
+			test_must_fail test-tool wildmatch wildmatch 'A' '[B-Za]'
+		
+ok 1833 - wildmatch: no match 'A' '[B-Za]'
 
-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.
+expecting success of 3070.1834 'wildmatch (via ls-files): no match '[B-Za]' 'A'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1834 - wildmatch (via ls-files): no match '[B-Za]' 'A'
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	deep/deeper2/deepest/
+expecting success of 3070.1835 'iwildmatch: match 'A' '[B-Za]'': 
+			test-tool wildmatch iwildmatch 'A' '[B-Za]'
+		
+ok 1835 - iwildmatch: match 'A' '[B-Za]'
 
-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 101 - advice.sparseIndexExpanded
+expecting success of 3070.1836 'iwildmatch (via ls-files): match '[B-Za]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1836 - iwildmatch (via ls-files): match '[B-Za]' 'A'
 
-expecting success of 1092.102 '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 &&
+expecting success of 3070.1837 'pathmatch: no match 'A' '[B-Za]'': 
+			test_must_fail test-tool wildmatch pathmatch 'A' '[B-Za]'
+		
+ok 1837 - pathmatch: no match 'A' '[B-Za]'
 
-	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
+expecting success of 3070.1838 'pathmatch (via ls-files): no match '[B-Za]' 'A'': 
+				>expect &&
+				git ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1838 - pathmatch (via ls-files): no match '[B-Za]' '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":"20250827T082059.083586Z-Hcf858c9d-P000828ba","thread":"main","time":"2025-08-27T08:20:59.084454Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082059.083586Z-Hcf858c9d-P000828ba","thread":"main","time":"2025-08-27T08:20:59.085288Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000834,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 102 - cat-file -p
+expecting success of 3070.1839 'ipathmatch: match 'A' '[B-Za]'': 
+			test-tool wildmatch ipathmatch 'A' '[B-Za]'
+		
+ok 1839 - ipathmatch: match 'A' '[B-Za]'
 
-expecting success of 1092.103 '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 &&
+expecting success of 3070.1840 'ipathmatch (via ls-files): match '[B-Za]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1840 - ipathmatch (via ls-files): match '[B-Za]' 'A'
 
-	echo ":deep/a" >in &&
-	test_all_match git cat-file --batch <in &&
-	ensure_not_expanded cat-file --batch <in &&
+expecting success of 3070.1841 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1841 - cleanup after previous file test
 
-	echo ":folder1/a" >in &&
-	test_all_match git cat-file --batch <in &&
-	ensure_expanded cat-file --batch <in &&
+expecting success of 3070.1842 'setup match file test for a': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1842 - setup match file test for a
 
-	cat >in <<-\EOF &&
-	:deep/a
-	:folder1/a
-	EOF
-	test_all_match git cat-file --batch <in &&
-	ensure_expanded cat-file --batch <in
+expecting success of 3070.1843 'wildmatch: match 'a' '[B-Za]'': 
+			test-tool wildmatch wildmatch 'a' '[B-Za]'
+		
+ok 1843 - wildmatch: match 'a' '[B-Za]'
 
-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":"20250827T082059.507283Z-Hcf858c9d-P00082bfd","thread":"main","time":"2025-08-27T08:20:59.508162Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082059.507283Z-Hcf858c9d-P00082bfd","thread":"main","time":"2025-08-27T08:20:59.510530Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.002367,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082059.582273Z-Hcf858c9d-P00082c9f","thread":"main","time":"2025-08-27T08:20:59.583228Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082059.582273Z-Hcf858c9d-P00082c9f","thread":"main","time":"2025-08-27T08:20:59.583919Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000691,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 103 - cat-file --batch
+expecting success of 3070.1844 'wildmatch (via ls-files): match '[B-Za]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1844 - wildmatch (via ls-files): match '[B-Za]' 'a'
 
-# still have 2 known breakage(s)
-# passed all remaining 101 test(s)
-1..103
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3704-add-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3704-add-pathspec-file/.git/
-expecting success of 3704.1 'setup': 
-	test_commit file0 &&
-	echo A >fileA.t &&
-	echo B >fileB.t &&
-	echo C >fileC.t &&
-	echo D >fileD.t
+expecting success of 3070.1845 'iwildmatch: match 'a' '[B-Za]'': 
+			test-tool wildmatch iwildmatch 'a' '[B-Za]'
+		
+ok 1845 - iwildmatch: match 'a' '[B-Za]'
 
-[master (root-commit) ad2e047] file0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file0.t
-ok 1 - setup
+expecting success of 3070.1846 'iwildmatch (via ls-files): match '[B-Za]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1846 - iwildmatch (via ls-files): match '[B-Za]' 'a'
 
-expecting success of 3704.2 '--pathspec-from-file from stdin': 
-	restore_checkpoint &&
+expecting success of 3070.1847 'pathmatch: match 'a' '[B-Za]'': 
+			test-tool wildmatch pathmatch 'a' '[B-Za]'
+		
+ok 1847 - pathmatch: match 'a' '[B-Za]'
 
-	echo fileA.t | git add --pathspec-from-file=- &&
+expecting success of 3070.1848 'pathmatch (via ls-files): match '[B-Za]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1848 - pathmatch (via ls-files): match '[B-Za]' 'a'
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	EOF
-	verify_expect
+expecting success of 3070.1849 'ipathmatch: match 'a' '[B-Za]'': 
+			test-tool wildmatch ipathmatch 'a' '[B-Za]'
+		
+ok 1849 - ipathmatch: match 'a' '[B-Za]'
 
-ok 2 - --pathspec-from-file from stdin
+expecting success of 3070.1850 'ipathmatch (via ls-files): match '[B-Za]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1850 - ipathmatch (via ls-files): match '[B-Za]' 'a'
 
-expecting success of 3704.3 '--pathspec-from-file from file': 
-	restore_checkpoint &&
+expecting success of 3070.1851 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1851 - cleanup after previous file test
 
-	echo fileA.t >list &&
-	git add --pathspec-from-file=list &&
+expecting success of 3070.1852 'setup match file test for A': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1852 - setup match file test for A
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	EOF
-	verify_expect
+expecting success of 3070.1853 'wildmatch: no match 'A' '[B-a]'': 
+			test_must_fail test-tool wildmatch wildmatch 'A' '[B-a]'
+		
+ok 1853 - wildmatch: no match 'A' '[B-a]'
 
-ok 3 - --pathspec-from-file from file
+expecting success of 3070.1854 'wildmatch (via ls-files): no match '[B-a]' 'A'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1854 - wildmatch (via ls-files): no match '[B-a]' 'A'
 
-expecting success of 3704.4 'NUL delimiters': 
-	restore_checkpoint &&
+expecting success of 3070.1855 'iwildmatch: match 'A' '[B-a]'': 
+			test-tool wildmatch iwildmatch 'A' '[B-a]'
+		
+ok 1855 - iwildmatch: match 'A' '[B-a]'
 
-	printf "fileA.t\0fileB.t\0" | git add --pathspec-from-file=- --pathspec-file-nul &&
+expecting success of 3070.1856 'iwildmatch (via ls-files): match '[B-a]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1856 - iwildmatch (via ls-files): match '[B-a]' 'A'
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	A  fileB.t
-	EOF
-	verify_expect
+expecting success of 3070.1857 'pathmatch: no match 'A' '[B-a]'': 
+			test_must_fail test-tool wildmatch pathmatch 'A' '[B-a]'
+		
+ok 1857 - pathmatch: no match 'A' '[B-a]'
 
-ok 4 - NUL delimiters
+expecting success of 3070.1858 'pathmatch (via ls-files): no match '[B-a]' 'A'': 
+				>expect &&
+				git ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1858 - pathmatch (via ls-files): no match '[B-a]' 'A'
 
-expecting success of 3704.5 'LF delimiters': 
-	restore_checkpoint &&
+expecting success of 3070.1859 'ipathmatch: match 'A' '[B-a]'': 
+			test-tool wildmatch ipathmatch 'A' '[B-a]'
+		
+ok 1859 - ipathmatch: match 'A' '[B-a]'
 
-	printf "fileA.t\nfileB.t\n" | git add --pathspec-from-file=- &&
+expecting success of 3070.1860 'ipathmatch (via ls-files): match '[B-a]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1860 - ipathmatch (via ls-files): match '[B-a]' 'A'
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	A  fileB.t
-	EOF
-	verify_expect
+expecting success of 3070.1861 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1861 - cleanup after previous file test
 
-ok 5 - LF delimiters
+expecting success of 3070.1862 'setup match file test for a': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1862 - setup match file test for a
 
-expecting success of 3704.6 'no trailing delimiter': 
-	restore_checkpoint &&
+expecting success of 3070.1863 'wildmatch: match 'a' '[B-a]'': 
+			test-tool wildmatch wildmatch 'a' '[B-a]'
+		
+ok 1863 - wildmatch: match 'a' '[B-a]'
 
-	printf "fileA.t\nfileB.t" | git add --pathspec-from-file=- &&
+expecting success of 3070.1864 'wildmatch (via ls-files): match '[B-a]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1864 - wildmatch (via ls-files): match '[B-a]' 'a'
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	A  fileB.t
-	EOF
-	verify_expect
+expecting success of 3070.1865 'iwildmatch: match 'a' '[B-a]'': 
+			test-tool wildmatch iwildmatch 'a' '[B-a]'
+		
+ok 1865 - iwildmatch: match 'a' '[B-a]'
 
-ok 6 - no trailing delimiter
+expecting success of 3070.1866 'iwildmatch (via ls-files): match '[B-a]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1866 - iwildmatch (via ls-files): match '[B-a]' 'a'
 
-expecting success of 3704.7 'CRLF delimiters': 
-	restore_checkpoint &&
+expecting success of 3070.1867 'pathmatch: match 'a' '[B-a]'': 
+			test-tool wildmatch pathmatch 'a' '[B-a]'
+		
+ok 1867 - pathmatch: match 'a' '[B-a]'
 
-	printf "fileA.t\r\nfileB.t\r\n" | git add --pathspec-from-file=- &&
+expecting success of 3070.1868 'pathmatch (via ls-files): match '[B-a]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1868 - pathmatch (via ls-files): match '[B-a]' 'a'
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	A  fileB.t
-	EOF
-	verify_expect
+expecting success of 3070.1869 'ipathmatch: match 'a' '[B-a]'': 
+			test-tool wildmatch ipathmatch 'a' '[B-a]'
+		
+ok 1869 - ipathmatch: match 'a' '[B-a]'
 
-ok 7 - CRLF delimiters
+expecting success of 3070.1870 'ipathmatch (via ls-files): match '[B-a]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1870 - ipathmatch (via ls-files): match '[B-a]' 'a'
 
-expecting success of 3704.8 'quotes': 
-	restore_checkpoint &&
+expecting success of 3070.1871 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1871 - cleanup after previous file test
 
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
+expecting success of 3070.1872 'setup match file test for z': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1872 - setup match file test for z
 
-	git add --pathspec-from-file=list &&
+expecting success of 3070.1873 'wildmatch: no match 'z' '[Z-y]'': 
+			test_must_fail test-tool wildmatch wildmatch 'z' '[Z-y]'
+		
+ok 1873 - wildmatch: no match 'z' '[Z-y]'
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	EOF
-	verify_expect
+expecting success of 3070.1874 'wildmatch (via ls-files): no match '[Z-y]' 'z'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1874 - wildmatch (via ls-files): no match '[Z-y]' 'z'
 
-ok 8 - quotes
+expecting success of 3070.1875 'iwildmatch: match 'z' '[Z-y]'': 
+			test-tool wildmatch iwildmatch 'z' '[Z-y]'
+		
+ok 1875 - iwildmatch: match 'z' '[Z-y]'
 
-expecting success of 3704.9 'quotes not compatible with --pathspec-file-nul': 
-	restore_checkpoint &&
+expecting success of 3070.1876 'iwildmatch (via ls-files): match '[Z-y]' 'z'': 
+				printf '%s' 'z' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1876 - iwildmatch (via ls-files): match '[Z-y]' 'z'
 
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
+expecting success of 3070.1877 'pathmatch: no match 'z' '[Z-y]'': 
+			test_must_fail test-tool wildmatch pathmatch 'z' '[Z-y]'
+		
+ok 1877 - pathmatch: no match 'z' '[Z-y]'
 
-	test_must_fail git add --pathspec-from-file=list --pathspec-file-nul
+expecting success of 3070.1878 'pathmatch (via ls-files): no match '[Z-y]' 'z'': 
+				>expect &&
+				git ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1878 - pathmatch (via ls-files): no match '[Z-y]' 'z'
 
-fatal: pathspec '"file\101.t"
-' did not match any files
-ok 9 - quotes not compatible with --pathspec-file-nul
+expecting success of 3070.1879 'ipathmatch: match 'z' '[Z-y]'': 
+			test-tool wildmatch ipathmatch 'z' '[Z-y]'
+		
+ok 1879 - ipathmatch: match 'z' '[Z-y]'
 
-expecting success of 3704.10 'only touches what was listed': 
-	restore_checkpoint &&
+expecting success of 3070.1880 'ipathmatch (via ls-files): match '[Z-y]' 'z'': 
+				printf '%s' 'z' >expect &&
+				git --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1880 - ipathmatch (via ls-files): match '[Z-y]' 'z'
 
-	printf "fileB.t\nfileC.t\n" | git add --pathspec-from-file=- &&
+expecting success of 3070.1881 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing z
+ok 1881 - cleanup after previous file test
 
-	cat >expect <<-\EOF &&
-	A  fileB.t
-	A  fileC.t
-	EOF
-	verify_expect
+expecting success of 3070.1882 'setup match file test for Z': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1882 - setup match file test for Z
 
-ok 10 - only touches what was listed
+expecting success of 3070.1883 'wildmatch: match 'Z' '[Z-y]'': 
+			test-tool wildmatch wildmatch 'Z' '[Z-y]'
+		
+ok 1883 - wildmatch: match 'Z' '[Z-y]'
 
-expecting success of 3704.11 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
-	>empty_list &&
+expecting success of 3070.1884 'wildmatch (via ls-files): match '[Z-y]' 'Z'': 
+				printf '%s' 'Z' >expect &&
+				git --glob-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1884 - wildmatch (via ls-files): match '[Z-y]' 'Z'
 
-	test_must_fail git add --pathspec-from-file=list --interactive 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
+expecting success of 3070.1885 'iwildmatch: match 'Z' '[Z-y]'': 
+			test-tool wildmatch iwildmatch 'Z' '[Z-y]'
+		
+ok 1885 - iwildmatch: match 'Z' '[Z-y]'
 
-	test_must_fail git add --pathspec-from-file=list --patch 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
+expecting success of 3070.1886 'iwildmatch (via ls-files): match '[Z-y]' 'Z'': 
+				printf '%s' 'Z' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1886 - iwildmatch (via ls-files): match '[Z-y]' 'Z'
 
-	test_must_fail git add --pathspec-from-file=list --edit 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--edit. cannot be used together" err &&
+expecting success of 3070.1887 'pathmatch: match 'Z' '[Z-y]'': 
+			test-tool wildmatch pathmatch 'Z' '[Z-y]'
+		
+ok 1887 - pathmatch: match 'Z' '[Z-y]'
 
-	test_must_fail git add --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 3070.1888 'pathmatch (via ls-files): match '[Z-y]' 'Z'': 
+				printf '%s' 'Z' >expect &&
+				git ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1888 - pathmatch (via ls-files): match '[Z-y]' 'Z'
 
-	test_must_fail git add --pathspec-file-nul 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+expecting success of 3070.1889 'ipathmatch: match 'Z' '[Z-y]'': 
+			test-tool wildmatch ipathmatch 'Z' '[Z-y]'
+		
+ok 1889 - ipathmatch: match 'Z' '[Z-y]'
 
-	# This case succeeds, but still prints to stderr
-	git add --pathspec-from-file=empty_list 2>err &&
-	test_grep -e "Nothing specified, nothing added." err
+expecting success of 3070.1890 'ipathmatch (via ls-files): match '[Z-y]' 'Z'': 
+				printf '%s' 'Z' >expect &&
+				git --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1890 - ipathmatch (via ls-files): match '[Z-y]' 'Z'
 
-fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
-fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
-fatal: options '--pathspec-from-file' and '--edit' 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'
-Nothing specified, nothing added.
-ok 11 - error conditions
+expecting success of 3070.1891 'matching does not exhibit exponential behavior': 
+	{
+		test-tool wildmatch wildmatch \
+			aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab \
+			"*a*a*a*a*a*a*a*a*a*a*a*a*a*a*a*a" &
+		pid=$!
+	} &&
+	sleep 2 &&
+	! kill $!
 
-# passed all 11 test(s)
-1..11
+./test-lib.sh: line 1010: kill: (2187451) - No such process
+ok 1891 - matching does not exhibit exponential behavior
+
+# still have 40 known breakage(s)
+# passed all remaining 1851 test(s)
+1..1891
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3700-add.sh ***
@@ -209131,4132 +211709,865 @@
 		echo "120000 $(printf 2 | git hash-object -w -t blob --stdin) 2	symlink"
 	) | git update-index --index-info &&
 	git config core.filemode 0 &&
-	git config core.symlinks 0 &&
-	echo new > file &&
-	echo new > symlink &&
-	git add file symlink &&
-	git ls-files --stage | grep "^100755 .* 0	file$" &&
-	git ls-files --stage | grep "^120000 .* 0	symlink$"
-
-rm 'file'
-rm 'symlink'
-100755 3e757656cf36eca53338e520d134963a44f793f8 0	file
-120000 3e757656cf36eca53338e520d134963a44f793f8 0	symlink
-ok 23 - git add with filemode=0, symlinks=0 prefers stage 2 over stage 1
-
-expecting success of 3700.24 'git add --refresh': 
-	>foo && git add foo && git commit -a -m "commit all" &&
-	test -z "$(git diff-index HEAD -- foo)" &&
-	git read-tree HEAD &&
-	case "$(git diff-index HEAD -- foo)" in
-	:100644" "*"M	foo") echo pass;;
-	*) echo fail; false;;
-	esac &&
-	git add --refresh -- foo &&
-	test -z "$(git diff-index HEAD -- foo)"
-
-[master (root-commit) 0254e3c] commit all
- Author: A U Thor <author@example.com>
- 6 files changed, 2 insertions(+)
- create mode 100644 1/2/a
- create mode 100644 1/2/c
- create mode 100644 1/3/b
- create mode 100755 file
- create mode 100644 foo
- create mode 120000 symlink
-pass
-ok 24 - git add --refresh
-
-expecting success of 3700.25 'git add --refresh with pathspec': 
-	git reset --hard &&
-	echo >foo && echo >bar && echo >baz &&
-	git add foo bar baz && H=$(git rev-parse :foo) && git rm -f foo &&
-	echo "100644 $H 3	foo" | git update-index --index-info &&
-	test-tool chmtime -60 bar baz &&
-	git add --refresh bar >actual &&
-	test_must_be_empty actual &&
-
-	git diff-files --name-only >actual &&
-	! grep bar actual &&
-	grep baz actual
-
-HEAD is now at 0254e3c commit all
-rm 'foo'
-baz
-ok 25 - git add --refresh with pathspec
-
-expecting success of 3700.26 'git add --refresh correctly reports no match error': 
-	echo "fatal: pathspec ':(icase)nonexistent' did not match any files" >expect &&
-	test_must_fail git add --refresh ':(icase)nonexistent' 2>actual &&
-	test_cmp expect actual
-
-ok 26 - git add --refresh correctly reports no match error
-
-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 3700.27 'git add should fail atomically upon an unreadable file': 
-	git reset --hard &&
-	date >foo1 &&
-	date >foo2 &&
-	chmod 0 foo2 &&
-	test_must_fail git add --verbose . &&
-	! ( git ls-files foo1 | grep foo1 )
-
-HEAD is now at 0254e3c commit all
-error: open("foo2"): Permission denied
-error: unable to index file 'foo2'
-fatal: adding files failed
-add '-q'
-add '.gitignore'
-add 'a.if'
-add 'actual'
-add 'added_files2_actual'
-add 'added_files2_oids'
-add 'added_files_actual'
-add 'added_files_oids'
-add 'b.if'
-add 'c.if/c.if'
-add 'expect'
-add 'files'
-add 'files_base_dir1/dir1/file1.txt'
-add 'files_base_dir1/dir1/file2.txt'
-add 'files_base_dir1/dir1/file3.txt'
-add 'files_base_dir1/dir1/file4.txt'
-add 'files_base_dir1/dir2/file1.txt'
-add 'files_base_dir1/dir2/file2.txt'
-add 'files_base_dir1/dir2/file3.txt'
-add 'files_base_dir1/dir2/file4.txt'
-add 'files_base_dir2/dir1/file1.txt'
-add 'files_base_dir2/dir1/file2.txt'
-add 'files_base_dir2/dir1/file3.txt'
-add 'files_base_dir2/dir1/file4.txt'
-add 'files_base_dir2/dir2/file1.txt'
-add 'files_base_dir2/dir2/file2.txt'
-add 'files_base_dir2/dir2/file3.txt'
-add 'files_base_dir2/dir2/file4.txt'
-add 'foo1'
-ok 27 - git add should fail atomically upon an unreadable file
-
-expecting success of 3700.28 'git add --ignore-errors': 
-	git reset --hard &&
-	date >foo1 &&
-	date >foo2 &&
-	chmod 0 foo2 &&
-	test_must_fail git add --verbose --ignore-errors . &&
-	git ls-files foo1 | grep foo1
-
-HEAD is now at 0254e3c commit all
-error: open("foo2"): Permission denied
-error: unable to index file 'foo2'
-add '-q'
-add '.gitignore'
-add 'a.if'
-add 'actual'
-add 'added_files2_actual'
-add 'added_files2_oids'
-add 'added_files_actual'
-add 'added_files_oids'
-add 'b.if'
-add 'c.if/c.if'
-add 'expect'
-add 'files'
-add 'files_base_dir1/dir1/file1.txt'
-add 'files_base_dir1/dir1/file2.txt'
-add 'files_base_dir1/dir1/file3.txt'
-add 'files_base_dir1/dir1/file4.txt'
-add 'files_base_dir1/dir2/file1.txt'
-add 'files_base_dir1/dir2/file2.txt'
-add 'files_base_dir1/dir2/file3.txt'
-add 'files_base_dir1/dir2/file4.txt'
-add 'files_base_dir2/dir1/file1.txt'
-add 'files_base_dir2/dir1/file2.txt'
-add 'files_base_dir2/dir1/file3.txt'
-add 'files_base_dir2/dir1/file4.txt'
-add 'files_base_dir2/dir2/file1.txt'
-add 'files_base_dir2/dir2/file2.txt'
-add 'files_base_dir2/dir2/file3.txt'
-add 'files_base_dir2/dir2/file4.txt'
-add 'foo1'
-add 'stage1'
-add 'stage2'
-add 'stage3'
-add 'sub/.gitignore'
-add 'sub/dir/a.ig'
-add 'xfoo1'
-add 'xfoo2'
-add 'xfoo3'
-foo1
-ok 28 - git add --ignore-errors
-
-expecting success of 3700.29 'git add (add.ignore-errors)': 
-	git config add.ignore-errors 1 &&
-	git reset --hard &&
-	date >foo1 &&
-	date >foo2 &&
-	chmod 0 foo2 &&
-	test_must_fail git add --verbose . &&
-	git ls-files foo1 | grep foo1
-
-HEAD is now at 0254e3c commit all
-error: open("foo2"): Permission denied
-error: unable to index file 'foo2'
-add 'a.ig'
-add 'c.if/c.ig'
-add 'd.ig/d.if'
-add 'd.ig/d.ig'
-add 'foo1'
-add 'sub/a.ig'
-foo1
-ok 29 - git add (add.ignore-errors)
-
-expecting success of 3700.30 'git add (add.ignore-errors = false)': 
-	git config add.ignore-errors 0 &&
-	git reset --hard &&
-	date >foo1 &&
-	date >foo2 &&
-	chmod 0 foo2 &&
-	test_must_fail git add --verbose . &&
-	! ( git ls-files foo1 | grep foo1 )
-
-HEAD is now at 0254e3c commit all
-error: open("foo2"): Permission denied
-error: unable to index file 'foo2'
-fatal: adding files failed
-add 'foo1'
-ok 30 - git add (add.ignore-errors = false)
-
-expecting success of 3700.31 '--no-ignore-errors overrides config': 
-	git config add.ignore-errors 1 &&
-	git reset --hard &&
-	date >foo1 &&
-	date >foo2 &&
-	chmod 0 foo2 &&
-	test_must_fail git add --verbose --no-ignore-errors . &&
-	! ( git ls-files foo1 | grep foo1 ) &&
-	git config add.ignore-errors 0
-
-HEAD is now at 0254e3c commit all
-error: open("foo2"): Permission denied
-error: unable to index file 'foo2'
-fatal: adding files failed
-add 'foo1'
-ok 31 - --no-ignore-errors overrides config
-
-expecting success of 3700.32 'git add 'fo\[ou\]bar' ignores foobar': 
-	git reset --hard &&
-	touch fo\[ou\]bar foobar &&
-	git add 'fo\[ou\]bar' &&
-	git ls-files fo\[ou\]bar | grep -F fo\[ou\]bar &&
-	! ( git ls-files foobar | grep foobar )
-
-HEAD is now at 0254e3c commit all
-fo[ou]bar
-ok 32 - git add 'fo\[ou\]bar' ignores foobar
-
-expecting success of 3700.33 'git add to resolve conflicts on otherwise ignored path': 
-	git reset --hard &&
-	H=$(git rev-parse :1/2/a) &&
-	(
-		echo "100644 $H 1	track-this" &&
-		echo "100644 $H 3	track-this"
-	) | git update-index --index-info &&
-	echo track-this >>.gitignore &&
-	echo resolved >track-this &&
-	git add track-this
-
-HEAD is now at 0254e3c commit all
-ok 33 - git add to resolve conflicts on otherwise ignored path
-
-expecting success of 3700.34 '"add non-existent" should fail': 
-	test_must_fail git add non-existent &&
-	! (git ls-files | grep "non-existent")
-
-fatal: pathspec 'non-existent' did not match any files
-ok 34 - "add non-existent" should fail
-
-expecting success of 3700.35 'git add -A on empty repo does not error out': 
-	rm -fr empty &&
-	git init empty &&
-	(
-		cd empty &&
-		git add -A . &&
-		git add -A
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/empty/.git/
-ok 35 - git add -A on empty repo does not error out
-
-expecting success of 3700.36 '"git add ." in empty repo': 
-	rm -fr empty &&
-	git init empty &&
-	(
-		cd empty &&
-		git add .
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/empty/.git/
-ok 36 - "git add ." in empty repo
-
-expecting success of 3700.37 '"git add" a embedded repository': 
-	rm -fr outer && git init outer &&
-	(
-		cd outer &&
-		for i in 1 2
-		do
-			name=inner$i &&
-			git init $name &&
-			git -C $name commit --allow-empty -m $name ||
-				return 1
-		done &&
-		git add . 2>actual &&
-		cat >expect <<-EOF &&
-		warning: adding embedded git repository: inner1
-		hint: You${SQ}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> inner1
-		hint:
-		hint: If you added this path by mistake, you can remove it from the
-		hint: index with:
-		hint:
-		hint: 	git rm --cached inner1
-		hint:
-		hint: See "git help submodule" for more information.
-		hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-		warning: adding embedded git repository: inner2
-		EOF
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/outer/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/outer/inner1/.git/
-[master (root-commit) c5e40ca] inner1
- Author: A U Thor <author@example.com>
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/outer/inner2/.git/
-[master (root-commit) 3c517b1] inner2
- Author: A U Thor <author@example.com>
-ok 37 - "git add" a embedded repository
-
-expecting success of 3700.38 'error on a repository with no commits': 
-	rm -fr empty &&
-	git init empty &&
-	test_must_fail git add empty >actual 2>&1 &&
-	cat >expect <<-EOF &&
-	error: 'empty/' does not have a commit checked out
-	fatal: adding files failed
-	EOF
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/empty/.git/
-ok 38 - error on a repository with no commits
-
-expecting success of 3700.39 'git add --dry-run of existing changed file': 
-	echo new >>track-this &&
-	git add --dry-run track-this >actual 2>&1 &&
-	echo "add 'track-this'" | test_cmp - actual
-
-ok 39 - git add --dry-run of existing changed file
-
-expecting success of 3700.40 'git add --dry-run of non-existing file': 
-	echo ignored-file >>.gitignore &&
-	test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
-
-ok 40 - git add --dry-run of non-existing file
-
-expecting success of 3700.41 'git add --dry-run of an existing file output': 
-	echo "fatal: pathspec 'ignored-file' did not match any files" >expect &&
-	test_cmp expect actual
-
-ok 41 - git add --dry-run of an existing file output
-
-expecting success of 3700.42 'git add --dry-run --ignore-missing of non-existing file': 
-	test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err
-
-ok 42 - git add --dry-run --ignore-missing of non-existing file
-
-expecting success of 3700.43 'git add --dry-run --ignore-missing of non-existing file output': 
-	test_cmp expect.out actual.out &&
-	test_cmp expect.err actual.err
-
-ok 43 - git add --dry-run --ignore-missing of non-existing file output
-
-expecting success of 3700.44 'git add --dry-run --interactive should fail': 
-	test_must_fail git add --dry-run --interactive
-
-fatal: options '--dry-run' and '--interactive/--patch' cannot be used together
-ok 44 - git add --dry-run --interactive should fail
-
-expecting success of 3700.45 'git add empty string should fail': 
-	test_must_fail git add ""
-
-fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
-ok 45 - git add empty string should fail
-
-expecting success of 3700.46 'git add --chmod=[+-]x stages correctly': 
-	rm -f foo1 &&
-	echo foo >foo1 &&
-	git add --chmod=+x foo1 &&
-	test_mode_in_index 100755 foo1 &&
-	git add --chmod=-x foo1 &&
-	test_mode_in_index 100644 foo1
-
-pass
-pass
-ok 46 - git add --chmod=[+-]x stages correctly
-
-expecting success of 3700.47 'git add --chmod=+x with symlinks': 
-	git config core.filemode 1 &&
-	git config core.symlinks 1 &&
-	rm -f foo2 &&
-	echo foo >foo2 &&
-	git add --chmod=+x foo2 &&
-	test_mode_in_index 100755 foo2
-
-pass
-ok 47 - git add --chmod=+x with symlinks
-
-expecting success of 3700.48 'git add --chmod=[+-]x changes index with already added file': 
-	rm -f foo3 xfoo3 &&
-	git reset --hard &&
-	echo foo >foo3 &&
-	git add foo3 &&
-	git add --chmod=+x foo3 &&
-	test_mode_in_index 100755 foo3 &&
-	echo foo >xfoo3 &&
-	chmod 755 xfoo3 &&
-	git add xfoo3 &&
-	git add --chmod=-x xfoo3 &&
-	test_mode_in_index 100644 xfoo3
-
-HEAD is now at 0254e3c commit all
-pass
-pass
-ok 48 - git add --chmod=[+-]x changes index with already added file
-
-expecting success of 3700.49 'git add --chmod=[+-]x does not change the working tree': 
-	echo foo >foo4 &&
-	git add foo4 &&
-	git add --chmod=+x foo4 &&
-	! test -x foo4
-
-ok 49 - git add --chmod=[+-]x does not change the working tree
-
-expecting success of 3700.50 'git add --chmod fails with non regular files (but updates the other paths)': 
-	git reset --hard &&
-	test_ln_s_add foo foo3 &&
-	touch foo4 &&
-	test_must_fail git add --chmod=+x foo3 foo4 2>stderr &&
-	test_grep "cannot chmod +x .foo3." stderr &&
-	test_mode_in_index 120000 foo3 &&
-	test_mode_in_index 100755 foo4
-
-HEAD is now at 0254e3c commit all
-error: cannot chmod +x 'foo3'
-pass
-pass
-ok 50 - git add --chmod fails with non regular files (but updates the other paths)
-
-expecting success of 3700.51 'git add --chmod honors --dry-run': 
-	git reset --hard &&
-	echo foo >foo4 &&
-	git add foo4 &&
-	git add --chmod=+x --dry-run foo4 &&
-	test_mode_in_index 100644 foo4
-
-HEAD is now at 0254e3c commit all
-pass
-ok 51 - git add --chmod honors --dry-run
-
-expecting success of 3700.52 'git add --chmod --dry-run reports error for non regular files': 
-	git reset --hard &&
-	test_ln_s_add foo foo4 &&
-	test_must_fail git add --chmod=+x --dry-run foo4 2>stderr &&
-	test_grep "cannot chmod +x .foo4." stderr
-
-HEAD is now at 0254e3c commit all
-error: cannot chmod +x 'foo4'
-ok 52 - git add --chmod --dry-run reports error for non regular files
-
-expecting success of 3700.53 'git add --chmod --dry-run reports error for unmatched pathspec': 
-	test_must_fail git add --chmod=+x --dry-run nonexistent 2>stderr &&
-	test_grep "pathspec .nonexistent. did not match any files" stderr
-
-fatal: pathspec 'nonexistent' did not match any files
-ok 53 - git add --chmod --dry-run reports error for unmatched pathspec
-
-expecting success of 3700.54 'no file status change if no pathspec is given': 
-	>foo5 &&
-	>foo6 &&
-	git add foo5 foo6 &&
-	git add --chmod=+x &&
-	test_mode_in_index 100644 foo5 &&
-	test_mode_in_index 100644 foo6
-
-Nothing specified, nothing added.
-hint: Maybe you wanted to say 'git add .'?
-hint: Disable this message with "git config set advice.addEmptyPathspec false"
-pass
-pass
-ok 54 - no file status change if no pathspec is given
-
-expecting success of 3700.55 'no file status change if no pathspec is given in subdir': 
-	mkdir -p sub &&
-	(
-		cd sub &&
-		>sub-foo1 &&
-		>sub-foo2 &&
-		git add . &&
-		git add --chmod=+x &&
-		test_mode_in_index 100644 sub-foo1 &&
-		test_mode_in_index 100644 sub-foo2
-	)
-
-Nothing specified, nothing added.
-hint: Maybe you wanted to say 'git add .'?
-hint: Disable this message with "git config set advice.addEmptyPathspec false"
-pass
-pass
-ok 55 - no file status change if no pathspec is given in subdir
-
-expecting success of 3700.56 'all statuses changed in folder if . is given': 
-	git init repo &&
-	(
-		cd repo &&
-		mkdir -p sub/dir &&
-		touch x y z sub/a sub/dir/b &&
-		git add -A &&
-		git add --chmod=+x . &&
-		test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 &&
-		git add --chmod=-x . &&
-		test $(git ls-files --stage | grep ^100755 | wc -l) -eq 0
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/repo/.git/
-ok 56 - all statuses changed in folder if . is given
-
-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 57 # skip path is case-insensitive (missing CASE_INSENSITIVE_FS)
-
-# passed all 57 test(s)
-1..57
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3510-cherry-pick-sequence.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3510-cherry-pick-sequence/.git/
-expecting success of 3510.1 'setup': 
-	git config set advice.detachedhead false &&
-	echo unrelated >unrelated &&
-	git add unrelated &&
-	test_commit initial foo a &&
-	test_commit base foo b &&
-	test_commit unrelatedpick unrelated reallyunrelated &&
-	test_commit picked foo c &&
-	test_commit anotherpick foo d &&
-	test_commit yetanotherpick foo e &&
-	pristine_detach initial &&
-	test_commit conflicting unrelated
-
-[master (root-commit) df2a63d] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 foo
- create mode 100644 unrelated
-[master dc0113b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 24c5742] unrelatedpick
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master fdc0b12] picked
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 965fed4] anotherpick
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 55c7d12] yetanotherpick
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at df2a63d initial
-[detached HEAD d520364] conflicting
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 3510.2 'cherry-pick persists data on failure': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick -s base..anotherpick &&
-	test_path_is_dir .git/sequencer &&
-	test_path_is_file .git/sequencer/head &&
-	test_path_is_file .git/sequencer/todo &&
-	test_path_is_file .git/sequencer/opts
-
-Previous HEAD position was d520364 conflicting
-HEAD is now at df2a63d initial
-[detached HEAD 2fa73e8] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-ok 2 - cherry-pick persists data on failure
-
-expecting success of 3510.3 'cherry-pick mid-cherry-pick-sequence': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick base..anotherpick &&
-	test_cmp_rev picked CHERRY_PICK_HEAD &&
-	# "oops, I forgot that these patches rely on the change from base"
-	git checkout HEAD foo &&
-	git cherry-pick base &&
-	git cherry-pick picked &&
-	git cherry-pick --continue &&
-	git diff --exit-code anotherpick
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  2fa73e8 unrelatedpick
-
-HEAD is now at df2a63d initial
-[detached HEAD 7fdfeeb] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-Updated 1 path from a9867be
-[detached HEAD 28eafda] base
- 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 4a5cd69] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 49d5115] anotherpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - cherry-pick mid-cherry-pick-sequence
-
-expecting success of 3510.4 'cherry-pick persists opts correctly': 
-	pristine_detach initial &&
-	# to make sure that the session to cherry-pick a sequence
-	# gets interrupted, use a high-enough number that is larger
-	# than the number of parents of any commit we have created
-	mainline=4 &&
-	test_expect_code 128 git cherry-pick -s -m $mainline --strategy=recursive -X patience -X ours --edit initial..anotherpick &&
-	test_path_is_dir .git/sequencer &&
-	test_path_is_file .git/sequencer/head &&
-	test_path_is_file .git/sequencer/todo &&
-	test_path_is_file .git/sequencer/opts &&
-	echo "true" >expect &&
-	git config --file=.git/sequencer/opts --get-all options.signoff >actual &&
-	test_cmp expect actual &&
-	echo "$mainline" >expect &&
-	git config --file=.git/sequencer/opts --get-all options.mainline >actual &&
-	test_cmp expect actual &&
-	echo "recursive" >expect &&
-	git config --file=.git/sequencer/opts --get-all options.strategy >actual &&
-	test_cmp expect actual &&
-	cat >expect <<-\EOF &&
-	patience
-	ours
-	EOF
-	git config --file=.git/sequencer/opts --get-all options.strategy-option >actual &&
-	test_cmp expect actual &&
-	echo "true" >expect &&
-	git config --file=.git/sequencer/opts --get-all options.edit >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 4 commits behind, not connected to
-any of your branches:
-
-  49d5115 anotherpick
-  4a5cd69 picked
-  28eafda base
-  7fdfeeb unrelatedpick
-
-HEAD is now at df2a63d initial
-error: commit dc0113b541050fbc624688af31e35b1d246f20fc does not have parent 4
-fatal: cherry-pick failed
-ok 4 - cherry-pick persists opts correctly
-
-expecting success of 3510.5 'cherry-pick persists --empty=stop correctly': 
-	pristine_detach yetanotherpick &&
-	# Picking `anotherpick` forces a conflict so that we stop. That
-	# commit is then skipped, after which we pick `yetanotherpick`
-	# while already on `yetanotherpick` to cause an empty commit
-	test_must_fail git cherry-pick --empty=stop anotherpick yetanotherpick &&
-	test_must_fail git cherry-pick --skip 2>msg &&
-	test_grep "The previous cherry-pick is now empty" msg &&
-	rm msg &&
-	git cherry-pick --abort
-
-Previous HEAD position was df2a63d initial
-HEAD is now at 55c7d12 yetanotherpick
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 965fed4... anotherpick
-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"
-HEAD detached at 55c7d12
-You are currently cherry-picking commit 55c7d12.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	msg
-
-nothing added to commit but untracked files present (use "git add" to track)
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-ok 5 - cherry-pick persists --empty=stop correctly
-
-expecting success of 3510.6 'cherry-pick persists --empty=drop correctly': 
-	pristine_detach yetanotherpick &&
-	# Picking `anotherpick` forces a conflict so that we stop. That
-	# commit is then skipped, after which we pick `yetanotherpick`
-	# while already on `yetanotherpick` to cause an empty commit
-	test_must_fail git cherry-pick --empty=drop anotherpick yetanotherpick &&
-	git cherry-pick --skip &&
-	test_cmp_rev yetanotherpick HEAD
-
-HEAD is now at 55c7d12 yetanotherpick
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 965fed4... anotherpick
-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"
-dropping 55c7d12676e46241f1279640f1bc977feab93361 yetanotherpick -- patch contents already upstream
-ok 6 - cherry-pick persists --empty=drop correctly
-
-expecting success of 3510.7 'cherry-pick persists --empty=keep correctly': 
-	pristine_detach yetanotherpick &&
-	# Picking `anotherpick` forces a conflict so that we stop. That
-	# commit is then skipped, after which we pick `yetanotherpick`
-	# while already on `yetanotherpick` to cause an empty commit
-	test_must_fail git cherry-pick --empty=keep anotherpick yetanotherpick &&
-	git cherry-pick --skip &&
-	test_cmp_rev yetanotherpick HEAD^
-
-HEAD is now at 55c7d12 yetanotherpick
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 965fed4... anotherpick
-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"
-[detached HEAD 3fb2aca] yetanotherpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
-ok 7 - cherry-pick persists --empty=keep correctly
-
-expecting success of 3510.8 'revert persists opts correctly': 
-	pristine_detach initial &&
-	# to make sure that the session to revert a sequence
-	# gets interrupted, revert commits that are not in the history
-	# of HEAD.
-	test_expect_code 1 git revert -s --strategy=recursive -X patience -X ours --no-edit picked yetanotherpick &&
-	test_path_is_dir .git/sequencer &&
-	test_path_is_file .git/sequencer/head &&
-	test_path_is_file .git/sequencer/todo &&
-	test_path_is_file .git/sequencer/opts &&
-	echo "true" >expect &&
-	git config --file=.git/sequencer/opts --get-all options.signoff >actual &&
-	test_cmp expect actual &&
-	echo "recursive" >expect &&
-	git config --file=.git/sequencer/opts --get-all options.strategy >actual &&
-	test_cmp expect actual &&
-	cat >expect <<-\EOF &&
-	patience
-	ours
-	EOF
-	git config --file=.git/sequencer/opts --get-all options.strategy-option >actual &&
-	test_cmp expect actual &&
-	echo "false" >expect &&
-	git config --file=.git/sequencer/opts --get-all options.edit >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  3fb2aca yetanotherpick
-
-HEAD is now at df2a63d initial
-Auto-merging foo
-HEAD detached at df2a63d
-Revert currently in progress.
-  (run "git revert --continue" to continue)
-  (use "git revert --skip" to skip this patch)
-  (use "git revert --abort" to cancel the revert operation)
-
-nothing to commit, working tree clean
-ok 8 - revert persists opts correctly
-
-expecting success of 3510.9 'cherry-pick cleans up sequencer state upon success': 
-	pristine_detach initial &&
-	git cherry-pick initial..picked &&
-	test_path_is_missing .git/sequencer
-
-HEAD is now at df2a63d initial
-[detached HEAD 86ee3fa] base
- 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 2b8ae83] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD a222ac0] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 9 - cherry-pick cleans up sequencer state upon success
-
-expecting success of 3510.10 'cherry-pick --skip requires cherry-pick in progress': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick --skip
-
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  a222ac0 picked
-  2b8ae83 unrelatedpick
-  86ee3fa base
-
-HEAD is now at df2a63d initial
-error: no cherry-pick in progress
-fatal: cherry-pick failed
-ok 10 - cherry-pick --skip requires cherry-pick in progress
-
-expecting success of 3510.11 'revert --skip requires revert in progress': 
-	pristine_detach initial &&
-	test_must_fail git revert --skip
-
-HEAD is now at df2a63d initial
-error: no revert in progress
-fatal: revert failed
-ok 11 - revert --skip requires revert in progress
-
-expecting success of 3510.12 'cherry-pick --skip to skip commit': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick anotherpick &&
-	test_must_fail git revert --skip &&
-	git cherry-pick --skip &&
-	test_cmp_rev initial HEAD &&
-	test_path_is_missing .git/CHERRY_PICK_HEAD
-
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 965fed4... anotherpick
-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"
-error: no revert in progress
-fatal: revert failed
-ok 12 - cherry-pick --skip to skip commit
-
-expecting success of 3510.13 'revert --skip to skip commit': 
-	pristine_detach anotherpick &&
-	test_must_fail git revert anotherpick~1 &&
-	test_must_fail git cherry-pick --skip &&
-	git revert --skip &&
-	test_cmp_rev anotherpick HEAD
-
-Previous HEAD position was df2a63d initial
-HEAD is now at 965fed4 anotherpick
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert fdc0b12... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-error: no cherry-pick in progress
-fatal: cherry-pick failed
-ok 13 - revert --skip to skip commit
-
-expecting success of 3510.14 'skip "empty" commit': 
-	pristine_detach picked &&
-	test_commit dummy foo d &&
-	test_must_fail git cherry-pick anotherpick 2>err &&
-	test_grep "git cherry-pick --skip" err &&
-	git cherry-pick --skip &&
-	test_cmp_rev dummy HEAD
-
-Previous HEAD position was 965fed4 anotherpick
-HEAD is now at fdc0b12 picked
-[detached HEAD 4b36a1c] dummy
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD detached from fdc0b12
-You are currently cherry-picking commit 965fed4.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
-
-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)
-Otherwise, please use 'git cherry-pick --skip'
-ok 14 - skip "empty" commit
-
-expecting success of 3510.15 'skip a commit and check if rest of sequence is correct': 
-	pristine_detach initial &&
-	echo e >expect &&
-	cat >expect.log <<-EOF &&
-	OBJID
-	:100644 100644 OBJID OBJID M	foo
-	OBJID
-	:100644 100644 OBJID OBJID M	foo
-	OBJID
-	:100644 100644 OBJID OBJID M	unrelated
-	OBJID
-	:000000 100644 OBJID OBJID A	foo
-	:000000 100644 OBJID OBJID A	unrelated
-	EOF
-	test_must_fail git cherry-pick base..yetanotherpick &&
-	test_must_fail git cherry-pick --skip &&
-	echo d >foo &&
-	git add foo &&
-	git cherry-pick --continue &&
-	{
-		git rev-list HEAD |
-		git diff-tree --root --stdin |
-		sed "s/$OID_REGEX/OBJID/g"
-	} >actual.log &&
-	test_cmp expect foo &&
-	test_cmp expect.log actual.log
-
-Previous HEAD position was 4b36a1c dummy
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 965fed4... anotherpick
-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"
-[detached HEAD 612ff5e] anotherpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 61f8ec3] yetanotherpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 15 - skip a commit and check if rest of sequence is correct
-
-expecting success of 3510.16 'check advice when we move HEAD by committing': 
-	pristine_detach initial &&
-	cat >expect <<-EOF &&
-	error: there is nothing to skip
-	hint: have you committed already?
-	hint: try "git cherry-pick --continue"
-	fatal: cherry-pick failed
-	EOF
-	test_must_fail git cherry-pick base..yetanotherpick &&
-	echo c >foo &&
-	git commit -a &&
-	test_path_is_missing .git/CHERRY_PICK_HEAD &&
-	test_must_fail git cherry-pick --skip 2>advice &&
-	test_cmp expect advice
-
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  61f8ec3 yetanotherpick
-  612ff5e anotherpick
-  c738c4d unrelatedpick
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD 43fe10f] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 16 - check advice when we move HEAD by committing
-
-expecting success of 3510.17 'selectively advise --skip while launching another sequence': 
-	pristine_detach initial &&
-	cat >expect <<-EOF &&
-	error: cherry-pick is already in progress
-	hint: try "git cherry-pick (--continue | --skip | --abort | --quit)"
-	fatal: cherry-pick failed
-	EOF
-	test_must_fail git cherry-pick picked..yetanotherpick &&
-	test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
-	test_cmp expect advice &&
-	cat >expect <<-EOF &&
-	error: cherry-pick is already in progress
-	hint: try "git cherry-pick (--continue | --abort | --quit)"
-	fatal: cherry-pick failed
-	EOF
-	git reset --merge &&
-	test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
-	test_cmp expect advice
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  43fe10f picked
-  c738c4d unrelatedpick
-
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 965fed4... anotherpick
-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"
-ok 17 - selectively advise --skip while launching another sequence
-
-expecting success of 3510.18 'allow skipping commit but not abort for a new history': 
-	pristine_detach initial &&
-	cat >expect <<-EOF &&
-	error: cannot abort from a branch yet to be born
-	fatal: cherry-pick failed
-	EOF
-	git checkout --orphan new_disconnected &&
-	git reset --hard &&
-	test_must_fail git cherry-pick anotherpick &&
-	test_must_fail git cherry-pick --abort 2>advice &&
-	git cherry-pick --skip &&
-	test_cmp expect advice
-
-HEAD is now at df2a63d initial
-Switched to a new branch 'new_disconnected'
-CONFLICT (modify/delete): foo deleted in HEAD and modified in 965fed4 (anotherpick).  Version 965fed4 (anotherpick) of foo left in tree.
-error: could not apply 965fed4... anotherpick
-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"
-ok 18 - allow skipping commit but not abort for a new history
-
-expecting success of 3510.19 'allow skipping stopped cherry-pick because of untracked file modifications': 
-	test_when_finished "rm unrelated" &&
-	pristine_detach initial &&
-	git rm --cached unrelated &&
-	git commit -m "untrack unrelated" &&
-	test_must_fail git cherry-pick initial base &&
-	test_path_is_missing .git/CHERRY_PICK_HEAD &&
-	git cherry-pick --skip
-
-HEAD is now at df2a63d initial
-rm 'unrelated'
-[detached HEAD 44a5ca1] untrack unrelated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 unrelated
-error: The following untracked working tree files would be overwritten by merge:
-	unrelated
-Please move or remove them before you merge.
-Aborting
-fatal: cherry-pick failed
-[detached HEAD f847cb0] base
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 19 - allow skipping stopped cherry-pick because of untracked file modifications
-
-expecting success of 3510.20 '--quit does not complain when no cherry-pick is in progress': 
-	pristine_detach initial &&
-	git cherry-pick --quit
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  f847cb0 base
-  44a5ca1 untrack unrelated
-
-HEAD is now at df2a63d initial
-ok 20 - --quit does not complain when no cherry-pick is in progress
-
-expecting success of 3510.21 '--abort requires cherry-pick in progress': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick --abort
-
-HEAD is now at df2a63d initial
-error: no cherry-pick or revert in progress
-fatal: cherry-pick failed
-ok 21 - --abort requires cherry-pick in progress
-
-expecting success of 3510.22 '--quit cleans up sequencer state': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick base..picked &&
-	git cherry-pick --quit &&
-	test_path_is_missing .git/sequencer &&
-	test_path_is_missing .git/CHERRY_PICK_HEAD
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-ok 22 - --quit cleans up sequencer state
-
-expecting success of 3510.23 '--quit keeps HEAD and conflicted index intact': 
-	pristine_detach initial &&
-	cat >expect <<-\EOF &&
-	OBJID
-	:100644 100644 OBJID OBJID M	unrelated
-	OBJID
-	:000000 100644 OBJID OBJID A	foo
-	:000000 100644 OBJID OBJID A	unrelated
-	EOF
-	test_expect_code 1 git cherry-pick base..picked &&
-	git cherry-pick --quit &&
-	test_path_is_missing .git/sequencer &&
-	test_must_fail git update-index --refresh &&
-	{
-		git rev-list HEAD |
-		git diff-tree --root --stdin |
-		sed "s/$OID_REGEX/OBJID/g"
-	} >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  c738c4d unrelatedpick
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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: needs merge
-ok 23 - --quit keeps HEAD and conflicted index intact
-
-expecting success of 3510.24 '--abort to cancel multiple cherry-pick': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick base..anotherpick &&
-	git cherry-pick --abort &&
-	test_path_is_missing .git/sequencer &&
-	test_path_is_missing .git/CHERRY_PICK_HEAD &&
-	test_cmp_rev initial HEAD &&
-	git update-index --refresh &&
-	git diff-index --exit-code HEAD
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  c738c4d unrelatedpick
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-ok 24 - --abort to cancel multiple cherry-pick
-
-expecting success of 3510.25 '--abort to cancel single cherry-pick': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick picked &&
-	git cherry-pick --abort &&
-	test_path_is_missing .git/sequencer &&
-	test_path_is_missing .git/CHERRY_PICK_HEAD &&
-	test_cmp_rev initial HEAD &&
-	git update-index --refresh &&
-	git diff-index --exit-code HEAD
-
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-ok 25 - --abort to cancel single cherry-pick
-
-expecting success of 3510.26 '--abort does not unsafely change HEAD': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick picked anotherpick &&
-	git reset --hard base &&
-	test_must_fail git cherry-pick picked anotherpick &&
-	git cherry-pick --abort 2>actual &&
-	test_grep "You seem to have moved HEAD" actual &&
-	test_cmp_rev base HEAD
-
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-HEAD is now at dc0113b base
-error: cherry-pick is already in progress
-hint: try "git cherry-pick (--continue | --abort | --quit)"
-fatal: cherry-pick failed
-warning: You seem to have moved HEAD. Not rewinding, check your HEAD!
-ok 26 - --abort does not unsafely change HEAD
-
-expecting success of 3510.27 'cherry-pick --abort to cancel multiple revert': 
-	pristine_detach anotherpick &&
-	test_expect_code 1 git revert base..picked &&
-	git cherry-pick --abort &&
-	test_path_is_missing .git/sequencer &&
-	test_path_is_missing .git/CHERRY_PICK_HEAD &&
-	test_cmp_rev anotherpick HEAD &&
-	git update-index --refresh &&
-	git diff-index --exit-code HEAD
-
-Previous HEAD position was dc0113b base
-HEAD is now at 965fed4 anotherpick
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert fdc0b12... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 27 - cherry-pick --abort to cancel multiple revert
-
-expecting success of 3510.28 'revert --abort works, too': 
-	pristine_detach anotherpick &&
-	test_expect_code 1 git revert base..picked &&
-	git revert --abort &&
-	test_path_is_missing .git/sequencer &&
-	test_cmp_rev anotherpick HEAD
-
-HEAD is now at 965fed4 anotherpick
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert fdc0b12... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 28 - revert --abort works, too
-
-expecting success of 3510.29 '--abort to cancel single revert': 
-	pristine_detach anotherpick &&
-	test_expect_code 1 git revert picked &&
-	git revert --abort &&
-	test_path_is_missing .git/sequencer &&
-	test_cmp_rev anotherpick HEAD &&
-	git update-index --refresh &&
-	git diff-index --exit-code HEAD
-
-HEAD is now at 965fed4 anotherpick
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert fdc0b12... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 29 - --abort to cancel single revert
-
-expecting success of 3510.30 '--abort keeps unrelated change, easy case': 
-	pristine_detach unrelatedpick &&
-	echo changed >expect &&
-	test_expect_code 1 git cherry-pick picked..yetanotherpick &&
-	echo changed >unrelated &&
-	git cherry-pick --abort &&
-	test_cmp expect unrelated
-
-Previous HEAD position was 965fed4 anotherpick
-HEAD is now at 24c5742 unrelatedpick
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 965fed4... anotherpick
-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"
-ok 30 - --abort keeps unrelated change, easy case
-
-expecting success of 3510.31 '--abort refuses to clobber unrelated change, harder case': 
-	pristine_detach initial &&
-	echo changed >expect &&
-	test_expect_code 1 git cherry-pick base..anotherpick &&
-	echo changed >unrelated &&
-	test_must_fail git cherry-pick --abort &&
-	test_cmp expect unrelated &&
-	git rev-list HEAD >log &&
-	test_line_count = 2 log &&
-	test_must_fail git update-index --refresh &&
-
-	git checkout unrelated &&
-	git cherry-pick --abort &&
-	test_cmp_rev initial HEAD
-
-Previous HEAD position was 24c5742 unrelatedpick
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-error: Entry 'unrelated' not uptodate. Cannot merge.
-fatal: Could not reset index file to revision 'df2a63d8a410bba7d3f608203e12bb371c76d4a8'.
-fatal: cherry-pick failed
-foo: needs merge
-unrelated: needs update
-Updated 1 path from the index
-ok 31 - --abort refuses to clobber unrelated change, harder case
-
-expecting success of 3510.32 'cherry-pick still writes sequencer state when one commit is left': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick base..picked &&
-	test_path_is_dir .git/sequencer &&
-	echo "resolved" >foo &&
-	git add foo &&
-	git commit &&
-	{
-		git rev-list HEAD |
-		git diff-tree --root --stdin |
-		sed "s/$OID_REGEX/OBJID/g"
-	} >actual &&
-	cat >expect <<-\EOF &&
-	OBJID
-	:100644 100644 OBJID OBJID M	foo
-	OBJID
-	:100644 100644 OBJID OBJID M	unrelated
-	OBJID
-	:000000 100644 OBJID OBJID A	foo
-	:000000 100644 OBJID OBJID A	unrelated
-	EOF
-	test_cmp expect actual
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD 9781982] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 32 - cherry-pick still writes sequencer state when one commit is left
-
-expecting success of 3510.33 '--abort after last commit in sequence': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick base..picked &&
-	git cherry-pick --abort &&
-	test_path_is_missing .git/sequencer &&
-	test_path_is_missing .git/CHERRY_PICK_HEAD &&
-	test_cmp_rev initial HEAD &&
-	git update-index --refresh &&
-	git diff-index --exit-code HEAD
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  9781982 picked
-  c738c4d unrelatedpick
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-ok 33 - --abort after last commit in sequence
-
-expecting success of 3510.34 'cherry-pick does not implicitly stomp an existing operation': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick base..anotherpick &&
-	test-tool chmtime --get .git/sequencer >expect &&
-	test_expect_code 128 git cherry-pick unrelatedpick &&
-	test-tool chmtime --get .git/sequencer >actual &&
-	test_cmp expect actual
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-error: Cherry-picking 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: cherry-pick failed
-ok 34 - cherry-pick does not implicitly stomp an existing operation
-
-expecting success of 3510.35 '--continue complains when no cherry-pick is in progress': 
-	pristine_detach initial &&
-	test_expect_code 128 git cherry-pick --continue
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  c738c4d unrelatedpick
-
-HEAD is now at df2a63d initial
-error: no cherry-pick or revert in progress
-fatal: cherry-pick failed
-ok 35 - --continue complains when no cherry-pick is in progress
-
-expecting success of 3510.36 '--continue complains when there are unresolved conflicts': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick base..anotherpick &&
-	test_expect_code 128 git cherry-pick --continue
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-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	foo
-ok 36 - --continue complains when there are unresolved conflicts
-
-expecting success of 3510.37 '--continue of single cherry-pick': 
-	pristine_detach initial &&
-	echo c >expect &&
-	test_must_fail git cherry-pick picked &&
-	echo c >foo &&
-	git add foo &&
-	git cherry-pick --continue &&
-
-	test_cmp expect foo &&
-	test_cmp_rev initial HEAD^ &&
-	git diff --exit-code HEAD &&
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  c738c4d unrelatedpick
-
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD 9aabd79] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-ok 37 - --continue of single cherry-pick
-
-expecting success of 3510.38 '--continue of single revert': 
-	pristine_detach initial &&
-	echo resolved >expect &&
-	echo "Revert \"picked\"" >expect.msg &&
-	test_must_fail git revert picked &&
-	echo resolved >foo &&
-	git add foo &&
-	git cherry-pick --continue &&
-
-	git diff --exit-code HEAD &&
-	test_cmp expect foo &&
-	test_cmp_rev initial HEAD^ &&
-	git diff-tree -s --pretty=tformat:%s HEAD >msg &&
-	test_cmp expect.msg msg &&
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
-	test_must_fail git rev-parse --verify REVERT_HEAD
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  9aabd79 picked
-
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert fdc0b12... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-[detached HEAD 267eac8] Revert "picked"
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 38 - --continue of single revert
-
-expecting success of 3510.39 '--continue after resolving conflicts': 
-	pristine_detach initial &&
-	echo d >expect &&
-	cat >expect.log <<-\EOF &&
-	OBJID
-	:100644 100644 OBJID OBJID M	foo
-	OBJID
-	:100644 100644 OBJID OBJID M	foo
-	OBJID
-	:100644 100644 OBJID OBJID M	unrelated
-	OBJID
-	:000000 100644 OBJID OBJID A	foo
-	:000000 100644 OBJID OBJID A	unrelated
-	EOF
-	test_must_fail git cherry-pick base..anotherpick &&
-	echo c >foo &&
-	git add foo &&
-	git cherry-pick --continue &&
-	{
-		git rev-list HEAD |
-		git diff-tree --root --stdin |
-		sed "s/$OID_REGEX/OBJID/g"
-	} >actual.log &&
-	test_cmp expect foo &&
-	test_cmp expect.log actual.log
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  267eac8 Revert "picked"
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD 43fe10f] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 3b1768d] anotherpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 39 - --continue after resolving conflicts
-
-expecting success of 3510.40 '--continue after resolving conflicts and committing': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick base..anotherpick &&
-	echo "c" >foo &&
-	git add foo &&
-	git commit &&
-	git cherry-pick --continue &&
-	test_path_is_missing .git/sequencer &&
-	{
-		git rev-list HEAD |
-		git diff-tree --root --stdin |
-		sed "s/$OID_REGEX/OBJID/g"
-	} >actual &&
-	cat >expect <<-\EOF &&
-	OBJID
-	:100644 100644 OBJID OBJID M	foo
-	OBJID
-	:100644 100644 OBJID OBJID M	foo
-	OBJID
-	:100644 100644 OBJID OBJID M	unrelated
-	OBJID
-	:000000 100644 OBJID OBJID A	foo
-	:000000 100644 OBJID OBJID A	unrelated
-	EOF
-	test_cmp expect actual
-
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  3b1768d anotherpick
-  43fe10f picked
-  c738c4d unrelatedpick
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD 43fe10f] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 3b1768d] anotherpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 40 - --continue after resolving conflicts and committing
-
-expecting success of 3510.41 '--continue asks for help after resolving patch to nil': 
-	pristine_detach conflicting &&
-	test_must_fail git cherry-pick initial..picked &&
-
-	test_cmp_rev unrelatedpick CHERRY_PICK_HEAD &&
-	git checkout HEAD -- unrelated &&
-	test_must_fail git cherry-pick --continue 2>msg &&
-	test_grep "The previous cherry-pick is now empty" msg
-
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  3b1768d anotherpick
-  43fe10f picked
-  c738c4d unrelatedpick
-
-HEAD is now at d520364 conflicting
-[detached HEAD 838794c] base
- 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 unrelated
-CONFLICT (content): Merge conflict in unrelated
-error: could not apply 24c5742... unrelatedpick
-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"
-HEAD detached from d520364
-You are currently cherry-picking commit 24c5742.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	msg
-
-nothing added to commit but untracked files present (use "git add" to track)
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-ok 41 - --continue asks for help after resolving patch to nil
-
-expecting success of 3510.42 'follow advice and skip nil patch': 
-	pristine_detach conflicting &&
-	test_must_fail git cherry-pick initial..picked &&
-
-	git checkout HEAD -- unrelated &&
-	test_must_fail git cherry-pick --continue &&
-	git reset &&
-	git cherry-pick --continue &&
-
-	git rev-list initial..HEAD >commits &&
-	test_line_count = 3 commits
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  838794c base
-
-HEAD is now at d520364 conflicting
-[detached HEAD 838794c] base
- 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 unrelated
-CONFLICT (content): Merge conflict in unrelated
-error: could not apply 24c5742... unrelatedpick
-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"
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
-
-    git commit --allow-empty
-
-Otherwise, please use 'git cherry-pick --skip'
-HEAD detached from d520364
-You are currently cherry-picking commit 24c5742.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
-
-nothing to commit, working tree clean
-[detached HEAD fef14ec] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 42 - follow advice and skip nil patch
-
-expecting success of 3510.43 '--continue respects opts': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick -x base..anotherpick &&
-	echo "c" >foo &&
-	git add foo &&
-	git commit &&
-	git cherry-pick --continue &&
-	test_path_is_missing .git/sequencer &&
-	git cat-file commit HEAD >anotherpick_msg &&
-	git cat-file commit HEAD~1 >picked_msg &&
-	git cat-file commit HEAD~2 >unrelatedpick_msg &&
-	git cat-file commit HEAD~3 >initial_msg &&
-	! grep "cherry picked from" initial_msg &&
-	grep "cherry picked from" unrelatedpick_msg &&
-	grep "cherry picked from" picked_msg &&
-	grep "cherry picked from" anotherpick_msg
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  fef14ec picked
-  838794c base
-
-HEAD is now at df2a63d initial
-[detached HEAD a731ebf] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD 4d735ac] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 3834c90] anotherpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-(cherry picked from commit 24c574226938b210285578b30b436ec6119f7a7d)
-(cherry picked from commit fdc0b12b2eb6de44c0df7d41b045ab2b44b6c37c)
-(cherry picked from commit 965fed4c41239668ada422bca0c600444cc00e82)
-ok 43 - --continue respects opts
-
-expecting success of 3510.44 '--continue of single-pick respects -x': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick -x picked &&
-	echo c >foo &&
-	git add foo &&
-	git cherry-pick --continue &&
-	test_path_is_missing .git/sequencer &&
-	git cat-file commit HEAD >msg &&
-	grep "cherry picked from" msg
-
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  3834c90 anotherpick
-  4d735ac picked
-  a731ebf unrelatedpick
-
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD 775318b] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-(cherry picked from commit fdc0b12b2eb6de44c0df7d41b045ab2b44b6c37c)
-ok 44 - --continue of single-pick respects -x
-
-expecting success of 3510.45 '--continue respects -x in first commit in multi-pick': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick -x picked anotherpick &&
-	echo c >foo &&
-	git add foo &&
-	git cherry-pick --continue &&
-	test_path_is_missing .git/sequencer &&
-	git cat-file commit HEAD^ >msg &&
-	picked=$(git rev-parse --verify picked) &&
-	grep "cherry picked from.*$picked" msg
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  775318b picked
-
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD 775318b] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD d310f74] anotherpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-(cherry picked from commit fdc0b12b2eb6de44c0df7d41b045ab2b44b6c37c)
-ok 45 - --continue respects -x in first commit in multi-pick
-
-checking known breakage of 3510.46 '--signoff is automatically propagated to resolved conflict': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick --signoff base..anotherpick &&
-	echo "c" >foo &&
-	git add foo &&
-	git commit &&
-	git cherry-pick --continue &&
-	test_path_is_missing .git/sequencer &&
-	git cat-file commit HEAD >anotherpick_msg &&
-	git cat-file commit HEAD~1 >picked_msg &&
-	git cat-file commit HEAD~2 >unrelatedpick_msg &&
-	git cat-file commit HEAD~3 >initial_msg &&
-	! grep "Signed-off-by:" initial_msg &&
-	grep "Signed-off-by:" unrelatedpick_msg &&
-	! grep "Signed-off-by:" picked_msg &&
-	grep "Signed-off-by:" anotherpick_msg
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  d310f74 anotherpick
-  775318b picked
-
-HEAD is now at df2a63d initial
-[detached HEAD 9b2cda6] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD f7bab3d] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD cf7cfba] anotherpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Signed-off-by: C O Mitter <committer@example.com>
-Signed-off-by: C O Mitter <committer@example.com>
-not ok 46 - --signoff is automatically propagated to resolved conflict # TODO known breakage
-
-checking known breakage of 3510.47 '--signoff dropped for implicit commit of resolution, multi-pick case': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick -s picked anotherpick &&
-	echo c >foo &&
-	git add foo &&
-	git cherry-pick --continue &&
-
-	git diff --exit-code HEAD &&
-	test_cmp_rev initial HEAD^^ &&
-	git cat-file commit HEAD^ >msg &&
-	! grep Signed-off-by: msg
-
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  cf7cfba anotherpick
-  f7bab3d picked
-  9b2cda6 unrelatedpick
-
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD c80a680] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD d9a8514] anotherpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Signed-off-by: C O Mitter <committer@example.com>
-not ok 47 - --signoff dropped for implicit commit of resolution, multi-pick case # TODO known breakage
-
-checking known breakage of 3510.48 'sign-off needs to be reaffirmed after conflict resolution, single-pick case': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick -s picked &&
-	echo c >foo &&
-	git add foo &&
-	git cherry-pick --continue &&
-
-	git diff --exit-code HEAD &&
-	test_cmp_rev initial HEAD^ &&
-	git cat-file commit HEAD >msg &&
-	! grep Signed-off-by: msg
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  d9a8514 anotherpick
-  c80a680 picked
-
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD c80a680] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Signed-off-by: C O Mitter <committer@example.com>
-not ok 48 - sign-off needs to be reaffirmed after conflict resolution, single-pick case # TODO known breakage
-
-expecting success of 3510.49 'malformed instruction sheet 1': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick base..anotherpick &&
-	echo "resolved" >foo &&
-	git add foo &&
-	git commit &&
-	sed "s/pick /pick/" .git/sequencer/todo >new_sheet &&
-	cp new_sheet .git/sequencer/todo &&
-	test_expect_code 128 git cherry-pick --continue
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  c80a680 picked
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD 9781982] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: invalid command 'pickfdc0b12'
-error: invalid line 1: pickfdc0b12 picked
-error: invalid command 'pick965fed4'
-error: invalid line 2: pick965fed4 anotherpick
-error: unusable instruction sheet: '.git/sequencer/todo'
-fatal: cherry-pick failed
-ok 49 - malformed instruction sheet 1
-
-expecting success of 3510.50 'malformed instruction sheet 2': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick base..anotherpick &&
-	echo "resolved" >foo &&
-	git add foo &&
-	git commit &&
-	sed "s/pick/revert/" .git/sequencer/todo >new_sheet &&
-	cp new_sheet .git/sequencer/todo &&
-	test_expect_code 128 git cherry-pick --continue
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  9781982 picked
-  c738c4d unrelatedpick
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD 9781982] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: cannot cherry-pick during a revert.
-fatal: cherry-pick failed
-ok 50 - malformed instruction sheet 2
-
-expecting success of 3510.51 'empty commit set (no commits to walk)': 
-	pristine_detach initial &&
-	test_expect_code 128 git cherry-pick base..base
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  9781982 picked
-  c738c4d unrelatedpick
-
-HEAD is now at df2a63d initial
-error: empty commit set passed
-fatal: cherry-pick failed
-ok 51 - empty commit set (no commits to walk)
-
-expecting success of 3510.52 'empty commit set (culled during walk)': 
-	pristine_detach initial &&
-	test_expect_code 128 git cherry-pick -2 --author=no.such.author base
-
-HEAD is now at df2a63d initial
-error: empty commit set passed
-fatal: cherry-pick failed
-ok 52 - empty commit set (culled during walk)
-
-expecting success of 3510.53 'malformed instruction sheet 3': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick base..anotherpick &&
-	echo "resolved" >foo &&
-	git add foo &&
-	git commit &&
-	sed "s/pick \([0-9a-f]*\)/pick $_r10/" .git/sequencer/todo >new_sheet &&
-	cp new_sheet .git/sequencer/todo &&
-	test_expect_code 128 git cherry-pick --continue
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD 9781982] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: could not parse 'fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12'
-error: invalid line 1: pick fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12fdc0b12 picked
-error: could not parse '965fed4965fed4965fed4965fed4965fed4965fed4965fed4965fed4965fed4965fed4'
-error: invalid line 2: pick 965fed4965fed4965fed4965fed4965fed4965fed4965fed4965fed4965fed4965fed4 anotherpick
-error: unusable instruction sheet: '.git/sequencer/todo'
-fatal: cherry-pick failed
-ok 53 - malformed instruction sheet 3
-
-expecting success of 3510.54 'instruction sheet, fat-fingers version': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick base..anotherpick &&
-	echo "c" >foo &&
-	git add foo &&
-	git commit &&
-	sed "s/pick \([0-9a-f]*\)/pick 	 \1 	/" .git/sequencer/todo >new_sheet &&
-	cp new_sheet .git/sequencer/todo &&
-	git cherry-pick --continue
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  9781982 picked
-  c738c4d unrelatedpick
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD 43fe10f] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 3b1768d] anotherpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 54 - instruction sheet, fat-fingers version
-
-expecting success of 3510.55 'commit descriptions in insn sheet are optional': 
-	pristine_detach initial &&
-	test_expect_code 1 git cherry-pick base..anotherpick &&
-	echo "c" >foo &&
-	git add foo &&
-	git commit &&
-	cut -d" " -f1,2 .git/sequencer/todo >new_sheet &&
-	cp new_sheet .git/sequencer/todo &&
-	git cherry-pick --continue &&
-	test_path_is_missing .git/sequencer &&
-	git rev-list HEAD >commits &&
-	test_line_count = 4 commits
-
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  3b1768d anotherpick
-  43fe10f picked
-  c738c4d unrelatedpick
-
-HEAD is now at df2a63d initial
-[detached HEAD c738c4d] unrelatedpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply fdc0b12... picked
-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"
-[detached HEAD 43fe10f] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 3b1768d] anotherpick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 55 - commit descriptions in insn sheet are optional
-
-# still have 3 known breakage(s)
-# passed all remaining 52 test(s)
-1..55
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3902-quoted.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3705-add-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+	git config core.symlinks 0 &&
+	echo new > file &&
+	echo new > symlink &&
+	git add file symlink &&
+	git ls-files --stage | grep "^100755 .* 0	file$" &&
+	git ls-files --stage | grep "^120000 .* 0	symlink$"
 
-[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
+rm 'file'
+rm 'symlink'
+100755 3e757656cf36eca53338e520d134963a44f793f8 0	file
+120000 3e757656cf36eca53338e520d134963a44f793f8 0	symlink
+ok 23 - git add with filemode=0, symlinks=0 prefers stage 2 over stage 1
 
-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 &&
+expecting success of 3700.24 'git add --refresh': 
+	>foo && git add foo && git commit -a -m "commit all" &&
+	test -z "$(git diff-index HEAD -- foo)" &&
+	git read-tree HEAD &&
+	case "$(git diff-index HEAD -- foo)" in
+	:100644" "*"M	foo") echo pass;;
+	*) echo fail; false;;
+	esac &&
+	git add --refresh -- foo &&
+	test -z "$(git diff-index HEAD -- foo)"
 
-	git update-index --no-skip-worktree sparse_entry &&
-	test_must_fail git add sparse_entry &&
-	test_sparse_entry_unstaged &&
+[master (root-commit) 0254e3c] commit all
+ Author: A U Thor <author@example.com>
+ 6 files changed, 2 insertions(+)
+ create mode 100644 1/2/a
+ create mode 100644 1/2/c
+ create mode 100644 1/3/b
+ create mode 100755 file
+ create mode 100644 foo
+ create mode 120000 symlink
+pass
+ok 24 - git add --refresh
 
-	test_must_fail git add --chmod=+x sparse_entry &&
-	test_sparse_entry_unstaged &&
+expecting success of 3700.25 'git add --refresh with pathspec': 
+	git reset --hard &&
+	echo >foo && echo >bar && echo >baz &&
+	git add foo bar baz && H=$(git rev-parse :foo) && git rm -f foo &&
+	echo "100644 $H 3	foo" | git update-index --index-info &&
+	test-tool chmtime -60 bar baz &&
+	git add --refresh bar >actual &&
+	test_must_be_empty actual &&
 
-	test_must_fail git add --renormalize sparse_entry &&
-	test_sparse_entry_unstaged &&
+	git diff-files --name-only >actual &&
+	! grep bar actual &&
+	grep baz actual
 
-	# 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 &&
+HEAD is now at 0254e3c commit all
+rm 'foo'
+baz
+ok 25 - git add --refresh with pathspec
 
-	git add --sparse --chmod=+x sparse_entry 2>stderr &&
-	test_must_be_empty stderr &&
-	git ls-files --stage >actual &&
-	grep "^100755 .*sparse_entry\$" actual &&
+expecting success of 3700.26 'git add --refresh correctly reports no match error': 
+	echo "fatal: pathspec ':(icase)nonexistent' did not match any files" >expect &&
+	test_must_fail git add --refresh ':(icase)nonexistent' 2>actual &&
+	test_cmp expect actual
 
-	git reset &&
+ok 26 - git add --refresh correctly reports no match error
 
-	# This will print a message over stderr on Windows.
-	git add --sparse --renormalize sparse_entry &&
-	git status --porcelain >actual &&
-	grep "^M  sparse_entry\$" actual
+checking prerequisite: SANITY
 
-[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
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-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
+	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"
 
-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
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-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
+	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 3700.27 'git add should fail atomically upon an unreadable file': 
+	git reset --hard &&
+	date >foo1 &&
+	date >foo2 &&
+	chmod 0 foo2 &&
+	test_must_fail git add --verbose . &&
+	! ( git ls-files foo1 | grep foo1 )
 
-[master 91ae5df] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 17 - add obeys advice.updateSparsePath
+HEAD is now at 0254e3c commit all
+error: open("foo2"): Permission denied
+error: unable to index file 'foo2'
+fatal: adding files failed
+add '-q'
+add '.gitignore'
+add 'a.if'
+add 'actual'
+add 'added_files2_actual'
+add 'added_files2_oids'
+add 'added_files_actual'
+add 'added_files_oids'
+add 'b.if'
+add 'c.if/c.if'
+add 'expect'
+add 'files'
+add 'files_base_dir1/dir1/file1.txt'
+add 'files_base_dir1/dir1/file2.txt'
+add 'files_base_dir1/dir1/file3.txt'
+add 'files_base_dir1/dir1/file4.txt'
+add 'files_base_dir1/dir2/file1.txt'
+add 'files_base_dir1/dir2/file2.txt'
+add 'files_base_dir1/dir2/file3.txt'
+add 'files_base_dir1/dir2/file4.txt'
+add 'files_base_dir2/dir1/file1.txt'
+add 'files_base_dir2/dir1/file2.txt'
+add 'files_base_dir2/dir1/file3.txt'
+add 'files_base_dir2/dir1/file4.txt'
+add 'files_base_dir2/dir2/file1.txt'
+add 'files_base_dir2/dir2/file2.txt'
+add 'files_base_dir2/dir2/file3.txt'
+add 'files_base_dir2/dir2/file4.txt'
+add 'foo1'
+ok 27 - git add should fail atomically upon an unreadable file
 
-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
+expecting success of 3700.28 'git add --ignore-errors': 
+	git reset --hard &&
+	date >foo1 &&
+	date >foo2 &&
+	chmod 0 foo2 &&
+	test_must_fail git add --verbose --ignore-errors . &&
+	git ls-files foo1 | grep foo1
 
-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
+HEAD is now at 0254e3c commit all
+error: open("foo2"): Permission denied
+error: unable to index file 'foo2'
+add '-q'
+add '.gitignore'
+add 'a.if'
+add 'actual'
+add 'added_files2_actual'
+add 'added_files2_oids'
+add 'added_files_actual'
+add 'added_files_oids'
+add 'b.if'
+add 'c.if/c.if'
+add 'expect'
+add 'files'
+add 'files_base_dir1/dir1/file1.txt'
+add 'files_base_dir1/dir1/file2.txt'
+add 'files_base_dir1/dir1/file3.txt'
+add 'files_base_dir1/dir1/file4.txt'
+add 'files_base_dir1/dir2/file1.txt'
+add 'files_base_dir1/dir2/file2.txt'
+add 'files_base_dir1/dir2/file3.txt'
+add 'files_base_dir1/dir2/file4.txt'
+add 'files_base_dir2/dir1/file1.txt'
+add 'files_base_dir2/dir1/file2.txt'
+add 'files_base_dir2/dir1/file3.txt'
+add 'files_base_dir2/dir1/file4.txt'
+add 'files_base_dir2/dir2/file1.txt'
+add 'files_base_dir2/dir2/file2.txt'
+add 'files_base_dir2/dir2/file3.txt'
+add 'files_base_dir2/dir2/file4.txt'
+add 'foo1'
+add 'stage1'
+add 'stage2'
+add 'stage3'
+add 'sub/.gitignore'
+add 'sub/dir/a.ig'
+add 'xfoo1'
+add 'xfoo2'
+add 'xfoo3'
+foo1
+ok 28 - git add --ignore-errors
 
-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
+expecting success of 3700.29 'git add (add.ignore-errors)': 
+	git config add.ignore-errors 1 &&
+	git reset --hard &&
+	date >foo1 &&
+	date >foo2 &&
+	chmod 0 foo2 &&
+	test_must_fail git add --verbose . &&
+	git ls-files foo1 | grep foo1
 
-ok 19 - can add files from non-sparse dir
+HEAD is now at 0254e3c commit all
+error: open("foo2"): Permission denied
+error: unable to index file 'foo2'
+add 'a.ig'
+add 'c.if/c.ig'
+add 'd.ig/d.if'
+add 'd.ig/d.ig'
+add 'foo1'
+add 'sub/a.ig'
+foo1
+ok 29 - git add (add.ignore-errors)
 
-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
+expecting success of 3700.30 'git add (add.ignore-errors = false)': 
+	git config add.ignore-errors 0 &&
+	git reset --hard &&
+	date >foo1 &&
+	date >foo2 &&
+	chmod 0 foo2 &&
+	test_must_fail git add --verbose . &&
+	! ( git ls-files foo1 | grep foo1 )
 
-ok 20 - refuse to add non-skip-worktree file from sparse dir
+HEAD is now at 0254e3c commit all
+error: open("foo2"): Permission denied
+error: unable to index file 'foo2'
+fatal: adding files failed
+add 'foo1'
+ok 30 - git add (add.ignore-errors = false)
 
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3900-i18n-commit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3900-i18n-commit/.git/
-expecting success of 3900.1 'setup': 
-	: >F &&
-	git add F &&
-	T=$(git write-tree) &&
-	C=$(git commit-tree $T <"$TEST_DIRECTORY"/t3900/1-UTF-8.txt) &&
-	git update-ref HEAD $C &&
-	git tag C0
+expecting success of 3700.31 '--no-ignore-errors overrides config': 
+	git config add.ignore-errors 1 &&
+	git reset --hard &&
+	date >foo1 &&
+	date >foo2 &&
+	chmod 0 foo2 &&
+	test_must_fail git add --verbose --no-ignore-errors . &&
+	! ( git ls-files foo1 | grep foo1 ) &&
+	git config add.ignore-errors 0
 
-ok 1 - setup
+HEAD is now at 0254e3c commit all
+error: open("foo2"): Permission denied
+error: unable to index file 'foo2'
+fatal: adding files failed
+add 'foo1'
+ok 31 - --no-ignore-errors overrides config
 
-expecting success of 3900.2 'no encoding header for base case': 
-	E=$(git cat-file commit C0 | sed -ne "s/^encoding //p") &&
-	test z = "z$E"
+expecting success of 3700.32 'git add 'fo\[ou\]bar' ignores foobar': 
+	git reset --hard &&
+	touch fo\[ou\]bar foobar &&
+	git add 'fo\[ou\]bar' &&
+	git ls-files fo\[ou\]bar | grep -F fo\[ou\]bar &&
+	! ( git ls-files foobar | grep foobar )
 
-ok 2 - no encoding header for base case
+HEAD is now at 0254e3c commit all
+fo[ou]bar
+ok 32 - git add 'fo\[ou\]bar' ignores foobar
 
-expecting success of 3900.3 'UTF-16 refused because of NULs': 
-	echo UTF-16 >F &&
-	test_must_fail git commit -a -F "$TEST_DIRECTORY"/t3900/UTF-16.txt
+expecting success of 3700.33 'git add to resolve conflicts on otherwise ignored path': 
+	git reset --hard &&
+	H=$(git rev-parse :1/2/a) &&
+	(
+		echo "100644 $H 1	track-this" &&
+		echo "100644 $H 3	track-this"
+	) | git update-index --index-info &&
+	echo track-this >>.gitignore &&
+	echo resolved >track-this &&
+	git add track-this
 
-error: a NUL byte in commit log message not allowed.
-fatal: failed to write commit object
-ok 3 - UTF-16 refused because of NULs
+HEAD is now at 0254e3c commit all
+ok 33 - git add to resolve conflicts on otherwise ignored path
 
-expecting success of 3900.4 'UTF-8 invalid characters refused': 
-	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
-	echo "UTF-8 characters" >F &&
-	printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
-		>"$HOME/invalid" &&
-	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
-	test_grep "did not conform" "$HOME"/stderr
+expecting success of 3700.34 '"add non-existent" should fail': 
+	test_must_fail git add non-existent &&
+	! (git ls-files | grep "non-existent")
 
-[master 97e22ab] Commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Warning: commit message did not conform to UTF-8.
-ok 4 - UTF-8 invalid characters refused
+fatal: pathspec 'non-existent' did not match any files
+ok 34 - "add non-existent" should fail
 
-expecting success of 3900.5 'UTF-8 overlong sequences rejected': 
-	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
-	rm -f "$HOME/stderr" "$HOME/invalid" &&
-	echo "UTF-8 overlong" >F &&
-	printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
-		>"$HOME/invalid" &&
-	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
-	test_grep "did not conform" "$HOME"/stderr
+expecting success of 3700.35 'git add -A on empty repo does not error out': 
+	rm -fr empty &&
+	git init empty &&
+	(
+		cd empty &&
+		git add -A . &&
+		git add -A
+	)
 
-[master f17d203] à‚©ommit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Warning: commit message did not conform to UTF-8.
-ok 5 - UTF-8 overlong sequences rejected
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/empty/.git/
+ok 35 - git add -A on empty repo does not error out
 
-expecting success of 3900.6 'UTF-8 non-characters refused': 
-	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
-	echo "UTF-8 non-character 1" >F &&
-	printf "Commit message\n\nNon-character:\364\217\277\276\n" \
-		>"$HOME/invalid" &&
-	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
-	test_grep "did not conform" "$HOME"/stderr
+expecting success of 3700.36 '"git add ." in empty repo': 
+	rm -fr empty &&
+	git init empty &&
+	(
+		cd empty &&
+		git add .
+	)
 
-[master b54194f] Commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Warning: commit message did not conform to UTF-8.
-ok 6 - UTF-8 non-characters refused
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/empty/.git/
+ok 36 - "git add ." in empty repo
 
-expecting success of 3900.7 'UTF-8 non-characters refused': 
-	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
-	echo "UTF-8 non-character 2." >F &&
-	printf "Commit message\n\nNon-character:\357\267\220\n" \
-		>"$HOME/invalid" &&
-	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
-	test_grep "did not conform" "$HOME"/stderr
+expecting success of 3700.37 '"git add" a embedded repository': 
+	rm -fr outer && git init outer &&
+	(
+		cd outer &&
+		for i in 1 2
+		do
+			name=inner$i &&
+			git init $name &&
+			git -C $name commit --allow-empty -m $name ||
+				return 1
+		done &&
+		git add . 2>actual &&
+		cat >expect <<-EOF &&
+		warning: adding embedded git repository: inner1
+		hint: You${SQ}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> inner1
+		hint:
+		hint: If you added this path by mistake, you can remove it from the
+		hint: index with:
+		hint:
+		hint: 	git rm --cached inner1
+		hint:
+		hint: See "git help submodule" for more information.
+		hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+		warning: adding embedded git repository: inner2
+		EOF
+		test_cmp expect actual
+	)
 
-[master 65f731d] Commit message
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/outer/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/outer/inner1/.git/
+[master (root-commit) c5e40ca] inner1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Warning: commit message did not conform to UTF-8.
-ok 7 - UTF-8 non-characters refused
-
-expecting success of 3900.8 'ISO8859-1 setup': 
-		git config i18n.commitencoding $H &&
-		git checkout -b $H C0 &&
-		echo $H >F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
-	
-Switched to a new branch 'ISO8859-1'
-[ISO8859-1 37233ac] ÄËÑÏÖ
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/outer/inner2/.git/
+[master (root-commit) 3c517b1] inner2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 8 - ISO8859-1 setup
+ok 37 - "git add" a embedded repository
 
-expecting success of 3900.9 'eucJP setup': 
-		git config i18n.commitencoding $H &&
-		git checkout -b $H C0 &&
-		echo $H >F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
-	
-Switched to a new branch 'eucJP'
-[eucJP 2d12add] ¤Ï¤ì¤Ò¤Û¤Õ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 9 - eucJP setup
+expecting success of 3700.38 'error on a repository with no commits': 
+	rm -fr empty &&
+	git init empty &&
+	test_must_fail git add empty >actual 2>&1 &&
+	cat >expect <<-EOF &&
+	error: 'empty/' does not have a commit checked out
+	fatal: adding files failed
+	EOF
+	test_cmp expect actual
 
-expecting success of 3900.10 'ISO-2022-JP setup': 
-		git config i18n.commitencoding $H &&
-		git checkout -b $H C0 &&
-		echo $H >F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
-	
-Switched to a new branch 'ISO-2022-JP'
-[ISO-2022-JP ae78d6f] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 10 - ISO-2022-JP setup
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/empty/.git/
+ok 38 - error on a repository with no commits
 
-expecting success of 3900.11 'check encoding header for ISO8859-1': 
-		E=$(git cat-file commit ISO8859-1 | sed -ne "s/^encoding //p") &&
-		test "z$E" = "zISO8859-1"
-	
-ok 11 - check encoding header for ISO8859-1
+expecting success of 3700.39 'git add --dry-run of existing changed file': 
+	echo new >>track-this &&
+	git add --dry-run track-this >actual 2>&1 &&
+	echo "add 'track-this'" | test_cmp - actual
 
-expecting success of 3900.12 'check encoding header for eucJP': 
-		E=$(git cat-file commit eucJP | sed -ne "s/^encoding //p") &&
-		test "z$E" = "zeucJP"
-	
-ok 12 - check encoding header for eucJP
+ok 39 - git add --dry-run of existing changed file
 
-expecting success of 3900.13 'check encoding header for ISO-2022-JP': 
-		E=$(git cat-file commit ISO-2022-JP | sed -ne "s/^encoding //p") &&
-		test "z$E" = "zISO-2022-JP"
-	
-ok 13 - check encoding header for ISO-2022-JP
+expecting success of 3700.40 'git add --dry-run of non-existing file': 
+	echo ignored-file >>.gitignore &&
+	test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
 
-expecting success of 3900.14 'config to remove customization': 
-	git config --unset-all i18n.commitencoding &&
-	if Z=$(git config --get-all i18n.commitencoding)
-	then
-		echo Oops, should have failed.
-		false
-	else
-		test z = "z$Z"
-	fi &&
-	git config i18n.commitencoding UTF-8
+ok 40 - git add --dry-run of non-existing file
 
-ok 14 - config to remove customization
+expecting success of 3700.41 'git add --dry-run of an existing file output': 
+	echo "fatal: pathspec 'ignored-file' did not match any files" >expect &&
+	test_cmp expect actual
 
-expecting success of 3900.15 'ISO8859-1 should be shown in UTF-8 now': 
-	compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
+ok 41 - git add --dry-run of an existing file output
 
-ok 15 - ISO8859-1 should be shown in UTF-8 now
+expecting success of 3700.42 'git add --dry-run --ignore-missing of non-existing file': 
+	test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err
 
-expecting success of 3900.16 'eucJP should be shown in UTF-8 now': 
-		compare_with eucJP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-	
-ok 16 - eucJP should be shown in UTF-8 now
+ok 42 - git add --dry-run --ignore-missing of non-existing file
 
-expecting success of 3900.17 'ISO-2022-JP should be shown in UTF-8 now': 
-		compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-	
-ok 17 - ISO-2022-JP should be shown in UTF-8 now
+expecting success of 3700.43 'git add --dry-run --ignore-missing of non-existing file output': 
+	test_cmp expect.out actual.out &&
+	test_cmp expect.err actual.err
 
-expecting success of 3900.18 'config to add customization': 
-	git config --unset-all i18n.commitencoding &&
-	if Z=$(git config --get-all i18n.commitencoding)
-	then
-		echo Oops, should have failed.
-		false
-	else
-		test z = "z$Z"
-	fi
+ok 43 - git add --dry-run --ignore-missing of non-existing file output
 
-ok 18 - config to add customization
+expecting success of 3700.44 'git add --dry-run --interactive should fail': 
+	test_must_fail git add --dry-run --interactive
 
-expecting success of 3900.19 'ISO8859-1 should be shown in itself now': 
-		git config i18n.commitencoding ISO8859-1 &&
-		compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/ISO8859-1.txt
-	
-ok 19 - ISO8859-1 should be shown in itself now
+fatal: options '--dry-run' and '--interactive/--patch' cannot be used together
+ok 44 - git add --dry-run --interactive should fail
 
-expecting success of 3900.20 'eucJP should be shown in itself now': 
-		git config i18n.commitencoding eucJP &&
-		compare_with eucJP "$TEST_DIRECTORY"/t3900/eucJP.txt
-	
-ok 20 - eucJP should be shown in itself now
+expecting success of 3700.45 'git add empty string should fail': 
+	test_must_fail git add ""
 
-expecting success of 3900.21 'ISO-2022-JP should be shown in itself now': 
-		git config i18n.commitencoding ISO-2022-JP &&
-		compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt
-	
-ok 21 - ISO-2022-JP should be shown in itself now
+fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
+ok 45 - git add empty string should fail
 
-expecting success of 3900.22 'config to tweak customization': 
-	git config i18n.logoutputencoding UTF-8
+expecting success of 3700.46 'git add --chmod=[+-]x stages correctly': 
+	rm -f foo1 &&
+	echo foo >foo1 &&
+	git add --chmod=+x foo1 &&
+	test_mode_in_index 100755 foo1 &&
+	git add --chmod=-x foo1 &&
+	test_mode_in_index 100644 foo1
 
-ok 22 - config to tweak customization
+pass
+pass
+ok 46 - git add --chmod=[+-]x stages correctly
 
-expecting success of 3900.23 'ISO8859-1 should be shown in UTF-8 now': 
-	compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
+expecting success of 3700.47 'git add --chmod=+x with symlinks': 
+	git config core.filemode 1 &&
+	git config core.symlinks 1 &&
+	rm -f foo2 &&
+	echo foo >foo2 &&
+	git add --chmod=+x foo2 &&
+	test_mode_in_index 100755 foo2
 
-ok 23 - ISO8859-1 should be shown in UTF-8 now
+pass
+ok 47 - git add --chmod=+x with symlinks
 
-expecting success of 3900.24 'eucJP should be shown in UTF-8 now': 
-		compare_with eucJP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-	
-ok 24 - eucJP should be shown in UTF-8 now
+expecting success of 3700.48 'git add --chmod=[+-]x changes index with already added file': 
+	rm -f foo3 xfoo3 &&
+	git reset --hard &&
+	echo foo >foo3 &&
+	git add foo3 &&
+	git add --chmod=+x foo3 &&
+	test_mode_in_index 100755 foo3 &&
+	echo foo >xfoo3 &&
+	chmod 755 xfoo3 &&
+	git add xfoo3 &&
+	git add --chmod=-x xfoo3 &&
+	test_mode_in_index 100644 xfoo3
 
-expecting success of 3900.25 'ISO-2022-JP should be shown in UTF-8 now': 
-		compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-	
-ok 25 - ISO-2022-JP should be shown in UTF-8 now
+HEAD is now at 0254e3c commit all
+pass
+pass
+ok 48 - git add --chmod=[+-]x changes index with already added file
 
-expecting success of 3900.26 'eucJP should be shown in eucJP now': 
-			compare_with eucJP "$TEST_DIRECTORY"/t3900/eucJP.txt $ICONV
-		
-ok 26 - eucJP should be shown in eucJP now
+expecting success of 3700.49 'git add --chmod=[+-]x does not change the working tree': 
+	echo foo >foo4 &&
+	git add foo4 &&
+	git add --chmod=+x foo4 &&
+	! test -x foo4
 
-expecting success of 3900.27 'ISO-2022-JP should be shown in eucJP now': 
-			compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/eucJP.txt $ICONV
-		
-ok 27 - ISO-2022-JP should be shown in eucJP now
+ok 49 - git add --chmod=[+-]x does not change the working tree
 
-expecting success of 3900.28 'eucJP should be shown in ISO-2022-JP now': 
-			compare_with eucJP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt $ICONV
-		
-ok 28 - eucJP should be shown in ISO-2022-JP now
+expecting success of 3700.50 'git add --chmod fails with non regular files (but updates the other paths)': 
+	git reset --hard &&
+	test_ln_s_add foo foo3 &&
+	touch foo4 &&
+	test_must_fail git add --chmod=+x foo3 foo4 2>stderr &&
+	test_grep "cannot chmod +x .foo3." stderr &&
+	test_mode_in_index 120000 foo3 &&
+	test_mode_in_index 100755 foo4
 
-expecting success of 3900.29 'ISO-2022-JP should be shown in ISO-2022-JP now': 
-			compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt $ICONV
-		
-ok 29 - ISO-2022-JP should be shown in ISO-2022-JP now
+HEAD is now at 0254e3c commit all
+error: cannot chmod +x 'foo3'
+pass
+pass
+ok 50 - git add --chmod fails with non regular files (but updates the other paths)
 
-expecting success of 3900.30 'No conversion with ISO8859-1': 
-		compare_with "--encoding=none ISO8859-1" "$TEST_DIRECTORY"/t3900/ISO8859-1.txt
-	
-ok 30 - No conversion with ISO8859-1
+expecting success of 3700.51 'git add --chmod honors --dry-run': 
+	git reset --hard &&
+	echo foo >foo4 &&
+	git add foo4 &&
+	git add --chmod=+x --dry-run foo4 &&
+	test_mode_in_index 100644 foo4
 
-expecting success of 3900.31 'No conversion with eucJP': 
-		compare_with "--encoding=none eucJP" "$TEST_DIRECTORY"/t3900/eucJP.txt
-	
-ok 31 - No conversion with eucJP
+HEAD is now at 0254e3c commit all
+pass
+ok 51 - git add --chmod honors --dry-run
 
-expecting success of 3900.32 'No conversion with ISO-2022-JP': 
-		compare_with "--encoding=none ISO-2022-JP" "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt
-	
-ok 32 - No conversion with ISO-2022-JP
+expecting success of 3700.52 'git add --chmod --dry-run reports error for non regular files': 
+	git reset --hard &&
+	test_ln_s_add foo foo4 &&
+	test_must_fail git add --chmod=+x --dry-run foo4 2>stderr &&
+	test_grep "cannot chmod +x .foo4." stderr
 
-expecting success of 3900.33 'commit --fixup with eucJP encoding': 
-		git config i18n.commitencoding $H &&
-		git checkout -b $H-$flag C0 &&
-		echo $H >>F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
-		test_tick &&
-		echo intermediate stuff >>G &&
-		git add G &&
-		git commit -a -m "intermediate commit" &&
-		test_tick &&
-		echo $H $flag >>F &&
-		git commit -a --$flag HEAD~1 &&
-		E=$(git cat-file commit eucJP-fixup |
-			sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H" &&
-		git config --unset-all i18n.commitencoding &&
-		git rebase --autosquash -i HEAD^^^ &&
-		git log --oneline >actual &&
-		test_line_count = 3 actual
-	
-Switched to a new branch 'eucJP-fixup'
-[eucJP-fixup 2d12add] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[eucJP-fixup 4164b89] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[eucJP-fixup 762ea33] fixup! $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/eucJP-fixup.
-ok 33 - commit --fixup with eucJP encoding
+HEAD is now at 0254e3c commit all
+error: cannot chmod +x 'foo4'
+ok 52 - git add --chmod --dry-run reports error for non regular files
 
-expecting success of 3900.34 'commit --squash with ISO-2022-JP encoding': 
-		git config i18n.commitencoding $H &&
-		git checkout -b $H-$flag C0 &&
-		echo $H >>F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
-		test_tick &&
-		echo intermediate stuff >>G &&
-		git add G &&
-		git commit -a -m "intermediate commit" &&
-		test_tick &&
-		echo $H $flag >>F &&
-		git commit -a --$flag HEAD~1 &&
-		E=$(git cat-file commit ISO-2022-JP-squash |
-			sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H" &&
-		git config --unset-all i18n.commitencoding &&
-		git rebase --autosquash -i HEAD^^^ &&
-		git log --oneline >actual &&
-		test_line_count = 3 actual
-	
-Switched to a new branch 'ISO-2022-JP-squash'
-[ISO-2022-JP-squash 73be6f0] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ISO-2022-JP-squash 358ea4d] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[ISO-2022-JP-squash 31af1e8] squash! $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
[detached HEAD 452b79b] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Rebasing (3/3)
Successfully rebased and updated refs/heads/ISO-2022-JP-squash.
-ok 34 - commit --squash with ISO-2022-JP encoding
+expecting success of 3700.53 'git add --chmod --dry-run reports error for unmatched pathspec': 
+	test_must_fail git add --chmod=+x --dry-run nonexistent 2>stderr &&
+	test_grep "pathspec .nonexistent. did not match any files" stderr
 
-expecting success of 3900.35 'commit --fixup into UTF-8 from ISO-8859-1': 
-		git checkout -b $flag-$old-$new C0 &&
-		git config i18n.commitencoding $old &&
-		echo $old >>F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
-		test_tick &&
-		echo intermediate stuff >>G &&
-		git add G &&
-		git commit -a -m "intermediate commit" &&
-		test_tick &&
-		git config i18n.commitencoding $new &&
-		echo $new-$flag >>F &&
-		git commit -a --$flag HEAD^ &&
-		git rebase --autosquash -i HEAD^^^ &&
-		git rev-list HEAD >actual &&
-		test_line_count = 3 actual &&
-		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
-		git cat-file commit HEAD^ >raw &&
-		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
-		test_cmp expect actual
-	
-Switched to a new branch 'fixup-UTF-8-ISO-8859-1'
-[fixup-UTF-8-ISO-8859-1 f9ae2e6] ÄËÑ�Ö
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[fixup-UTF-8-ISO-8859-1 2e63169] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[fixup-UTF-8-ISO-8859-1 c8086ca] fixup! ÄËÑ�Ö
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/fixup-UTF-8-ISO-8859-1.
-ok 35 - commit --fixup into UTF-8 from ISO-8859-1
+fatal: pathspec 'nonexistent' did not match any files
+ok 53 - git add --chmod --dry-run reports error for unmatched pathspec
 
-expecting success of 3900.36 'commit --squash into ISO-8859-1 from UTF-8': 
-		git checkout -b $flag-$old-$new C0 &&
-		git config i18n.commitencoding $old &&
-		echo $old >>F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
-		test_tick &&
-		echo intermediate stuff >>G &&
-		git add G &&
-		git commit -a -m "intermediate commit" &&
-		test_tick &&
-		git config i18n.commitencoding $new &&
-		echo $new-$flag >>F &&
-		git commit -a --$flag HEAD^ &&
-		git rebase --autosquash -i HEAD^^^ &&
-		git rev-list HEAD >actual &&
-		test_line_count = 3 actual &&
-		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
-		git cat-file commit HEAD^ >raw &&
-		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
-		test_cmp expect actual
-	
-Switched to a new branch 'squash-ISO-8859-1-UTF-8'
-[squash-ISO-8859-1-UTF-8 786be3a] ÄËÑ�Ö
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[squash-ISO-8859-1-UTF-8 108aa2c] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[squash-ISO-8859-1-UTF-8 1f9565f] squash! ÄËÑ�Ö
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
[detached HEAD a65b88e] ÄËÑ�Ö
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-ISO-8859-1-UTF-8.
-ok 36 - commit --squash into ISO-8859-1 from UTF-8
+expecting success of 3700.54 'no file status change if no pathspec is given': 
+	>foo5 &&
+	>foo6 &&
+	git add foo5 foo6 &&
+	git add --chmod=+x &&
+	test_mode_in_index 100644 foo5 &&
+	test_mode_in_index 100644 foo6
 
-expecting success of 3900.37 'commit --squash into eucJP from ISO-2022-JP': 
-		git checkout -b $flag-$old-$new C0 &&
-		git config i18n.commitencoding $old &&
-		echo $old >>F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
-		test_tick &&
-		echo intermediate stuff >>G &&
-		git add G &&
-		git commit -a -m "intermediate commit" &&
-		test_tick &&
-		git config i18n.commitencoding $new &&
-		echo $new-$flag >>F &&
-		git commit -a --$flag HEAD^ &&
-		git rebase --autosquash -i HEAD^^^ &&
-		git rev-list HEAD >actual &&
-		test_line_count = 3 actual &&
-		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
-		git cat-file commit HEAD^ >raw &&
-		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
-		test_cmp expect actual
-	
-Switched to a new branch 'squash-eucJP-ISO-2022-JP'
-[squash-eucJP-ISO-2022-JP 8154dd2] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[squash-eucJP-ISO-2022-JP ac34524] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[squash-eucJP-ISO-2022-JP 60556dc] squash! $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
[detached HEAD d7dba56] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:20:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-eucJP-ISO-2022-JP.
-ok 37 - commit --squash into eucJP from ISO-2022-JP
+Nothing specified, nothing added.
+hint: Maybe you wanted to say 'git add .'?
+hint: Disable this message with "git config set advice.addEmptyPathspec false"
+pass
+pass
+ok 54 - no file status change if no pathspec is given
 
-expecting success of 3900.38 'commit --fixup into ISO-2022-JP from UTF-8': 
-		git checkout -b $flag-$old-$new C0 &&
-		git config i18n.commitencoding $old &&
-		echo $old >>F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
-		test_tick &&
-		echo intermediate stuff >>G &&
-		git add G &&
-		git commit -a -m "intermediate commit" &&
-		test_tick &&
-		git config i18n.commitencoding $new &&
-		echo $new-$flag >>F &&
-		git commit -a --$flag HEAD^ &&
-		git rebase --autosquash -i HEAD^^^ &&
-		git rev-list HEAD >actual &&
-		test_line_count = 3 actual &&
-		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
-		git cat-file commit HEAD^ >raw &&
-		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
-		test_cmp expect actual
-	
-Switched to a new branch 'fixup-ISO-2022-JP-UTF-8'
-[fixup-ISO-2022-JP-UTF-8 31ec3d8] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[fixup-ISO-2022-JP-UTF-8 1264baa] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[fixup-ISO-2022-JP-UTF-8 7683d37] fixup! $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/fixup-ISO-2022-JP-UTF-8.
-ok 38 - commit --fixup into ISO-2022-JP from UTF-8
+expecting success of 3700.55 'no file status change if no pathspec is given in subdir': 
+	mkdir -p sub &&
+	(
+		cd sub &&
+		>sub-foo1 &&
+		>sub-foo2 &&
+		git add . &&
+		git add --chmod=+x &&
+		test_mode_in_index 100644 sub-foo1 &&
+		test_mode_in_index 100644 sub-foo2
+	)
 
-# passed all 38 test(s)
-1..38
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3901-i18n-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3901-i18n-patch/.git/
-expecting success of 3901.1 'setup': 
-	git config i18n.commitencoding UTF-8 &&
+Nothing specified, nothing added.
+hint: Maybe you wanted to say 'git add .'?
+hint: Disable this message with "git config set advice.addEmptyPathspec false"
+pass
+pass
+ok 55 - no file status change if no pathspec is given in subdir
 
-	# use UTF-8 in author and committer name to match the
-	# i18n.commitencoding settings
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+expecting success of 3700.56 'all statuses changed in folder if . is given': 
+	git init repo &&
+	(
+		cd repo &&
+		mkdir -p sub/dir &&
+		touch x y z sub/a sub/dir/b &&
+		git add -A &&
+		git add --chmod=+x . &&
+		test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 &&
+		git add --chmod=-x . &&
+		test $(git ls-files --stage | grep ^100755 | wc -l) -eq 0
+	)
 
-	test_tick &&
-	echo "$GIT_AUTHOR_NAME" >mine &&
-	git add mine &&
-	git commit -s -m "Initial commit" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3700-add/repo/.git/
+ok 56 - all statuses changed in folder if . is given
 
-	test_tick &&
-	echo Hello world >mine &&
-	git add mine &&
-	git commit -s -m "Second on main" &&
+checking prerequisite: CASE_INSENSITIVE_FS
 
-	# the first commit on the side branch is UTF-8
-	test_tick &&
-	git checkout -b side main^ &&
-	echo Another file >yours &&
-	git add yours &&
-	git commit -s -m "Second on side" &&
+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
 
-	if test_have_prereq !MINGW
-	then
-		# the second one on the side branch is ISO-8859-1
-		git config i18n.commitencoding ISO8859-1 &&
-		# use author and committer name in ISO-8859-1 to match it.
-		. "$TEST_DIRECTORY"/t3901/8859-1.txt
-	fi &&
-	test_tick &&
-	echo Yet another >theirs &&
-	git add theirs &&
-	git commit -s -m "Third on side" &&
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+ok 57 # skip path is case-insensitive (missing CASE_INSENSITIVE_FS)
 
-	# Back to default
-	git config i18n.commitencoding UTF-8
+# passed all 57 test(s)
+1..57
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3704-add-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3704-add-pathspec-file/.git/
+expecting success of 3704.1 'setup': 
+	test_commit file0 &&
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t
 
-[main (root-commit) a751cb4] Initial commit
- Author: �éí óú <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 mine
-[main 1abbfe5] Second on main
- Author: �éí óú <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side'
-[side 907dc52] Second on side
- Author: �éí óú <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 yours
-[side 717f610] Third on side
- Author: Áéí óú <author@example.com>
+[master (root-commit) ad2e047] file0
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 theirs
+ create mode 100644 file0.t
 ok 1 - setup
 
-expecting success of 3901.2 'format-patch output (ISO-8859-1)': 
-	git config i18n.logoutputencoding ISO8859-1 &&
-
-	git format-patch --stdout main..HEAD^ >out-l1 &&
-	git format-patch --stdout HEAD^ >out-l2 &&
-	grep "^Content-Type: text/plain; charset=ISO8859-1" out-l1 &&
-	grep "^From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l1 &&
-	grep "^Content-Type: text/plain; charset=ISO8859-1" out-l2 &&
-	grep "^From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l2
-
-Content-Type: text/plain; charset=ISO8859-1
-From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?= <author@example.com>
-Content-Type: text/plain; charset=ISO8859-1
-From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?= <author@example.com>
-ok 2 - format-patch output (ISO-8859-1)
-
-expecting success of 3901.3 'format-patch output (UTF-8)': 
-	git config i18n.logoutputencoding UTF-8 &&
-
-	git format-patch --stdout main..HEAD^ >out-u1 &&
-	git format-patch --stdout HEAD^ >out-u2 &&
-	grep "^Content-Type: text/plain; charset=UTF-8" out-u1 &&
-	grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?=" out-u1 &&
-	grep "^Content-Type: text/plain; charset=UTF-8" out-u2 &&
-	grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?=" out-u2
-
-Content-Type: text/plain; charset=UTF-8
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-Content-Type: text/plain; charset=UTF-8
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-ok 3 - format-patch output (UTF-8)
-
-expecting success of 3901.4 'rebase (U/U)': 
-	# We want the result of rebase in UTF-8
-	git config i18n.commitencoding UTF-8 &&
-
-	# The test is about logoutputencoding not affecting the
-	# final outcome -- it is used internally to generate the
-	# patch and the log.
+expecting success of 3704.2 '--pathspec-from-file from stdin': 
+	restore_checkpoint &&
 
-	git config i18n.logoutputencoding UTF-8 &&
+	echo fileA.t | git add --pathspec-from-file=- &&
 
-	# The result will be committed by GIT_COMMITTER_NAME --
-	# we want UTF-8 encoded name.
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
-	git checkout -b test &&
-	git rebase main &&
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
 
-	check_encoding 2
+ok 2 - --pathspec-from-file from stdin
 
-Switched to a new branch 'test'
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-ok 4 - rebase (U/U)
+expecting success of 3704.3 '--pathspec-from-file from file': 
+	restore_checkpoint &&
 
-expecting success of 3901.5 'rebase (U/L)': 
-	git config i18n.commitencoding UTF-8 &&
-	git config i18n.logoutputencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+	echo fileA.t >list &&
+	git add --pathspec-from-file=list &&
 
-	git reset --hard side &&
-	git rebase main &&
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
 
-	check_encoding 2
+ok 3 - --pathspec-from-file from file
 
-HEAD is now at 717f610 Third on side
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-ok 5 - rebase (U/L)
+expecting success of 3704.4 'NUL delimiters': 
+	restore_checkpoint &&
 
-expecting success of 3901.6 'rebase (L/L)': 
-	# In this test we want ISO-8859-1 encoded commits as the result
-	git config i18n.commitencoding ISO8859-1 &&
-	git config i18n.logoutputencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+	printf "fileA.t\0fileB.t\0" | git add --pathspec-from-file=- --pathspec-file-nul &&
 
-	git reset --hard side &&
-	git rebase main &&
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
 
-	check_encoding 2 8859
+ok 4 - NUL delimiters
 
-HEAD is now at 717f610 Third on side
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-ok 6 - rebase (L/L)
+expecting success of 3704.5 'LF delimiters': 
+	restore_checkpoint &&
 
-expecting success of 3901.7 'rebase (L/U)': 
-	# This is pathological -- use UTF-8 as intermediate form
-	# to get ISO-8859-1 results.
-	git config i18n.commitencoding ISO8859-1 &&
-	git config i18n.logoutputencoding UTF-8 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+	printf "fileA.t\nfileB.t\n" | git add --pathspec-from-file=- &&
 
-	git reset --hard side &&
-	git rebase main &&
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
 
-	check_encoding 2 8859
+ok 5 - LF delimiters
 
-HEAD is now at 717f610 Third on side
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-ok 7 - rebase (L/U)
+expecting success of 3704.6 'no trailing delimiter': 
+	restore_checkpoint &&
 
-expecting success of 3901.8 'cherry-pick(U/U)': 
-	# Both the commitencoding and logoutputencoding is set to UTF-8.
+	printf "fileA.t\nfileB.t" | git add --pathspec-from-file=- &&
 
-	git config i18n.commitencoding UTF-8 &&
-	git config i18n.logoutputencoding UTF-8 &&
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
 
-	git reset --hard main &&
-	git cherry-pick side^ &&
-	git cherry-pick side &&
-	git revert HEAD &&
+ok 6 - no trailing delimiter
 
-	check_encoding 3
+expecting success of 3704.7 'CRLF delimiters': 
+	restore_checkpoint &&
 
-HEAD is now at 1abbfe5 Second on main
-[test 226e420] Second on side
- Author: �éí óú <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 yours
-[test 0c82aa3] Third on side
- Author: �éí óú <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 theirs
-[test 267f566] Revert "Third on side"
- Author: �éí óú <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 theirs
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-ok 8 - cherry-pick(U/U)
+	printf "fileA.t\r\nfileB.t\r\n" | git add --pathspec-from-file=- &&
 
-expecting success of 3901.9 'cherry-pick(L/L)': 
-	# Both the commitencoding and logoutputencoding is set to ISO-8859-1
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
 
-	git config i18n.commitencoding ISO8859-1 &&
-	git config i18n.logoutputencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+ok 7 - CRLF delimiters
 
-	git reset --hard main &&
-	git cherry-pick side^ &&
-	git cherry-pick side &&
-	git revert HEAD &&
+expecting success of 3704.8 'quotes': 
+	restore_checkpoint &&
 
-	check_encoding 3 8859
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
 
-HEAD is now at 1abbfe5 Second on main
-[test e1b2855] Second on side
- Author: Áéí óú <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 yours
-[test 37f31da] Third on side
- Author: Áéí óú <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 theirs
-[test 2f88e21] Revert "Third on side"
- Author: Áéí óú <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 theirs
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-ok 9 - cherry-pick(L/L)
+	git add --pathspec-from-file=list &&
 
-expecting success of 3901.10 'cherry-pick(U/L)': 
-	# Commitencoding is set to UTF-8 but logoutputencoding is ISO-8859-1
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
 
-	git config i18n.commitencoding UTF-8 &&
-	git config i18n.logoutputencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+ok 8 - quotes
 
-	git reset --hard main &&
-	git cherry-pick side^ &&
-	git cherry-pick side &&
-	git revert HEAD &&
+expecting success of 3704.9 'quotes not compatible with --pathspec-file-nul': 
+	restore_checkpoint &&
 
-	check_encoding 3
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
 
-HEAD is now at 1abbfe5 Second on main
-[test 226e420] Second on side
- Author: Áéí óú <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 yours
-[test 0c82aa3] Third on side
- Author: Áéí óú <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 theirs
-[test 267f566] Revert "Third on side"
- Author: Áéí óú <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 theirs
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-ok 10 - cherry-pick(U/L)
+	test_must_fail git add --pathspec-from-file=list --pathspec-file-nul
 
-expecting success of 3901.11 'cherry-pick(L/U)': 
-	# Again, the commitencoding is set to ISO-8859-1 but
-	# logoutputencoding is set to UTF-8.
+fatal: pathspec '"file\101.t"
+' did not match any files
+ok 9 - quotes not compatible with --pathspec-file-nul
 
-	git config i18n.commitencoding ISO8859-1 &&
-	git config i18n.logoutputencoding UTF-8 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+expecting success of 3704.10 'only touches what was listed': 
+	restore_checkpoint &&
 
-	git reset --hard main &&
-	git cherry-pick side^ &&
-	git cherry-pick side &&
-	git revert HEAD &&
+	printf "fileB.t\nfileC.t\n" | git add --pathspec-from-file=- &&
 
-	check_encoding 3 8859
+	cat >expect <<-\EOF &&
+	A  fileB.t
+	A  fileC.t
+	EOF
+	verify_expect
 
-HEAD is now at 1abbfe5 Second on main
-[test e1b2855] Second on side
- Author: Áéí óú <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 yours
-[test 37f31da] Third on side
- Author: Áéí óú <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 theirs
-[test 2f88e21] Revert "Third on side"
- Author: Áéí óú <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 theirs
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-ok 11 - cherry-pick(L/U)
+ok 10 - only touches what was listed
 
-expecting success of 3901.12 'rebase --merge (U/U)': 
-	git config i18n.commitencoding UTF-8 &&
-	git config i18n.logoutputencoding UTF-8 &&
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+expecting success of 3704.11 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>empty_list &&
 
-	git reset --hard side &&
-	git rebase --merge main &&
+	test_must_fail git add --pathspec-from-file=list --interactive 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
 
-	check_encoding 2
+	test_must_fail git add --pathspec-from-file=list --patch 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
 
-HEAD is now at 717f610 Third on side
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-ok 12 - rebase --merge (U/U)
+	test_must_fail git add --pathspec-from-file=list --edit 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--edit. cannot be used together" err &&
 
-expecting success of 3901.13 'rebase --merge (U/L)': 
-	git config i18n.commitencoding UTF-8 &&
-	git config i18n.logoutputencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+	test_must_fail git add --pathspec-from-file=list -- fileA.t 2>err &&
+	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
 
-	git reset --hard side &&
-	git rebase --merge main &&
+	test_must_fail git add --pathspec-file-nul 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
 
-	check_encoding 2
+	# This case succeeds, but still prints to stderr
+	git add --pathspec-from-file=empty_list 2>err &&
+	test_grep -e "Nothing specified, nothing added." err
 
-HEAD is now at 717f610 Third on side
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-ok 13 - rebase --merge (U/L)
+fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
+fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
+fatal: options '--pathspec-from-file' and '--edit' 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'
+Nothing specified, nothing added.
+ok 11 - error conditions
 
-expecting success of 3901.14 'rebase --merge (L/L)': 
-	# In this test we want ISO-8859-1 encoded commits as the result
-	git config i18n.commitencoding ISO8859-1 &&
-	git config i18n.logoutputencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3902-quoted.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3902-quoted/.git/
+expecting success of 3902.1 'setup': 
 
-	git reset --hard side &&
-	git rebase --merge main &&
+	mkdir "$FN" &&
+	for_each_name "echo initial >\"\$name\"" &&
+	git add . &&
+	git commit -q -m Initial &&
 
-	check_encoding 2 8859
+	for_each_name "echo second >\"\$name\"" &&
+	git commit -a -m Second &&
 
-HEAD is now at 717f610 Third on side
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-ok 14 - rebase --merge (L/L)
+	for_each_name "echo modified >\"\$name\""
 
-expecting success of 3901.15 'rebase --merge (L/U)': 
-	# This is pathological -- use UTF-8 as intermediate form
-	# to get ISO-8859-1 results.
-	git config i18n.commitencoding ISO8859-1 &&
-	git config i18n.logoutputencoding UTF-8 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-	git reset --hard side &&
-	git rebase --merge main &&
+[master 6e4313d] Second
+ Author: A U Thor <author@example.com>
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+ok 1 - setup
 
-	check_encoding 2 8859
+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
 
-HEAD is now at 717f610 Third on side
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-ok 15 - rebase --merge (L/U)
+cat >expect.raw <<\EOF
+Name
+"Name and a\nLF"
+"Name and an\tHT"
+"Name\""
+With SP in it
+"濱野\t純"
+"濱野\n純"
+濱野 純
+"濱野\"純"
+濱野/file
+濱野純
+EOF
 
-expecting success of 3901.16 'am (U/U)': 
-	# Apply UTF-8 patches with UTF-8 commitencoding
-	git config i18n.commitencoding UTF-8 &&
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+ok 2 - setup expected files
 
-	git reset --hard main &&
-	git am out-u1 out-u2 &&
+expecting success of 3902.3 'check fully quoted output from ls-files': 
 
-	check_encoding 2
+	git ls-files >current && test_cmp expect.quoted current
 
-HEAD is now at 1abbfe5 Second on main
-Applying: Second on side
-Applying: Third on side
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-ok 16 - am (U/U)
 
-expecting success of 3901.17 'am (L/L)': 
-	# Apply ISO-8859-1 patches with ISO-8859-1 commitencoding
-	git config i18n.commitencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+ok 3 - check fully quoted output from ls-files
 
-	git reset --hard main &&
-	git am out-l1 out-l2 &&
+expecting success of 3902.4 'check fully quoted output from diff-files': 
 
-	check_encoding 2 8859
+	git diff --name-only >current &&
+	test_cmp expect.quoted current
 
-HEAD is now at 1abbfe5 Second on main
-Applying: Second on side
-Applying: Third on side
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-ok 17 - am (L/L)
 
-expecting success of 3901.18 'am (U/L)': 
-	# Apply ISO-8859-1 patches with UTF-8 commitencoding
-	git config i18n.commitencoding UTF-8 &&
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
-	git reset --hard main &&
+ok 4 - check fully quoted output from diff-files
 
-	# am specifies --utf8 by default.
-	git am out-l1 out-l2 &&
+expecting success of 3902.5 'check fully quoted output from diff-index': 
 
-	check_encoding 2
+	git diff --name-only HEAD >current &&
+	test_cmp expect.quoted current
 
-HEAD is now at 1abbfe5 Second on main
-Applying: Second on side
-Applying: Third on side
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-ok 18 - am (U/L)
 
-expecting success of 3901.19 'am --no-utf8 (U/L)': 
-	# Apply ISO-8859-1 patches with UTF-8 commitencoding
-	git config i18n.commitencoding UTF-8 &&
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+ok 5 - check fully quoted output from diff-index
 
-	git reset --hard main &&
-	git am --no-utf8 out-l1 out-l2 2>err &&
+expecting success of 3902.6 'check fully quoted output from diff-tree': 
 
-	# commit-tree will warn that the commit message does not contain valid UTF-8
-	# as mailinfo did not convert it
-	test_grep "did not conform" err &&
+	git diff --name-only HEAD^ HEAD >current &&
+	test_cmp expect.quoted current
 
-	check_encoding 2
 
-HEAD is now at 1abbfe5 Second on main
-Applying: Second on side
-Applying: Third on side
-Warning: commit message did not conform to UTF-8.
-Warning: commit message did not conform to UTF-8.
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-ok 19 - am --no-utf8 (U/L)
+ok 6 - check fully quoted output from diff-tree
 
-expecting success of 3901.20 'am (L/U)': 
-	# Apply UTF-8 patches with ISO-8859-1 commitencoding
-	git config i18n.commitencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+expecting success of 3902.7 'check fully quoted output from ls-tree': 
 
-	git reset --hard main &&
-	# mailinfo will re-code the commit message to the charset specified by
-	# i18n.commitencoding
-	git am out-u1 out-u2 &&
+	git ls-tree --name-only -r HEAD >current &&
+	test_cmp expect.quoted current
 
-	check_encoding 2 8859
 
-HEAD is now at 1abbfe5 Second on main
-Applying: Second on side
-Applying: Third on side
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-ok 20 - am (L/U)
+ok 7 - check fully quoted output from ls-tree
 
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3904-stash-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3904-stash-patch/.git/
-expecting success of 3904.1 'setup': 
-	mkdir dir &&
-	echo parent > dir/foo &&
-	echo dummy > bar &&
-	echo committed > HEAD &&
-	git add bar dir/foo HEAD &&
-	git commit -m initial &&
-	test_tick &&
-	test_commit second dir/foo head &&
-	echo index > dir/foo &&
-	git add dir/foo &&
-	set_and_save_state bar bar_work bar_index &&
-	save_head
+expecting success of 3902.8 'setting core.quotepath': 
 
-[master (root-commit) 797253d] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 HEAD
- create mode 100644 bar
- create mode 100644 dir/foo
-[master 1f3a67c] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+	git config --bool core.quotepath false
 
-expecting success of 3904.2 'saying "n" does nothing': 
-	set_state HEAD HEADfile_work HEADfile_index &&
-	set_state dir/foo work index &&
-	test_write_lines n n n | test_must_fail git stash save -p &&
-	verify_state HEAD HEADfile_work HEADfile_index &&
-	verify_saved_state bar &&
-	verify_state dir/foo work index
 
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-(1/1) Stash this hunk [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) Stash this hunk [y,n,q,a,d,e,p,?]? 
-No changes selected
-ok 2 - saying "n" does nothing
+ok 8 - setting core.quotepath
 
-expecting success of 3904.3 'git stash -p': 
-	test_write_lines y n y | git stash save -p &&
-	verify_state HEAD committed HEADfile_index &&
-	verify_saved_state bar &&
-	verify_state dir/foo head index &&
-	git reset --hard &&
-	git stash apply &&
-	verify_state HEAD HEADfile_work committed &&
-	verify_state bar dummy dummy &&
-	verify_state dir/foo work head
+expecting success of 3902.9 'check fully quoted output from ls-files': 
 
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-(1/1) Stash this hunk [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) Stash this hunk [y,n,q,a,d,e,p,?]? 
-Saved working directory and index state WIP on master: 1f3a67c second
-HEAD is now at 1f3a67c second
-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:   HEAD
-	modified:   dir/foo
+	git ls-files >current && test_cmp expect.raw current
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	_head
-	_index_bar
-	_worktree_bar
-	actual
-	expect
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 3 - git stash -p
+ok 9 - check fully quoted output from ls-files
 
-expecting success of 3904.4 'git stash -p --no-keep-index': 
-	set_state HEAD HEADfile_work HEADfile_index &&
-	set_state bar bar_work bar_index &&
-	set_state dir/foo work index &&
-	test_write_lines y n y | git stash save -p --no-keep-index &&
-	verify_state HEAD committed committed &&
-	verify_state bar bar_work dummy &&
-	verify_state dir/foo head head &&
-	git reset --hard &&
-	git stash apply --index &&
-	verify_state HEAD HEADfile_work HEADfile_index &&
-	verify_state bar dummy bar_index &&
-	verify_state dir/foo work index
+expecting success of 3902.10 'check fully quoted output from diff-files': 
 
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-(1/1) Stash this hunk [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) Stash this hunk [y,n,q,a,d,e,p,?]? 
-Saved working directory and index state WIP on master: 1f3a67c second
-HEAD is now at 1f3a67c second
-Merging Version stash was based on with Stashed changes
-On branch master
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   HEAD
-	modified:   bar
-	modified:   dir/foo
+	git diff --name-only >current &&
+	test_cmp expect.raw current
 
-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:   HEAD
-	modified:   bar
-	modified:   dir/foo
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	_head
-	_index_bar
-	_worktree_bar
-	actual
-	expect
+ok 10 - check fully quoted output from diff-files
 
-ok 4 - git stash -p --no-keep-index
+expecting success of 3902.11 'check fully quoted output from diff-index': 
 
-expecting success of 3904.5 'git stash --no-keep-index -p': 
-	set_state HEAD HEADfile_work HEADfile_index &&
-	set_state bar bar_work bar_index &&
-	set_state dir/foo work index &&
-	test_write_lines y n y | git stash save --no-keep-index -p &&
-	verify_state HEAD committed committed &&
-	verify_state dir/foo head head &&
-	verify_state bar bar_work dummy &&
-	git reset --hard &&
-	git stash apply --index &&
-	verify_state HEAD HEADfile_work HEADfile_index &&
-	verify_state bar dummy bar_index &&
-	verify_state dir/foo work index
+	git diff --name-only HEAD >current &&
+	test_cmp expect.raw current
 
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-(1/1) Stash this hunk [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) Stash this hunk [y,n,q,a,d,e,p,?]? 
-Saved working directory and index state WIP on master: 1f3a67c second
-HEAD is now at 1f3a67c second
-Merging Version stash was based on with Stashed changes
-On branch master
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   HEAD
-	modified:   bar
-	modified:   dir/foo
 
-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:   HEAD
-	modified:   bar
-	modified:   dir/foo
+ok 11 - check fully quoted output from diff-index
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	_head
-	_index_bar
-	_worktree_bar
-	actual
-	expect
+expecting success of 3902.12 'check fully quoted output from diff-tree': 
 
-ok 5 - git stash --no-keep-index -p
+	git diff --name-only HEAD^ HEAD >current &&
+	test_cmp expect.raw current
 
-expecting success of 3904.6 'stash -p --no-keep-index -- <pathspec> does not unstage other files': 
-	set_state HEAD HEADfile_work HEADfile_index &&
-	set_state dir/foo work index &&
-	echo y | git stash push -p --no-keep-index -- HEAD &&
-	verify_state HEAD committed committed &&
-	verify_state dir/foo work index
 
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-Saved working directory and index state WIP on master: 1f3a67c second
-ok 6 - stash -p --no-keep-index -- <pathspec> does not unstage other files
+ok 12 - check fully quoted output from diff-tree
 
-expecting success of 3904.7 'none of this moved HEAD': 
-	verify_saved_head
+expecting success of 3902.13 'check fully quoted output from ls-tree': 
 
-ok 7 - none of this moved HEAD
+	git ls-tree --name-only -r HEAD >current &&
+	test_cmp expect.raw current
 
-expecting success of 3904.8 'stash -p with split hunk': 
-	git reset --hard &&
-	cat >test <<-\EOF &&
-	aaa
-	bbb
-	ccc
-	EOF
-	git add test &&
-	git commit -m "initial" &&
-	cat >test <<-\EOF &&
-	aaa
-	added line 1
-	bbb
-	added line 2
-	ccc
-	EOF
-	printf "%s\n" s n y q |
-	git stash -p 2>error &&
-	test_must_be_empty error &&
-	grep "added line 1" test &&
-	! grep "added line 2" test
 
-HEAD is now at 1f3a67c second
-[master 97cac8f] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 test
-diff --git a/test b/test
-index 1802a74..515ff88 100644
---- a/test
-+++ b/test
-@@ -1,3 +1,5 @@
- aaa
-+added line 1
- bbb
-+added line 2
- ccc
-(1/1) Stash this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
-@@ -1,2 +1,3 @@
- aaa
-+added line 1
- bbb
-(1/2) Stash this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -2,2 +3,3 @@
- bbb
-+added line 2
- ccc
-(2/2) Stash this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-Saved working directory and index state WIP on master: 97cac8f initial
-added line 1
-ok 8 - stash -p with split hunk
+ok 13 - check fully quoted output from ls-tree
 
-# passed all 8 test(s)
-1..8
+# passed all 13 test(s)
+1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3512-cherry-pick-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/.git/
-expecting success of 3512.1 'git_test_func: added submodule creates empty directory': 
+*** t3426-rebase-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/.git/
+expecting success of 3426.1 'git_rebase: added submodule creates empty directory': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -213269,31 +212580,31 @@
 			test_submodule_content sub1 origin/add_sub1
 		)
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t3426-rebase-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.51.0/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.51.0/t/trash directory.t3426-rebase-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.51.0/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.51.0/t/trash directory.t3426-rebase-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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_repo/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_repo/uninitialized_sub'...
 done.
 [add_sub1 09bcf53] Add sub1
  Author: A U Thor <author@example.com>
@@ -213316,13 +212627,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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
+To /build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1/sub2'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_repo/sub1/sub2'...
 done.
 [add_nested_sub 8b3b335] add a nested submodule
  Author: A U Thor <author@example.com>
@@ -213343,9 +212654,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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
+To /build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1
  * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub2
+To /build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub2
  * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
 Cleared directory 'sub2'
 Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
@@ -213389,29 +212700,32 @@
  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 a new branch 'ours'
+[ours dddfb5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 2a5884b] Revert "add_x"
  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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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_rebase: added submodule creates empty directory
 
-expecting success of 3512.2 'git_test_func: added submodule leaves existing empty directory alone': 
+expecting success of 3426.2 'git_rebase: added submodule leaves existing empty directory alone': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -213430,23 +212744,26 @@
 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 a new branch 'ours'
+[ours dddfb5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 2a5884b] Revert "add_x"
  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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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_rebase: 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 3426.3 'git_rebase: replace tracked file with submodule creates empty directory': 
 		prolog &&
 		reset_work_tree_to replace_sub1_with_file &&
 		(
@@ -213465,22 +212782,26 @@
 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 a new branch 'ours'
+[ours db2b5c3] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours d7a6c40] Revert "add_x"
  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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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_rebase: replace tracked file with submodule creates empty directory
 
-expecting success of 3512.4 'git_test_func: replace directory with submodule': 
+expecting success of 3426.4 'git_rebase: replace directory with submodule': 
 		prolog &&
 		reset_work_tree_to replace_sub1_with_directory &&
 		(
@@ -213499,24 +212820,26 @@
 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 a new branch 'ours'
+[ours c876b15] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 86f2b1a] Revert "add_x"
  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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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_rebase: 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 3426.5 'git_rebase: removed submodule leaves submodule directory and its contents in place': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -213531,22 +212854,24 @@
 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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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 a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  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
+ 1 file changed, 1 deletion(-)
+warning: unable to rmdir 'sub1': Directory not empty
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+ok 5 - git_rebase: 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 3426.6 'git_rebase: removed submodule leaves submodule containing a .git directory alone': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -213563,22 +212888,24 @@
 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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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 a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  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
+ 1 file changed, 1 deletion(-)
+warning: unable to rmdir 'sub1': Directory not empty
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+ok 6 - git_rebase: 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 3426.7 'git_rebase: replace submodule with a directory must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -213593,20 +212920,28 @@
 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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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:
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+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
+error: could not detach HEAD
+ok 7 - git_rebase: 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 3426.8 'git_rebase: replace submodule containing a .git directory with a directory must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -213623,20 +212958,28 @@
 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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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:
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+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
+error: could not detach HEAD
+ok 8 - git_rebase: 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 3426.9 'git_rebase: replace submodule with a file must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -213651,20 +212994,24 @@
 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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  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
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+test_must_fail: command succeeded: git rebase replace_sub1_with_file
+not ok 9 - git_rebase: 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 3426.10 'git_rebase: replace submodule containing a .git directory with a file must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -213681,20 +213028,24 @@
 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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  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
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+test_must_fail: command succeeded: git rebase replace_sub1_with_file
+not ok 10 - git_rebase: 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 3426.11 'git_rebase: modified submodule does not update submodule work tree': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -213711,18 +213062,24 @@
 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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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 a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
 Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - git_test_func: modified submodule does not update submodule work tree
+ok 11 - git_rebase: 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 3426.12 'git_rebase: modified submodule does not update submodule work tree to invalid commit': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -213739,20 +213096,26 @@
 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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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 a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
 fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: git 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_rebase: 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 3426.13 'git_rebase: modified submodule does not update submodule work tree from invalid commit': 
 		prolog &&
 		reset_work_tree_to invalid_sub1 &&
 		(
@@ -213771,20 +213134,26 @@
 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 a new branch 'ours'
+[ours 8fb6209] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 1145b44] Revert "add_x"
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
-Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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_rebase: 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 3426.14 'git_rebase: added submodule doesn't remove untracked unignored file with same name': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -213801,90 +213170,22 @@
 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.51.0/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.51.0/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
+Switched to a new branch 'ours'
+[ours dddfb5c] add_x
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to branch 'main'
-Cloning into '/build/reproducible-path/git-2.51.0/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
+[ours 2a5884b] Revert "add_x"
  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
+ 1 file changed, 1 deletion(-)
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1
+Please move or remove them before you switch branches.
+Aborting
+error: could not detach HEAD
+ok 14 - git_rebase: 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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3426-rebase-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/.git/
-expecting success of 3426.1 'git_rebase: added submodule creates empty directory': 
+expecting success of 3426.15 'git_rebase_interactive: added submodule creates empty directory': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -213897,127 +213198,6 @@
 			test_submodule_content sub1 origin/add_sub1
 		)
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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.51.0/t/trash directory.t3426-rebase-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.51.0/t/trash directory.t3426-rebase-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.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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.51.0/t/trash directory.t3426-rebase-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.51.0/t/trash directory.t3426-rebase-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.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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'
@@ -214040,9 +213220,9 @@
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_rebase: added submodule creates empty directory
+ok 15 - git_rebase_interactive: added submodule creates empty directory
 
-expecting success of 3426.2 'git_rebase: added submodule leaves existing empty directory alone': 
+expecting success of 3426.16 'git_rebase_interactive: added submodule leaves existing empty directory alone': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -214078,9 +213258,9 @@
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - git_rebase: added submodule leaves existing empty directory alone
+ok 16 - git_rebase_interactive: added submodule leaves existing empty directory alone
 
-expecting success of 3426.3 'git_rebase: replace tracked file with submodule creates empty directory': 
+expecting success of 3426.17 'git_rebase_interactive: replace tracked file with submodule creates empty directory': 
 		prolog &&
 		reset_work_tree_to replace_sub1_with_file &&
 		(
@@ -214116,9 +213296,9 @@
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - git_rebase: replace tracked file with submodule creates empty directory
+ok 17 - git_rebase_interactive: replace tracked file with submodule creates empty directory
 
-expecting success of 3426.4 'git_rebase: replace directory with submodule': 
+expecting success of 3426.18 'git_rebase_interactive: replace directory with submodule': 
 		prolog &&
 		reset_work_tree_to replace_sub1_with_directory &&
 		(
@@ -214154,9 +213334,9 @@
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - git_rebase: replace directory with submodule
+ok 18 - git_rebase_interactive: replace directory with submodule
 
-expecting success of 3426.5 'git_rebase: removed submodule leaves submodule directory and its contents in place': 
+expecting success of 3426.19 'git_rebase_interactive: removed submodule leaves submodule directory and its contents in place': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -214186,9 +213366,9 @@
  1 file changed, 1 deletion(-)
 warning: unable to rmdir 'sub1': Directory not empty
 Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-ok 5 - git_rebase: removed submodule leaves submodule directory and its contents in place
+ok 19 - git_rebase_interactive: removed submodule leaves submodule directory and its contents in place
 
-expecting success of 3426.6 'git_rebase: removed submodule leaves submodule containing a .git directory alone': 
+expecting success of 3426.20 'git_rebase_interactive: removed submodule leaves submodule containing a .git directory alone': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -214220,9 +213400,9 @@
  1 file changed, 1 deletion(-)
 warning: unable to rmdir 'sub1': Directory not empty
 Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-ok 6 - git_rebase: removed submodule leaves submodule containing a .git directory alone
+ok 20 - git_rebase_interactive: removed submodule leaves submodule containing a .git directory alone
 
-expecting success of 3426.7 'git_rebase: replace submodule with a directory must fail': 
+expecting success of 3426.21 'git_rebase_interactive: replace submodule with a directory must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -214256,9 +213436,9 @@
 Please move or remove them before you switch branches.
 Aborting
 error: could not detach HEAD
-ok 7 - git_rebase: replace submodule with a directory must fail
+ok 21 - git_rebase_interactive: replace submodule with a directory must fail
 
-expecting success of 3426.8 'git_rebase: replace submodule containing a .git directory with a directory must fail': 
+expecting success of 3426.22 'git_rebase_interactive: replace submodule containing a .git directory with a directory must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -214294,9 +213474,9 @@
 Please move or remove them before you switch branches.
 Aborting
 error: could not detach HEAD
-ok 8 - git_rebase: replace submodule containing a .git directory with a directory must fail
+ok 22 - git_rebase_interactive: replace submodule containing a .git directory with a directory must fail
 
-checking known breakage of 3426.9 'git_rebase: replace submodule with a file must fail': 
+checking known breakage of 3426.23 'git_rebase_interactive: replace submodule with a file must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -214325,10 +213505,10 @@
  Date: Fri Apr 1 13:14:15 2005 +0200
  1 file changed, 1 deletion(-)
 Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-test_must_fail: command succeeded: git rebase replace_sub1_with_file
-not ok 9 - git_rebase: replace submodule with a file must fail # TODO known breakage
+test_must_fail: command succeeded: git rebase -i replace_sub1_with_file
+not ok 23 - git_rebase_interactive: replace submodule with a file must fail # TODO known breakage
 
-checking known breakage of 3426.10 'git_rebase: replace submodule containing a .git directory with a file must fail': 
+checking known breakage of 3426.24 'git_rebase_interactive: replace submodule containing a .git directory with a file must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -214359,10 +213539,10 @@
  Date: Fri Apr 1 13:14:15 2005 +0200
  1 file changed, 1 deletion(-)
 Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-test_must_fail: command succeeded: git rebase replace_sub1_with_file
-not ok 10 - git_rebase: replace submodule containing a .git directory with a file must fail # TODO known breakage
+test_must_fail: command succeeded: git rebase -i replace_sub1_with_file
+not ok 24 - git_rebase_interactive: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-expecting success of 3426.11 'git_rebase: modified submodule does not update submodule work tree': 
+expecting success of 3426.25 'git_rebase_interactive: modified submodule does not update submodule work tree': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -214394,9 +213574,9 @@
  1 file changed, 1 deletion(-)
 Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
 Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - git_rebase: modified submodule does not update submodule work tree
+ok 25 - git_rebase_interactive: modified submodule does not update submodule work tree
 
-expecting success of 3426.12 'git_rebase: modified submodule does not update submodule work tree to invalid commit': 
+expecting success of 3426.26 'git_rebase_interactive: modified submodule does not update submodule work tree to invalid commit': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -214427,12 +213607,12 @@
  Date: Fri Apr 1 13:14:15 2005 +0200
  1 file changed, 1 deletion(-)
 Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
 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_rebase: modified submodule does not update submodule work tree to invalid commit
+ok 26 - git_rebase_interactive: modified submodule does not update submodule work tree to invalid commit
 
-expecting success of 3426.13 'git_rebase: modified submodule does not update submodule work tree from invalid commit': 
+expecting success of 3426.27 'git_rebase_interactive: modified submodule does not update submodule work tree from invalid commit': 
 		prolog &&
 		reset_work_tree_to invalid_sub1 &&
 		(
@@ -214468,9 +213648,9 @@
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - git_rebase: modified submodule does not update submodule work tree from invalid commit
+ok 27 - git_rebase_interactive: modified submodule does not update submodule work tree from invalid commit
 
-expecting success of 3426.14 'git_rebase: added submodule doesn't remove untracked unignored file with same name': 
+expecting success of 3426.28 'git_rebase_interactive: added submodule doesn't remove untracked unignored file with same name': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -214500,9 +213680,60 @@
 Please move or remove them before you switch branches.
 Aborting
 error: could not detach HEAD
-ok 14 - git_rebase: added submodule doesn't remove untracked unignored file with same name
+ok 28 - git_rebase_interactive: added submodule doesn't remove untracked unignored file with same name
 
-expecting success of 3426.15 'git_rebase_interactive: added submodule creates empty directory': 
+expecting success of 3426.29 'rebase interactive ignores modified submodules': 
+	test_when_finished "rm -rf super sub" &&
+	git init sub &&
+	git -C sub commit --allow-empty -m "Initial commit" &&
+	git init super &&
+	git -c protocol.file.allow=always \
+		-C super submodule add ../sub &&
+	git -C super config submodule.sub.ignore dirty &&
+	>super/foo &&
+	git -C super add foo &&
+	git -C super commit -m "Initial commit" &&
+	test_commit -C super a &&
+	test_commit -C super b &&
+	test_commit -C super/sub c &&
+	set_fake_editor &&
+	git -C super rebase -i HEAD^^
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/sub/.git/
+[master (root-commit) b8cea33] Initial commit
+ Author: A U Thor <author@example.com>
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/super/.git/
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/super/sub'...
+done.
+[master (root-commit) f377606] Initial commit
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 foo
+ create mode 160000 sub
+[master 4e30919] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+[master 41aa191] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+[master a61c667] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Successfully rebased and updated refs/heads/master.
+ok 29 - rebase interactive ignores modified submodules
+
+# still have 4 known breakage(s)
+# passed all remaining 25 test(s)
+1..29
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3512-cherry-pick-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
 		(
@@ -214515,31 +213746,149 @@
 			test_submodule_content sub1 origin/add_sub1
 		)
 	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.51.0/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'.
-Switched to a new branch 'ours'
-[ours dddfb5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 2a5884b] Revert "add_x"
+[no_submodule 09bcf53] Add sub1
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/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 15 - git_rebase_interactive: added submodule creates empty directory
+ok 1 - git_test_func: added submodule creates empty directory
 
-expecting success of 3426.16 'git_rebase_interactive: added submodule leaves existing empty directory alone': 
+expecting success of 3512.2 'git_test_func: added submodule leaves existing empty directory alone': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -214558,26 +213907,23 @@
 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 a new branch 'ours'
-[ours dddfb5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 2a5884b] Revert "add_x"
+[no_submodule 09bcf53] Add sub1
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/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 16 - git_rebase_interactive: added submodule leaves existing empty directory alone
+ok 2 - git_test_func: added submodule leaves existing empty directory alone
 
-expecting success of 3426.17 'git_rebase_interactive: replace tracked file with submodule creates empty directory': 
+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 &&
 		(
@@ -214596,26 +213942,22 @@
 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 a new branch 'ours'
-[ours db2b5c3] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours d7a6c40] Revert "add_x"
+[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
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/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 17 - git_rebase_interactive: replace tracked file with submodule creates empty directory
+ok 3 - git_test_func: replace tracked file with submodule creates empty directory
 
-expecting success of 3426.18 'git_rebase_interactive: replace directory with submodule': 
+expecting success of 3512.4 'git_test_func: replace directory with submodule': 
 		prolog &&
 		reset_work_tree_to replace_sub1_with_directory &&
 		(
@@ -214634,26 +213976,24 @@
 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 a new branch 'ours'
-[ours c876b15] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 86f2b1a] Revert "add_x"
+[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
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+ 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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/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 18 - git_rebase_interactive: replace directory with submodule
+ok 4 - git_test_func: replace directory with submodule
 
-expecting success of 3426.19 'git_rebase_interactive: removed submodule leaves submodule directory and its contents in place': 
+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 &&
 		(
@@ -214668,24 +214008,22 @@
 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.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/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'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+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
- 1 file changed, 1 deletion(-)
-warning: unable to rmdir 'sub1': Directory not empty
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-ok 19 - git_rebase_interactive: removed submodule leaves submodule directory and its contents in place
+ 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 3426.20 'git_rebase_interactive: removed submodule leaves submodule containing a .git directory alone': 
+expecting success of 3512.6 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -214702,24 +214040,22 @@
 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.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/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'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+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
- 1 file changed, 1 deletion(-)
-warning: unable to rmdir 'sub1': Directory not empty
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-ok 20 - git_rebase_interactive: removed submodule leaves submodule containing a .git directory alone
+ 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 3426.21 'git_rebase_interactive: replace submodule with a directory must fail': 
+expecting success of 3512.7 'git_test_func: replace submodule with a directory must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -214734,552 +214070,2005 @@
 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.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/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'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
+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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/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>
- 1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+ 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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/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
- 1 file changed, 1 deletion(-)
-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.
+ 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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/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
-error: could not detach HEAD
-ok 21 - git_rebase_interactive: replace submodule with a directory must fail
+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.51.0/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.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3705-add-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3305-notes-fanout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3900-i18n-commit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3900-i18n-commit/.git/
+expecting success of 3900.1 'setup': 
+	: >F &&
+	git add F &&
+	T=$(git write-tree) &&
+	C=$(git commit-tree $T <"$TEST_DIRECTORY"/t3900/1-UTF-8.txt) &&
+	git update-ref HEAD $C &&
+	git tag C0
+
+ok 1 - setup
+
+expecting success of 3900.2 'no encoding header for base case': 
+	E=$(git cat-file commit C0 | sed -ne "s/^encoding //p") &&
+	test z = "z$E"
+
+ok 2 - no encoding header for base case
+
+expecting success of 3900.3 'UTF-16 refused because of NULs': 
+	echo UTF-16 >F &&
+	test_must_fail git commit -a -F "$TEST_DIRECTORY"/t3900/UTF-16.txt
+
+error: a NUL byte in commit log message not allowed.
+fatal: failed to write commit object
+ok 3 - UTF-16 refused because of NULs
+
+expecting success of 3900.4 'UTF-8 invalid characters refused': 
+	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
+	echo "UTF-8 characters" >F &&
+	printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
+		>"$HOME/invalid" &&
+	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
+	test_grep "did not conform" "$HOME"/stderr
+
+[master 97e22ab] Commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Warning: commit message did not conform to UTF-8.
+ok 4 - UTF-8 invalid characters refused
+
+expecting success of 3900.5 'UTF-8 overlong sequences rejected': 
+	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
+	rm -f "$HOME/stderr" "$HOME/invalid" &&
+	echo "UTF-8 overlong" >F &&
+	printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
+		>"$HOME/invalid" &&
+	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
+	test_grep "did not conform" "$HOME"/stderr
+
+[master f17d203] à‚©ommit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Warning: commit message did not conform to UTF-8.
+ok 5 - UTF-8 overlong sequences rejected
+
+expecting success of 3900.6 'UTF-8 non-characters refused': 
+	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
+	echo "UTF-8 non-character 1" >F &&
+	printf "Commit message\n\nNon-character:\364\217\277\276\n" \
+		>"$HOME/invalid" &&
+	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
+	test_grep "did not conform" "$HOME"/stderr
+
+[master b54194f] Commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Warning: commit message did not conform to UTF-8.
+ok 6 - UTF-8 non-characters refused
+
+expecting success of 3900.7 'UTF-8 non-characters refused': 
+	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
+	echo "UTF-8 non-character 2." >F &&
+	printf "Commit message\n\nNon-character:\357\267\220\n" \
+		>"$HOME/invalid" &&
+	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
+	test_grep "did not conform" "$HOME"/stderr
+
+[master 65f731d] Commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Warning: commit message did not conform to UTF-8.
+ok 7 - UTF-8 non-characters refused
+
+expecting success of 3900.8 'ISO8859-1 setup': 
+		git config i18n.commitencoding $H &&
+		git checkout -b $H C0 &&
+		echo $H >F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
+	
+Switched to a new branch 'ISO8859-1'
+[ISO8859-1 37233ac] ÄËÑÏÖ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 8 - ISO8859-1 setup
+
+expecting success of 3900.9 'eucJP setup': 
+		git config i18n.commitencoding $H &&
+		git checkout -b $H C0 &&
+		echo $H >F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
+	
+Switched to a new branch 'eucJP'
+[eucJP 2d12add] ¤Ï¤ì¤Ò¤Û¤Õ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 9 - eucJP setup
+
+expecting success of 3900.10 'ISO-2022-JP setup': 
+		git config i18n.commitencoding $H &&
+		git checkout -b $H C0 &&
+		echo $H >F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
+	
+Switched to a new branch 'ISO-2022-JP'
+[ISO-2022-JP ae78d6f] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 10 - ISO-2022-JP setup
+
+expecting success of 3900.11 'check encoding header for ISO8859-1': 
+		E=$(git cat-file commit ISO8859-1 | sed -ne "s/^encoding //p") &&
+		test "z$E" = "zISO8859-1"
+	
+ok 11 - check encoding header for ISO8859-1
+
+expecting success of 3900.12 'check encoding header for eucJP': 
+		E=$(git cat-file commit eucJP | sed -ne "s/^encoding //p") &&
+		test "z$E" = "zeucJP"
+	
+ok 12 - check encoding header for eucJP
+
+expecting success of 3900.13 'check encoding header for ISO-2022-JP': 
+		E=$(git cat-file commit ISO-2022-JP | sed -ne "s/^encoding //p") &&
+		test "z$E" = "zISO-2022-JP"
+	
+ok 13 - check encoding header for ISO-2022-JP
+
+expecting success of 3900.14 'config to remove customization': 
+	git config --unset-all i18n.commitencoding &&
+	if Z=$(git config --get-all i18n.commitencoding)
+	then
+		echo Oops, should have failed.
+		false
+	else
+		test z = "z$Z"
+	fi &&
+	git config i18n.commitencoding UTF-8
+
+ok 14 - config to remove customization
+
+expecting success of 3900.15 'ISO8859-1 should be shown in UTF-8 now': 
+	compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
+
+ok 15 - ISO8859-1 should be shown in UTF-8 now
+
+expecting success of 3900.16 'eucJP should be shown in UTF-8 now': 
+		compare_with eucJP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+	
+ok 16 - eucJP should be shown in UTF-8 now
+
+expecting success of 3900.17 'ISO-2022-JP should be shown in UTF-8 now': 
+		compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+	
+ok 17 - ISO-2022-JP should be shown in UTF-8 now
+
+expecting success of 3900.18 'config to add customization': 
+	git config --unset-all i18n.commitencoding &&
+	if Z=$(git config --get-all i18n.commitencoding)
+	then
+		echo Oops, should have failed.
+		false
+	else
+		test z = "z$Z"
+	fi
+
+ok 18 - config to add customization
+
+expecting success of 3900.19 'ISO8859-1 should be shown in itself now': 
+		git config i18n.commitencoding ISO8859-1 &&
+		compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/ISO8859-1.txt
+	
+ok 19 - ISO8859-1 should be shown in itself now
+
+expecting success of 3900.20 'eucJP should be shown in itself now': 
+		git config i18n.commitencoding eucJP &&
+		compare_with eucJP "$TEST_DIRECTORY"/t3900/eucJP.txt
+	
+ok 20 - eucJP should be shown in itself now
+
+expecting success of 3900.21 'ISO-2022-JP should be shown in itself now': 
+		git config i18n.commitencoding ISO-2022-JP &&
+		compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt
+	
+ok 21 - ISO-2022-JP should be shown in itself now
+
+expecting success of 3900.22 'config to tweak customization': 
+	git config i18n.logoutputencoding UTF-8
+
+ok 22 - config to tweak customization
+
+expecting success of 3900.23 'ISO8859-1 should be shown in UTF-8 now': 
+	compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
+
+ok 23 - ISO8859-1 should be shown in UTF-8 now
+
+expecting success of 3900.24 'eucJP should be shown in UTF-8 now': 
+		compare_with eucJP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+	
+ok 24 - eucJP should be shown in UTF-8 now
+
+expecting success of 3900.25 'ISO-2022-JP should be shown in UTF-8 now': 
+		compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+	
+ok 25 - ISO-2022-JP should be shown in UTF-8 now
+
+expecting success of 3900.26 'eucJP should be shown in eucJP now': 
+			compare_with eucJP "$TEST_DIRECTORY"/t3900/eucJP.txt $ICONV
+		
+ok 26 - eucJP should be shown in eucJP now
+
+expecting success of 3900.27 'ISO-2022-JP should be shown in eucJP now': 
+			compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/eucJP.txt $ICONV
+		
+ok 27 - ISO-2022-JP should be shown in eucJP now
+
+expecting success of 3900.28 'eucJP should be shown in ISO-2022-JP now': 
+			compare_with eucJP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt $ICONV
+		
+ok 28 - eucJP should be shown in ISO-2022-JP now
+
+expecting success of 3900.29 'ISO-2022-JP should be shown in ISO-2022-JP now': 
+			compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt $ICONV
+		
+ok 29 - ISO-2022-JP should be shown in ISO-2022-JP now
+
+expecting success of 3900.30 'No conversion with ISO8859-1': 
+		compare_with "--encoding=none ISO8859-1" "$TEST_DIRECTORY"/t3900/ISO8859-1.txt
+	
+ok 30 - No conversion with ISO8859-1
+
+expecting success of 3900.31 'No conversion with eucJP': 
+		compare_with "--encoding=none eucJP" "$TEST_DIRECTORY"/t3900/eucJP.txt
+	
+ok 31 - No conversion with eucJP
+
+expecting success of 3900.32 'No conversion with ISO-2022-JP': 
+		compare_with "--encoding=none ISO-2022-JP" "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt
+	
+ok 32 - No conversion with ISO-2022-JP
 
-expecting success of 3426.22 'git_rebase_interactive: 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
-		)
+expecting success of 3900.33 'commit --fixup with eucJP encoding': 
+		git config i18n.commitencoding $H &&
+		git checkout -b $H-$flag C0 &&
+		echo $H >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		echo $H $flag >>F &&
+		git commit -a --$flag HEAD~1 &&
+		E=$(git cat-file commit eucJP-fixup |
+			sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H" &&
+		git config --unset-all i18n.commitencoding &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git log --oneline >actual &&
+		test_line_count = 3 actual
 	
-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.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
+Switched to a new branch 'eucJP-fixup'
+[eucJP-fixup 2d12add] $B$O$l$R$[$U(B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+[eucJP-fixup 4164b89] intermediate commit
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-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
-error: could not detach HEAD
-ok 22 - git_rebase_interactive: replace submodule containing a .git directory with a directory must fail
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[eucJP-fixup 762ea33] fixup! $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/eucJP-fixup.
+ok 33 - commit --fixup with eucJP encoding
 
-checking known breakage of 3426.23 'git_rebase_interactive: 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
-		)
+expecting success of 3900.34 'commit --squash with ISO-2022-JP encoding': 
+		git config i18n.commitencoding $H &&
+		git checkout -b $H-$flag C0 &&
+		echo $H >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		echo $H $flag >>F &&
+		git commit -a --$flag HEAD~1 &&
+		E=$(git cat-file commit ISO-2022-JP-squash |
+			sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H" &&
+		git config --unset-all i18n.commitencoding &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git log --oneline >actual &&
+		test_line_count = 3 actual
 	
-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.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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 a new branch 'ours'
-[ours 506db5c] add_x
+Switched to a new branch 'ISO-2022-JP-squash'
+[ISO-2022-JP-squash 73be6f0] $B$O$l$R$[$U(B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+[ISO-2022-JP-squash 358ea4d] intermediate commit
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-test_must_fail: command succeeded: git rebase -i replace_sub1_with_file
-not ok 23 - git_rebase_interactive: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 3426.24 'git_rebase_interactive: 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.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-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 a new branch 'ours'
-[ours 506db5c] add_x
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[ISO-2022-JP-squash 31af1e8] squash! $B$O$l$R$[$U(B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+Rebasing (2/3)
[detached HEAD 452b79b] $B$O$l$R$[$U(B
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-test_must_fail: command succeeded: git rebase -i replace_sub1_with_file
-not ok 24 - git_rebase_interactive: replace submodule containing a .git directory with a file must fail # TODO known breakage
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Rebasing (3/3)
Successfully rebased and updated refs/heads/ISO-2022-JP-squash.
+ok 34 - commit --squash with ISO-2022-JP encoding
 
-expecting success of 3426.25 'git_rebase_interactive: 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
-		)
+expecting success of 3900.35 'commit --fixup into UTF-8 from ISO-8859-1': 
+		git checkout -b $flag-$old-$new C0 &&
+		git config i18n.commitencoding $old &&
+		echo $old >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		git config i18n.commitencoding $new &&
+		echo $new-$flag >>F &&
+		git commit -a --$flag HEAD^ &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git rev-list HEAD >actual &&
+		test_line_count = 3 actual &&
+		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
+		git cat-file commit HEAD^ >raw &&
+		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
+		test_cmp expect actual
 	
-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.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
+Switched to a new branch 'fixup-UTF-8-ISO-8859-1'
+[fixup-UTF-8-ISO-8859-1 f9ae2e6] ÄËÑ�Ö
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+[fixup-UTF-8-ISO-8859-1 2e63169] intermediate commit
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 25 - git_rebase_interactive: modified submodule does not update submodule work tree
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[fixup-UTF-8-ISO-8859-1 c8086ca] fixup! ÄËÑ�Ö
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/fixup-UTF-8-ISO-8859-1.
+ok 35 - commit --fixup into UTF-8 from ISO-8859-1
 
-expecting success of 3426.26 'git_rebase_interactive: 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
-		)
+expecting success of 3900.36 'commit --squash into ISO-8859-1 from UTF-8': 
+		git checkout -b $flag-$old-$new C0 &&
+		git config i18n.commitencoding $old &&
+		echo $old >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		git config i18n.commitencoding $new &&
+		echo $new-$flag >>F &&
+		git commit -a --$flag HEAD^ &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git rev-list HEAD >actual &&
+		test_line_count = 3 actual &&
+		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
+		git cat-file commit HEAD^ >raw &&
+		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
+		test_cmp expect actual
 	
-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.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
+Switched to a new branch 'squash-ISO-8859-1-UTF-8'
+[squash-ISO-8859-1-UTF-8 786be3a] ÄËÑ�Ö
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+[squash-ISO-8859-1-UTF-8 108aa2c] intermediate commit
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-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_rebase_interactive: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 3426.27 'git_rebase_interactive: 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 a new branch 'ours'
-[ours 8fb6209] add_x
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[squash-ISO-8859-1-UTF-8 1f9565f] squash! ÄËÑ�Ö
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[ours 1145b44] Revert "add_x"
+Rebasing (2/3)
[detached HEAD a65b88e] ÄËÑ�Ö
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 27 - git_rebase_interactive: modified submodule does not update submodule work tree from invalid commit
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-ISO-8859-1-UTF-8.
+ok 36 - commit --squash into ISO-8859-1 from UTF-8
 
-expecting success of 3426.28 'git_rebase_interactive: 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
-		)
+expecting success of 3900.37 'commit --squash into eucJP from ISO-2022-JP': 
+		git checkout -b $flag-$old-$new C0 &&
+		git config i18n.commitencoding $old &&
+		echo $old >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		git config i18n.commitencoding $new &&
+		echo $new-$flag >>F &&
+		git commit -a --$flag HEAD^ &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git rev-list HEAD >actual &&
+		test_line_count = 3 actual &&
+		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
+		git cat-file commit HEAD^ >raw &&
+		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
+		test_cmp expect actual
 	
-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 a new branch 'ours'
-[ours dddfb5c] add_x
+Switched to a new branch 'squash-eucJP-ISO-2022-JP'
+[squash-eucJP-ISO-2022-JP 8154dd2] $B$O$l$R$[$U(B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[ours 2a5884b] Revert "add_x"
+[squash-eucJP-ISO-2022-JP ac34524] intermediate commit
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1
-Please move or remove them before you switch branches.
-Aborting
-error: could not detach HEAD
-ok 28 - git_rebase_interactive: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 3426.29 'rebase interactive ignores modified submodules': 
-	test_when_finished "rm -rf super sub" &&
-	git init sub &&
-	git -C sub commit --allow-empty -m "Initial commit" &&
-	git init super &&
-	git -c protocol.file.allow=always \
-		-C super submodule add ../sub &&
-	git -C super config submodule.sub.ignore dirty &&
-	>super/foo &&
-	git -C super add foo &&
-	git -C super commit -m "Initial commit" &&
-	test_commit -C super a &&
-	test_commit -C super b &&
-	test_commit -C super/sub c &&
-	set_fake_editor &&
-	git -C super rebase -i HEAD^^
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/sub/.git/
-[master (root-commit) b8cea33] Initial commit
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[squash-eucJP-ISO-2022-JP 60556dc] squash! $B$O$l$R$[$U(B
  Author: A U Thor <author@example.com>
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/super/.git/
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t3426-rebase-submodule/super/sub'...
-done.
-[master (root-commit) f377606] Initial commit
+ 1 file changed, 1 insertion(+)
+Rebasing (2/3)
[detached HEAD d7dba56] $B$O$l$R$[$U(B
  Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 foo
- create mode 160000 sub
-[master 4e30919] a
+ Date: Thu Apr 7 15:20:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-eucJP-ISO-2022-JP.
+ok 37 - commit --squash into eucJP from ISO-2022-JP
+
+expecting success of 3900.38 'commit --fixup into ISO-2022-JP from UTF-8': 
+		git checkout -b $flag-$old-$new C0 &&
+		git config i18n.commitencoding $old &&
+		echo $old >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		git config i18n.commitencoding $new &&
+		echo $new-$flag >>F &&
+		git commit -a --$flag HEAD^ &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git rev-list HEAD >actual &&
+		test_line_count = 3 actual &&
+		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
+		git cat-file commit HEAD^ >raw &&
+		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
+		test_cmp expect actual
+	
+Switched to a new branch 'fixup-ISO-2022-JP-UTF-8'
+[fixup-ISO-2022-JP-UTF-8 31ec3d8] $B$O$l$R$[$U(B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a.t
-[master 41aa191] b
+[fixup-ISO-2022-JP-UTF-8 1264baa] intermediate commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 b.t
-[master a61c667] c
+ create mode 100644 G
+[fixup-ISO-2022-JP-UTF-8 7683d37] fixup! $B$O$l$R$[$U(B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Successfully rebased and updated refs/heads/master.
-ok 29 - rebase interactive ignores modified submodules
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/fixup-ISO-2022-JP-UTF-8.
+ok 38 - commit --fixup into ISO-2022-JP from UTF-8
 
-# still have 4 known breakage(s)
-# passed all remaining 25 test(s)
-1..29
+# passed all 38 test(s)
+1..38
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3908-stash-in-worktree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3908-stash-in-worktree/.git/
-expecting success of 3908.1 'setup': 
-	test_commit initial &&
-	git worktree add wt &&
-	test_commit -C wt in-worktree
+*** t3901-i18n-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3901-i18n-patch/.git/
+expecting success of 3901.1 'setup': 
+	git config i18n.commitencoding UTF-8 &&
 
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
+	# use UTF-8 in author and committer name to match the
+	# i18n.commitencoding settings
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+
+	test_tick &&
+	echo "$GIT_AUTHOR_NAME" >mine &&
+	git add mine &&
+	git commit -s -m "Initial commit" &&
+
+	test_tick &&
+	echo Hello world >mine &&
+	git add mine &&
+	git commit -s -m "Second on main" &&
+
+	# the first commit on the side branch is UTF-8
+	test_tick &&
+	git checkout -b side main^ &&
+	echo Another file >yours &&
+	git add yours &&
+	git commit -s -m "Second on side" &&
+
+	if test_have_prereq !MINGW
+	then
+		# the second one on the side branch is ISO-8859-1
+		git config i18n.commitencoding ISO8859-1 &&
+		# use author and committer name in ISO-8859-1 to match it.
+		. "$TEST_DIRECTORY"/t3901/8859-1.txt
+	fi &&
+	test_tick &&
+	echo Yet another >theirs &&
+	git add theirs &&
+	git commit -s -m "Third on side" &&
+
+	# Back to default
+	git config i18n.commitencoding UTF-8
+
+[main (root-commit) a751cb4] Initial commit
+ Author: �éí óú <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Preparing worktree (new branch 'wt')
-HEAD is now at 24b24cf initial
-[wt a17e291] in-worktree
- Author: A U Thor <author@example.com>
+ create mode 100644 mine
+[main 1abbfe5] Second on main
+ Author: �éí óú <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side'
+[side 907dc52] Second on side
+ Author: �éí óú <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 in-worktree.t
+ create mode 100644 yours
+[side 717f610] Third on side
+ Author: Áéí óú <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 theirs
 ok 1 - setup
 
-expecting success of 3908.2 'apply in subdirectory': 
-	mkdir wt/subdir &&
-	(
-		cd wt/subdir &&
-		echo modified >../initial.t &&
-		git stash &&
-		git stash apply >out
-	) &&
-	grep "\.\.\/initial\.t" wt/subdir/out
+expecting success of 3901.2 'format-patch output (ISO-8859-1)': 
+	git config i18n.logoutputencoding ISO8859-1 &&
 
-Saved working directory and index state WIP on wt: a17e291 in-worktree
-	modified:   ../initial.t
-ok 2 - apply in subdirectory
+	git format-patch --stdout main..HEAD^ >out-l1 &&
+	git format-patch --stdout HEAD^ >out-l2 &&
+	grep "^Content-Type: text/plain; charset=ISO8859-1" out-l1 &&
+	grep "^From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l1 &&
+	grep "^Content-Type: text/plain; charset=ISO8859-1" out-l2 &&
+	grep "^From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l2
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3907-stash-show-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3907-stash-show-config/.git/
-expecting success of 3907.1 'setup': 
-	test_commit file
+Content-Type: text/plain; charset=ISO8859-1
+From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?= <author@example.com>
+Content-Type: text/plain; charset=ISO8859-1
+From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?= <author@example.com>
+ok 2 - format-patch output (ISO-8859-1)
 
-[master (root-commit) 4c1911f] file
- Author: A U Thor <author@example.com>
+expecting success of 3901.3 'format-patch output (UTF-8)': 
+	git config i18n.logoutputencoding UTF-8 &&
+
+	git format-patch --stdout main..HEAD^ >out-u1 &&
+	git format-patch --stdout HEAD^ >out-u2 &&
+	grep "^Content-Type: text/plain; charset=UTF-8" out-u1 &&
+	grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?=" out-u1 &&
+	grep "^Content-Type: text/plain; charset=UTF-8" out-u2 &&
+	grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?=" out-u2
+
+Content-Type: text/plain; charset=UTF-8
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+Content-Type: text/plain; charset=UTF-8
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 3 - format-patch output (UTF-8)
+
+expecting success of 3901.4 'rebase (U/U)': 
+	# We want the result of rebase in UTF-8
+	git config i18n.commitencoding UTF-8 &&
+
+	# The test is about logoutputencoding not affecting the
+	# final outcome -- it is used internally to generate the
+	# patch and the log.
+
+	git config i18n.logoutputencoding UTF-8 &&
+
+	# The result will be committed by GIT_COMMITTER_NAME --
+	# we want UTF-8 encoded name.
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+	git checkout -b test &&
+	git rebase main &&
+
+	check_encoding 2
+
+Switched to a new branch 'test'
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 4 - rebase (U/U)
+
+expecting success of 3901.5 'rebase (U/L)': 
+	git config i18n.commitencoding UTF-8 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+
+	git reset --hard side &&
+	git rebase main &&
+
+	check_encoding 2
+
+HEAD is now at 717f610 Third on side
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 5 - rebase (U/L)
+
+expecting success of 3901.6 'rebase (L/L)': 
+	# In this test we want ISO-8859-1 encoded commits as the result
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+
+	git reset --hard side &&
+	git rebase main &&
+
+	check_encoding 2 8859
+
+HEAD is now at 717f610 Third on side
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+ok 6 - rebase (L/L)
+
+expecting success of 3901.7 'rebase (L/U)': 
+	# This is pathological -- use UTF-8 as intermediate form
+	# to get ISO-8859-1 results.
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+
+	git reset --hard side &&
+	git rebase main &&
+
+	check_encoding 2 8859
+
+HEAD is now at 717f610 Third on side
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+ok 7 - rebase (L/U)
+
+expecting success of 3901.8 'cherry-pick(U/U)': 
+	# Both the commitencoding and logoutputencoding is set to UTF-8.
+
+	git config i18n.commitencoding UTF-8 &&
+	git config i18n.logoutputencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+
+	git reset --hard main &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	git revert HEAD &&
+
+	check_encoding 3
+
+HEAD is now at 1abbfe5 Second on main
+[test 226e420] Second on side
+ Author: �éí óú <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 file.t
-ok 1 - setup
+ create mode 100644 yours
+[test 0c82aa3] Third on side
+ Author: �éí óú <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 theirs
+[test 267f566] Revert "Third on side"
+ Author: �éí óú <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 theirs
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 8 - cherry-pick(U/U)
 
-expecting success of 3907.2 'showStat unset showPatch unset': 
-	test_stat_and_patch "<unset>" "<unset>" --stat
+expecting success of 3901.9 'cherry-pick(L/L)': 
+	# Both the commitencoding and logoutputencoding is set to ISO-8859-1
 
-Saved working directory and index state WIP on master: 4c1911f file
-ok 2 - showStat unset showPatch unset
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-expecting success of 3907.3 'showStat unset showPatch false': 
-	test_stat_and_patch "<unset>" false --stat
+	git reset --hard main &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	git revert HEAD &&
 
-Saved working directory and index state WIP on master: 4c1911f file
-ok 3 - showStat unset showPatch false
+	check_encoding 3 8859
 
-expecting success of 3907.4 'showStat unset showPatch true': 
-	test_stat_and_patch "<unset>" true --stat -p
+HEAD is now at 1abbfe5 Second on main
+[test e1b2855] Second on side
+ Author: Áéí óú <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 yours
+[test 37f31da] Third on side
+ Author: Áéí óú <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 theirs
+[test 2f88e21] Revert "Third on side"
+ Author: Áéí óú <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 theirs
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+ok 9 - cherry-pick(L/L)
 
-Saved working directory and index state WIP on master: 4c1911f file
-ok 4 - showStat unset showPatch true
+expecting success of 3901.10 'cherry-pick(U/L)': 
+	# Commitencoding is set to UTF-8 but logoutputencoding is ISO-8859-1
 
-expecting success of 3907.5 'showStat false showPatch unset': 
-	test_stat_and_patch false "<unset>"
+	git config i18n.commitencoding UTF-8 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
-Saved working directory and index state WIP on master: 4c1911f file
-ok 5 - showStat false showPatch unset
+	git reset --hard main &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	git revert HEAD &&
 
-expecting success of 3907.6 'showStat false showPatch false': 
-	test_stat_and_patch false false
+	check_encoding 3
 
-Saved working directory and index state WIP on master: 4c1911f file
-ok 6 - showStat false showPatch false
+HEAD is now at 1abbfe5 Second on main
+[test 226e420] Second on side
+ Author: Áéí óú <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 yours
+[test 0c82aa3] Third on side
+ Author: Áéí óú <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 theirs
+[test 267f566] Revert "Third on side"
+ Author: Áéí óú <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 theirs
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 10 - cherry-pick(U/L)
 
-expecting success of 3907.7 'showStat false showPatch true': 
-	test_stat_and_patch false true -p
+expecting success of 3901.11 'cherry-pick(L/U)': 
+	# Again, the commitencoding is set to ISO-8859-1 but
+	# logoutputencoding is set to UTF-8.
 
-Saved working directory and index state WIP on master: 4c1911f file
-ok 7 - showStat false showPatch true
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-expecting success of 3907.8 'showStat true showPatch unset': 
-	test_stat_and_patch true "<unset>" --stat
+	git reset --hard main &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	git revert HEAD &&
 
-Saved working directory and index state WIP on master: 4c1911f file
-ok 8 - showStat true showPatch unset
+	check_encoding 3 8859
 
-expecting success of 3907.9 'showStat true showPatch false': 
-	test_stat_and_patch true false --stat
+HEAD is now at 1abbfe5 Second on main
+[test e1b2855] Second on side
+ Author: Áéí óú <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 yours
+[test 37f31da] Third on side
+ Author: Áéí óú <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 theirs
+[test 2f88e21] Revert "Third on side"
+ Author: Áéí óú <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 theirs
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+ok 11 - cherry-pick(L/U)
 
-Saved working directory and index state WIP on master: 4c1911f file
-ok 9 - showStat true showPatch false
+expecting success of 3901.12 'rebase --merge (U/U)': 
+	git config i18n.commitencoding UTF-8 &&
+	git config i18n.logoutputencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
-expecting success of 3907.10 'showStat true showPatch true': 
-	test_stat_and_patch true true --stat -p
+	git reset --hard side &&
+	git rebase --merge main &&
 
-Saved working directory and index state WIP on master: 4c1911f file
-ok 10 - showStat true showPatch true
+	check_encoding 2
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3909-stash-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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" &&
+HEAD is now at 717f610 Third on side
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 12 - rebase --merge (U/U)
 
-	git tag checkpoint
+expecting success of 3901.13 'rebase --merge (U/L)': 
+	git config i18n.commitencoding UTF-8 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
-[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
+	git reset --hard side &&
+	git rebase --merge main &&
 
-expecting success of 3909.2 'simplest': 
-	restore_checkpoint &&
+	check_encoding 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 &&
+HEAD is now at 717f610 Third on side
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 13 - rebase --merge (U/L)
 
-	cat >expect <<-\EOF &&
-	M	fileA.t
-	EOF
+expecting success of 3901.14 'rebase --merge (L/L)': 
+	# In this test we want ISO-8859-1 encoded commits as the result
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-	echo fileA.t | git stash push --pathspec-from-file=- &&
-	verify_expect
+	git reset --hard side &&
+	git rebase --merge main &&
 
-HEAD is now at 2d1bb5b Files
-Saved working directory and index state WIP on master: 2d1bb5b Files
-ok 2 - simplest
+	check_encoding 2 8859
 
-expecting success of 3909.3 '--pathspec-file-nul': 
-	restore_checkpoint &&
+HEAD is now at 717f610 Third on side
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+ok 14 - rebase --merge (L/L)
 
-	# 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 3901.15 'rebase --merge (L/U)': 
+	# This is pathological -- use UTF-8 as intermediate form
+	# to get ISO-8859-1 results.
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-	cat >expect <<-\EOF &&
-	M	fileA.t
-	M	fileB.t
-	EOF
+	git reset --hard side &&
+	git rebase --merge main &&
 
-	printf "fileA.t\0fileB.t\0" | git stash push --pathspec-from-file=- --pathspec-file-nul &&
-	verify_expect
+	check_encoding 2 8859
 
-HEAD is now at 2d1bb5b Files
-Saved working directory and index state WIP on master: 2d1bb5b Files
-ok 3 - --pathspec-file-nul
+HEAD is now at 717f610 Third on side
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+ok 15 - rebase --merge (L/U)
 
-expecting success of 3909.4 'only touches what was listed': 
-	restore_checkpoint &&
+expecting success of 3901.16 'am (U/U)': 
+	# Apply UTF-8 patches with UTF-8 commitencoding
+	git config i18n.commitencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
-	# 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 &&
+	git reset --hard main &&
+	git am out-u1 out-u2 &&
 
-	cat >expect <<-\EOF &&
-	M	fileB.t
-	M	fileC.t
-	EOF
+	check_encoding 2
 
-	printf "fileB.t\nfileC.t\n" | git stash push --pathspec-from-file=- &&
-	verify_expect
+HEAD is now at 1abbfe5 Second on main
+Applying: Second on side
+Applying: Third on side
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 16 - am (U/U)
 
-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 3901.17 'am (L/L)': 
+	# Apply ISO-8859-1 patches with ISO-8859-1 commitencoding
+	git config i18n.commitencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-expecting success of 3909.5 'error conditions': 
-	restore_checkpoint &&
-	echo A >fileA.t &&
-	echo fileA.t >list &&
+	git reset --hard main &&
+	git am out-l1 out-l2 &&
 
-	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 &&
+	check_encoding 2 8859
 
-	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 &&
+HEAD is now at 1abbfe5 Second on main
+Applying: Second on side
+Applying: Third on side
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+ok 17 - am (L/L)
 
-	test_must_fail git stash push --pathspec-file-nul 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
+expecting success of 3901.18 'am (U/L)': 
+	# Apply ISO-8859-1 patches with UTF-8 commitencoding
+	git config i18n.commitencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+	git reset --hard main &&
 
-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
+	# am specifies --utf8 by default.
+	git am out-l1 out-l2 &&
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3910-mac-os-precompose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3910-mac-os-precompose/.git/
-checking prerequisite: UTF8_NFD_TO_NFC
+	check_encoding 2
 
-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"
+HEAD is now at 1abbfe5 Second on main
+Applying: Second on side
+Applying: Third on side
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 18 - am (U/L)
 
-)
-prerequisite UTF8_NFD_TO_NFC not satisfied
-1..0 # SKIP filesystem does not corrupt utf-8
+expecting success of 3901.19 'am --no-utf8 (U/L)': 
+	# Apply ISO-8859-1 patches with UTF-8 commitencoding
+	git config i18n.commitencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+
+	git reset --hard main &&
+	git am --no-utf8 out-l1 out-l2 2>err &&
+
+	# commit-tree will warn that the commit message does not contain valid UTF-8
+	# as mailinfo did not convert it
+	test_grep "did not conform" err &&
+
+	check_encoding 2
+
+HEAD is now at 1abbfe5 Second on main
+Applying: Second on side
+Applying: Third on side
+Warning: commit message did not conform to UTF-8.
+Warning: commit message did not conform to UTF-8.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 19 - am --no-utf8 (U/L)
+
+expecting success of 3901.20 'am (L/U)': 
+	# Apply UTF-8 patches with ISO-8859-1 commitencoding
+	git config i18n.commitencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+
+	git reset --hard main &&
+	# mailinfo will re-code the commit message to the charset specified by
+	# i18n.commitencoding
+	git am out-u1 out-u2 &&
+
+	check_encoding 2 8859
+
+HEAD is now at 1abbfe5 Second on main
+Applying: Second on side
+Applying: Third on side
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+ok 20 - am (L/U)
+
+# passed all 20 test(s)
+1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3513-revert-submodule.sh ***
@@ -215830,9 +216619,9 @@
 [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.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
 ok 12 - git_revert: modified submodule does not update submodule work tree to invalid commit
 
 expecting success of 3513.13 'git_revert: modified submodule does not update submodule work tree from invalid commit': 
@@ -215900,6 +216689,617 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3908-stash-in-worktree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3908-stash-in-worktree/.git/
+expecting success of 3908.1 'setup': 
+	test_commit initial &&
+	git worktree add wt &&
+	test_commit -C wt in-worktree
+
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Preparing worktree (new branch 'wt')
+HEAD is now at 24b24cf initial
+[wt a17e291] in-worktree
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 in-worktree.t
+ok 1 - setup
+
+expecting success of 3908.2 'apply in subdirectory': 
+	mkdir wt/subdir &&
+	(
+		cd wt/subdir &&
+		echo modified >../initial.t &&
+		git stash &&
+		git stash apply >out
+	) &&
+	grep "\.\.\/initial\.t" wt/subdir/out
+
+Saved working directory and index state WIP on wt: a17e291 in-worktree
+	modified:   ../initial.t
+ok 2 - apply in subdirectory
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3904-stash-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3904-stash-patch/.git/
+expecting success of 3904.1 'setup': 
+	mkdir dir &&
+	echo parent > dir/foo &&
+	echo dummy > bar &&
+	echo committed > HEAD &&
+	git add bar dir/foo HEAD &&
+	git commit -m initial &&
+	test_tick &&
+	test_commit second dir/foo head &&
+	echo index > dir/foo &&
+	git add dir/foo &&
+	set_and_save_state bar bar_work bar_index &&
+	save_head
+
+[master (root-commit) 797253d] initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 HEAD
+ create mode 100644 bar
+ create mode 100644 dir/foo
+[master 1f3a67c] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 3904.2 'saying "n" does nothing': 
+	set_state HEAD HEADfile_work HEADfile_index &&
+	set_state dir/foo work index &&
+	test_write_lines n n n | test_must_fail git stash save -p &&
+	verify_state HEAD HEADfile_work HEADfile_index &&
+	verify_saved_state bar &&
+	verify_state dir/foo work index
+
+diff --git a/HEAD b/HEAD
+index d0fe822..e74fca5 100644
+--- a/HEAD
++++ b/HEAD
+@@ -1 +1 @@
+-committed
++HEADfile_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+(1/1) Stash this hunk [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) Stash this hunk [y,n,q,a,d,e,p,?]? 
+No changes selected
+ok 2 - saying "n" does nothing
+
+expecting success of 3904.3 'git stash -p': 
+	test_write_lines y n y | git stash save -p &&
+	verify_state HEAD committed HEADfile_index &&
+	verify_saved_state bar &&
+	verify_state dir/foo head index &&
+	git reset --hard &&
+	git stash apply &&
+	verify_state HEAD HEADfile_work committed &&
+	verify_state bar dummy dummy &&
+	verify_state dir/foo work head
+
+diff --git a/HEAD b/HEAD
+index d0fe822..e74fca5 100644
+--- a/HEAD
++++ b/HEAD
+@@ -1 +1 @@
+-committed
++HEADfile_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+(1/1) Stash this hunk [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) Stash this hunk [y,n,q,a,d,e,p,?]? 
+Saved working directory and index state WIP on master: 1f3a67c second
+HEAD is now at 1f3a67c second
+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:   HEAD
+	modified:   dir/foo
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	_head
+	_index_bar
+	_worktree_bar
+	actual
+	expect
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 3 - git stash -p
+
+expecting success of 3904.4 'git stash -p --no-keep-index': 
+	set_state HEAD HEADfile_work HEADfile_index &&
+	set_state bar bar_work bar_index &&
+	set_state dir/foo work index &&
+	test_write_lines y n y | git stash save -p --no-keep-index &&
+	verify_state HEAD committed committed &&
+	verify_state bar bar_work dummy &&
+	verify_state dir/foo head head &&
+	git reset --hard &&
+	git stash apply --index &&
+	verify_state HEAD HEADfile_work HEADfile_index &&
+	verify_state bar dummy bar_index &&
+	verify_state dir/foo work index
+
+diff --git a/HEAD b/HEAD
+index d0fe822..e74fca5 100644
+--- a/HEAD
++++ b/HEAD
+@@ -1 +1 @@
+-committed
++HEADfile_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+(1/1) Stash this hunk [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) Stash this hunk [y,n,q,a,d,e,p,?]? 
+Saved working directory and index state WIP on master: 1f3a67c second
+HEAD is now at 1f3a67c second
+Merging Version stash was based on with Stashed changes
+On branch master
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   HEAD
+	modified:   bar
+	modified:   dir/foo
+
+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:   HEAD
+	modified:   bar
+	modified:   dir/foo
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	_head
+	_index_bar
+	_worktree_bar
+	actual
+	expect
+
+ok 4 - git stash -p --no-keep-index
+
+expecting success of 3904.5 'git stash --no-keep-index -p': 
+	set_state HEAD HEADfile_work HEADfile_index &&
+	set_state bar bar_work bar_index &&
+	set_state dir/foo work index &&
+	test_write_lines y n y | git stash save --no-keep-index -p &&
+	verify_state HEAD committed committed &&
+	verify_state dir/foo head head &&
+	verify_state bar bar_work dummy &&
+	git reset --hard &&
+	git stash apply --index &&
+	verify_state HEAD HEADfile_work HEADfile_index &&
+	verify_state bar dummy bar_index &&
+	verify_state dir/foo work index
+
+diff --git a/HEAD b/HEAD
+index d0fe822..e74fca5 100644
+--- a/HEAD
++++ b/HEAD
+@@ -1 +1 @@
+-committed
++HEADfile_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+(1/1) Stash this hunk [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) Stash this hunk [y,n,q,a,d,e,p,?]? 
+Saved working directory and index state WIP on master: 1f3a67c second
+HEAD is now at 1f3a67c second
+Merging Version stash was based on with Stashed changes
+On branch master
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   HEAD
+	modified:   bar
+	modified:   dir/foo
+
+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:   HEAD
+	modified:   bar
+	modified:   dir/foo
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	_head
+	_index_bar
+	_worktree_bar
+	actual
+	expect
+
+ok 5 - git stash --no-keep-index -p
+
+expecting success of 3904.6 'stash -p --no-keep-index -- <pathspec> does not unstage other files': 
+	set_state HEAD HEADfile_work HEADfile_index &&
+	set_state dir/foo work index &&
+	echo y | git stash push -p --no-keep-index -- HEAD &&
+	verify_state HEAD committed committed &&
+	verify_state dir/foo work index
+
+diff --git a/HEAD b/HEAD
+index d0fe822..e74fca5 100644
+--- a/HEAD
++++ b/HEAD
+@@ -1 +1 @@
+-committed
++HEADfile_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+Saved working directory and index state WIP on master: 1f3a67c second
+ok 6 - stash -p --no-keep-index -- <pathspec> does not unstage other files
+
+expecting success of 3904.7 'none of this moved HEAD': 
+	verify_saved_head
+
+ok 7 - none of this moved HEAD
+
+expecting success of 3904.8 'stash -p with split hunk': 
+	git reset --hard &&
+	cat >test <<-\EOF &&
+	aaa
+	bbb
+	ccc
+	EOF
+	git add test &&
+	git commit -m "initial" &&
+	cat >test <<-\EOF &&
+	aaa
+	added line 1
+	bbb
+	added line 2
+	ccc
+	EOF
+	printf "%s\n" s n y q |
+	git stash -p 2>error &&
+	test_must_be_empty error &&
+	grep "added line 1" test &&
+	! grep "added line 2" test
+
+HEAD is now at 1f3a67c second
+[master 97cac8f] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 test
+diff --git a/test b/test
+index 1802a74..515ff88 100644
+--- a/test
++++ b/test
+@@ -1,3 +1,5 @@
+ aaa
++added line 1
+ bbb
++added line 2
+ ccc
+(1/1) Stash this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
+@@ -1,2 +1,3 @@
+ aaa
++added line 1
+ bbb
+(1/2) Stash this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -2,2 +3,3 @@
+ bbb
++added line 2
+ ccc
+(2/2) Stash this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+Saved working directory and index state WIP on master: 97cac8f initial
+added line 1
+ok 8 - stash -p with split hunk
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3910-mac-os-precompose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3907-stash-show-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3907-stash-show-config/.git/
+expecting success of 3907.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 3907.2 'showStat unset showPatch unset': 
+	test_stat_and_patch "<unset>" "<unset>" --stat
+
+Saved working directory and index state WIP on master: 4c1911f file
+ok 2 - showStat unset showPatch unset
+
+expecting success of 3907.3 'showStat unset showPatch false': 
+	test_stat_and_patch "<unset>" false --stat
+
+Saved working directory and index state WIP on master: 4c1911f file
+ok 3 - showStat unset showPatch false
+
+expecting success of 3907.4 'showStat unset showPatch true': 
+	test_stat_and_patch "<unset>" true --stat -p
+
+Saved working directory and index state WIP on master: 4c1911f file
+ok 4 - showStat unset showPatch true
+
+expecting success of 3907.5 'showStat false showPatch unset': 
+	test_stat_and_patch false "<unset>"
+
+Saved working directory and index state WIP on master: 4c1911f file
+ok 5 - showStat false showPatch unset
+
+expecting success of 3907.6 'showStat false showPatch false': 
+	test_stat_and_patch false false
+
+Saved working directory and index state WIP on master: 4c1911f file
+ok 6 - showStat false showPatch false
+
+expecting success of 3907.7 'showStat false showPatch true': 
+	test_stat_and_patch false true -p
+
+Saved working directory and index state WIP on master: 4c1911f file
+ok 7 - showStat false showPatch true
+
+expecting success of 3907.8 'showStat true showPatch unset': 
+	test_stat_and_patch true "<unset>" --stat
+
+Saved working directory and index state WIP on master: 4c1911f file
+ok 8 - showStat true showPatch unset
+
+expecting success of 3907.9 'showStat true showPatch false': 
+	test_stat_and_patch true false --stat
+
+Saved working directory and index state WIP on master: 4c1911f file
+ok 9 - showStat true showPatch false
+
+expecting success of 3907.10 'showStat true showPatch true': 
+	test_stat_and_patch true true --stat -p
+
+Saved working directory and index state WIP on master: 4c1911f file
+ok 10 - showStat true showPatch true
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3909-stash-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4003-diff-rename-1.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4003-diff-rename-1/.git/
+expecting success of 4003.1 'prepare reference tree': 
+	COPYING_test_data >COPYING &&
+	echo frotz >rezrov &&
+	git update-index --add COPYING rezrov &&
+	tree=$(git write-tree) &&
+	echo $tree
+
+f7f2b494dd94f6acf05bc19174516b590236eb2d
+ok 1 - prepare reference tree
+
+expecting success of 4003.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 &&
+	git update-index --add --remove COPYING COPYING.?
+
+ok 2 - prepare work tree
+
+expecting success of 4003.3 'validate output from rename/copy detection (#1)': 
+	compare_diff_patch current expected
+
+ok 3 - validate output from rename/copy detection (#1)
+
+expecting success of 4003.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 4003.5 'validate output from rename/copy detection (#2)': 
+	compare_diff_patch current expected
+
+ok 5 - validate output from rename/copy detection (#2)
+
+expecting success of 4003.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 4003.7 'validate output from rename/copy detection (#3)': 
+	compare_diff_patch 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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3905-stash-include-untracked.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3905-stash-include-untracked/.git/
 expecting success of 3905.1 'stash save --include-untracked some dirty working directory': 
@@ -216499,57 +217899,1961 @@
 1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4003-diff-rename-1.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4003-diff-rename-1/.git/
-expecting success of 4003.1 'prepare reference tree': 
-	COPYING_test_data >COPYING &&
-	echo frotz >rezrov &&
-	git update-index --add COPYING rezrov &&
+*** t4004-diff-rename-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-f7f2b494dd94f6acf05bc19174516b590236eb2d
+e8a7292168115b2c189b56bd500aa179ca8d69ba
 ok 1 - prepare reference tree
 
-expecting success of 4003.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 &&
-	git update-index --add --remove COPYING COPYING.?
+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 4003.3 'validate output from rename/copy detection (#1)': 
+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 3 - validate output from rename/copy detection (#1)
+ok 4 - validate diff output
 
-expecting success of 4003.4 'prepare work tree again': 
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t3920-crlf-messages.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3920-crlf-messages/.git/
+expecting success of 3920.1 'Setup refs with commit and tag messages using CRLF': 
+	test_commit initial &&
+	create_crlf_refs
+
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 1 - Setup refs with commit and tag messages using CRLF
+
+expecting success of 3920.2 'branch: --verbose works with messages using CRLF': 
+	rm -f expect &&
+	for branch in $LIB_CRLF_BRANCHES
+	do
+		printf "  " >>expect &&
+		cat .crlf-subject-${branch}.txt >>expect &&
+		printf "\n" >>expect || return 1
+	done &&
+	git branch -v >tmp &&
+	# Remove first two columns, and the line for the currently checked out branch
+	current=$(git branch --show-current) &&
+	awk "/$current/ { next } { \$1 = \$2 = \"\" } 1" <tmp >actual &&
+	test_cmp expect actual
+
+ok 2 - branch: --verbose works with messages using CRLF
+
+expecting success of 3920.3 'branch: --format='%(contents:subject)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-subject-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git branch --list crlf* --format="%(contents:subject)" >actual &&
+			test_cmp expect actual
+		
+ok 3 - branch: --format='%(contents:subject)' works with messages using CRLF
+
+expecting success of 3920.4 'branch: --format='%(contents:body)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-body-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git branch --list crlf* --format="%(contents:body)" >actual &&
+			test_cmp expect actual
+		
+ok 4 - branch: --format='%(contents:body)' works with messages using CRLF
+
+expecting success of 3920.5 'branch: --format='%(contents)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-message-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git branch --list crlf* --format="%(contents)" >actual &&
+			test_cmp expect actual
+		
+ok 5 - branch: --format='%(contents)' works with messages using CRLF
+
+expecting success of 3920.6 'tag: --format='%(contents:subject)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-subject-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git tag --list tag-crlf* --format="%(contents:subject)" >actual &&
+			test_cmp expect actual
+		
+ok 6 - tag: --format='%(contents:subject)' works with messages using CRLF
+
+expecting success of 3920.7 'tag: --format='%(contents:body)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-body-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git tag --list tag-crlf* --format="%(contents:body)" >actual &&
+			test_cmp expect actual
+		
+ok 7 - tag: --format='%(contents:body)' works with messages using CRLF
+
+expecting success of 3920.8 'tag: --format='%(contents)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-message-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git tag --list tag-crlf* --format="%(contents)" >actual &&
+			test_cmp expect actual
+		
+ok 8 - tag: --format='%(contents)' works with messages using CRLF
+
+expecting success of 3920.9 'for-each-ref: --format='%(contents:subject)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-subject-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git for-each-ref refs/heads/crlf* --format="%(contents:subject)" >actual &&
+			test_cmp expect actual
+		
+ok 9 - for-each-ref: --format='%(contents:subject)' works with messages using CRLF
+
+expecting success of 3920.10 'for-each-ref: --format='%(contents:body)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-body-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git for-each-ref refs/heads/crlf* --format="%(contents:body)" >actual &&
+			test_cmp expect actual
+		
+ok 10 - for-each-ref: --format='%(contents:body)' works with messages using CRLF
+
+expecting success of 3920.11 'for-each-ref: --format='%(contents)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-message-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git for-each-ref refs/heads/crlf* --format="%(contents)" >actual &&
+			test_cmp expect actual
+		
+ok 11 - for-each-ref: --format='%(contents)' works with messages using CRLF
+
+expecting success of 3920.12 'log: --oneline works with messages using CRLF': 
+	for branch in $LIB_CRLF_BRANCHES
+	do
+		cat .crlf-subject-${branch}.txt >expect &&
+		printf "\n" >>expect &&
+		git log --oneline -1 ${branch} >tmp-branch &&
+		git log --oneline -1 tag-${branch} >tmp-tag &&
+		cut -d" " -f2- <tmp-branch >actual-branch &&
+		cut -d" " -f2- <tmp-tag >actual-tag &&
+		test_cmp expect actual-branch &&
+		test_cmp expect actual-tag || return 1
+	done
+
+ok 12 - log: --oneline works with messages using CRLF
+
+expecting success of 3920.13 'log: --format='%s' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-subject-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git log --all --reverse --grep Subject --format="%s" >actual &&
+			test_cmp expect actual
+		
+ok 13 - log: --format='%s' works with messages using CRLF
+
+expecting success of 3920.14 'log: --format='%b' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-body-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git log --all --reverse --grep Subject --format="%b" >actual &&
+			test_cmp expect actual
+		
+ok 14 - log: --format='%b' works with messages using CRLF
+
+expecting success of 3920.15 'log: --format='%B' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-message-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git log --all --reverse --grep Subject --format="%B" >actual &&
+			test_cmp expect actual
+		
+ok 15 - log: --format='%B' works with messages using CRLF
+
+expecting success of 3920.16 'show: --format='%s' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-subject-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git show crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline --format="%s" >actual &&
+			test_cmp expect actual
+		
+ok 16 - show: --format='%s' works with messages using CRLF
+
+expecting success of 3920.17 'show: --format='%b' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-body-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git show crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline --format="%b" >actual &&
+			test_cmp expect actual
+		
+ok 17 - show: --format='%b' works with messages using CRLF
+
+expecting success of 3920.18 'show: --format='%B' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-message-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git show crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline --format="%B" >actual &&
+			test_cmp expect actual
+		
+ok 18 - show: --format='%B' works with messages using CRLF
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4000-diff-format.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+
+ok 5 - git diff-files --no-patch as synonym for -s
+
+expecting success of 4000.6 'git diff-files --no-patch --patch shows the patch': 
+	git diff-files --no-patch --patch >actual &&
+	compare_diff_patch expected actual
+
+ok 6 - git diff-files --no-patch --patch shows the patch
+
+expecting success of 4000.7 'git diff-files --no-patch --patch-with-raw shows the patch and raw data': 
+	git diff-files --no-patch --patch-with-raw >actual &&
+	grep -q "^:100644 100755 .* $ZERO_OID M	path0\$" actual &&
+	tail -n +4 actual >actual-patch &&
+	compare_diff_patch expected actual-patch
+
+ok 7 - git diff-files --no-patch --patch-with-raw shows the patch and raw data
+
+expecting success of 4000.8 'git diff-files --patch --no-patch does not show the patch': 
+	git diff-files --patch --no-patch >actual 2>err &&
+	test_must_be_empty actual &&
+	test_must_be_empty err
+
+ok 8 - git diff-files --patch --no-patch does not show the patch
+
+expecting success of 4000.9 '--no-patch in 'git diff-files --no-patch --stat' is a no-op': 
+		git diff-files --no-patch "--$format" >actual &&
+		git diff-files "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 9 - --no-patch in 'git diff-files --no-patch --stat' is a no-op
+
+expecting success of 4000.10 '--no-patch clears all previous ones': 
+		git diff-files --$format -s -p >actual &&
+		git diff-files -p >expect &&
+		test_cmp expect actual
+	
+ok 10 - --no-patch clears all previous ones
+
+expecting success of 4000.11 '--no-patch in 'git diff --no-patch --stat' is a no-op': 
+		git diff --no-patch "--$format" >actual &&
+		git diff "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 11 - --no-patch in 'git diff --no-patch --stat' is a no-op
+
+expecting success of 4000.12 '--no-patch in 'git diff-files --no-patch --raw' is a no-op': 
+		git diff-files --no-patch "--$format" >actual &&
+		git diff-files "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 12 - --no-patch in 'git diff-files --no-patch --raw' is a no-op
+
+expecting success of 4000.13 '--no-patch clears all previous ones': 
+		git diff-files --$format -s -p >actual &&
+		git diff-files -p >expect &&
+		test_cmp expect actual
+	
+ok 13 - --no-patch clears all previous ones
+
+expecting success of 4000.14 '--no-patch in 'git diff --no-patch --raw' is a no-op': 
+		git diff --no-patch "--$format" >actual &&
+		git diff "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 14 - --no-patch in 'git diff --no-patch --raw' is a no-op
+
+expecting success of 4000.15 '--no-patch in 'git diff-files --no-patch --numstat' is a no-op': 
+		git diff-files --no-patch "--$format" >actual &&
+		git diff-files "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 15 - --no-patch in 'git diff-files --no-patch --numstat' is a no-op
+
+expecting success of 4000.16 '--no-patch clears all previous ones': 
+		git diff-files --$format -s -p >actual &&
+		git diff-files -p >expect &&
+		test_cmp expect actual
+	
+ok 16 - --no-patch clears all previous ones
+
+expecting success of 4000.17 '--no-patch in 'git diff --no-patch --numstat' is a no-op': 
+		git diff --no-patch "--$format" >actual &&
+		git diff "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 17 - --no-patch in 'git diff --no-patch --numstat' is a no-op
+
+expecting success of 4000.18 '--no-patch in 'git diff-files --no-patch --shortstat' is a no-op': 
+		git diff-files --no-patch "--$format" >actual &&
+		git diff-files "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 18 - --no-patch in 'git diff-files --no-patch --shortstat' is a no-op
+
+expecting success of 4000.19 '--no-patch clears all previous ones': 
+		git diff-files --$format -s -p >actual &&
+		git diff-files -p >expect &&
+		test_cmp expect actual
+	
+ok 19 - --no-patch clears all previous ones
+
+expecting success of 4000.20 '--no-patch in 'git diff --no-patch --shortstat' is a no-op': 
+		git diff --no-patch "--$format" >actual &&
+		git diff "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 20 - --no-patch in 'git diff --no-patch --shortstat' is a no-op
+
+expecting success of 4000.21 '--no-patch in 'git diff-files --no-patch --summary' is a no-op': 
+		git diff-files --no-patch "--$format" >actual &&
+		git diff-files "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 21 - --no-patch in 'git diff-files --no-patch --summary' is a no-op
+
+expecting success of 4000.22 '--no-patch clears all previous ones': 
+		git diff-files --$format -s -p >actual &&
+		git diff-files -p >expect &&
+		test_cmp expect actual
+	
+ok 22 - --no-patch clears all previous ones
+
+expecting success of 4000.23 '--no-patch in 'git diff --no-patch --summary' is a no-op': 
+		git diff --no-patch "--$format" >actual &&
+		git diff "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 23 - --no-patch in 'git diff --no-patch --summary' is a no-op
+
+expecting success of 4000.24 '--no-patch in 'git diff-files --no-patch --dirstat' is a no-op': 
+		git diff-files --no-patch "--$format" >actual &&
+		git diff-files "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 24 - --no-patch in 'git diff-files --no-patch --dirstat' is a no-op
+
+expecting success of 4000.25 '--no-patch clears all previous ones': 
+		git diff-files --$format -s -p >actual &&
+		git diff-files -p >expect &&
+		test_cmp expect actual
+	
+ok 25 - --no-patch clears all previous ones
+
+expecting success of 4000.26 '--no-patch in 'git diff --no-patch --dirstat' is a no-op': 
+		git diff --no-patch "--$format" >actual &&
+		git diff "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 26 - --no-patch in 'git diff --no-patch --dirstat' is a no-op
+
+expecting success of 4000.27 '--no-patch in 'git diff-files --no-patch --cumulative' is a no-op': 
+		git diff-files --no-patch "--$format" >actual &&
+		git diff-files "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 27 - --no-patch in 'git diff-files --no-patch --cumulative' is a no-op
+
+expecting success of 4000.28 '--no-patch clears all previous ones': 
+		git diff-files --$format -s -p >actual &&
+		git diff-files -p >expect &&
+		test_cmp expect actual
+	
+ok 28 - --no-patch clears all previous ones
+
+expecting success of 4000.29 '--no-patch in 'git diff --no-patch --cumulative' is a no-op': 
+		git diff --no-patch "--$format" >actual &&
+		git diff "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 29 - --no-patch in 'git diff --no-patch --cumulative' is a no-op
+
+expecting success of 4000.30 '--no-patch in 'git diff-files --no-patch --dirstat-by-file' is a no-op': 
+		git diff-files --no-patch "--$format" >actual &&
+		git diff-files "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 30 - --no-patch in 'git diff-files --no-patch --dirstat-by-file' is a no-op
+
+expecting success of 4000.31 '--no-patch clears all previous ones': 
+		git diff-files --$format -s -p >actual &&
+		git diff-files -p >expect &&
+		test_cmp expect actual
+	
+ok 31 - --no-patch clears all previous ones
+
+expecting success of 4000.32 '--no-patch in 'git diff --no-patch --dirstat-by-file' is a no-op': 
+		git diff --no-patch "--$format" >actual &&
+		git diff "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 32 - --no-patch in 'git diff --no-patch --dirstat-by-file' is a no-op
+
+expecting success of 4000.33 '--no-patch in 'git diff-files --no-patch --patch-with-raw' is a no-op': 
+		git diff-files --no-patch "--$format" >actual &&
+		git diff-files "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 33 - --no-patch in 'git diff-files --no-patch --patch-with-raw' is a no-op
+
+expecting success of 4000.34 '--no-patch clears all previous ones': 
+		git diff-files --$format -s -p >actual &&
+		git diff-files -p >expect &&
+		test_cmp expect actual
+	
+ok 34 - --no-patch clears all previous ones
+
+expecting success of 4000.35 '--no-patch in 'git diff --no-patch --patch-with-raw' is a no-op': 
+		git diff --no-patch "--$format" >actual &&
+		git diff "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 35 - --no-patch in 'git diff --no-patch --patch-with-raw' is a no-op
+
+expecting success of 4000.36 '--no-patch in 'git diff-files --no-patch --patch-with-stat' is a no-op': 
+		git diff-files --no-patch "--$format" >actual &&
+		git diff-files "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 36 - --no-patch in 'git diff-files --no-patch --patch-with-stat' is a no-op
+
+expecting success of 4000.37 '--no-patch clears all previous ones': 
+		git diff-files --$format -s -p >actual &&
+		git diff-files -p >expect &&
+		test_cmp expect actual
+	
+ok 37 - --no-patch clears all previous ones
+
+expecting success of 4000.38 '--no-patch in 'git diff --no-patch --patch-with-stat' is a no-op': 
+		git diff --no-patch "--$format" >actual &&
+		git diff "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 38 - --no-patch in 'git diff --no-patch --patch-with-stat' is a no-op
+
+expecting success of 4000.39 '--no-patch in 'git diff-files --no-patch --compact-summary' is a no-op': 
+		git diff-files --no-patch "--$format" >actual &&
+		git diff-files "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 39 - --no-patch in 'git diff-files --no-patch --compact-summary' is a no-op
+
+expecting success of 4000.40 '--no-patch clears all previous ones': 
+		git diff-files --$format -s -p >actual &&
+		git diff-files -p >expect &&
+		test_cmp expect actual
+	
+ok 40 - --no-patch clears all previous ones
+
+expecting success of 4000.41 '--no-patch in 'git diff --no-patch --compact-summary' is a no-op': 
+		git diff --no-patch "--$format" >actual &&
+		git diff "--$format" >expect &&
+		test_cmp expect actual
+	
+ok 41 - --no-patch in 'git diff --no-patch --compact-summary' is a no-op
+
+# passed all 41 test(s)
+1..41
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4005-diff-rename-2.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+	git update-index --add --remove COPYING COPYING.1 COPYING.2 &&
 
-ok 4 - prepare work tree again
+	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
 
-expecting success of 4003.5 'validate output from rename/copy detection (#2)': 
+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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4001-diff-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4001-diff-rename/.git/
+expecting success of 4001.1 'setup': 
+	cat >path0 <<-\EOF &&
+	Line 1
+	Line 2
+	Line 3
+	Line 4
+	Line 5
+	Line 6
+	Line 7
+	Line 8
+	Line 9
+	Line 10
+	line 11
+	Line 12
+	Line 13
+	Line 14
+	Line 15
+	EOF
+	cat >expected <<-\EOF &&
+	diff --git a/path0 b/path1
+	rename from path0
+	rename to path1
+	--- a/path0
+	+++ b/path1
+	@@ -8,7 +8,7 @@ Line 7
+	 Line 8
+	 Line 9
+	 Line 10
+	-line 11
+	+Line 11
+	 Line 12
+	 Line 13
+	 Line 14
+	EOF
+	cat >no-rename <<-\EOF
+	diff --git a/path0 b/path0
+	deleted file mode 100644
+	index fdbec44..0000000
+	--- a/path0
+	+++ /dev/null
+	@@ -1,15 +0,0 @@
+	-Line 1
+	-Line 2
+	-Line 3
+	-Line 4
+	-Line 5
+	-Line 6
+	-Line 7
+	-Line 8
+	-Line 9
+	-Line 10
+	-line 11
+	-Line 12
+	-Line 13
+	-Line 14
+	-Line 15
+	diff --git a/path1 b/path1
+	new file mode 100644
+	index 0000000..752c50e
+	--- /dev/null
+	+++ b/path1
+	@@ -0,0 +1,15 @@
+	+Line 1
+	+Line 2
+	+Line 3
+	+Line 4
+	+Line 5
+	+Line 6
+	+Line 7
+	+Line 8
+	+Line 9
+	+Line 10
+	+Line 11
+	+Line 12
+	+Line 13
+	+Line 14
+	+Line 15
+	EOF
+
+ok 1 - setup
+
+expecting success of 4001.2 'update-index --add a file.': git update-index --add path0
+ok 2 - update-index --add a file.
+
+expecting success of 4001.3 'write that tree.': tree=$(git write-tree) && echo $tree
+ad8378482f032562f72403dd7c5bd607578a3f0e
+ok 3 - write that tree.
+
+expecting success of 4001.4 'renamed and edited the file.': git update-index --add --remove path0 path1
+ok 4 - renamed and edited the file.
+
+expecting success of 4001.5 'git diff-index -p -M after rename and editing.': git diff-index -p -M $tree >current
+ok 5 - git diff-index -p -M after rename and editing.
+
+expecting success of 4001.6 'validate the output.': compare_diff_patch current expected
+ok 6 - validate the output.
+
+expecting success of 4001.7 'test diff.renames=true': 
+	git -c diff.renames=true diff --cached $tree >current &&
 	compare_diff_patch current expected
 
-ok 5 - validate output from rename/copy detection (#2)
+ok 7 - test diff.renames=true
 
-expecting success of 4003.6 'prepare work tree once again': 
-	COPYING_test_data >COPYING &&
-	git update-index --add --remove COPYING COPYING.1
+expecting success of 4001.8 'test diff.renames=false': 
+	git -c diff.renames=false diff --cached $tree >current &&
+	compare_diff_patch current no-rename
 
-ok 6 - prepare work tree once again
+ok 8 - test diff.renames=false
 
-expecting success of 4003.7 'validate output from rename/copy detection (#3)': 
+expecting success of 4001.9 'test diff.renames unset': 
+	git diff --cached $tree >current &&
 	compare_diff_patch current expected
 
+ok 9 - test diff.renames unset
+
+expecting success of 4001.10 'favour same basenames over different ones': 
+	cp path1 another-path &&
+	git add another-path &&
+	git commit -m 1 &&
+	git rm path1 &&
+	mkdir subdir &&
+	git mv another-path subdir/path1 &&
+	git status >out &&
+	test_grep "renamed: .*path1 -> subdir/path1" out
+
+[master (root-commit) 7846fdf] 1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 30 insertions(+)
+ create mode 100644 another-path
+ create mode 100644 path1
+rm 'path1'
+	renamed:    path1 -> subdir/path1
+ok 10 - favour same basenames over different ones
+
+expecting success of 4001.11 'test diff.renames=true for git status': 
+	git -c diff.renames=true status >out &&
+	test_grep "renamed: .*path1 -> subdir/path1" out
+
+	renamed:    path1 -> subdir/path1
+ok 11 - test diff.renames=true for git status
+
+expecting success of 4001.12 'test diff.renames=false for git status': 
+	git -c diff.renames=false status >out &&
+	test_grep ! "renamed: .*path1 -> subdir/path1" out &&
+	test_grep "new file: .*subdir/path1" out &&
+	test_grep "deleted: .*[^/]path1" out
+
+	new file:   subdir/path1
+	deleted:    path1
+ok 12 - test diff.renames=false for git status
+
+expecting success of 4001.13 'favour same basenames even with minor differences': 
+	git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
+	git status >out &&
+	test_grep "renamed: .*path1 -> subdir/path1" out
+
+	renamed:    path1 -> subdir/path1
+ok 13 - favour same basenames even with minor differences
+
+expecting success of 4001.14 'two files with same basename and same content': 
+	git reset --hard &&
+	mkdir -p dir/A dir/B &&
+	cp path1 dir/A/file &&
+	cp path1 dir/B/file &&
+	git add dir &&
+	git commit -m 2 &&
+	git mv dir other-dir &&
+	git status >out &&
+	test_grep "renamed: .*dir/A/file -> other-dir/A/file" out
+
+HEAD is now at 7846fdf 1
+[master 05f0b7a] 2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 30 insertions(+)
+ create mode 100644 dir/A/file
+ create mode 100644 dir/B/file
+	renamed:    dir/A/file -> other-dir/A/file
+ok 14 - two files with same basename and same content
+
+expecting success of 4001.15 'setup for many rename source candidates': 
+	git reset --hard &&
+	for i in 0 1 2 3 4 5 6 7 8 9;
+	do
+		for j in 0 1 2 3 4 5 6 7 8 9;
+		do
+			echo "$i$j" >"path$i$j" || return 1
+		done
+	done &&
+	git add "path??" &&
+	test_tick &&
+	git commit -m "hundred" &&
+	(cat path1 && echo new) >new-path &&
+	echo old >>path1 &&
+	git add new-path path1 &&
+	git diff -l 4 -C -C --cached --name-status >actual 2>actual.err &&
+	sed -e "s/^\([CM]\)[0-9]*	/\1	/" actual >actual.munged &&
+	cat >expect <<-EOF &&
+	C	path1	new-path
+	M	path1
+	EOF
+	test_cmp expect actual.munged &&
+	grep warning actual.err
+
+HEAD is now at 05f0b7a 2
+[master c0eb1c8] hundred
+ Author: A U Thor <author@example.com>
+ 100 files changed, 100 insertions(+)
+ create mode 100644 path00
+ create mode 100644 path01
+ create mode 100644 path02
+ create mode 100644 path03
+ create mode 100644 path04
+ create mode 100644 path05
+ create mode 100644 path06
+ create mode 100644 path07
+ create mode 100644 path08
+ create mode 100644 path09
+ create mode 100644 path10
+ create mode 100644 path11
+ create mode 100644 path12
+ create mode 100644 path13
+ create mode 100644 path14
+ create mode 100644 path15
+ create mode 100644 path16
+ create mode 100644 path17
+ create mode 100644 path18
+ create mode 100644 path19
+ create mode 100644 path20
+ create mode 100644 path21
+ create mode 100644 path22
+ create mode 100644 path23
+ create mode 100644 path24
+ create mode 100644 path25
+ create mode 100644 path26
+ create mode 100644 path27
+ create mode 100644 path28
+ create mode 100644 path29
+ create mode 100644 path30
+ create mode 100644 path31
+ create mode 100644 path32
+ create mode 100644 path33
+ create mode 100644 path34
+ create mode 100644 path35
+ create mode 100644 path36
+ create mode 100644 path37
+ create mode 100644 path38
+ create mode 100644 path39
+ create mode 100644 path40
+ create mode 100644 path41
+ create mode 100644 path42
+ create mode 100644 path43
+ create mode 100644 path44
+ create mode 100644 path45
+ create mode 100644 path46
+ create mode 100644 path47
+ create mode 100644 path48
+ create mode 100644 path49
+ create mode 100644 path50
+ create mode 100644 path51
+ create mode 100644 path52
+ create mode 100644 path53
+ create mode 100644 path54
+ create mode 100644 path55
+ create mode 100644 path56
+ create mode 100644 path57
+ create mode 100644 path58
+ create mode 100644 path59
+ create mode 100644 path60
+ create mode 100644 path61
+ create mode 100644 path62
+ create mode 100644 path63
+ create mode 100644 path64
+ create mode 100644 path65
+ create mode 100644 path66
+ create mode 100644 path67
+ create mode 100644 path68
+ create mode 100644 path69
+ create mode 100644 path70
+ create mode 100644 path71
+ create mode 100644 path72
+ create mode 100644 path73
+ create mode 100644 path74
+ create mode 100644 path75
+ create mode 100644 path76
+ create mode 100644 path77
+ create mode 100644 path78
+ create mode 100644 path79
+ create mode 100644 path80
+ create mode 100644 path81
+ create mode 100644 path82
+ create mode 100644 path83
+ create mode 100644 path84
+ create mode 100644 path85
+ create mode 100644 path86
+ create mode 100644 path87
+ create mode 100644 path88
+ create mode 100644 path89
+ create mode 100644 path90
+ create mode 100644 path91
+ create mode 100644 path92
+ create mode 100644 path93
+ create mode 100644 path94
+ create mode 100644 path95
+ create mode 100644 path96
+ create mode 100644 path97
+ create mode 100644 path98
+ create mode 100644 path99
+warning: only found copies from modified paths due to too many files.
+warning: you may want to set your diff.renameLimit variable to at least 104 and retry the command.
+ok 15 - setup for many rename source candidates
+
+expecting success of 4001.16 'rename pretty print with nothing in common': 
+	mkdir -p a/b/ &&
+	: >a/b/c &&
+	git add a/b/c &&
+	git commit -m "create a/b/c" &&
+	mkdir -p c/b/ &&
+	git mv a/b/c c/b/a &&
+	git commit -m "a/b/c -> c/b/a" &&
+	git diff -M --summary HEAD^ HEAD >output &&
+	test_grep " a/b/c => c/b/a " output &&
+	git diff -M --stat HEAD^ HEAD >output &&
+	test_grep " a/b/c => c/b/a " output
+
+[master 5d0663c] create a/b/c
+ Author: A U Thor <author@example.com>
+ 3 files changed, 17 insertions(+)
+ create mode 100644 a/b/c
+ create mode 100644 new-path
+[master 24096e6] a/b/c -> c/b/a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a/b/c => c/b/a (100%)
+ rename a/b/c => c/b/a (100%)
+ a/b/c => c/b/a | 0
+ok 16 - rename pretty print with nothing in common
+
+expecting success of 4001.17 'rename pretty print with common prefix': 
+	mkdir -p c/d &&
+	git mv c/b/a c/d/e &&
+	git commit -m "c/b/a -> c/d/e" &&
+	git diff -M --summary HEAD^ HEAD >output &&
+	test_grep " c/{b/a => d/e} " output &&
+	git diff -M --stat HEAD^ HEAD >output &&
+	test_grep " c/{b/a => d/e} " output
+
+[master e15a3a1] c/b/a -> c/d/e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename c/{b/a => d/e} (100%)
+ rename c/{b/a => d/e} (100%)
+ c/{b/a => d/e} | 0
+ok 17 - rename pretty print with common prefix
+
+expecting success of 4001.18 'rename pretty print with common suffix': 
+	mkdir d &&
+	git mv c/d/e d/e &&
+	git commit -m "c/d/e -> d/e" &&
+	git diff -M --summary HEAD^ HEAD >output &&
+	test_grep " {c/d => d}/e " output &&
+	git diff -M --stat HEAD^ HEAD >output &&
+	test_grep " {c/d => d}/e " output
+
+[master aafbd77] c/d/e -> d/e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {c/d => d}/e (100%)
+ rename {c/d => d}/e (100%)
+ {c/d => d}/e | 0
+ok 18 - rename pretty print with common suffix
+
+expecting success of 4001.19 'rename pretty print with common prefix and suffix': 
+	mkdir d/f &&
+	git mv d/e d/f/e &&
+	git commit -m "d/e -> d/f/e" &&
+	git diff -M --summary HEAD^ HEAD >output &&
+	test_grep " d/{ => f}/e " output &&
+	git diff -M --stat HEAD^ HEAD >output &&
+	test_grep " d/{ => f}/e " output
+
+[master 28b412a] d/e -> d/f/e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename d/{ => f}/e (100%)
+ rename d/{ => f}/e (100%)
+ d/{ => f}/e | 0
+ok 19 - rename pretty print with common prefix and suffix
+
+expecting success of 4001.20 'rename pretty print common prefix and suffix overlap': 
+	mkdir d/f/f &&
+	git mv d/f/e d/f/f/e &&
+	git commit -m "d/f/e d/f/f/e" &&
+	git diff -M --summary HEAD^ HEAD >output &&
+	test_grep " d/f/{ => f}/e " output &&
+	git diff -M --stat HEAD^ HEAD >output &&
+	test_grep " d/f/{ => f}/e " output
+
+[master 272fc8d] d/f/e d/f/f/e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename d/f/{ => f}/e (100%)
+ rename d/f/{ => f}/e (100%)
+ d/f/{ => f}/e | 0
+ok 20 - rename pretty print common prefix and suffix overlap
+
+expecting success of 4001.21 'diff-tree -l0 defaults to a big rename limit, not zero': 
+	test_write_lines line1 line2 line3 >myfile &&
+	git add myfile &&
+	git commit -m x &&
+
+	test_write_lines line1 line2 line4 >myotherfile &&
+	git rm myfile &&
+	git add myotherfile &&
+	git commit -m x &&
+
+	git diff-tree -M -l0 HEAD HEAD^ >actual &&
+	# Verify that a rename from myotherfile to myfile was detected
+	grep "myotherfile.*myfile" actual
+
+[master a3d2e59] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 myfile
+rm 'myfile'
+[master ff4cac0] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename myfile => myotherfile (66%)
+:100644 100644 cc8654bf0610eedacc646edaf4c1cbda59454836 83db48f84ec878fbfb30b46d16630e944e34f205 R066	myotherfile	myfile
+ok 21 - diff-tree -l0 defaults to a big rename limit, not zero
+
+expecting success of 4001.22 'basename similarity vs best similarity': 
+	mkdir subdir &&
+	test_write_lines line1 line2 line3 line4 line5 \
+			 line6 line7 line8 line9 line10 >subdir/file.txt &&
+	git add subdir/file.txt &&
+	git commit -m "base txt" &&
+
+	git rm subdir/file.txt &&
+	test_write_lines line1 line2 line3 line4 line5 \
+			  line6 line7 line8 >file.txt &&
+	test_write_lines line1 line2 line3 line4 line5 \
+			  line6 line7 line8 line9 >file.md &&
+	git add file.txt file.md &&
+	git commit -a -m "rename" &&
+	git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+	# subdir/file.txt is 88% similar to file.md, 78% similar to file.txt,
+	# but since same basenames are checked first...
+	cat >expected <<-\EOF &&
+	A	file.md
+	R078	subdir/file.txt	file.txt
+	EOF
+	test_cmp expected actual
+
+[master 09a1aec] base txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 subdir/file.txt
+rm 'subdir/file.txt'
+[master 72a9c67] rename
+ Author: A U Thor <author@example.com>
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+ create mode 100644 file.md
+ rename subdir/file.txt => file.txt (78%)
+ok 22 - basename similarity vs best similarity
+
+expecting success of 4001.23 'last line matters too': 
+	{
+		test_write_lines a 0 1 2 3 4 5 6 7 8 9 &&
+		printf "git ignores final up to 63 characters if not newline terminated"
+	} >no-final-lf &&
+	git add no-final-lf &&
+	git commit -m "original version of file with no final newline" &&
+
+	# Change ONLY the first character of the whole file
+	{
+		test_write_lines b 0 1 2 3 4 5 6 7 8 9 &&
+		printf "git ignores final up to 63 characters if not newline terminated"
+	} >no-final-lf &&
+	git add no-final-lf &&
+	git mv no-final-lf still-absent-final-lf &&
+	git commit -a -m "rename no-final-lf -> still-absent-final-lf" &&
+	git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+	sed -e "s/^R[0-9]*	/R	/" actual >actual.munged &&
+	cat >expected <<-\EOF &&
+	R	no-final-lf	still-absent-final-lf
+	EOF
+	test_cmp expected actual.munged
+
+[master b0865a0] original version of file with no final newline
+ Author: A U Thor <author@example.com>
+ 1 file changed, 12 insertions(+)
+ create mode 100644 no-final-lf
+[master bbca1a2] rename no-final-lf -> still-absent-final-lf
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename no-final-lf => still-absent-final-lf (97%)
+ok 23 - last line matters too
+
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4006-diff-mode.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4007-rename-3.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4009-diff-rename-4.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4008-diff-break-rewrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4011-diff-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4010-diff-pathspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4012-diff-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3701-add-interactive.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3701-add-interactive/.git/
 expecting success of 3701.1 'unknown command': 
@@ -218682,259 +221986,781 @@
 -f
 +F
 
-(3/3) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-ok 85 - hunk splitting works with diff.suppressBlankEmpty
+(3/3) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+ok 85 - hunk splitting works with diff.suppressBlankEmpty
+
+expecting success of 3701.86 'add -p respects diff.context': 
+	test_write_lines a b c d e f g h i j k l m >file &&
+	git add file &&
+	test_write_lines a b c d e f G h i j k l m >file &&
+	echo y | git -c diff.context=5 add -p >actual &&
+	test_grep "@@ -2,11 +2,11 @@" actual
+
+@@ -2,11 +2,11 @@ a
+ok 86 - add -p respects diff.context
+
+expecting success of 3701.87 'add -p respects diff.interHunkContext': 
+	test_write_lines a b c d e f g h i j k l m n o p q r s >file &&
+	git add file &&
+	test_write_lines a b c d E f g i i j k l m N o p q r s >file &&
+	echo y | git -c diff.interhunkcontext=2 add -p >actual &&
+	test_grep "@@ -2,16 +2,16 @@" actual
+
+@@ -2,16 +2,16 @@ a
+ok 87 - add -p respects diff.interHunkContext
+
+expecting success of 3701.88 'add -p rejects negative diff.context': 
+	test_config diff.context -1 &&
+	test_must_fail git add -p 2>output &&
+	test_grep "diff.context cannot be negative" output
+
+fatal: diff.context cannot be negative
+ok 88 - add -p rejects negative diff.context
+
+expecting success of 3701.89 'add accepts -U and --inter-hunk-context': 
+		test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
+		git add file &&
+		test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
+		echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
+			$cmd -p -U 4 --inter-hunk-context 2 >actual &&
+		test_grep "@@ -2,20 +2,20 @@" actual
+	
+@@ -2,20 +2,20 @@ a
+ok 89 - add accepts -U and --inter-hunk-context
+
+expecting success of 3701.90 'checkout accepts -U and --inter-hunk-context': 
+		test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
+		git add file &&
+		test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
+		echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
+			$cmd -p -U 4 --inter-hunk-context 2 >actual &&
+		test_grep "@@ -2,20 +2,20 @@" actual
+	
+@@ -2,20 +2,20 @@ a
+ok 90 - checkout accepts -U and --inter-hunk-context
+
+expecting success of 3701.91 'restore accepts -U and --inter-hunk-context': 
+		test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
+		git add file &&
+		test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
+		echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
+			$cmd -p -U 4 --inter-hunk-context 2 >actual &&
+		test_grep "@@ -2,20 +2,20 @@" actual
+	
+@@ -2,20 +2,20 @@ a
+ok 91 - restore accepts -U and --inter-hunk-context
+
+expecting success of 3701.92 'commit accepts -U and --inter-hunk-context': 
+		test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
+		git add file &&
+		test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
+		echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
+			$cmd -p -U 4 --inter-hunk-context 2 >actual &&
+		test_grep "@@ -2,20 +2,20 @@" actual
+	
+@@ -2,20 +2,20 @@ a
+ok 92 - commit accepts -U and --inter-hunk-context
+
+expecting success of 3701.93 'reset accepts -U and --inter-hunk-context': 
+	test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
+	git commit -m file file &&
+	test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
+	git add file &&
+	echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
+		reset -p -U 4 --inter-hunk-context 2 >actual &&
+	test_grep "@@ -2,20 +2,20 @@" actual
+
+[main 4425006] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+@@ -2,20 +2,20 @@ a
+ok 93 - reset accepts -U and --inter-hunk-context
+
+expecting success of 3701.94 'stash accepts -U and --inter-hunk-context': 
+	test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
+	git commit -m file file &&
+	test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
+	echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
+		stash -p -U 4 --inter-hunk-context 2 >actual &&
+	test_grep "@@ -2,20 +2,20 @@" actual
+
+[main b953778] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+@@ -2,20 +2,20 @@ a
+ok 94 - stash accepts -U and --inter-hunk-context
+
+expecting success of 3701.95 'add rejects invalid context options': 
+		test_must_fail git $cmd -p -U -3 2>actual &&
+		cat actual | echo &&
+		test_grep -e ".--unified. cannot be negative" actual &&
+
+		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
+		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+
+		test_must_fail git $cmd -U 7 2>actual &&
+		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+
+		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
+		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
+	
+
+fatal: '--unified' cannot be negative
+fatal: '--inter-hunk-context' cannot be negative
+fatal: the option '--unified' requires '--interactive/--patch'
+fatal: the option '--inter-hunk-context' requires '--interactive/--patch'
+ok 95 - add rejects invalid context options
+
+expecting success of 3701.96 'checkout rejects invalid context options': 
+		test_must_fail git $cmd -p -U -3 2>actual &&
+		cat actual | echo &&
+		test_grep -e ".--unified. cannot be negative" actual &&
+
+		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
+		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+
+		test_must_fail git $cmd -U 7 2>actual &&
+		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+
+		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
+		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
+	
+
+fatal: '--unified' cannot be negative
+fatal: '--inter-hunk-context' cannot be negative
+fatal: the option '--unified' requires '--patch'
+fatal: the option '--inter-hunk-context' requires '--patch'
+ok 96 - checkout rejects invalid context options
+
+expecting success of 3701.97 'commit rejects invalid context options': 
+		test_must_fail git $cmd -p -U -3 2>actual &&
+		cat actual | echo &&
+		test_grep -e ".--unified. cannot be negative" actual &&
+
+		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
+		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+
+		test_must_fail git $cmd -U 7 2>actual &&
+		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+
+		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
+		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
+	
+
+fatal: '--unified' cannot be negative
+fatal: '--inter-hunk-context' cannot be negative
+fatal: the option '--unified' requires '--interactive/--patch'
+fatal: the option '--inter-hunk-context' requires '--interactive/--patch'
+ok 97 - commit rejects invalid context options
+
+expecting success of 3701.98 'reset rejects invalid context options': 
+		test_must_fail git $cmd -p -U -3 2>actual &&
+		cat actual | echo &&
+		test_grep -e ".--unified. cannot be negative" actual &&
+
+		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
+		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+
+		test_must_fail git $cmd -U 7 2>actual &&
+		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+
+		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
+		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
+	
+
+fatal: '--unified' cannot be negative
+fatal: '--inter-hunk-context' cannot be negative
+fatal: the option '--unified' requires '--patch'
+fatal: the option '--inter-hunk-context' requires '--patch'
+ok 98 - reset rejects invalid context options
+
+expecting success of 3701.99 'restore rejects invalid context options': 
+		test_must_fail git $cmd -p -U -3 2>actual &&
+		cat actual | echo &&
+		test_grep -e ".--unified. cannot be negative" actual &&
+
+		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
+		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+
+		test_must_fail git $cmd -U 7 2>actual &&
+		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+
+		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
+		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
+	
+
+fatal: '--unified' cannot be negative
+fatal: '--inter-hunk-context' cannot be negative
+fatal: the option '--unified' requires '--patch'
+fatal: the option '--inter-hunk-context' requires '--patch'
+ok 99 - restore rejects invalid context options
+
+expecting success of 3701.100 'stash save rejects invalid context options': 
+		test_must_fail git $cmd -p -U -3 2>actual &&
+		cat actual | echo &&
+		test_grep -e ".--unified. cannot be negative" actual &&
+
+		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
+		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+
+		test_must_fail git $cmd -U 7 2>actual &&
+		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+
+		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
+		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
+	
+
+fatal: '--unified' cannot be negative
+fatal: '--inter-hunk-context' cannot be negative
+fatal: the option '--unified' requires '--patch'
+fatal: the option '--inter-hunk-context' requires '--patch'
+ok 100 - stash save rejects invalid context options
+
+expecting success of 3701.101 'stash push rejects invalid context options': 
+		test_must_fail git $cmd -p -U -3 2>actual &&
+		cat actual | echo &&
+		test_grep -e ".--unified. cannot be negative" actual &&
+
+		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
+		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+
+		test_must_fail git $cmd -U 7 2>actual &&
+		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+
+		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
+		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
+	
+
+fatal: '--unified' cannot be negative
+fatal: '--inter-hunk-context' cannot be negative
+fatal: the option '--unified' requires '--patch'
+fatal: the option '--inter-hunk-context' requires '--patch'
+ok 101 - stash push rejects invalid context options
+
+# passed all 101 test(s)
+1..101
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4002-diff-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4002-diff-basic/.git/
+expecting success of 4002.1 'adding test file NN and Z/NN': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 1 - adding test file NN and Z/NN
+
+expecting success of 4002.2 'adding test file ND and Z/ND': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 2 - adding test file ND and Z/ND
+
+expecting success of 4002.3 'adding test file NM and Z/NM': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 3 - adding test file NM and Z/NM
+
+expecting success of 4002.4 'adding test file DN and Z/DN': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 4 - adding test file DN and Z/DN
+
+expecting success of 4002.5 'adding test file DD and Z/DD': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 5 - adding test file DD and Z/DD
+
+expecting success of 4002.6 'adding test file DM and Z/DM': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 6 - adding test file DM and Z/DM
+
+expecting success of 4002.7 'adding test file MN and Z/MN': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 7 - adding test file MN and Z/MN
+
+expecting success of 4002.8 'adding test file MD and Z/MD': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 8 - adding test file MD and Z/MD
+
+expecting success of 4002.9 'adding test file MM and Z/MM': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 9 - adding test file MM and Z/MM
+
+expecting success of 4002.10 'adding test file SS': 
+	git update-index --add SS
+
+ok 10 - adding test file SS
+
+expecting success of 4002.11 'adding test file TT': 
+	git update-index --add TT
+
+ok 11 - adding test file TT
+
+expecting success of 4002.12 'prepare initial tree': 
+	tree_O=$(git write-tree)
+
+ok 12 - prepare initial tree
+
+expecting success of 4002.13 'change in branch A (removal)': 
+	git update-index --remove $to_remove
+
+ok 13 - change in branch A (removal)
+
+expecting success of 4002.14 'change in branch A (modification)': 
+		git update-index $p
+	
+ok 14 - change in branch A (modification)
+
+expecting success of 4002.15 'change in branch A (modification)': 
+		git update-index $p
+	
+ok 15 - change in branch A (modification)
+
+expecting success of 4002.16 'change in branch A (modification)': 
+		git update-index $p
+	
+ok 16 - change in branch A (modification)
+
+expecting success of 4002.17 'change in branch A (modification)': 
+		git update-index $p
+	
+ok 17 - change in branch A (modification)
+
+expecting success of 4002.18 'change in branch A (modification)': 
+		git update-index $p
+	
+ok 18 - change in branch A (modification)
+
+expecting success of 4002.19 'change in branch A (modification)': 
+		git update-index $p
+	
+ok 19 - change in branch A (modification)
+
+expecting success of 4002.20 'change in branch A (addition)': 
+		git update-index --add $p
+	
+ok 20 - change in branch A (addition)
+
+expecting success of 4002.21 'change in branch A (addition)': 
+		git update-index --add $p
+	
+ok 21 - change in branch A (addition)
+
+expecting success of 4002.22 'change in branch A (addition)': 
+		git update-index --add $p
+	
+ok 22 - change in branch A (addition)
+
+expecting success of 4002.23 'change in branch A (addition)': 
+		git update-index --add $p
+	
+ok 23 - change in branch A (addition)
+
+expecting success of 4002.24 'change in branch A (addition)': 
+	git update-index --add LL &&
+	git update-index SS
+
+ok 24 - change in branch A (addition)
+
+expecting success of 4002.25 'change in branch A (edit)': 
+	git update-index TT
+
+ok 25 - change in branch A (edit)
+
+expecting success of 4002.26 'change in branch A (change file to directory)': 
+	git update-index --add DF/DF
+
+ok 26 - change in branch A (change file to directory)
+
+expecting success of 4002.27 'recording branch A tree': 
+	tree_A=$(git write-tree)
+
+ok 27 - recording branch A tree
+
+expecting success of 4002.28 'reading original tree and checking out': 
+	git read-tree $tree_O &&
+	git checkout-index -a
+
+ok 28 - reading original tree and checking out
+
+expecting success of 4002.29 'change in branch B (removal)': 
+	git update-index --remove $to_remove
+
+ok 29 - change in branch B (removal)
+
+expecting success of 4002.30 'change in branch B (modification)': 
+		git update-index $p
+	
+ok 30 - change in branch B (modification)
+
+expecting success of 4002.31 'change in branch B (modification)': 
+		git update-index $p
+	
+ok 31 - change in branch B (modification)
+
+expecting success of 4002.32 'change in branch B (modification)': 
+		git update-index $p
+	
+ok 32 - change in branch B (modification)
+
+expecting success of 4002.33 'change in branch B (modification)': 
+		git update-index $p
+	
+ok 33 - change in branch B (modification)
+
+expecting success of 4002.34 'change in branch B (modification)': 
+		git update-index $p
+	
+ok 34 - change in branch B (modification)
+
+expecting success of 4002.35 'change in branch B (modification)': 
+		git update-index $p
+	
+ok 35 - change in branch B (modification)
+
+expecting success of 4002.36 'change in branch B (addition)': 
+		git update-index --add $p
+	
+ok 36 - change in branch B (addition)
+
+expecting success of 4002.37 'change in branch B (addition)': 
+		git update-index --add $p
+	
+ok 37 - change in branch B (addition)
+
+expecting success of 4002.38 'change in branch B (addition)': 
+		git update-index --add $p
+	
+ok 38 - change in branch B (addition)
+
+expecting success of 4002.39 'change in branch B (addition)': 
+		git update-index --add $p
+	
+ok 39 - change in branch B (addition)
+
+expecting success of 4002.40 'change in branch B (addition and modification)': 
+	git update-index --add LL &&
+	git update-index SS
+
+ok 40 - change in branch B (addition and modification)
+
+expecting success of 4002.41 'change in branch B (modification)': 
+	git update-index TT
+
+ok 41 - change in branch B (modification)
+
+expecting success of 4002.42 'change in branch B (addition of a file to conflict with directory)': 
+	git update-index --add DF
+
+ok 42 - change in branch B (addition of a file to conflict with directory)
+
+expecting success of 4002.43 'recording branch B tree': 
+	tree_B=$(git write-tree)
+
+ok 43 - recording branch B tree
 
-expecting success of 3701.86 'add -p respects diff.context': 
-	test_write_lines a b c d e f g h i j k l m >file &&
-	git add file &&
-	test_write_lines a b c d e f G h i j k l m >file &&
-	echo y | git -c diff.context=5 add -p >actual &&
-	test_grep "@@ -2,11 +2,11 @@" actual
+expecting success of 4002.44 'keep contents of 3 trees for easy access': 
+	rm -f .git/index &&
+	git read-tree $tree_O &&
+	mkdir .orig-O &&
+	git checkout-index --prefix=.orig-O/ -f -q -a &&
+	rm -f .git/index &&
+	git read-tree $tree_A &&
+	mkdir .orig-A &&
+	git checkout-index --prefix=.orig-A/ -f -q -a &&
+	rm -f .git/index &&
+	git read-tree $tree_B &&
+	mkdir .orig-B &&
+	git checkout-index --prefix=.orig-B/ -f -q -a
 
-@@ -2,11 +2,11 @@ a
-ok 86 - add -p respects diff.context
+ok 44 - keep contents of 3 trees for easy access
 
-expecting success of 3701.87 'add -p respects diff.interHunkContext': 
-	test_write_lines a b c d e f g h i j k l m n o p q r s >file &&
-	git add file &&
-	test_write_lines a b c d E f g i i j k l m N o p q r s >file &&
-	echo y | git -c diff.interhunkcontext=2 add -p >actual &&
-	test_grep "@@ -2,16 +2,16 @@" actual
+expecting success of 4002.45 'diff-tree of known trees.': 
+	git diff-tree $tree_O $tree_A >.test-a &&
+	cmp -s .test-a .test-plain-OA
 
-@@ -2,16 +2,16 @@ a
-ok 87 - add -p respects diff.interHunkContext
+ok 45 - diff-tree of known trees.
 
-expecting success of 3701.88 'add -p rejects negative diff.context': 
-	test_config diff.context -1 &&
-	test_must_fail git add -p 2>output &&
-	test_grep "diff.context cannot be negative" output
+expecting success of 4002.46 'diff-tree of known trees.': 
+	git diff-tree -r $tree_O $tree_A >.test-a &&
+	cmp -s .test-a .test-recursive-OA
 
-fatal: diff.context cannot be negative
-ok 88 - add -p rejects negative diff.context
+ok 46 - diff-tree of known trees.
 
-expecting success of 3701.89 'add accepts -U and --inter-hunk-context': 
-		test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
-		git add file &&
-		test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
-		echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
-			$cmd -p -U 4 --inter-hunk-context 2 >actual &&
-		test_grep "@@ -2,20 +2,20 @@" actual
-	
-@@ -2,20 +2,20 @@ a
-ok 89 - add accepts -U and --inter-hunk-context
+expecting success of 4002.47 'diff-tree of known trees.': 
+	git diff-tree $tree_O $tree_B >.test-a &&
+	cmp -s .test-a .test-plain-OB
 
-expecting success of 3701.90 'checkout accepts -U and --inter-hunk-context': 
-		test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
-		git add file &&
-		test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
-		echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
-			$cmd -p -U 4 --inter-hunk-context 2 >actual &&
-		test_grep "@@ -2,20 +2,20 @@" actual
-	
-@@ -2,20 +2,20 @@ a
-ok 90 - checkout accepts -U and --inter-hunk-context
+ok 47 - diff-tree of known trees.
 
-expecting success of 3701.91 'restore accepts -U and --inter-hunk-context': 
-		test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
-		git add file &&
-		test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
-		echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
-			$cmd -p -U 4 --inter-hunk-context 2 >actual &&
-		test_grep "@@ -2,20 +2,20 @@" actual
-	
-@@ -2,20 +2,20 @@ a
-ok 91 - restore accepts -U and --inter-hunk-context
+expecting success of 4002.48 'diff-tree of known trees.': 
+	git diff-tree -r $tree_O $tree_B >.test-a &&
+	cmp -s .test-a .test-recursive-OB
 
-expecting success of 3701.92 'commit accepts -U and --inter-hunk-context': 
-		test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
-		git add file &&
-		test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
-		echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
-			$cmd -p -U 4 --inter-hunk-context 2 >actual &&
-		test_grep "@@ -2,20 +2,20 @@" actual
-	
-@@ -2,20 +2,20 @@ a
-ok 92 - commit accepts -U and --inter-hunk-context
+ok 48 - diff-tree of known trees.
 
-expecting success of 3701.93 'reset accepts -U and --inter-hunk-context': 
-	test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
-	git commit -m file file &&
-	test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
-	git add file &&
-	echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
-		reset -p -U 4 --inter-hunk-context 2 >actual &&
-	test_grep "@@ -2,20 +2,20 @@" actual
+expecting success of 4002.49 'diff-tree of known trees.': 
+	git diff-tree $tree_A $tree_B >.test-a &&
+	cmp -s .test-a .test-plain-AB
 
-[main 4425006] file
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-@@ -2,20 +2,20 @@ a
-ok 93 - reset accepts -U and --inter-hunk-context
+ok 49 - diff-tree of known trees.
 
-expecting success of 3701.94 'stash accepts -U and --inter-hunk-context': 
-	test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
-	git commit -m file file &&
-	test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
-	echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
-		stash -p -U 4 --inter-hunk-context 2 >actual &&
-	test_grep "@@ -2,20 +2,20 @@" actual
+expecting success of 4002.50 'diff-tree of known trees.': 
+	git diff-tree -r $tree_A $tree_B >.test-a &&
+	cmp -s .test-a .test-recursive-AB
 
-[main b953778] file
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-@@ -2,20 +2,20 @@ a
-ok 94 - stash accepts -U and --inter-hunk-context
+ok 50 - diff-tree of known trees.
 
-expecting success of 3701.95 'add rejects invalid context options': 
-		test_must_fail git $cmd -p -U -3 2>actual &&
-		cat actual | echo &&
-		test_grep -e ".--unified. cannot be negative" actual &&
+expecting success of 4002.51 'diff-tree --stdin of known trees.': 
+	echo $tree_A $tree_B | git diff-tree --stdin > .test-a &&
+	echo $tree_A $tree_B > .test-plain-ABx &&
+	cat .test-plain-AB >> .test-plain-ABx &&
+	cmp -s .test-a .test-plain-ABx
 
-		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
-		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+ok 51 - diff-tree --stdin of known trees.
 
-		test_must_fail git $cmd -U 7 2>actual &&
-		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+expecting success of 4002.52 'diff-tree --stdin of known trees.': 
+	echo $tree_A $tree_B | git diff-tree -r --stdin > .test-a &&
+	echo $tree_A $tree_B > .test-recursive-ABx &&
+	cat .test-recursive-AB >> .test-recursive-ABx &&
+	cmp -s .test-a .test-recursive-ABx
 
-		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
-		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
-	
+ok 52 - diff-tree --stdin of known trees.
 
-fatal: '--unified' cannot be negative
-fatal: '--inter-hunk-context' cannot be negative
-fatal: the option '--unified' requires '--interactive/--patch'
-fatal: the option '--inter-hunk-context' requires '--interactive/--patch'
-ok 95 - add rejects invalid context options
+expecting success of 4002.53 'diff-cache O with A in cache': 
+	git read-tree $tree_A &&
+	git diff-index --cached $tree_O >.test-a &&
+	cmp -s .test-a .test-recursive-OA
 
-expecting success of 3701.96 'checkout rejects invalid context options': 
-		test_must_fail git $cmd -p -U -3 2>actual &&
-		cat actual | echo &&
-		test_grep -e ".--unified. cannot be negative" actual &&
+ok 53 - diff-cache O with A in cache
 
-		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
-		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+expecting success of 4002.54 'diff-cache O with B in cache': 
+	git read-tree $tree_B &&
+	git diff-index --cached $tree_O >.test-a &&
+	cmp -s .test-a .test-recursive-OB
 
-		test_must_fail git $cmd -U 7 2>actual &&
-		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+ok 54 - diff-cache O with B in cache
 
-		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
-		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
-	
+expecting success of 4002.55 'diff-cache A with B in cache': 
+	git read-tree $tree_B &&
+	git diff-index --cached $tree_A >.test-a &&
+	cmp -s .test-a .test-recursive-AB
 
-fatal: '--unified' cannot be negative
-fatal: '--inter-hunk-context' cannot be negative
-fatal: the option '--unified' requires '--patch'
-fatal: the option '--inter-hunk-context' requires '--patch'
-ok 96 - checkout rejects invalid context options
+ok 55 - diff-cache A with B in cache
 
-expecting success of 3701.97 'commit rejects invalid context options': 
-		test_must_fail git $cmd -p -U -3 2>actual &&
-		cat actual | echo &&
-		test_grep -e ".--unified. cannot be negative" actual &&
+expecting success of 4002.56 'diff-files with O in cache and A checked out': 
+	rm -fr Z [A-Z][A-Z] &&
+	git read-tree $tree_A &&
+	git checkout-index -f -a &&
+	git read-tree --reset $tree_O &&
+	test_must_fail git update-index --refresh -q &&
+	git diff-files >.test-a &&
+	cmp_diff_files_output .test-a .test-recursive-OA
 
-		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
-		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+DD: needs update
+DM: needs update
+DN: needs update
+MD: needs update
+MM: needs update
+MN: needs update
+SS: needs update
+TT: needs update
+Z/DD: needs update
+Z/DM: needs update
+Z/DN: needs update
+Z/MD: needs update
+Z/MM: needs update
+Z/MN: needs update
+ok 56 - diff-files with O in cache and A checked out
 
-		test_must_fail git $cmd -U 7 2>actual &&
-		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+expecting success of 4002.57 'diff-files with O in cache and B checked out': 
+	rm -fr Z [A-Z][A-Z] &&
+	git read-tree $tree_B &&
+	git checkout-index -f -a &&
+	git read-tree --reset $tree_O &&
+	test_must_fail git update-index --refresh -q &&
+	git diff-files >.test-a &&
+	cmp_diff_files_output .test-a .test-recursive-OB
 
-		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
-		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
-	
+DD: needs update
+DM: needs update
+MD: needs update
+MM: needs update
+ND: needs update
+NM: needs update
+SS: needs update
+TT: needs update
+Z/DD: needs update
+Z/DM: needs update
+Z/MD: needs update
+Z/MM: needs update
+Z/ND: needs update
+Z/NM: needs update
+ok 57 - diff-files with O in cache and B checked out
 
-fatal: '--unified' cannot be negative
-fatal: '--inter-hunk-context' cannot be negative
-fatal: the option '--unified' requires '--interactive/--patch'
-fatal: the option '--inter-hunk-context' requires '--interactive/--patch'
-ok 97 - commit rejects invalid context options
+expecting success of 4002.58 'diff-files with A in cache and B checked out': 
+	rm -fr Z [A-Z][A-Z] &&
+	git read-tree $tree_B &&
+	git checkout-index -f -a &&
+	git read-tree --reset $tree_A &&
+	test_must_fail git update-index --refresh -q &&
+	git diff-files >.test-a &&
+	cmp_diff_files_output .test-a .test-recursive-AB
 
-expecting success of 3701.98 'reset rejects invalid context options': 
-		test_must_fail git $cmd -p -U -3 2>actual &&
-		cat actual | echo &&
-		test_grep -e ".--unified. cannot be negative" actual &&
+AA: needs update
+AN: needs update
+DF/DF: needs update
+MD: needs update
+MM: needs update
+MN: needs update
+ND: needs update
+NM: needs update
+TT: needs update
+Z/AA: needs update
+Z/AN: needs update
+Z/MD: needs update
+Z/MM: needs update
+Z/MN: needs update
+Z/ND: needs update
+Z/NM: needs update
+ok 58 - diff-files with A in cache and B checked out
 
-		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
-		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+expecting success of 4002.59 'diff-tree O A == diff-tree -R A O': 
+	git diff-tree $tree_O $tree_A >.test-a &&
+	git diff-tree -R $tree_A $tree_O >.test-b &&
+	cmp -s .test-a .test-b
 
-		test_must_fail git $cmd -U 7 2>actual &&
-		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+ok 59 - diff-tree O A == diff-tree -R A O
 
-		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
-		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
-	
+expecting success of 4002.60 'diff-tree -r O A == diff-tree -r -R A O': 
+	git diff-tree -r $tree_O $tree_A >.test-a &&
+	git diff-tree -r -R $tree_A $tree_O >.test-b &&
+	cmp -s .test-a .test-b
 
-fatal: '--unified' cannot be negative
-fatal: '--inter-hunk-context' cannot be negative
-fatal: the option '--unified' requires '--patch'
-fatal: the option '--inter-hunk-context' requires '--patch'
-ok 98 - reset rejects invalid context options
+ok 60 - diff-tree -r O A == diff-tree -r -R A O
 
-expecting success of 3701.99 'restore rejects invalid context options': 
-		test_must_fail git $cmd -p -U -3 2>actual &&
-		cat actual | echo &&
-		test_grep -e ".--unified. cannot be negative" actual &&
+expecting success of 4002.61 'diff-tree B A == diff-tree -R A B': 
+	git diff-tree $tree_B $tree_A >.test-a &&
+	git diff-tree -R $tree_A $tree_B >.test-b &&
+	cmp -s .test-a .test-b
 
-		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
-		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+ok 61 - diff-tree B A == diff-tree -R A B
 
-		test_must_fail git $cmd -U 7 2>actual &&
-		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+expecting success of 4002.62 'diff-tree -r B A == diff-tree -r -R A B': 
+	git diff-tree -r $tree_B $tree_A >.test-a &&
+	git diff-tree -r -R $tree_A $tree_B >.test-b &&
+	cmp -s .test-a .test-b
+ok 62 - diff-tree -r B A == diff-tree -r -R A B
 
-		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
-		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
-	
+expecting success of 4002.63 'diff can read from stdin': 
+	test_must_fail git diff --no-index -- MN - < NN |
+		sed "/^index/d; s#/-#/NN#" >.test-a &&
+	test_must_fail git diff --no-index -- MN NN |
+		grep -v "^index" >.test-b &&
+	test_cmp .test-a .test-b
 
-fatal: '--unified' cannot be negative
-fatal: '--inter-hunk-context' cannot be negative
-fatal: the option '--unified' requires '--patch'
-fatal: the option '--inter-hunk-context' requires '--patch'
-ok 99 - restore rejects invalid context options
+ok 63 - diff can read from stdin
 
-expecting success of 3701.100 'stash save rejects invalid context options': 
-		test_must_fail git $cmd -p -U -3 2>actual &&
-		cat actual | echo &&
-		test_grep -e ".--unified. cannot be negative" actual &&
+# passed all 63 test(s)
+1..63
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4016-diff-quote.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4016-diff-quote/.git/
+expecting success of 4016.1 'setup': 
+	echo P0.0 >"$P0.0" &&
+	echo P0.1 >"$P0.1" &&
+	echo P0.2 >"$P0.2" &&
+	echo P0.3 >"$P0.3" &&
+	echo P1.0 >"$P1.0" &&
+	echo P1.2 >"$P1.2" &&
+	echo P1.3 >"$P1.3" &&
+	git add . &&
+	git commit -m initial &&
+	git mv "$P0.0" "R$P0.0" &&
+	git mv "$P0.1" "R$P1.0" &&
+	git mv "$P0.2" "R$P2.0" &&
+	git mv "$P0.3" "R$P3.0" &&
+	git mv "$P1.0" "R$P0.1" &&
+	git mv "$P1.2" "R$P2.1" &&
+	git mv "$P1.3" "R$P3.1" &&
+	:
 
-		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
-		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+[master (root-commit) ab09c26] initial
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+)
+ create mode 100644 "pathname\twith HT.0"
+ create mode 100644 "pathname\twith HT.2"
+ create mode 100644 "pathname\twith HT.3"
+ create mode 100644 pathname.0
+ create mode 100644 pathname.1
+ create mode 100644 pathname.2
+ create mode 100644 pathname.3
+ok 1 - setup
 
-		test_must_fail git $cmd -U 7 2>actual &&
-		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+expecting success of 4016.2 'setup expected files': 
+cat >expect <<\EOF
+ rename pathname.1 => "Rpathname\twith HT.0" (100%)
+ rename pathname.3 => "Rpathname\nwith LF.0" (100%)
+ rename "pathname\twith HT.3" => "Rpathname\nwith LF.1" (100%)
+ rename pathname.2 => Rpathname with SP.0 (100%)
+ rename "pathname\twith HT.2" => Rpathname with SP.1 (100%)
+ rename pathname.0 => Rpathname.0 (100%)
+ rename "pathname\twith HT.0" => Rpathname.1 (100%)
+EOF
 
-		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
-		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
-	
+ok 2 - setup expected files
 
-fatal: '--unified' cannot be negative
-fatal: '--inter-hunk-context' cannot be negative
-fatal: the option '--unified' requires '--patch'
-fatal: the option '--inter-hunk-context' requires '--patch'
-ok 100 - stash save rejects invalid context options
+expecting success of 4016.3 'git diff --summary -M HEAD': 
+	git diff --summary -M HEAD >actual &&
+	test_cmp expect actual
 
-expecting success of 3701.101 'stash push rejects invalid context options': 
-		test_must_fail git $cmd -p -U -3 2>actual &&
-		cat actual | echo &&
-		test_grep -e ".--unified. cannot be negative" actual &&
+ok 3 - git diff --summary -M HEAD
 
-		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
-		test_grep -e ".--inter-hunk-context. cannot be negative" actual &&
+expecting success of 4016.4 'git diff --numstat -M HEAD': 
+	cat >expect <<-\EOF &&
+	0	0	pathname.1 => "Rpathname\twith HT.0"
+	0	0	pathname.3 => "Rpathname\nwith LF.0"
+	0	0	"pathname\twith HT.3" => "Rpathname\nwith LF.1"
+	0	0	pathname.2 => Rpathname with SP.0
+	0	0	"pathname\twith HT.2" => Rpathname with SP.1
+	0	0	pathname.0 => Rpathname.0
+	0	0	"pathname\twith HT.0" => Rpathname.1
+	EOF
+	git diff --numstat -M HEAD >actual &&
+	test_cmp expect actual
 
-		test_must_fail git $cmd -U 7 2>actual &&
-		test_grep -E ".--unified. requires .(--interactive/)?--patch." actual &&
+ok 4 - git diff --numstat -M HEAD
 
-		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
-		test_grep -E ".--inter-hunk-context. requires .(--interactive/)?--patch." actual
-	
+expecting success of 4016.5 'git diff --stat -M HEAD': 
+	cat >expect <<-\EOF &&
+	 pathname.1 => "Rpathname\twith HT.0"            | 0
+	 pathname.3 => "Rpathname\nwith LF.0"            | 0
+	 "pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0
+	 pathname.2 => Rpathname with SP.0               | 0
+	 "pathname\twith HT.2" => Rpathname with SP.1    | 0
+	 pathname.0 => Rpathname.0                       | 0
+	 "pathname\twith HT.0" => Rpathname.1            | 0
+	 7 files changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	git diff --stat -M HEAD >actual &&
+	test_cmp expect actual
 
-fatal: '--unified' cannot be negative
-fatal: '--inter-hunk-context' cannot be negative
-fatal: the option '--unified' requires '--patch'
-fatal: the option '--inter-hunk-context' requires '--patch'
-ok 101 - stash push rejects invalid context options
+ok 5 - git diff --stat -M HEAD
 
-# passed all 101 test(s)
-1..101
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3800-mktag.sh ***
@@ -219793,4767 +223619,1735 @@
 4e3fe4d9567cd5a844c5587aa99cf1b302e7487f
 fatal: Tag refs/tags/bad_tag points nowhere?
 fatal: bad object deadbeefdeadbeefdeadbeefdeadbeefdeadbeef
-ok 56 - fast-export & fast-import: verify object (hash/type) check -- correct type, nonexisting object
-
-expecting success of 3800.57 'fail with [--[no-]strict]: verify object (hash/type) check -- made-up type, valid object': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-ok 57 - fail with [--[no-]strict]: verify object (hash/type) check -- made-up type, valid object
-
-expecting success of 3800.58 'setup: verify object (hash/type) check -- made-up type, valid object': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 58 - setup: verify object (hash/type) check -- made-up type, valid object
-
-expecting success of 3800.59 'hash-object & fsck unreachable: verify object (hash/type) check -- made-up type, valid object': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-error: 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0: object could not be parsed: ./objects/52/b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-ok 59 - hash-object & fsck unreachable: verify object (hash/type) check -- made-up type, valid object
-
-expecting success of 3800.60 'update-ref & fsck reachable: verify object (hash/type) check -- made-up type, valid object': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-fatal: update_ref failed for ref 'refs/tags/bad_tag': cannot update ref 'refs/tags/bad_tag': trying to write ref 'refs/tags/bad_tag' with nonexistent object 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-error: 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0: object could not be parsed: ./objects/52/b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-error: refs/tags/bad_tag: invalid sha1 pointer 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-ok 60 - update-ref & fsck reachable: verify object (hash/type) check -- made-up type, valid object
-
-expecting success of 3800.61 'for-each-ref: verify object (hash/type) check -- made-up type, valid object': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-fatal: parse_object_buffer failed on 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0 for refs/tags/bad_tag
-ok 61 - for-each-ref: verify object (hash/type) check -- made-up type, valid object
-
-expecting success of 3800.62 'fast-export & fast-import: verify object (hash/type) check -- made-up type, valid object': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-fatal: bad object refs/tags/bad_tag
-error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-fatal: bad object 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
-ok 62 - fast-export & fast-import: verify object (hash/type) check -- made-up type, valid object
-
-expecting success of 3800.63 'fail with [--[no-]strict]: verify object (hash/type) check -- made-up type, nonexisting object': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-ok 63 - fail with [--[no-]strict]: verify object (hash/type) check -- made-up type, nonexisting object
-
-expecting success of 3800.64 'setup: verify object (hash/type) check -- made-up type, nonexisting object': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 64 - setup: verify object (hash/type) check -- made-up type, nonexisting object
-
-expecting success of 3800.65 'hash-object & fsck unreachable: verify object (hash/type) check -- made-up type, nonexisting object': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
-error: 873c7147ca509be00715bfd9f0901c56090b241a: object could not be parsed: ./objects/87/3c7147ca509be00715bfd9f0901c56090b241a
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-ok 65 - hash-object & fsck unreachable: verify object (hash/type) check -- made-up type, nonexisting object
-
-expecting success of 3800.66 'update-ref & fsck reachable: verify object (hash/type) check -- made-up type, nonexisting object': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-873c7147ca509be00715bfd9f0901c56090b241a
-error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
-fatal: update_ref failed for ref 'refs/tags/bad_tag': cannot update ref 'refs/tags/bad_tag': trying to write ref 'refs/tags/bad_tag' with nonexistent object 873c7147ca509be00715bfd9f0901c56090b241a
-error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
-error: 873c7147ca509be00715bfd9f0901c56090b241a: object could not be parsed: ./objects/87/3c7147ca509be00715bfd9f0901c56090b241a
-error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
-error: refs/tags/bad_tag: invalid sha1 pointer 873c7147ca509be00715bfd9f0901c56090b241a
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-ok 66 - update-ref & fsck reachable: verify object (hash/type) check -- made-up type, nonexisting object
-
-expecting success of 3800.67 'for-each-ref: verify object (hash/type) check -- made-up type, nonexisting object': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-873c7147ca509be00715bfd9f0901c56090b241a
-error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
-fatal: parse_object_buffer failed on 873c7147ca509be00715bfd9f0901c56090b241a for refs/tags/bad_tag
-ok 67 - for-each-ref: verify object (hash/type) check -- made-up type, nonexisting object
-
-expecting success of 3800.68 'fast-export & fast-import: verify object (hash/type) check -- made-up type, nonexisting object': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-873c7147ca509be00715bfd9f0901c56090b241a
-error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
-fatal: bad object refs/tags/bad_tag
-error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
-fatal: bad object 873c7147ca509be00715bfd9f0901c56090b241a
-ok 68 - fast-export & fast-import: verify object (hash/type) check -- made-up type, nonexisting object
-
-expecting success of 3800.69 'fail with [--[no-]strict]: verify object (hash/type) check -- mismatched type, valid object': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-ok 69 - fail with [--[no-]strict]: verify object (hash/type) check -- mismatched type, valid object
-
-expecting success of 3800.70 'setup: verify object (hash/type) check -- mismatched type, valid object': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 70 - setup: verify object (hash/type) check -- mismatched type, valid object
-
-expecting success of 3800.71 'hash-object & fsck unreachable: verify object (hash/type) check -- mismatched type, valid object': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag 8eb32de5253d54ed4e9a069073f158738f84be64
-ok 71 - hash-object & fsck unreachable: verify object (hash/type) check -- mismatched type, valid object
-
-expecting success of 3800.72 'update-ref & fsck reachable: verify object (hash/type) check -- mismatched type, valid object': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-8eb32de5253d54ed4e9a069073f158738f84be64
-notice: HEAD points to an unborn branch (master)
-broken link from     tag 8eb32de5253d54ed4e9a069073f158738f84be64
-              to    tree d9df4505cb3522088b9e29d6051ac16f1564154a
-missing tree d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 72 - update-ref & fsck reachable: verify object (hash/type) check -- mismatched type, valid object
-
-expecting success of 3800.73 'for-each-ref: verify object (hash/type) check -- mismatched type, valid object': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-8eb32de5253d54ed4e9a069073f158738f84be64
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 73 - for-each-ref: verify object (hash/type) check -- mismatched type, valid object
-
-expecting success of 3800.74 'fast-export & fast-import: verify object (hash/type) check -- mismatched type, valid object': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-8eb32de5253d54ed4e9a069073f158738f84be64
-warning: Tag points to object of unexpected type tree, skipping.
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 74 - fast-export & fast-import: verify object (hash/type) check -- mismatched type, valid object
-
-expecting success of 3800.75 'setup replacement of commit -> commit and tree -> blob': 
-	git replace $head_parent $head &&
-	git replace -f $tree $blob
-
-ok 75 - setup replacement of commit -> commit and tree -> blob
-
-expecting success of 3800.76 'tag to a commit replaced by another commit': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-ok 76 - tag to a commit replaced by another commit
-
-expecting success of 3800.77 'fail with [--[no-]strict]: verify object (hash/type) check -- mismatched type, valid object': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-ok 77 - fail with [--[no-]strict]: verify object (hash/type) check -- mismatched type, valid object
-
-expecting success of 3800.78 'setup: verify object (hash/type) check -- mismatched type, valid object': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 78 - setup: verify object (hash/type) check -- mismatched type, valid object
-
-expecting success of 3800.79 'hash-object & fsck unreachable: verify object (hash/type) check -- mismatched type, valid object': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag 9c31a0046f5d3b4164baf115cc0b69635524bb04
-ok 79 - hash-object & fsck unreachable: verify object (hash/type) check -- mismatched type, valid object
-
-expecting success of 3800.80 'update-ref & fsck reachable: verify object (hash/type) check -- mismatched type, valid object': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-9c31a0046f5d3b4164baf115cc0b69635524bb04
-notice: HEAD points to an unborn branch (master)
-broken link from     tag 9c31a0046f5d3b4164baf115cc0b69635524bb04
-              to    tree 0fbca9850869684085d654f9e1380c9780802570
-missing tree 0fbca9850869684085d654f9e1380c9780802570
-ok 80 - update-ref & fsck reachable: verify object (hash/type) check -- mismatched type, valid object
-
-expecting success of 3800.81 'for-each-ref: verify object (hash/type) check -- mismatched type, valid object': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-9c31a0046f5d3b4164baf115cc0b69635524bb04
-fatal: missing object 0fbca9850869684085d654f9e1380c9780802570 for refs/tags/bad_tag
-ok 81 - for-each-ref: verify object (hash/type) check -- mismatched type, valid object
-
-expecting success of 3800.82 'fast-export & fast-import: verify object (hash/type) check -- mismatched type, valid object': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-9c31a0046f5d3b4164baf115cc0b69635524bb04
-warning: Tag points to object of unexpected type tree, skipping.
-fatal: bad object 0fbca9850869684085d654f9e1380c9780802570
-fatal: bad object 0fbca9850869684085d654f9e1380c9780802570
-ok 82 - fast-export & fast-import: verify object (hash/type) check -- mismatched type, valid object
-
-expecting success of 3800.83 'fail with [--[no-]strict]: verify tag-name check': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-warning: tag input does not pass fsck: badTagName: invalid 'tag' name: my	tag
-3a917b365efe8e0762ae4448ca795035d60fedbe
-ok 83 - fail with [--[no-]strict]: verify tag-name check
-
-expecting success of 3800.84 'setup: verify tag-name check': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 84 - setup: verify tag-name check
-
-expecting success of 3800.85 'hash-object & fsck unreachable: verify tag-name check': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-ok 85 - hash-object & fsck unreachable: verify tag-name check
-
-expecting success of 3800.86 'update-ref & fsck reachable: verify tag-name check': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-3a917b365efe8e0762ae4448ca795035d60fedbe
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-notice: HEAD points to an unborn branch (master)
-broken link from     tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
-missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 86 - update-ref & fsck reachable: verify tag-name check
-
-expecting success of 3800.87 'for-each-ref: verify tag-name check': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-3a917b365efe8e0762ae4448ca795035d60fedbe
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 87 - for-each-ref: verify tag-name check
-
-expecting success of 3800.88 'fast-export & fast-import: verify tag-name check': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-3a917b365efe8e0762ae4448ca795035d60fedbe
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 88 - fast-export & fast-import: verify tag-name check
-
-expecting success of 3800.89 'fail with [--[no-]strict]: "tagger" line label check #1': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-warning: tag input does not pass fsck: missingTaggerEntry: invalid format - expected 'tagger' line
-c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-ok 89 - fail with [--[no-]strict]: "tagger" line label check #1
-
-expecting success of 3800.90 'setup: "tagger" line label check #1': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 90 - setup: "tagger" line label check #1
-
-expecting success of 3800.91 'hash-object & fsck unreachable: "tagger" line label check #1': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-ok 91 - hash-object & fsck unreachable: "tagger" line label check #1
-
-expecting success of 3800.92 'update-ref & fsck reachable: "tagger" line label check #1': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-notice: HEAD points to an unborn branch (master)
-broken link from     tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
-missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 92 - update-ref & fsck reachable: "tagger" line label check #1
-
-expecting success of 3800.93 'for-each-ref: "tagger" line label check #1': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 93 - for-each-ref: "tagger" line label check #1
-
-expecting success of 3800.94 'fast-export & fast-import: "tagger" line label check #1': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 94 - fast-export & fast-import: "tagger" line label check #1
-
-expecting success of 3800.95 'fail with [--[no-]strict]: "tagger" line label check #2': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-warning: tag input does not pass fsck: missingTaggerEntry: invalid format - expected 'tagger' line
-warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-ok 95 - fail with [--[no-]strict]: "tagger" line label check #2
-
-expecting success of 3800.96 'setup: "tagger" line label check #2': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 96 - setup: "tagger" line label check #2
-
-expecting success of 3800.97 'hash-object & fsck unreachable: "tagger" line label check #2': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-ok 97 - hash-object & fsck unreachable: "tagger" line label check #2
-
-expecting success of 3800.98 'update-ref & fsck reachable: "tagger" line label check #2': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-notice: HEAD points to an unborn branch (master)
-broken link from     tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
-missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 98 - update-ref & fsck reachable: "tagger" line label check #2
-
-expecting success of 3800.99 'for-each-ref: "tagger" line label check #2': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 99 - for-each-ref: "tagger" line label check #2
-
-expecting success of 3800.100 'fast-export & fast-import: "tagger" line label check #2': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 100 - fast-export & fast-import: "tagger" line label check #2
-
-expecting success of 3800.101 'allow missing tag author name': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-ok 101 - allow missing tag author name
-
-expecting success of 3800.102 'fail with [--[no-]strict]: disallow malformed tagger': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-error: tag input does not pass fsck: badEmail: invalid author/committer line - bad email
-warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-10a38b63369e5f6b0d453612536d13ca970fdf12
-ok 102 - fail with [--[no-]strict]: disallow malformed tagger
-
-expecting success of 3800.103 'setup: disallow malformed tagger': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 103 - setup: disallow malformed tagger
-
-expecting success of 3800.104 'hash-object & fsck unreachable: disallow malformed tagger': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-ok 104 - hash-object & fsck unreachable: disallow malformed tagger
-
-expecting success of 3800.105 'update-ref & fsck reachable: disallow malformed tagger': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-10a38b63369e5f6b0d453612536d13ca970fdf12
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-notice: HEAD points to an unborn branch (master)
-broken link from     tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
-missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 105 - update-ref & fsck reachable: disallow malformed tagger
-
-expecting success of 3800.106 'for-each-ref: disallow malformed tagger': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-10a38b63369e5f6b0d453612536d13ca970fdf12
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 106 - for-each-ref: disallow malformed tagger
-
-expecting success of 3800.107 'fast-export & fast-import: disallow malformed tagger': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-10a38b63369e5f6b0d453612536d13ca970fdf12
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 107 - fast-export & fast-import: disallow malformed tagger
-
-expecting success of 3800.108 'allow empty tag email': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-ok 108 - allow empty tag email
-
-expecting success of 3800.109 'allow spaces in tag email like fsck': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-ok 109 - allow spaces in tag email like fsck
-
-expecting success of 3800.110 'fail with [--[no-]strict]: disallow missing tag timestamp': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-ok 110 - fail with [--[no-]strict]: disallow missing tag timestamp
-
-expecting success of 3800.111 'setup: disallow missing tag timestamp': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 111 - setup: disallow missing tag timestamp
-
-expecting success of 3800.112 'hash-object & fsck unreachable: disallow missing tag timestamp': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-error in tag 86ec28e12f82414dedbbf24955ba3624796ce743: badDate: invalid author/committer line - bad date
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag 86ec28e12f82414dedbbf24955ba3624796ce743
-ok 112 - hash-object & fsck unreachable: disallow missing tag timestamp
-
-expecting success of 3800.113 'update-ref & fsck reachable: disallow missing tag timestamp': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-86ec28e12f82414dedbbf24955ba3624796ce743
-error in tag 86ec28e12f82414dedbbf24955ba3624796ce743: badDate: invalid author/committer line - bad date
-notice: HEAD points to an unborn branch (master)
-broken link from     tag 86ec28e12f82414dedbbf24955ba3624796ce743
-              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
-missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 113 - update-ref & fsck reachable: disallow missing tag timestamp
-
-expecting success of 3800.114 'for-each-ref: disallow missing tag timestamp': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-86ec28e12f82414dedbbf24955ba3624796ce743
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 114 - for-each-ref: disallow missing tag timestamp
-
-expecting success of 3800.115 'fast-export & fast-import: disallow missing tag timestamp': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-86ec28e12f82414dedbbf24955ba3624796ce743
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 115 - fast-export & fast-import: disallow missing tag timestamp
-
-expecting success of 3800.116 'fail with [--[no-]strict]: detect invalid tag timestamp1': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-ok 116 - fail with [--[no-]strict]: detect invalid tag timestamp1
-
-expecting success of 3800.117 'setup: detect invalid tag timestamp1': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 117 - setup: detect invalid tag timestamp1
-
-expecting success of 3800.118 'hash-object & fsck unreachable: detect invalid tag timestamp1': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-error in tag a7154e3a1ebaee50a7858cfa890b4e328ba6eff1: badDate: invalid author/committer line - bad date
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag a7154e3a1ebaee50a7858cfa890b4e328ba6eff1
-ok 118 - hash-object & fsck unreachable: detect invalid tag timestamp1
-
-expecting success of 3800.119 'update-ref & fsck reachable: detect invalid tag timestamp1': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-a7154e3a1ebaee50a7858cfa890b4e328ba6eff1
-error in tag a7154e3a1ebaee50a7858cfa890b4e328ba6eff1: badDate: invalid author/committer line - bad date
-notice: HEAD points to an unborn branch (master)
-broken link from     tag a7154e3a1ebaee50a7858cfa890b4e328ba6eff1
-              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
-missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 119 - update-ref & fsck reachable: detect invalid tag timestamp1
-
-expecting success of 3800.120 'for-each-ref: detect invalid tag timestamp1': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-a7154e3a1ebaee50a7858cfa890b4e328ba6eff1
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 120 - for-each-ref: detect invalid tag timestamp1
-
-expecting success of 3800.121 'fast-export & fast-import: detect invalid tag timestamp1': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-a7154e3a1ebaee50a7858cfa890b4e328ba6eff1
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 121 - fast-export & fast-import: detect invalid tag timestamp1
-
-expecting success of 3800.122 'fail with [--[no-]strict]: detect invalid tag timestamp2': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-ok 122 - fail with [--[no-]strict]: detect invalid tag timestamp2
-
-expecting success of 3800.123 'setup: detect invalid tag timestamp2': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 123 - setup: detect invalid tag timestamp2
-
-expecting success of 3800.124 'hash-object & fsck unreachable: detect invalid tag timestamp2': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-error in tag 1f6463b89bb8b45e3232dbac638692b2b5d5c962: badDate: invalid author/committer line - bad date
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag 1f6463b89bb8b45e3232dbac638692b2b5d5c962
-ok 124 - hash-object & fsck unreachable: detect invalid tag timestamp2
-
-expecting success of 3800.125 'update-ref & fsck reachable: detect invalid tag timestamp2': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-1f6463b89bb8b45e3232dbac638692b2b5d5c962
-error in tag 1f6463b89bb8b45e3232dbac638692b2b5d5c962: badDate: invalid author/committer line - bad date
-notice: HEAD points to an unborn branch (master)
-broken link from     tag 1f6463b89bb8b45e3232dbac638692b2b5d5c962
-              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
-missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 125 - update-ref & fsck reachable: detect invalid tag timestamp2
-
-expecting success of 3800.126 'for-each-ref: detect invalid tag timestamp2': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-1f6463b89bb8b45e3232dbac638692b2b5d5c962
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 126 - for-each-ref: detect invalid tag timestamp2
-
-expecting success of 3800.127 'fast-export & fast-import: detect invalid tag timestamp2': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-1f6463b89bb8b45e3232dbac638692b2b5d5c962
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 127 - fast-export & fast-import: detect invalid tag timestamp2
-
-expecting success of 3800.128 'fail with [--[no-]strict]: detect invalid tag timezone1': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-ok 128 - fail with [--[no-]strict]: detect invalid tag timezone1
-
-expecting success of 3800.129 'setup: detect invalid tag timezone1': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 129 - setup: detect invalid tag timezone1
-
-expecting success of 3800.130 'hash-object & fsck unreachable: detect invalid tag timezone1': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-error in tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56: badTimezone: invalid author/committer line - bad time zone
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
-ok 130 - hash-object & fsck unreachable: detect invalid tag timezone1
-
-expecting success of 3800.131 'update-ref & fsck reachable: detect invalid tag timezone1': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
-error in tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56: badTimezone: invalid author/committer line - bad time zone
-notice: HEAD points to an unborn branch (master)
-broken link from     tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
-              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
-missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 131 - update-ref & fsck reachable: detect invalid tag timezone1
-
-expecting success of 3800.132 'for-each-ref: detect invalid tag timezone1': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 132 - for-each-ref: detect invalid tag timezone1
-
-expecting success of 3800.133 'fast-export & fast-import: detect invalid tag timezone1': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 133 - fast-export & fast-import: detect invalid tag timezone1
-
-expecting success of 3800.134 'fail with [--[no-]strict]: detect invalid tag timezone2': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-ok 134 - fail with [--[no-]strict]: detect invalid tag timezone2
-
-expecting success of 3800.135 'setup: detect invalid tag timezone2': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 135 - setup: detect invalid tag timezone2
-
-expecting success of 3800.136 'hash-object & fsck unreachable: detect invalid tag timezone2': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-error in tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b: badTimezone: invalid author/committer line - bad time zone
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
-ok 136 - hash-object & fsck unreachable: detect invalid tag timezone2
-
-expecting success of 3800.137 'update-ref & fsck reachable: detect invalid tag timezone2': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
-error in tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b: badTimezone: invalid author/committer line - bad time zone
-notice: HEAD points to an unborn branch (master)
-broken link from     tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
-              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
-missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 137 - update-ref & fsck reachable: detect invalid tag timezone2
-
-expecting success of 3800.138 'for-each-ref: detect invalid tag timezone2': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 138 - for-each-ref: detect invalid tag timezone2
-
-expecting success of 3800.139 'fast-export & fast-import: detect invalid tag timezone2': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 139 - fast-export & fast-import: detect invalid tag timezone2
-
-expecting success of 3800.140 'allow invalid tag timezone': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-ok 140 - allow invalid tag timezone
-
-expecting success of 3800.141 'fail with [--[no-]strict]: detect invalid header entry': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-ok 141 - fail with [--[no-]strict]: detect invalid header entry
-
-expecting success of 3800.142 'setup: detect invalid header entry': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
-ok 142 - setup: detect invalid header entry
-
-expecting success of 3800.143 'hash-object & fsck unreachable: detect invalid header entry': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-ok 143 - hash-object & fsck unreachable: detect invalid header entry
-
-expecting success of 3800.144 'update-ref & fsck reachable: detect invalid header entry': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-notice: HEAD points to an unborn branch (master)
-broken link from     tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
-missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 144 - update-ref & fsck reachable: detect invalid header entry
-
-expecting success of 3800.145 'for-each-ref: detect invalid header entry': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 145 - for-each-ref: detect invalid header entry
-
-expecting success of 3800.146 'fast-export & fast-import: detect invalid header entry': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 146 - fast-export & fast-import: detect invalid header entry
-
-expecting success of 3800.147 'invalid header entry config & fsck': 
-	test_must_fail git mktag <tag.sig &&
-	git mktag --no-strict <tag.sig &&
-
-	test_must_fail git -c fsck.extraHeaderEntry=error mktag <tag.sig &&
-	test_must_fail git -c fsck.extraHeaderEntry=error mktag --no-strict <tag.sig &&
-
-	test_must_fail git -c fsck.extraHeaderEntry=warn mktag <tag.sig &&
-	git -c fsck.extraHeaderEntry=warn mktag --no-strict <tag.sig &&
-
-	git -c fsck.extraHeaderEntry=ignore mktag <tag.sig &&
-	git -c fsck.extraHeaderEntry=ignore mktag --no-strict <tag.sig &&
-
-	git fsck &&
-	git -c fsck.extraHeaderEntry=warn fsck 2>err &&
-	grep "warning .*extraHeaderEntry:" err &&
-	test_must_fail git -c fsck.extraHeaderEntry=error 2>err fsck &&
-	grep "error .* extraHeaderEntry:" err
-
-error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-fatal: tag on stdin did not pass our strict fsck check
-warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-fatal: tag on stdin did not pass our strict fsck check
-error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-fatal: tag on stdin did not pass our strict fsck check
-error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-fatal: tag on stdin did not pass our strict fsck check
-warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-warning in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-warning in tag 27668aaff16c8e0303faa67823e07d9c4e709bd8: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-error in tag 27668aaff16c8e0303faa67823e07d9c4e709bd8: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-error in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-ok 147 - invalid header entry config & fsck
-
-expecting success of 3800.148 'allow extra newlines at start of body': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-ok 148 - allow extra newlines at start of body
-
-expecting success of 3800.149 'allow a blank line before an empty body (1)': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-ok 149 - allow a blank line before an empty body (1)
-
-expecting success of 3800.150 'allow no blank line before an empty body (2)': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-ok 150 - allow no blank line before an empty body (2)
-
-expecting success of 3800.151 'create valid tag object': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-ok 151 - create valid tag object
-
-# passed all 151 test(s)
-1..151
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3920-crlf-messages.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3920-crlf-messages/.git/
-expecting success of 3920.1 'Setup refs with commit and tag messages using CRLF': 
-	test_commit initial &&
-	create_crlf_refs
-
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 1 - Setup refs with commit and tag messages using CRLF
-
-expecting success of 3920.2 'branch: --verbose works with messages using CRLF': 
-	rm -f expect &&
-	for branch in $LIB_CRLF_BRANCHES
-	do
-		printf "  " >>expect &&
-		cat .crlf-subject-${branch}.txt >>expect &&
-		printf "\n" >>expect || return 1
-	done &&
-	git branch -v >tmp &&
-	# Remove first two columns, and the line for the currently checked out branch
-	current=$(git branch --show-current) &&
-	awk "/$current/ { next } { \$1 = \$2 = \"\" } 1" <tmp >actual &&
-	test_cmp expect actual
-
-ok 2 - branch: --verbose works with messages using CRLF
-
-expecting success of 3920.3 'branch: --format='%(contents:subject)' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-subject-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git branch --list crlf* --format="%(contents:subject)" >actual &&
-			test_cmp expect actual
-		
-ok 3 - branch: --format='%(contents:subject)' works with messages using CRLF
-
-expecting success of 3920.4 'branch: --format='%(contents:body)' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-body-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git branch --list crlf* --format="%(contents:body)" >actual &&
-			test_cmp expect actual
-		
-ok 4 - branch: --format='%(contents:body)' works with messages using CRLF
-
-expecting success of 3920.5 'branch: --format='%(contents)' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-message-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git branch --list crlf* --format="%(contents)" >actual &&
-			test_cmp expect actual
-		
-ok 5 - branch: --format='%(contents)' works with messages using CRLF
-
-expecting success of 3920.6 'tag: --format='%(contents:subject)' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-subject-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git tag --list tag-crlf* --format="%(contents:subject)" >actual &&
-			test_cmp expect actual
-		
-ok 6 - tag: --format='%(contents:subject)' works with messages using CRLF
-
-expecting success of 3920.7 'tag: --format='%(contents:body)' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-body-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git tag --list tag-crlf* --format="%(contents:body)" >actual &&
-			test_cmp expect actual
-		
-ok 7 - tag: --format='%(contents:body)' works with messages using CRLF
-
-expecting success of 3920.8 'tag: --format='%(contents)' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-message-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git tag --list tag-crlf* --format="%(contents)" >actual &&
-			test_cmp expect actual
-		
-ok 8 - tag: --format='%(contents)' works with messages using CRLF
-
-expecting success of 3920.9 'for-each-ref: --format='%(contents:subject)' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-subject-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git for-each-ref refs/heads/crlf* --format="%(contents:subject)" >actual &&
-			test_cmp expect actual
-		
-ok 9 - for-each-ref: --format='%(contents:subject)' works with messages using CRLF
-
-expecting success of 3920.10 'for-each-ref: --format='%(contents:body)' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-body-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git for-each-ref refs/heads/crlf* --format="%(contents:body)" >actual &&
-			test_cmp expect actual
-		
-ok 10 - for-each-ref: --format='%(contents:body)' works with messages using CRLF
-
-expecting success of 3920.11 'for-each-ref: --format='%(contents)' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-message-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git for-each-ref refs/heads/crlf* --format="%(contents)" >actual &&
-			test_cmp expect actual
-		
-ok 11 - for-each-ref: --format='%(contents)' works with messages using CRLF
-
-expecting success of 3920.12 'log: --oneline works with messages using CRLF': 
-	for branch in $LIB_CRLF_BRANCHES
-	do
-		cat .crlf-subject-${branch}.txt >expect &&
-		printf "\n" >>expect &&
-		git log --oneline -1 ${branch} >tmp-branch &&
-		git log --oneline -1 tag-${branch} >tmp-tag &&
-		cut -d" " -f2- <tmp-branch >actual-branch &&
-		cut -d" " -f2- <tmp-tag >actual-tag &&
-		test_cmp expect actual-branch &&
-		test_cmp expect actual-tag || return 1
-	done
-
-ok 12 - log: --oneline works with messages using CRLF
-
-expecting success of 3920.13 'log: --format='%s' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-subject-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git log --all --reverse --grep Subject --format="%s" >actual &&
-			test_cmp expect actual
-		
-ok 13 - log: --format='%s' works with messages using CRLF
-
-expecting success of 3920.14 'log: --format='%b' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-body-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git log --all --reverse --grep Subject --format="%b" >actual &&
-			test_cmp expect actual
-		
-ok 14 - log: --format='%b' works with messages using CRLF
-
-expecting success of 3920.15 'log: --format='%B' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-message-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git log --all --reverse --grep Subject --format="%B" >actual &&
-			test_cmp expect actual
-		
-ok 15 - log: --format='%B' works with messages using CRLF
-
-expecting success of 3920.16 'show: --format='%s' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-subject-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git show crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline --format="%s" >actual &&
-			test_cmp expect actual
-		
-ok 16 - show: --format='%s' works with messages using CRLF
-
-expecting success of 3920.17 'show: --format='%b' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-body-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git show crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline --format="%b" >actual &&
-			test_cmp expect actual
-		
-ok 17 - show: --format='%b' works with messages using CRLF
-
-expecting success of 3920.18 'show: --format='%B' works with messages using CRLF': 
-			rm -f expect &&
-			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
-			do
-				cat .crlf-message-"${ref}".txt >>expect &&
-				printf "\n" >>expect || return 1
-			done &&
-			git show crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline --format="%B" >actual &&
-			test_cmp expect actual
-		
-ok 18 - show: --format='%B' works with messages using CRLF
-
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4000-diff-format.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-
-ok 5 - git diff-files --no-patch as synonym for -s
-
-expecting success of 4000.6 'git diff-files --no-patch --patch shows the patch': 
-	git diff-files --no-patch --patch >actual &&
-	compare_diff_patch expected actual
-
-ok 6 - git diff-files --no-patch --patch shows the patch
-
-expecting success of 4000.7 'git diff-files --no-patch --patch-with-raw shows the patch and raw data': 
-	git diff-files --no-patch --patch-with-raw >actual &&
-	grep -q "^:100644 100755 .* $ZERO_OID M	path0\$" actual &&
-	tail -n +4 actual >actual-patch &&
-	compare_diff_patch expected actual-patch
-
-ok 7 - git diff-files --no-patch --patch-with-raw shows the patch and raw data
-
-expecting success of 4000.8 'git diff-files --patch --no-patch does not show the patch': 
-	git diff-files --patch --no-patch >actual 2>err &&
-	test_must_be_empty actual &&
-	test_must_be_empty err
-
-ok 8 - git diff-files --patch --no-patch does not show the patch
-
-expecting success of 4000.9 '--no-patch in 'git diff-files --no-patch --stat' is a no-op': 
-		git diff-files --no-patch "--$format" >actual &&
-		git diff-files "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 9 - --no-patch in 'git diff-files --no-patch --stat' is a no-op
-
-expecting success of 4000.10 '--no-patch clears all previous ones': 
-		git diff-files --$format -s -p >actual &&
-		git diff-files -p >expect &&
-		test_cmp expect actual
-	
-ok 10 - --no-patch clears all previous ones
-
-expecting success of 4000.11 '--no-patch in 'git diff --no-patch --stat' is a no-op': 
-		git diff --no-patch "--$format" >actual &&
-		git diff "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 11 - --no-patch in 'git diff --no-patch --stat' is a no-op
-
-expecting success of 4000.12 '--no-patch in 'git diff-files --no-patch --raw' is a no-op': 
-		git diff-files --no-patch "--$format" >actual &&
-		git diff-files "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 12 - --no-patch in 'git diff-files --no-patch --raw' is a no-op
-
-expecting success of 4000.13 '--no-patch clears all previous ones': 
-		git diff-files --$format -s -p >actual &&
-		git diff-files -p >expect &&
-		test_cmp expect actual
-	
-ok 13 - --no-patch clears all previous ones
-
-expecting success of 4000.14 '--no-patch in 'git diff --no-patch --raw' is a no-op': 
-		git diff --no-patch "--$format" >actual &&
-		git diff "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 14 - --no-patch in 'git diff --no-patch --raw' is a no-op
-
-expecting success of 4000.15 '--no-patch in 'git diff-files --no-patch --numstat' is a no-op': 
-		git diff-files --no-patch "--$format" >actual &&
-		git diff-files "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 15 - --no-patch in 'git diff-files --no-patch --numstat' is a no-op
-
-expecting success of 4000.16 '--no-patch clears all previous ones': 
-		git diff-files --$format -s -p >actual &&
-		git diff-files -p >expect &&
-		test_cmp expect actual
-	
-ok 16 - --no-patch clears all previous ones
-
-expecting success of 4000.17 '--no-patch in 'git diff --no-patch --numstat' is a no-op': 
-		git diff --no-patch "--$format" >actual &&
-		git diff "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 17 - --no-patch in 'git diff --no-patch --numstat' is a no-op
-
-expecting success of 4000.18 '--no-patch in 'git diff-files --no-patch --shortstat' is a no-op': 
-		git diff-files --no-patch "--$format" >actual &&
-		git diff-files "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 18 - --no-patch in 'git diff-files --no-patch --shortstat' is a no-op
-
-expecting success of 4000.19 '--no-patch clears all previous ones': 
-		git diff-files --$format -s -p >actual &&
-		git diff-files -p >expect &&
-		test_cmp expect actual
-	
-ok 19 - --no-patch clears all previous ones
-
-expecting success of 4000.20 '--no-patch in 'git diff --no-patch --shortstat' is a no-op': 
-		git diff --no-patch "--$format" >actual &&
-		git diff "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 20 - --no-patch in 'git diff --no-patch --shortstat' is a no-op
-
-expecting success of 4000.21 '--no-patch in 'git diff-files --no-patch --summary' is a no-op': 
-		git diff-files --no-patch "--$format" >actual &&
-		git diff-files "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 21 - --no-patch in 'git diff-files --no-patch --summary' is a no-op
-
-expecting success of 4000.22 '--no-patch clears all previous ones': 
-		git diff-files --$format -s -p >actual &&
-		git diff-files -p >expect &&
-		test_cmp expect actual
-	
-ok 22 - --no-patch clears all previous ones
-
-expecting success of 4000.23 '--no-patch in 'git diff --no-patch --summary' is a no-op': 
-		git diff --no-patch "--$format" >actual &&
-		git diff "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 23 - --no-patch in 'git diff --no-patch --summary' is a no-op
-
-expecting success of 4000.24 '--no-patch in 'git diff-files --no-patch --dirstat' is a no-op': 
-		git diff-files --no-patch "--$format" >actual &&
-		git diff-files "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 24 - --no-patch in 'git diff-files --no-patch --dirstat' is a no-op
-
-expecting success of 4000.25 '--no-patch clears all previous ones': 
-		git diff-files --$format -s -p >actual &&
-		git diff-files -p >expect &&
-		test_cmp expect actual
-	
-ok 25 - --no-patch clears all previous ones
-
-expecting success of 4000.26 '--no-patch in 'git diff --no-patch --dirstat' is a no-op': 
-		git diff --no-patch "--$format" >actual &&
-		git diff "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 26 - --no-patch in 'git diff --no-patch --dirstat' is a no-op
-
-expecting success of 4000.27 '--no-patch in 'git diff-files --no-patch --cumulative' is a no-op': 
-		git diff-files --no-patch "--$format" >actual &&
-		git diff-files "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 27 - --no-patch in 'git diff-files --no-patch --cumulative' is a no-op
-
-expecting success of 4000.28 '--no-patch clears all previous ones': 
-		git diff-files --$format -s -p >actual &&
-		git diff-files -p >expect &&
-		test_cmp expect actual
-	
-ok 28 - --no-patch clears all previous ones
-
-expecting success of 4000.29 '--no-patch in 'git diff --no-patch --cumulative' is a no-op': 
-		git diff --no-patch "--$format" >actual &&
-		git diff "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 29 - --no-patch in 'git diff --no-patch --cumulative' is a no-op
-
-expecting success of 4000.30 '--no-patch in 'git diff-files --no-patch --dirstat-by-file' is a no-op': 
-		git diff-files --no-patch "--$format" >actual &&
-		git diff-files "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 30 - --no-patch in 'git diff-files --no-patch --dirstat-by-file' is a no-op
-
-expecting success of 4000.31 '--no-patch clears all previous ones': 
-		git diff-files --$format -s -p >actual &&
-		git diff-files -p >expect &&
-		test_cmp expect actual
-	
-ok 31 - --no-patch clears all previous ones
-
-expecting success of 4000.32 '--no-patch in 'git diff --no-patch --dirstat-by-file' is a no-op': 
-		git diff --no-patch "--$format" >actual &&
-		git diff "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 32 - --no-patch in 'git diff --no-patch --dirstat-by-file' is a no-op
-
-expecting success of 4000.33 '--no-patch in 'git diff-files --no-patch --patch-with-raw' is a no-op': 
-		git diff-files --no-patch "--$format" >actual &&
-		git diff-files "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 33 - --no-patch in 'git diff-files --no-patch --patch-with-raw' is a no-op
-
-expecting success of 4000.34 '--no-patch clears all previous ones': 
-		git diff-files --$format -s -p >actual &&
-		git diff-files -p >expect &&
-		test_cmp expect actual
-	
-ok 34 - --no-patch clears all previous ones
-
-expecting success of 4000.35 '--no-patch in 'git diff --no-patch --patch-with-raw' is a no-op': 
-		git diff --no-patch "--$format" >actual &&
-		git diff "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 35 - --no-patch in 'git diff --no-patch --patch-with-raw' is a no-op
-
-expecting success of 4000.36 '--no-patch in 'git diff-files --no-patch --patch-with-stat' is a no-op': 
-		git diff-files --no-patch "--$format" >actual &&
-		git diff-files "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 36 - --no-patch in 'git diff-files --no-patch --patch-with-stat' is a no-op
-
-expecting success of 4000.37 '--no-patch clears all previous ones': 
-		git diff-files --$format -s -p >actual &&
-		git diff-files -p >expect &&
-		test_cmp expect actual
-	
-ok 37 - --no-patch clears all previous ones
-
-expecting success of 4000.38 '--no-patch in 'git diff --no-patch --patch-with-stat' is a no-op': 
-		git diff --no-patch "--$format" >actual &&
-		git diff "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 38 - --no-patch in 'git diff --no-patch --patch-with-stat' is a no-op
-
-expecting success of 4000.39 '--no-patch in 'git diff-files --no-patch --compact-summary' is a no-op': 
-		git diff-files --no-patch "--$format" >actual &&
-		git diff-files "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 39 - --no-patch in 'git diff-files --no-patch --compact-summary' is a no-op
-
-expecting success of 4000.40 '--no-patch clears all previous ones': 
-		git diff-files --$format -s -p >actual &&
-		git diff-files -p >expect &&
-		test_cmp expect actual
-	
-ok 40 - --no-patch clears all previous ones
-
-expecting success of 4000.41 '--no-patch in 'git diff --no-patch --compact-summary' is a no-op': 
-		git diff --no-patch "--$format" >actual &&
-		git diff "--$format" >expect &&
-		test_cmp expect actual
-	
-ok 41 - --no-patch in 'git diff --no-patch --compact-summary' is a no-op
-
-# passed all 41 test(s)
-1..41
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4004-diff-rename-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t3305-notes-fanout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4001-diff-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4001-diff-rename/.git/
-expecting success of 4001.1 'setup': 
-	cat >path0 <<-\EOF &&
-	Line 1
-	Line 2
-	Line 3
-	Line 4
-	Line 5
-	Line 6
-	Line 7
-	Line 8
-	Line 9
-	Line 10
-	line 11
-	Line 12
-	Line 13
-	Line 14
-	Line 15
-	EOF
-	cat >expected <<-\EOF &&
-	diff --git a/path0 b/path1
-	rename from path0
-	rename to path1
-	--- a/path0
-	+++ b/path1
-	@@ -8,7 +8,7 @@ Line 7
-	 Line 8
-	 Line 9
-	 Line 10
-	-line 11
-	+Line 11
-	 Line 12
-	 Line 13
-	 Line 14
-	EOF
-	cat >no-rename <<-\EOF
-	diff --git a/path0 b/path0
-	deleted file mode 100644
-	index fdbec44..0000000
-	--- a/path0
-	+++ /dev/null
-	@@ -1,15 +0,0 @@
-	-Line 1
-	-Line 2
-	-Line 3
-	-Line 4
-	-Line 5
-	-Line 6
-	-Line 7
-	-Line 8
-	-Line 9
-	-Line 10
-	-line 11
-	-Line 12
-	-Line 13
-	-Line 14
-	-Line 15
-	diff --git a/path1 b/path1
-	new file mode 100644
-	index 0000000..752c50e
-	--- /dev/null
-	+++ b/path1
-	@@ -0,0 +1,15 @@
-	+Line 1
-	+Line 2
-	+Line 3
-	+Line 4
-	+Line 5
-	+Line 6
-	+Line 7
-	+Line 8
-	+Line 9
-	+Line 10
-	+Line 11
-	+Line 12
-	+Line 13
-	+Line 14
-	+Line 15
-	EOF
-
-ok 1 - setup
-
-expecting success of 4001.2 'update-index --add a file.': git update-index --add path0
-ok 2 - update-index --add a file.
-
-expecting success of 4001.3 'write that tree.': tree=$(git write-tree) && echo $tree
-ad8378482f032562f72403dd7c5bd607578a3f0e
-ok 3 - write that tree.
-
-expecting success of 4001.4 'renamed and edited the file.': git update-index --add --remove path0 path1
-ok 4 - renamed and edited the file.
-
-expecting success of 4001.5 'git diff-index -p -M after rename and editing.': git diff-index -p -M $tree >current
-ok 5 - git diff-index -p -M after rename and editing.
-
-expecting success of 4001.6 'validate the output.': compare_diff_patch current expected
-ok 6 - validate the output.
-
-expecting success of 4001.7 'test diff.renames=true': 
-	git -c diff.renames=true diff --cached $tree >current &&
-	compare_diff_patch current expected
-
-ok 7 - test diff.renames=true
-
-expecting success of 4001.8 'test diff.renames=false': 
-	git -c diff.renames=false diff --cached $tree >current &&
-	compare_diff_patch current no-rename
-
-ok 8 - test diff.renames=false
-
-expecting success of 4001.9 'test diff.renames unset': 
-	git diff --cached $tree >current &&
-	compare_diff_patch current expected
-
-ok 9 - test diff.renames unset
-
-expecting success of 4001.10 'favour same basenames over different ones': 
-	cp path1 another-path &&
-	git add another-path &&
-	git commit -m 1 &&
-	git rm path1 &&
-	mkdir subdir &&
-	git mv another-path subdir/path1 &&
-	git status >out &&
-	test_grep "renamed: .*path1 -> subdir/path1" out
-
-[master (root-commit) 7846fdf] 1
- Author: A U Thor <author@example.com>
- 2 files changed, 30 insertions(+)
- create mode 100644 another-path
- create mode 100644 path1
-rm 'path1'
-	renamed:    path1 -> subdir/path1
-ok 10 - favour same basenames over different ones
-
-expecting success of 4001.11 'test diff.renames=true for git status': 
-	git -c diff.renames=true status >out &&
-	test_grep "renamed: .*path1 -> subdir/path1" out
-
-	renamed:    path1 -> subdir/path1
-ok 11 - test diff.renames=true for git status
-
-expecting success of 4001.12 'test diff.renames=false for git status': 
-	git -c diff.renames=false status >out &&
-	test_grep ! "renamed: .*path1 -> subdir/path1" out &&
-	test_grep "new file: .*subdir/path1" out &&
-	test_grep "deleted: .*[^/]path1" out
-
-	new file:   subdir/path1
-	deleted:    path1
-ok 12 - test diff.renames=false for git status
-
-expecting success of 4001.13 'favour same basenames even with minor differences': 
-	git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
-	git status >out &&
-	test_grep "renamed: .*path1 -> subdir/path1" out
-
-	renamed:    path1 -> subdir/path1
-ok 13 - favour same basenames even with minor differences
-
-expecting success of 4001.14 'two files with same basename and same content': 
-	git reset --hard &&
-	mkdir -p dir/A dir/B &&
-	cp path1 dir/A/file &&
-	cp path1 dir/B/file &&
-	git add dir &&
-	git commit -m 2 &&
-	git mv dir other-dir &&
-	git status >out &&
-	test_grep "renamed: .*dir/A/file -> other-dir/A/file" out
-
-HEAD is now at 7846fdf 1
-[master 05f0b7a] 2
- Author: A U Thor <author@example.com>
- 2 files changed, 30 insertions(+)
- create mode 100644 dir/A/file
- create mode 100644 dir/B/file
-	renamed:    dir/A/file -> other-dir/A/file
-ok 14 - two files with same basename and same content
-
-expecting success of 4001.15 'setup for many rename source candidates': 
-	git reset --hard &&
-	for i in 0 1 2 3 4 5 6 7 8 9;
-	do
-		for j in 0 1 2 3 4 5 6 7 8 9;
-		do
-			echo "$i$j" >"path$i$j" || return 1
-		done
-	done &&
-	git add "path??" &&
-	test_tick &&
-	git commit -m "hundred" &&
-	(cat path1 && echo new) >new-path &&
-	echo old >>path1 &&
-	git add new-path path1 &&
-	git diff -l 4 -C -C --cached --name-status >actual 2>actual.err &&
-	sed -e "s/^\([CM]\)[0-9]*	/\1	/" actual >actual.munged &&
-	cat >expect <<-EOF &&
-	C	path1	new-path
-	M	path1
-	EOF
-	test_cmp expect actual.munged &&
-	grep warning actual.err
-
-HEAD is now at 05f0b7a 2
-[master c0eb1c8] hundred
- Author: A U Thor <author@example.com>
- 100 files changed, 100 insertions(+)
- create mode 100644 path00
- create mode 100644 path01
- create mode 100644 path02
- create mode 100644 path03
- create mode 100644 path04
- create mode 100644 path05
- create mode 100644 path06
- create mode 100644 path07
- create mode 100644 path08
- create mode 100644 path09
- create mode 100644 path10
- create mode 100644 path11
- create mode 100644 path12
- create mode 100644 path13
- create mode 100644 path14
- create mode 100644 path15
- create mode 100644 path16
- create mode 100644 path17
- create mode 100644 path18
- create mode 100644 path19
- create mode 100644 path20
- create mode 100644 path21
- create mode 100644 path22
- create mode 100644 path23
- create mode 100644 path24
- create mode 100644 path25
- create mode 100644 path26
- create mode 100644 path27
- create mode 100644 path28
- create mode 100644 path29
- create mode 100644 path30
- create mode 100644 path31
- create mode 100644 path32
- create mode 100644 path33
- create mode 100644 path34
- create mode 100644 path35
- create mode 100644 path36
- create mode 100644 path37
- create mode 100644 path38
- create mode 100644 path39
- create mode 100644 path40
- create mode 100644 path41
- create mode 100644 path42
- create mode 100644 path43
- create mode 100644 path44
- create mode 100644 path45
- create mode 100644 path46
- create mode 100644 path47
- create mode 100644 path48
- create mode 100644 path49
- create mode 100644 path50
- create mode 100644 path51
- create mode 100644 path52
- create mode 100644 path53
- create mode 100644 path54
- create mode 100644 path55
- create mode 100644 path56
- create mode 100644 path57
- create mode 100644 path58
- create mode 100644 path59
- create mode 100644 path60
- create mode 100644 path61
- create mode 100644 path62
- create mode 100644 path63
- create mode 100644 path64
- create mode 100644 path65
- create mode 100644 path66
- create mode 100644 path67
- create mode 100644 path68
- create mode 100644 path69
- create mode 100644 path70
- create mode 100644 path71
- create mode 100644 path72
- create mode 100644 path73
- create mode 100644 path74
- create mode 100644 path75
- create mode 100644 path76
- create mode 100644 path77
- create mode 100644 path78
- create mode 100644 path79
- create mode 100644 path80
- create mode 100644 path81
- create mode 100644 path82
- create mode 100644 path83
- create mode 100644 path84
- create mode 100644 path85
- create mode 100644 path86
- create mode 100644 path87
- create mode 100644 path88
- create mode 100644 path89
- create mode 100644 path90
- create mode 100644 path91
- create mode 100644 path92
- create mode 100644 path93
- create mode 100644 path94
- create mode 100644 path95
- create mode 100644 path96
- create mode 100644 path97
- create mode 100644 path98
- create mode 100644 path99
-warning: only found copies from modified paths due to too many files.
-warning: you may want to set your diff.renameLimit variable to at least 104 and retry the command.
-ok 15 - setup for many rename source candidates
-
-expecting success of 4001.16 'rename pretty print with nothing in common': 
-	mkdir -p a/b/ &&
-	: >a/b/c &&
-	git add a/b/c &&
-	git commit -m "create a/b/c" &&
-	mkdir -p c/b/ &&
-	git mv a/b/c c/b/a &&
-	git commit -m "a/b/c -> c/b/a" &&
-	git diff -M --summary HEAD^ HEAD >output &&
-	test_grep " a/b/c => c/b/a " output &&
-	git diff -M --stat HEAD^ HEAD >output &&
-	test_grep " a/b/c => c/b/a " output
-
-[master 5d0663c] create a/b/c
- Author: A U Thor <author@example.com>
- 3 files changed, 17 insertions(+)
- create mode 100644 a/b/c
- create mode 100644 new-path
-[master 24096e6] a/b/c -> c/b/a
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a/b/c => c/b/a (100%)
- rename a/b/c => c/b/a (100%)
- a/b/c => c/b/a | 0
-ok 16 - rename pretty print with nothing in common
-
-expecting success of 4001.17 'rename pretty print with common prefix': 
-	mkdir -p c/d &&
-	git mv c/b/a c/d/e &&
-	git commit -m "c/b/a -> c/d/e" &&
-	git diff -M --summary HEAD^ HEAD >output &&
-	test_grep " c/{b/a => d/e} " output &&
-	git diff -M --stat HEAD^ HEAD >output &&
-	test_grep " c/{b/a => d/e} " output
-
-[master e15a3a1] c/b/a -> c/d/e
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename c/{b/a => d/e} (100%)
- rename c/{b/a => d/e} (100%)
- c/{b/a => d/e} | 0
-ok 17 - rename pretty print with common prefix
-
-expecting success of 4001.18 'rename pretty print with common suffix': 
-	mkdir d &&
-	git mv c/d/e d/e &&
-	git commit -m "c/d/e -> d/e" &&
-	git diff -M --summary HEAD^ HEAD >output &&
-	test_grep " {c/d => d}/e " output &&
-	git diff -M --stat HEAD^ HEAD >output &&
-	test_grep " {c/d => d}/e " output
-
-[master aafbd77] c/d/e -> d/e
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {c/d => d}/e (100%)
- rename {c/d => d}/e (100%)
- {c/d => d}/e | 0
-ok 18 - rename pretty print with common suffix
-
-expecting success of 4001.19 'rename pretty print with common prefix and suffix': 
-	mkdir d/f &&
-	git mv d/e d/f/e &&
-	git commit -m "d/e -> d/f/e" &&
-	git diff -M --summary HEAD^ HEAD >output &&
-	test_grep " d/{ => f}/e " output &&
-	git diff -M --stat HEAD^ HEAD >output &&
-	test_grep " d/{ => f}/e " output
-
-[master 28b412a] d/e -> d/f/e
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename d/{ => f}/e (100%)
- rename d/{ => f}/e (100%)
- d/{ => f}/e | 0
-ok 19 - rename pretty print with common prefix and suffix
-
-expecting success of 4001.20 'rename pretty print common prefix and suffix overlap': 
-	mkdir d/f/f &&
-	git mv d/f/e d/f/f/e &&
-	git commit -m "d/f/e d/f/f/e" &&
-	git diff -M --summary HEAD^ HEAD >output &&
-	test_grep " d/f/{ => f}/e " output &&
-	git diff -M --stat HEAD^ HEAD >output &&
-	test_grep " d/f/{ => f}/e " output
-
-[master 272fc8d] d/f/e d/f/f/e
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename d/f/{ => f}/e (100%)
- rename d/f/{ => f}/e (100%)
- d/f/{ => f}/e | 0
-ok 20 - rename pretty print common prefix and suffix overlap
-
-expecting success of 4001.21 'diff-tree -l0 defaults to a big rename limit, not zero': 
-	test_write_lines line1 line2 line3 >myfile &&
-	git add myfile &&
-	git commit -m x &&
-
-	test_write_lines line1 line2 line4 >myotherfile &&
-	git rm myfile &&
-	git add myotherfile &&
-	git commit -m x &&
-
-	git diff-tree -M -l0 HEAD HEAD^ >actual &&
-	# Verify that a rename from myotherfile to myfile was detected
-	grep "myotherfile.*myfile" actual
-
-[master a3d2e59] x
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 myfile
-rm 'myfile'
-[master ff4cac0] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename myfile => myotherfile (66%)
-:100644 100644 cc8654bf0610eedacc646edaf4c1cbda59454836 83db48f84ec878fbfb30b46d16630e944e34f205 R066	myotherfile	myfile
-ok 21 - diff-tree -l0 defaults to a big rename limit, not zero
-
-expecting success of 4001.22 'basename similarity vs best similarity': 
-	mkdir subdir &&
-	test_write_lines line1 line2 line3 line4 line5 \
-			 line6 line7 line8 line9 line10 >subdir/file.txt &&
-	git add subdir/file.txt &&
-	git commit -m "base txt" &&
-
-	git rm subdir/file.txt &&
-	test_write_lines line1 line2 line3 line4 line5 \
-			  line6 line7 line8 >file.txt &&
-	test_write_lines line1 line2 line3 line4 line5 \
-			  line6 line7 line8 line9 >file.md &&
-	git add file.txt file.md &&
-	git commit -a -m "rename" &&
-	git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
-	# subdir/file.txt is 88% similar to file.md, 78% similar to file.txt,
-	# but since same basenames are checked first...
-	cat >expected <<-\EOF &&
-	A	file.md
-	R078	subdir/file.txt	file.txt
-	EOF
-	test_cmp expected actual
-
-[master 09a1aec] base txt
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 subdir/file.txt
-rm 'subdir/file.txt'
-[master 72a9c67] rename
- Author: A U Thor <author@example.com>
- 2 files changed, 9 insertions(+), 2 deletions(-)
- create mode 100644 file.md
- rename subdir/file.txt => file.txt (78%)
-ok 22 - basename similarity vs best similarity
-
-expecting success of 4001.23 'last line matters too': 
-	{
-		test_write_lines a 0 1 2 3 4 5 6 7 8 9 &&
-		printf "git ignores final up to 63 characters if not newline terminated"
-	} >no-final-lf &&
-	git add no-final-lf &&
-	git commit -m "original version of file with no final newline" &&
-
-	# Change ONLY the first character of the whole file
-	{
-		test_write_lines b 0 1 2 3 4 5 6 7 8 9 &&
-		printf "git ignores final up to 63 characters if not newline terminated"
-	} >no-final-lf &&
-	git add no-final-lf &&
-	git mv no-final-lf still-absent-final-lf &&
-	git commit -a -m "rename no-final-lf -> still-absent-final-lf" &&
-	git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
-	sed -e "s/^R[0-9]*	/R	/" actual >actual.munged &&
-	cat >expected <<-\EOF &&
-	R	no-final-lf	still-absent-final-lf
-	EOF
-	test_cmp expected actual.munged
-
-[master b0865a0] original version of file with no final newline
- Author: A U Thor <author@example.com>
- 1 file changed, 12 insertions(+)
- create mode 100644 no-final-lf
-[master bbca1a2] rename no-final-lf -> still-absent-final-lf
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename no-final-lf => still-absent-final-lf (97%)
-ok 23 - last line matters too
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4009-diff-rename-4.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4007-rename-3.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4006-diff-mode.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4005-diff-rename-2.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4008-diff-break-rewrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4011-diff-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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) &&
+ok 56 - fast-export & fast-import: verify object (hash/type) check -- correct type, nonexisting object
 
-	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 3800.57 'fail with [--[no-]strict]: verify object (hash/type) check -- made-up type, valid object': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	
+ok 57 - fail with [--[no-]strict]: verify object (hash/type) check -- made-up type, valid object
 
-checking prerequisite: SYMLINKS
+expecting success of 3800.58 'setup: verify object (hash/type) check -- made-up type, valid object': 
+		tag_ref=refs/tags/bad_tag &&
 
-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 any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-)
-prerequisite SYMLINKS ok
-ok 1 - diff new symlink and file
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 58 - setup: verify object (hash/type) check -- made-up type, valid object
 
-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 3800.59 'hash-object & fsck unreachable: verify object (hash/type) check -- made-up type, valid object': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	
+error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+error: 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0: object could not be parsed: ./objects/52/b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+ok 59 - hash-object & fsck unreachable: verify object (hash/type) check -- made-up type, valid object
 
-ok 2 - diff unchanged symlink and file
+expecting success of 3800.60 'update-ref & fsck reachable: verify object (hash/type) check -- made-up type, valid object': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-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
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-ok 3 - diff removed symlink and file
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-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 &&
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	
+52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+fatal: update_ref failed for ref 'refs/tags/bad_tag': cannot update ref 'refs/tags/bad_tag': trying to write ref 'refs/tags/bad_tag' with nonexistent object 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+error: 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0: object could not be parsed: ./objects/52/b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+error: refs/tags/bad_tag: invalid sha1 pointer 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+ok 60 - update-ref & fsck reachable: verify object (hash/type) check -- made-up type, valid object
 
-	>expected &&
-	git diff-index -M -p -w $tree >current &&
-	compare_diff_patch expected current
+expecting success of 3800.61 'for-each-ref: verify object (hash/type) check -- made-up type, valid object': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-ok 4 - diff identical, but newly created symlink and file
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-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
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-ok 5 - diff different symlink and file
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+fatal: parse_object_buffer failed on 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0 for refs/tags/bad_tag
+ok 61 - for-each-ref: verify object (hash/type) check -- made-up type, valid object
 
-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
+expecting success of 3800.62 'fast-export & fast-import: verify object (hash/type) check -- made-up type, valid object': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
--narf
-ok 6 - diff symlinks with non-existing targets
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	
+52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+fatal: bad object refs/tags/bad_tag
+error: unknown tag type 'tagggg' in 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+fatal: bad object 52b3b27f1ab531cc409f48a025c37dbc1f4f6ac0
+ok 62 - fast-export & fast-import: verify object (hash/type) check -- made-up type, valid object
 
-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
+expecting success of 3800.63 'fail with [--[no-]strict]: verify object (hash/type) check -- made-up type, nonexisting object': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	
+ok 63 - fail with [--[no-]strict]: verify object (hash/type) check -- made-up type, nonexisting object
 
-ok 7 - setup symlinks with attributes
+expecting success of 3800.64 'setup: verify object (hash/type) check -- made-up type, nonexisting object': 
+		tag_ref=refs/tags/bad_tag &&
 
-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
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-ok 8 - symlinks do not respect userdiff config by path
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 64 - setup: verify object (hash/type) check -- made-up type, nonexisting object
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4010-diff-pathspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 3800.65 'hash-object & fsck unreachable: verify object (hash/type) check -- made-up type, nonexisting object': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	
+error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
+error: 873c7147ca509be00715bfd9f0901c56090b241a: object could not be parsed: ./objects/87/3c7147ca509be00715bfd9f0901c56090b241a
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+ok 65 - hash-object & fsck unreachable: verify object (hash/type) check -- made-up type, nonexisting object
 
-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 3800.66 'update-ref & fsck reachable: verify object (hash/type) check -- made-up type, nonexisting object': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-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
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-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
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-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
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	
+873c7147ca509be00715bfd9f0901c56090b241a
+error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
+fatal: update_ref failed for ref 'refs/tags/bad_tag': cannot update ref 'refs/tags/bad_tag': trying to write ref 'refs/tags/bad_tag' with nonexistent object 873c7147ca509be00715bfd9f0901c56090b241a
+error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
+error: 873c7147ca509be00715bfd9f0901c56090b241a: object could not be parsed: ./objects/87/3c7147ca509be00715bfd9f0901c56090b241a
+error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
+error: refs/tags/bad_tag: invalid sha1 pointer 873c7147ca509be00715bfd9f0901c56090b241a
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+ok 66 - update-ref & fsck reachable: verify object (hash/type) check -- made-up type, nonexisting object
 
-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 3800.67 'for-each-ref: verify object (hash/type) check -- made-up type, nonexisting object': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-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.
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-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
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-54d8765b122f32157e847ce3924180cb2ec778fc
-ok 8 - diff-tree pathspec
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+873c7147ca509be00715bfd9f0901c56090b241a
+error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
+fatal: parse_object_buffer failed on 873c7147ca509be00715bfd9f0901c56090b241a for refs/tags/bad_tag
+ok 67 - for-each-ref: verify object (hash/type) check -- made-up type, nonexisting object
 
-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
+expecting success of 3800.68 'fast-export & fast-import: verify object (hash/type) check -- made-up type, nonexisting object': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-ok 9 - diff-tree with wildcard shows dir also matches
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	
+873c7147ca509be00715bfd9f0901c56090b241a
+error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
+fatal: bad object refs/tags/bad_tag
+error: unknown tag type 'tagggg' in 873c7147ca509be00715bfd9f0901c56090b241a
+fatal: bad object 873c7147ca509be00715bfd9f0901c56090b241a
+ok 68 - fast-export & fast-import: verify object (hash/type) check -- made-up type, nonexisting object
 
-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
+expecting success of 3800.69 'fail with [--[no-]strict]: verify object (hash/type) check -- mismatched type, valid object': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	
+ok 69 - fail with [--[no-]strict]: verify object (hash/type) check -- mismatched type, valid object
 
-ok 10 - diff-tree -r with wildcard
+expecting success of 3800.70 'setup: verify object (hash/type) check -- mismatched type, valid object': 
+		tag_ref=refs/tags/bad_tag &&
 
-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
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-ok 11 - diff-tree with wildcard shows dir also matches
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 70 - setup: verify object (hash/type) check -- mismatched type, valid object
 
-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
+expecting success of 3800.71 'hash-object & fsck unreachable: verify object (hash/type) check -- mismatched type, valid object': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag 8eb32de5253d54ed4e9a069073f158738f84be64
+ok 71 - hash-object & fsck unreachable: verify object (hash/type) check -- mismatched type, valid object
 
-ok 12 - diff-tree -r with wildcard from beginning
+expecting success of 3800.72 'update-ref & fsck reachable: verify object (hash/type) check -- mismatched type, valid object': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-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
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-ok 13 - diff-tree -r with wildcard
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-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
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	
+8eb32de5253d54ed4e9a069073f158738f84be64
+notice: HEAD points to an unborn branch (master)
+broken link from     tag 8eb32de5253d54ed4e9a069073f158738f84be64
+              to    tree d9df4505cb3522088b9e29d6051ac16f1564154a
+missing tree d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 72 - update-ref & fsck reachable: verify object (hash/type) check -- mismatched type, valid object
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 3800.73 'for-each-ref: verify object (hash/type) check -- mismatched type, valid object': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-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
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-ok 15 - diff-tree ignores trailing slash on submodule path
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-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
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+8eb32de5253d54ed4e9a069073f158738f84be64
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 73 - for-each-ref: verify object (hash/type) check -- mismatched type, valid object
 
-ok 16 - diff multiple wildcard pathspecs
+expecting success of 3800.74 'fast-export & fast-import: verify object (hash/type) check -- mismatched type, valid object': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-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
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	
+8eb32de5253d54ed4e9a069073f158738f84be64
+warning: Tag points to object of unexpected type tree, skipping.
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 74 - fast-export & fast-import: verify object (hash/type) check -- mismatched type, valid object
 
-ok 17 - diff-cache ignores trailing slash on submodule path
+expecting success of 3800.75 'setup replacement of commit -> commit and tree -> blob': 
+	git replace $head_parent $head &&
+	git replace -f $tree $blob
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4002-diff-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4002-diff-basic/.git/
-expecting success of 4002.1 'adding test file NN and Z/NN': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 1 - adding test file NN and Z/NN
+ok 75 - setup replacement of commit -> commit and tree -> blob
 
-expecting success of 4002.2 'adding test file ND and Z/ND': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 2 - adding test file ND and Z/ND
+expecting success of 3800.76 'tag to a commit replaced by another commit': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-expecting success of 4002.3 'adding test file NM and Z/NM': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 3 - adding test file NM and Z/NM
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+ok 76 - tag to a commit replaced by another commit
 
-expecting success of 4002.4 'adding test file DN and Z/DN': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 4 - adding test file DN and Z/DN
+expecting success of 3800.77 'fail with [--[no-]strict]: verify object (hash/type) check -- mismatched type, valid object': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	
+ok 77 - fail with [--[no-]strict]: verify object (hash/type) check -- mismatched type, valid object
 
-expecting success of 4002.5 'adding test file DD and Z/DD': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 5 - adding test file DD and Z/DD
+expecting success of 3800.78 'setup: verify object (hash/type) check -- mismatched type, valid object': 
+		tag_ref=refs/tags/bad_tag &&
 
-expecting success of 4002.6 'adding test file DM and Z/DM': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 6 - adding test file DM and Z/DM
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-expecting success of 4002.7 'adding test file MN and Z/MN': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 7 - adding test file MN and Z/MN
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 78 - setup: verify object (hash/type) check -- mismatched type, valid object
 
-expecting success of 4002.8 'adding test file MD and Z/MD': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 8 - adding test file MD and Z/MD
+expecting success of 3800.79 'hash-object & fsck unreachable: verify object (hash/type) check -- mismatched type, valid object': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag 9c31a0046f5d3b4164baf115cc0b69635524bb04
+ok 79 - hash-object & fsck unreachable: verify object (hash/type) check -- mismatched type, valid object
 
-expecting success of 4002.9 'adding test file MM and Z/MM': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 9 - adding test file MM and Z/MM
+expecting success of 3800.80 'update-ref & fsck reachable: verify object (hash/type) check -- mismatched type, valid object': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4002.10 'adding test file SS': 
-	git update-index --add SS
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-ok 10 - adding test file SS
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-expecting success of 4002.11 'adding test file TT': 
-	git update-index --add TT
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	
+9c31a0046f5d3b4164baf115cc0b69635524bb04
+notice: HEAD points to an unborn branch (master)
+broken link from     tag 9c31a0046f5d3b4164baf115cc0b69635524bb04
+              to    tree 0fbca9850869684085d654f9e1380c9780802570
+missing tree 0fbca9850869684085d654f9e1380c9780802570
+ok 80 - update-ref & fsck reachable: verify object (hash/type) check -- mismatched type, valid object
 
-ok 11 - adding test file TT
+expecting success of 3800.81 'for-each-ref: verify object (hash/type) check -- mismatched type, valid object': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4002.12 'prepare initial tree': 
-	tree_O=$(git write-tree)
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-ok 12 - prepare initial tree
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-expecting success of 4002.13 'change in branch A (removal)': 
-	git update-index --remove $to_remove
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+9c31a0046f5d3b4164baf115cc0b69635524bb04
+fatal: missing object 0fbca9850869684085d654f9e1380c9780802570 for refs/tags/bad_tag
+ok 81 - for-each-ref: verify object (hash/type) check -- mismatched type, valid object
 
-ok 13 - change in branch A (removal)
+expecting success of 3800.82 'fast-export & fast-import: verify object (hash/type) check -- mismatched type, valid object': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4002.14 'change in branch A (modification)': 
-		git update-index $p
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
 	
-ok 14 - change in branch A (modification)
+9c31a0046f5d3b4164baf115cc0b69635524bb04
+warning: Tag points to object of unexpected type tree, skipping.
+fatal: bad object 0fbca9850869684085d654f9e1380c9780802570
+fatal: bad object 0fbca9850869684085d654f9e1380c9780802570
+ok 82 - fast-export & fast-import: verify object (hash/type) check -- mismatched type, valid object
 
-expecting success of 4002.15 'change in branch A (modification)': 
-		git update-index $p
+expecting success of 3800.83 'fail with [--[no-]strict]: verify tag-name check': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
 	
-ok 15 - change in branch A (modification)
+warning: tag input does not pass fsck: badTagName: invalid 'tag' name: my	tag
+3a917b365efe8e0762ae4448ca795035d60fedbe
+ok 83 - fail with [--[no-]strict]: verify tag-name check
 
-expecting success of 4002.16 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 16 - change in branch A (modification)
+expecting success of 3800.84 'setup: verify tag-name check': 
+		tag_ref=refs/tags/bad_tag &&
 
-expecting success of 4002.17 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 17 - change in branch A (modification)
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-expecting success of 4002.18 'change in branch A (modification)': 
-		git update-index $p
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
 	
-ok 18 - change in branch A (modification)
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 84 - setup: verify tag-name check
 
-expecting success of 4002.19 'change in branch A (modification)': 
-		git update-index $p
+expecting success of 3800.85 'hash-object & fsck unreachable: verify tag-name check': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
 	
-ok 19 - change in branch A (modification)
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+ok 85 - hash-object & fsck unreachable: verify tag-name check
 
-expecting success of 4002.20 'change in branch A (addition)': 
-		git update-index --add $p
-	
-ok 20 - change in branch A (addition)
+expecting success of 3800.86 'update-ref & fsck reachable: verify tag-name check': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4002.21 'change in branch A (addition)': 
-		git update-index --add $p
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
+
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
+
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
 	
-ok 21 - change in branch A (addition)
+3a917b365efe8e0762ae4448ca795035d60fedbe
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+notice: HEAD points to an unborn branch (master)
+broken link from     tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
+missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 86 - update-ref & fsck reachable: verify tag-name check
 
-expecting success of 4002.22 'change in branch A (addition)': 
-		git update-index --add $p
+expecting success of 3800.87 'for-each-ref: verify tag-name check': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
+
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
+
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
+
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
 	
-ok 22 - change in branch A (addition)
+3a917b365efe8e0762ae4448ca795035d60fedbe
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 87 - for-each-ref: verify tag-name check
 
-expecting success of 4002.23 'change in branch A (addition)': 
-		git update-index --add $p
+expecting success of 3800.88 'fast-export & fast-import: verify tag-name check': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
+
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
 	
-ok 23 - change in branch A (addition)
+3a917b365efe8e0762ae4448ca795035d60fedbe
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 88 - fast-export & fast-import: verify tag-name check
 
-expecting success of 4002.24 'change in branch A (addition)': 
-	git update-index --add LL &&
-	git update-index SS
+expecting success of 3800.89 'fail with [--[no-]strict]: "tagger" line label check #1': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	
+warning: tag input does not pass fsck: missingTaggerEntry: invalid format - expected 'tagger' line
+c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+ok 89 - fail with [--[no-]strict]: "tagger" line label check #1
 
-ok 24 - change in branch A (addition)
+expecting success of 3800.90 'setup: "tagger" line label check #1': 
+		tag_ref=refs/tags/bad_tag &&
 
-expecting success of 4002.25 'change in branch A (edit)': 
-	git update-index TT
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-ok 25 - change in branch A (edit)
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 90 - setup: "tagger" line label check #1
 
-expecting success of 4002.26 'change in branch A (change file to directory)': 
-	git update-index --add DF/DF
+expecting success of 3800.91 'hash-object & fsck unreachable: "tagger" line label check #1': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+ok 91 - hash-object & fsck unreachable: "tagger" line label check #1
 
-ok 26 - change in branch A (change file to directory)
+expecting success of 3800.92 'update-ref & fsck reachable: "tagger" line label check #1': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4002.27 'recording branch A tree': 
-	tree_A=$(git write-tree)
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-ok 27 - recording branch A tree
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-expecting success of 4002.28 'reading original tree and checking out': 
-	git read-tree $tree_O &&
-	git checkout-index -a
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	
+c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+notice: HEAD points to an unborn branch (master)
+broken link from     tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
+missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 92 - update-ref & fsck reachable: "tagger" line label check #1
 
-ok 28 - reading original tree and checking out
+expecting success of 3800.93 'for-each-ref: "tagger" line label check #1': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4002.29 'change in branch B (removal)': 
-	git update-index --remove $to_remove
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-ok 29 - change in branch B (removal)
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-expecting success of 4002.30 'change in branch B (modification)': 
-		git update-index $p
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
 	
-ok 30 - change in branch B (modification)
+c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 93 - for-each-ref: "tagger" line label check #1
 
-expecting success of 4002.31 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 31 - change in branch B (modification)
+expecting success of 3800.94 'fast-export & fast-import: "tagger" line label check #1': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4002.32 'change in branch B (modification)': 
-		git update-index $p
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
 	
-ok 32 - change in branch B (modification)
+c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 94 - fast-export & fast-import: "tagger" line label check #1
 
-expecting success of 4002.33 'change in branch B (modification)': 
-		git update-index $p
+expecting success of 3800.95 'fail with [--[no-]strict]: "tagger" line label check #2': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
 	
-ok 33 - change in branch B (modification)
+warning: tag input does not pass fsck: missingTaggerEntry: invalid format - expected 'tagger' line
+warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+ok 95 - fail with [--[no-]strict]: "tagger" line label check #2
 
-expecting success of 4002.34 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 34 - change in branch B (modification)
+expecting success of 3800.96 'setup: "tagger" line label check #2': 
+		tag_ref=refs/tags/bad_tag &&
 
-expecting success of 4002.35 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 35 - change in branch B (modification)
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-expecting success of 4002.36 'change in branch B (addition)': 
-		git update-index --add $p
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
 	
-ok 36 - change in branch B (addition)
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 96 - setup: "tagger" line label check #2
 
-expecting success of 4002.37 'change in branch B (addition)': 
-		git update-index --add $p
+expecting success of 3800.97 'hash-object & fsck unreachable: "tagger" line label check #2': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
 	
-ok 37 - change in branch B (addition)
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+ok 97 - hash-object & fsck unreachable: "tagger" line label check #2
 
-expecting success of 4002.38 'change in branch B (addition)': 
-		git update-index --add $p
-	
-ok 38 - change in branch B (addition)
+expecting success of 3800.98 'update-ref & fsck reachable: "tagger" line label check #2': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4002.39 'change in branch B (addition)': 
-		git update-index --add $p
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
+
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
+
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
 	
-ok 39 - change in branch B (addition)
+a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+notice: HEAD points to an unborn branch (master)
+broken link from     tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
+missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 98 - update-ref & fsck reachable: "tagger" line label check #2
 
-expecting success of 4002.40 'change in branch B (addition and modification)': 
-	git update-index --add LL &&
-	git update-index SS
+expecting success of 3800.99 'for-each-ref: "tagger" line label check #2': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-ok 40 - change in branch B (addition and modification)
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-expecting success of 4002.41 'change in branch B (modification)': 
-	git update-index TT
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-ok 41 - change in branch B (modification)
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 99 - for-each-ref: "tagger" line label check #2
 
-expecting success of 4002.42 'change in branch B (addition of a file to conflict with directory)': 
-	git update-index --add DF
+expecting success of 3800.100 'fast-export & fast-import: "tagger" line label check #2': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-ok 42 - change in branch B (addition of a file to conflict with directory)
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	
+a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 100 - fast-export & fast-import: "tagger" line label check #2
 
-expecting success of 4002.43 'recording branch B tree': 
-	tree_B=$(git write-tree)
+expecting success of 3800.101 'allow missing tag author name': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-ok 43 - recording branch B tree
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+ok 101 - allow missing tag author name
 
-expecting success of 4002.44 'keep contents of 3 trees for easy access': 
-	rm -f .git/index &&
-	git read-tree $tree_O &&
-	mkdir .orig-O &&
-	git checkout-index --prefix=.orig-O/ -f -q -a &&
-	rm -f .git/index &&
-	git read-tree $tree_A &&
-	mkdir .orig-A &&
-	git checkout-index --prefix=.orig-A/ -f -q -a &&
-	rm -f .git/index &&
-	git read-tree $tree_B &&
-	mkdir .orig-B &&
-	git checkout-index --prefix=.orig-B/ -f -q -a
+expecting success of 3800.102 'fail with [--[no-]strict]: disallow malformed tagger': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	
+error: tag input does not pass fsck: badEmail: invalid author/committer line - bad email
+warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+10a38b63369e5f6b0d453612536d13ca970fdf12
+ok 102 - fail with [--[no-]strict]: disallow malformed tagger
 
-ok 44 - keep contents of 3 trees for easy access
+expecting success of 3800.103 'setup: disallow malformed tagger': 
+		tag_ref=refs/tags/bad_tag &&
 
-expecting success of 4002.45 'diff-tree of known trees.': 
-	git diff-tree $tree_O $tree_A >.test-a &&
-	cmp -s .test-a .test-plain-OA
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-ok 45 - diff-tree of known trees.
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 103 - setup: disallow malformed tagger
 
-expecting success of 4002.46 'diff-tree of known trees.': 
-	git diff-tree -r $tree_O $tree_A >.test-a &&
-	cmp -s .test-a .test-recursive-OA
+expecting success of 3800.104 'hash-object & fsck unreachable: disallow malformed tagger': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+ok 104 - hash-object & fsck unreachable: disallow malformed tagger
 
-ok 46 - diff-tree of known trees.
+expecting success of 3800.105 'update-ref & fsck reachable: disallow malformed tagger': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4002.47 'diff-tree of known trees.': 
-	git diff-tree $tree_O $tree_B >.test-a &&
-	cmp -s .test-a .test-plain-OB
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-ok 47 - diff-tree of known trees.
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-expecting success of 4002.48 'diff-tree of known trees.': 
-	git diff-tree -r $tree_O $tree_B >.test-a &&
-	cmp -s .test-a .test-recursive-OB
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	
+10a38b63369e5f6b0d453612536d13ca970fdf12
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+notice: HEAD points to an unborn branch (master)
+broken link from     tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
+missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 105 - update-ref & fsck reachable: disallow malformed tagger
 
-ok 48 - diff-tree of known trees.
+expecting success of 3800.106 'for-each-ref: disallow malformed tagger': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4002.49 'diff-tree of known trees.': 
-	git diff-tree $tree_A $tree_B >.test-a &&
-	cmp -s .test-a .test-plain-AB
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-ok 49 - diff-tree of known trees.
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-expecting success of 4002.50 'diff-tree of known trees.': 
-	git diff-tree -r $tree_A $tree_B >.test-a &&
-	cmp -s .test-a .test-recursive-AB
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+10a38b63369e5f6b0d453612536d13ca970fdf12
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 106 - for-each-ref: disallow malformed tagger
 
-ok 50 - diff-tree of known trees.
+expecting success of 3800.107 'fast-export & fast-import: disallow malformed tagger': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4002.51 'diff-tree --stdin of known trees.': 
-	echo $tree_A $tree_B | git diff-tree --stdin > .test-a &&
-	echo $tree_A $tree_B > .test-plain-ABx &&
-	cat .test-plain-AB >> .test-plain-ABx &&
-	cmp -s .test-a .test-plain-ABx
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	
+10a38b63369e5f6b0d453612536d13ca970fdf12
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 107 - fast-export & fast-import: disallow malformed tagger
 
-ok 51 - diff-tree --stdin of known trees.
+expecting success of 3800.108 'allow empty tag email': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-expecting success of 4002.52 'diff-tree --stdin of known trees.': 
-	echo $tree_A $tree_B | git diff-tree -r --stdin > .test-a &&
-	echo $tree_A $tree_B > .test-recursive-ABx &&
-	cat .test-recursive-AB >> .test-recursive-ABx &&
-	cmp -s .test-a .test-recursive-ABx
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+ok 108 - allow empty tag email
 
-ok 52 - diff-tree --stdin of known trees.
+expecting success of 3800.109 'allow spaces in tag email like fsck': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-expecting success of 4002.53 'diff-cache O with A in cache': 
-	git read-tree $tree_A &&
-	git diff-index --cached $tree_O >.test-a &&
-	cmp -s .test-a .test-recursive-OA
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+ok 109 - allow spaces in tag email like fsck
 
-ok 53 - diff-cache O with A in cache
+expecting success of 3800.110 'fail with [--[no-]strict]: disallow missing tag timestamp': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	
+ok 110 - fail with [--[no-]strict]: disallow missing tag timestamp
 
-expecting success of 4002.54 'diff-cache O with B in cache': 
-	git read-tree $tree_B &&
-	git diff-index --cached $tree_O >.test-a &&
-	cmp -s .test-a .test-recursive-OB
+expecting success of 3800.111 'setup: disallow missing tag timestamp': 
+		tag_ref=refs/tags/bad_tag &&
 
-ok 54 - diff-cache O with B in cache
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-expecting success of 4002.55 'diff-cache A with B in cache': 
-	git read-tree $tree_B &&
-	git diff-index --cached $tree_A >.test-a &&
-	cmp -s .test-a .test-recursive-AB
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 111 - setup: disallow missing tag timestamp
 
-ok 55 - diff-cache A with B in cache
+expecting success of 3800.112 'hash-object & fsck unreachable: disallow missing tag timestamp': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	
+error in tag 86ec28e12f82414dedbbf24955ba3624796ce743: badDate: invalid author/committer line - bad date
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag 86ec28e12f82414dedbbf24955ba3624796ce743
+ok 112 - hash-object & fsck unreachable: disallow missing tag timestamp
 
-expecting success of 4002.56 'diff-files with O in cache and A checked out': 
-	rm -fr Z [A-Z][A-Z] &&
-	git read-tree $tree_A &&
-	git checkout-index -f -a &&
-	git read-tree --reset $tree_O &&
-	test_must_fail git update-index --refresh -q &&
-	git diff-files >.test-a &&
-	cmp_diff_files_output .test-a .test-recursive-OA
+expecting success of 3800.113 'update-ref & fsck reachable: disallow missing tag timestamp': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-DD: needs update
-DM: needs update
-DN: needs update
-MD: needs update
-MM: needs update
-MN: needs update
-SS: needs update
-TT: needs update
-Z/DD: needs update
-Z/DM: needs update
-Z/DN: needs update
-Z/MD: needs update
-Z/MM: needs update
-Z/MN: needs update
-ok 56 - diff-files with O in cache and A checked out
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-expecting success of 4002.57 'diff-files with O in cache and B checked out': 
-	rm -fr Z [A-Z][A-Z] &&
-	git read-tree $tree_B &&
-	git checkout-index -f -a &&
-	git read-tree --reset $tree_O &&
-	test_must_fail git update-index --refresh -q &&
-	git diff-files >.test-a &&
-	cmp_diff_files_output .test-a .test-recursive-OB
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-DD: needs update
-DM: needs update
-MD: needs update
-MM: needs update
-ND: needs update
-NM: needs update
-SS: needs update
-TT: needs update
-Z/DD: needs update
-Z/DM: needs update
-Z/MD: needs update
-Z/MM: needs update
-Z/ND: needs update
-Z/NM: needs update
-ok 57 - diff-files with O in cache and B checked out
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	
+86ec28e12f82414dedbbf24955ba3624796ce743
+error in tag 86ec28e12f82414dedbbf24955ba3624796ce743: badDate: invalid author/committer line - bad date
+notice: HEAD points to an unborn branch (master)
+broken link from     tag 86ec28e12f82414dedbbf24955ba3624796ce743
+              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
+missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 113 - update-ref & fsck reachable: disallow missing tag timestamp
 
-expecting success of 4002.58 'diff-files with A in cache and B checked out': 
-	rm -fr Z [A-Z][A-Z] &&
-	git read-tree $tree_B &&
-	git checkout-index -f -a &&
-	git read-tree --reset $tree_A &&
-	test_must_fail git update-index --refresh -q &&
-	git diff-files >.test-a &&
-	cmp_diff_files_output .test-a .test-recursive-AB
+expecting success of 3800.114 'for-each-ref: disallow missing tag timestamp': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-AA: needs update
-AN: needs update
-DF/DF: needs update
-MD: needs update
-MM: needs update
-MN: needs update
-ND: needs update
-NM: needs update
-TT: needs update
-Z/AA: needs update
-Z/AN: needs update
-Z/MD: needs update
-Z/MM: needs update
-Z/MN: needs update
-Z/ND: needs update
-Z/NM: needs update
-ok 58 - diff-files with A in cache and B checked out
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-expecting success of 4002.59 'diff-tree O A == diff-tree -R A O': 
-	git diff-tree $tree_O $tree_A >.test-a &&
-	git diff-tree -R $tree_A $tree_O >.test-b &&
-	cmp -s .test-a .test-b
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-ok 59 - diff-tree O A == diff-tree -R A O
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+86ec28e12f82414dedbbf24955ba3624796ce743
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 114 - for-each-ref: disallow missing tag timestamp
 
-expecting success of 4002.60 'diff-tree -r O A == diff-tree -r -R A O': 
-	git diff-tree -r $tree_O $tree_A >.test-a &&
-	git diff-tree -r -R $tree_A $tree_O >.test-b &&
-	cmp -s .test-a .test-b
+expecting success of 3800.115 'fast-export & fast-import: disallow missing tag timestamp': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-ok 60 - diff-tree -r O A == diff-tree -r -R A O
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	
+86ec28e12f82414dedbbf24955ba3624796ce743
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 115 - fast-export & fast-import: disallow missing tag timestamp
 
-expecting success of 4002.61 'diff-tree B A == diff-tree -R A B': 
-	git diff-tree $tree_B $tree_A >.test-a &&
-	git diff-tree -R $tree_A $tree_B >.test-b &&
-	cmp -s .test-a .test-b
+expecting success of 3800.116 'fail with [--[no-]strict]: detect invalid tag timestamp1': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	
+ok 116 - fail with [--[no-]strict]: detect invalid tag timestamp1
 
-ok 61 - diff-tree B A == diff-tree -R A B
+expecting success of 3800.117 'setup: detect invalid tag timestamp1': 
+		tag_ref=refs/tags/bad_tag &&
 
-expecting success of 4002.62 'diff-tree -r B A == diff-tree -r -R A B': 
-	git diff-tree -r $tree_B $tree_A >.test-a &&
-	git diff-tree -r -R $tree_A $tree_B >.test-b &&
-	cmp -s .test-a .test-b
-ok 62 - diff-tree -r B A == diff-tree -r -R A B
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-expecting success of 4002.63 'diff can read from stdin': 
-	test_must_fail git diff --no-index -- MN - < NN |
-		sed "/^index/d; s#/-#/NN#" >.test-a &&
-	test_must_fail git diff --no-index -- MN NN |
-		grep -v "^index" >.test-b &&
-	test_cmp .test-a .test-b
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 117 - setup: detect invalid tag timestamp1
 
-ok 63 - diff can read from stdin
+expecting success of 3800.118 'hash-object & fsck unreachable: detect invalid tag timestamp1': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	
+error in tag a7154e3a1ebaee50a7858cfa890b4e328ba6eff1: badDate: invalid author/committer line - bad date
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag a7154e3a1ebaee50a7858cfa890b4e328ba6eff1
+ok 118 - hash-object & fsck unreachable: detect invalid tag timestamp1
 
-# passed all 63 test(s)
-1..63
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4012-diff-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+expecting success of 3800.119 'update-ref & fsck reachable: detect invalid tag timestamp1': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-ok 1 - prepare repository
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-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
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-ok 2 - apply --stat output for binary file change
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	
+a7154e3a1ebaee50a7858cfa890b4e328ba6eff1
+error in tag a7154e3a1ebaee50a7858cfa890b4e328ba6eff1: badDate: invalid author/committer line - bad date
+notice: HEAD points to an unborn branch (master)
+broken link from     tag a7154e3a1ebaee50a7858cfa890b4e328ba6eff1
+              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
+missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 119 - update-ref & fsck reachable: detect invalid tag timestamp1
 
-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
+expecting success of 3800.120 'for-each-ref: detect invalid tag timestamp1': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-ok 3 - diff --shortstat output for binary file change
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-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
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-ok 4 - diff --shortstat output for binary file change only
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+a7154e3a1ebaee50a7858cfa890b4e328ba6eff1
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 120 - for-each-ref: detect invalid tag timestamp1
 
-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
+expecting success of 3800.121 'fast-export & fast-import: detect invalid tag timestamp1': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-ok 5 - apply --numstat notices binary file change
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	
+a7154e3a1ebaee50a7858cfa890b4e328ba6eff1
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 121 - fast-export & fast-import: detect invalid tag timestamp1
 
-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
+expecting success of 3800.122 'fail with [--[no-]strict]: detect invalid tag timestamp2': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	
+ok 122 - fail with [--[no-]strict]: detect invalid tag timestamp2
 
-ok 6 - apply --numstat understands diff --binary format
+expecting success of 3800.123 'setup: detect invalid tag timestamp2': 
+		tag_ref=refs/tags/bad_tag &&
 
-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
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-ok 7 - apply detecting corrupt patch correctly
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 123 - setup: detect invalid tag timestamp2
 
-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
+expecting success of 3800.124 'hash-object & fsck unreachable: detect invalid tag timestamp2': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	
+error in tag 1f6463b89bb8b45e3232dbac638692b2b5d5c962: badDate: invalid author/committer line - bad date
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag 1f6463b89bb8b45e3232dbac638692b2b5d5c962
+ok 124 - hash-object & fsck unreachable: detect invalid tag timestamp2
 
-ok 8 - apply detecting corrupt patch correctly
+expecting success of 3800.125 'update-ref & fsck reachable: detect invalid tag timestamp2': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-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
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-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
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
- 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
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	
+1f6463b89bb8b45e3232dbac638692b2b5d5c962
+error in tag 1f6463b89bb8b45e3232dbac638692b2b5d5c962: badDate: invalid author/committer line - bad date
+notice: HEAD points to an unborn branch (master)
+broken link from     tag 1f6463b89bb8b45e3232dbac638692b2b5d5c962
+              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
+missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 125 - update-ref & fsck reachable: detect invalid tag timestamp2
 
-expecting success of 4012.11 'apply binary patch': 
-	git reset --hard &&
-	git apply --binary --index <current &&
-	tree1=$(git write-tree) &&
-	test "$tree1" = "$tree0"
+expecting success of 3800.126 'for-each-ref: detect invalid tag timestamp2': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-HEAD is now at 4ede773 initial
-ok 11 - apply binary patch
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-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
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-ok 12 - diff --no-index with binary creation
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+1f6463b89bb8b45e3232dbac638692b2b5d5c962
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 126 - for-each-ref: detect invalid tag timestamp2
 
-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
+expecting success of 3800.127 'fast-export & fast-import: detect invalid tag timestamp2': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-ok 13 - diff --stat with binary files and big change count
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	
+1f6463b89bb8b45e3232dbac638692b2b5d5c962
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 127 - fast-export & fast-import: detect invalid tag timestamp2
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4016-diff-quote.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4016-diff-quote/.git/
-expecting success of 4016.1 'setup': 
-	echo P0.0 >"$P0.0" &&
-	echo P0.1 >"$P0.1" &&
-	echo P0.2 >"$P0.2" &&
-	echo P0.3 >"$P0.3" &&
-	echo P1.0 >"$P1.0" &&
-	echo P1.2 >"$P1.2" &&
-	echo P1.3 >"$P1.3" &&
-	git add . &&
-	git commit -m initial &&
-	git mv "$P0.0" "R$P0.0" &&
-	git mv "$P0.1" "R$P1.0" &&
-	git mv "$P0.2" "R$P2.0" &&
-	git mv "$P0.3" "R$P3.0" &&
-	git mv "$P1.0" "R$P0.1" &&
-	git mv "$P1.2" "R$P2.1" &&
-	git mv "$P1.3" "R$P3.1" &&
-	:
+expecting success of 3800.128 'fail with [--[no-]strict]: detect invalid tag timezone1': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	
+ok 128 - fail with [--[no-]strict]: detect invalid tag timezone1
 
-[master (root-commit) ab09c26] initial
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+)
- create mode 100644 "pathname\twith HT.0"
- create mode 100644 "pathname\twith HT.2"
- create mode 100644 "pathname\twith HT.3"
- create mode 100644 pathname.0
- create mode 100644 pathname.1
- create mode 100644 pathname.2
- create mode 100644 pathname.3
-ok 1 - setup
+expecting success of 3800.129 'setup: detect invalid tag timezone1': 
+		tag_ref=refs/tags/bad_tag &&
 
-expecting success of 4016.2 'setup expected files': 
-cat >expect <<\EOF
- rename pathname.1 => "Rpathname\twith HT.0" (100%)
- rename pathname.3 => "Rpathname\nwith LF.0" (100%)
- rename "pathname\twith HT.3" => "Rpathname\nwith LF.1" (100%)
- rename pathname.2 => Rpathname with SP.0 (100%)
- rename "pathname\twith HT.2" => Rpathname with SP.1 (100%)
- rename pathname.0 => Rpathname.0 (100%)
- rename "pathname\twith HT.0" => Rpathname.1 (100%)
-EOF
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-ok 2 - setup expected files
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 129 - setup: detect invalid tag timezone1
 
-expecting success of 4016.3 'git diff --summary -M HEAD': 
-	git diff --summary -M HEAD >actual &&
-	test_cmp expect actual
+expecting success of 3800.130 'hash-object & fsck unreachable: detect invalid tag timezone1': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	
+error in tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56: badTimezone: invalid author/committer line - bad time zone
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
+ok 130 - hash-object & fsck unreachable: detect invalid tag timezone1
 
-ok 3 - git diff --summary -M HEAD
+expecting success of 3800.131 'update-ref & fsck reachable: detect invalid tag timezone1': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4016.4 'git diff --numstat -M HEAD': 
-	cat >expect <<-\EOF &&
-	0	0	pathname.1 => "Rpathname\twith HT.0"
-	0	0	pathname.3 => "Rpathname\nwith LF.0"
-	0	0	"pathname\twith HT.3" => "Rpathname\nwith LF.1"
-	0	0	pathname.2 => Rpathname with SP.0
-	0	0	"pathname\twith HT.2" => Rpathname with SP.1
-	0	0	pathname.0 => Rpathname.0
-	0	0	"pathname\twith HT.0" => Rpathname.1
-	EOF
-	git diff --numstat -M HEAD >actual &&
-	test_cmp expect actual
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-ok 4 - git diff --numstat -M HEAD
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-expecting success of 4016.5 'git diff --stat -M HEAD': 
-	cat >expect <<-\EOF &&
-	 pathname.1 => "Rpathname\twith HT.0"            | 0
-	 pathname.3 => "Rpathname\nwith LF.0"            | 0
-	 "pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0
-	 pathname.2 => Rpathname with SP.0               | 0
-	 "pathname\twith HT.2" => Rpathname with SP.1    | 0
-	 pathname.0 => Rpathname.0                       | 0
-	 "pathname\twith HT.0" => Rpathname.1            | 0
-	 7 files changed, 0 insertions(+), 0 deletions(-)
-	EOF
-	git diff --stat -M HEAD >actual &&
-	test_cmp expect actual
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	
+1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
+error in tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56: badTimezone: invalid author/committer line - bad time zone
+notice: HEAD points to an unborn branch (master)
+broken link from     tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
+              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
+missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 131 - update-ref & fsck reachable: detect invalid tag timezone1
 
-ok 5 - git diff --stat -M HEAD
+expecting success of 3800.132 'for-each-ref: detect invalid tag timezone1': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4021-format-patch-numbered.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4021-format-patch-numbered/.git/
-expecting success of 4021.1 'setup': 
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-	echo A > file &&
-	git add file &&
-	git commit -m First &&
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-	echo B >> file &&
-	git commit -a -m Second &&
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 132 - for-each-ref: detect invalid tag timezone1
 
-	echo C >> file &&
-	git commit -a -m Third
+expecting success of 3800.133 'fast-export & fast-import: detect invalid tag timezone1': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	
+1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 133 - fast-export & fast-import: detect invalid tag timezone1
 
-[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 3800.134 'fail with [--[no-]strict]: detect invalid tag timezone2': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	
+ok 134 - fail with [--[no-]strict]: detect invalid tag timezone2
 
-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
+expecting success of 3800.135 'setup: detect invalid tag timezone2': 
+		tag_ref=refs/tags/bad_tag &&
 
-ok 2 - single patch defaults to no numbers
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-expecting success of 4021.3 'multiple patch defaults to numbered': 
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 135 - setup: detect invalid tag timezone2
 
-	git format-patch --stdout HEAD~2 >patch0.multiple &&
-	test_numbered patch0.multiple
+expecting success of 3800.136 'hash-object & fsck unreachable: detect invalid tag timezone2': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	
+error in tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b: badTimezone: invalid author/committer line - bad time zone
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
+ok 136 - hash-object & fsck unreachable: detect invalid tag timezone2
 
+expecting success of 3800.137 'update-ref & fsck reachable: detect invalid tag timezone2': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-Subject: [PATCH 1/2] Second
-Subject: [PATCH 2/2] Third
-ok 3 - multiple patch defaults to numbered
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-expecting success of 4021.4 'Use --numbered': 
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-	git format-patch --numbered --stdout HEAD~1 >patch1 &&
-	test_single_numbered patch1
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	
+30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
+error in tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b: badTimezone: invalid author/committer line - bad time zone
+notice: HEAD points to an unborn branch (master)
+broken link from     tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
+              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
+missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 137 - update-ref & fsck reachable: detect invalid tag timezone2
 
+expecting success of 3800.138 'for-each-ref: detect invalid tag timezone2': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-Subject: [PATCH 1/1] Third
-ok 4 - Use --numbered
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-expecting success of 4021.5 'format.numbered = true': 
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-	git config format.numbered true &&
-	git format-patch --stdout HEAD~2 >patch2 &&
-	test_numbered patch2
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 138 - for-each-ref: detect invalid tag timezone2
 
+expecting success of 3800.139 'fast-export & fast-import: detect invalid tag timezone2': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-Subject: [PATCH 1/2] Second
-Subject: [PATCH 2/2] Third
-ok 5 - format.numbered = true
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	
+30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 139 - fast-export & fast-import: detect invalid tag timezone2
 
-expecting success of 4021.6 'format.numbered && single patch': 
+expecting success of 3800.140 'allow invalid tag timezone': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-	git format-patch --stdout HEAD^ > patch3 &&
-	test_single_numbered patch3
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+ok 140 - allow invalid tag timezone
 
+expecting success of 3800.141 'fail with [--[no-]strict]: detect invalid header entry': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	
+warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+ok 141 - fail with [--[no-]strict]: detect invalid header entry
 
-Subject: [PATCH 1/1] Third
-ok 6 - format.numbered && single patch
+expecting success of 3800.142 'setup: detect invalid header entry': 
+		tag_ref=refs/tags/bad_tag &&
 
-expecting success of 4021.7 'format.numbered && --no-numbered': 
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-	git format-patch --no-numbered --stdout HEAD~2 >patch4 &&
-	test_no_numbered patch4
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3800-mktag/bad-tag/
+ok 142 - setup: detect invalid header entry
 
+expecting success of 3800.143 'hash-object & fsck unreachable: detect invalid header entry': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+ok 143 - hash-object & fsck unreachable: detect invalid header entry
 
-ok 7 - format.numbered && --no-numbered
+expecting success of 3800.144 'update-ref & fsck reachable: detect invalid header entry': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4021.8 'format.numbered && --keep-subject': 
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-	git format-patch --keep-subject --stdout HEAD^ >patch4a &&
-	grep "^Subject: Third" patch4a
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+notice: HEAD points to an unborn branch (master)
+broken link from     tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
+missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 144 - update-ref & fsck reachable: detect invalid header entry
 
-Subject: Third
-ok 8 - format.numbered && --keep-subject
+expecting success of 3800.145 'for-each-ref: detect invalid header entry': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4021.9 'format.numbered = auto': 
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-	git config format.numbered auto &&
-	git format-patch --stdout HEAD~2 > patch5 &&
-	test_numbered patch5
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 145 - for-each-ref: detect invalid header entry
 
-Subject: [PATCH 1/2] Second
-Subject: [PATCH 2/2] Third
-ok 9 - format.numbered = auto
+expecting success of 3800.146 'fast-export & fast-import: detect invalid header entry': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4021.10 'format.numbered = auto && single patch': 
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 146 - fast-export & fast-import: detect invalid header entry
 
-	git format-patch --stdout HEAD^ > patch6 &&
-	test_single_no_numbered patch6
+expecting success of 3800.147 'invalid header entry config & fsck': 
+	test_must_fail git mktag <tag.sig &&
+	git mktag --no-strict <tag.sig &&
 
+	test_must_fail git -c fsck.extraHeaderEntry=error mktag <tag.sig &&
+	test_must_fail git -c fsck.extraHeaderEntry=error mktag --no-strict <tag.sig &&
 
-ok 10 - format.numbered = auto && single patch
+	test_must_fail git -c fsck.extraHeaderEntry=warn mktag <tag.sig &&
+	git -c fsck.extraHeaderEntry=warn mktag --no-strict <tag.sig &&
 
-expecting success of 4021.11 'format.numbered = auto && --no-numbered': 
+	git -c fsck.extraHeaderEntry=ignore mktag <tag.sig &&
+	git -c fsck.extraHeaderEntry=ignore mktag --no-strict <tag.sig &&
 
-	git format-patch --no-numbered --stdout HEAD~2 > patch7 &&
-	test_no_numbered patch7
+	git fsck &&
+	git -c fsck.extraHeaderEntry=warn fsck 2>err &&
+	grep "warning .*extraHeaderEntry:" err &&
+	test_must_fail git -c fsck.extraHeaderEntry=error 2>err fsck &&
+	grep "error .* extraHeaderEntry:" err
 
+error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+fatal: tag on stdin did not pass our strict fsck check
+warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+fatal: tag on stdin did not pass our strict fsck check
+error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+fatal: tag on stdin did not pass our strict fsck check
+error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+fatal: tag on stdin did not pass our strict fsck check
+warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+warning in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+warning in tag 27668aaff16c8e0303faa67823e07d9c4e709bd8: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+error in tag 27668aaff16c8e0303faa67823e07d9c4e709bd8: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+error in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+ok 147 - invalid header entry config & fsck
 
-ok 11 - format.numbered = auto && --no-numbered
+expecting success of 3800.148 'allow extra newlines at start of body': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-expecting success of 4021.12 '--start-number && --numbered': 
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+ok 148 - allow extra newlines at start of body
 
-	git format-patch --start-number 3 --numbered --stdout HEAD~1 > patch8 &&
-	grep "^Subject: \[PATCH 3/3\]" patch8
+expecting success of 3800.149 'allow a blank line before an empty body (1)': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-Subject: [PATCH 3/3] Third
-ok 12 - --start-number && --numbered
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+ok 149 - allow a blank line before an empty body (1)
 
-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
+expecting success of 3800.150 'allow no blank line before an empty body (2)': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-Subject: [PATCH 0/1] *** SUBJECT HERE ***
-Subject: [PATCH 1/1] Third
-ok 13 - single patch with cover-letter defaults to numbers
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+ok 150 - allow no blank line before an empty body (2)
 
-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
+expecting success of 3800.151 'create valid tag object': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-ok 14 - Use --no-numbered and --cover-letter single patch
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+ok 151 - create valid tag object
 
-# passed all 14 test(s)
-1..14
+# passed all 151 test(s)
+1..151
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4017-diff-retval.sh ***
@@ -224956,6 +225750,148 @@
 1..38
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4021-format-patch-numbered.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4019-diff-wserror.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4019-diff-wserror/.git/
 expecting success of 4019.1 'setup': 
@@ -225385,79 +226321,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4024-diff-optimize-common.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4024-diff-optimize-common/.git/
-expecting success of 4024.1 'setup': 
-
-	for n in $sample
-	do
-		( zs $n && echo a ) >file-a$n &&
-		( echo b && zs $n && echo ) >file-b$n &&
-		( printf c && zs $n ) >file-c$n &&
-		( echo d && zs $n ) >file-d$n &&
-
-		git add file-a$n file-b$n file-c$n file-d$n &&
-
-		( zs $n && echo A ) >file-a$n &&
-		( echo B && zs $n && echo ) >file-b$n &&
-		( printf C && zs $n ) >file-c$n &&
-		( echo D && zs $n ) >file-d$n &&
-
-		expect_pattern $n || return 1
-
-	done >expect
-
-ok 1 - setup
-
-expecting success of 4024.2 'diff -U0': 
-
-	for n in $sample
-	do
-		git diff -U0 file-?$n || return 1
-	done | zc >actual &&
-	test_cmp expect actual
-
-
-ok 2 - diff -U0
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4025-hunk-header.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4023-diff-rename-typechange.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4023-diff-rename-typechange/.git/
 expecting success of 4023.1 'setup': 
@@ -225593,6 +226456,79 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4025-hunk-header.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4024-diff-optimize-common.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4024-diff-optimize-common/.git/
+expecting success of 4024.1 'setup': 
+
+	for n in $sample
+	do
+		( zs $n && echo a ) >file-a$n &&
+		( echo b && zs $n && echo ) >file-b$n &&
+		( printf c && zs $n ) >file-c$n &&
+		( echo d && zs $n ) >file-d$n &&
+
+		git add file-a$n file-b$n file-c$n file-d$n &&
+
+		( zs $n && echo A ) >file-a$n &&
+		( echo B && zs $n && echo ) >file-b$n &&
+		( printf C && zs $n ) >file-c$n &&
+		( echo D && zs $n ) >file-d$n &&
+
+		expect_pattern $n || return 1
+
+	done >expect
+
+ok 1 - setup
+
+expecting success of 4024.2 'diff -U0': 
+
+	for n in $sample
+	do
+		git diff -U0 file-?$n || return 1
+	done | zc >actual &&
+	test_cmp expect actual
+
+
+ok 2 - diff -U0
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4028-format-patch-mime-headers.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4028-format-patch-mime-headers/.git/
 expecting success of 4028.1 'create commit with utf-8 body': 
@@ -225906,423 +226842,6 @@
 1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4031-diff-rewrite-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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': 
-	write_script dump <<-\EOF &&
-	test-tool hexdump <"$1"
-	EOF
-	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 &&
-	test_grep "dissimilarity index" diff &&
-	test_grep "^-3d 0a 00" diff &&
-	test_grep "^+3d 0a 01" diff
-
-dissimilarity index 99%
--3d 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 
-+3d 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 
-ok 8 - rewrite diff respects textconv
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4027-diff-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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)
-
-expecting success of 4027.10 'git diff HEAD with dirty submodule (work tree, refs match)': 
-	git commit -m "x" sub &&
-	echo >>sub/world &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git diff --ignore-submodules HEAD >actual2 &&
-	test_must_be_empty actual2 &&
-	git diff --ignore-submodules=untracked HEAD >actual3 &&
-	sed -e "1,/^@@/d" actual3 >actual3.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual3.body &&
-	git diff --ignore-submodules=dirty HEAD >actual4 &&
-	test_must_be_empty actual4
-
-[master e6ee575] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 10 - git diff HEAD with dirty submodule (work tree, refs match)
-
-expecting success of 4027.11 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]': 
-	git config diff.ignoreSubmodules dirty &&
-	git diff HEAD >actual &&
-	test_must_be_empty actual &&
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sub &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git config -f .gitmodules submodule.subname.ignore all &&
-	git config -f .gitmodules submodule.subname.path sub &&
-	git diff HEAD >actual2 &&
-	test_must_be_empty actual2 &&
-	git config -f .gitmodules submodule.subname.ignore untracked &&
-	git diff HEAD >actual3 &&
-	sed -e "1,/^@@/d" actual3 >actual3.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual3.body &&
-	git config -f .gitmodules submodule.subname.ignore dirty &&
-	git diff HEAD >actual4 &&
-	test_must_be_empty actual4 &&
-	git config submodule.subname.ignore none &&
-	git config submodule.subname.path sub &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git config --remove-section submodule.subname &&
-	git config --remove-section -f .gitmodules submodule.subname &&
-	git config --unset diff.ignoreSubmodules &&
-	rm .gitmodules
-
-ok 11 - git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]
-
-expecting success of 4027.12 'git diff HEAD with dirty submodule (index, refs match)': 
-	(
-		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 $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body
-
-HEAD is now at 2dd69d6 submodule #2
-ok 12 - git diff HEAD with dirty submodule (index, refs match)
-
-expecting success of 4027.13 'git diff HEAD with dirty submodule (untracked, refs match)': 
-	(
-		cd sub &&
-		git reset --hard &&
-		git clean -qfdx &&
-		>cruft
-	) &&
-	git diff --ignore-submodules=none HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git diff --ignore-submodules=all HEAD >actual2 &&
-	test_must_be_empty actual2 &&
-	git diff HEAD >actual3 &&
-	test_must_be_empty actual3 &&
-	git diff --ignore-submodules=dirty HEAD >actual4 &&
-	test_must_be_empty actual4
-
-HEAD is now at 2dd69d6 submodule #2
-ok 13 - git diff HEAD with dirty submodule (untracked, refs match)
-
-expecting success of 4027.14 'git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]': 
-	git config --add -f .gitmodules submodule.subname.ignore all &&
-	git config --add -f .gitmodules submodule.subname.path sub &&
-	git diff HEAD >actual2 &&
-	test_must_be_empty actual2 &&
-	git config -f .gitmodules submodule.subname.ignore untracked &&
-	git diff HEAD >actual3 &&
-	test_must_be_empty actual3 &&
-	git config -f .gitmodules submodule.subname.ignore dirty &&
-	git diff HEAD >actual4 &&
-	test_must_be_empty actual4 &&
-	git config submodule.subname.ignore none &&
-	git config submodule.subname.path sub &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git config --remove-section submodule.subname &&
-	git config --remove-section -f .gitmodules submodule.subname &&
-	rm .gitmodules
-
-ok 14 - git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]
-
-expecting success of 4027.15 'git diff between submodule commits': 
-	git diff HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git diff --ignore-submodules=dirty HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git diff --ignore-submodules HEAD^..HEAD >actual &&
-	test_must_be_empty actual
-
-ok 15 - git diff between submodule commits
-
-expecting success of 4027.16 'git diff between submodule commits [.gitmodules]': 
-	git diff HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git config --add -f .gitmodules submodule.subname.ignore dirty &&
-	git config --add -f .gitmodules submodule.subname.path sub &&
-	git diff HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git config -f .gitmodules submodule.subname.ignore all &&
-	git diff HEAD^..HEAD >actual &&
-	test_must_be_empty actual &&
-	git config submodule.subname.ignore dirty &&
-	git config submodule.subname.path sub &&
-	git diff  HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	git config --remove-section submodule.subname &&
-	git config --remove-section -f .gitmodules submodule.subname &&
-	rm .gitmodules
-
-ok 16 - git diff between submodule commits [.gitmodules]
-
-expecting success of 4027.17 'git diff (empty submodule dir)': 
-	rm -rf sub/* sub/.git &&
-	git diff > actual.empty &&
-	test_must_be_empty actual.empty
-
-ok 17 - git diff (empty submodule dir)
-
-expecting success of 4027.18 'conflicted submodule setup': 
-	c=$(test_oid ff_1) &&
-	(
-		echo "000000 $ZERO_OID 0	sub" &&
-		echo "160000 1$c 1	sub" &&
-		echo "160000 2$c 2	sub" &&
-		echo "160000 3$c 3	sub"
-	) | git update-index --index-info &&
-	echo >expect.nosub "diff --cc sub
-index 2ffffff,3ffffff..0000000
---- a/sub
-+++ b/sub
-@@@ -1,1 -1,1 +1,1 @@@
-- Subproject commit 2$c
- -Subproject commit 3$c
-++Subproject commit $ZERO_OID" &&
-
-	hh=$(git rev-parse HEAD) &&
-	sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub
-
-
-ok 18 - conflicted submodule setup
-
-expecting success of 4027.19 'combined (empty submodule)': 
-	rm -fr sub && mkdir sub &&
-	git diff >actual &&
-	test_cmp expect.nosub actual
-
-ok 19 - combined (empty submodule)
-
-expecting success of 4027.20 'combined (with submodule)': 
-	rm -fr sub &&
-	git clone --no-checkout . sub &&
-	git diff >actual &&
-	test_cmp expect.withsub actual
-
-Cloning into 'sub'...
-done.
-ok 20 - combined (with submodule)
-
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3906-stash-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3906-stash-submodule/.git/
 expecting success of 3906.1 'git_stash: added submodule creates empty directory': 
@@ -226505,8 +227024,8 @@
 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-08-27 08:21:05.811703747 +0000
-+++ actual	2025-08-27 08:21:05.855704037 +0000
+--- expect	2026-09-29 14:52:26.742548970 +0000
++++ actual	2026-09-29 14:52:26.770548970 +0000
 @@ -2,5 +2,3 @@
  expect
  file1
@@ -226805,8 +227324,8 @@
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'modify_sub1' set up to track 'origin/modify_sub1'.
 No local changes to save
---- expect	2025-08-27 08:21:08.511721556 +0000
-+++ actual	2025-08-27 08:21:08.543721767 +0000
+--- expect	2026-09-29 14:52:28.590548970 +0000
++++ actual	2026-09-29 14:52:28.606548970 +0000
 @@ -1,3 +1,4 @@
 +M  sub1
  actual
@@ -226837,8 +227356,8 @@
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
 No local changes to save
---- expect	2025-08-27 08:21:08.775723297 +0000
-+++ actual	2025-08-27 08:21:08.791723402 +0000
+--- expect	2026-09-29 14:52:28.794548970 +0000
++++ actual	2026-09-29 14:52:28.806548970 +0000
 @@ -1,3 +1,4 @@
 +M  sub1
  actual
@@ -226866,8 +227385,8 @@
 fatal: Needed a single revision
 branch 'valid_sub1' set up to track 'origin/valid_sub1'.
 No local changes to save
---- expect	2025-08-27 08:21:08.903724141 +0000
-+++ actual	2025-08-27 08:21:08.939724379 +0000
+--- expect	2026-09-29 14:52:28.906548970 +0000
++++ actual	2026-09-29 14:52:28.922548970 +0000
 @@ -1,3 +1,4 @@
 +M  sub1
  actual
@@ -226968,6 +227487,594 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4031-diff-rewrite-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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': 
+	write_script dump <<-\EOF &&
+	test-tool hexdump <"$1"
+	EOF
+	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 &&
+	test_grep "dissimilarity index" diff &&
+	test_grep "^-3d 0a 00" diff &&
+	test_grep "^+3d 0a 01" diff
+
+dissimilarity index 99%
+-3d 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 00 0a 
++3d 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 01 0a 
+ok 8 - rewrite diff respects textconv
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4027-diff-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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)
+
+expecting success of 4027.10 'git diff HEAD with dirty submodule (work tree, refs match)': 
+	git commit -m "x" sub &&
+	echo >>sub/world &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git diff --ignore-submodules HEAD >actual2 &&
+	test_must_be_empty actual2 &&
+	git diff --ignore-submodules=untracked HEAD >actual3 &&
+	sed -e "1,/^@@/d" actual3 >actual3.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual3.body &&
+	git diff --ignore-submodules=dirty HEAD >actual4 &&
+	test_must_be_empty actual4
+
+[master e6ee575] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 10 - git diff HEAD with dirty submodule (work tree, refs match)
+
+expecting success of 4027.11 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]': 
+	git config diff.ignoreSubmodules dirty &&
+	git diff HEAD >actual &&
+	test_must_be_empty actual &&
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sub &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git config -f .gitmodules submodule.subname.ignore all &&
+	git config -f .gitmodules submodule.subname.path sub &&
+	git diff HEAD >actual2 &&
+	test_must_be_empty actual2 &&
+	git config -f .gitmodules submodule.subname.ignore untracked &&
+	git diff HEAD >actual3 &&
+	sed -e "1,/^@@/d" actual3 >actual3.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual3.body &&
+	git config -f .gitmodules submodule.subname.ignore dirty &&
+	git diff HEAD >actual4 &&
+	test_must_be_empty actual4 &&
+	git config submodule.subname.ignore none &&
+	git config submodule.subname.path sub &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git config --remove-section submodule.subname &&
+	git config --remove-section -f .gitmodules submodule.subname &&
+	git config --unset diff.ignoreSubmodules &&
+	rm .gitmodules
+
+ok 11 - git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]
+
+expecting success of 4027.12 'git diff HEAD with dirty submodule (index, refs match)': 
+	(
+		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 $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body
+
+HEAD is now at 2dd69d6 submodule #2
+ok 12 - git diff HEAD with dirty submodule (index, refs match)
+
+expecting success of 4027.13 'git diff HEAD with dirty submodule (untracked, refs match)': 
+	(
+		cd sub &&
+		git reset --hard &&
+		git clean -qfdx &&
+		>cruft
+	) &&
+	git diff --ignore-submodules=none HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git diff --ignore-submodules=all HEAD >actual2 &&
+	test_must_be_empty actual2 &&
+	git diff HEAD >actual3 &&
+	test_must_be_empty actual3 &&
+	git diff --ignore-submodules=dirty HEAD >actual4 &&
+	test_must_be_empty actual4
+
+HEAD is now at 2dd69d6 submodule #2
+ok 13 - git diff HEAD with dirty submodule (untracked, refs match)
+
+expecting success of 4027.14 'git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]': 
+	git config --add -f .gitmodules submodule.subname.ignore all &&
+	git config --add -f .gitmodules submodule.subname.path sub &&
+	git diff HEAD >actual2 &&
+	test_must_be_empty actual2 &&
+	git config -f .gitmodules submodule.subname.ignore untracked &&
+	git diff HEAD >actual3 &&
+	test_must_be_empty actual3 &&
+	git config -f .gitmodules submodule.subname.ignore dirty &&
+	git diff HEAD >actual4 &&
+	test_must_be_empty actual4 &&
+	git config submodule.subname.ignore none &&
+	git config submodule.subname.path sub &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git config --remove-section submodule.subname &&
+	git config --remove-section -f .gitmodules submodule.subname &&
+	rm .gitmodules
+
+ok 14 - git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]
+
+expecting success of 4027.15 'git diff between submodule commits': 
+	git diff HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body &&
+	git diff --ignore-submodules=dirty HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body &&
+	git diff --ignore-submodules HEAD^..HEAD >actual &&
+	test_must_be_empty actual
+
+ok 15 - git diff between submodule commits
+
+expecting success of 4027.16 'git diff between submodule commits [.gitmodules]': 
+	git diff HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body &&
+	git config --add -f .gitmodules submodule.subname.ignore dirty &&
+	git config --add -f .gitmodules submodule.subname.path sub &&
+	git diff HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body &&
+	git config -f .gitmodules submodule.subname.ignore all &&
+	git diff HEAD^..HEAD >actual &&
+	test_must_be_empty actual &&
+	git config submodule.subname.ignore dirty &&
+	git config submodule.subname.path sub &&
+	git diff  HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	git config --remove-section submodule.subname &&
+	git config --remove-section -f .gitmodules submodule.subname &&
+	rm .gitmodules
+
+ok 16 - git diff between submodule commits [.gitmodules]
+
+expecting success of 4027.17 'git diff (empty submodule dir)': 
+	rm -rf sub/* sub/.git &&
+	git diff > actual.empty &&
+	test_must_be_empty actual.empty
+
+ok 17 - git diff (empty submodule dir)
+
+expecting success of 4027.18 'conflicted submodule setup': 
+	c=$(test_oid ff_1) &&
+	(
+		echo "000000 $ZERO_OID 0	sub" &&
+		echo "160000 1$c 1	sub" &&
+		echo "160000 2$c 2	sub" &&
+		echo "160000 3$c 3	sub"
+	) | git update-index --index-info &&
+	echo >expect.nosub "diff --cc sub
+index 2ffffff,3ffffff..0000000
+--- a/sub
++++ b/sub
+@@@ -1,1 -1,1 +1,1 @@@
+- Subproject commit 2$c
+ -Subproject commit 3$c
+++Subproject commit $ZERO_OID" &&
+
+	hh=$(git rev-parse HEAD) &&
+	sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub
+
+
+ok 18 - conflicted submodule setup
+
+expecting success of 4027.19 'combined (empty submodule)': 
+	rm -fr sub && mkdir sub &&
+	git diff >actual &&
+	test_cmp expect.nosub actual
+
+ok 19 - combined (empty submodule)
+
+expecting success of 4027.20 'combined (with submodule)': 
+	rm -fr sub &&
+	git clone --no-checkout . sub &&
+	git diff >actual &&
+	test_cmp expect.withsub actual
+
+Cloning into 'sub'...
+done.
+ok 20 - combined (with submodule)
+
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4030-diff-textconv.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4030-diff-textconv/.git/
+expecting success of 4030.1 'setup binary file with history': 
+	write_script hexdump <<-\EOF &&
+	tr "\000\001" "01" <"$1"
+	EOF
+	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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3600-rm.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3600-rm/.git/
 expecting success of 3600.1 'Initialize test directory': 
@@ -228417,175 +229524,173 @@
 1..82
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4030-diff-textconv.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4030-diff-textconv/.git/
-expecting success of 4030.1 'setup binary file with history': 
-	write_script hexdump <<-\EOF &&
-	tr "\000\001" "01" <"$1"
-	EOF
-	test_commit --printf one file "\\0\\n" &&
-	test_commit --printf --append two file "\\01\\n"
+*** t4033-diff-patience.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-[master (root-commit) f1b27dd] one
++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>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[master e1c09e5] two
+ 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, 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
+ 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
 
-ok 6 - show commit produces text
+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 4030.7 'diff-tree produces binary': 
-	git diff-tree -p HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.binary actual
+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
 
-ok 7 - diff-tree produces binary
+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 4030.8 'log produces text': 
-	git log -1 -p >log &&
-	find_diff <log >actual &&
-	test_cmp expect.text actual
+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
 
-ok 8 - log produces text
+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 4030.9 'format-patch produces binary': 
-	git format-patch --no-binary --stdout HEAD^ >patch &&
-	find_diff <patch >actual &&
-	test_cmp expect.binary actual
+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
 
-ok 9 - format-patch produces binary
+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 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}
+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
 
-ok 10 - status -v produces text
+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
 
-expecting success of 4030.11 'show blob produces binary': 
-	git show HEAD:file >actual &&
-	printf "\\0\\n\\01\\n" >expect &&
-	test_cmp expect actual
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4036-format-patch-signer-mime.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4036-format-patch-signer-mime/.git/
+expecting success of 4036.1 'setup': 
 
-ok 11 - show blob produces binary
+	>F &&
+	git add F &&
+	git commit -m initial &&
+	echo new line >F &&
 
-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
+	test_tick &&
+	git commit -m "This adds some lines to F" F
 
-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
+[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 13 - show --no-textconv blob produces binary
+expecting success of 4036.2 'format normally': 
 
-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
+	git format-patch --stdout -1 >output &&
+	! grep Content-Type output
 
-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 2 - format normally
 
-ok 15 - grep-diff (-G) operates on textconv data (modification)
+expecting success of 4036.3 'format with signoff without funny signer name': 
 
-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
+	git format-patch -s --stdout -1 >output &&
+	! grep Content-Type output
 
-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 3 - format with signoff without funny signer name
 
-ok 17 - pickaxe (-S) operates on textconv data (modification)
+expecting success of 4036.4 'format with non ASCII signer name': 
 
-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 &&
+	GIT_COMMITTER_NAME="��� ����" \
+	git format-patch -s --stdout -1 >output &&
+	grep Content-Type output
 
-	head -n1 <expect.stat >expect.line1 &&
-	head -n1 <actual >actual.line1 &&
-	test_cmp expect.line1 actual.line1
 
-ok 18 - diffstat does not run textconv
+Content-Type: text/plain; charset=UTF-8
+ok 4 - format with non ASCII signer name
 
-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
+expecting success of 4036.5 'attach and signoff do not duplicate mime headers': 
 
-checking prerequisite: SYMLINKS
+	GIT_COMMITTER_NAME="��� ����" \
+	git format-patch -s --stdout -1 --attach >output &&
+	test $(grep -ci ^MIME-Version: output) = 1
 
-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
+ok 5 - attach and signoff do not duplicate mime headers
 
-# passed all 19 test(s)
-1..19
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4020-diff-external.sh ***
@@ -229251,8 +230356,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file2
-file /tmp/git-blob-GxwUEL/file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
-file2 /tmp/git-blob-Tws5gg/file2 abc9fa522731419e7eaa3d472e3cb3d99e475c49 100644 file2 0000000000000000000000000000000000000000 100644
+file /tmp/git-blob-z8IW1j/file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
+file2 /tmp/git-blob-lcxRMv/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': 
@@ -229350,188 +230455,19 @@
 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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4033-diff-patience.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4036-format-patch-signer-mime.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+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 5 test(s)
-1..5
+# passed all 71 test(s)
+1..71
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4037-diff-r-t-dirs.sh ***
@@ -229826,62 +230762,6 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4039-diff-assume-unchanged.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4032-diff-inter-hunk-context.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4032-diff-inter-hunk-context/.git/
 expecting success of 4032.1 'diff -U0, 1 common line: count hunks (2)': 
@@ -230085,6 +230965,62 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4039-diff-assume-unchanged.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4040-whitespace-status.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4040-whitespace-status/.git/
 expecting success of 4040.1 'setup': 
@@ -233643,6 +234579,1559 @@
 1..131
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4048-diff-combined-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4048-diff-combined-binary/.git/
+expecting success of 4048.1 'setup binary merge conflict': 
+	echo oneQ1 | q_to_nul >binary &&
+	git add binary &&
+	git commit -m one &&
+	echo twoQ2 | q_to_nul >binary &&
+	git commit -a -m two &&
+	two=$(git rev-parse --short HEAD:binary) &&
+	git checkout -b branch-binary HEAD^ &&
+	echo threeQ3 | q_to_nul >binary &&
+	git commit -a -m three &&
+	three=$(git rev-parse --short HEAD:binary) &&
+	test_must_fail git merge main &&
+	echo resolvedQhooray | q_to_nul >binary &&
+	git commit -a -m resolved &&
+	res=$(git rev-parse --short HEAD:binary)
+
+[main (root-commit) 4aaee60] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 binary
+[main 37524dd] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Switched to a new branch 'branch-binary'
+[branch-binary f388a1d] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+warning: Cannot merge binary files: binary (HEAD vs. main)
+Auto-merging binary
+CONFLICT (content): Merge conflict in binary
+Automatic merge failed; fix conflicts and then commit the result.
+[branch-binary bc3cee3] resolved
+ Author: A U Thor <author@example.com>
+ok 1 - setup binary merge conflict
+
+expecting success of 4048.2 'diff -m indicates binary-ness': 
+	git show --format=%s -m >actual &&
+	test_cmp expect actual
+
+ok 2 - diff -m indicates binary-ness
+
+expecting success of 4048.3 'diff -c indicates binary-ness': 
+	git show --format=%s -c >actual &&
+	test_cmp expect actual
+
+ok 3 - diff -c indicates binary-ness
+
+expecting success of 4048.4 'diff --cc indicates binary-ness': 
+	git show --format=%s --cc >actual &&
+	test_cmp expect actual
+
+ok 4 - diff --cc indicates binary-ness
+
+expecting success of 4048.5 'setup non-binary with binary attribute': 
+	git checkout main &&
+	test_commit one text &&
+	test_commit two text &&
+	two=$(git rev-parse --short HEAD:text) &&
+	git checkout -b branch-text HEAD^ &&
+	test_commit three text &&
+	three=$(git rev-parse --short HEAD:text) &&
+	test_must_fail git merge main &&
+	test_commit resolved text &&
+	res=$(git rev-parse --short HEAD:text) &&
+	echo text -diff >.gitattributes
+
+Switched to branch 'main'
+[main faa5b8e] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 text
+[main 84c76a1] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branch-text'
+[branch-text 9b74371] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging text
+CONFLICT (content): Merge conflict in text
+Automatic merge failed; fix conflicts and then commit the result.
+[branch-text c916fed] resolved
+ Author: A U Thor <author@example.com>
+ok 5 - setup non-binary with binary attribute
+
+expecting success of 4048.6 'diff -m respects binary attribute': 
+	git show --format=%s -m >actual &&
+	test_cmp expect actual
+
+ok 6 - diff -m respects binary attribute
+
+expecting success of 4048.7 'diff -c respects binary attribute': 
+	git show --format=%s -c >actual &&
+	test_cmp expect actual
+
+ok 7 - diff -c respects binary attribute
+
+expecting success of 4048.8 'diff --cc respects binary attribute': 
+	git show --format=%s --cc >actual &&
+	test_cmp expect actual
+
+ok 8 - diff --cc respects binary attribute
+
+expecting success of 4048.9 'setup textconv attribute': 
+	echo "text diff=upcase" >.gitattributes &&
+	git config diff.upcase.textconv "tr a-z A-Z <"
+
+ok 9 - setup textconv attribute
+
+expecting success of 4048.10 'diff -m respects textconv attribute': 
+	git show --format=%s -m >actual &&
+	test_cmp expect actual
+
+ok 10 - diff -m respects textconv attribute
+
+expecting success of 4048.11 'diff -c respects textconv attribute': 
+	git show --format=%s -c >actual &&
+	test_cmp expect actual
+
+ok 11 - diff -c respects textconv attribute
+
+expecting success of 4048.12 'diff --cc respects textconv attribute': 
+	git show --format=%s --cc >actual &&
+	test_cmp expect actual
+
+ok 12 - diff --cc respects textconv attribute
+
+expecting success of 4048.13 'diff-tree plumbing does not respect textconv': 
+	git diff-tree HEAD -c -p >full &&
+	tail -n +2 full >actual &&
+	test_cmp expect actual
+
+ok 13 - diff-tree plumbing does not respect textconv
+
+expecting success of 4048.14 'diff --cc respects textconv on worktree file': 
+	git reset --hard HEAD^ &&
+	test_must_fail git merge main &&
+	git diff >actual &&
+	test_cmp expect actual
+
+HEAD is now at 9b74371 three
+Auto-merging text
+CONFLICT (content): Merge conflict in text
+Automatic merge failed; fix conflicts and then commit the result.
+ok 14 - diff --cc respects textconv on worktree file
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4049-diff-stat-count.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4049-diff-stat-count/.git/
+expecting success of 4049.1 'setup': 
+	>a &&
+	>b &&
+	>c &&
+	>d &&
+	git add a b c d &&
+	git commit -m initial
+
+[master (root-commit) 000d1c1] initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ create mode 100644 b
+ create mode 100644 c
+ create mode 100644 d
+ok 1 - setup
+
+expecting success of 4049.2 'mode-only change show as a 0-line change': 
+	git reset --hard &&
+	test_chmod +x b d &&
+	echo a >a &&
+	echo c >c &&
+	cat >expect <<-\EOF &&
+	 a | 1 +
+	 b | 0
+	 ...
+	 4 files changed, 2 insertions(+)
+	EOF
+	git diff --stat --stat-count=2 HEAD >actual &&
+	test_cmp expect actual
+
+HEAD is now at 000d1c1 initial
+ok 2 - mode-only change show as a 0-line change
+
+expecting success of 4049.3 'binary changes do not count in lines': 
+	git reset --hard &&
+	echo a >a &&
+	echo c >c &&
+	cat "$TEST_DIRECTORY"/test-binary-1.png >d &&
+	cat >expect <<-\EOF &&
+	 a | 1 +
+	 c | 1 +
+	 ...
+	 3 files changed, 2 insertions(+)
+	EOF
+	git diff --stat --stat-count=2 >actual &&
+	test_cmp expect actual
+
+HEAD is now at 000d1c1 initial
+ok 3 - binary changes do not count in lines
+
+expecting success of 4049.4 'exclude unmerged entries from total file count': 
+	git reset --hard &&
+	echo a >a &&
+	echo b >b &&
+	git ls-files -s a >x &&
+	git rm -f d &&
+	for stage in 1 2 3
+	do
+		sed -e "s/ 0	a/ $stage	d/" x || return 1
+	done |
+	git update-index --index-info &&
+	echo d >d &&
+	cat >expect <<-\EOF &&
+	 a | 1 +
+	 b | 1 +
+	 ...
+	 3 files changed, 3 insertions(+)
+	EOF
+	git diff --stat --stat-count=2 >actual &&
+	test_cmp expect actual
+
+HEAD is now at 000d1c1 initial
+rm 'd'
+ok 4 - exclude unmerged entries from total file count
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4041-diff-submodule-option.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4041-diff-submodule-option/.git/
+expecting success of 4041.1 'setup submodule': 
+	git init sm1 &&
+	add_file . foo &&
+	head1=$(add_file sm1 foo1 foo2) &&
+	fullhead1=$(cd sm1 && git rev-parse --verify HEAD)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4041-diff-submodule-option/sm1/.git/
+36d39d8
+ok 1 - setup submodule
+
+expecting success of 4041.2 'added submodule': 
+	git add sm1 &&
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 0000000...$head1 (new submodule)
+	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 2 - added submodule
+
+expecting success of 4041.3 'added submodule, set diff.submodule': 
+	git config diff.submodule log &&
+	git add sm1 &&
+	git diff --cached >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 0000000...$head1 (new submodule)
+	EOF
+	git config --unset diff.submodule &&
+	test_cmp expected actual
+
+ok 3 - added submodule, set diff.submodule
+
+expecting success of 4041.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
+	test_cmp expected actual
+
+ok 4 - --submodule=short overrides diff.submodule
+
+expecting success of 4041.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
+	test_cmp expected actual
+
+ok 5 - diff.submodule does not affect plumbing
+
+expecting success of 4041.6 'modified submodule(forward)': 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head1..$head2:
+	  > Add foo3 ($added foo3)
+	EOF
+	test_cmp expected actual
+
+ok 6 - modified submodule(forward)
+
+expecting success of 4041.7 'modified submodule(forward)': 
+	git diff --submodule=log >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head1..$head2:
+	  > Add foo3 ($added foo3)
+	EOF
+	test_cmp expected actual
+
+ok 7 - modified submodule(forward)
+
+expecting success of 4041.8 'modified submodule(forward) --submodule': 
+	git diff --submodule >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head1..$head2:
+	  > Add foo3 ($added foo3)
+	EOF
+	test_cmp expected actual
+
+ok 8 - modified submodule(forward) --submodule
+
+expecting success of 4041.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
+	test_cmp expected actual
+
+ok 9 - modified submodule(forward) --submodule=short
+
+expecting success of 4041.10 'modified submodule(backward)': 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head2..$head3 (rewind):
+	  < Add foo3 ($added foo3)
+	  < Add foo2 ($added foo2)
+	EOF
+	test_cmp expected actual
+
+ok 10 - modified submodule(backward)
+
+expecting success of 4041.11 'modified submodule(backward and forward)': 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head2...$head4:
+	  > Add foo5 ($added foo5)
+	  > Add foo4 ($added foo4)
+	  < Add foo3 ($added foo3)
+	  < Add foo2 ($added foo2)
+	EOF
+	test_cmp expected actual
+
+ok 11 - modified submodule(backward and forward)
+
+expecting success of 4041.12 'typechanged submodule(submodule->blob), --cached': 
+	git diff --submodule=log --cached >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head4...0000000 (submodule deleted)
+	diff --git a/sm1 b/sm1
+	new file mode 100644
+	index 0000000..$head5
+	--- /dev/null
+	+++ b/sm1
+	@@ -0,0 +1 @@
+	+sm1
+	EOF
+	test_cmp expected actual
+
+ok 12 - typechanged submodule(submodule->blob), --cached
+
+expecting success of 4041.13 'typechanged submodule(submodule->blob)': 
+	git diff --submodule=log >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	deleted file mode 100644
+	index $head5..0000000
+	--- a/sm1
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-sm1
+	Submodule sm1 0000000...$head4 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 13 - typechanged submodule(submodule->blob)
+
+expecting success of 4041.14 'typechanged submodule(submodule->blob)': 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head4...0000000 (submodule deleted)
+	diff --git a/sm1 b/sm1
+	new file mode 100644
+	index 0000000..$head5
+	--- /dev/null
+	+++ b/sm1
+	@@ -0,0 +1 @@
+	+sm1
+	EOF
+	test_cmp expected actual
+
+ok 14 - typechanged submodule(submodule->blob)
+
+expecting success of 4041.15 'setup submodule anew': 
+	rm -f sm1 &&
+	git init sm1 &&
+	head6=$(add_file sm1 foo6 foo7) &&
+	fullhead6=$(cd sm1 && git rev-parse --verify HEAD)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4041-diff-submodule-option/sm1/.git/
+ok 15 - setup submodule anew
+
+expecting success of 4041.16 'nonexistent commit': 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head4...$head6 (commits not present)
+	EOF
+	test_cmp expected actual
+
+ok 16 - nonexistent commit
+
+expecting success of 4041.17 'typechanged submodule(blob->submodule)': 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	deleted file mode 100644
+	index $head5..0000000
+	--- a/sm1
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-sm1
+	Submodule sm1 0000000...$head6 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 17 - typechanged submodule(blob->submodule)
+
+expecting success of 4041.18 'submodule is up to date': 
+	git diff-index -p --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 18 - submodule is up to date
+
+expecting success of 4041.19 'submodule contains untracked content': 
+	echo new > sm1/new-file &&
+	git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	EOF
+	test_cmp expected actual
+
+ok 19 - submodule contains untracked content
+
+expecting success of 4041.20 'submodule contains untracked content (untracked ignored)': 
+	git diff-index -p --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 20 - submodule contains untracked content (untracked ignored)
+
+expecting success of 4041.21 'submodule contains untracked content (dirty ignored)': 
+	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 21 - submodule contains untracked content (dirty ignored)
+
+expecting success of 4041.22 'submodule contains untracked content (all ignored)': 
+	git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 22 - submodule contains untracked content (all ignored)
+
+expecting success of 4041.23 'submodule contains untracked and modified content': 
+	echo new > sm1/foo6 &&
+	git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	Submodule sm1 contains modified content
+	EOF
+	test_cmp expected actual
+
+ok 23 - submodule contains untracked and modified content
+
+expecting success of 4041.24 'submodule contains untracked and modified content (untracked ignored)': 
+	echo new > sm1/foo6 &&
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	EOF
+	test_cmp expected actual
+
+ok 24 - submodule contains untracked and modified content (untracked ignored)
+
+expecting success of 4041.25 'submodule contains untracked and modified content (dirty ignored)': 
+	echo new > sm1/foo6 &&
+	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 25 - submodule contains untracked and modified content (dirty ignored)
+
+expecting success of 4041.26 'submodule contains untracked and modified content (all ignored)': 
+	echo new > sm1/foo6 &&
+	git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 26 - submodule contains untracked and modified content (all ignored)
+
+expecting success of 4041.27 'submodule contains modified content': 
+	rm -f sm1/new-file &&
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	EOF
+	test_cmp expected actual
+
+ok 27 - submodule contains modified content
+
+expecting success of 4041.28 'submodule is modified': 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 28 - submodule is modified
+
+expecting success of 4041.29 'modified submodule contains untracked content': 
+	echo new > sm1/new-file &&
+	git diff-index -p  --ignore-submodules=none --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 29 - modified submodule contains untracked content
+
+expecting success of 4041.30 'modified submodule contains untracked content (untracked ignored)': 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 30 - modified submodule contains untracked content (untracked ignored)
+
+expecting success of 4041.31 'modified submodule contains untracked content (dirty ignored)': 
+	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 31 - modified submodule contains untracked content (dirty ignored)
+
+expecting success of 4041.32 'modified submodule contains untracked content (all ignored)': 
+	git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 32 - modified submodule contains untracked content (all ignored)
+
+expecting success of 4041.33 'modified submodule contains untracked and modified content': 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	Submodule sm1 contains modified content
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 33 - modified submodule contains untracked and modified content
+
+expecting success of 4041.34 'modified submodule contains untracked and modified content (untracked ignored)': 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 34 - modified submodule contains untracked and modified content (untracked ignored)
+
+expecting success of 4041.35 'modified submodule contains untracked and modified content (dirty ignored)': 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 35 - modified submodule contains untracked and modified content (dirty ignored)
+
+expecting success of 4041.36 'modified submodule contains untracked and modified content (all ignored)': 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 36 - modified submodule contains untracked and modified content (all ignored)
+
+expecting success of 4041.37 'modified submodule contains modified content': 
+	rm -f sm1/new-file &&
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 37 - modified submodule contains modified content
+
+expecting success of 4041.38 'deleted submodule': 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6...0000000 (submodule deleted)
+	EOF
+	test_cmp expected actual
+
+ok 38 - deleted submodule
+
+expecting success of 4041.39 '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.51.0/t/trash directory.t4041-diff-submodule-option/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 39 - create second submodule
+
+expecting success of 4041.40 'multiple submodules': 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head7 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 40 - multiple submodules
+
+expecting success of 4041.41 'path filter': 
+	git diff-index -p --submodule=log HEAD sm2 >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm2 0000000...$head7 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 41 - path filter
+
+expecting success of 4041.42 'given commit': 
+	git diff-index -p --submodule=log HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head7 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 42 - given commit
+
+expecting success of 4041.43 'given commit --submodule': 
+	git diff-index -p --submodule HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head7 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 43 - given commit --submodule
+
+expecting success of 4041.44 'given commit --submodule=short': 
+	git diff-index -p --submodule=short HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	deleted file mode 160000
+	index $head6..0000000
+	--- a/sm1
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-Subproject commit $fullhead6
+	diff --git a/sm2 b/sm2
+	new file mode 160000
+	index 0000000..$head7
+	--- /dev/null
+	+++ b/sm2
+	@@ -0,0 +1 @@
+	+Subproject commit $fullhead7
+	EOF
+	test_cmp expected actual
+
+ok 44 - given commit --submodule=short
+
+expecting success of 4041.45 'setup .git file for sm2': 
+	(cd sm2 &&
+	 REAL="$(pwd)/../.real" &&
+	 mv .git "$REAL" &&
+	 echo "gitdir: $REAL" >.git)
+
+ok 45 - setup .git file for sm2
+
+expecting success of 4041.46 'diff --submodule with .git file': 
+	git diff --submodule HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head7 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 46 - diff --submodule with .git file
+
+expecting success of 4041.47 'diff --submodule with objects referenced by alternates': 
+	mkdir sub_alt &&
+	(cd sub_alt &&
+		git init &&
+		echo a >a &&
+		git add a &&
+		git commit -m a
+	) &&
+	mkdir super &&
+	(cd super &&
+		git clone -s ../sub_alt sub &&
+		git init &&
+		git add sub &&
+		git commit -m "sub a"
+	) &&
+	(cd sub_alt &&
+		sha1_before=$(git rev-parse --short HEAD) &&
+		echo b >b &&
+		git add b &&
+		git commit -m b &&
+		sha1_after=$(git rev-parse --short HEAD) &&
+		{
+			echo "Submodule sub $sha1_before..$sha1_after:" &&
+			echo "  > b"
+		} >../expected
+	) &&
+	(cd super &&
+		(cd sub &&
+			git fetch &&
+			git checkout origin/main
+		) &&
+		git diff --submodule > ../actual
+	) &&
+	test_cmp expected actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4041-diff-submodule-option/sub_alt/.git/
+[main (root-commit) b7442a0] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+Cloning into 'sub'...
+done.
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4041-diff-submodule-option/super/.git/
+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) d9c5753] sub a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+[main 8e02ef5] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+From /build/reproducible-path/git-2.51.0/t/trash directory.t4041-diff-submodule-option/super/../sub_alt
+   b7442a0..8e02ef5  main       -> origin/main
+Note: switching to 'origin/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 8e02ef5 b
+ok 47 - diff --submodule with objects referenced by alternates
+
+# passed all 47 test(s)
+1..47
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4045-diff-relative.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4045-diff-relative/.git/
+expecting success of 4045.1 'setup': 
+	git commit --allow-empty -m empty &&
+	echo content >file1 &&
+	mkdir subdir &&
+	echo other content >subdir/file2 &&
+	blob_file1=$(git hash-object file1) &&
+	blob_file2=$(git hash-object subdir/file2) &&
+	git add . &&
+	git commit -m one
+
+[master (root-commit) f4030cd] empty
+ Author: A U Thor <author@example.com>
+[master e528d0d] one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 subdir/file2
+ok 1 - setup
+
+expecting success of 4045.2 '-p --relative=subdir/': 
+		git -C '.' diff -p --relative=subdir/ HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 2 - -p --relative=subdir/
+
+expecting success of 4045.3 '-p --relative=subdir': 
+		git -C '.' diff -p --relative=subdir HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 3 - -p --relative=subdir
+
+expecting success of 4045.4 '-p --relative': 
+		git -C 'subdir' diff -p --relative HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 4 - -p --relative
+
+expecting success of 4045.5 '-p --relative=sub': 
+		git -C '.' diff -p --relative=sub HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 5 - -p --relative=sub
+
+expecting success of 4045.6 '--numstat --relative=subdir/': 
+		echo '1	0	file2' >expected &&
+		git -C '.' diff --numstat --relative=subdir/ HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 6 - --numstat --relative=subdir/
+
+expecting success of 4045.7 '--numstat --relative=subdir': 
+		echo '1	0	file2' >expected &&
+		git -C '.' diff --numstat --relative=subdir HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 7 - --numstat --relative=subdir
+
+expecting success of 4045.8 '--numstat --relative': 
+		echo '1	0	file2' >expected &&
+		git -C 'subdir' diff --numstat --relative HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 8 - --numstat --relative
+
+expecting success of 4045.9 '--numstat --relative=sub': 
+		echo '1	0	dir/file2' >expected &&
+		git -C '.' diff --numstat --relative=sub HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 9 - --numstat --relative=sub
+
+expecting success of 4045.10 '--stat --relative=subdir/': 
+		git -C '.' diff --stat --relative=subdir/ HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 10 - --stat --relative=subdir/
+
+expecting success of 4045.11 '--stat --relative=subdir': 
+		git -C '.' diff --stat --relative=subdir HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 11 - --stat --relative=subdir
+
+expecting success of 4045.12 '--stat --relative': 
+		git -C 'subdir' diff --stat --relative HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 12 - --stat --relative
+
+expecting success of 4045.13 '--stat --relative=sub': 
+		git -C '.' diff --stat --relative=sub HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 13 - --stat --relative=sub
+
+expecting success of 4045.14 '--raw --relative=subdir/': 
+		git -C '.' diff --no-abbrev --raw --relative=subdir/ HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 14 - --raw --relative=subdir/
+
+expecting success of 4045.15 '--raw --relative=subdir': 
+		git -C '.' diff --no-abbrev --raw --relative=subdir HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 15 - --raw --relative=subdir
+
+expecting success of 4045.16 '--raw --relative': 
+		git -C 'subdir' diff --no-abbrev --raw --relative HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 16 - --raw --relative
+
+expecting success of 4045.17 '--raw --relative=sub': 
+		git -C '.' diff --no-abbrev --raw --relative=sub HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 17 - --raw --relative=sub
+
+expecting success of 4045.18 'config diff.relative false -p ': 
+		short_blob_file1=$(git rev-parse --short d95f3ad14dee633a758d2e331151e950dd13e4ed) &&
+		short_blob_file2=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file1 b/file1
+		new file mode 100644
+		index 0000000..$short_blob_file1
+		--- /dev/null
+		+++ b/file1
+		@@ -0,0 +1 @@
+		+content
+		diff --git a/subdir/file2 b/subdir/file2
+		new file mode 100644
+		index 0000000..$short_blob_file2
+		--- /dev/null
+		+++ b/subdir/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C . diff.relative false &&
+		git -C '.' diff -p  HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 18 - config diff.relative false -p 
+
+expecting success of 4045.19 'config diff.relative true -p --no-relative': 
+		short_blob_file1=$(git rev-parse --short d95f3ad14dee633a758d2e331151e950dd13e4ed) &&
+		short_blob_file2=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file1 b/file1
+		new file mode 100644
+		index 0000000..$short_blob_file1
+		--- /dev/null
+		+++ b/file1
+		@@ -0,0 +1 @@
+		+content
+		diff --git a/subdir/file2 b/subdir/file2
+		new file mode 100644
+		index 0000000..$short_blob_file2
+		--- /dev/null
+		+++ b/subdir/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C . diff.relative true &&
+		git -C '.' diff -p --no-relative HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 19 - config diff.relative true -p --no-relative
+
+expecting success of 4045.20 'config diff.relative false -p --no-relative': 
+		short_blob_file1=$(git rev-parse --short d95f3ad14dee633a758d2e331151e950dd13e4ed) &&
+		short_blob_file2=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file1 b/file1
+		new file mode 100644
+		index 0000000..$short_blob_file1
+		--- /dev/null
+		+++ b/file1
+		@@ -0,0 +1 @@
+		+content
+		diff --git a/subdir/file2 b/subdir/file2
+		new file mode 100644
+		index 0000000..$short_blob_file2
+		--- /dev/null
+		+++ b/subdir/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C . diff.relative false &&
+		git -C '.' diff -p --no-relative HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 20 - config diff.relative false -p --no-relative
+
+expecting success of 4045.21 'config diff.relative false -p ': 
+		short_blob_file1=$(git rev-parse --short d95f3ad14dee633a758d2e331151e950dd13e4ed) &&
+		short_blob_file2=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file1 b/file1
+		new file mode 100644
+		index 0000000..$short_blob_file1
+		--- /dev/null
+		+++ b/file1
+		@@ -0,0 +1 @@
+		+content
+		diff --git a/subdir/file2 b/subdir/file2
+		new file mode 100644
+		index 0000000..$short_blob_file2
+		--- /dev/null
+		+++ b/subdir/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C subdir diff.relative false &&
+		git -C 'subdir' diff -p  HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 21 - config diff.relative false -p 
+
+expecting success of 4045.22 'config diff.relative true -p --no-relative': 
+		short_blob_file1=$(git rev-parse --short d95f3ad14dee633a758d2e331151e950dd13e4ed) &&
+		short_blob_file2=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file1 b/file1
+		new file mode 100644
+		index 0000000..$short_blob_file1
+		--- /dev/null
+		+++ b/file1
+		@@ -0,0 +1 @@
+		+content
+		diff --git a/subdir/file2 b/subdir/file2
+		new file mode 100644
+		index 0000000..$short_blob_file2
+		--- /dev/null
+		+++ b/subdir/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C subdir diff.relative true &&
+		git -C 'subdir' diff -p --no-relative HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 22 - config diff.relative true -p --no-relative
+
+expecting success of 4045.23 'config diff.relative false -p --no-relative': 
+		short_blob_file1=$(git rev-parse --short d95f3ad14dee633a758d2e331151e950dd13e4ed) &&
+		short_blob_file2=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file1 b/file1
+		new file mode 100644
+		index 0000000..$short_blob_file1
+		--- /dev/null
+		+++ b/file1
+		@@ -0,0 +1 @@
+		+content
+		diff --git a/subdir/file2 b/subdir/file2
+		new file mode 100644
+		index 0000000..$short_blob_file2
+		--- /dev/null
+		+++ b/subdir/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C subdir diff.relative false &&
+		git -C 'subdir' diff -p --no-relative HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 23 - config diff.relative false -p --no-relative
+
+expecting success of 4045.24 'config diff.relative false -p --relative=subdir/': 
+		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file2 b/file2
+		new file mode 100644
+		index 0000000..$short_blob
+		--- /dev/null
+		+++ b/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C . diff.relative false &&
+		git -C '.' diff -p --relative=subdir/ HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 24 - config diff.relative false -p --relative=subdir/
+
+expecting success of 4045.25 'config diff.relative false -p --relative=subdir': 
+		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file2 b/file2
+		new file mode 100644
+		index 0000000..$short_blob
+		--- /dev/null
+		+++ b/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C . diff.relative false &&
+		git -C '.' diff -p --relative=subdir HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 25 - config diff.relative false -p --relative=subdir
+
+expecting success of 4045.26 'config diff.relative true -p --relative=subdir/': 
+		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file2 b/file2
+		new file mode 100644
+		index 0000000..$short_blob
+		--- /dev/null
+		+++ b/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C . diff.relative true &&
+		git -C '.' diff -p --relative=subdir/ HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 26 - config diff.relative true -p --relative=subdir/
+
+expecting success of 4045.27 'config diff.relative true -p --relative=subdir': 
+		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file2 b/file2
+		new file mode 100644
+		index 0000000..$short_blob
+		--- /dev/null
+		+++ b/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C . diff.relative true &&
+		git -C '.' diff -p --relative=subdir HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 27 - config diff.relative true -p --relative=subdir
+
+expecting success of 4045.28 'config diff.relative false -p --relative': 
+		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file2 b/file2
+		new file mode 100644
+		index 0000000..$short_blob
+		--- /dev/null
+		+++ b/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C subdir diff.relative false &&
+		git -C 'subdir' diff -p --relative HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 28 - config diff.relative false -p --relative
+
+expecting success of 4045.29 'config diff.relative true -p --relative': 
+		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file2 b/file2
+		new file mode 100644
+		index 0000000..$short_blob
+		--- /dev/null
+		+++ b/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C subdir diff.relative true &&
+		git -C 'subdir' diff -p --relative HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 29 - config diff.relative true -p --relative
+
+expecting success of 4045.30 'config diff.relative true -p ': 
+		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file2 b/file2
+		new file mode 100644
+		index 0000000..$short_blob
+		--- /dev/null
+		+++ b/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C subdir diff.relative true &&
+		git -C 'subdir' diff -p  HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 30 - config diff.relative true -p 
+
+expecting success of 4045.31 'config diff.relative false -p --no-relative --relative': 
+		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file2 b/file2
+		new file mode 100644
+		index 0000000..$short_blob
+		--- /dev/null
+		+++ b/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C subdir diff.relative false &&
+		git -C 'subdir' diff -p --no-relative --relative HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 31 - config diff.relative false -p --no-relative --relative
+
+expecting success of 4045.32 'config diff.relative true -p --no-relative --relative': 
+		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file2 b/file2
+		new file mode 100644
+		index 0000000..$short_blob
+		--- /dev/null
+		+++ b/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C subdir diff.relative true &&
+		git -C 'subdir' diff -p --no-relative --relative HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 32 - config diff.relative true -p --no-relative --relative
+
+expecting success of 4045.33 'config diff.relative false -p --no-relative --relative=subdir': 
+		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file2 b/file2
+		new file mode 100644
+		index 0000000..$short_blob
+		--- /dev/null
+		+++ b/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C . diff.relative false &&
+		git -C '.' diff -p --no-relative --relative=subdir HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 33 - config diff.relative false -p --no-relative --relative=subdir
+
+expecting success of 4045.34 'config diff.relative true -p --no-relative --relative=subdir': 
+		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
+		cat >expected <<-EOF &&
+		diff --git a/file2 b/file2
+		new file mode 100644
+		index 0000000..$short_blob
+		--- /dev/null
+		+++ b/file2
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C . diff.relative true &&
+		git -C '.' diff -p --no-relative --relative=subdir HEAD^ >actual &&
+		test_cmp expected actual
+	
+ok 34 - config diff.relative true -p --no-relative --relative=subdir
+
+expecting success of 4045.35 'external diff with --relative': 
+	test_when_finished "git reset --hard" &&
+	echo changed >file1 &&
+	echo changed >subdir/file2 &&
+
+	write_script mydiff <<-\EOF &&
+	# hacky pretend diff; the goal here is just to make sure we got
+	# passed sensible input that we _could_ diff, without relying on
+	# the specific output of a system diff tool.
+	echo "diff a/$1 b/$1" &&
+	echo "--- a/$1" &&
+	echo "+++ b/$1" &&
+	echo "@@ -1 +0,0 @@" &&
+	sed "s/^/-/" "$2" &&
+	sed "s/^/+/" "$5"
+	EOF
+
+	cat >expect <<-\EOF &&
+	diff a/file2 b/file2
+	--- a/file2
+	+++ b/file2
+	@@ -1 +0,0 @@
+	-other content
+	+changed
+	EOF
+	GIT_EXTERNAL_DIFF=./mydiff git diff --relative=subdir >actual &&
+	test_cmp expect actual
+
+HEAD is now at e528d0d one
+ok 35 - external diff with --relative
+
+expecting success of 4045.36 'setup diff --relative unmerged': 
+	test_commit zero file0 &&
+	test_commit base subdir/file0 &&
+	git switch -c br1 &&
+	test_commit one file0 &&
+	test_commit sub1 subdir/file0 &&
+	git switch -c br2 base &&
+	test_commit two file0 &&
+	git switch -c br3 &&
+	test_commit sub3 subdir/file0
+
+[master 8079767] zero
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file0
+[master 32ab62b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/file0
+Switched to a new branch 'br1'
+[br1 02602ea] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[br1 7cf214c] sub1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'br2'
+[br2 a52bcea] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'br3'
+[br3 b0bcae9] sub3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 36 - setup diff --relative unmerged
+
+expecting success of 4045.37 'diff --relative without change in subdir': 
+	git switch br2 &&
+	test_when_finished "git merge --abort" &&
+	test_must_fail git merge one &&
+	git -C subdir diff --relative >out &&
+	test_must_be_empty out &&
+	git -C subdir diff --relative --name-only >out &&
+	test_must_be_empty out
+
+Switched to branch 'br2'
+Auto-merging file0
+CONFLICT (content): Merge conflict in file0
+Automatic merge failed; fix conflicts and then commit the result.
+ok 37 - diff --relative without change in subdir
+
+expecting success of 4045.38 'diff --relative --name-only with change in subdir': 
+	git switch br3 &&
+	test_when_finished "git merge --abort" &&
+	test_must_fail git merge sub1 &&
+	test_write_lines file0 file0 >expected &&
+	git -C subdir diff --relative --name-only >out &&
+	test_cmp expected out
+
+Switched to branch 'br3'
+Auto-merging file0
+CONFLICT (content): Merge conflict in file0
+Auto-merging subdir/file0
+CONFLICT (content): Merge conflict in subdir/file0
+Automatic merge failed; fix conflicts and then commit the result.
+ok 38 - diff --relative --name-only with change in subdir
+
+checking known breakage of 4045.39 'diff --relative with change in subdir': 
+	git switch br3 &&
+	br1_blob=$(git rev-parse --short --verify br1:subdir/file0) &&
+	br3_blob=$(git rev-parse --short --verify br3:subdir/file0) &&
+	test_when_finished "git merge --abort" &&
+	test_must_fail git merge br1 &&
+	cat >expected <<-EOF &&
+	diff --cc file0
+	index $br3_blob,$br1_blob..0000000
+	--- a/file0
+	+++ b/file0
+	@@@ -1,1 -1,1 +1,5 @@@
+	++<<<<<<< HEAD
+	 +sub3
+	++=======
+	+ sub1
+	++>>>>>>> br1
+	EOF
+	git -C subdir diff --relative >out &&
+	test_cmp expected out
+
+Already on 'br3'
+Auto-merging file0
+CONFLICT (content): Merge conflict in file0
+Auto-merging subdir/file0
+CONFLICT (content): Merge conflict in subdir/file0
+Automatic merge failed; fix conflicts and then commit the result.
+--- expected	2026-09-29 14:52:31.858548970 +0000
++++ out	2026-09-29 14:52:31.866548970 +0000
+@@ -1,7 +1,7 @@
+-diff --cc file0
++diff --cc subdir/file0
+ index b8c2280,48df0cb..0000000
+---- a/file0
+-+++ b/file0
++--- a/subdir/file0
+++++ b/subdir/file0
+ @@@ -1,1 -1,1 +1,5 @@@
+ ++<<<<<<< HEAD
+  +sub3
+not ok 39 - diff --relative with change in subdir # TODO known breakage
+
+# still have 1 known breakage(s)
+# passed all remaining 38 test(s)
+1..39
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4050-diff-histogram.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4050-diff-histogram/.git/
+expecting success of 4050.1 'setup attributes files for tests with histogram': 
+		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 1 - setup attributes files for tests with histogram
+
+expecting success of 4050.2 'histogram diff from attributes': 
+		test_must_fail git -c diff.driver.algorithm=$STRATEGY diff --no-index file1 file2 > output &&
+		test_cmp expect output
+	
+ok 2 - histogram diff from attributes
+
+expecting success of 4050.3 '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 3 - diff from attributes with bare repo with source
+
+expecting success of 4050.4 '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 4 - diff from attributes with bare repo with invalid source
+
+expecting success of 4050.5 'histogram 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 5 - histogram diff from attributes has valid diffstat
+
+expecting success of 4050.6 'histogram diff': 
+		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
+		test_cmp expect output
+	
+ok 6 - histogram diff
+
+expecting success of 4050.7 'histogram 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 7 - histogram diff command line precedence before attributes
+
+expecting success of 4050.8 'histogram 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 8 - histogram diff attributes precedence before config
+
+expecting success of 4050.9 'histogram diff output is valid': 
+		mv file2 expect &&
+		git apply < output &&
+		test_cmp expect file2
+	
+ok 9 - histogram diff output is valid
+
+expecting success of 4050.10 'completely different files': 
+		test_must_fail git diff --no-index "--$STRATEGY" uniq1 uniq2 > output &&
+		test_cmp expect output
+	
+ok 10 - completely different files
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3432-rebase-fast-forward.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3432-rebase-fast-forward/.git/
 expecting success of 3432.1 'setup': 
@@ -243679,1559 +246168,6 @@
 1..225
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4049-diff-stat-count.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4049-diff-stat-count/.git/
-expecting success of 4049.1 'setup': 
-	>a &&
-	>b &&
-	>c &&
-	>d &&
-	git add a b c d &&
-	git commit -m initial
-
-[master (root-commit) 000d1c1] initial
- Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
- create mode 100644 b
- create mode 100644 c
- create mode 100644 d
-ok 1 - setup
-
-expecting success of 4049.2 'mode-only change show as a 0-line change': 
-	git reset --hard &&
-	test_chmod +x b d &&
-	echo a >a &&
-	echo c >c &&
-	cat >expect <<-\EOF &&
-	 a | 1 +
-	 b | 0
-	 ...
-	 4 files changed, 2 insertions(+)
-	EOF
-	git diff --stat --stat-count=2 HEAD >actual &&
-	test_cmp expect actual
-
-HEAD is now at 000d1c1 initial
-ok 2 - mode-only change show as a 0-line change
-
-expecting success of 4049.3 'binary changes do not count in lines': 
-	git reset --hard &&
-	echo a >a &&
-	echo c >c &&
-	cat "$TEST_DIRECTORY"/test-binary-1.png >d &&
-	cat >expect <<-\EOF &&
-	 a | 1 +
-	 c | 1 +
-	 ...
-	 3 files changed, 2 insertions(+)
-	EOF
-	git diff --stat --stat-count=2 >actual &&
-	test_cmp expect actual
-
-HEAD is now at 000d1c1 initial
-ok 3 - binary changes do not count in lines
-
-expecting success of 4049.4 'exclude unmerged entries from total file count': 
-	git reset --hard &&
-	echo a >a &&
-	echo b >b &&
-	git ls-files -s a >x &&
-	git rm -f d &&
-	for stage in 1 2 3
-	do
-		sed -e "s/ 0	a/ $stage	d/" x || return 1
-	done |
-	git update-index --index-info &&
-	echo d >d &&
-	cat >expect <<-\EOF &&
-	 a | 1 +
-	 b | 1 +
-	 ...
-	 3 files changed, 3 insertions(+)
-	EOF
-	git diff --stat --stat-count=2 >actual &&
-	test_cmp expect actual
-
-HEAD is now at 000d1c1 initial
-rm 'd'
-ok 4 - exclude unmerged entries from total file count
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4048-diff-combined-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4048-diff-combined-binary/.git/
-expecting success of 4048.1 'setup binary merge conflict': 
-	echo oneQ1 | q_to_nul >binary &&
-	git add binary &&
-	git commit -m one &&
-	echo twoQ2 | q_to_nul >binary &&
-	git commit -a -m two &&
-	two=$(git rev-parse --short HEAD:binary) &&
-	git checkout -b branch-binary HEAD^ &&
-	echo threeQ3 | q_to_nul >binary &&
-	git commit -a -m three &&
-	three=$(git rev-parse --short HEAD:binary) &&
-	test_must_fail git merge main &&
-	echo resolvedQhooray | q_to_nul >binary &&
-	git commit -a -m resolved &&
-	res=$(git rev-parse --short HEAD:binary)
-
-[main (root-commit) 4aaee60] one
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 binary
-[main 37524dd] two
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Switched to a new branch 'branch-binary'
-[branch-binary f388a1d] three
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-warning: Cannot merge binary files: binary (HEAD vs. main)
-Auto-merging binary
-CONFLICT (content): Merge conflict in binary
-Automatic merge failed; fix conflicts and then commit the result.
-[branch-binary bc3cee3] resolved
- Author: A U Thor <author@example.com>
-ok 1 - setup binary merge conflict
-
-expecting success of 4048.2 'diff -m indicates binary-ness': 
-	git show --format=%s -m >actual &&
-	test_cmp expect actual
-
-ok 2 - diff -m indicates binary-ness
-
-expecting success of 4048.3 'diff -c indicates binary-ness': 
-	git show --format=%s -c >actual &&
-	test_cmp expect actual
-
-ok 3 - diff -c indicates binary-ness
-
-expecting success of 4048.4 'diff --cc indicates binary-ness': 
-	git show --format=%s --cc >actual &&
-	test_cmp expect actual
-
-ok 4 - diff --cc indicates binary-ness
-
-expecting success of 4048.5 'setup non-binary with binary attribute': 
-	git checkout main &&
-	test_commit one text &&
-	test_commit two text &&
-	two=$(git rev-parse --short HEAD:text) &&
-	git checkout -b branch-text HEAD^ &&
-	test_commit three text &&
-	three=$(git rev-parse --short HEAD:text) &&
-	test_must_fail git merge main &&
-	test_commit resolved text &&
-	res=$(git rev-parse --short HEAD:text) &&
-	echo text -diff >.gitattributes
-
-Switched to branch 'main'
-[main faa5b8e] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 text
-[main 84c76a1] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branch-text'
-[branch-text 9b74371] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging text
-CONFLICT (content): Merge conflict in text
-Automatic merge failed; fix conflicts and then commit the result.
-[branch-text c916fed] resolved
- Author: A U Thor <author@example.com>
-ok 5 - setup non-binary with binary attribute
-
-expecting success of 4048.6 'diff -m respects binary attribute': 
-	git show --format=%s -m >actual &&
-	test_cmp expect actual
-
-ok 6 - diff -m respects binary attribute
-
-expecting success of 4048.7 'diff -c respects binary attribute': 
-	git show --format=%s -c >actual &&
-	test_cmp expect actual
-
-ok 7 - diff -c respects binary attribute
-
-expecting success of 4048.8 'diff --cc respects binary attribute': 
-	git show --format=%s --cc >actual &&
-	test_cmp expect actual
-
-ok 8 - diff --cc respects binary attribute
-
-expecting success of 4048.9 'setup textconv attribute': 
-	echo "text diff=upcase" >.gitattributes &&
-	git config diff.upcase.textconv "tr a-z A-Z <"
-
-ok 9 - setup textconv attribute
-
-expecting success of 4048.10 'diff -m respects textconv attribute': 
-	git show --format=%s -m >actual &&
-	test_cmp expect actual
-
-ok 10 - diff -m respects textconv attribute
-
-expecting success of 4048.11 'diff -c respects textconv attribute': 
-	git show --format=%s -c >actual &&
-	test_cmp expect actual
-
-ok 11 - diff -c respects textconv attribute
-
-expecting success of 4048.12 'diff --cc respects textconv attribute': 
-	git show --format=%s --cc >actual &&
-	test_cmp expect actual
-
-ok 12 - diff --cc respects textconv attribute
-
-expecting success of 4048.13 'diff-tree plumbing does not respect textconv': 
-	git diff-tree HEAD -c -p >full &&
-	tail -n +2 full >actual &&
-	test_cmp expect actual
-
-ok 13 - diff-tree plumbing does not respect textconv
-
-expecting success of 4048.14 'diff --cc respects textconv on worktree file': 
-	git reset --hard HEAD^ &&
-	test_must_fail git merge main &&
-	git diff >actual &&
-	test_cmp expect actual
-
-HEAD is now at 9b74371 three
-Auto-merging text
-CONFLICT (content): Merge conflict in text
-Automatic merge failed; fix conflicts and then commit the result.
-ok 14 - diff --cc respects textconv on worktree file
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4041-diff-submodule-option.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4041-diff-submodule-option/.git/
-expecting success of 4041.1 'setup submodule': 
-	git init sm1 &&
-	add_file . foo &&
-	head1=$(add_file sm1 foo1 foo2) &&
-	fullhead1=$(cd sm1 && git rev-parse --verify HEAD)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4041-diff-submodule-option/sm1/.git/
-36d39d8
-ok 1 - setup submodule
-
-expecting success of 4041.2 'added submodule': 
-	git add sm1 &&
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 0000000...$head1 (new submodule)
-	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 2 - added submodule
-
-expecting success of 4041.3 'added submodule, set diff.submodule': 
-	git config diff.submodule log &&
-	git add sm1 &&
-	git diff --cached >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 0000000...$head1 (new submodule)
-	EOF
-	git config --unset diff.submodule &&
-	test_cmp expected actual
-
-ok 3 - added submodule, set diff.submodule
-
-expecting success of 4041.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
-	test_cmp expected actual
-
-ok 4 - --submodule=short overrides diff.submodule
-
-expecting success of 4041.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
-	test_cmp expected actual
-
-ok 5 - diff.submodule does not affect plumbing
-
-expecting success of 4041.6 'modified submodule(forward)': 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head1..$head2:
-	  > Add foo3 ($added foo3)
-	EOF
-	test_cmp expected actual
-
-ok 6 - modified submodule(forward)
-
-expecting success of 4041.7 'modified submodule(forward)': 
-	git diff --submodule=log >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head1..$head2:
-	  > Add foo3 ($added foo3)
-	EOF
-	test_cmp expected actual
-
-ok 7 - modified submodule(forward)
-
-expecting success of 4041.8 'modified submodule(forward) --submodule': 
-	git diff --submodule >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head1..$head2:
-	  > Add foo3 ($added foo3)
-	EOF
-	test_cmp expected actual
-
-ok 8 - modified submodule(forward) --submodule
-
-expecting success of 4041.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
-	test_cmp expected actual
-
-ok 9 - modified submodule(forward) --submodule=short
-
-expecting success of 4041.10 'modified submodule(backward)': 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head2..$head3 (rewind):
-	  < Add foo3 ($added foo3)
-	  < Add foo2 ($added foo2)
-	EOF
-	test_cmp expected actual
-
-ok 10 - modified submodule(backward)
-
-expecting success of 4041.11 'modified submodule(backward and forward)': 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head2...$head4:
-	  > Add foo5 ($added foo5)
-	  > Add foo4 ($added foo4)
-	  < Add foo3 ($added foo3)
-	  < Add foo2 ($added foo2)
-	EOF
-	test_cmp expected actual
-
-ok 11 - modified submodule(backward and forward)
-
-expecting success of 4041.12 'typechanged submodule(submodule->blob), --cached': 
-	git diff --submodule=log --cached >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head4...0000000 (submodule deleted)
-	diff --git a/sm1 b/sm1
-	new file mode 100644
-	index 0000000..$head5
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+sm1
-	EOF
-	test_cmp expected actual
-
-ok 12 - typechanged submodule(submodule->blob), --cached
-
-expecting success of 4041.13 'typechanged submodule(submodule->blob)': 
-	git diff --submodule=log >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	deleted file mode 100644
-	index $head5..0000000
-	--- a/sm1
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-sm1
-	Submodule sm1 0000000...$head4 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 13 - typechanged submodule(submodule->blob)
-
-expecting success of 4041.14 'typechanged submodule(submodule->blob)': 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head4...0000000 (submodule deleted)
-	diff --git a/sm1 b/sm1
-	new file mode 100644
-	index 0000000..$head5
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+sm1
-	EOF
-	test_cmp expected actual
-
-ok 14 - typechanged submodule(submodule->blob)
-
-expecting success of 4041.15 'setup submodule anew': 
-	rm -f sm1 &&
-	git init sm1 &&
-	head6=$(add_file sm1 foo6 foo7) &&
-	fullhead6=$(cd sm1 && git rev-parse --verify HEAD)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4041-diff-submodule-option/sm1/.git/
-ok 15 - setup submodule anew
-
-expecting success of 4041.16 'nonexistent commit': 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head4...$head6 (commits not present)
-	EOF
-	test_cmp expected actual
-
-ok 16 - nonexistent commit
-
-expecting success of 4041.17 'typechanged submodule(blob->submodule)': 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	deleted file mode 100644
-	index $head5..0000000
-	--- a/sm1
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-sm1
-	Submodule sm1 0000000...$head6 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 17 - typechanged submodule(blob->submodule)
-
-expecting success of 4041.18 'submodule is up to date': 
-	git diff-index -p --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 18 - submodule is up to date
-
-expecting success of 4041.19 'submodule contains untracked content': 
-	echo new > sm1/new-file &&
-	git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	EOF
-	test_cmp expected actual
-
-ok 19 - submodule contains untracked content
-
-expecting success of 4041.20 'submodule contains untracked content (untracked ignored)': 
-	git diff-index -p --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 20 - submodule contains untracked content (untracked ignored)
-
-expecting success of 4041.21 'submodule contains untracked content (dirty ignored)': 
-	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 21 - submodule contains untracked content (dirty ignored)
-
-expecting success of 4041.22 'submodule contains untracked content (all ignored)': 
-	git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 22 - submodule contains untracked content (all ignored)
-
-expecting success of 4041.23 'submodule contains untracked and modified content': 
-	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	Submodule sm1 contains modified content
-	EOF
-	test_cmp expected actual
-
-ok 23 - submodule contains untracked and modified content
-
-expecting success of 4041.24 'submodule contains untracked and modified content (untracked ignored)': 
-	echo new > sm1/foo6 &&
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	EOF
-	test_cmp expected actual
-
-ok 24 - submodule contains untracked and modified content (untracked ignored)
-
-expecting success of 4041.25 'submodule contains untracked and modified content (dirty ignored)': 
-	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 25 - submodule contains untracked and modified content (dirty ignored)
-
-expecting success of 4041.26 'submodule contains untracked and modified content (all ignored)': 
-	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 26 - submodule contains untracked and modified content (all ignored)
-
-expecting success of 4041.27 'submodule contains modified content': 
-	rm -f sm1/new-file &&
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	EOF
-	test_cmp expected actual
-
-ok 27 - submodule contains modified content
-
-expecting success of 4041.28 'submodule is modified': 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 28 - submodule is modified
-
-expecting success of 4041.29 'modified submodule contains untracked content': 
-	echo new > sm1/new-file &&
-	git diff-index -p  --ignore-submodules=none --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 29 - modified submodule contains untracked content
-
-expecting success of 4041.30 'modified submodule contains untracked content (untracked ignored)': 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 30 - modified submodule contains untracked content (untracked ignored)
-
-expecting success of 4041.31 'modified submodule contains untracked content (dirty ignored)': 
-	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 31 - modified submodule contains untracked content (dirty ignored)
-
-expecting success of 4041.32 'modified submodule contains untracked content (all ignored)': 
-	git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 32 - modified submodule contains untracked content (all ignored)
-
-expecting success of 4041.33 'modified submodule contains untracked and modified content': 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	Submodule sm1 contains modified content
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 33 - modified submodule contains untracked and modified content
-
-expecting success of 4041.34 'modified submodule contains untracked and modified content (untracked ignored)': 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 34 - modified submodule contains untracked and modified content (untracked ignored)
-
-expecting success of 4041.35 'modified submodule contains untracked and modified content (dirty ignored)': 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 35 - modified submodule contains untracked and modified content (dirty ignored)
-
-expecting success of 4041.36 'modified submodule contains untracked and modified content (all ignored)': 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 36 - modified submodule contains untracked and modified content (all ignored)
-
-expecting success of 4041.37 'modified submodule contains modified content': 
-	rm -f sm1/new-file &&
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 37 - modified submodule contains modified content
-
-expecting success of 4041.38 'deleted submodule': 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6...0000000 (submodule deleted)
-	EOF
-	test_cmp expected actual
-
-ok 38 - deleted submodule
-
-expecting success of 4041.39 '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.51.0/t/trash directory.t4041-diff-submodule-option/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 39 - create second submodule
-
-expecting success of 4041.40 'multiple submodules': 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head7 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 40 - multiple submodules
-
-expecting success of 4041.41 'path filter': 
-	git diff-index -p --submodule=log HEAD sm2 >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm2 0000000...$head7 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 41 - path filter
-
-expecting success of 4041.42 'given commit': 
-	git diff-index -p --submodule=log HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head7 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 42 - given commit
-
-expecting success of 4041.43 'given commit --submodule': 
-	git diff-index -p --submodule HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head7 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 43 - given commit --submodule
-
-expecting success of 4041.44 'given commit --submodule=short': 
-	git diff-index -p --submodule=short HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	deleted file mode 160000
-	index $head6..0000000
-	--- a/sm1
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-Subproject commit $fullhead6
-	diff --git a/sm2 b/sm2
-	new file mode 160000
-	index 0000000..$head7
-	--- /dev/null
-	+++ b/sm2
-	@@ -0,0 +1 @@
-	+Subproject commit $fullhead7
-	EOF
-	test_cmp expected actual
-
-ok 44 - given commit --submodule=short
-
-expecting success of 4041.45 'setup .git file for sm2': 
-	(cd sm2 &&
-	 REAL="$(pwd)/../.real" &&
-	 mv .git "$REAL" &&
-	 echo "gitdir: $REAL" >.git)
-
-ok 45 - setup .git file for sm2
-
-expecting success of 4041.46 'diff --submodule with .git file': 
-	git diff --submodule HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head7 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 46 - diff --submodule with .git file
-
-expecting success of 4041.47 'diff --submodule with objects referenced by alternates': 
-	mkdir sub_alt &&
-	(cd sub_alt &&
-		git init &&
-		echo a >a &&
-		git add a &&
-		git commit -m a
-	) &&
-	mkdir super &&
-	(cd super &&
-		git clone -s ../sub_alt sub &&
-		git init &&
-		git add sub &&
-		git commit -m "sub a"
-	) &&
-	(cd sub_alt &&
-		sha1_before=$(git rev-parse --short HEAD) &&
-		echo b >b &&
-		git add b &&
-		git commit -m b &&
-		sha1_after=$(git rev-parse --short HEAD) &&
-		{
-			echo "Submodule sub $sha1_before..$sha1_after:" &&
-			echo "  > b"
-		} >../expected
-	) &&
-	(cd super &&
-		(cd sub &&
-			git fetch &&
-			git checkout origin/main
-		) &&
-		git diff --submodule > ../actual
-	) &&
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4041-diff-submodule-option/sub_alt/.git/
-[main (root-commit) b7442a0] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-Cloning into 'sub'...
-done.
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4041-diff-submodule-option/super/.git/
-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) d9c5753] sub a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-[main 8e02ef5] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-From /build/reproducible-path/git-2.51.0/t/trash directory.t4041-diff-submodule-option/super/../sub_alt
-   b7442a0..8e02ef5  main       -> origin/main
-Note: switching to 'origin/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 8e02ef5 b
-ok 47 - diff --submodule with objects referenced by alternates
-
-# passed all 47 test(s)
-1..47
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4045-diff-relative.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4045-diff-relative/.git/
-expecting success of 4045.1 'setup': 
-	git commit --allow-empty -m empty &&
-	echo content >file1 &&
-	mkdir subdir &&
-	echo other content >subdir/file2 &&
-	blob_file1=$(git hash-object file1) &&
-	blob_file2=$(git hash-object subdir/file2) &&
-	git add . &&
-	git commit -m one
-
-[master (root-commit) f4030cd] empty
- Author: A U Thor <author@example.com>
-[master e528d0d] one
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 subdir/file2
-ok 1 - setup
-
-expecting success of 4045.2 '-p --relative=subdir/': 
-		git -C '.' diff -p --relative=subdir/ HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 2 - -p --relative=subdir/
-
-expecting success of 4045.3 '-p --relative=subdir': 
-		git -C '.' diff -p --relative=subdir HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 3 - -p --relative=subdir
-
-expecting success of 4045.4 '-p --relative': 
-		git -C 'subdir' diff -p --relative HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 4 - -p --relative
-
-expecting success of 4045.5 '-p --relative=sub': 
-		git -C '.' diff -p --relative=sub HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 5 - -p --relative=sub
-
-expecting success of 4045.6 '--numstat --relative=subdir/': 
-		echo '1	0	file2' >expected &&
-		git -C '.' diff --numstat --relative=subdir/ HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 6 - --numstat --relative=subdir/
-
-expecting success of 4045.7 '--numstat --relative=subdir': 
-		echo '1	0	file2' >expected &&
-		git -C '.' diff --numstat --relative=subdir HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 7 - --numstat --relative=subdir
-
-expecting success of 4045.8 '--numstat --relative': 
-		echo '1	0	file2' >expected &&
-		git -C 'subdir' diff --numstat --relative HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 8 - --numstat --relative
-
-expecting success of 4045.9 '--numstat --relative=sub': 
-		echo '1	0	dir/file2' >expected &&
-		git -C '.' diff --numstat --relative=sub HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 9 - --numstat --relative=sub
-
-expecting success of 4045.10 '--stat --relative=subdir/': 
-		git -C '.' diff --stat --relative=subdir/ HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 10 - --stat --relative=subdir/
-
-expecting success of 4045.11 '--stat --relative=subdir': 
-		git -C '.' diff --stat --relative=subdir HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 11 - --stat --relative=subdir
-
-expecting success of 4045.12 '--stat --relative': 
-		git -C 'subdir' diff --stat --relative HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 12 - --stat --relative
-
-expecting success of 4045.13 '--stat --relative=sub': 
-		git -C '.' diff --stat --relative=sub HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 13 - --stat --relative=sub
-
-expecting success of 4045.14 '--raw --relative=subdir/': 
-		git -C '.' diff --no-abbrev --raw --relative=subdir/ HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 14 - --raw --relative=subdir/
-
-expecting success of 4045.15 '--raw --relative=subdir': 
-		git -C '.' diff --no-abbrev --raw --relative=subdir HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 15 - --raw --relative=subdir
-
-expecting success of 4045.16 '--raw --relative': 
-		git -C 'subdir' diff --no-abbrev --raw --relative HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 16 - --raw --relative
-
-expecting success of 4045.17 '--raw --relative=sub': 
-		git -C '.' diff --no-abbrev --raw --relative=sub HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 17 - --raw --relative=sub
-
-expecting success of 4045.18 'config diff.relative false -p ': 
-		short_blob_file1=$(git rev-parse --short d95f3ad14dee633a758d2e331151e950dd13e4ed) &&
-		short_blob_file2=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file1 b/file1
-		new file mode 100644
-		index 0000000..$short_blob_file1
-		--- /dev/null
-		+++ b/file1
-		@@ -0,0 +1 @@
-		+content
-		diff --git a/subdir/file2 b/subdir/file2
-		new file mode 100644
-		index 0000000..$short_blob_file2
-		--- /dev/null
-		+++ b/subdir/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C . diff.relative false &&
-		git -C '.' diff -p  HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 18 - config diff.relative false -p 
-
-expecting success of 4045.19 'config diff.relative true -p --no-relative': 
-		short_blob_file1=$(git rev-parse --short d95f3ad14dee633a758d2e331151e950dd13e4ed) &&
-		short_blob_file2=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file1 b/file1
-		new file mode 100644
-		index 0000000..$short_blob_file1
-		--- /dev/null
-		+++ b/file1
-		@@ -0,0 +1 @@
-		+content
-		diff --git a/subdir/file2 b/subdir/file2
-		new file mode 100644
-		index 0000000..$short_blob_file2
-		--- /dev/null
-		+++ b/subdir/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C . diff.relative true &&
-		git -C '.' diff -p --no-relative HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 19 - config diff.relative true -p --no-relative
-
-expecting success of 4045.20 'config diff.relative false -p --no-relative': 
-		short_blob_file1=$(git rev-parse --short d95f3ad14dee633a758d2e331151e950dd13e4ed) &&
-		short_blob_file2=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file1 b/file1
-		new file mode 100644
-		index 0000000..$short_blob_file1
-		--- /dev/null
-		+++ b/file1
-		@@ -0,0 +1 @@
-		+content
-		diff --git a/subdir/file2 b/subdir/file2
-		new file mode 100644
-		index 0000000..$short_blob_file2
-		--- /dev/null
-		+++ b/subdir/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C . diff.relative false &&
-		git -C '.' diff -p --no-relative HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 20 - config diff.relative false -p --no-relative
-
-expecting success of 4045.21 'config diff.relative false -p ': 
-		short_blob_file1=$(git rev-parse --short d95f3ad14dee633a758d2e331151e950dd13e4ed) &&
-		short_blob_file2=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file1 b/file1
-		new file mode 100644
-		index 0000000..$short_blob_file1
-		--- /dev/null
-		+++ b/file1
-		@@ -0,0 +1 @@
-		+content
-		diff --git a/subdir/file2 b/subdir/file2
-		new file mode 100644
-		index 0000000..$short_blob_file2
-		--- /dev/null
-		+++ b/subdir/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C subdir diff.relative false &&
-		git -C 'subdir' diff -p  HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 21 - config diff.relative false -p 
-
-expecting success of 4045.22 'config diff.relative true -p --no-relative': 
-		short_blob_file1=$(git rev-parse --short d95f3ad14dee633a758d2e331151e950dd13e4ed) &&
-		short_blob_file2=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file1 b/file1
-		new file mode 100644
-		index 0000000..$short_blob_file1
-		--- /dev/null
-		+++ b/file1
-		@@ -0,0 +1 @@
-		+content
-		diff --git a/subdir/file2 b/subdir/file2
-		new file mode 100644
-		index 0000000..$short_blob_file2
-		--- /dev/null
-		+++ b/subdir/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C subdir diff.relative true &&
-		git -C 'subdir' diff -p --no-relative HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 22 - config diff.relative true -p --no-relative
-
-expecting success of 4045.23 'config diff.relative false -p --no-relative': 
-		short_blob_file1=$(git rev-parse --short d95f3ad14dee633a758d2e331151e950dd13e4ed) &&
-		short_blob_file2=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file1 b/file1
-		new file mode 100644
-		index 0000000..$short_blob_file1
-		--- /dev/null
-		+++ b/file1
-		@@ -0,0 +1 @@
-		+content
-		diff --git a/subdir/file2 b/subdir/file2
-		new file mode 100644
-		index 0000000..$short_blob_file2
-		--- /dev/null
-		+++ b/subdir/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C subdir diff.relative false &&
-		git -C 'subdir' diff -p --no-relative HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 23 - config diff.relative false -p --no-relative
-
-expecting success of 4045.24 'config diff.relative false -p --relative=subdir/': 
-		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file2 b/file2
-		new file mode 100644
-		index 0000000..$short_blob
-		--- /dev/null
-		+++ b/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C . diff.relative false &&
-		git -C '.' diff -p --relative=subdir/ HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 24 - config diff.relative false -p --relative=subdir/
-
-expecting success of 4045.25 'config diff.relative false -p --relative=subdir': 
-		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file2 b/file2
-		new file mode 100644
-		index 0000000..$short_blob
-		--- /dev/null
-		+++ b/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C . diff.relative false &&
-		git -C '.' diff -p --relative=subdir HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 25 - config diff.relative false -p --relative=subdir
-
-expecting success of 4045.26 'config diff.relative true -p --relative=subdir/': 
-		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file2 b/file2
-		new file mode 100644
-		index 0000000..$short_blob
-		--- /dev/null
-		+++ b/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C . diff.relative true &&
-		git -C '.' diff -p --relative=subdir/ HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 26 - config diff.relative true -p --relative=subdir/
-
-expecting success of 4045.27 'config diff.relative true -p --relative=subdir': 
-		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file2 b/file2
-		new file mode 100644
-		index 0000000..$short_blob
-		--- /dev/null
-		+++ b/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C . diff.relative true &&
-		git -C '.' diff -p --relative=subdir HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 27 - config diff.relative true -p --relative=subdir
-
-expecting success of 4045.28 'config diff.relative false -p --relative': 
-		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file2 b/file2
-		new file mode 100644
-		index 0000000..$short_blob
-		--- /dev/null
-		+++ b/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C subdir diff.relative false &&
-		git -C 'subdir' diff -p --relative HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 28 - config diff.relative false -p --relative
-
-expecting success of 4045.29 'config diff.relative true -p --relative': 
-		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file2 b/file2
-		new file mode 100644
-		index 0000000..$short_blob
-		--- /dev/null
-		+++ b/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C subdir diff.relative true &&
-		git -C 'subdir' diff -p --relative HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 29 - config diff.relative true -p --relative
-
-expecting success of 4045.30 'config diff.relative true -p ': 
-		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file2 b/file2
-		new file mode 100644
-		index 0000000..$short_blob
-		--- /dev/null
-		+++ b/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C subdir diff.relative true &&
-		git -C 'subdir' diff -p  HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 30 - config diff.relative true -p 
-
-expecting success of 4045.31 'config diff.relative false -p --no-relative --relative': 
-		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file2 b/file2
-		new file mode 100644
-		index 0000000..$short_blob
-		--- /dev/null
-		+++ b/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C subdir diff.relative false &&
-		git -C 'subdir' diff -p --no-relative --relative HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 31 - config diff.relative false -p --no-relative --relative
-
-expecting success of 4045.32 'config diff.relative true -p --no-relative --relative': 
-		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file2 b/file2
-		new file mode 100644
-		index 0000000..$short_blob
-		--- /dev/null
-		+++ b/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C subdir diff.relative true &&
-		git -C 'subdir' diff -p --no-relative --relative HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 32 - config diff.relative true -p --no-relative --relative
-
-expecting success of 4045.33 'config diff.relative false -p --no-relative --relative=subdir': 
-		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file2 b/file2
-		new file mode 100644
-		index 0000000..$short_blob
-		--- /dev/null
-		+++ b/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C . diff.relative false &&
-		git -C '.' diff -p --no-relative --relative=subdir HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 33 - config diff.relative false -p --no-relative --relative=subdir
-
-expecting success of 4045.34 'config diff.relative true -p --no-relative --relative=subdir': 
-		short_blob=$(git rev-parse --short 25c05ef3639d2d270e7fe765a67668f098092bc5) &&
-		cat >expected <<-EOF &&
-		diff --git a/file2 b/file2
-		new file mode 100644
-		index 0000000..$short_blob
-		--- /dev/null
-		+++ b/file2
-		@@ -0,0 +1 @@
-		+other content
-		EOF
-		test_config -C . diff.relative true &&
-		git -C '.' diff -p --no-relative --relative=subdir HEAD^ >actual &&
-		test_cmp expected actual
-	
-ok 34 - config diff.relative true -p --no-relative --relative=subdir
-
-expecting success of 4045.35 'external diff with --relative': 
-	test_when_finished "git reset --hard" &&
-	echo changed >file1 &&
-	echo changed >subdir/file2 &&
-
-	write_script mydiff <<-\EOF &&
-	# hacky pretend diff; the goal here is just to make sure we got
-	# passed sensible input that we _could_ diff, without relying on
-	# the specific output of a system diff tool.
-	echo "diff a/$1 b/$1" &&
-	echo "--- a/$1" &&
-	echo "+++ b/$1" &&
-	echo "@@ -1 +0,0 @@" &&
-	sed "s/^/-/" "$2" &&
-	sed "s/^/+/" "$5"
-	EOF
-
-	cat >expect <<-\EOF &&
-	diff a/file2 b/file2
-	--- a/file2
-	+++ b/file2
-	@@ -1 +0,0 @@
-	-other content
-	+changed
-	EOF
-	GIT_EXTERNAL_DIFF=./mydiff git diff --relative=subdir >actual &&
-	test_cmp expect actual
-
-HEAD is now at e528d0d one
-ok 35 - external diff with --relative
-
-expecting success of 4045.36 'setup diff --relative unmerged': 
-	test_commit zero file0 &&
-	test_commit base subdir/file0 &&
-	git switch -c br1 &&
-	test_commit one file0 &&
-	test_commit sub1 subdir/file0 &&
-	git switch -c br2 base &&
-	test_commit two file0 &&
-	git switch -c br3 &&
-	test_commit sub3 subdir/file0
-
-[master 8079767] zero
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file0
-[master 32ab62b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/file0
-Switched to a new branch 'br1'
-[br1 02602ea] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[br1 7cf214c] sub1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'br2'
-[br2 a52bcea] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'br3'
-[br3 b0bcae9] sub3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 36 - setup diff --relative unmerged
-
-expecting success of 4045.37 'diff --relative without change in subdir': 
-	git switch br2 &&
-	test_when_finished "git merge --abort" &&
-	test_must_fail git merge one &&
-	git -C subdir diff --relative >out &&
-	test_must_be_empty out &&
-	git -C subdir diff --relative --name-only >out &&
-	test_must_be_empty out
-
-Switched to branch 'br2'
-Auto-merging file0
-CONFLICT (content): Merge conflict in file0
-Automatic merge failed; fix conflicts and then commit the result.
-ok 37 - diff --relative without change in subdir
-
-expecting success of 4045.38 'diff --relative --name-only with change in subdir': 
-	git switch br3 &&
-	test_when_finished "git merge --abort" &&
-	test_must_fail git merge sub1 &&
-	test_write_lines file0 file0 >expected &&
-	git -C subdir diff --relative --name-only >out &&
-	test_cmp expected out
-
-Switched to branch 'br3'
-Auto-merging file0
-CONFLICT (content): Merge conflict in file0
-Auto-merging subdir/file0
-CONFLICT (content): Merge conflict in subdir/file0
-Automatic merge failed; fix conflicts and then commit the result.
-ok 38 - diff --relative --name-only with change in subdir
-
-checking known breakage of 4045.39 'diff --relative with change in subdir': 
-	git switch br3 &&
-	br1_blob=$(git rev-parse --short --verify br1:subdir/file0) &&
-	br3_blob=$(git rev-parse --short --verify br3:subdir/file0) &&
-	test_when_finished "git merge --abort" &&
-	test_must_fail git merge br1 &&
-	cat >expected <<-EOF &&
-	diff --cc file0
-	index $br3_blob,$br1_blob..0000000
-	--- a/file0
-	+++ b/file0
-	@@@ -1,1 -1,1 +1,5 @@@
-	++<<<<<<< HEAD
-	 +sub3
-	++=======
-	+ sub1
-	++>>>>>>> br1
-	EOF
-	git -C subdir diff --relative >out &&
-	test_cmp expected out
-
-Already on 'br3'
-Auto-merging file0
-CONFLICT (content): Merge conflict in file0
-Auto-merging subdir/file0
-CONFLICT (content): Merge conflict in subdir/file0
-Automatic merge failed; fix conflicts and then commit the result.
---- expected	2025-08-27 08:21:12.631748731 +0000
-+++ out	2025-08-27 08:21:12.635748757 +0000
-@@ -1,7 +1,7 @@
--diff --cc file0
-+diff --cc subdir/file0
- index b8c2280,48df0cb..0000000
----- a/file0
--+++ b/file0
-+--- a/subdir/file0
-++++ b/subdir/file0
- @@@ -1,1 -1,1 +1,5 @@@
- ++<<<<<<< HEAD
-  +sub3
-not ok 39 - diff --relative with change in subdir # TODO known breakage
-
-# still have 1 known breakage(s)
-# passed all remaining 38 test(s)
-1..39
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4050-diff-histogram.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4050-diff-histogram/.git/
-expecting success of 4050.1 'setup attributes files for tests with histogram': 
-		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 1 - setup attributes files for tests with histogram
-
-expecting success of 4050.2 'histogram diff from attributes': 
-		test_must_fail git -c diff.driver.algorithm=$STRATEGY diff --no-index file1 file2 > output &&
-		test_cmp expect output
-	
-ok 2 - histogram diff from attributes
-
-expecting success of 4050.3 '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 3 - diff from attributes with bare repo with source
-
-expecting success of 4050.4 '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 4 - diff from attributes with bare repo with invalid source
-
-expecting success of 4050.5 'histogram 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 5 - histogram diff from attributes has valid diffstat
-
-expecting success of 4050.6 'histogram diff': 
-		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
-		test_cmp expect output
-	
-ok 6 - histogram diff
-
-expecting success of 4050.7 'histogram 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 7 - histogram diff command line precedence before attributes
-
-expecting success of 4050.8 'histogram 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 8 - histogram diff attributes precedence before config
-
-expecting success of 4050.9 'histogram diff output is valid': 
-		mv file2 expect &&
-		git apply < output &&
-		test_cmp expect file2
-	
-ok 9 - histogram diff output is valid
-
-expecting success of 4050.10 'completely different files': 
-		test_must_fail git diff --no-index "--$STRATEGY" uniq1 uniq2 > output &&
-		test_cmp expect output
-	
-ok 10 - completely different files
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t3903-stash.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t3903-stash/.git/
 expecting success of 3903.1 'setup': 
@@ -248778,108 +249714,6 @@
 1..137
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4054-diff-bogus-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4054-diff-bogus-tree/.git/
-expecting success of 4054.1 'create bogus tree': 
-	name=$(echo $ZERO_OID | sed -e "s/00/Q/g") &&
-	bogus_tree=$(
-		printf "100644 fooQ$name" |
-		q_to_nul |
-		git hash-object --literally -w --stdin -t tree
-	)
-
-ok 1 - create bogus tree
-
-expecting success of 4054.2 'create tree with matching file': 
-	echo bar >foo &&
-	git add foo &&
-	good_tree=$(git write-tree) &&
-	blob=$(git rev-parse :foo)
-
-ok 2 - create tree with matching file
-
-expecting success of 4054.3 'raw diff shows null sha1 (addition)': 
-	echo ":000000 100644 $ZERO_OID $ZERO_OID A	foo" >expect &&
-	git diff-tree $EMPTY_TREE $bogus_tree >actual &&
-	test_cmp expect actual
-
-ok 3 - raw diff shows null sha1 (addition)
-
-expecting success of 4054.4 'raw diff shows null sha1 (removal)': 
-	echo ":100644 000000 $ZERO_OID $ZERO_OID D	foo" >expect &&
-	git diff-tree $bogus_tree $EMPTY_TREE >actual &&
-	test_cmp expect actual
-
-ok 4 - raw diff shows null sha1 (removal)
-
-expecting success of 4054.5 'raw diff shows null sha1 (modification)': 
-	echo ":100644 100644 $blob $ZERO_OID M	foo" >expect &&
-	git diff-tree $good_tree $bogus_tree >actual &&
-	test_cmp expect actual
-
-ok 5 - raw diff shows null sha1 (modification)
-
-expecting success of 4054.6 'raw diff shows null sha1 (other direction)': 
-	echo ":100644 100644 $ZERO_OID $blob M	foo" >expect &&
-	git diff-tree $bogus_tree $good_tree >actual &&
-	test_cmp expect actual
-
-ok 6 - raw diff shows null sha1 (other direction)
-
-expecting success of 4054.7 'raw diff shows null sha1 (reverse)': 
-	echo ":100644 100644 $ZERO_OID $blob M	foo" >expect &&
-	git diff-tree -R $good_tree $bogus_tree >actual &&
-	test_cmp expect actual
-
-ok 7 - raw diff shows null sha1 (reverse)
-
-expecting success of 4054.8 'raw diff shows null sha1 (index)': 
-	echo ":100644 100644 $ZERO_OID $blob M	foo" >expect &&
-	git diff-index $bogus_tree >actual &&
-	test_cmp expect actual
-
-ok 8 - raw diff shows null sha1 (index)
-
-expecting success of 4054.9 'patch fails due to bogus sha1 (addition)': 
-	test_must_fail git diff-tree -p $EMPTY_TREE $bogus_tree
-
-fatal: unable to read 0000000000000000000000000000000000000000
-ok 9 - patch fails due to bogus sha1 (addition)
-
-expecting success of 4054.10 'patch fails due to bogus sha1 (removal)': 
-	test_must_fail git diff-tree -p $bogus_tree $EMPTY_TREE
-
-fatal: unable to read 0000000000000000000000000000000000000000
-ok 10 - patch fails due to bogus sha1 (removal)
-
-expecting success of 4054.11 'patch fails due to bogus sha1 (modification)': 
-	test_must_fail git diff-tree -p $good_tree $bogus_tree
-
-fatal: unable to read 0000000000000000000000000000000000000000
-ok 11 - patch fails due to bogus sha1 (modification)
-
-expecting success of 4054.12 'patch fails due to bogus sha1 (other direction)': 
-	test_must_fail git diff-tree -p $bogus_tree $good_tree
-
-fatal: unable to read 0000000000000000000000000000000000000000
-ok 12 - patch fails due to bogus sha1 (other direction)
-
-expecting success of 4054.13 'patch fails due to bogus sha1 (reverse)': 
-	test_must_fail git diff-tree -R -p $good_tree $bogus_tree
-
-fatal: unable to read 0000000000000000000000000000000000000000
-ok 13 - patch fails due to bogus sha1 (reverse)
-
-expecting success of 4054.14 'patch fails due to bogus sha1 (index)': 
-	test_must_fail git diff-index -p $bogus_tree
-
-fatal: unable to read 0000000000000000000000000000000000000000
-ok 14 - patch fails due to bogus sha1 (index)
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4034-diff-words.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4034-diff-words/.git/
 expecting success of 4034.1 'setup': 
@@ -250010,8 +250844,8 @@
 [detached HEAD 22de592] empty3
  Author: A U Thor <author@example.com>
  1 file changed, 5 insertions(+)
---- .tmp-1	2025-08-27 08:21:12.471747676 +0000
-+++ .tmp-2	2025-08-27 08:21:12.471747676 +0000
+--- .tmp-1	2026-09-29 14:52:31.554548970 +0000
++++ .tmp-2	2026-09-29 14:52:31.558548970 +0000
 @@ -1,8 +1,9 @@
  -- 3
  ---1
@@ -250322,132 +251156,6 @@
 1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4055-diff-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
-	test_grep ! "^ d" output &&
-	test_grep "^ e" output &&
-	test_grep "^ j" output &&
-	test_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 &&
-	test_grep ! firstline output &&
-	test_config diff.context 8 &&
-	git log -1 -p >output &&
-	test_grep "^ firstline" output
-
- firstline
-ok 3 - diff.context honored by "log"
-
-expecting success of 4055.4 'The -U option overrides diff.context': 
-	test_config diff.context 8 &&
-	git log -U4 -1 >output &&
-	test_grep ! "^ firstline" output
-
-ok 4 - The -U option overrides diff.context
-
-expecting success of 4055.5 'diff.context honored by "diff"': 
-	test_config diff.context 8 &&
-	git diff >output &&
-	test_grep "^ firstline" output
-
- firstline
-ok 5 - diff.context honored by "diff"
-
-expecting success of 4055.6 'plumbing not affected': 
-	test_config diff.context 8 &&
-	git diff-files -p >output &&
-	test_grep ! "^ firstline" output
-
-ok 6 - plumbing not affected
-
-expecting success of 4055.7 'non-integer config parsing': 
-	test_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': 
-	test_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': 
-	test_config diff.context 0 &&
-	git diff >output &&
-	test_grep "^-ADDED" output &&
-	test_grep "^+MODIFIED" output
-
--ADDED
-+MODIFIED
-ok 9 - -U0 is valid, so is diff.context=0
-
-expecting success of 4055.10 '-U2147483647 works': 
-	echo APPENDED >>x &&
-	test_line_count = 16 x &&
-	git diff -U2147483647 >output &&
-	test_line_count = 22 output &&
-	test_grep "^-ADDED" output &&
-	test_grep "^+MODIFIED" output &&
-	test_grep "^+APPENDED" output
-
--ADDED
-+MODIFIED
-+APPENDED
-ok 10 - -U2147483647 works
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4047-diff-dirstat.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4047-diff-dirstat/.git/
 expecting success of 4047.1 'setup': 
@@ -250755,391 +251463,984 @@
 	git diff -X -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
 	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-ok 5 - vanilla -X
+ok 5 - vanilla -X
+
+expecting success of 4047.6 'explicit defaults: --dirstat=changes,noncumulative,3': 
+	git diff --dirstat=changes,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 6 - explicit defaults: --dirstat=changes,noncumulative,3
+
+expecting success of 4047.7 'explicit defaults: -Xchanges,noncumulative,3': 
+	git diff -Xchanges,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff -Xchanges,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff -Xchanges,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 7 - explicit defaults: -Xchanges,noncumulative,3
+
+expecting success of 4047.8 'later options override earlier options:': 
+	git diff --dirstat=files,10,cumulative,changes,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,10,cumulative,changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,10,cumulative,changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC &&
+	git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 8 - later options override earlier options:
+
+expecting success of 4047.9 'non-defaults in config overridden by explicit defaults on command line': 
+	git -c diff.dirstat=files,cumulative,50 diff --dirstat=changes,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=files,cumulative,50 diff --dirstat=changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=files,cumulative,50 diff --dirstat=changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 9 - non-defaults in config overridden by explicit defaults on command line
+
+expecting success of 4047.10 '--dirstat=0': 
+	git diff --dirstat=0 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=0 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=0 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 10 - --dirstat=0
+
+expecting success of 4047.11 '-X0': 
+	git diff -X0 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff -X0 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff -X0 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 11 - -X0
+
+expecting success of 4047.12 'diff.dirstat=0': 
+	git -c diff.dirstat=0 diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=0 diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=0 diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 12 - diff.dirstat=0
+
+expecting success of 4047.13 '--dirstat=0 --cumulative': 
+	git diff --dirstat=0 --cumulative HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=0 --cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=0 --cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 13 - --dirstat=0 --cumulative
+
+expecting success of 4047.14 '--dirstat=0,cumulative': 
+	git diff --dirstat=0,cumulative HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=0,cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=0,cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 14 - --dirstat=0,cumulative
+
+expecting success of 4047.15 '-X0,cumulative': 
+	git diff -X0,cumulative HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff -X0,cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff -X0,cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 15 - -X0,cumulative
+
+expecting success of 4047.16 'diff.dirstat=0,cumulative': 
+	git -c diff.dirstat=0,cumulative diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=0,cumulative diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=0,cumulative diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 16 - diff.dirstat=0,cumulative
+
+expecting success of 4047.17 'diff.dirstat=0 & --dirstat=cumulative': 
+	git -c diff.dirstat=0 diff --dirstat=cumulative HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=0 diff --dirstat=cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=0 diff --dirstat=cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 17 - diff.dirstat=0 & --dirstat=cumulative
+
+expecting success of 4047.18 '--dirstat-by-file': 
+	git diff --dirstat-by-file HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat-by-file -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat-by-file -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 18 - --dirstat-by-file
+
+expecting success of 4047.19 '--dirstat=files': 
+	git diff --dirstat=files HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 19 - --dirstat=files
+
+expecting success of 4047.20 'diff.dirstat=files': 
+	git -c diff.dirstat=files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 20 - diff.dirstat=files
+
+expecting success of 4047.21 '--dirstat-by-file=10': 
+	git diff --dirstat-by-file=10 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat-by-file=10 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat-by-file=10 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 21 - --dirstat-by-file=10
+
+expecting success of 4047.22 '--dirstat=files,10': 
+	git diff --dirstat=files,10 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,10 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,10 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 22 - --dirstat=files,10
+
+expecting success of 4047.23 'diff.dirstat=10,files': 
+	git -c diff.dirstat=10,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=10,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=10,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 23 - diff.dirstat=10,files
+
+expecting success of 4047.24 '--dirstat-by-file --cumulative': 
+	git diff --dirstat-by-file --cumulative HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat-by-file --cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat-by-file --cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 24 - --dirstat-by-file --cumulative
+
+expecting success of 4047.25 '--dirstat=files,cumulative': 
+	git diff --dirstat=files,cumulative HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 25 - --dirstat=files,cumulative
+
+expecting success of 4047.26 'diff.dirstat=cumulative,files': 
+	git -c diff.dirstat=cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 26 - diff.dirstat=cumulative,files
+
+expecting success of 4047.27 '--dirstat=files,cumulative,10': 
+	git diff --dirstat=files,cumulative,10 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,cumulative,10 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,cumulative,10 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 27 - --dirstat=files,cumulative,10
+
+expecting success of 4047.28 'diff.dirstat=10,cumulative,files': 
+	git -c diff.dirstat=10,cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=10,cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=10,cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 28 - diff.dirstat=10,cumulative,files
+
+expecting success of 4047.29 '--dirstat=files,cumulative,16.7': 
+	git diff --dirstat=files,cumulative,16.7 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,cumulative,16.7 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,cumulative,16.7 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 29 - --dirstat=files,cumulative,16.7
+
+expecting success of 4047.30 'diff.dirstat=16.7,cumulative,files': 
+	git -c diff.dirstat=16.7,cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=16.7,cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=16.7,cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 30 - diff.dirstat=16.7,cumulative,files
+
+expecting success of 4047.31 'diff.dirstat=16.70,cumulative,files': 
+	git -c diff.dirstat=16.70,cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=16.70,cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=16.70,cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 31 - diff.dirstat=16.70,cumulative,files
+
+expecting success of 4047.32 '--dirstat=files,cumulative,27.2': 
+	git diff --dirstat=files,cumulative,27.2 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,cumulative,27.2 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,cumulative,27.2 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 32 - --dirstat=files,cumulative,27.2
+
+expecting success of 4047.33 '--dirstat=files,cumulative,27.09': 
+	git diff --dirstat=files,cumulative,27.09 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,cumulative,27.09 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,cumulative,27.09 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 33 - --dirstat=files,cumulative,27.09
+
+expecting success of 4047.34 '--dirstat=lines': 
+	git diff --dirstat=lines HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=lines -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=lines -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 34 - --dirstat=lines
+
+expecting success of 4047.35 'diff.dirstat=lines': 
+	git -c diff.dirstat=lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 35 - diff.dirstat=lines
+
+expecting success of 4047.36 '--dirstat=lines,0': 
+	git diff --dirstat=lines,0 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=lines,0 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=lines,0 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 36 - --dirstat=lines,0
+
+expecting success of 4047.37 'diff.dirstat=0,lines': 
+	git -c diff.dirstat=0,lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=0,lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=0,lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+
+ok 37 - diff.dirstat=0,lines
+
+expecting success of 4047.38 '--dirstat=future_param,lines,0 should fail loudly': 
+	test_must_fail git diff --dirstat=future_param,lines,0 HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
+	test_debug "cat actual_error" &&
+	test_must_be_empty actual_diff_dirstat &&
+	test_grep -q "future_param" actual_error &&
+	test_grep -q "\--dirstat" actual_error
+
+ok 38 - --dirstat=future_param,lines,0 should fail loudly
+
+expecting success of 4047.39 '--dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters': 
+	test_must_fail git diff --dirstat=dummy1,cumulative,2dummy HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
+	test_debug "cat actual_error" &&
+	test_must_be_empty actual_diff_dirstat &&
+	test_grep -q "dummy1" actual_error &&
+	test_grep -q "2dummy" actual_error &&
+	test_grep -q "\--dirstat" actual_error
+
+ok 39 - --dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters
+
+expecting success of 4047.40 'diff.dirstat=future_param,0,lines should warn, but still work': 
+	git -c diff.dirstat=future_param,0,lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
+	test_debug "cat actual_error" &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	test_grep -q "future_param" actual_error &&
+	test_grep -q "diff\\.dirstat" actual_error &&
+
+	git -c diff.dirstat=future_param,0,lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M 2>actual_error &&
+	test_debug "cat actual_error" &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	test_grep -q "future_param" actual_error &&
+	test_grep -q "diff\\.dirstat" actual_error &&
+
+	git -c diff.dirstat=future_param,0,lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC 2>actual_error &&
+	test_debug "cat actual_error" &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC &&
+	test_grep -q "future_param" actual_error &&
+	test_grep -q "diff\\.dirstat" actual_error
+
+ok 40 - diff.dirstat=future_param,0,lines should warn, but still work
+
+expecting success of 4047.41 '--shortstat --dirstat should output only one dirstat': 
+	git diff --shortstat --dirstat=changes HEAD^..HEAD >out &&
+	grep " dst/copy/changed/$" out >actual_diff_shortstat_dirstat_changes &&
+	test_line_count = 1 actual_diff_shortstat_dirstat_changes &&
+
+	git diff --shortstat --dirstat=lines HEAD^..HEAD >out &&
+	grep " dst/copy/changed/$" out >actual_diff_shortstat_dirstat_lines &&
+	test_line_count = 1 actual_diff_shortstat_dirstat_lines &&
+
+	git diff --shortstat --dirstat=files HEAD^..HEAD >out &&
+	grep " dst/copy/changed/$" out >actual_diff_shortstat_dirstat_files &&
+	test_line_count = 1 actual_diff_shortstat_dirstat_files
+
+ok 41 - --shortstat --dirstat should output only one dirstat
+
+# passed all 41 test(s)
+1..41
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4054-diff-bogus-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4054-diff-bogus-tree/.git/
+expecting success of 4054.1 'create bogus tree': 
+	name=$(echo $ZERO_OID | sed -e "s/00/Q/g") &&
+	bogus_tree=$(
+		printf "100644 fooQ$name" |
+		q_to_nul |
+		git hash-object --literally -w --stdin -t tree
+	)
+
+ok 1 - create bogus tree
+
+expecting success of 4054.2 'create tree with matching file': 
+	echo bar >foo &&
+	git add foo &&
+	good_tree=$(git write-tree) &&
+	blob=$(git rev-parse :foo)
+
+ok 2 - create tree with matching file
+
+expecting success of 4054.3 'raw diff shows null sha1 (addition)': 
+	echo ":000000 100644 $ZERO_OID $ZERO_OID A	foo" >expect &&
+	git diff-tree $EMPTY_TREE $bogus_tree >actual &&
+	test_cmp expect actual
+
+ok 3 - raw diff shows null sha1 (addition)
+
+expecting success of 4054.4 'raw diff shows null sha1 (removal)': 
+	echo ":100644 000000 $ZERO_OID $ZERO_OID D	foo" >expect &&
+	git diff-tree $bogus_tree $EMPTY_TREE >actual &&
+	test_cmp expect actual
+
+ok 4 - raw diff shows null sha1 (removal)
+
+expecting success of 4054.5 'raw diff shows null sha1 (modification)': 
+	echo ":100644 100644 $blob $ZERO_OID M	foo" >expect &&
+	git diff-tree $good_tree $bogus_tree >actual &&
+	test_cmp expect actual
+
+ok 5 - raw diff shows null sha1 (modification)
+
+expecting success of 4054.6 'raw diff shows null sha1 (other direction)': 
+	echo ":100644 100644 $ZERO_OID $blob M	foo" >expect &&
+	git diff-tree $bogus_tree $good_tree >actual &&
+	test_cmp expect actual
+
+ok 6 - raw diff shows null sha1 (other direction)
+
+expecting success of 4054.7 'raw diff shows null sha1 (reverse)': 
+	echo ":100644 100644 $ZERO_OID $blob M	foo" >expect &&
+	git diff-tree -R $good_tree $bogus_tree >actual &&
+	test_cmp expect actual
+
+ok 7 - raw diff shows null sha1 (reverse)
+
+expecting success of 4054.8 'raw diff shows null sha1 (index)': 
+	echo ":100644 100644 $ZERO_OID $blob M	foo" >expect &&
+	git diff-index $bogus_tree >actual &&
+	test_cmp expect actual
+
+ok 8 - raw diff shows null sha1 (index)
+
+expecting success of 4054.9 'patch fails due to bogus sha1 (addition)': 
+	test_must_fail git diff-tree -p $EMPTY_TREE $bogus_tree
+
+fatal: unable to read 0000000000000000000000000000000000000000
+ok 9 - patch fails due to bogus sha1 (addition)
+
+expecting success of 4054.10 'patch fails due to bogus sha1 (removal)': 
+	test_must_fail git diff-tree -p $bogus_tree $EMPTY_TREE
+
+fatal: unable to read 0000000000000000000000000000000000000000
+ok 10 - patch fails due to bogus sha1 (removal)
+
+expecting success of 4054.11 'patch fails due to bogus sha1 (modification)': 
+	test_must_fail git diff-tree -p $good_tree $bogus_tree
+
+fatal: unable to read 0000000000000000000000000000000000000000
+ok 11 - patch fails due to bogus sha1 (modification)
+
+expecting success of 4054.12 'patch fails due to bogus sha1 (other direction)': 
+	test_must_fail git diff-tree -p $bogus_tree $good_tree
+
+fatal: unable to read 0000000000000000000000000000000000000000
+ok 12 - patch fails due to bogus sha1 (other direction)
+
+expecting success of 4054.13 'patch fails due to bogus sha1 (reverse)': 
+	test_must_fail git diff-tree -R -p $good_tree $bogus_tree
+
+fatal: unable to read 0000000000000000000000000000000000000000
+ok 13 - patch fails due to bogus sha1 (reverse)
+
+expecting success of 4054.14 'patch fails due to bogus sha1 (index)': 
+	test_must_fail git diff-index -p $bogus_tree
+
+fatal: unable to read 0000000000000000000000000000000000000000
+ok 14 - patch fails due to bogus sha1 (index)
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4055-diff-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
+	test_grep ! "^ d" output &&
+	test_grep "^ e" output &&
+	test_grep "^ j" output &&
+	test_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 &&
+	test_grep ! firstline output &&
+	test_config diff.context 8 &&
+	git log -1 -p >output &&
+	test_grep "^ firstline" output
+
+ firstline
+ok 3 - diff.context honored by "log"
+
+expecting success of 4055.4 'The -U option overrides diff.context': 
+	test_config diff.context 8 &&
+	git log -U4 -1 >output &&
+	test_grep ! "^ firstline" output
+
+ok 4 - The -U option overrides diff.context
+
+expecting success of 4055.5 'diff.context honored by "diff"': 
+	test_config diff.context 8 &&
+	git diff >output &&
+	test_grep "^ firstline" output
+
+ firstline
+ok 5 - diff.context honored by "diff"
+
+expecting success of 4055.6 'plumbing not affected': 
+	test_config diff.context 8 &&
+	git diff-files -p >output &&
+	test_grep ! "^ firstline" output
+
+ok 6 - plumbing not affected
+
+expecting success of 4055.7 'non-integer config parsing': 
+	test_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': 
+	test_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': 
+	test_config diff.context 0 &&
+	git diff >output &&
+	test_grep "^-ADDED" output &&
+	test_grep "^+MODIFIED" output
+
+-ADDED
++MODIFIED
+ok 9 - -U0 is valid, so is diff.context=0
+
+expecting success of 4055.10 '-U2147483647 works': 
+	echo APPENDED >>x &&
+	test_line_count = 16 x &&
+	git diff -U2147483647 >output &&
+	test_line_count = 22 output &&
+	test_grep "^-ADDED" output &&
+	test_grep "^+MODIFIED" output &&
+	test_grep "^+APPENDED" output
+
+-ADDED
++MODIFIED
++APPENDED
+ok 10 - -U2147483647 works
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4051-diff-function-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4051-diff-function-context/.git/
+expecting success of 4051.1 'setup': 
+	cat "$dir/includes.c" "$dir/dummy.c" "$dir/dummy.c" "$dir/hello.c" \
+		"$dir/dummy.c" "$dir/dummy.c" >file.c &&
+	commit_and_tag initial file.c &&
+
+	grep -v "delete me from hello" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	commit_and_tag changed_hello file.c &&
+
+	grep -v "delete me from includes" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	commit_and_tag changed_includes file.c &&
+
+	cat "$dir/appended1.c" >>file.c &&
+	commit_and_tag appended file.c &&
+
+	cat "$dir/appended2.c" >>file.c &&
+	commit_and_tag extended file.c &&
+
+	grep -v "Begin of second part" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	commit_and_tag long_common_tail file.c &&
+
+	git checkout initial &&
+	cat "$dir/hello.c" "$dir/dummy.c" >file.c &&
+	commit_and_tag hello_dummy file.c &&
 
-expecting success of 4047.6 'explicit defaults: --dirstat=changes,noncumulative,3': 
-	git diff --dirstat=changes,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+	# overlap function context of 1st change and -u context of 2nd change
+	grep -v "delete me from hello" <"$dir/hello.c" >file.c &&
+	sed "2a\\
+	     extra line" <"$dir/dummy.c" >>file.c &&
+	commit_and_tag changed_hello_dummy file.c &&
 
-ok 6 - explicit defaults: --dirstat=changes,noncumulative,3
+	git checkout initial &&
+	grep -v "delete me from hello" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	cat "$dir/appended1.c" >>file.c &&
+	commit_and_tag changed_hello_appended file.c
 
-expecting success of 4047.7 'explicit defaults: -Xchanges,noncumulative,3': 
-	git diff -Xchanges,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff -Xchanges,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff -Xchanges,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+[master (root-commit) 9f6e181] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 72 insertions(+)
+ create mode 100644 file.c
+[master 5e132d0] changed_hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+[master 964b054] changed_includes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+[master d0cff11] appended
+ Author: A U Thor <author@example.com>
+ 1 file changed, 15 insertions(+)
+[master d16114c] extended
+ Author: A U Thor <author@example.com>
+ 1 file changed, 35 insertions(+)
+[master fa474ba] long_common_tail
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+Note: switching to 'initial'.
 
-ok 7 - explicit defaults: -Xchanges,noncumulative,3
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 4047.8 'later options override earlier options:': 
-	git diff --dirstat=files,10,cumulative,changes,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,10,cumulative,changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,10,cumulative,changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC &&
-	git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+If you want to 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 8 - later options override earlier options:
+  git switch -c <new-branch-name>
 
-expecting success of 4047.9 'non-defaults in config overridden by explicit defaults on command line': 
-	git -c diff.dirstat=files,cumulative,50 diff --dirstat=changes,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=files,cumulative,50 diff --dirstat=changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=files,cumulative,50 diff --dirstat=changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+Or undo this operation with:
 
-ok 9 - non-defaults in config overridden by explicit defaults on command line
+  git switch -
 
-expecting success of 4047.10 '--dirstat=0': 
-	git diff --dirstat=0 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=0 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=0 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 10 - --dirstat=0
+HEAD is now at 9f6e181 initial
+[detached HEAD cf16009] hello_dummy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 41 deletions(-)
+[detached HEAD d307f65] changed_hello_dummy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Previous HEAD position was d307f65 changed_hello_dummy
+HEAD is now at 9f6e181 initial
+[detached HEAD aca4ec7] changed_hello_appended
+ Author: A U Thor <author@example.com>
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+ok 1 - setup
 
-expecting success of 4047.11 '-X0': 
-	git diff -X0 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff -X0 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff -X0 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.2 'changed function': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 2 - changed function
 
-ok 11 - -X0
+expecting success of 4051.3 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was aca4ec7 changed_hello_appended
+HEAD is now at 9f6e181 initial
+HEAD is now at 9f6e181 initial
+ok 3 -  diff applies
 
-expecting success of 4047.12 'diff.dirstat=0': 
-	git -c diff.dirstat=0 diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=0 diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=0 diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.4 ' context includes comment': 
+	grep "^ .*Hello comment" changed_hello.diff
 
-ok 12 - diff.dirstat=0
+  * Hello comment.
+ok 4 -  context includes comment
 
-expecting success of 4047.13 '--dirstat=0 --cumulative': 
-	git diff --dirstat=0 --cumulative HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=0 --cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=0 --cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.5 ' context includes begin': 
+	grep "^ .*Begin of hello" changed_hello.diff
 
-ok 13 - --dirstat=0 --cumulative
+ static void hello(void)	// Begin of hello
+ok 5 -  context includes begin
 
-expecting success of 4047.14 '--dirstat=0,cumulative': 
-	git diff --dirstat=0,cumulative HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=0,cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=0,cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.6 ' context includes end': 
+	grep "^ .*End of hello" changed_hello.diff
 
-ok 14 - --dirstat=0,cumulative
+ }	// End of hello
+ok 6 -  context includes end
 
-expecting success of 4047.15 '-X0,cumulative': 
-	git diff -X0,cumulative HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff -X0,cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff -X0,cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.7 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" changed_hello.diff) -le 1
 
-ok 15 - -X0,cumulative
+ok 7 -  context does not include other functions
 
-expecting success of 4047.16 'diff.dirstat=0,cumulative': 
-	git -c diff.dirstat=0,cumulative diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=0,cumulative diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=0,cumulative diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.8 ' context does not include preceding empty lines': 
+	test "$(first_context_line <changed_hello.diff)" != " "
 
-ok 16 - diff.dirstat=0,cumulative
+ok 8 -  context does not include preceding empty lines
 
-expecting success of 4047.17 'diff.dirstat=0 & --dirstat=cumulative': 
-	git -c diff.dirstat=0 diff --dirstat=cumulative HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=0 diff --dirstat=cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=0 diff --dirstat=cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.9 ' context does not include trailing empty lines': 
+	test "$(last_context_line <changed_hello.diff)" != " "
 
-ok 17 - diff.dirstat=0 & --dirstat=cumulative
+ok 9 -  context does not include trailing empty lines
 
-expecting success of 4047.18 '--dirstat-by-file': 
-	git diff --dirstat-by-file HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat-by-file -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat-by-file -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.10 'changed includes': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 10 - changed includes
 
-ok 18 - --dirstat-by-file
+expecting success of 4051.11 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was 9f6e181 initial
+HEAD is now at 5e132d0 changed_hello
+HEAD is now at 5e132d0 changed_hello
+ok 11 -  diff applies
 
-expecting success of 4047.19 '--dirstat=files': 
-	git diff --dirstat=files HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.12 ' context includes begin': 
+	grep "^ .*Begin.h" changed_includes.diff
 
-ok 19 - --dirstat=files
+ #include <Begin.h>
+ok 12 -  context includes begin
 
-expecting success of 4047.20 'diff.dirstat=files': 
-	git -c diff.dirstat=files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.13 ' context includes end': 
+	grep "^ .*End.h" changed_includes.diff
 
-ok 20 - diff.dirstat=files
+ #include <End.h>
+ok 13 -  context includes end
 
-expecting success of 4047.21 '--dirstat-by-file=10': 
-	git diff --dirstat-by-file=10 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat-by-file=10 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat-by-file=10 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.14 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" changed_includes.diff) -le 1
 
-ok 21 - --dirstat-by-file=10
+ok 14 -  context does not include other functions
 
-expecting success of 4047.22 '--dirstat=files,10': 
-	git diff --dirstat=files,10 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,10 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,10 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.15 ' context does not include trailing empty lines': 
+	test "$(last_context_line <changed_includes.diff)" != " "
 
-ok 22 - --dirstat=files,10
+ok 15 -  context does not include trailing empty lines
 
-expecting success of 4047.23 'diff.dirstat=10,files': 
-	git -c diff.dirstat=10,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=10,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=10,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.16 'appended function': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 16 - appended function
 
-ok 23 - diff.dirstat=10,files
+expecting success of 4051.17 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was 5e132d0 changed_hello
+HEAD is now at 964b054 changed_includes
+HEAD is now at 964b054 changed_includes
+ok 17 -  diff applies
 
-expecting success of 4047.24 '--dirstat-by-file --cumulative': 
-	git diff --dirstat-by-file --cumulative HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat-by-file --cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat-by-file --cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.18 ' context includes begin': 
+	grep "^[+].*Begin of first part" appended.diff
 
-ok 24 - --dirstat-by-file --cumulative
++int appended(void) // Begin of first part
+ok 18 -  context includes begin
 
-expecting success of 4047.25 '--dirstat=files,cumulative': 
-	git diff --dirstat=files,cumulative HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.19 ' context includes end': 
+	grep "^[+].*End of first part" appended.diff
 
-ok 25 - --dirstat=files,cumulative
++	printf("End of first part\n");
+ok 19 -  context includes end
 
-expecting success of 4047.26 'diff.dirstat=cumulative,files': 
-	git -c diff.dirstat=cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.20 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" appended.diff) -le 1
 
-ok 26 - diff.dirstat=cumulative,files
+ok 20 -  context does not include other functions
 
-expecting success of 4047.27 '--dirstat=files,cumulative,10': 
-	git diff --dirstat=files,cumulative,10 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,cumulative,10 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,cumulative,10 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.21 'appended function part': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 21 - appended function part
 
-ok 27 - --dirstat=files,cumulative,10
+expecting success of 4051.22 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was 964b054 changed_includes
+HEAD is now at d0cff11 appended
+HEAD is now at d0cff11 appended
+ok 22 -  diff applies
 
-expecting success of 4047.28 'diff.dirstat=10,cumulative,files': 
-	git -c diff.dirstat=10,cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=10,cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=10,cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.23 ' context includes begin': 
+	grep "^ .*Begin of first part" extended.diff
 
-ok 28 - diff.dirstat=10,cumulative,files
+ int appended(void) // Begin of first part
+ok 23 -  context includes begin
 
-expecting success of 4047.29 '--dirstat=files,cumulative,16.7': 
-	git diff --dirstat=files,cumulative,16.7 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,cumulative,16.7 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,cumulative,16.7 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.24 ' context includes end': 
+	grep "^[+].*End of second part" extended.diff
 
-ok 29 - --dirstat=files,cumulative,16.7
++}	// End of second part
+ok 24 -  context includes end
 
-expecting success of 4047.30 'diff.dirstat=16.7,cumulative,files': 
-	git -c diff.dirstat=16.7,cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=16.7,cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=16.7,cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.25 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" extended.diff) -le 2
 
-ok 30 - diff.dirstat=16.7,cumulative,files
+ok 25 -  context does not include other functions
 
-expecting success of 4047.31 'diff.dirstat=16.70,cumulative,files': 
-	git -c diff.dirstat=16.70,cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=16.70,cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=16.70,cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.26 ' context does not include preceding empty lines': 
+	test "$(first_context_line <extended.diff)" != " "
 
-ok 31 - diff.dirstat=16.70,cumulative,files
+ok 26 -  context does not include preceding empty lines
 
-expecting success of 4047.32 '--dirstat=files,cumulative,27.2': 
-	git diff --dirstat=files,cumulative,27.2 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,cumulative,27.2 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,cumulative,27.2 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.27 'change with long common tail and no context': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 27 - change with long common tail and no context
 
-ok 32 - --dirstat=files,cumulative,27.2
+expecting success of 4051.28 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was d0cff11 appended
+HEAD is now at d16114c extended
+HEAD is now at d16114c extended
+ok 28 -  diff applies
 
-expecting success of 4047.33 '--dirstat=files,cumulative,27.09': 
-	git diff --dirstat=files,cumulative,27.09 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,cumulative,27.09 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,cumulative,27.09 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.29 ' context includes begin': 
+	grep "^ .*Begin of first part" long_common_tail.diff
 
-ok 33 - --dirstat=files,cumulative,27.09
+ int appended(void) // Begin of first part
+ok 29 -  context includes begin
 
-expecting success of 4047.34 '--dirstat=lines': 
-	git diff --dirstat=lines HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=lines -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=lines -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.30 ' context includes end': 
+	grep "^ .*End of second part" long_common_tail.diff
 
-ok 34 - --dirstat=lines
+ }	// End of second part
+ok 30 -  context includes end
 
-expecting success of 4047.35 'diff.dirstat=lines': 
-	git -c diff.dirstat=lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.31 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" long_common_tail.diff) -le 2
 
-ok 35 - diff.dirstat=lines
+ok 31 -  context does not include other functions
 
-expecting success of 4047.36 '--dirstat=lines,0': 
-	git diff --dirstat=lines,0 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=lines,0 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=lines,0 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.32 ' context does not include preceding empty lines': 
+	test "$(first_context_line <long_common_tail.diff)" != " "
 
-ok 36 - --dirstat=lines,0
+ok 32 -  context does not include preceding empty lines
 
-expecting success of 4047.37 'diff.dirstat=0,lines': 
-	git -c diff.dirstat=0,lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=0,lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=0,lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+expecting success of 4051.33 'changed function plus appended function': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 33 - changed function plus appended function
 
-ok 37 - diff.dirstat=0,lines
+expecting success of 4051.34 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was d16114c extended
+HEAD is now at 9f6e181 initial
+HEAD is now at 9f6e181 initial
+ok 34 -  diff applies
 
-expecting success of 4047.38 '--dirstat=future_param,lines,0 should fail loudly': 
-	test_must_fail git diff --dirstat=future_param,lines,0 HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
-	test_debug "cat actual_error" &&
-	test_must_be_empty actual_diff_dirstat &&
-	test_grep -q "future_param" actual_error &&
-	test_grep -q "\--dirstat" actual_error
+expecting success of 4051.35 ' context includes begin': 
+	grep "^ .*Begin of hello" changed_hello_appended.diff &&
+	grep "^[+].*Begin of first part" changed_hello_appended.diff
 
-ok 38 - --dirstat=future_param,lines,0 should fail loudly
+ static void hello(void)	// Begin of hello
++int appended(void) // Begin of first part
+ok 35 -  context includes begin
 
-expecting success of 4047.39 '--dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters': 
-	test_must_fail git diff --dirstat=dummy1,cumulative,2dummy HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
-	test_debug "cat actual_error" &&
-	test_must_be_empty actual_diff_dirstat &&
-	test_grep -q "dummy1" actual_error &&
-	test_grep -q "2dummy" actual_error &&
-	test_grep -q "\--dirstat" actual_error
+expecting success of 4051.36 ' context includes end': 
+	grep "^ .*End of hello" changed_hello_appended.diff &&
+	grep "^[+].*End of first part" changed_hello_appended.diff
 
-ok 39 - --dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters
+ }	// End of hello
++	printf("End of first part\n");
+ok 36 -  context includes end
 
-expecting success of 4047.40 'diff.dirstat=future_param,0,lines should warn, but still work': 
-	git -c diff.dirstat=future_param,0,lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
-	test_debug "cat actual_error" &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	test_grep -q "future_param" actual_error &&
-	test_grep -q "diff\\.dirstat" actual_error &&
+expecting success of 4051.37 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" changed_hello_appended.diff) -le 2
 
-	git -c diff.dirstat=future_param,0,lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M 2>actual_error &&
-	test_debug "cat actual_error" &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	test_grep -q "future_param" actual_error &&
-	test_grep -q "diff\\.dirstat" actual_error &&
+ok 37 -  context does not include other functions
 
-	git -c diff.dirstat=future_param,0,lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC 2>actual_error &&
-	test_debug "cat actual_error" &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC &&
-	test_grep -q "future_param" actual_error &&
-	test_grep -q "diff\\.dirstat" actual_error
+expecting success of 4051.38 'changed two consecutive functions': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 38 - changed two consecutive functions
 
-ok 40 - diff.dirstat=future_param,0,lines should warn, but still work
+expecting success of 4051.39 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was 9f6e181 initial
+HEAD is now at cf16009 hello_dummy
+HEAD is now at cf16009 hello_dummy
+ok 39 -  diff applies
 
-expecting success of 4047.41 '--shortstat --dirstat should output only one dirstat': 
-	git diff --shortstat --dirstat=changes HEAD^..HEAD >out &&
-	grep " dst/copy/changed/$" out >actual_diff_shortstat_dirstat_changes &&
-	test_line_count = 1 actual_diff_shortstat_dirstat_changes &&
+expecting success of 4051.40 ' context includes begin': 
+	grep "^ .*Begin of hello" changed_hello_dummy.diff &&
+	grep "^ .*Begin of dummy" changed_hello_dummy.diff
 
-	git diff --shortstat --dirstat=lines HEAD^..HEAD >out &&
-	grep " dst/copy/changed/$" out >actual_diff_shortstat_dirstat_lines &&
-	test_line_count = 1 actual_diff_shortstat_dirstat_lines &&
+ static void hello(void)	// Begin of hello
+ static int dummy(void)	// Begin of dummy
+ok 40 -  context includes begin
 
-	git diff --shortstat --dirstat=files HEAD^..HEAD >out &&
-	grep " dst/copy/changed/$" out >actual_diff_shortstat_dirstat_files &&
-	test_line_count = 1 actual_diff_shortstat_dirstat_files
+expecting success of 4051.41 ' context includes end': 
+	grep "^ .*End of hello" changed_hello_dummy.diff &&
+	grep "^ .*End of dummy" changed_hello_dummy.diff
 
-ok 41 - --shortstat --dirstat should output only one dirstat
+ }	// End of hello
+ }	// End of dummy
+ok 41 -  context includes end
 
-# passed all 41 test(s)
-1..41
+expecting success of 4051.42 ' overlapping hunks are merged': 
+	test $(grep -c "^@@" changed_hello_dummy.diff) -eq 1
+
+ok 42 -  overlapping hunks are merged
+
+# passed all 42 test(s)
+1..42
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4053-diff-no-index.sh ***
@@ -251490,10 +252791,8 @@
 	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
-
+./test-lib.sh: line 1002: kill: (2227577) - No such process
+./test-lib.sh: line 1003: kill: (2227576) - No such process
 ok 25 - diff --no-index reads from pipes
 
 expecting success of 4053.26 'diff --no-index F F rejects pathspecs': 
@@ -251591,404 +252890,306 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4051-diff-function-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4051-diff-function-context/.git/
-expecting success of 4051.1 'setup': 
-	cat "$dir/includes.c" "$dir/dummy.c" "$dir/dummy.c" "$dir/hello.c" \
-		"$dir/dummy.c" "$dir/dummy.c" >file.c &&
-	commit_and_tag initial file.c &&
-
-	grep -v "delete me from hello" <file.c >file.c.new &&
-	mv file.c.new file.c &&
-	commit_and_tag changed_hello file.c &&
-
-	grep -v "delete me from includes" <file.c >file.c.new &&
-	mv file.c.new file.c &&
-	commit_and_tag changed_includes file.c &&
-
-	cat "$dir/appended1.c" >>file.c &&
-	commit_and_tag appended file.c &&
-
-	cat "$dir/appended2.c" >>file.c &&
-	commit_and_tag extended file.c &&
-
-	grep -v "Begin of second part" <file.c >file.c.new &&
-	mv file.c.new file.c &&
-	commit_and_tag long_common_tail file.c &&
-
-	git checkout initial &&
-	cat "$dir/hello.c" "$dir/dummy.c" >file.c &&
-	commit_and_tag hello_dummy file.c &&
-
-	# overlap function context of 1st change and -u context of 2nd change
-	grep -v "delete me from hello" <"$dir/hello.c" >file.c &&
-	sed "2a\\
-	     extra line" <"$dir/dummy.c" >>file.c &&
-	commit_and_tag changed_hello_dummy file.c &&
-
-	git checkout initial &&
-	grep -v "delete me from hello" <file.c >file.c.new &&
-	mv file.c.new file.c &&
-	cat "$dir/appended1.c" >>file.c &&
-	commit_and_tag changed_hello_appended file.c
-
-[master (root-commit) 9f6e181] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 72 insertions(+)
- create mode 100644 file.c
-[master 5e132d0] changed_hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-[master 964b054] changed_includes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-[master d0cff11] appended
- Author: A U Thor <author@example.com>
- 1 file changed, 15 insertions(+)
-[master d16114c] extended
- Author: A U Thor <author@example.com>
- 1 file changed, 35 insertions(+)
-[master fa474ba] long_common_tail
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-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.
+*** t4056-diff-order.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4056-diff-order/.git/
+expecting success of 4056.1 'setup': 
+	mkdir c &&
+	create_files 1 &&
+	create_files 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:
+	cat >order_file_1 <<-\EOF &&
+	*Makefile
+	*.txt
+	*.h
+	EOF
 
-  git switch -c <new-branch-name>
+	cat >order_file_2 <<-\EOF &&
+	*Makefile
+	*.h
+	*.c
+	EOF
 
-Or undo this operation with:
+	cat >expect_none <<-\EOF &&
+	a.h
+	b.c
+	c/Makefile
+	d.txt
+	EOF
 
-  git switch -
+	cat >expect_1 <<-\EOF &&
+	c/Makefile
+	d.txt
+	a.h
+	b.c
+	EOF
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	cat >expect_2 <<-\EOF
+	c/Makefile
+	a.h
+	b.c
+	d.txt
+	EOF
 
-HEAD is now at 9f6e181 initial
-[detached HEAD cf16009] hello_dummy
- Author: A U Thor <author@example.com>
- 1 file changed, 41 deletions(-)
-[detached HEAD d307f65] changed_hello_dummy
+[main (root-commit) 770e898] 1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Previous HEAD position was d307f65 changed_hello_dummy
-HEAD is now at 9f6e181 initial
-[detached HEAD aca4ec7] changed_hello_appended
+ 4 files changed, 4 insertions(+)
+ create mode 100644 a.h
+ create mode 100644 b.c
+ create mode 100644 c/Makefile
+ create mode 100644 d.txt
+[main 7c2d19e] 2
  Author: A U Thor <author@example.com>
- 1 file changed, 15 insertions(+), 1 deletion(-)
+ 4 files changed, 4 insertions(+), 4 deletions(-)
 ok 1 - setup
 
-expecting success of 4051.2 'changed function': 
-		git diff $options "$name^" "$name" >"$name.diff"
-	
-ok 2 - changed function
-
-expecting success of 4051.3 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
-	
-Previous HEAD position was aca4ec7 changed_hello_appended
-HEAD is now at 9f6e181 initial
-HEAD is now at 9f6e181 initial
-ok 3 -  diff applies
-
-expecting success of 4051.4 ' context includes comment': 
-	grep "^ .*Hello comment" changed_hello.diff
+expecting success of 4056.2 'no order (=tree object order)': 
+	git diff --name-only HEAD^..HEAD >actual &&
+	test_cmp expect_none actual
 
-  * Hello comment.
-ok 4 -  context includes comment
+ok 2 - no order (=tree object order)
 
-expecting success of 4051.5 ' context includes begin': 
-	grep "^ .*Begin of hello" changed_hello.diff
+expecting success of 4056.3 'missing orderfile': 
+	rm -f bogus_file &&
+	test_must_fail git diff -Obogus_file --name-only HEAD^..HEAD
 
- static void hello(void)	// Begin of hello
-ok 5 -  context includes begin
+fatal: failed to read orderfile 'bogus_file': No such file or directory
+ok 3 - missing orderfile
 
-expecting success of 4051.6 ' context includes end': 
-	grep "^ .*End of hello" changed_hello.diff
+checking prerequisite: SANITY
 
- }	// End of hello
-ok 6 -  context includes end
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-expecting success of 4051.7 ' context does not include other functions': 
-	test $(grep -c "^[ +-].*Begin" changed_hello.diff) -le 1
+	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 7 -  context does not include other functions
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-expecting success of 4051.8 ' context does not include preceding empty lines': 
-	test "$(first_context_line <changed_hello.diff)" != " "
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-ok 8 -  context does not include preceding empty lines
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 4056.4 'unreadable orderfile': 
+	>unreadable_file &&
+	chmod -r unreadable_file &&
+	test_must_fail git diff -Ounreadable_file --name-only HEAD^..HEAD
 
-expecting success of 4051.9 ' context does not include trailing empty lines': 
-	test "$(last_context_line <changed_hello.diff)" != " "
+fatal: failed to read orderfile 'unreadable_file': Permission denied
+ok 4 - unreadable orderfile
 
-ok 9 -  context does not include trailing empty lines
+expecting success of 4056.5 'orderfile using option from subdir with --output': 
+	mkdir subdir &&
+	git -C subdir diff -O../order_file_1 --output ../actual --name-only HEAD^..HEAD &&
+	test_cmp expect_1 actual
 
-expecting success of 4051.10 'changed includes': 
-		git diff $options "$name^" "$name" >"$name.diff"
-	
-ok 10 - changed includes
+ok 5 - orderfile using option from subdir with --output
 
-expecting success of 4051.11 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
+expecting success of 4056.6 'orderfile using option (1)': 
+		git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_$i actual
 	
-Previous HEAD position was 9f6e181 initial
-HEAD is now at 5e132d0 changed_hello
-HEAD is now at 5e132d0 changed_hello
-ok 11 -  diff applies
-
-expecting success of 4051.12 ' context includes begin': 
-	grep "^ .*Begin.h" changed_includes.diff
-
- #include <Begin.h>
-ok 12 -  context includes begin
-
-expecting success of 4051.13 ' context includes end': 
-	grep "^ .*End.h" changed_includes.diff
-
- #include <End.h>
-ok 13 -  context includes end
-
-expecting success of 4051.14 ' context does not include other functions': 
-	test $(grep -c "^[ +-].*Begin" changed_includes.diff) -le 1
-
-ok 14 -  context does not include other functions
+ok 6 - orderfile using option (1)
 
-expecting success of 4051.15 ' context does not include trailing empty lines': 
-	test "$(last_context_line <changed_includes.diff)" != " "
+checking prerequisite: PIPE
 
-ok 15 -  context does not include trailing empty lines
+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
 
-expecting success of 4051.16 'appended function': 
-		git diff $options "$name^" "$name" >"$name.diff"
+)
+prerequisite PIPE ok
+expecting success of 4056.7 'orderfile is fifo (1)': 
+		rm -f order_fifo &&
+		mkfifo order_fifo &&
+		{
+			cat order_file_$i >order_fifo &
+		} &&
+		git diff -O order_fifo --name-only HEAD^..HEAD >actual &&
+		wait &&
+		test_cmp expect_$i actual
 	
-ok 16 - appended function
+ok 7 - orderfile is fifo (1)
 
-expecting success of 4051.17 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
+expecting success of 4056.8 'orderfile using config (1)': 
+		git -c diff.orderfile=order_file_$i diff --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_$i actual
 	
-Previous HEAD position was 5e132d0 changed_hello
-HEAD is now at 964b054 changed_includes
-HEAD is now at 964b054 changed_includes
-ok 17 -  diff applies
-
-expecting success of 4051.18 ' context includes begin': 
-	grep "^[+].*Begin of first part" appended.diff
-
-+int appended(void) // Begin of first part
-ok 18 -  context includes begin
-
-expecting success of 4051.19 ' context includes end': 
-	grep "^[+].*End of first part" appended.diff
-
-+	printf("End of first part\n");
-ok 19 -  context includes end
-
-expecting success of 4051.20 ' context does not include other functions': 
-	test $(grep -c "^[ +-].*Begin" appended.diff) -le 1
-
-ok 20 -  context does not include other functions
+ok 8 - orderfile using config (1)
 
-expecting success of 4051.21 'appended function part': 
-		git diff $options "$name^" "$name" >"$name.diff"
+expecting success of 4056.9 'cancelling configured orderfile (1)': 
+		git -c diff.orderfile=order_file_$i diff -O/dev/null --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_none actual
 	
-ok 21 - appended function part
+ok 9 - cancelling configured orderfile (1)
 
-expecting success of 4051.22 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
+expecting success of 4056.10 'orderfile using option (2)': 
+		git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_$i actual
 	
-Previous HEAD position was 964b054 changed_includes
-HEAD is now at d0cff11 appended
-HEAD is now at d0cff11 appended
-ok 22 -  diff applies
-
-expecting success of 4051.23 ' context includes begin': 
-	grep "^ .*Begin of first part" extended.diff
-
- int appended(void) // Begin of first part
-ok 23 -  context includes begin
-
-expecting success of 4051.24 ' context includes end': 
-	grep "^[+].*End of second part" extended.diff
-
-+}	// End of second part
-ok 24 -  context includes end
-
-expecting success of 4051.25 ' context does not include other functions': 
-	test $(grep -c "^[ +-].*Begin" extended.diff) -le 2
-
-ok 25 -  context does not include other functions
-
-expecting success of 4051.26 ' context does not include preceding empty lines': 
-	test "$(first_context_line <extended.diff)" != " "
-
-ok 26 -  context does not include preceding empty lines
+ok 10 - orderfile using option (2)
 
-expecting success of 4051.27 'change with long common tail and no context': 
-		git diff $options "$name^" "$name" >"$name.diff"
+expecting success of 4056.11 'orderfile is fifo (2)': 
+		rm -f order_fifo &&
+		mkfifo order_fifo &&
+		{
+			cat order_file_$i >order_fifo &
+		} &&
+		git diff -O order_fifo --name-only HEAD^..HEAD >actual &&
+		wait &&
+		test_cmp expect_$i actual
 	
-ok 27 - change with long common tail and no context
+ok 11 - orderfile is fifo (2)
 
-expecting success of 4051.28 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
+expecting success of 4056.12 'orderfile using config (2)': 
+		git -c diff.orderfile=order_file_$i diff --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_$i actual
 	
-Previous HEAD position was d0cff11 appended
-HEAD is now at d16114c extended
-HEAD is now at d16114c extended
-ok 28 -  diff applies
-
-expecting success of 4051.29 ' context includes begin': 
-	grep "^ .*Begin of first part" long_common_tail.diff
-
- int appended(void) // Begin of first part
-ok 29 -  context includes begin
-
-expecting success of 4051.30 ' context includes end': 
-	grep "^ .*End of second part" long_common_tail.diff
+ok 12 - orderfile using config (2)
 
- }	// End of second part
-ok 30 -  context includes end
+expecting success of 4056.13 'cancelling configured orderfile (2)': 
+		git -c diff.orderfile=order_file_$i diff -O/dev/null --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_none actual
+	
+ok 13 - cancelling configured orderfile (2)
 
-expecting success of 4051.31 ' context does not include other functions': 
-	test $(grep -c "^[ +-].*Begin" long_common_tail.diff) -le 2
+expecting success of 4056.14 'setup for testing combine-diff order': 
+	git checkout -b tmp HEAD~ &&
+	create_files 3 &&
+	git checkout main &&
+	git merge --no-commit -s ours tmp &&
+	create_files 5
 
-ok 31 -  context does not include other functions
+Switched to a new branch 'tmp'
+[tmp ec24607] 3
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+Switched to branch 'main'
+Automatic merge went well; stopped before committing as requested
+[main e00a015] 5
+ Author: A U Thor <author@example.com>
+ok 14 - setup for testing combine-diff order
 
-expecting success of 4051.32 ' context does not include preceding empty lines': 
-	test "$(first_context_line <long_common_tail.diff)" != " "
+expecting success of 4056.15 'combine-diff: no order (=tree object order)': 
+	git diff --name-only HEAD HEAD^ HEAD^2 >actual &&
+	test_cmp expect_none actual
 
-ok 32 -  context does not include preceding empty lines
+ok 15 - combine-diff: no order (=tree object order)
 
-expecting success of 4051.33 'changed function plus appended function': 
-		git diff $options "$name^" "$name" >"$name.diff"
+expecting success of 4056.16 'combine-diff: orderfile using option (1)': 
+		git diff -Oorder_file_$i --name-only HEAD HEAD^ HEAD^2 >actual &&
+		test_cmp expect_$i actual
 	
-ok 33 - changed function plus appended function
+ok 16 - combine-diff: orderfile using option (1)
 
-expecting success of 4051.34 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
+expecting success of 4056.17 'combine-diff: orderfile using option (2)': 
+		git diff -Oorder_file_$i --name-only HEAD HEAD^ HEAD^2 >actual &&
+		test_cmp expect_$i actual
 	
-Previous HEAD position was d16114c extended
-HEAD is now at 9f6e181 initial
-HEAD is now at 9f6e181 initial
-ok 34 -  diff applies
-
-expecting success of 4051.35 ' context includes begin': 
-	grep "^ .*Begin of hello" changed_hello_appended.diff &&
-	grep "^[+].*Begin of first part" changed_hello_appended.diff
-
- static void hello(void)	// Begin of hello
-+int appended(void) // Begin of first part
-ok 35 -  context includes begin
-
-expecting success of 4051.36 ' context includes end': 
-	grep "^ .*End of hello" changed_hello_appended.diff &&
-	grep "^[+].*End of first part" changed_hello_appended.diff
-
- }	// End of hello
-+	printf("End of first part\n");
-ok 36 -  context includes end
+ok 17 - combine-diff: orderfile using option (2)
 
-expecting success of 4051.37 ' context does not include other functions': 
-	test $(grep -c "^[ +-].*Begin" changed_hello_appended.diff) -le 2
+expecting success of 4056.18 'rotate and skip setup': 
+	>sample1.t &&
+	>sample2.t &&
+	>sample3.t &&
+	>sample4.t &&
+	git add sample[1234].t &&
+	git commit -m "added" sample[1234].t &&
+	echo modified >>sample1.t &&
+	echo modified >>sample2.t &&
+	echo modified >>sample4.t &&
+	git commit -m "updated" sample[1234].t
 
-ok 37 -  context does not include other functions
+[main bfe9459] added
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 sample1.t
+ create mode 100644 sample2.t
+ create mode 100644 sample3.t
+ create mode 100644 sample4.t
+[main ba2bcc7] updated
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ok 18 - rotate and skip setup
 
-expecting success of 4051.38 'changed two consecutive functions': 
-		git diff $options "$name^" "$name" >"$name.diff"
-	
-ok 38 - changed two consecutive functions
+expecting success of 4056.19 'diff --rotate-to': 
+	git diff --rotate-to=sample2.t --name-only HEAD^ >actual &&
+	test_write_lines sample2.t sample4.t sample1.t >expect &&
+	test_cmp expect actual
 
-expecting success of 4051.39 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
-	
-Previous HEAD position was 9f6e181 initial
-HEAD is now at cf16009 hello_dummy
-HEAD is now at cf16009 hello_dummy
-ok 39 -  diff applies
+ok 19 - diff --rotate-to
 
-expecting success of 4051.40 ' context includes begin': 
-	grep "^ .*Begin of hello" changed_hello_dummy.diff &&
-	grep "^ .*Begin of dummy" changed_hello_dummy.diff
+expecting success of 4056.20 'diff --skip-to': 
+	git diff --skip-to=sample2.t --name-only HEAD^ >actual &&
+	test_write_lines sample2.t sample4.t >expect &&
+	test_cmp expect actual
 
- static void hello(void)	// Begin of hello
- static int dummy(void)	// Begin of dummy
-ok 40 -  context includes begin
+ok 20 - diff --skip-to
 
-expecting success of 4051.41 ' context includes end': 
-	grep "^ .*End of hello" changed_hello_dummy.diff &&
-	grep "^ .*End of dummy" changed_hello_dummy.diff
+expecting success of 4056.21 'diff --rotate/skip-to error condition': 
+	test_must_fail git diff --rotate-to=sample3.t HEAD^ &&
+	test_must_fail git diff --skip-to=sample3.t HEAD^
 
- }	// End of hello
- }	// End of dummy
-ok 41 -  context includes end
+fatal: No such path 'sample3.t' in the diff
+fatal: No such path 'sample3.t' in the diff
+ok 21 - diff --rotate/skip-to error condition
 
-expecting success of 4051.42 ' overlapping hunks are merged': 
-	test $(grep -c "^@@" changed_hello_dummy.diff) -eq 1
+expecting success of 4056.22 'log --rotate-to': 
+	git log --rotate-to=sample3.t --raw HEAD~2.. >raw &&
+	# just distill the commit header and paths
+	sed -n -e "s/^commit.*/commit/p" \
+	       -e "/^:/s/^.*	//p" raw >actual &&
 
-ok 42 -  overlapping hunks are merged
+	cat >expect <<-\EOF &&
+	commit
+	sample4.t
+	sample1.t
+	sample2.t
+	commit
+	sample3.t
+	sample4.t
+	sample1.t
+	sample2.t
+	EOF
 
-# passed all 42 test(s)
-1..42
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4062-diff-pickaxe.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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"
+	test_cmp expect actual
 
-[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
+ok 22 - log --rotate-to
 
-expecting success of 4062.2 '-G matches': 
-	git diff --name-only -G "^(0{64}){64}$" HEAD^ >out &&
-	test 4096-zeroes.txt = "$(cat out)"
+expecting success of 4056.23 'log --skip-to': 
+	git log --skip-to=sample3.t --raw HEAD~2.. >raw &&
+	# just distill the commit header and paths
+	sed -n -e "s/^commit.*/commit/p" \
+	       -e "/^:/s/^.*	//p" raw >actual &&
 
-ok 2 - -G matches
+	cat >expect <<-\EOF &&
+	commit
+	sample4.t
+	commit
+	sample3.t
+	sample4.t
+	EOF
 
-expecting success of 4062.3 '-S --pickaxe-regex': 
-	git diff --name-only -S0 --pickaxe-regex HEAD^ >out &&
-	test 4096-zeroes.txt = "$(cat out)"
+	test_cmp expect actual
 
-ok 3 - -S --pickaxe-regex
+ok 23 - log --skip-to
 
-# passed all 3 test(s)
-1..3
+# passed all 23 test(s)
+1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4058-diff-duplicates.sh ***
@@ -252384,306 +253585,39 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4056-diff-order.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4056-diff-order/.git/
-expecting success of 4056.1 'setup': 
-	mkdir c &&
-	create_files 1 &&
-	create_files 2 &&
-
-	cat >order_file_1 <<-\EOF &&
-	*Makefile
-	*.txt
-	*.h
-	EOF
-
-	cat >order_file_2 <<-\EOF &&
-	*Makefile
-	*.h
-	*.c
-	EOF
-
-	cat >expect_none <<-\EOF &&
-	a.h
-	b.c
-	c/Makefile
-	d.txt
-	EOF
-
-	cat >expect_1 <<-\EOF &&
-	c/Makefile
-	d.txt
-	a.h
-	b.c
-	EOF
-
-	cat >expect_2 <<-\EOF
-	c/Makefile
-	a.h
-	b.c
-	d.txt
-	EOF
+*** t4062-diff-pickaxe.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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"
 
-[main (root-commit) 770e898] 1
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 a.h
- create mode 100644 b.c
- create mode 100644 c/Makefile
- create mode 100644 d.txt
-[main 7c2d19e] 2
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[master 98d74df] A 4k file
  Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4096-zeroes.txt
 ok 1 - setup
 
-expecting success of 4056.2 'no order (=tree object order)': 
-	git diff --name-only HEAD^..HEAD >actual &&
-	test_cmp expect_none actual
-
-ok 2 - no order (=tree object order)
-
-expecting success of 4056.3 'missing orderfile': 
-	rm -f bogus_file &&
-	test_must_fail git diff -Obogus_file --name-only HEAD^..HEAD
-
-fatal: failed to read orderfile 'bogus_file': No such file or directory
-ok 3 - missing orderfile
-
-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 4056.4 'unreadable orderfile': 
-	>unreadable_file &&
-	chmod -r unreadable_file &&
-	test_must_fail git diff -Ounreadable_file --name-only HEAD^..HEAD
-
-fatal: failed to read orderfile 'unreadable_file': Permission denied
-ok 4 - unreadable orderfile
-
-expecting success of 4056.5 'orderfile using option from subdir with --output': 
-	mkdir subdir &&
-	git -C subdir diff -O../order_file_1 --output ../actual --name-only HEAD^..HEAD &&
-	test_cmp expect_1 actual
-
-ok 5 - orderfile using option from subdir with --output
-
-expecting success of 4056.6 'orderfile using option (1)': 
-		git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual &&
-		test_cmp expect_$i actual
-	
-ok 6 - orderfile using option (1)
-
-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 4056.7 'orderfile is fifo (1)': 
-		rm -f order_fifo &&
-		mkfifo order_fifo &&
-		{
-			cat order_file_$i >order_fifo &
-		} &&
-		git diff -O order_fifo --name-only HEAD^..HEAD >actual &&
-		wait &&
-		test_cmp expect_$i actual
-	
-ok 7 - orderfile is fifo (1)
-
-expecting success of 4056.8 'orderfile using config (1)': 
-		git -c diff.orderfile=order_file_$i diff --name-only HEAD^..HEAD >actual &&
-		test_cmp expect_$i actual
-	
-ok 8 - orderfile using config (1)
-
-expecting success of 4056.9 'cancelling configured orderfile (1)': 
-		git -c diff.orderfile=order_file_$i diff -O/dev/null --name-only HEAD^..HEAD >actual &&
-		test_cmp expect_none actual
-	
-ok 9 - cancelling configured orderfile (1)
-
-expecting success of 4056.10 'orderfile using option (2)': 
-		git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual &&
-		test_cmp expect_$i actual
-	
-ok 10 - orderfile using option (2)
-
-expecting success of 4056.11 'orderfile is fifo (2)': 
-		rm -f order_fifo &&
-		mkfifo order_fifo &&
-		{
-			cat order_file_$i >order_fifo &
-		} &&
-		git diff -O order_fifo --name-only HEAD^..HEAD >actual &&
-		wait &&
-		test_cmp expect_$i actual
-	
-ok 11 - orderfile is fifo (2)
-
-expecting success of 4056.12 'orderfile using config (2)': 
-		git -c diff.orderfile=order_file_$i diff --name-only HEAD^..HEAD >actual &&
-		test_cmp expect_$i actual
-	
-ok 12 - orderfile using config (2)
-
-expecting success of 4056.13 'cancelling configured orderfile (2)': 
-		git -c diff.orderfile=order_file_$i diff -O/dev/null --name-only HEAD^..HEAD >actual &&
-		test_cmp expect_none actual
-	
-ok 13 - cancelling configured orderfile (2)
-
-expecting success of 4056.14 'setup for testing combine-diff order': 
-	git checkout -b tmp HEAD~ &&
-	create_files 3 &&
-	git checkout main &&
-	git merge --no-commit -s ours tmp &&
-	create_files 5
-
-Switched to a new branch 'tmp'
-[tmp ec24607] 3
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+), 4 deletions(-)
-Switched to branch 'main'
-Automatic merge went well; stopped before committing as requested
-[main e00a015] 5
- Author: A U Thor <author@example.com>
-ok 14 - setup for testing combine-diff order
-
-expecting success of 4056.15 'combine-diff: no order (=tree object order)': 
-	git diff --name-only HEAD HEAD^ HEAD^2 >actual &&
-	test_cmp expect_none actual
-
-ok 15 - combine-diff: no order (=tree object order)
-
-expecting success of 4056.16 'combine-diff: orderfile using option (1)': 
-		git diff -Oorder_file_$i --name-only HEAD HEAD^ HEAD^2 >actual &&
-		test_cmp expect_$i actual
-	
-ok 16 - combine-diff: orderfile using option (1)
-
-expecting success of 4056.17 'combine-diff: orderfile using option (2)': 
-		git diff -Oorder_file_$i --name-only HEAD HEAD^ HEAD^2 >actual &&
-		test_cmp expect_$i actual
-	
-ok 17 - combine-diff: orderfile using option (2)
-
-expecting success of 4056.18 'rotate and skip setup': 
-	>sample1.t &&
-	>sample2.t &&
-	>sample3.t &&
-	>sample4.t &&
-	git add sample[1234].t &&
-	git commit -m "added" sample[1234].t &&
-	echo modified >>sample1.t &&
-	echo modified >>sample2.t &&
-	echo modified >>sample4.t &&
-	git commit -m "updated" sample[1234].t
-
-[main bfe9459] added
- Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 sample1.t
- create mode 100644 sample2.t
- create mode 100644 sample3.t
- create mode 100644 sample4.t
-[main ba2bcc7] updated
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-ok 18 - rotate and skip setup
-
-expecting success of 4056.19 'diff --rotate-to': 
-	git diff --rotate-to=sample2.t --name-only HEAD^ >actual &&
-	test_write_lines sample2.t sample4.t sample1.t >expect &&
-	test_cmp expect actual
-
-ok 19 - diff --rotate-to
-
-expecting success of 4056.20 'diff --skip-to': 
-	git diff --skip-to=sample2.t --name-only HEAD^ >actual &&
-	test_write_lines sample2.t sample4.t >expect &&
-	test_cmp expect actual
-
-ok 20 - diff --skip-to
-
-expecting success of 4056.21 'diff --rotate/skip-to error condition': 
-	test_must_fail git diff --rotate-to=sample3.t HEAD^ &&
-	test_must_fail git diff --skip-to=sample3.t HEAD^
-
-fatal: No such path 'sample3.t' in the diff
-fatal: No such path 'sample3.t' in the diff
-ok 21 - diff --rotate/skip-to error condition
-
-expecting success of 4056.22 'log --rotate-to': 
-	git log --rotate-to=sample3.t --raw HEAD~2.. >raw &&
-	# just distill the commit header and paths
-	sed -n -e "s/^commit.*/commit/p" \
-	       -e "/^:/s/^.*	//p" raw >actual &&
-
-	cat >expect <<-\EOF &&
-	commit
-	sample4.t
-	sample1.t
-	sample2.t
-	commit
-	sample3.t
-	sample4.t
-	sample1.t
-	sample2.t
-	EOF
-
-	test_cmp expect actual
-
-ok 22 - log --rotate-to
-
-expecting success of 4056.23 'log --skip-to': 
-	git log --skip-to=sample3.t --raw HEAD~2.. >raw &&
-	# just distill the commit header and paths
-	sed -n -e "s/^commit.*/commit/p" \
-	       -e "/^:/s/^.*	//p" raw >actual &&
+expecting success of 4062.2 '-G matches': 
+	git diff --name-only -G "^(0{64}){64}$" HEAD^ >out &&
+	test 4096-zeroes.txt = "$(cat out)"
 
-	cat >expect <<-\EOF &&
-	commit
-	sample4.t
-	commit
-	sample3.t
-	sample4.t
-	EOF
+ok 2 - -G matches
 
-	test_cmp expect actual
+expecting success of 4062.3 '-S --pickaxe-regex': 
+	git diff --name-only -S0 --pickaxe-regex HEAD^ >out &&
+	test 4096-zeroes.txt = "$(cat out)"
 
-ok 23 - log --skip-to
+ok 3 - -S --pickaxe-regex
 
-# passed all 23 test(s)
-1..23
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4063-diff-blobs.sh ***
@@ -252823,6 +253757,112 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4059-diff-submodule-not-initialized.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4065-diff-anchored.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4065-diff-anchored/.git/
 expecting success of 4065.1 '--anchored': 
@@ -253040,112 +254080,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4059-diff-submodule-not-initialized.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4052-stat-output.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4052-stat-output/.git/
 expecting success of 4052.1 'preparation': 
@@ -253802,20 +254736,6 @@
 1..88
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4071-diff-minimal.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4071-diff-minimal/.git/
-expecting success of 4071.1 'minimal diff should not mark changes between changed lines': 
-	test_write_lines x x x x >pre &&
-	test_write_lines x x x A B C D x E F G >post &&
-	test_expect_code 1 git diff --no-index --minimal pre post >diff &&
-	test_grep ! ^[+-]x diff 
-
-ok 1 - minimal diff should not mark changes between changed lines
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4064-diff-oidfind.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4064-diff-oidfind/.git/
 expecting success of 4064.1 'setup ': 
@@ -254008,6 +254928,20 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4071-diff-minimal.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4071-diff-minimal/.git/
+expecting success of 4071.1 'minimal diff should not mark changes between changed lines': 
+	test_write_lines x x x x >pre &&
+	test_write_lines x x x A B C D x E F G >post &&
+	test_expect_code 1 git diff --no-index --minimal pre post >diff &&
+	test_grep ! ^[+-]x diff 
+
+ok 1 - minimal diff should not mark changes between changed lines
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4061-diff-indent.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4061-diff-indent/.git/
 expecting success of 4061.1 'prepare': 
@@ -254430,153 +255364,6 @@
 1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4100-apply-stat.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4070-diff-pairs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4070-diff-pairs/.git/
 expecting success of 4070.1 'setup': 
@@ -254709,6 +255496,48 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4102-apply-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4102-apply-rename/.git/
+expecting success of 4102.1 'setup': git update-index --add foo
+ok 1 - setup
+
+expecting success of 4102.2 'apply': git apply --index --stat --summary --apply test-patch
+ bar |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename foo => bar (47%)
+ok 2 - apply
+
+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 4102.3 'validate': test -f bar && ls -l bar | grep "^-..x......"
+-rwxr-xr-x 1 pbuilder2 pbuilder2 12 Sep 29 14:52 bar
+ok 3 - validate
+
+expecting success of 4102.4 'apply reverse': git apply -R --index --stat --summary --apply test-patch &&
+     test "$(cat foo)" = "This is foo"
+ foo |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename bar => foo (47%)
+ok 4 - apply reverse
+
+expecting success of 4102.5 'apply copy': git apply --index --stat --summary --apply test-patch &&
+     test "$(cat bar)" = "This is bar" && test "$(cat foo)" = "This is foo"
+ bar |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ copy foo => bar (47%)
+ok 5 - apply copy
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4101-apply-nonl.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4101-apply-nonl/.git/
 expecting success of 4101.1 'apply diff between 0 and 1': 
@@ -254787,451 +255616,151 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4102-apply-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4102-apply-rename/.git/
-expecting success of 4102.1 'setup': git update-index --add foo
-ok 1 - setup
-
-expecting success of 4102.2 'apply': git apply --index --stat --summary --apply test-patch
- bar |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename foo => bar (47%)
-ok 2 - apply
-
-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 4102.3 'validate': test -f bar && ls -l bar | grep "^-..x......"
--rwxr-xr-x 1 pbuilder1 pbuilder1 12 Aug 27 08:21 bar
-ok 3 - validate
-
-expecting success of 4102.4 'apply reverse': git apply -R --index --stat --summary --apply test-patch &&
-     test "$(cat foo)" = "This is foo"
- foo |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename bar => foo (47%)
-ok 4 - apply reverse
-
-expecting success of 4102.5 'apply copy': git apply --index --stat --summary --apply test-patch &&
-     test "$(cat bar)" = "This is bar" && test "$(cat foo)" = "This is foo"
- bar |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- copy foo => bar (47%)
-ok 5 - apply copy
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4068-diff-symmetric-merge-base.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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 - 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> [<pathspec>...]
-
-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
+*** t4100-apply-stat.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 	
-Already on 'main'
-fatal: no merge base found
-ok 17 - diff-index --merge-base with no merge bases and one commit
+ok 1 - rename
 
-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
+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
 	
-Already on 'main'
-fatal: multiple merge bases found
-ok 18 - diff-index --merge-base with multiple merge bases and one commit
+ok 2 - rename with recount
 
-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
+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
 	
-Already on 'main'
-ok 19 - diff --merge-base with one commit
+ok 3 - copy
 
-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
+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
 	
-Already on 'main'
-ok 20 - diff --merge-base with annotated tag
+ok 4 - copy with recount
 
-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
+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
 	
-Already on 'main'
-HEAD is now at c8f83a5 E
-ok 21 - diff --merge-base with one commit and unstaged changes
+ok 5 - rewrite
 
-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
+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
 	
-Already on 'main'
-HEAD is now at c8f83a5 E
-ok 22 - diff --merge-base with one commit and staged and unstaged changes
+ok 6 - rewrite with recount
 
-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
+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
 	
-Already on 'main'
-HEAD is now at c8f83a5 E
-ok 23 - diff --merge-base --cached with one commit and staged and unstaged changes
+ok 7 - mode
 
-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
+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
 	
-Already on 'main'
-error: object e42ba3e77f66f623836b47df796932f7e5604aec is a tree, not a commit
-ok 24 - diff --merge-base with non-commit
+ok 8 - mode with recount
 
-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
+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
 	
-Already on 'main'
-fatal: no merge base found
-ok 25 - diff --merge-base with no merge bases and one commit
+ok 9 - non git (1)
 
-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
+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
 	
-Already on 'main'
-fatal: multiple merge bases found
-ok 26 - diff --merge-base with multiple merge bases and one commit
+ok 10 - non git (1) with recount
 
-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
+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 27 - diff-tree --merge-base with two commits
+ok 11 - non git (2)
 
-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
+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
 	
-error: object e42ba3e77f66f623836b47df796932f7e5604aec is a tree, not a commit
-ok 28 - diff-tree --merge-base commit and non-commit
+ok 12 - non git (2) with recount
 
-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
+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
 	
-fatal: no merge base found
-ok 29 - diff-tree --merge-base with no merge bases and two commits
+ok 13 - non git (3)
 
-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
+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
 	
-fatal: multiple merge bases found
-ok 30 - diff-tree --merge-base with multiple merge bases and two commits
+ok 14 - non git (3) with recount
 
-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
+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 31 - diff --merge-base with two commits
+ok 15 - incomplete (1)
 
-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
+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
 	
-error: object e42ba3e77f66f623836b47df796932f7e5604aec is a tree, not a commit
-ok 32 - diff --merge-base commit and non-commit
+ok 16 - incomplete (1) with recount
 
-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
+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
 	
-fatal: no merge base found
-ok 33 - diff --merge-base with no merge bases and two commits
+ok 17 - incomplete (2)
 
-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
+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
 	
-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 18 - incomplete (2) with recount
 
-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 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
 
-fatal: --merge-base does not work with ranges
-ok 36 - diff --merge-base with range
+ok 19 - applying a hunk header which overflows fails
 
-# passed all 36 test(s)
-1..36
+# passed all 19 test(s)
+1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4106-apply-stdin.sh ***
@@ -255265,89 +255794,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4107-apply-ignore-whitespace.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4105-apply-fuzz.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4105-apply-fuzz/.git/
 expecting success of 4105.1 'setup': 
@@ -255434,6 +255880,89 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4107-apply-ignore-whitespace.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4067-diff-partial-clone.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4067-diff-partial-clone/.git/
 expecting success of 4067.1 'git show batches blobs': 
@@ -255772,58 +256301,409 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4109-apply-multifrag.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t4068-diff-symmetric-merge-base.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-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)
+[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 4109.2 'git apply (2)': 
-	git apply patch1.patch patch2.patch patch3.patch &&
-	test_cmp "$TEST_DIRECTORY/t4109/expect-2" main.c
+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
 
-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)
+ok 2 - diff with one merge base
 
-expecting success of 4109.3 'git apply (3)': 
-	git apply patch1.patch patch4.patch &&
-	test_cmp "$TEST_DIRECTORY/t4109/expect-3" main.c
+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
 
-patch1.patch:28: new blank line at EOF.
-+
-warning: 1 line adds whitespace errors.
-ok 3 - git apply (3)
+ok 3 - diff with two merge bases
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4110-apply-scan.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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"
+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
 
-ok 1 - git apply scan
+fatal: br2...br3: no merge base
+ok 4 - diff with no merge bases
 
-# passed all 1 test(s)
-1..1
+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> [<pathspec>...]
+
+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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4069-remerge-diff.sh ***
@@ -256281,6 +257161,60 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4110-apply-scan.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4109-apply-multifrag.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4112-apply-renames.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4112-apply-renames/.git/
 expecting success of 4112.1 'check rename/copy patch': git apply --check patch
@@ -256293,25 +257227,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4113-apply-ending.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-error: file: patch does not apply
-ok 2 - apply at the end
-
-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
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4013-diff-various.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4013-diff-various/.git/
 expecting success of 4013.1 'setup': 
@@ -264363,1706 +265278,448 @@
 
 ok 208 - diff-tree --stdin with log formatting
 
-expecting success of 4013.209 'diff-tree --stdin with pathspec': 
-	cat >expect <<-EOF &&
-	Third
-
-	dir/sub
-	Second
-
-	dir/sub
-	EOF
-	git rev-list master^ |
-	git diff-tree -r --stdin --name-only --format=%s dir >actual &&
-	test_cmp expect actual
-
-ok 209 - diff-tree --stdin with pathspec
-
-expecting success of 4013.210 'show A B ... -- <pathspec>': 
-	# side touches dir/sub, file0, and file3
-	# master^ touches dir/sub, and file1
-	# master^^ touches dir/sub, file0, and file2
-	git show --name-only --format="<%s>" side master^ master^^ -- dir >actual &&
-	cat >expect <<-\EOF &&
-	<Side>
-
-	dir/sub
-	<Third>
-
-	dir/sub
-	<Second>
-
-	dir/sub
-	EOF
-	test_cmp expect actual
-
-ok 210 - show A B ... -- <pathspec>
-
-expecting success of 4013.211 'diff -I<regex>: setup': 
-	git checkout master &&
-	test_seq 50 >file0 &&
-	git commit -m "Set up -I<regex> test file" file0 &&
-	test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
-	echo >>file0
-
-Switched to branch 'master'
-[master 4362559] Set up -I<regex> test file
- Author: A U Thor <author@example.com>
- 1 file changed, 44 insertions(+), 3 deletions(-)
-ok 211 - diff -I<regex>: setup
-
-expecting success of 4013.212 'diff -I<regex>': 
-	git diff --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
-	cat >expect <<-\EOF &&
-	diff --git a/file0 b/file0
-	--- a/file0
-	+++ b/file0
-	@@ -34,7 +31,6 @@
-	 34
-	 35
-	 36
-	-37
-	 38
-	 39
-	 40
-	EOF
-	compare_diff_patch expect actual
-
-ok 212 - diff -I<regex>
-
-expecting success of 4013.213 'diff -I<regex> --stat': 
-	git diff --stat --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
-	cat >expect <<-\EOF &&
-	 file0 | 1 -
-	 1 file changed, 1 deletion(-)
-	EOF
-	test_cmp expect actual
-
-ok 213 - diff -I<regex> --stat
-
-expecting success of 4013.214 'diff -I<regex>: detect malformed regex': 
-	test_expect_code 129 git diff --ignore-matching-lines="^[124-9" 2>error &&
-	test_grep "invalid regex given to -I: " error
-
-error: invalid regex given to -I: '^[124-9'
-ok 214 - diff -I<regex>: detect malformed regex
-
-expecting success of 4013.215 'diff-files does not respect diff.noPrefix': 
-	git -c diff.noPrefix diff-files -p >actual &&
-	check_prefix actual a/file0 b/file0
-
-ok 215 - diff-files does not respect diff.noPrefix
-
-expecting success of 4013.216 'diff-files respects --no-prefix': 
-	git diff-files -p --no-prefix >actual &&
-	check_prefix actual file0 file0
-
-ok 216 - diff-files respects --no-prefix
-
-expecting success of 4013.217 'diff respects diff.noPrefix': 
-	git -c diff.noPrefix diff >actual &&
-	check_prefix actual file0 file0
-
-ok 217 - diff respects diff.noPrefix
-
-expecting success of 4013.218 'diff --default-prefix overrides diff.noPrefix': 
-	git -c diff.noPrefix diff --default-prefix >actual &&
-	check_prefix actual a/file0 b/file0
-
-ok 218 - diff --default-prefix overrides diff.noPrefix
-
-expecting success of 4013.219 'diff respects diff.mnemonicPrefix': 
-	git -c diff.mnemonicPrefix diff >actual &&
-	check_prefix actual i/file0 w/file0
-
-ok 219 - diff respects diff.mnemonicPrefix
-
-expecting success of 4013.220 'diff --default-prefix overrides diff.mnemonicPrefix': 
-	git -c diff.mnemonicPrefix diff --default-prefix >actual &&
-	check_prefix actual a/file0 b/file0
-
-ok 220 - diff --default-prefix overrides diff.mnemonicPrefix
-
-expecting success of 4013.221 'diff respects diff.srcPrefix': 
-	git -c diff.srcPrefix=x/ diff >actual &&
-	check_prefix actual x/file0 b/file0
-
-ok 221 - diff respects diff.srcPrefix
-
-expecting success of 4013.222 'diff respects diff.dstPrefix': 
-	git -c diff.dstPrefix=y/ diff >actual &&
-	check_prefix actual a/file0 y/file0
-
-ok 222 - diff respects diff.dstPrefix
-
-expecting success of 4013.223 'diff --src-prefix overrides diff.srcPrefix': 
-	git -c diff.srcPrefix=y/ diff --src-prefix=z/ >actual &&
-	check_prefix actual z/file0 b/file0
-
-ok 223 - diff --src-prefix overrides diff.srcPrefix
-
-expecting success of 4013.224 'diff --dst-prefix overrides diff.dstPrefix': 
-	git -c diff.dstPrefix=y/ diff --dst-prefix=z/ >actual &&
-	check_prefix actual a/file0 z/file0
-
-ok 224 - diff --dst-prefix overrides diff.dstPrefix
-
-expecting success of 4013.225 'diff.{src,dst}Prefix ignored with diff.noPrefix': 
-	git -c diff.dstPrefix=y/ -c diff.srcPrefix=x/ -c diff.noPrefix diff >actual &&
-	check_prefix actual file0 file0
-
-ok 225 - diff.{src,dst}Prefix ignored with diff.noPrefix
-
-expecting success of 4013.226 'diff.{src,dst}Prefix ignored with diff.mnemonicPrefix': 
-	git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ -c diff.mnemonicPrefix diff >actual &&
-	check_prefix actual i/file0 w/file0
-
-ok 226 - diff.{src,dst}Prefix ignored with diff.mnemonicPrefix
-
-expecting success of 4013.227 'diff.{src,dst}Prefix ignored with --default-prefix': 
-	git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ diff --default-prefix >actual &&
-	check_prefix actual a/file0 b/file0
-
-ok 227 - diff.{src,dst}Prefix ignored with --default-prefix
-
-expecting success of 4013.228 'diff --no-renames cannot be abbreviated': 
-	test_expect_code 129 git diff --no-rename >actual 2>error &&
-	test_must_be_empty actual &&
-	grep "invalid option: --no-rename" error
-
-error: invalid option: --no-rename
-ok 228 - diff --no-renames cannot be abbreviated
-
-# passed all 228 test(s)
-1..228
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4103-apply-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
-	tr "x" "\000" <file1 >file3 &&
-	cat file3 >file4 &&
-	git add file2 &&
-	tr "y" "\000" <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 55950f3] Second Version
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename file2 => file3 (57%)
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 |  Bin
- file2 |    5 -----
- file3 |  Bin
- file4 |  Bin
- 4 files changed, 5 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 |  Bin
- file3 |  Bin
- file4 |  Bin
- 3 files changed, 0 insertions(+), 0 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
-Already on 'main'
-error: cannot apply binary patch to 'file1' without full index line
-error: file1: patch does not apply
-error: cannot apply binary patch to 'file3' without full index line
-error: file3: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 5 - check binary diff -- should fail.
-
-expecting success of 4103.6 'check binary diff (copy) -- should fail.': git checkout main &&
-	 test_must_fail git apply --check C.diff
-Already on 'main'
-error: cannot apply binary patch to 'file1' without full index line
-error: file1: patch does not apply
-error: cannot apply binary patch to 'file2' without full index line
-error: file2: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 6 - check binary diff (copy) -- should fail.
-
-expecting success of 4103.7 'check incomplete binary diff with replacement -- should fail.': 
-	git checkout main &&
-	test_must_fail git apply --check --allow-binary-replacement B.diff
-
-Already on 'main'
-error: cannot apply binary patch to 'file1' without full index line
-error: file1: patch does not apply
-error: cannot apply binary patch to 'file3' without full index line
-error: file3: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 7 - check incomplete binary diff with replacement -- should fail.
-
-expecting success of 4103.8 'check incomplete binary diff with replacement (copy) -- should fail.': 
-	 git checkout main &&
-	 test_must_fail git apply --check --allow-binary-replacement C.diff
-
-Already on 'main'
-error: cannot apply binary patch to 'file1' without full index line
-error: file1: patch does not apply
-error: cannot apply binary patch to 'file2' without full index line
-error: file2: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 8 - check incomplete binary diff with replacement (copy) -- should fail.
-
-expecting success of 4103.9 'check binary diff with replacement.': git checkout main &&
-	 git apply --check --allow-binary-replacement BF.diff
-Already on 'main'
-ok 9 - check binary diff with replacement.
-
-expecting success of 4103.10 'check binary diff with replacement (copy).': git checkout main &&
-	 git apply --check --allow-binary-replacement CF.diff
-Already on 'main'
-ok 10 - check binary diff with replacement (copy).
-
-expecting success of 4103.11 'apply binary diff -- should fail.': do_reset &&
-	 test_must_fail git apply B.diff
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-error: cannot apply binary patch to 'file1' without full index line
-error: file1: patch does not apply
-error: cannot apply binary patch to 'file3' without full index line
-error: file3: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 11 - apply binary diff -- should fail.
-
-expecting success of 4103.12 'apply binary diff -- should fail.': do_reset &&
-	 test_must_fail git apply --index B.diff
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-error: cannot apply binary patch to 'file1' without full index line
-error: file1: patch does not apply
-error: cannot apply binary patch to 'file3' without full index line
-error: file3: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 12 - apply binary diff -- should fail.
-
-expecting success of 4103.13 'apply binary diff (copy) -- should fail.': do_reset &&
-	 test_must_fail git apply C.diff
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-error: cannot apply binary patch to 'file1' without full index line
-error: file1: patch does not apply
-error: cannot apply binary patch to 'file2' without full index line
-error: file2: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 13 - apply binary diff (copy) -- should fail.
-
-expecting success of 4103.14 'apply binary diff (copy) -- should fail.': do_reset &&
-	 test_must_fail git apply --index C.diff
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-error: cannot apply binary patch to 'file1' without full index line
-error: file1: patch does not apply
-error: cannot apply binary patch to 'file2' without full index line
-error: file2: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 14 - apply binary diff (copy) -- should fail.
-
-expecting success of 4103.15 'apply binary diff with full-index': 
-	do_reset &&
-	git apply B-index.diff
-
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-ok 15 - apply binary diff with full-index
-
-expecting success of 4103.16 'apply binary diff with full-index (copy)': 
-	do_reset &&
-	git apply C-index.diff
-
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-ok 16 - apply binary diff with full-index (copy)
-
-expecting success of 4103.17 'apply full-index binary diff in new repo': 
-	(cd other-repo &&
-	 do_reset &&
-	 test_must_fail git apply ../B-index.diff)
-
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-error: missing binary patch data for 'file1'
-error: binary patch does not apply to 'file1'
-error: file1: patch does not apply
-error: missing binary patch data for 'file3'
-error: binary patch does not apply to 'file3'
-error: file3: patch does not apply
-error: missing binary patch data for 'file4'
-error: binary patch does not apply to 'file4'
-error: file4: patch does not apply
-ok 17 - apply full-index binary diff in new repo
-
-expecting success of 4103.18 'apply binary diff without replacement.': do_reset &&
-	 git apply BF.diff
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-ok 18 - apply binary diff without replacement.
-
-expecting success of 4103.19 'apply binary diff without replacement (copy).': do_reset &&
-	 git apply CF.diff
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-ok 19 - apply binary diff without replacement (copy).
-
-expecting success of 4103.20 'apply binary diff.': do_reset &&
-	 git apply --allow-binary-replacement --index BF.diff &&
-	 test -z "$(git diff --name-status binary)"
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-ok 20 - apply binary diff.
-
-expecting success of 4103.21 'apply binary diff (copy).': do_reset &&
-	 git apply --allow-binary-replacement --index CF.diff &&
-	 test -z "$(git diff --name-status binary)"
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-ok 21 - apply binary diff (copy).
-
-expecting success of 4103.22 'apply binary -p0 diff': 
-	do_reset &&
-	git apply -p0 --index B0.diff &&
-	test -z "$(git diff --name-status binary -- file3)"
-
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-ok 22 - apply binary -p0 diff
-
-expecting success of 4103.23 'reject truncated binary diff': 
-	do_reset &&
-
-	# this length is calculated to get us very close to
-	# the 8192-byte strbuf we will use to read in the patch.
-	test-tool genrandom foo 6205 >file1 &&
-	git diff --binary >patch &&
-
-	# truncate the patch at the second "literal" line,
-	# but exclude the trailing newline. We must use perl
-	# for this, since tools like "sed" cannot reliably
-	# produce output without the trailing newline.
-	perl -pe "
-		if (/^literal/ && \$count++ >= 1) {
-			chomp;
-			print;
-			exit 0;
-		}
-	" <patch >patch.trunc &&
-
-	do_reset &&
-	test_must_fail git apply patch.trunc
-
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-HEAD is now at 8985c5f Initial Version
-Already on 'main'
-error: corrupt binary patch at line 127: 
-error: No valid patches in input (allow with "--allow-empty")
-ok 23 - reject truncated binary diff
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4104-apply-boundary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
-
-	# 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
-
-ok 1 - setup
-
-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 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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4060-diff-submodule-option-diff-format.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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
+expecting success of 4013.209 'diff-tree --stdin with pathspec': 
+	cat >expect <<-EOF &&
+	Third
+
+	dir/sub
+	Second
+
+	dir/sub
 	EOF
-	diff_cmp expected actual
+	git rev-list master^ |
+	git diff-tree -r --stdin --name-only --format=%s dir >actual &&
+	test_cmp expect actual
 
-ok 13 - typechanged submodule(submodule->blob)
+ok 209 - diff-tree --stdin with pathspec
 
-expecting success of 4060.14 'typechanged submodule(submodule->blob)': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head4...0000000 (submodule deleted)
-	diff --git a/sm1 b/sm1
-	new file mode 100644
-	index 0000000..9da5fb8
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+sm1
+expecting success of 4013.210 'show A B ... -- <pathspec>': 
+	# side touches dir/sub, file0, and file3
+	# master^ touches dir/sub, and file1
+	# master^^ touches dir/sub, file0, and file2
+	git show --name-only --format="<%s>" side master^ master^^ -- dir >actual &&
+	cat >expect <<-\EOF &&
+	<Side>
+
+	dir/sub
+	<Third>
+
+	dir/sub
+	<Second>
+
+	dir/sub
 	EOF
-	diff_cmp expected actual
+	test_cmp expect actual
 
-ok 14 - typechanged submodule(submodule->blob)
+ok 210 - show A B ... -- <pathspec>
 
-expecting success of 4060.15 'setup': 
-	rm -f sm1 &&
-	git init sm1 &&
-	head6=$(add_file sm1 foo6 foo7)
+expecting success of 4013.211 'diff -I<regex>: setup': 
+	git checkout master &&
+	test_seq 50 >file0 &&
+	git commit -m "Set up -I<regex> test file" file0 &&
+	test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
+	echo >>file0
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4060-diff-submodule-option-diff-format/sm1/.git/
-ok 15 - setup
+Switched to branch 'master'
+[master 4362559] Set up -I<regex> test file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 44 insertions(+), 3 deletions(-)
+ok 211 - diff -I<regex>: setup
 
-expecting success of 4060.16 'nonexistent commit': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head4...$head6 (commits not present)
+expecting success of 4013.212 'diff -I<regex>': 
+	git diff --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
+	cat >expect <<-\EOF &&
+	diff --git a/file0 b/file0
+	--- a/file0
+	+++ b/file0
+	@@ -34,7 +31,6 @@
+	 34
+	 35
+	 36
+	-37
+	 38
+	 39
+	 40
 	EOF
-	diff_cmp expected actual
+	compare_diff_patch expect actual
 
-ok 16 - nonexistent commit
+ok 212 - diff -I<regex>
 
-expecting success of 4060.17 'typechanged submodule(blob->submodule)': 
-	git diff-index -p --submodule=diff HEAD >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...$head6 (new submodule)
-	diff --git a/sm1/foo6 b/sm1/foo6
-	new file mode 100644
-	index 0000000..462398b
-	--- /dev/null
-	+++ b/sm1/foo6
-	@@ -0,0 +1 @@
-	+foo6
-	diff --git a/sm1/foo7 b/sm1/foo7
-	new file mode 100644
-	index 0000000..6e9262c
-	--- /dev/null
-	+++ b/sm1/foo7
-	@@ -0,0 +1 @@
-	+foo7
+expecting success of 4013.213 'diff -I<regex> --stat': 
+	git diff --stat --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
+	cat >expect <<-\EOF &&
+	 file0 | 1 -
+	 1 file changed, 1 deletion(-)
 	EOF
-	diff_cmp expected actual
+	test_cmp expect actual
 
-ok 17 - typechanged submodule(blob->submodule)
+ok 213 - diff -I<regex> --stat
 
-expecting success of 4060.18 'submodule is up to date': 
-	head7=$(git -C sm1 rev-parse --short --verify HEAD) &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+expecting success of 4013.214 'diff -I<regex>: detect malformed regex': 
+	test_expect_code 129 git diff --ignore-matching-lines="^[124-9" 2>error &&
+	test_grep "invalid regex given to -I: " error
 
-ok 18 - submodule is up to date
+error: invalid regex given to -I: '^[124-9'
+ok 214 - diff -I<regex>: detect malformed regex
 
-expecting success of 4060.19 'submodule contains untracked content': 
-	echo new > sm1/new-file &&
-	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	EOF
-	diff_cmp expected actual
+expecting success of 4013.215 'diff-files does not respect diff.noPrefix': 
+	git -c diff.noPrefix diff-files -p >actual &&
+	check_prefix actual a/file0 b/file0
 
-ok 19 - submodule contains untracked content
+ok 215 - diff-files does not respect diff.noPrefix
 
-expecting success of 4060.20 'submodule contains untracked content (untracked ignored)': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+expecting success of 4013.216 'diff-files respects --no-prefix': 
+	git diff-files -p --no-prefix >actual &&
+	check_prefix actual file0 file0
 
-ok 20 - submodule contains untracked content (untracked ignored)
+ok 216 - diff-files respects --no-prefix
 
-expecting success of 4060.21 'submodule contains untracked content (dirty ignored)': 
-	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+expecting success of 4013.217 'diff respects diff.noPrefix': 
+	git -c diff.noPrefix diff >actual &&
+	check_prefix actual file0 file0
 
-ok 21 - submodule contains untracked content (dirty ignored)
+ok 217 - diff respects diff.noPrefix
 
-expecting success of 4060.22 'submodule contains untracked content (all ignored)': 
-	git diff-index -p --ignore-submodules=all --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+expecting success of 4013.218 'diff --default-prefix overrides diff.noPrefix': 
+	git -c diff.noPrefix diff --default-prefix >actual &&
+	check_prefix actual a/file0 b/file0
 
-ok 22 - submodule contains untracked content (all ignored)
+ok 218 - diff --default-prefix overrides diff.noPrefix
 
-expecting success of 4060.23 'submodule contains untracked and modified content': 
-	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	Submodule sm1 contains modified content
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
-	EOF
-	diff_cmp expected actual
+expecting success of 4013.219 'diff respects diff.mnemonicPrefix': 
+	git -c diff.mnemonicPrefix diff >actual &&
+	check_prefix actual i/file0 w/file0
 
-ok 23 - submodule contains untracked and modified content
+ok 219 - diff respects diff.mnemonicPrefix
 
-expecting success of 4060.24 'submodule contains untracked and modified content (untracked ignored)': 
-	echo new > sm1/foo6 &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
-	EOF
-	diff_cmp expected actual
+expecting success of 4013.220 'diff --default-prefix overrides diff.mnemonicPrefix': 
+	git -c diff.mnemonicPrefix diff --default-prefix >actual &&
+	check_prefix actual a/file0 b/file0
 
-ok 24 - submodule contains untracked and modified content (untracked ignored)
+ok 220 - diff --default-prefix overrides diff.mnemonicPrefix
 
-expecting success of 4060.25 'submodule contains untracked and modified content (dirty ignored)': 
-	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+expecting success of 4013.221 'diff respects diff.srcPrefix': 
+	git -c diff.srcPrefix=x/ diff >actual &&
+	check_prefix actual x/file0 b/file0
 
-ok 25 - submodule contains untracked and modified content (dirty ignored)
+ok 221 - diff respects diff.srcPrefix
 
-expecting success of 4060.26 'submodule contains untracked and modified content (all ignored)': 
-	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+expecting success of 4013.222 'diff respects diff.dstPrefix': 
+	git -c diff.dstPrefix=y/ diff >actual &&
+	check_prefix actual a/file0 y/file0
 
-ok 26 - submodule contains untracked and modified content (all ignored)
+ok 222 - diff respects diff.dstPrefix
 
-expecting success of 4060.27 'submodule contains modified content': 
-	rm -f sm1/new-file &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
-	EOF
-	diff_cmp expected actual
+expecting success of 4013.223 'diff --src-prefix overrides diff.srcPrefix': 
+	git -c diff.srcPrefix=y/ diff --src-prefix=z/ >actual &&
+	check_prefix actual z/file0 b/file0
 
-ok 27 - submodule contains modified content
+ok 223 - diff --src-prefix overrides diff.srcPrefix
 
-expecting success of 4060.28 'submodule is modified': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
-	EOF
-	diff_cmp expected actual
+expecting success of 4013.224 'diff --dst-prefix overrides diff.dstPrefix': 
+	git -c diff.dstPrefix=y/ diff --dst-prefix=z/ >actual &&
+	check_prefix actual a/file0 z/file0
 
-ok 28 - submodule is modified
+ok 224 - diff --dst-prefix overrides diff.dstPrefix
 
-expecting success of 4060.29 'modified submodule contains untracked content': 
-	echo new > sm1/new-file &&
-	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
-	EOF
-	diff_cmp expected actual
+expecting success of 4013.225 'diff.{src,dst}Prefix ignored with diff.noPrefix': 
+	git -c diff.dstPrefix=y/ -c diff.srcPrefix=x/ -c diff.noPrefix diff >actual &&
+	check_prefix actual file0 file0
 
-ok 29 - modified submodule contains untracked content
+ok 225 - diff.{src,dst}Prefix ignored with diff.noPrefix
 
-expecting success of 4060.30 'modified submodule contains untracked content (untracked ignored)': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
-	EOF
-	diff_cmp expected actual
+expecting success of 4013.226 'diff.{src,dst}Prefix ignored with diff.mnemonicPrefix': 
+	git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ -c diff.mnemonicPrefix diff >actual &&
+	check_prefix actual i/file0 w/file0
 
-ok 30 - modified submodule contains untracked content (untracked ignored)
+ok 226 - diff.{src,dst}Prefix ignored with diff.mnemonicPrefix
 
-expecting success of 4060.31 'modified submodule contains untracked content (dirty ignored)': 
-	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
-	EOF
-	diff_cmp expected actual
+expecting success of 4013.227 'diff.{src,dst}Prefix ignored with --default-prefix': 
+	git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ diff --default-prefix >actual &&
+	check_prefix actual a/file0 b/file0
 
-ok 31 - modified submodule contains untracked content (dirty ignored)
+ok 227 - diff.{src,dst}Prefix ignored with --default-prefix
 
-expecting success of 4060.32 'modified submodule contains untracked content (all ignored)': 
-	git diff-index -p --ignore-submodules=all --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+expecting success of 4013.228 'diff --no-renames cannot be abbreviated': 
+	test_expect_code 129 git diff --no-rename >actual 2>error &&
+	test_must_be_empty actual &&
+	grep "invalid option: --no-rename" error
 
-ok 32 - modified submodule contains untracked content (all ignored)
+error: invalid option: --no-rename
+ok 228 - diff --no-renames cannot be abbreviated
 
-expecting success of 4060.33 'modified submodule contains untracked and modified content': 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	Submodule sm1 contains modified content
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..dfda541 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1,2 @@
-	-foo6
-	+new
-	+modification
-	EOF
-	diff_cmp expected actual
+# passed all 228 test(s)
+1..228
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4113-apply-ending.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4113-apply-ending/.git/
+expecting success of 4113.1 'setup': git update-index --add file
+ok 1 - setup
 
-ok 33 - modified submodule contains untracked and modified content
+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
 
-expecting success of 4060.34 'modified submodule contains untracked and modified content (untracked ignored)': 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..e20e2d9 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1,3 @@
-	-foo6
-	+new
-	+modification
-	+modification
-	EOF
-	diff_cmp expected actual
+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
 
-ok 34 - modified submodule contains untracked and modified content (untracked ignored)
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4104-apply-boundary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 4060.35 'modified submodule contains untracked and modified content (dirty ignored)': 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
-	EOF
-	diff_cmp expected actual
+	# 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 &&
 
-ok 35 - modified submodule contains untracked and modified content (dirty ignored)
+	# 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 4060.36 'modified submodule contains untracked and modified content (all ignored)': 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+	# 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 &&
 
-ok 36 - modified submodule contains untracked and modified content (all ignored)
+	# 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 &&
 
-expecting success of 4060.37 'modified submodule contains modified content': 
-	rm -f sm1/new-file &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..ac466ca 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1,5 @@
-	-foo6
-	+new
-	+modification
-	+modification
-	+modification
-	+modification
-	EOF
-	diff_cmp expected actual
+	# 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 &&
 
-ok 37 - modified submodule contains modified content
+	# 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 &&
 
-expecting success of 4060.38 'deleted submodule': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	EOF
-	diff_cmp expected actual
+	# 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
 
-ok 38 - deleted submodule
+	# done
 
-expecting success of 4060.39 'create second submodule': 
-	test_create_repo sm2 &&
-	head9=$(add_file sm2 foo8 foo9) &&
-	git add sm2
+ok 1 - setup
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4060-diff-submodule-option-diff-format/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 39 - create second submodule
+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 4060.40 'multiple submodules': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head9 (new submodule)
-	diff --git a/sm2/foo8 b/sm2/foo8
-	new file mode 100644
-	index 0000000..db9916b
-	--- /dev/null
-	+++ b/sm2/foo8
-	@@ -0,0 +1 @@
-	+foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	new file mode 100644
-	index 0000000..9c3b4f6
-	--- /dev/null
-	+++ b/sm2/foo9
-	@@ -0,0 +1 @@
-	+foo9
-	EOF
-	diff_cmp expected actual
+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
 
-ok 40 - multiple submodules
+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 4060.41 'path filter': 
-	git diff-index -p --submodule=diff HEAD sm2 >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm2 0000000...$head9 (new submodule)
-	diff --git a/sm2/foo8 b/sm2/foo8
-	new file mode 100644
-	index 0000000..db9916b
-	--- /dev/null
-	+++ b/sm2/foo8
-	@@ -0,0 +1 @@
-	+foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	new file mode 100644
-	index 0000000..9c3b4f6
-	--- /dev/null
-	+++ b/sm2/foo9
-	@@ -0,0 +1 @@
-	+foo9
-	EOF
-	diff_cmp expected actual
+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
 
-ok 41 - path filter
+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 4060.42 'given commit': 
-	git diff-index -p --submodule=diff HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/.gitmodules b/.gitmodules
-	new file mode 100644
-	index 1234567..89abcde
-	--- /dev/null
-	+++ b/.gitmodules
-	@@ -0,0 +1,3 @@
-	+[submodule "sm2"]
-	+path = sm2
-	+url = bogus_url
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head9 (new submodule)
-	diff --git a/sm2/foo8 b/sm2/foo8
-	new file mode 100644
-	index 0000000..db9916b
-	--- /dev/null
-	+++ b/sm2/foo8
-	@@ -0,0 +1 @@
-	+foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	new file mode 100644
-	index 0000000..9c3b4f6
-	--- /dev/null
-	+++ b/sm2/foo9
-	@@ -0,0 +1 @@
-	+foo9
-	EOF
-	diff_cmp expected actual
+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
 
-ok 42 - given commit
+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 4060.43 'setup .git file for sm2': 
-	git submodule absorbgitdirs sm2
+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
 
-Migrating git directory of 'sm2' from
-'/build/reproducible-path/git-2.51.0/t/trash directory.t4060-diff-submodule-option-diff-format/sm2/.git' to
-'/build/reproducible-path/git-2.51.0/t/trash directory.t4060-diff-submodule-option-diff-format/.git/modules/sm2'
-ok 43 - setup .git file for sm2
+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 4060.44 'diff --submodule=diff with .git file': 
-	git diff --submodule=diff HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/.gitmodules b/.gitmodules
-	new file mode 100644
-	index 1234567..89abcde
-	--- /dev/null
-	+++ b/.gitmodules
-	@@ -0,0 +1,3 @@
-	+[submodule "sm2"]
-	+path = sm2
-	+url = bogus_url
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head9 (new submodule)
-	diff --git a/sm2/foo8 b/sm2/foo8
-	new file mode 100644
-	index 0000000..db9916b
-	--- /dev/null
-	+++ b/sm2/foo8
-	@@ -0,0 +1 @@
-	+foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	new file mode 100644
-	index 0000000..9c3b4f6
-	--- /dev/null
-	+++ b/sm2/foo9
-	@@ -0,0 +1 @@
-	+foo9
-	EOF
-	diff_cmp expected actual
+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
 
-ok 44 - diff --submodule=diff with .git file
+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 4060.45 'deleted submodule with .git file': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 $head9...0000000 (submodule deleted)
-	diff --git a/sm2/foo8 b/sm2/foo8
-	deleted file mode 100644
-	index 1234567..89abcde
-	--- a/sm2/foo8
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	deleted file mode 100644
-	index 1234567..89abcde
-	--- a/sm2/foo9
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo9
-	EOF
-	diff_cmp expected actual
+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
 
-ok 45 - deleted submodule with .git file
+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 4060.46 'typechanged(submodule->blob) submodule with .git file': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 $head9...0000000 (submodule deleted)
-	diff --git a/sm2/foo8 b/sm2/foo8
-	deleted file mode 100644
-	index 1234567..89abcde
-	--- a/sm2/foo8
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	deleted file mode 100644
-	index 1234567..89abcde
-	--- a/sm2/foo9
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo9
-	diff --git a/sm2 b/sm2
-	new file mode 100644
-	index 1234567..89abcde
-	--- /dev/null
-	+++ b/sm2
-	@@ -0,0 +1 @@
-	+submodule-to-blob
-	EOF
-	diff_cmp expected actual
+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
 
-ok 46 - typechanged(submodule->blob) submodule with .git file
+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 4060.47 'setup nested submodule': 
-	git -c protocol.file.allow=always -C sm2 submodule add ../sm2 nested &&
-	git -C sm2 commit -a -m "nested sub" &&
-	head10=$(git -C sm2 rev-parse --short --verify HEAD)
+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
 
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t4060-diff-submodule-option-diff-format/sm2/nested'...
-done.
-[master 280969a] nested sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 nested
-ok 47 - setup nested submodule
+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 4060.48 'move nested submodule HEAD': 
-	echo "nested content" >sm2/nested/file &&
-	git -C sm2/nested add file &&
-	git -C sm2/nested commit --allow-empty -m "new HEAD" &&
-	head11=$(git -C sm2/nested rev-parse --short --verify HEAD)
+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
 
-[master b55928c] new HEAD
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 48 - move nested submodule HEAD
+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 4060.49 'diff --submodule=diff with moved nested submodule HEAD': 
-	cat >expected <<-EOF &&
-	Submodule nested $head9..$head11:
-	diff --git a/nested/file b/nested/file
-	new file mode 100644
-	index 0000000..ca281f5
-	--- /dev/null
-	+++ b/nested/file
-	@@ -0,0 +1 @@
-	+nested content
-	EOF
-	git -C sm2 diff --submodule=diff >actual 2>err &&
-	test_must_be_empty err &&
-	diff_cmp expected actual
+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
 
-ok 49 - diff --submodule=diff with moved nested submodule HEAD
+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 4060.50 'diff --submodule=diff recurses into nested submodules': 
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 contains modified content
-	Submodule sm2 $head9..$head10:
-	diff --git a/sm2/.gitmodules b/sm2/.gitmodules
-	new file mode 100644
-	index 0000000..3a816b8
-	--- /dev/null
-	+++ b/sm2/.gitmodules
-	@@ -0,0 +1,3 @@
-	+[submodule "nested"]
-	+	path = nested
-	+	url = ../sm2
-	Submodule nested 0000000...$head11 (new submodule)
-	diff --git a/sm2/nested/file b/sm2/nested/file
-	new file mode 100644
-	index 0000000..ca281f5
-	--- /dev/null
-	+++ b/sm2/nested/file
-	@@ -0,0 +1 @@
-	+nested content
-	diff --git a/sm2/nested/foo8 b/sm2/nested/foo8
-	new file mode 100644
-	index 0000000..db9916b
-	--- /dev/null
-	+++ b/sm2/nested/foo8
-	@@ -0,0 +1 @@
-	+foo8
-	diff --git a/sm2/nested/foo9 b/sm2/nested/foo9
-	new file mode 100644
-	index 0000000..9c3b4f6
-	--- /dev/null
-	+++ b/sm2/nested/foo9
-	@@ -0,0 +1 @@
-	+foo9
-	EOF
-	git diff --submodule=diff >actual 2>err &&
-	test_must_be_empty err &&
-	diff_cmp expected actual
+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
 
-ok 50 - diff --submodule=diff recurses into nested submodules
+error: patch failed: file:0
+error: file: patch does not apply
+ok 23 - two lines
 
-expecting success of 4060.51 'diff --submodule=diff recurses into deleted nested submodules': 
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 $head12...0000000 (submodule deleted)
-	diff --git a/sm2/.gitmodules b/sm2/.gitmodules
-	deleted file mode 100644
-	index 3a816b8..0000000
-	--- a/sm2/.gitmodules
-	+++ /dev/null
-	@@ -1,3 +0,0 @@
-	-[submodule "nested"]
-	-	path = nested
-	-	url = ../sm2
-	diff --git a/sm2/foo8 b/sm2/foo8
-	deleted file mode 100644
-	index db9916b..0000000
-	--- a/sm2/foo8
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	deleted file mode 100644
-	index 9c3b4f6..0000000
-	--- a/sm2/foo9
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo9
-	Submodule nested $head11...0000000 (submodule deleted)
-	diff --git a/sm2/nested/file b/sm2/nested/file
-	deleted file mode 100644
-	index ca281f5..0000000
-	--- a/sm2/nested/file
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-nested content
-	diff --git a/sm2/nested/foo8 b/sm2/nested/foo8
-	deleted file mode 100644
-	index db9916b..0000000
-	--- a/sm2/nested/foo8
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo8
-	diff --git a/sm2/nested/foo9 b/sm2/nested/foo9
-	deleted file mode 100644
-	index 9c3b4f6..0000000
-	--- a/sm2/nested/foo9
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo9
-	EOF
-	git diff --submodule=diff >actual 2>err &&
-	test_must_be_empty err &&
-	diff_cmp expected actual
+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
 
-ok 51 - diff --submodule=diff recurses into deleted nested submodules
+error: patch failed: file:2
+error: file: patch does not apply
+ok 24 - apply patch with 3 context lines matching at end
 
-# passed all 51 test(s)
-1..51
+# passed all 24 test(s)
+1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4014-format-patch.sh ***
@@ -270486,8 +270143,8 @@
 	! test_cmp fail actual2
 
 Switched to branch 'patchid'
---- fail	2025-08-27 08:21:14.719762503 +0000
-+++ actual1	2025-08-27 08:21:14.595761685 +0000
+--- fail	2026-09-29 14:52:33.030548970 +0000
++++ actual1	2026-09-29 14:52:32.962548970 +0000
 @@ -1,7 +1,7 @@
  
  base-commit: 18ed22aae56367787c36a882bd61281e07994f11
@@ -270498,8 +270155,8 @@
  -- 
  2.51.0
  
---- fail	2025-08-27 08:21:14.719762503 +0000
-+++ actual2	2025-08-27 08:21:14.615761817 +0000
+--- fail	2026-09-29 14:52:33.030548970 +0000
++++ actual2	2026-09-29 14:52:32.974548970 +0000
 @@ -1,7 +1,7 @@
  
  base-commit: 18ed22aae56367787c36a882bd61281e07994f11
@@ -270971,6 +270628,1283 @@
 1..212
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4060-diff-submodule-option-diff-format.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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)
+
+expecting success of 4060.14 'typechanged submodule(submodule->blob)': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head4...0000000 (submodule deleted)
+	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 14 - typechanged submodule(submodule->blob)
+
+expecting success of 4060.15 'setup': 
+	rm -f sm1 &&
+	git init sm1 &&
+	head6=$(add_file sm1 foo6 foo7)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4060-diff-submodule-option-diff-format/sm1/.git/
+ok 15 - setup
+
+expecting success of 4060.16 'nonexistent commit': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head4...$head6 (commits not present)
+	EOF
+	diff_cmp expected actual
+
+ok 16 - nonexistent commit
+
+expecting success of 4060.17 'typechanged submodule(blob->submodule)': 
+	git diff-index -p --submodule=diff HEAD >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...$head6 (new submodule)
+	diff --git a/sm1/foo6 b/sm1/foo6
+	new file mode 100644
+	index 0000000..462398b
+	--- /dev/null
+	+++ b/sm1/foo6
+	@@ -0,0 +1 @@
+	+foo6
+	diff --git a/sm1/foo7 b/sm1/foo7
+	new file mode 100644
+	index 0000000..6e9262c
+	--- /dev/null
+	+++ b/sm1/foo7
+	@@ -0,0 +1 @@
+	+foo7
+	EOF
+	diff_cmp expected actual
+
+ok 17 - typechanged submodule(blob->submodule)
+
+expecting success of 4060.18 'submodule is up to date': 
+	head7=$(git -C sm1 rev-parse --short --verify HEAD) &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 18 - submodule is up to date
+
+expecting success of 4060.19 'submodule contains untracked content': 
+	echo new > sm1/new-file &&
+	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	EOF
+	diff_cmp expected actual
+
+ok 19 - submodule contains untracked content
+
+expecting success of 4060.20 'submodule contains untracked content (untracked ignored)': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 20 - submodule contains untracked content (untracked ignored)
+
+expecting success of 4060.21 'submodule contains untracked content (dirty ignored)': 
+	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 21 - submodule contains untracked content (dirty ignored)
+
+expecting success of 4060.22 'submodule contains untracked content (all ignored)': 
+	git diff-index -p --ignore-submodules=all --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 22 - submodule contains untracked content (all ignored)
+
+expecting success of 4060.23 'submodule contains untracked and modified content': 
+	echo new > sm1/foo6 &&
+	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	Submodule sm1 contains modified content
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 23 - submodule contains untracked and modified content
+
+expecting success of 4060.24 'submodule contains untracked and modified content (untracked ignored)': 
+	echo new > sm1/foo6 &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 24 - submodule contains untracked and modified content (untracked ignored)
+
+expecting success of 4060.25 'submodule contains untracked and modified content (dirty ignored)': 
+	echo new > sm1/foo6 &&
+	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 25 - submodule contains untracked and modified content (dirty ignored)
+
+expecting success of 4060.26 'submodule contains untracked and modified content (all ignored)': 
+	echo new > sm1/foo6 &&
+	git diff-index -p --ignore-submodules --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 26 - submodule contains untracked and modified content (all ignored)
+
+expecting success of 4060.27 'submodule contains modified content': 
+	rm -f sm1/new-file &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 27 - submodule contains modified content
+
+expecting success of 4060.28 'submodule is modified': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 28 - submodule is modified
+
+expecting success of 4060.29 'modified submodule contains untracked content': 
+	echo new > sm1/new-file &&
+	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 29 - modified submodule contains untracked content
+
+expecting success of 4060.30 'modified submodule contains untracked content (untracked ignored)': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 30 - modified submodule contains untracked content (untracked ignored)
+
+expecting success of 4060.31 'modified submodule contains untracked content (dirty ignored)': 
+	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 31 - modified submodule contains untracked content (dirty ignored)
+
+expecting success of 4060.32 'modified submodule contains untracked content (all ignored)': 
+	git diff-index -p --ignore-submodules=all --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 32 - modified submodule contains untracked content (all ignored)
+
+expecting success of 4060.33 'modified submodule contains untracked and modified content': 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	Submodule sm1 contains modified content
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..dfda541 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1,2 @@
+	-foo6
+	+new
+	+modification
+	EOF
+	diff_cmp expected actual
+
+ok 33 - modified submodule contains untracked and modified content
+
+expecting success of 4060.34 'modified submodule contains untracked and modified content (untracked ignored)': 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..e20e2d9 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1,3 @@
+	-foo6
+	+new
+	+modification
+	+modification
+	EOF
+	diff_cmp expected actual
+
+ok 34 - modified submodule contains untracked and modified content (untracked ignored)
+
+expecting success of 4060.35 'modified submodule contains untracked and modified content (dirty ignored)': 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 35 - modified submodule contains untracked and modified content (dirty ignored)
+
+expecting success of 4060.36 'modified submodule contains untracked and modified content (all ignored)': 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --ignore-submodules --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 36 - modified submodule contains untracked and modified content (all ignored)
+
+expecting success of 4060.37 'modified submodule contains modified content': 
+	rm -f sm1/new-file &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..ac466ca 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1,5 @@
+	-foo6
+	+new
+	+modification
+	+modification
+	+modification
+	+modification
+	EOF
+	diff_cmp expected actual
+
+ok 37 - modified submodule contains modified content
+
+expecting success of 4060.38 'deleted submodule': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	EOF
+	diff_cmp expected actual
+
+ok 38 - deleted submodule
+
+expecting success of 4060.39 'create second submodule': 
+	test_create_repo sm2 &&
+	head9=$(add_file sm2 foo8 foo9) &&
+	git add sm2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4060-diff-submodule-option-diff-format/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 39 - create second submodule
+
+expecting success of 4060.40 'multiple submodules': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head9 (new submodule)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	new file mode 100644
+	index 0000000..db9916b
+	--- /dev/null
+	+++ b/sm2/foo8
+	@@ -0,0 +1 @@
+	+foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	new file mode 100644
+	index 0000000..9c3b4f6
+	--- /dev/null
+	+++ b/sm2/foo9
+	@@ -0,0 +1 @@
+	+foo9
+	EOF
+	diff_cmp expected actual
+
+ok 40 - multiple submodules
+
+expecting success of 4060.41 'path filter': 
+	git diff-index -p --submodule=diff HEAD sm2 >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm2 0000000...$head9 (new submodule)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	new file mode 100644
+	index 0000000..db9916b
+	--- /dev/null
+	+++ b/sm2/foo8
+	@@ -0,0 +1 @@
+	+foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	new file mode 100644
+	index 0000000..9c3b4f6
+	--- /dev/null
+	+++ b/sm2/foo9
+	@@ -0,0 +1 @@
+	+foo9
+	EOF
+	diff_cmp expected actual
+
+ok 41 - path filter
+
+expecting success of 4060.42 'given commit': 
+	git diff-index -p --submodule=diff HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/.gitmodules b/.gitmodules
+	new file mode 100644
+	index 1234567..89abcde
+	--- /dev/null
+	+++ b/.gitmodules
+	@@ -0,0 +1,3 @@
+	+[submodule "sm2"]
+	+path = sm2
+	+url = bogus_url
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head9 (new submodule)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	new file mode 100644
+	index 0000000..db9916b
+	--- /dev/null
+	+++ b/sm2/foo8
+	@@ -0,0 +1 @@
+	+foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	new file mode 100644
+	index 0000000..9c3b4f6
+	--- /dev/null
+	+++ b/sm2/foo9
+	@@ -0,0 +1 @@
+	+foo9
+	EOF
+	diff_cmp expected actual
+
+ok 42 - given commit
+
+expecting success of 4060.43 'setup .git file for sm2': 
+	git submodule absorbgitdirs sm2
+
+Migrating git directory of 'sm2' from
+'/build/reproducible-path/git-2.51.0/t/trash directory.t4060-diff-submodule-option-diff-format/sm2/.git' to
+'/build/reproducible-path/git-2.51.0/t/trash directory.t4060-diff-submodule-option-diff-format/.git/modules/sm2'
+ok 43 - setup .git file for sm2
+
+expecting success of 4060.44 'diff --submodule=diff with .git file': 
+	git diff --submodule=diff HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/.gitmodules b/.gitmodules
+	new file mode 100644
+	index 1234567..89abcde
+	--- /dev/null
+	+++ b/.gitmodules
+	@@ -0,0 +1,3 @@
+	+[submodule "sm2"]
+	+path = sm2
+	+url = bogus_url
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head9 (new submodule)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	new file mode 100644
+	index 0000000..db9916b
+	--- /dev/null
+	+++ b/sm2/foo8
+	@@ -0,0 +1 @@
+	+foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	new file mode 100644
+	index 0000000..9c3b4f6
+	--- /dev/null
+	+++ b/sm2/foo9
+	@@ -0,0 +1 @@
+	+foo9
+	EOF
+	diff_cmp expected actual
+
+ok 44 - diff --submodule=diff with .git file
+
+expecting success of 4060.45 'deleted submodule with .git file': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 $head9...0000000 (submodule deleted)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	deleted file mode 100644
+	index 1234567..89abcde
+	--- a/sm2/foo8
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	deleted file mode 100644
+	index 1234567..89abcde
+	--- a/sm2/foo9
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo9
+	EOF
+	diff_cmp expected actual
+
+ok 45 - deleted submodule with .git file
+
+expecting success of 4060.46 'typechanged(submodule->blob) submodule with .git file': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 $head9...0000000 (submodule deleted)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	deleted file mode 100644
+	index 1234567..89abcde
+	--- a/sm2/foo8
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	deleted file mode 100644
+	index 1234567..89abcde
+	--- a/sm2/foo9
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo9
+	diff --git a/sm2 b/sm2
+	new file mode 100644
+	index 1234567..89abcde
+	--- /dev/null
+	+++ b/sm2
+	@@ -0,0 +1 @@
+	+submodule-to-blob
+	EOF
+	diff_cmp expected actual
+
+ok 46 - typechanged(submodule->blob) submodule with .git file
+
+expecting success of 4060.47 'setup nested submodule': 
+	git -c protocol.file.allow=always -C sm2 submodule add ../sm2 nested &&
+	git -C sm2 commit -a -m "nested sub" &&
+	head10=$(git -C sm2 rev-parse --short --verify HEAD)
+
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t4060-diff-submodule-option-diff-format/sm2/nested'...
+done.
+[master 280969a] nested sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 nested
+ok 47 - setup nested submodule
+
+expecting success of 4060.48 'move nested submodule HEAD': 
+	echo "nested content" >sm2/nested/file &&
+	git -C sm2/nested add file &&
+	git -C sm2/nested commit --allow-empty -m "new HEAD" &&
+	head11=$(git -C sm2/nested rev-parse --short --verify HEAD)
+
+[master b55928c] new HEAD
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 48 - move nested submodule HEAD
+
+expecting success of 4060.49 'diff --submodule=diff with moved nested submodule HEAD': 
+	cat >expected <<-EOF &&
+	Submodule nested $head9..$head11:
+	diff --git a/nested/file b/nested/file
+	new file mode 100644
+	index 0000000..ca281f5
+	--- /dev/null
+	+++ b/nested/file
+	@@ -0,0 +1 @@
+	+nested content
+	EOF
+	git -C sm2 diff --submodule=diff >actual 2>err &&
+	test_must_be_empty err &&
+	diff_cmp expected actual
+
+ok 49 - diff --submodule=diff with moved nested submodule HEAD
+
+expecting success of 4060.50 'diff --submodule=diff recurses into nested submodules': 
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 contains modified content
+	Submodule sm2 $head9..$head10:
+	diff --git a/sm2/.gitmodules b/sm2/.gitmodules
+	new file mode 100644
+	index 0000000..3a816b8
+	--- /dev/null
+	+++ b/sm2/.gitmodules
+	@@ -0,0 +1,3 @@
+	+[submodule "nested"]
+	+	path = nested
+	+	url = ../sm2
+	Submodule nested 0000000...$head11 (new submodule)
+	diff --git a/sm2/nested/file b/sm2/nested/file
+	new file mode 100644
+	index 0000000..ca281f5
+	--- /dev/null
+	+++ b/sm2/nested/file
+	@@ -0,0 +1 @@
+	+nested content
+	diff --git a/sm2/nested/foo8 b/sm2/nested/foo8
+	new file mode 100644
+	index 0000000..db9916b
+	--- /dev/null
+	+++ b/sm2/nested/foo8
+	@@ -0,0 +1 @@
+	+foo8
+	diff --git a/sm2/nested/foo9 b/sm2/nested/foo9
+	new file mode 100644
+	index 0000000..9c3b4f6
+	--- /dev/null
+	+++ b/sm2/nested/foo9
+	@@ -0,0 +1 @@
+	+foo9
+	EOF
+	git diff --submodule=diff >actual 2>err &&
+	test_must_be_empty err &&
+	diff_cmp expected actual
+
+ok 50 - diff --submodule=diff recurses into nested submodules
+
+expecting success of 4060.51 'diff --submodule=diff recurses into deleted nested submodules': 
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 $head12...0000000 (submodule deleted)
+	diff --git a/sm2/.gitmodules b/sm2/.gitmodules
+	deleted file mode 100644
+	index 3a816b8..0000000
+	--- a/sm2/.gitmodules
+	+++ /dev/null
+	@@ -1,3 +0,0 @@
+	-[submodule "nested"]
+	-	path = nested
+	-	url = ../sm2
+	diff --git a/sm2/foo8 b/sm2/foo8
+	deleted file mode 100644
+	index db9916b..0000000
+	--- a/sm2/foo8
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	deleted file mode 100644
+	index 9c3b4f6..0000000
+	--- a/sm2/foo9
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo9
+	Submodule nested $head11...0000000 (submodule deleted)
+	diff --git a/sm2/nested/file b/sm2/nested/file
+	deleted file mode 100644
+	index ca281f5..0000000
+	--- a/sm2/nested/file
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-nested content
+	diff --git a/sm2/nested/foo8 b/sm2/nested/foo8
+	deleted file mode 100644
+	index db9916b..0000000
+	--- a/sm2/nested/foo8
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo8
+	diff --git a/sm2/nested/foo9 b/sm2/nested/foo9
+	deleted file mode 100644
+	index 9c3b4f6..0000000
+	--- a/sm2/nested/foo9
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo9
+	EOF
+	git diff --submodule=diff >actual 2>err &&
+	test_must_be_empty err &&
+	diff_cmp expected actual
+
+ok 51 - diff --submodule=diff recurses into deleted nested submodules
+
+# passed all 51 test(s)
+1..51
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4103-apply-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
+	tr "x" "\000" <file1 >file3 &&
+	cat file3 >file4 &&
+	git add file2 &&
+	tr "y" "\000" <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 55950f3] Second Version
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename file2 => file3 (57%)
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 |  Bin
+ file2 |    5 -----
+ file3 |  Bin
+ file4 |  Bin
+ 4 files changed, 5 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 |  Bin
+ file3 |  Bin
+ file4 |  Bin
+ 3 files changed, 0 insertions(+), 0 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
+Already on 'main'
+error: cannot apply binary patch to 'file1' without full index line
+error: file1: patch does not apply
+error: cannot apply binary patch to 'file3' without full index line
+error: file3: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 5 - check binary diff -- should fail.
+
+expecting success of 4103.6 'check binary diff (copy) -- should fail.': git checkout main &&
+	 test_must_fail git apply --check C.diff
+Already on 'main'
+error: cannot apply binary patch to 'file1' without full index line
+error: file1: patch does not apply
+error: cannot apply binary patch to 'file2' without full index line
+error: file2: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 6 - check binary diff (copy) -- should fail.
+
+expecting success of 4103.7 'check incomplete binary diff with replacement -- should fail.': 
+	git checkout main &&
+	test_must_fail git apply --check --allow-binary-replacement B.diff
+
+Already on 'main'
+error: cannot apply binary patch to 'file1' without full index line
+error: file1: patch does not apply
+error: cannot apply binary patch to 'file3' without full index line
+error: file3: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 7 - check incomplete binary diff with replacement -- should fail.
+
+expecting success of 4103.8 'check incomplete binary diff with replacement (copy) -- should fail.': 
+	 git checkout main &&
+	 test_must_fail git apply --check --allow-binary-replacement C.diff
+
+Already on 'main'
+error: cannot apply binary patch to 'file1' without full index line
+error: file1: patch does not apply
+error: cannot apply binary patch to 'file2' without full index line
+error: file2: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 8 - check incomplete binary diff with replacement (copy) -- should fail.
+
+expecting success of 4103.9 'check binary diff with replacement.': git checkout main &&
+	 git apply --check --allow-binary-replacement BF.diff
+Already on 'main'
+ok 9 - check binary diff with replacement.
+
+expecting success of 4103.10 'check binary diff with replacement (copy).': git checkout main &&
+	 git apply --check --allow-binary-replacement CF.diff
+Already on 'main'
+ok 10 - check binary diff with replacement (copy).
+
+expecting success of 4103.11 'apply binary diff -- should fail.': do_reset &&
+	 test_must_fail git apply B.diff
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+error: cannot apply binary patch to 'file1' without full index line
+error: file1: patch does not apply
+error: cannot apply binary patch to 'file3' without full index line
+error: file3: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 11 - apply binary diff -- should fail.
+
+expecting success of 4103.12 'apply binary diff -- should fail.': do_reset &&
+	 test_must_fail git apply --index B.diff
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+error: cannot apply binary patch to 'file1' without full index line
+error: file1: patch does not apply
+error: cannot apply binary patch to 'file3' without full index line
+error: file3: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 12 - apply binary diff -- should fail.
+
+expecting success of 4103.13 'apply binary diff (copy) -- should fail.': do_reset &&
+	 test_must_fail git apply C.diff
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+error: cannot apply binary patch to 'file1' without full index line
+error: file1: patch does not apply
+error: cannot apply binary patch to 'file2' without full index line
+error: file2: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 13 - apply binary diff (copy) -- should fail.
+
+expecting success of 4103.14 'apply binary diff (copy) -- should fail.': do_reset &&
+	 test_must_fail git apply --index C.diff
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+error: cannot apply binary patch to 'file1' without full index line
+error: file1: patch does not apply
+error: cannot apply binary patch to 'file2' without full index line
+error: file2: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 14 - apply binary diff (copy) -- should fail.
+
+expecting success of 4103.15 'apply binary diff with full-index': 
+	do_reset &&
+	git apply B-index.diff
+
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+ok 15 - apply binary diff with full-index
+
+expecting success of 4103.16 'apply binary diff with full-index (copy)': 
+	do_reset &&
+	git apply C-index.diff
+
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+ok 16 - apply binary diff with full-index (copy)
+
+expecting success of 4103.17 'apply full-index binary diff in new repo': 
+	(cd other-repo &&
+	 do_reset &&
+	 test_must_fail git apply ../B-index.diff)
+
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+error: missing binary patch data for 'file1'
+error: binary patch does not apply to 'file1'
+error: file1: patch does not apply
+error: missing binary patch data for 'file3'
+error: binary patch does not apply to 'file3'
+error: file3: patch does not apply
+error: missing binary patch data for 'file4'
+error: binary patch does not apply to 'file4'
+error: file4: patch does not apply
+ok 17 - apply full-index binary diff in new repo
+
+expecting success of 4103.18 'apply binary diff without replacement.': do_reset &&
+	 git apply BF.diff
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+ok 18 - apply binary diff without replacement.
+
+expecting success of 4103.19 'apply binary diff without replacement (copy).': do_reset &&
+	 git apply CF.diff
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+ok 19 - apply binary diff without replacement (copy).
+
+expecting success of 4103.20 'apply binary diff.': do_reset &&
+	 git apply --allow-binary-replacement --index BF.diff &&
+	 test -z "$(git diff --name-status binary)"
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+ok 20 - apply binary diff.
+
+expecting success of 4103.21 'apply binary diff (copy).': do_reset &&
+	 git apply --allow-binary-replacement --index CF.diff &&
+	 test -z "$(git diff --name-status binary)"
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+ok 21 - apply binary diff (copy).
+
+expecting success of 4103.22 'apply binary -p0 diff': 
+	do_reset &&
+	git apply -p0 --index B0.diff &&
+	test -z "$(git diff --name-status binary -- file3)"
+
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+ok 22 - apply binary -p0 diff
+
+expecting success of 4103.23 'reject truncated binary diff': 
+	do_reset &&
+
+	# this length is calculated to get us very close to
+	# the 8192-byte strbuf we will use to read in the patch.
+	test-tool genrandom foo 6205 >file1 &&
+	git diff --binary >patch &&
+
+	# truncate the patch at the second "literal" line,
+	# but exclude the trailing newline. We must use perl
+	# for this, since tools like "sed" cannot reliably
+	# produce output without the trailing newline.
+	perl -pe "
+		if (/^literal/ && \$count++ >= 1) {
+			chomp;
+			print;
+			exit 0;
+		}
+	" <patch >patch.trunc &&
+
+	do_reset &&
+	test_must_fail git apply patch.trunc
+
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+error: corrupt binary patch at line 127: 
+error: No valid patches in input (allow with "--allow-empty")
+ok 23 - reject truncated binary diff
+
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4118-apply-empty-context.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4118-apply-empty-context/.git/
 expecting success of 4118.1 'setup': 
@@ -271019,197 +271953,108 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4115-apply-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
+*** t4116-apply-reverse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4116-apply-reverse/.git/
+expecting success of 4116.1 'setup': 
 
-	rm -f link? &&
+	test_write_lines a b c d e f g h i j k l m n >file1 &&
+	tr "ijk" "\000\001\002" <file1 >file2 &&
 
-	test_ln_s_add htap6 link1 &&
-	git commit -m second &&
+	git add file1 file2 &&
+	git commit -m initial &&
+	git tag initial &&
 
-	git diff-tree -p HEAD^ HEAD >patch  &&
-	git apply --stat --summary patch
+	test_write_lines a b c g h i J K L m o n p q >file1 &&
+	tr "mon" "\000\001\002" <file1 >file2 &&
 
+	git commit -a -m second &&
+	git tag second &&
 
-checking prerequisite: SYMLINKS
+	git diff --binary initial second >patch
 
-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
+[master (root-commit) 40ea0d8] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 link1
-[master 3f5d5e0] second
+ 2 files changed, 14 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+[master 09f0b7a] second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- link1 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 2 files changed, 6 insertions(+), 6 deletions(-)
 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
-
+expecting success of 4116.2 'apply in forward': 
 
-Already on 'side'
-ok 3 - apply --index symlink patch
+	T0=$(git rev-parse "second^{tree}") &&
+	git reset --hard initial &&
+	git apply --index --binary patch &&
+	T1=$(git write-tree) &&
+	test "$T0" = "$T1"
 
-expecting success of 4115.4 'symlink setup': 
-	ln -s .git symlink &&
-	git add symlink &&
-	git commit -m "add symlink"
+HEAD is now at 40ea0d8 initial
+ok 2 - apply in forward
 
-[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 4116.3 'apply in reverse': 
 
-expecting success of 4115.5 'symlink escape when creating new files': 
-	test_when_finished "git reset --hard && git clean -dfx" &&
+	git reset --hard second &&
+	git apply --reverse --binary --index patch &&
+	git diff >diff &&
+	test_must_be_empty diff
 
-	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 09f0b7a second
+ok 3 - apply in reverse
 
-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 4116.4 'setup separate repository lacking postimage': 
 
-expecting success of 4115.6 'symlink escape when modifying file': 
-	test_when_finished "git reset --hard && git clean -dfx" &&
-	touch .git/modify-me &&
+	git archive --format=tar --prefix=initial/ initial | $TAR xf - &&
+	(
+		cd initial && git init && git add .
+	) &&
 
-	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
+	git archive --format=tar --prefix=second/ second | $TAR xf - &&
+	(
+		cd second && git init && git add .
+	)
 
-	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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4116-apply-reverse/initial/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4116-apply-reverse/second/.git/
+ok 4 - setup separate repository lacking postimage
 
-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 &&
+expecting success of 4116.5 'apply in forward without postimage': 
 
-	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
+	T0=$(git rev-parse "second^{tree}") &&
+	(
+		cd initial &&
+		git apply --index --binary ../patch &&
+		T1=$(git write-tree) &&
+		test "$T0" = "$T1"
+	)
 
-	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
+ok 5 - apply in forward without postimage
 
-HEAD is now at 3bf7232 add symlink
-Removing expected_stderr
-Removing patch
-Removing stderr
-ok 7 - symlink escape when deleting file
+expecting success of 4116.6 'apply in reverse without postimage': 
 
-expecting success of 4115.8 '--reject removes .rej symlink if it exists': 
-	test_when_finished "git reset --hard && git clean -dfx" &&
+	T0=$(git rev-parse "initial^{tree}") &&
+	(
+		cd second &&
+		git apply --index --binary --reverse ../patch &&
+		T1=$(git write-tree) &&
+		test "$T0" = "$T1"
+	)
 
-	test_commit file &&
-	echo modified >file.t &&
-	git diff -- file.t >patch &&
-	echo modified-again >file.t &&
+ok 6 - apply in reverse without postimage
 
-	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
+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
 
-[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
+ok 7 - reversing a whitespace introduction
 
-# passed all 8 test(s)
-1..8
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4117-apply-reject.sh ***
@@ -271599,108 +272444,197 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4116-apply-reverse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
-	tr "ijk" "\000\001\002" <file1 >file2 &&
+*** t4115-apply-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4115-apply-symlink/.git/
+expecting success of 4115.1 'setup': 
 
-	git add file1 file2 &&
+	test_ln_s_add path1/path2/path3/path4/path5 link1 &&
 	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 &&
-	tr "mon" "\000\001\002" <file1 >file2 &&
+	git branch side &&
 
-	git commit -a -m second &&
-	git tag second &&
+	rm -f link? &&
 
-	git diff --binary initial second >patch
+	test_ln_s_add htap6 link1 &&
+	git commit -m second &&
+
+	git diff-tree -p HEAD^ HEAD >patch  &&
+	git apply --stat --summary patch
 
 
-[master (root-commit) 40ea0d8] initial
+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>
- 2 files changed, 14 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-[master 09f0b7a] second
+ 1 file changed, 1 insertion(+)
+ create mode 120000 link1
+[master 3f5d5e0] second
  Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ link1 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
 
-expecting success of 4116.2 'apply in forward': 
+expecting success of 4115.2 'apply symlink patch': 
 
-	T0=$(git rev-parse "second^{tree}") &&
-	git reset --hard initial &&
-	git apply --index --binary patch &&
-	T1=$(git write-tree) &&
-	test "$T0" = "$T1"
+	git checkout side &&
+	git apply patch &&
+	git diff-files -p >patched &&
+	test_cmp patch patched
 
-HEAD is now at 40ea0d8 initial
-ok 2 - apply in forward
 
-expecting success of 4116.3 'apply in reverse': 
+Switched to branch 'side'
+ok 2 - apply symlink patch
 
-	git reset --hard second &&
-	git apply --reverse --binary --index patch &&
-	git diff >diff &&
-	test_must_be_empty diff
+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
 
-HEAD is now at 09f0b7a second
-ok 3 - apply in reverse
 
-expecting success of 4116.4 'setup separate repository lacking postimage': 
+Already on 'side'
+ok 3 - apply --index symlink patch
 
-	git archive --format=tar --prefix=initial/ initial | $TAR xf - &&
-	(
-		cd initial && git init && git add .
-	) &&
+expecting success of 4115.4 'symlink setup': 
+	ln -s .git symlink &&
+	git add symlink &&
+	git commit -m "add symlink"
 
-	git archive --format=tar --prefix=second/ second | $TAR xf - &&
-	(
-		cd second && git init && git add .
-	)
+[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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4116-apply-reverse/initial/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4116-apply-reverse/second/.git/
-ok 4 - setup separate repository lacking postimage
+	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
 
-expecting success of 4116.5 'apply in forward without postimage': 
+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
 
-	T0=$(git rev-parse "second^{tree}") &&
-	(
-		cd initial &&
-		git apply --index --binary ../patch &&
-		T1=$(git write-tree) &&
-		test "$T0" = "$T1"
-	)
+expecting success of 4115.6 'symlink escape when modifying file': 
+	test_when_finished "git reset --hard && git clean -dfx" &&
+	touch .git/modify-me &&
 
-ok 5 - apply in forward without postimage
+	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
 
-expecting success of 4116.6 'apply in reverse without postimage': 
+	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
 
-	T0=$(git rev-parse "initial^{tree}") &&
-	(
-		cd second &&
-		git apply --index --binary --reverse ../patch &&
-		T1=$(git write-tree) &&
-		test "$T0" = "$T1"
-	)
+HEAD is now at 3bf7232 add symlink
+Removing expected_stderr
+Removing patch
+Removing stderr
+ok 6 - symlink escape when modifying file
 
-ok 6 - apply in reverse without postimage
+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 &&
 
-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
+	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
 
-ok 7 - reversing a whitespace introduction
+	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
 
-# passed all 7 test(s)
-1..7
+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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4121-apply-diffs.sh ***
@@ -271834,32 +272768,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4123-apply-shrink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4123-apply-shrink/.git/
-expecting success of 4123.1 'setup': 
-
-	git add F &&
-	mv F G &&
-	sed -e "s/1/11/" -e "s/999999/9/" -e "s/H/HH/" <G >F &&
-	git diff >patch &&
-	sed -e "/^\$/d" <G >F &&
-	git add F
-
-
-ok 1 - setup
-
-expecting success of 4123.2 'apply should fail gracefully': 
-	test_must_fail git apply --index patch &&
-	test_path_is_missing .git/index.lock
-
-error: patch failed: F:14
-error: F: patch does not apply
-ok 2 - apply should fail gracefully
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4114-apply-typechange.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4114-apply-typechange/.git/
 expecting success of 4114.1 'setup repository and commits': 
@@ -272222,6 +273130,32 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4123-apply-shrink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4123-apply-shrink/.git/
+expecting success of 4123.1 'setup': 
+
+	git add F &&
+	mv F G &&
+	sed -e "s/1/11/" -e "s/999999/9/" -e "s/H/HH/" <G >F &&
+	git diff >patch &&
+	sed -e "/^\$/d" <G >F &&
+	git add F
+
+
+ok 1 - setup
+
+expecting success of 4123.2 'apply should fail gracefully': 
+	test_must_fail git apply --index patch &&
+	test_path_is_missing .git/index.lock
+
+error: patch failed: F:14
+error: F: patch does not apply
+ok 2 - apply should fail gracefully
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4125-apply-ws-fuzz.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4125-apply-ws-fuzz/.git/
 expecting success of 4125.1 'setup': 
@@ -272343,8 +273277,8 @@
 	! test_cmp fixed-tail file-tail
 
 
---- fixed-tail	2025-08-27 08:21:16.795776197 +0000
-+++ file-tail	2025-08-27 08:21:16.799776223 +0000
+--- fixed-tail	2026-09-29 14:52:34.626548970 +0000
++++ file-tail	2026-09-29 14:52:34.630548970 +0000
 @@ -1 +1 @@
 -h
 +h 
@@ -272354,6 +273288,318 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4122-apply-symlink-inside.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4122-apply-symlink-inside/.git/
+expecting success of 4122.1 'setup': 
+
+	mkdir -p arch/i386/boot arch/x86_64 &&
+	test_write_lines 1 2 3 4 5 >arch/i386/boot/Makefile &&
+	test_ln_s_add ../i386/boot arch/x86_64/boot &&
+	git add . &&
+	test_tick &&
+	git commit -m initial &&
+	git branch test &&
+
+	rm arch/x86_64/boot &&
+	mkdir arch/x86_64/boot &&
+	test_write_lines 2 3 4 5 6 >arch/x86_64/boot/Makefile &&
+	git add . &&
+	test_tick &&
+	git commit -a -m second &&
+
+	git format-patch --binary -1 --stdout >test.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
+[main (root-commit) f9acfaa] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 arch/i386/boot/Makefile
+ create mode 120000 arch/x86_64/boot
+[main e8e99d5] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ delete mode 120000 arch/x86_64/boot
+ create mode 100644 arch/x86_64/boot/Makefile
+ok 1 - setup
+
+expecting success of 4122.2 'apply': 
+
+	git checkout test &&
+	git diff --exit-code test &&
+	git diff --exit-code --cached test &&
+	git apply --index test.patch
+
+
+Switched to branch 'test'
+ok 2 - apply
+
+expecting success of 4122.3 'check result': 
+
+	git diff --exit-code main &&
+	git diff --exit-code --cached main &&
+	test_tick &&
+	git commit -m replay &&
+	T1=$(git rev-parse "main^{tree}") &&
+	T2=$(git rev-parse "HEAD^{tree}") &&
+	test "z$T1" = "z$T2"
+
+
+[test 66a4bdc] replay
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ delete mode 120000 arch/x86_64/boot
+ create mode 100644 arch/x86_64/boot/Makefile
+ok 3 - check result
+
+expecting success of 4122.4 'do not read from beyond symbolic link': 
+	git reset --hard &&
+	mkdir -p arch/x86_64/dir &&
+	>arch/x86_64/dir/file &&
+	git add arch/x86_64/dir/file &&
+	echo line >arch/x86_64/dir/file &&
+	git diff >patch &&
+	git reset --hard &&
+
+	mkdir arch/i386/dir &&
+	>arch/i386/dir/file &&
+	ln -s ../i386/dir arch/x86_64/dir &&
+
+	test_must_fail git apply patch &&
+	test_must_fail git apply --cached patch &&
+	test_must_fail git apply --index patch
+
+
+HEAD is now at 66a4bdc replay
+HEAD is now at 66a4bdc replay
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: arch/x86_64/dir/file: does not exist in index
+error: arch/x86_64/dir/file: does not exist in index
+ok 4 - do not read from beyond symbolic link
+
+expecting success of 4122.5 'do not follow symbolic link (setup)': 
+
+	rm -rf arch/i386/dir arch/x86_64/dir &&
+	git reset --hard &&
+	ln -s ../i386/dir arch/x86_64/dir &&
+	git add arch/x86_64/dir &&
+	git diff HEAD >add_symlink.patch &&
+	git reset --hard &&
+
+	mkdir arch/x86_64/dir &&
+	>arch/x86_64/dir/file &&
+	git add arch/x86_64/dir/file &&
+	git diff HEAD >add_file.patch &&
+	git diff -R HEAD >del_file.patch &&
+	git reset --hard &&
+	rm -fr arch/x86_64/dir &&
+
+	cat add_symlink.patch add_file.patch >patch &&
+	cat add_symlink.patch del_file.patch >tricky_del &&
+
+	mkdir arch/i386/dir
+
+HEAD is now at 66a4bdc replay
+HEAD is now at 66a4bdc replay
+HEAD is now at 66a4bdc replay
+ok 5 - do not follow symbolic link (setup)
+
+expecting success of 4122.6 'do not follow symbolic link (same input)': 
+
+	# same input creates a confusing symbolic link
+	test_must_fail git apply patch 2>error-wt &&
+	test_grep "beyond a symbolic link" error-wt &&
+	test_path_is_missing arch/x86_64/dir &&
+	test_path_is_missing arch/i386/dir/file &&
+
+	test_must_fail git apply --index patch 2>error-ix &&
+	test_grep "beyond a symbolic link" error-ix &&
+	test_path_is_missing arch/x86_64/dir &&
+	test_path_is_missing arch/i386/dir/file &&
+	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
+	test_must_fail git ls-files --error-unmatch arch/i386/dir &&
+
+	test_must_fail git apply --cached patch 2>error-ct &&
+	test_grep "beyond a symbolic link" error-ct &&
+	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
+	test_must_fail git ls-files --error-unmatch arch/i386/dir &&
+
+	>arch/i386/dir/file &&
+	git add arch/i386/dir/file &&
+
+	test_must_fail git apply tricky_del &&
+	test_path_is_file arch/i386/dir/file &&
+
+	test_must_fail git apply --index tricky_del &&
+	test_path_is_file arch/i386/dir/file &&
+	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
+	git ls-files --error-unmatch arch/i386/dir &&
+
+	test_must_fail git apply --cached tricky_del &&
+	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
+	git ls-files --error-unmatch arch/i386/dir
+
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: pathspec 'arch/i386/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: pathspec 'arch/i386/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: arch/x86_64/dir/file: No such file or directory
+error: arch/x86_64/dir/file: does not exist in index
+error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+arch/i386/dir/file
+error: arch/x86_64/dir/file: does not exist in index
+error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+arch/i386/dir/file
+ok 6 - do not follow symbolic link (same input)
+
+expecting success of 4122.7 'do not follow symbolic link (existing)': 
+
+	# existing symbolic link
+	git reset --hard &&
+	ln -s ../i386/dir arch/x86_64/dir &&
+	git add arch/x86_64/dir &&
+
+	test_must_fail git apply add_file.patch 2>error-wt-add &&
+	test_grep "beyond a symbolic link" error-wt-add &&
+	test_path_is_missing arch/i386/dir/file &&
+
+	mkdir arch/i386/dir &&
+	>arch/i386/dir/file &&
+	test_must_fail git apply del_file.patch 2>error-wt-del &&
+	test_grep "beyond a symbolic link" error-wt-del &&
+	test_path_is_file arch/i386/dir/file &&
+	rm arch/i386/dir/file &&
+
+	test_must_fail git apply --index add_file.patch 2>error-ix-add &&
+	test_grep "beyond a symbolic link" error-ix-add &&
+	test_path_is_missing arch/i386/dir/file &&
+	test_must_fail git ls-files --error-unmatch arch/i386/dir &&
+
+	test_must_fail git apply --cached add_file.patch 2>error-ct-file &&
+	test_grep "beyond a symbolic link" error-ct-file &&
+	test_must_fail git ls-files --error-unmatch arch/i386/dir
+
+HEAD is now at 66a4bdc replay
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: reading from 'arch/x86_64/dir/file' beyond a symbolic link
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: pathspec 'arch/i386/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: pathspec 'arch/i386/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 7 - do not follow symbolic link (existing)
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4128-apply-root.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4128-apply-root/.git/
+expecting success of 4128.1 'setup': 
+
+	mkdir -p some/sub/dir &&
+	echo Hello > some/sub/dir/file &&
+	git add some/sub/dir/file &&
+	git commit -m initial &&
+	git tag initial
+
+
+[master (root-commit) dcaa43e] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 some/sub/dir/file
+ok 1 - setup
+
+expecting success of 4128.2 'apply --directory -p (1)': 
+	git apply --directory=some/sub -p3 --index patch &&
+	echo Bello >expect &&
+	git show :some/sub/dir/file >actual &&
+	test_cmp expect actual &&
+	test_cmp expect some/sub/dir/file
+
+
+ok 2 - apply --directory -p (1)
+
+expecting success of 4128.3 'apply --directory -p (2) ': 
+
+	git reset --hard initial &&
+	git apply --directory=some/sub/ -p3 --index patch &&
+	echo Bello >expect &&
+	git show :some/sub/dir/file >actual &&
+	test_cmp expect actual &&
+	test_cmp expect some/sub/dir/file
+
+
+HEAD is now at dcaa43e initial
+ok 3 - apply --directory -p (2) 
+
+expecting success of 4128.4 'apply --directory (new file)': 
+	git reset --hard initial &&
+	git apply --directory=some/sub/dir/ --index patch &&
+	echo content >expect &&
+	git show :some/sub/dir/newfile >actual &&
+	test_cmp expect actual &&
+	test_cmp expect some/sub/dir/newfile
+
+HEAD is now at dcaa43e initial
+ok 4 - apply --directory (new file)
+
+expecting success of 4128.5 'apply --directory -p (new file)': 
+	git reset --hard initial &&
+	git apply -p2 --directory=some/sub/dir/ --index patch &&
+	echo content >expect &&
+	git show :some/sub/dir/newfile2 >actual &&
+	test_cmp expect actual &&
+	test_cmp expect some/sub/dir/newfile2
+
+HEAD is now at dcaa43e initial
+ok 5 - apply --directory -p (new file)
+
+expecting success of 4128.6 'apply --directory (delete file)': 
+	git reset --hard initial &&
+	echo content >some/sub/dir/delfile &&
+	git add some/sub/dir/delfile &&
+	git apply --directory=some/sub/dir/ --index patch &&
+	git ls-files >out &&
+	! grep delfile out
+
+HEAD is now at dcaa43e initial
+ok 6 - apply --directory (delete file)
+
+expecting success of 4128.7 'apply --directory (quoted filename)': 
+	git reset --hard initial &&
+	git apply --directory=some/sub/dir/ --index patch &&
+	echo content >expect &&
+	git show :some/sub/dir/quotefile >actual &&
+	test_cmp expect actual &&
+	test_cmp expect some/sub/dir/quotefile
+
+HEAD is now at dcaa43e initial
+ok 7 - apply --directory (quoted filename)
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4126-apply-empty.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4126-apply-empty/.git/
 expecting success of 4126.1 'setup': 
@@ -276022,318 +277268,6 @@
 1..287
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4128-apply-root.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4128-apply-root/.git/
-expecting success of 4128.1 'setup': 
-
-	mkdir -p some/sub/dir &&
-	echo Hello > some/sub/dir/file &&
-	git add some/sub/dir/file &&
-	git commit -m initial &&
-	git tag initial
-
-
-[master (root-commit) dcaa43e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 some/sub/dir/file
-ok 1 - setup
-
-expecting success of 4128.2 'apply --directory -p (1)': 
-	git apply --directory=some/sub -p3 --index patch &&
-	echo Bello >expect &&
-	git show :some/sub/dir/file >actual &&
-	test_cmp expect actual &&
-	test_cmp expect some/sub/dir/file
-
-
-ok 2 - apply --directory -p (1)
-
-expecting success of 4128.3 'apply --directory -p (2) ': 
-
-	git reset --hard initial &&
-	git apply --directory=some/sub/ -p3 --index patch &&
-	echo Bello >expect &&
-	git show :some/sub/dir/file >actual &&
-	test_cmp expect actual &&
-	test_cmp expect some/sub/dir/file
-
-
-HEAD is now at dcaa43e initial
-ok 3 - apply --directory -p (2) 
-
-expecting success of 4128.4 'apply --directory (new file)': 
-	git reset --hard initial &&
-	git apply --directory=some/sub/dir/ --index patch &&
-	echo content >expect &&
-	git show :some/sub/dir/newfile >actual &&
-	test_cmp expect actual &&
-	test_cmp expect some/sub/dir/newfile
-
-HEAD is now at dcaa43e initial
-ok 4 - apply --directory (new file)
-
-expecting success of 4128.5 'apply --directory -p (new file)': 
-	git reset --hard initial &&
-	git apply -p2 --directory=some/sub/dir/ --index patch &&
-	echo content >expect &&
-	git show :some/sub/dir/newfile2 >actual &&
-	test_cmp expect actual &&
-	test_cmp expect some/sub/dir/newfile2
-
-HEAD is now at dcaa43e initial
-ok 5 - apply --directory -p (new file)
-
-expecting success of 4128.6 'apply --directory (delete file)': 
-	git reset --hard initial &&
-	echo content >some/sub/dir/delfile &&
-	git add some/sub/dir/delfile &&
-	git apply --directory=some/sub/dir/ --index patch &&
-	git ls-files >out &&
-	! grep delfile out
-
-HEAD is now at dcaa43e initial
-ok 6 - apply --directory (delete file)
-
-expecting success of 4128.7 'apply --directory (quoted filename)': 
-	git reset --hard initial &&
-	git apply --directory=some/sub/dir/ --index patch &&
-	echo content >expect &&
-	git show :some/sub/dir/quotefile >actual &&
-	test_cmp expect actual &&
-	test_cmp expect some/sub/dir/quotefile
-
-HEAD is now at dcaa43e initial
-ok 7 - apply --directory (quoted filename)
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4122-apply-symlink-inside.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4122-apply-symlink-inside/.git/
-expecting success of 4122.1 'setup': 
-
-	mkdir -p arch/i386/boot arch/x86_64 &&
-	test_write_lines 1 2 3 4 5 >arch/i386/boot/Makefile &&
-	test_ln_s_add ../i386/boot arch/x86_64/boot &&
-	git add . &&
-	test_tick &&
-	git commit -m initial &&
-	git branch test &&
-
-	rm arch/x86_64/boot &&
-	mkdir arch/x86_64/boot &&
-	test_write_lines 2 3 4 5 6 >arch/x86_64/boot/Makefile &&
-	git add . &&
-	test_tick &&
-	git commit -a -m second &&
-
-	git format-patch --binary -1 --stdout >test.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
-[main (root-commit) f9acfaa] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 arch/i386/boot/Makefile
- create mode 120000 arch/x86_64/boot
-[main e8e99d5] second
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+), 1 deletion(-)
- delete mode 120000 arch/x86_64/boot
- create mode 100644 arch/x86_64/boot/Makefile
-ok 1 - setup
-
-expecting success of 4122.2 'apply': 
-
-	git checkout test &&
-	git diff --exit-code test &&
-	git diff --exit-code --cached test &&
-	git apply --index test.patch
-
-
-Switched to branch 'test'
-ok 2 - apply
-
-expecting success of 4122.3 'check result': 
-
-	git diff --exit-code main &&
-	git diff --exit-code --cached main &&
-	test_tick &&
-	git commit -m replay &&
-	T1=$(git rev-parse "main^{tree}") &&
-	T2=$(git rev-parse "HEAD^{tree}") &&
-	test "z$T1" = "z$T2"
-
-
-[test 66a4bdc] replay
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+), 1 deletion(-)
- delete mode 120000 arch/x86_64/boot
- create mode 100644 arch/x86_64/boot/Makefile
-ok 3 - check result
-
-expecting success of 4122.4 'do not read from beyond symbolic link': 
-	git reset --hard &&
-	mkdir -p arch/x86_64/dir &&
-	>arch/x86_64/dir/file &&
-	git add arch/x86_64/dir/file &&
-	echo line >arch/x86_64/dir/file &&
-	git diff >patch &&
-	git reset --hard &&
-
-	mkdir arch/i386/dir &&
-	>arch/i386/dir/file &&
-	ln -s ../i386/dir arch/x86_64/dir &&
-
-	test_must_fail git apply patch &&
-	test_must_fail git apply --cached patch &&
-	test_must_fail git apply --index patch
-
-
-HEAD is now at 66a4bdc replay
-HEAD is now at 66a4bdc replay
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: arch/x86_64/dir/file: does not exist in index
-error: arch/x86_64/dir/file: does not exist in index
-ok 4 - do not read from beyond symbolic link
-
-expecting success of 4122.5 'do not follow symbolic link (setup)': 
-
-	rm -rf arch/i386/dir arch/x86_64/dir &&
-	git reset --hard &&
-	ln -s ../i386/dir arch/x86_64/dir &&
-	git add arch/x86_64/dir &&
-	git diff HEAD >add_symlink.patch &&
-	git reset --hard &&
-
-	mkdir arch/x86_64/dir &&
-	>arch/x86_64/dir/file &&
-	git add arch/x86_64/dir/file &&
-	git diff HEAD >add_file.patch &&
-	git diff -R HEAD >del_file.patch &&
-	git reset --hard &&
-	rm -fr arch/x86_64/dir &&
-
-	cat add_symlink.patch add_file.patch >patch &&
-	cat add_symlink.patch del_file.patch >tricky_del &&
-
-	mkdir arch/i386/dir
-
-HEAD is now at 66a4bdc replay
-HEAD is now at 66a4bdc replay
-HEAD is now at 66a4bdc replay
-ok 5 - do not follow symbolic link (setup)
-
-expecting success of 4122.6 'do not follow symbolic link (same input)': 
-
-	# same input creates a confusing symbolic link
-	test_must_fail git apply patch 2>error-wt &&
-	test_grep "beyond a symbolic link" error-wt &&
-	test_path_is_missing arch/x86_64/dir &&
-	test_path_is_missing arch/i386/dir/file &&
-
-	test_must_fail git apply --index patch 2>error-ix &&
-	test_grep "beyond a symbolic link" error-ix &&
-	test_path_is_missing arch/x86_64/dir &&
-	test_path_is_missing arch/i386/dir/file &&
-	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
-	test_must_fail git ls-files --error-unmatch arch/i386/dir &&
-
-	test_must_fail git apply --cached patch 2>error-ct &&
-	test_grep "beyond a symbolic link" error-ct &&
-	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
-	test_must_fail git ls-files --error-unmatch arch/i386/dir &&
-
-	>arch/i386/dir/file &&
-	git add arch/i386/dir/file &&
-
-	test_must_fail git apply tricky_del &&
-	test_path_is_file arch/i386/dir/file &&
-
-	test_must_fail git apply --index tricky_del &&
-	test_path_is_file arch/i386/dir/file &&
-	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
-	git ls-files --error-unmatch arch/i386/dir &&
-
-	test_must_fail git apply --cached tricky_del &&
-	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
-	git ls-files --error-unmatch arch/i386/dir
-
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: pathspec 'arch/i386/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: pathspec 'arch/i386/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: arch/x86_64/dir/file: No such file or directory
-error: arch/x86_64/dir/file: does not exist in index
-error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-arch/i386/dir/file
-error: arch/x86_64/dir/file: does not exist in index
-error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-arch/i386/dir/file
-ok 6 - do not follow symbolic link (same input)
-
-expecting success of 4122.7 'do not follow symbolic link (existing)': 
-
-	# existing symbolic link
-	git reset --hard &&
-	ln -s ../i386/dir arch/x86_64/dir &&
-	git add arch/x86_64/dir &&
-
-	test_must_fail git apply add_file.patch 2>error-wt-add &&
-	test_grep "beyond a symbolic link" error-wt-add &&
-	test_path_is_missing arch/i386/dir/file &&
-
-	mkdir arch/i386/dir &&
-	>arch/i386/dir/file &&
-	test_must_fail git apply del_file.patch 2>error-wt-del &&
-	test_grep "beyond a symbolic link" error-wt-del &&
-	test_path_is_file arch/i386/dir/file &&
-	rm arch/i386/dir/file &&
-
-	test_must_fail git apply --index add_file.patch 2>error-ix-add &&
-	test_grep "beyond a symbolic link" error-ix-add &&
-	test_path_is_missing arch/i386/dir/file &&
-	test_must_fail git ls-files --error-unmatch arch/i386/dir &&
-
-	test_must_fail git apply --cached add_file.patch 2>error-ct-file &&
-	test_grep "beyond a symbolic link" error-ct-file &&
-	test_must_fail git ls-files --error-unmatch arch/i386/dir
-
-HEAD is now at 66a4bdc replay
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: reading from 'arch/x86_64/dir/file' beyond a symbolic link
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: pathspec 'arch/i386/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: pathspec 'arch/i386/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 7 - do not follow symbolic link (existing)
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4133-apply-filenames.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4133-apply-filenames/.git/
 expecting success of 4133.1 'setup': 
@@ -276483,6 +277417,42 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4134-apply-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4134-apply-submodule/.git/
+expecting success of 4134.1 'setup': 
+	cat > create-sm.patch <<EOF &&
+diff --git a/dir/sm b/dir/sm
+new file mode 160000
+index 0000000..0123456
+--- /dev/null
++++ b/dir/sm
+@@ -0,0 +1 @@
++Subproject commit $(test_oid numeric)
+EOF
+	cat > remove-sm.patch <<EOF
+diff --git a/dir/sm b/dir/sm
+deleted file mode 160000
+index 0123456..0000000
+--- a/dir/sm
++++ /dev/null
+@@ -1 +0,0 @@
+-Subproject commit $(test_oid numeric)
+EOF
+
+ok 1 - setup
+
+expecting success of 4134.2 'removing a submodule also removes all leading subdirectories': 
+	git apply --index create-sm.patch &&
+	test -d dir/sm &&
+	git apply --index remove-sm.patch &&
+	test \! -d dir
+
+ok 2 - removing a submodule also removes all leading subdirectories
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4127-apply-same-fn.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4127-apply-same-fn/.git/
 expecting success of 4127.1 'setup': 
@@ -276600,560 +277570,80 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4134-apply-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4134-apply-submodule/.git/
-expecting success of 4134.1 'setup': 
-	cat > create-sm.patch <<EOF &&
-diff --git a/dir/sm b/dir/sm
-new file mode 160000
-index 0000000..0123456
---- /dev/null
-+++ b/dir/sm
-@@ -0,0 +1 @@
-+Subproject commit $(test_oid numeric)
-EOF
-	cat > remove-sm.patch <<EOF
-diff --git a/dir/sm b/dir/sm
-deleted file mode 160000
-index 0123456..0000000
---- a/dir/sm
-+++ /dev/null
-@@ -1 +0,0 @@
--Subproject commit $(test_oid numeric)
-EOF
-
-ok 1 - setup
-
-expecting success of 4134.2 'removing a submodule also removes all leading subdirectories': 
-	git apply --index create-sm.patch &&
-	test -d dir/sm &&
-	git apply --index remove-sm.patch &&
-	test \! -d dir
-
-ok 2 - removing a submodule also removes all leading subdirectories
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4108-apply-threeway.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4108-apply-threeway/.git/
-expecting success of 4108.1 'setup': 
-	test_tick &&
-	test_write_lines 1 2 3 4 5 6 7 >one &&
-	cat one >two &&
-	git add one two &&
-	git commit -m initial &&
-
-	git branch side &&
-
-	test_tick &&
-	test_write_lines 1 two 3 4 5 six 7 >one &&
-	test_write_lines 1 two 3 4 5 6 7 >two &&
-	git commit -a -m main &&
-
-	git checkout side &&
-	test_write_lines 1 2 3 4 five 6 7 >one &&
-	test_write_lines 1 2 3 4 five 6 7 >two &&
-	git commit -a -m side &&
-
-	git checkout main
+*** t4136-apply-check.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4136-apply-check/.git/
+expecting success of 4136.1 'setup': 
+	test_commit 1
 
-[main (root-commit) acfd9ea] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 14 insertions(+)
- create mode 100644 one
- create mode 100644 two
-[main cc2039c] main
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+), 3 deletions(-)
-Switched to branch 'side'
-[side 3dc6c9f] side
+[master (root-commit) d0dcf97] 1
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Switched to branch 'main'
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
 ok 1 - setup
 
-expecting success of 4108.2 'apply without --3way': 
-	git diff side^ side >P.diff &&
-
-	# should fail to apply
-	git reset --hard &&
-	git checkout main^0 &&
-	test_must_fail git apply --index P.diff &&
-	# should leave things intact
-	git diff-files --exit-code &&
-	git diff-index --exit-code --cached HEAD
-
-HEAD is now at cc2039c main
-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 cc2039c main
-error: patch failed: one:2
-error: one: patch does not apply
-error: patch failed: two:2
-error: two: patch does not apply
-ok 2 - apply without --3way
-
-expecting success of 4108.3 'apply with --3way': 
-	test_apply_with_3way
-
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Auto-merging one
-CONFLICT (content): Merge conflict in one
-Auto-merging two
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' with conflicts.
-Applied patch to 'two' cleanly.
-U one
-ok 3 - apply with --3way
-
-expecting success of 4108.4 'apply with --3way with merge.conflictStyle = diff3': 
-	test_config merge.conflictStyle diff3 &&
-	test_apply_with_3way
-
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Auto-merging one
-CONFLICT (content): Merge conflict in one
-Auto-merging two
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' with conflicts.
-Applied patch to 'two' cleanly.
-U one
-ok 4 - apply with --3way with merge.conflictStyle = diff3
-
-expecting success of 4108.5 'apply with --3way --ours': 
-	test_apply_with_3way_favoritism --ours -Xours
-
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Auto-merging one
-Auto-merging two
-Automatic merge went well; stopped before committing as requested
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' cleanly.
-Applied patch to 'two' cleanly.
-ok 5 - apply with --3way --ours
-
-expecting success of 4108.6 'apply with --3way --theirs': 
-	test_apply_with_3way_favoritism --theirs -Xtheirs
-
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Auto-merging one
-Auto-merging two
-Automatic merge went well; stopped before committing as requested
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' cleanly.
-Applied patch to 'two' cleanly.
-ok 6 - apply with --3way --theirs
-
-expecting success of 4108.7 'apply with --3way --union': 
-	echo "* merge=union" >.gitattributes &&
-	test_apply_with_3way_favoritism --union &&
-	rm .gitattributes
-
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Auto-merging one
-Auto-merging two
-Automatic merge went well; stopped before committing as requested
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' cleanly.
-Applied patch to 'two' cleanly.
-ok 7 - apply with --3way --union
-
-expecting success of 4108.8 'apply with --3way with rerere enabled': 
-	test_config rerere.enabled true &&
-
-	# Merging side should be similar to applying this patch
-	git diff ...side >P.diff &&
-
-	# The corresponding conflicted merge
-	git reset --hard &&
-	git checkout main^0 &&
-	test_must_fail git merge --no-commit side &&
-
-	# Manually resolve and record the resolution
-	test_write_lines 1 two 3 4 five six 7 >one &&
-	git rerere &&
-	cat one >expect &&
-
-	# should fail to apply
-	git reset --hard &&
-	git checkout main^0 &&
-	test_must_fail git apply --index --3way P.diff &&
-
-	# but rerere should have replayed the recorded resolution
-	test_cmp expect one
-
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Auto-merging one
-CONFLICT (content): Merge conflict in one
-Auto-merging two
-Recorded preimage for 'one'
-Automatic merge failed; fix conflicts and then commit the result.
-Recorded resolution for 'one'.
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' with conflicts.
-Applied patch to 'two' cleanly.
-U one
-Resolved 'one' using previous resolution.
-ok 8 - apply with --3way with rerere enabled
-
-expecting success of 4108.9 'apply -3 with add/add conflict setup': 
-	git reset --hard &&
-
-	git checkout -b adder &&
-	test_write_lines 1 2 3 4 5 6 7 >three &&
-	test_write_lines 1 2 3 4 5 6 7 >four &&
-	git add three four &&
-	git commit -m "add three and four" &&
-
-	git checkout -b another adder^ &&
-	test_write_lines 1 2 3 4 5 6 7 >three &&
-	test_write_lines 1 2 3 four 5 6 7 >four &&
-	git add three four &&
-	git commit -m "add three and four" &&
-
-	# Merging another should be similar to applying this patch
-	git diff adder...another >P.diff &&
-
-	git checkout adder^0 &&
-	test_must_fail git merge --no-commit another &&
-	git ls-files -s >expect.ls &&
-	print_sanitized_conflicted_diff >expect.diff
-
-HEAD is now at cc2039c main
-Switched to a new branch 'adder'
-[adder a4ae168] add three and four
- Author: A U Thor <author@example.com>
- 2 files changed, 14 insertions(+)
- create mode 100644 four
- create mode 100644 three
-Switched to a new branch 'another'
-[another 668e9f0] add three and four
- Author: A U Thor <author@example.com>
- 2 files changed, 14 insertions(+)
- create mode 100644 four
- create mode 100644 three
-Note: switching to 'adder^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 a4ae168 add three and four
-Auto-merging four
-CONFLICT (add/add): Merge conflict in four
-Recorded preimage for 'four'
-Automatic merge failed; fix conflicts and then commit the result.
-ok 9 - apply -3 with add/add conflict setup
-
-expecting success of 4108.10 'apply -3 with add/add conflict': 
-	# should fail to apply ...
-	git reset --hard &&
-	git checkout adder^0 &&
-	test_must_fail git apply --index --3way P.diff &&
-	# ... and leave conflicts in the index and in the working tree
-	git ls-files -s >actual.ls &&
-	print_sanitized_conflicted_diff >actual.diff &&
-
-	# The result should resemble the corresponding merge
-	test_cmp expect.ls actual.ls &&
-	test_cmp expect.diff actual.diff
-
-HEAD is now at a4ae168 add three and four
-HEAD is now at a4ae168 add three and four
-Performing three-way merge...
-Applied patch to 'four' with conflicts.
-Performing three-way merge...
-Applied patch to 'three' cleanly.
-U four
-Recorded preimage for 'four'
-ok 10 - apply -3 with add/add conflict
-
-expecting success of 4108.11 'apply -3 with add/add conflict (dirty working tree)': 
-	# should fail to apply ...
-	git reset --hard &&
-	git checkout adder^0 &&
-	echo >>four &&
-	cat four >four.save &&
-	cat three >three.save &&
-	git ls-files -s >expect.ls &&
-	test_must_fail git apply --index --3way P.diff &&
-	# ... and should not touch anything
-	git ls-files -s >actual.ls &&
-	test_cmp expect.ls actual.ls &&
-	test_cmp four.save four &&
-	test_cmp three.save three
-
-HEAD is now at a4ae168 add three and four
-HEAD is now at a4ae168 add three and four
-Performing three-way merge...
-error: four: does not match index
-error: cannot read the current contents of 'four'
-error: four: patch does not apply
-Performing three-way merge...
-Applied patch to 'three' cleanly.
-ok 11 - apply -3 with add/add conflict (dirty working tree)
-
-expecting success of 4108.12 'apply -3 with ambiguous repeating file': 
-	git reset --hard &&
-	test_write_lines 1 2 1 2 1 2 1 2 1 2 1 >one_two_repeat &&
-	git add one_two_repeat &&
-	git commit -m "init one" &&
-	test_write_lines 1 2 1 2 1 2 1 2 one 2 1 >one_two_repeat &&
-	git commit -a -m "change one" &&
-
-	git diff HEAD~ >Repeat.diff &&
-	git reset --hard HEAD~ &&
-
-	test_write_lines 1 2 1 2 1 2 one 2 1 2 one >one_two_repeat &&
-	git commit -a -m "change surrounding one" &&
-
-	git apply --index --3way Repeat.diff &&
-	test_write_lines 1 2 1 2 1 2 one 2 one 2 one >expect &&
-
-	test_cmp expect one_two_repeat
-
-HEAD is now at a4ae168 add three and four
-[detached HEAD 4fe2a89] init one
- Author: A U Thor <author@example.com>
- 1 file changed, 11 insertions(+)
- create mode 100644 one_two_repeat
-[detached HEAD 0e42fdf] change one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 4fe2a89 init one
-[detached HEAD 5364b93] change surrounding one
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Applied patch to 'one_two_repeat' cleanly.
-ok 12 - apply -3 with ambiguous repeating file
-
-expecting success of 4108.13 'apply with --3way --cached clean apply': 
-	# Merging side should be similar to applying this patch
-	git diff ...side >P.diff &&
-
-	# The corresponding cleanly applied merge
-	git reset --hard &&
-	git checkout main~ &&
-	git merge --no-commit side &&
-	git ls-files -s >expect.ls &&
-
-	# should succeed
-	git reset --hard &&
-	git checkout main~ &&
-	git apply --cached --3way P.diff &&
-	git ls-files -s >actual.ls &&
-	print_sanitized_conflicted_diff >actual.diff &&
-
-	# The cache should resemble the corresponding merge
-	# (both files at stage #0)
-	test_cmp expect.ls actual.ls &&
-	# However the working directory should not change
-	>expect.diff &&
-	test_cmp expect.diff actual.diff
-
-HEAD is now at 5364b93 change surrounding one
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  5364b93 change surrounding one
-  4fe2a89 init one
-
-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> 5364b93
-
-HEAD is now at acfd9ea initial
-Updating acfd9ea..3dc6c9f
-Fast-forward
- one | 2 +-
- two | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-HEAD is now at 3dc6c9f side
-Previous HEAD position was 3dc6c9f side
-HEAD is now at acfd9ea initial
-Applied patch to 'one' cleanly.
-Applied patch to 'two' cleanly.
-ok 13 - apply with --3way --cached clean apply
-
-expecting success of 4108.14 'apply with --3way --cached and conflicts': 
-	# Merging side should be similar to applying this patch
-	git diff ...side >P.diff &&
-
-	# The corresponding conflicted merge
-	git reset --hard &&
-	git checkout main^0 &&
-	test_must_fail git merge --no-commit side &&
-	git ls-files -s >expect.ls &&
-
-	# should fail to apply
-	git reset --hard &&
-	git checkout main^0 &&
-	test_must_fail git apply --cached --3way P.diff &&
-	git ls-files -s >actual.ls &&
-	print_sanitized_conflicted_diff >actual.diff &&
-
-	# The cache should resemble the corresponding merge
-	# (one file at stage #0, one file at stages #1 #2 #3)
-	test_cmp expect.ls actual.ls &&
-	# However the working directory should not change
-	>expect.diff &&
-	test_cmp expect.diff actual.diff
-
-HEAD is now at acfd9ea initial
-Previous HEAD position was acfd9ea initial
-HEAD is now at cc2039c main
-Auto-merging one
-CONFLICT (content): Merge conflict in one
-Auto-merging two
-Resolved 'one' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' with conflicts.
-Applied patch to 'two' cleanly.
-U one
-ok 14 - apply with --3way --cached and conflicts
-
-expecting success of 4108.15 'apply binary file patch': 
-	git reset --hard main &&
-	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
-	git add bin.png &&
-	git commit -m "add binary file" &&
-
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
-
-	git diff --binary >bin.diff &&
-	git reset --hard &&
-
-	# Apply must succeed.
-	git apply bin.diff
-
-HEAD is now at cc2039c main
-[detached HEAD 5c7d1bd] add binary file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bin.png
-HEAD is now at 5c7d1bd add binary file
-ok 15 - apply binary file patch
-
-expecting success of 4108.16 'apply binary file patch with 3way': 
-	git reset --hard main &&
-	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
-	git add bin.png &&
-	git commit -m "add binary file" &&
-
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
-
-	git diff --binary >bin.diff &&
-	git reset --hard &&
-
-	# Apply must succeed.
-	git apply --3way --index bin.diff
+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
 
-HEAD is now at cc2039c main
-[detached HEAD 5c7d1bd] add binary file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bin.png
-HEAD is now at 5c7d1bd add binary file
-Applied patch to 'bin.png' cleanly.
-ok 16 - apply binary file patch with 3way
+error: No valid patches in input (allow with "--allow-empty")
+ok 2 - apply --check exits non-zero with unrecognized input
 
-expecting success of 4108.17 'apply full-index patch with 3way': 
-	git reset --hard main &&
-	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
-	git add bin.png &&
-	git commit -m "add binary file" &&
+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
 
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+error: corrupt patch at line 7
+error: corrupt patch at line 7
+ok 3 - apply exits non-zero with no-op patch
 
-	git diff --full-index >bin.diff &&
-	git reset --hard &&
+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
 
-	# Apply must succeed.
-	git apply --3way --index bin.diff
+ok 4 - `apply --recount` allows no-op patch
 
-HEAD is now at cc2039c main
-[detached HEAD 5c7d1bd] add binary file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bin.png
-HEAD is now at 5c7d1bd add binary file
-Applied patch to 'bin.png' cleanly.
-ok 17 - apply full-index patch with 3way
+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
 
-expecting success of 4108.18 'apply delete then new patch with 3way': 
-	git reset --hard main &&
-	test_write_lines 2 > delnew &&
-	git add delnew &&
-	git diff --cached >> new.patch &&
-	git reset --hard &&
-	test_write_lines 1 > delnew &&
-	git add delnew &&
-	git commit -m "delnew" &&
-	rm delnew &&
-	git diff >> delete-then-new.patch &&
-	cat new.patch >> delete-then-new.patch &&
+error: inconsistent header lines 2 and 3
+ok 5 - invalid combination: create and copy
 
-	git checkout -- . &&
-	# Apply must succeed.
-	git apply --3way delete-then-new.patch
+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
 
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-[detached HEAD ba7e832] delnew
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 delnew
-Falling back to direct application...
-Falling back to direct application...
-ok 18 - apply delete then new patch with 3way
+error: inconsistent header lines 2 and 3
+ok 6 - invalid combination: create and rename
 
-# passed all 18 test(s)
-1..18
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4132-apply-removal.sh ***
@@ -277702,97 +278192,21 @@
 			git add file &&
 			git apply --index $patch &&
 			test -f file &&
-			test_must_be_empty file
-			;;
-		remove*)
-			# must remove the file
-			cat something >file &&
-			git add file &&
-			git apply --index $patch &&
-			! test -f file
-			;;
-		esac
-	
-ok 14 - test removeWest2.patch
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4136-apply-check.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+			test_must_be_empty file
+			;;
+		remove*)
+			# must remove the file
+			cat something >file &&
+			git add file &&
+			git apply --index $patch &&
+			! test -f file
+			;;
+		esac
+	
+ok 14 - test removeWest2.patch
 
-# passed all 6 test(s)
-1..6
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4141-apply-too-large.sh ***
@@ -277991,6 +278405,526 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4108-apply-threeway.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4108-apply-threeway/.git/
+expecting success of 4108.1 'setup': 
+	test_tick &&
+	test_write_lines 1 2 3 4 5 6 7 >one &&
+	cat one >two &&
+	git add one two &&
+	git commit -m initial &&
+
+	git branch side &&
+
+	test_tick &&
+	test_write_lines 1 two 3 4 5 six 7 >one &&
+	test_write_lines 1 two 3 4 5 6 7 >two &&
+	git commit -a -m main &&
+
+	git checkout side &&
+	test_write_lines 1 2 3 4 five 6 7 >one &&
+	test_write_lines 1 2 3 4 five 6 7 >two &&
+	git commit -a -m side &&
+
+	git checkout main
+
+[main (root-commit) acfd9ea] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 14 insertions(+)
+ create mode 100644 one
+ create mode 100644 two
+[main cc2039c] main
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+Switched to branch 'side'
+[side 3dc6c9f] side
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 4108.2 'apply without --3way': 
+	git diff side^ side >P.diff &&
+
+	# should fail to apply
+	git reset --hard &&
+	git checkout main^0 &&
+	test_must_fail git apply --index P.diff &&
+	# should leave things intact
+	git diff-files --exit-code &&
+	git diff-index --exit-code --cached HEAD
+
+HEAD is now at cc2039c main
+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 cc2039c main
+error: patch failed: one:2
+error: one: patch does not apply
+error: patch failed: two:2
+error: two: patch does not apply
+ok 2 - apply without --3way
+
+expecting success of 4108.3 'apply with --3way': 
+	test_apply_with_3way
+
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Auto-merging one
+CONFLICT (content): Merge conflict in one
+Auto-merging two
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' with conflicts.
+Applied patch to 'two' cleanly.
+U one
+ok 3 - apply with --3way
+
+expecting success of 4108.4 'apply with --3way with merge.conflictStyle = diff3': 
+	test_config merge.conflictStyle diff3 &&
+	test_apply_with_3way
+
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Auto-merging one
+CONFLICT (content): Merge conflict in one
+Auto-merging two
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' with conflicts.
+Applied patch to 'two' cleanly.
+U one
+ok 4 - apply with --3way with merge.conflictStyle = diff3
+
+expecting success of 4108.5 'apply with --3way --ours': 
+	test_apply_with_3way_favoritism --ours -Xours
+
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Auto-merging one
+Auto-merging two
+Automatic merge went well; stopped before committing as requested
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' cleanly.
+Applied patch to 'two' cleanly.
+ok 5 - apply with --3way --ours
+
+expecting success of 4108.6 'apply with --3way --theirs': 
+	test_apply_with_3way_favoritism --theirs -Xtheirs
+
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Auto-merging one
+Auto-merging two
+Automatic merge went well; stopped before committing as requested
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' cleanly.
+Applied patch to 'two' cleanly.
+ok 6 - apply with --3way --theirs
+
+expecting success of 4108.7 'apply with --3way --union': 
+	echo "* merge=union" >.gitattributes &&
+	test_apply_with_3way_favoritism --union &&
+	rm .gitattributes
+
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Auto-merging one
+Auto-merging two
+Automatic merge went well; stopped before committing as requested
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' cleanly.
+Applied patch to 'two' cleanly.
+ok 7 - apply with --3way --union
+
+expecting success of 4108.8 'apply with --3way with rerere enabled': 
+	test_config rerere.enabled true &&
+
+	# Merging side should be similar to applying this patch
+	git diff ...side >P.diff &&
+
+	# The corresponding conflicted merge
+	git reset --hard &&
+	git checkout main^0 &&
+	test_must_fail git merge --no-commit side &&
+
+	# Manually resolve and record the resolution
+	test_write_lines 1 two 3 4 five six 7 >one &&
+	git rerere &&
+	cat one >expect &&
+
+	# should fail to apply
+	git reset --hard &&
+	git checkout main^0 &&
+	test_must_fail git apply --index --3way P.diff &&
+
+	# but rerere should have replayed the recorded resolution
+	test_cmp expect one
+
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Auto-merging one
+CONFLICT (content): Merge conflict in one
+Auto-merging two
+Recorded preimage for 'one'
+Automatic merge failed; fix conflicts and then commit the result.
+Recorded resolution for 'one'.
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' with conflicts.
+Applied patch to 'two' cleanly.
+U one
+Resolved 'one' using previous resolution.
+ok 8 - apply with --3way with rerere enabled
+
+expecting success of 4108.9 'apply -3 with add/add conflict setup': 
+	git reset --hard &&
+
+	git checkout -b adder &&
+	test_write_lines 1 2 3 4 5 6 7 >three &&
+	test_write_lines 1 2 3 4 5 6 7 >four &&
+	git add three four &&
+	git commit -m "add three and four" &&
+
+	git checkout -b another adder^ &&
+	test_write_lines 1 2 3 4 5 6 7 >three &&
+	test_write_lines 1 2 3 four 5 6 7 >four &&
+	git add three four &&
+	git commit -m "add three and four" &&
+
+	# Merging another should be similar to applying this patch
+	git diff adder...another >P.diff &&
+
+	git checkout adder^0 &&
+	test_must_fail git merge --no-commit another &&
+	git ls-files -s >expect.ls &&
+	print_sanitized_conflicted_diff >expect.diff
+
+HEAD is now at cc2039c main
+Switched to a new branch 'adder'
+[adder a4ae168] add three and four
+ Author: A U Thor <author@example.com>
+ 2 files changed, 14 insertions(+)
+ create mode 100644 four
+ create mode 100644 three
+Switched to a new branch 'another'
+[another 668e9f0] add three and four
+ Author: A U Thor <author@example.com>
+ 2 files changed, 14 insertions(+)
+ create mode 100644 four
+ create mode 100644 three
+Note: switching to 'adder^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 a4ae168 add three and four
+Auto-merging four
+CONFLICT (add/add): Merge conflict in four
+Recorded preimage for 'four'
+Automatic merge failed; fix conflicts and then commit the result.
+ok 9 - apply -3 with add/add conflict setup
+
+expecting success of 4108.10 'apply -3 with add/add conflict': 
+	# should fail to apply ...
+	git reset --hard &&
+	git checkout adder^0 &&
+	test_must_fail git apply --index --3way P.diff &&
+	# ... and leave conflicts in the index and in the working tree
+	git ls-files -s >actual.ls &&
+	print_sanitized_conflicted_diff >actual.diff &&
+
+	# The result should resemble the corresponding merge
+	test_cmp expect.ls actual.ls &&
+	test_cmp expect.diff actual.diff
+
+HEAD is now at a4ae168 add three and four
+HEAD is now at a4ae168 add three and four
+Performing three-way merge...
+Applied patch to 'four' with conflicts.
+Performing three-way merge...
+Applied patch to 'three' cleanly.
+U four
+Recorded preimage for 'four'
+ok 10 - apply -3 with add/add conflict
+
+expecting success of 4108.11 'apply -3 with add/add conflict (dirty working tree)': 
+	# should fail to apply ...
+	git reset --hard &&
+	git checkout adder^0 &&
+	echo >>four &&
+	cat four >four.save &&
+	cat three >three.save &&
+	git ls-files -s >expect.ls &&
+	test_must_fail git apply --index --3way P.diff &&
+	# ... and should not touch anything
+	git ls-files -s >actual.ls &&
+	test_cmp expect.ls actual.ls &&
+	test_cmp four.save four &&
+	test_cmp three.save three
+
+HEAD is now at a4ae168 add three and four
+HEAD is now at a4ae168 add three and four
+Performing three-way merge...
+error: four: does not match index
+error: cannot read the current contents of 'four'
+error: four: patch does not apply
+Performing three-way merge...
+Applied patch to 'three' cleanly.
+ok 11 - apply -3 with add/add conflict (dirty working tree)
+
+expecting success of 4108.12 'apply -3 with ambiguous repeating file': 
+	git reset --hard &&
+	test_write_lines 1 2 1 2 1 2 1 2 1 2 1 >one_two_repeat &&
+	git add one_two_repeat &&
+	git commit -m "init one" &&
+	test_write_lines 1 2 1 2 1 2 1 2 one 2 1 >one_two_repeat &&
+	git commit -a -m "change one" &&
+
+	git diff HEAD~ >Repeat.diff &&
+	git reset --hard HEAD~ &&
+
+	test_write_lines 1 2 1 2 1 2 one 2 1 2 one >one_two_repeat &&
+	git commit -a -m "change surrounding one" &&
+
+	git apply --index --3way Repeat.diff &&
+	test_write_lines 1 2 1 2 1 2 one 2 one 2 one >expect &&
+
+	test_cmp expect one_two_repeat
+
+HEAD is now at a4ae168 add three and four
+[detached HEAD 4fe2a89] init one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 11 insertions(+)
+ create mode 100644 one_two_repeat
+[detached HEAD 0e42fdf] change one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 4fe2a89 init one
+[detached HEAD 5364b93] change surrounding one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Applied patch to 'one_two_repeat' cleanly.
+ok 12 - apply -3 with ambiguous repeating file
+
+expecting success of 4108.13 'apply with --3way --cached clean apply': 
+	# Merging side should be similar to applying this patch
+	git diff ...side >P.diff &&
+
+	# The corresponding cleanly applied merge
+	git reset --hard &&
+	git checkout main~ &&
+	git merge --no-commit side &&
+	git ls-files -s >expect.ls &&
+
+	# should succeed
+	git reset --hard &&
+	git checkout main~ &&
+	git apply --cached --3way P.diff &&
+	git ls-files -s >actual.ls &&
+	print_sanitized_conflicted_diff >actual.diff &&
+
+	# The cache should resemble the corresponding merge
+	# (both files at stage #0)
+	test_cmp expect.ls actual.ls &&
+	# However the working directory should not change
+	>expect.diff &&
+	test_cmp expect.diff actual.diff
+
+HEAD is now at 5364b93 change surrounding one
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  5364b93 change surrounding one
+  4fe2a89 init one
+
+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> 5364b93
+
+HEAD is now at acfd9ea initial
+Updating acfd9ea..3dc6c9f
+Fast-forward
+ one | 2 +-
+ two | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+HEAD is now at 3dc6c9f side
+Previous HEAD position was 3dc6c9f side
+HEAD is now at acfd9ea initial
+Applied patch to 'one' cleanly.
+Applied patch to 'two' cleanly.
+ok 13 - apply with --3way --cached clean apply
+
+expecting success of 4108.14 'apply with --3way --cached and conflicts': 
+	# Merging side should be similar to applying this patch
+	git diff ...side >P.diff &&
+
+	# The corresponding conflicted merge
+	git reset --hard &&
+	git checkout main^0 &&
+	test_must_fail git merge --no-commit side &&
+	git ls-files -s >expect.ls &&
+
+	# should fail to apply
+	git reset --hard &&
+	git checkout main^0 &&
+	test_must_fail git apply --cached --3way P.diff &&
+	git ls-files -s >actual.ls &&
+	print_sanitized_conflicted_diff >actual.diff &&
+
+	# The cache should resemble the corresponding merge
+	# (one file at stage #0, one file at stages #1 #2 #3)
+	test_cmp expect.ls actual.ls &&
+	# However the working directory should not change
+	>expect.diff &&
+	test_cmp expect.diff actual.diff
+
+HEAD is now at acfd9ea initial
+Previous HEAD position was acfd9ea initial
+HEAD is now at cc2039c main
+Auto-merging one
+CONFLICT (content): Merge conflict in one
+Auto-merging two
+Resolved 'one' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' with conflicts.
+Applied patch to 'two' cleanly.
+U one
+ok 14 - apply with --3way --cached and conflicts
+
+expecting success of 4108.15 'apply binary file patch': 
+	git reset --hard main &&
+	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	git add bin.png &&
+	git commit -m "add binary file" &&
+
+	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+
+	git diff --binary >bin.diff &&
+	git reset --hard &&
+
+	# Apply must succeed.
+	git apply bin.diff
+
+HEAD is now at cc2039c main
+[detached HEAD 5c7d1bd] add binary file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bin.png
+HEAD is now at 5c7d1bd add binary file
+ok 15 - apply binary file patch
+
+expecting success of 4108.16 'apply binary file patch with 3way': 
+	git reset --hard main &&
+	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	git add bin.png &&
+	git commit -m "add binary file" &&
+
+	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+
+	git diff --binary >bin.diff &&
+	git reset --hard &&
+
+	# Apply must succeed.
+	git apply --3way --index bin.diff
+
+HEAD is now at cc2039c main
+[detached HEAD 5c7d1bd] add binary file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bin.png
+HEAD is now at 5c7d1bd add binary file
+Applied patch to 'bin.png' cleanly.
+ok 16 - apply binary file patch with 3way
+
+expecting success of 4108.17 'apply full-index patch with 3way': 
+	git reset --hard main &&
+	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	git add bin.png &&
+	git commit -m "add binary file" &&
+
+	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+
+	git diff --full-index >bin.diff &&
+	git reset --hard &&
+
+	# Apply must succeed.
+	git apply --3way --index bin.diff
+
+HEAD is now at cc2039c main
+[detached HEAD 5c7d1bd] add binary file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bin.png
+HEAD is now at 5c7d1bd add binary file
+Applied patch to 'bin.png' cleanly.
+ok 17 - apply full-index patch with 3way
+
+expecting success of 4108.18 'apply delete then new patch with 3way': 
+	git reset --hard main &&
+	test_write_lines 2 > delnew &&
+	git add delnew &&
+	git diff --cached >> new.patch &&
+	git reset --hard &&
+	test_write_lines 1 > delnew &&
+	git add delnew &&
+	git commit -m "delnew" &&
+	rm delnew &&
+	git diff >> delete-then-new.patch &&
+	cat new.patch >> delete-then-new.patch &&
+
+	git checkout -- . &&
+	# Apply must succeed.
+	git apply --3way delete-then-new.patch
+
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+[detached HEAD ba7e832] delnew
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 delnew
+Falling back to direct application...
+Falling back to direct application...
+ok 18 - apply delete then new patch with 3way
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4139-apply-escape.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4139-apply-escape/.git/
 expecting success of 4139.1 'bump git repo one level down': 
@@ -278509,6 +279443,123 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4152-am-subjects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4152-am-subjects/.git/
+expecting success of 4152.1 'setup baseline commit': 
+	test_commit baseline file
+
+[master (root-commit) 2f64c43] baseline
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup baseline commit
+
+expecting success of 4152.2 'create patches with short subject': 
+		git reset --hard baseline &&
+		echo $type >file &&
+		git commit -a -m "$subject" &&
+		git format-patch -1 --stdout >$type.patch &&
+		git format-patch -1 --stdout -k >$type-k.patch
+	
+HEAD is now at 2f64c43 baseline
+[master 5d59063] short subject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 2 - create patches with short subject
+
+expecting success of 4152.3 'create patches with long subject': 
+		git reset --hard baseline &&
+		echo $type >file &&
+		git commit -a -m "$subject" &&
+		git format-patch -1 --stdout >$type.patch &&
+		git format-patch -1 --stdout -k >$type-k.patch
+	
+HEAD is now at 2f64c43 baseline
+[master 512ba33] this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - create patches with long subject
+
+expecting success of 4152.4 'create patches with multiline subject': 
+		git reset --hard baseline &&
+		echo $type >file &&
+		git commit -a -m "$subject" &&
+		git format-patch -1 --stdout >$type.patch &&
+		git format-patch -1 --stdout -k >$type-k.patch
+	
+HEAD is now at 2f64c43 baseline
+[master 230e818] this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - create patches with multiline subject
+
+expecting success of 4152.5 'short subject preserved (format-patch | am)': 
+	check_subject short
+
+HEAD is now at 2f64c43 baseline
+Applying: short subject
+ok 5 - short subject preserved (format-patch | am)
+
+expecting success of 4152.6 'short subject preserved (format-patch -k | am)': 
+	check_subject short-k
+
+HEAD is now at 2f64c43 baseline
+Applying: short subject
+ok 6 - short subject preserved (format-patch -k | am)
+
+expecting success of 4152.7 'short subject preserved (format-patch -k | am -k)': 
+	check_subject short-k -k
+
+HEAD is now at 2f64c43 baseline
+Applying: short subject
+ok 7 - short subject preserved (format-patch -k | am -k)
+
+expecting success of 4152.8 'long subject preserved (format-patch | am)': 
+	check_subject long
+
+HEAD is now at 2f64c43 baseline
+Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ok 8 - long subject preserved (format-patch | am)
+
+expecting success of 4152.9 'long subject preserved (format-patch -k | am)': 
+	check_subject long-k
+
+HEAD is now at 2f64c43 baseline
+Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ok 9 - long subject preserved (format-patch -k | am)
+
+expecting success of 4152.10 'long subject preserved (format-patch -k | am -k)': 
+	check_subject long-k -k
+
+HEAD is now at 2f64c43 baseline
+Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ok 10 - long subject preserved (format-patch -k | am -k)
+
+expecting success of 4152.11 'multiline subject unwrapped (format-patch | am)': 
+	check_subject multiline
+
+HEAD is now at 2f64c43 baseline
+Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ok 11 - multiline subject unwrapped (format-patch | am)
+
+expecting success of 4152.12 'multiline subject unwrapped (format-patch -k | am)': 
+	check_subject multiline-k
+
+HEAD is now at 2f64c43 baseline
+Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ok 12 - multiline subject unwrapped (format-patch -k | am)
+
+expecting success of 4152.13 'multiline subject preserved (format-patch -k | am -k)': 
+	check_subject multiline-k -k
+
+HEAD is now at 2f64c43 baseline
+Applying: this is a long subject that is virtually guaranteed
+ok 13 - multiline subject preserved (format-patch -k | am -k)
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4153-am-resume-override-opts.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4153-am-resume-override-opts/.git/
 expecting success of 4153.1 'setup': 
@@ -278772,123 +279823,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4152-am-subjects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4152-am-subjects/.git/
-expecting success of 4152.1 'setup baseline commit': 
-	test_commit baseline file
-
-[master (root-commit) 2f64c43] baseline
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup baseline commit
-
-expecting success of 4152.2 'create patches with short subject': 
-		git reset --hard baseline &&
-		echo $type >file &&
-		git commit -a -m "$subject" &&
-		git format-patch -1 --stdout >$type.patch &&
-		git format-patch -1 --stdout -k >$type-k.patch
-	
-HEAD is now at 2f64c43 baseline
-[master 5d59063] short subject
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - create patches with short subject
-
-expecting success of 4152.3 'create patches with long subject': 
-		git reset --hard baseline &&
-		echo $type >file &&
-		git commit -a -m "$subject" &&
-		git format-patch -1 --stdout >$type.patch &&
-		git format-patch -1 --stdout -k >$type-k.patch
-	
-HEAD is now at 2f64c43 baseline
-[master 512ba33] this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - create patches with long subject
-
-expecting success of 4152.4 'create patches with multiline subject': 
-		git reset --hard baseline &&
-		echo $type >file &&
-		git commit -a -m "$subject" &&
-		git format-patch -1 --stdout >$type.patch &&
-		git format-patch -1 --stdout -k >$type-k.patch
-	
-HEAD is now at 2f64c43 baseline
-[master 230e818] this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - create patches with multiline subject
-
-expecting success of 4152.5 'short subject preserved (format-patch | am)': 
-	check_subject short
-
-HEAD is now at 2f64c43 baseline
-Applying: short subject
-ok 5 - short subject preserved (format-patch | am)
-
-expecting success of 4152.6 'short subject preserved (format-patch -k | am)': 
-	check_subject short-k
-
-HEAD is now at 2f64c43 baseline
-Applying: short subject
-ok 6 - short subject preserved (format-patch -k | am)
-
-expecting success of 4152.7 'short subject preserved (format-patch -k | am -k)': 
-	check_subject short-k -k
-
-HEAD is now at 2f64c43 baseline
-Applying: short subject
-ok 7 - short subject preserved (format-patch -k | am -k)
-
-expecting success of 4152.8 'long subject preserved (format-patch | am)': 
-	check_subject long
-
-HEAD is now at 2f64c43 baseline
-Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
-ok 8 - long subject preserved (format-patch | am)
-
-expecting success of 4152.9 'long subject preserved (format-patch -k | am)': 
-	check_subject long-k
-
-HEAD is now at 2f64c43 baseline
-Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
-ok 9 - long subject preserved (format-patch -k | am)
-
-expecting success of 4152.10 'long subject preserved (format-patch -k | am -k)': 
-	check_subject long-k -k
-
-HEAD is now at 2f64c43 baseline
-Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
-ok 10 - long subject preserved (format-patch -k | am -k)
-
-expecting success of 4152.11 'multiline subject unwrapped (format-patch | am)': 
-	check_subject multiline
-
-HEAD is now at 2f64c43 baseline
-Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
-ok 11 - multiline subject unwrapped (format-patch | am)
-
-expecting success of 4152.12 'multiline subject unwrapped (format-patch -k | am)': 
-	check_subject multiline-k
-
-HEAD is now at 2f64c43 baseline
-Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
-ok 12 - multiline subject unwrapped (format-patch -k | am)
-
-expecting success of 4152.13 'multiline subject preserved (format-patch -k | am -k)': 
-	check_subject multiline-k -k
-
-HEAD is now at 2f64c43 baseline
-Applying: this is a long subject that is virtually guaranteed
-ok 13 - multiline subject preserved (format-patch -k | am -k)
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4201-shortlog.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4201-shortlog/.git/
 expecting success of 4201.1 'setup': 
@@ -280061,7 +280995,7 @@
 	test_grep "^-rw-rw-rw" worktree
 
 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	non-canon
--rw-rw-rw- 1 pbuilder1 pbuilder1 0 Aug 27 08:21 non-canon
+-rw-rw-rw- 1 pbuilder2 pbuilder2 0 Sep 29 14:52 non-canon
 HEAD is now at 06f0a25 undo: add change_notx_to_x as not executable
 ok 21 - patch mode for new file is canonicalized
 
@@ -280109,7 +281043,7 @@
 	test_grep "^-rwxrwxrwx" worktree
 
 100755 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	non-canon
--rwxrwxrwx 1 pbuilder1 pbuilder1 8 Aug 27 08:21 non-canon
+-rwxrwxrwx 1 pbuilder2 pbuilder2 8 Sep 29 14:52 non-canon
 HEAD is now at 06f0a25 undo: add change_notx_to_x as not executable
 ok 23 - patch mode for mode change is canonicalized
 
@@ -280773,415 +281707,178 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4204-patch-id.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4204-patch-id/.git/
-expecting success of 4204.1 'setup': 
-	str="ab cd ef gh ij kl mn op" &&
-	test_write_lines $str >foo &&
-	test_write_lines $str >bar &&
-	git add foo bar &&
-	git commit -a -m initial &&
-	test_write_lines $str b >foo &&
-	test_write_lines $str b >bar &&
-	git commit -a -m first &&
-	git checkout -b same main &&
-	git commit --amend -m same-msg &&
-	git checkout -b notsame main &&
-	echo c >foo &&
-	echo c >bar &&
-	git commit --amend -a -m notsame-msg &&
-	git checkout -b with_space main~ &&
-	cat >foo <<-\EOF &&
-	a  b
-	c d
-	e    f
-	  g   h
-	    i   j
-	k l
-	m   n
-	op
+*** t4210-log-i18n.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-	cp foo bar &&
-	git add foo bar &&
-	git commit --amend -m "with spaces" &&
-	test_write_lines bar foo >bar-then-foo &&
-	test_write_lines foo bar >foo-then-bar
+	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
 
-[main (root-commit) f34ad56] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 16 insertions(+)
- create mode 100644 bar
- create mode 100644 foo
-[main 637c384] first
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-Switched to a new branch 'same'
-[same bdbb3b3] same-msg
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 2 insertions(+)
-Switched to a new branch 'notsame'
-[notsame e083d83] notsame-msg
+[master (root-commit) cbf2796] utf8
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 2 insertions(+), 16 deletions(-)
-Switched to a new branch 'with_space'
-[with_space 983116d] with spaces
+ 1 file changed, 3 insertions(+)
+ create mode 100644 msg
+[master b077cf9] latin1
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 16 insertions(+)
- create mode 100644 bar
- create mode 100644 foo
-ok 1 - setup
-
-expecting success of 4204.2 'patch-id output is well-formed': 
-	git log -p -1 >log.output &&
-	git patch-id <log.output >output &&
-	grep "^$OID_REGEX $(git rev-parse HEAD)$" output
-
-f2e75ee7c01deac4f2c51488f8e1cc6c0ff2719f 983116d734eae4c6993305600c31050ff5dea7f1
-ok 2 - patch-id output is well-formed
-
-expecting success of 4204.3 'patch-id detects equality': 
-	get_patch_id main &&
-	get_patch_id same &&
-	test_cmp patch-id_main patch-id_same
-
-ok 3 - patch-id detects equality
-
-expecting success of 4204.4 'patch-id detects inequality': 
-	get_patch_id main &&
-	get_patch_id notsame &&
-	! test_cmp patch-id_main patch-id_notsame
-
---- patch-id_main	2025-08-27 08:21:18.407786829 +0000
-+++ patch-id_notsame	2025-08-27 08:21:18.431786988 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+6276aec15da664e9f9ce6dde29c2e2c71607e017
-ok 4 - patch-id detects inequality
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ok 1 - create commits in different encodings
 
-expecting success of 4204.5 'patch-id detects equality binary': 
-	cat >.gitattributes <<-\EOF &&
-	foo binary
-	bar binary
+expecting success of 4210.2 'log --grep searches in log output encoding (utf8)': 
+	cat >expect <<-\EOF &&
+	latin1
+	utf8
 	EOF
-	get_patch_id main &&
-	get_patch_id same &&
-	git log -p -1 --binary main >top-diff.output &&
-	calc_patch_id <top-diff.output main_binpatch &&
-	git log -p -1 --binary same >top-diff.output &&
-	calc_patch_id <top-diff.output same_binpatch &&
-	test_cmp patch-id_main patch-id_main_binpatch &&
-	test_cmp patch-id_same patch-id_same_binpatch &&
-	test_cmp patch-id_main patch-id_same &&
-	test_when_finished "rm .gitattributes"
+	git log --encoding=utf8 --format=%s --grep=$utf8_e >actual &&
+	test_cmp expect actual
 
-ok 5 - patch-id detects equality binary
+ok 2 - log --grep searches in log output encoding (utf8)
 
-expecting success of 4204.6 'patch-id detects inequality binary': 
-	cat >.gitattributes <<-\EOF &&
-	foo binary
-	bar binary
+expecting success of 4210.3 'log --grep searches in log output encoding (latin1)': 
+	cat >expect <<-\EOF &&
+	latin1
+	utf8
 	EOF
-	get_patch_id main &&
-	get_patch_id notsame &&
-	! test_cmp patch-id_main patch-id_notsame &&
-	test_when_finished "rm .gitattributes"
-
---- patch-id_main	2025-08-27 08:21:18.575787938 +0000
-+++ patch-id_notsame	2025-08-27 08:21:18.587788017 +0000
-@@ -1 +1 @@
--6c46c4bc49d6541a5d8bcadf7808959c9520ae8b
-+f92e710b91f98a3598e43f302e80d3e4a9bfe874
-ok 6 - patch-id detects inequality binary
-
-expecting success of 4204.7 'patch-id supports git-format-patch output': 
-	get_patch_id main &&
-	git checkout same &&
-	git format-patch -1 --stdout >format-patch.output &&
-	calc_patch_id same <format-patch.output &&
-	test_cmp patch-id_main patch-id_same &&
-	set $(git patch-id <format-patch.output) &&
-	test "$2" = $(git rev-parse HEAD)
-
-Switched to branch 'same'
-ok 7 - patch-id supports git-format-patch output
-
-expecting success of 4204.8 'whitespace is irrelevant in footer': 
-	get_patch_id main &&
-	git checkout same &&
-	git format-patch -1 --stdout >format-patch.output &&
-	sed "s/ \$//" format-patch.output | calc_patch_id same &&
-	test_cmp patch-id_main patch-id_same
-
-Already on 'same'
-ok 8 - whitespace is irrelevant in footer
-
-expecting success of 4204.9 'file order is irrelevant with --stable': 
-	test_patch_id_file_order irrelevant --stable --stable
-
-Already on 'same'
-ok 9 - file order is irrelevant with --stable
-
-expecting success of 4204.10 'file order is relevant with --unstable': 
-	test_patch_id_file_order relevant --unstable --unstable
-
-Already on 'same'
---- patch-id_order---unstable-relevant	2025-08-27 08:21:18.835789653 +0000
-+++ patch-id_ordered-order---unstable-relevant	2025-08-27 08:21:18.859789811 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 10 - file order is relevant with --unstable
-
-expecting success of 4204.11 'whitespace is relevant with --verbatim': 
-	test_patch_id_whitespace relevant --verbatim --verbatim
-
---- patch-id_ws---verbatim-relevant	2025-08-27 08:21:18.883789969 +0000
-+++ patch-id_ws-ws---verbatim-relevant	2025-08-27 08:21:18.923790233 +0000
-@@ -1 +1 @@
--bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
-+ec56d730a19f56a178db031386e5bcaabfea5677
-ok 11 - whitespace is relevant with --verbatim
-
-expecting success of 4204.12 'whitespace is irrelevant without --verbatim': 
-	test_patch_id_whitespace irrelevant --stable --stable
-
-ok 12 - whitespace is irrelevant without --verbatim
-
-expecting success of 4204.13 'default is unstable': 
-	test_patch_id relevant default
-
-Already on 'same'
---- patch-id_order-default-relevant	2025-08-27 08:21:18.995790708 +0000
-+++ patch-id_ordered-order-default-relevant	2025-08-27 08:21:19.027790919 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 13 - default is unstable
-
-expecting success of 4204.14 'patchid.stable = true is stable': 
-	test_config patchid.stable true &&
-	test_patch_id irrelevant patchid.stable=true
-
-Already on 'same'
-ok 14 - patchid.stable = true is stable
-
-expecting success of 4204.15 'patchid.stable = false is unstable': 
-	test_config patchid.stable false &&
-	test_patch_id relevant patchid.stable=false
-
-Already on 'same'
---- patch-id_order-patchid.stable=false-relevant	2025-08-27 08:21:19.115791499 +0000
-+++ patch-id_ordered-order-patchid.stable=false-relevant	2025-08-27 08:21:19.147791711 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 15 - patchid.stable = false is unstable
-
-expecting success of 4204.16 'patchid.verbatim = true is correct and stable': 
-	test_config patchid.verbatim true &&
-	test_patch_id_whitespace relevant patchid.verbatim=true &&
-	test_patch_id irrelevant patchid.verbatim=true
-
---- patch-id_ws-patchid.verbatim=true-relevant	2025-08-27 08:21:19.171791869 +0000
-+++ patch-id_ws-ws-patchid.verbatim=true-relevant	2025-08-27 08:21:19.207792106 +0000
-@@ -1 +1 @@
--bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
-+ec56d730a19f56a178db031386e5bcaabfea5677
-Already on 'same'
-ok 16 - patchid.verbatim = true is correct and stable
-
-expecting success of 4204.17 'patchid.verbatim = false is unstable': 
-	test_config patchid.verbatim false &&
-	test_patch_id relevant patchid.verbatim=false
-
-Already on 'same'
---- patch-id_order-patchid.verbatim=false-relevant	2025-08-27 08:21:19.295792687 +0000
-+++ patch-id_ordered-order-patchid.verbatim=false-relevant	2025-08-27 08:21:19.323792871 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 17 - patchid.verbatim = false is unstable
-
-expecting success of 4204.18 '--unstable overrides patchid.stable = true': 
-	test_config patchid.stable true &&
-	test_patch_id relevant patchid.stable=true--unstable --unstable
+	git log --encoding=ISO-8859-1 --format=%s --grep=$latin1_e >actual &&
+	test_cmp expect actual
 
-Already on 'same'
---- patch-id_order-patchid.stable=true--unstable-relevant	2025-08-27 08:21:19.367793162 +0000
-+++ patch-id_ordered-order-patchid.stable=true--unstable-relevant	2025-08-27 08:21:19.399793373 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 18 - --unstable overrides patchid.stable = true
+ok 3 - log --grep searches in log output encoding (latin1)
 
-expecting success of 4204.19 '--stable overrides patchid.stable = false': 
-	test_config patchid.stable false &&
-	test_patch_id irrelevant patchid.stable=false--stable --stable
+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
 
-Already on 'same'
-ok 19 - --stable overrides patchid.stable = false
+ok 4 - log --grep does not find non-reencoded values (utf8)
 
-expecting success of 4204.20 '--verbatim overrides patchid.stable = false': 
-	test_config patchid.stable false &&
-	test_patch_id_whitespace relevant stable=false--verbatim --verbatim
+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
 
---- patch-id_ws-stable=false--verbatim-relevant	2025-08-27 08:21:19.539794296 +0000
-+++ patch-id_ws-ws-stable=false--verbatim-relevant	2025-08-27 08:21:19.555794402 +0000
-@@ -1 +1 @@
--bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
-+ec56d730a19f56a178db031386e5bcaabfea5677
-ok 20 - --verbatim overrides patchid.stable = false
+ok 5 - log --grep does not find non-reencoded values (latin1)
 
-expecting success of 4204.21 'patch-id supports git-format-patch MIME output': 
-	get_patch_id main &&
-	git checkout same &&
-	git format-patch -1 --attach --stdout >format-patch.output &&
-	calc_patch_id <format-patch.output same &&
-	test_cmp patch-id_main patch-id_same
+expecting success of 4210.6 'config grep.patternType=fixed': 
+		git config grep.patternType fixed
+	
+ok 6 - config grep.patternType=fixed
 
-Already on 'same'
-ok 21 - patch-id supports git-format-patch MIME output
+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 4204.22 'patch-id respects config from subdir': 
-	test_config patchid.stable true &&
-	mkdir subdir &&
+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)
 
-	# copy these because test_patch_id() looks for them in
-	# the current directory
-	cp bar-then-foo foo-then-bar subdir &&
+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)
 
-	(
-		cd subdir &&
-		test_patch_id irrelevant patchid.stable=true
-	)
+expecting success of 4210.10 'config grep.patternType=basic': 
+		git config grep.patternType basic
+	
+ok 10 - config grep.patternType=basic
 
-Already on 'same'
-ok 22 - patch-id respects config from subdir
+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 4204.23 'patch-id handles no-nl-at-eof markers': 
-	cat >nonl <<-\EOF &&
-	diff --git i/a w/a
-	index e69de29..2e65efe 100644
-	--- i/a
-	+++ w/a
-	@@ -0,0 +1 @@
-	+a
-	\ No newline at end of file
-	diff --git i/b w/b
-	index e69de29..6178079 100644
-	--- i/b
-	+++ w/b
-	@@ -0,0 +1 @@
-	+b
-	EOF
-	cat >withnl <<-\EOF &&
-	diff --git i/a w/a
-	index e69de29..7898192 100644
-	--- i/a
-	+++ w/a
-	@@ -0,0 +1 @@
-	+a
-	diff --git i/b w/b
-	index e69de29..6178079 100644
-	--- i/b
-	+++ w/b
-	@@ -0,0 +1 @@
-	+b
-	EOF
-	calc_patch_id nonl <nonl &&
-	calc_patch_id withnl <withnl &&
-	test_cmp patch-id_nonl patch-id_withnl &&
-	calc_patch_id nonl-inc-ws --verbatim <nonl &&
-	calc_patch_id withnl-inc-ws --verbatim <withnl &&
-	! test_cmp patch-id_nonl-inc-ws patch-id_withnl-inc-ws
+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)
 
---- patch-id_nonl-inc-ws	2025-08-27 08:21:19.759795747 +0000
-+++ patch-id_withnl-inc-ws	2025-08-27 08:21:19.775795853 +0000
-@@ -1 +1 @@
--7ff2bcb9c001e010d881f0fccddc20be3af94012
-+897be18d6338cd2e68bf17f3848b1c48bbc17459
-ok 23 - patch-id handles no-nl-at-eof markers
+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 4204.24 'patch-id handles diffs with one line of before/after': 
-	cat >diffu1 <<-\EOF &&
-	diff --git a/bar b/bar
-	index bdaf90f..31051f6 100644
-	--- a/bar
-	+++ b/bar
-	@@ -2 +2,2 @@
-	 b
-	+c
-	diff --git a/car b/car
-	index 00750ed..2ae5e34 100644
-	--- a/car
-	+++ b/car
-	@@ -1 +1,2 @@
-	 3
-	+d
-	diff --git a/foo b/foo
-	index e439850..7146eb8 100644
-	--- a/foo
-	+++ b/foo
-	@@ -2 +2,2 @@
-	 a
-	+e
-	EOF
-	calc_patch_id diffu1 <diffu1 &&
-	test_config patchid.stable true &&
-	calc_patch_id diffu1stable <diffu1
+expecting success of 4210.14 'config grep.patternType=extended': 
+		git config grep.patternType extended
+	
+ok 14 - config grep.patternType=extended
 
-ok 24 - patch-id handles diffs with one line of before/after
+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)
 
-checking known breakage of 4204.25 'patch-id computes same ID with different object hashes': 
-	test_when_finished "rm -rf repo-sha1 repo-sha256" &&
+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)
 
-	cat >diff <<-\EOF &&
-	diff --git a/bar b/bar
-	index bdaf90f..31051f6 100644
-	--- a/bar
-	+++ b/bar
-	@@ -2 +2,2 @@
-	 b
-	+c
-	EOF
+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)
 
-	git init --object-format=sha1 repo-sha1 &&
-	git -C repo-sha1 patch-id <diff >patch-id-sha1 &&
-	git init --object-format=sha256 repo-sha256 &&
-	git -C repo-sha256 patch-id <diff >patch-id-sha256 &&
-	test_cmp patch-id-sha1 patch-id-sha256
+expecting success of 4210.18 'config grep.patternType=perl': 
+		git config grep.patternType perl
+	
+ok 18 - config grep.patternType=perl
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4204-patch-id/repo-sha1/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4204-patch-id/repo-sha256/.git/
---- patch-id-sha1	2025-08-27 08:21:19.835796249 +0000
-+++ patch-id-sha256	2025-08-27 08:21:19.851796354 +0000
-@@ -1 +1 @@
--412211131a680f60efe39ff97826b8a673042664 0000000000000000000000000000000000000000
-+f8e1e9607584d07254be0d54eebb3f8ce98ce90acb09c653b9bbda1ad2ffc516 0000000000000000000000000000000000000000000000000000000000000000
-not ok 25 - patch-id computes same ID with different object hashes # TODO known breakage
+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 4204.26 'patch-id without repository': 
-	cat >diff <<-\EOF &&
-	diff --git a/bar b/bar
-	index bdaf90f..31051f6 100644
-	--- a/bar
-	+++ b/bar
-	@@ -2 +2,2 @@
-	 b
-	+c
-	EOF
-	nongit git patch-id <diff
+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)
 
-412211131a680f60efe39ff97826b8a673042664 0000000000000000000000000000000000000000
-ok 26 - patch-id without repository
+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)
 
-# still have 1 known breakage(s)
-# passed all remaining 25 test(s)
-1..26
+# passed all 21 test(s)
+1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4208-log-magic-pathspec.sh ***
@@ -281520,178 +282217,415 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4210-log-i18n.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t4204-patch-id.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4204-patch-id/.git/
+expecting success of 4204.1 'setup': 
+	str="ab cd ef gh ij kl mn op" &&
+	test_write_lines $str >foo &&
+	test_write_lines $str >bar &&
+	git add foo bar &&
+	git commit -a -m initial &&
+	test_write_lines $str b >foo &&
+	test_write_lines $str b >bar &&
+	git commit -a -m first &&
+	git checkout -b same main &&
+	git commit --amend -m same-msg &&
+	git checkout -b notsame main &&
+	echo c >foo &&
+	echo c >bar &&
+	git commit --amend -a -m notsame-msg &&
+	git checkout -b with_space main~ &&
+	cat >foo <<-\EOF &&
+	a  b
+	c d
+	e    f
+	  g   h
+	    i   j
+	k l
+	m   n
+	op
 	EOF
-	git add msg &&
-	git -c i18n.commitencoding=utf8 commit -F msg &&
-	cat >msg <<-EOF &&
-	latin1
+	cp foo bar &&
+	git add foo bar &&
+	git commit --amend -m "with spaces" &&
+	test_write_lines bar foo >bar-then-foo &&
+	test_write_lines foo bar >foo-then-bar
 
-	t${latin1_e}st
-	EOF
-	git add msg &&
-	git -c i18n.commitencoding=ISO-8859-1 commit -F msg
 
-[master (root-commit) cbf2796] utf8
+[main (root-commit) f34ad56] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 msg
-[master b077cf9] latin1
+ 2 files changed, 16 insertions(+)
+ create mode 100644 bar
+ create mode 100644 foo
+[main 637c384] first
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-ok 1 - create commits in different encodings
+ 2 files changed, 2 insertions(+)
+Switched to a new branch 'same'
+[same bdbb3b3] same-msg
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 2 insertions(+)
+Switched to a new branch 'notsame'
+[notsame e083d83] notsame-msg
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 2 insertions(+), 16 deletions(-)
+Switched to a new branch 'with_space'
+[with_space 983116d] with spaces
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 16 insertions(+)
+ create mode 100644 bar
+ create mode 100644 foo
+ok 1 - setup
 
-expecting success of 4210.2 'log --grep searches in log output encoding (utf8)': 
-	cat >expect <<-\EOF &&
-	latin1
-	utf8
+expecting success of 4204.2 'patch-id output is well-formed': 
+	git log -p -1 >log.output &&
+	git patch-id <log.output >output &&
+	grep "^$OID_REGEX $(git rev-parse HEAD)$" output
+
+f2e75ee7c01deac4f2c51488f8e1cc6c0ff2719f 983116d734eae4c6993305600c31050ff5dea7f1
+ok 2 - patch-id output is well-formed
+
+expecting success of 4204.3 'patch-id detects equality': 
+	get_patch_id main &&
+	get_patch_id same &&
+	test_cmp patch-id_main patch-id_same
+
+ok 3 - patch-id detects equality
+
+expecting success of 4204.4 'patch-id detects inequality': 
+	get_patch_id main &&
+	get_patch_id notsame &&
+	! test_cmp patch-id_main patch-id_notsame
+
+--- patch-id_main	2026-09-29 14:52:35.714548970 +0000
++++ patch-id_notsame	2026-09-29 14:52:35.734548970 +0000
+@@ -1 +1 @@
+-c58fad5dc58fa3f768f4c9a1809f1bf824870825
++6276aec15da664e9f9ce6dde29c2e2c71607e017
+ok 4 - patch-id detects inequality
+
+expecting success of 4204.5 'patch-id detects equality binary': 
+	cat >.gitattributes <<-\EOF &&
+	foo binary
+	bar binary
 	EOF
-	git log --encoding=utf8 --format=%s --grep=$utf8_e >actual &&
-	test_cmp expect actual
+	get_patch_id main &&
+	get_patch_id same &&
+	git log -p -1 --binary main >top-diff.output &&
+	calc_patch_id <top-diff.output main_binpatch &&
+	git log -p -1 --binary same >top-diff.output &&
+	calc_patch_id <top-diff.output same_binpatch &&
+	test_cmp patch-id_main patch-id_main_binpatch &&
+	test_cmp patch-id_same patch-id_same_binpatch &&
+	test_cmp patch-id_main patch-id_same &&
+	test_when_finished "rm .gitattributes"
 
-ok 2 - log --grep searches in log output encoding (utf8)
+ok 5 - patch-id detects equality binary
 
-expecting success of 4210.3 'log --grep searches in log output encoding (latin1)': 
-	cat >expect <<-\EOF &&
-	latin1
-	utf8
+expecting success of 4204.6 'patch-id detects inequality binary': 
+	cat >.gitattributes <<-\EOF &&
+	foo binary
+	bar binary
 	EOF
-	git log --encoding=ISO-8859-1 --format=%s --grep=$latin1_e >actual &&
-	test_cmp expect actual
+	get_patch_id main &&
+	get_patch_id notsame &&
+	! test_cmp patch-id_main patch-id_notsame &&
+	test_when_finished "rm .gitattributes"
 
-ok 3 - log --grep searches in log output encoding (latin1)
+--- patch-id_main	2026-09-29 14:52:35.842548970 +0000
++++ patch-id_notsame	2026-09-29 14:52:35.862548970 +0000
+@@ -1 +1 @@
+-6c46c4bc49d6541a5d8bcadf7808959c9520ae8b
++f92e710b91f98a3598e43f302e80d3e4a9bfe874
+ok 6 - patch-id detects inequality binary
 
-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
+expecting success of 4204.7 'patch-id supports git-format-patch output': 
+	get_patch_id main &&
+	git checkout same &&
+	git format-patch -1 --stdout >format-patch.output &&
+	calc_patch_id same <format-patch.output &&
+	test_cmp patch-id_main patch-id_same &&
+	set $(git patch-id <format-patch.output) &&
+	test "$2" = $(git rev-parse HEAD)
 
-ok 4 - log --grep does not find non-reencoded values (utf8)
+Switched to branch 'same'
+ok 7 - patch-id supports git-format-patch output
 
-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
+expecting success of 4204.8 'whitespace is irrelevant in footer': 
+	get_patch_id main &&
+	git checkout same &&
+	git format-patch -1 --stdout >format-patch.output &&
+	sed "s/ \$//" format-patch.output | calc_patch_id same &&
+	test_cmp patch-id_main patch-id_same
 
-ok 5 - log --grep does not find non-reencoded values (latin1)
+Already on 'same'
+ok 8 - whitespace is irrelevant in footer
 
-expecting success of 4210.6 'config grep.patternType=fixed': 
-		git config grep.patternType fixed
-	
-ok 6 - config grep.patternType=fixed
+expecting success of 4204.9 'file order is irrelevant with --stable': 
+	test_patch_id_file_order irrelevant --stable --stable
 
-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)
+Already on 'same'
+ok 9 - file order is irrelevant with --stable
 
-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 4204.10 'file order is relevant with --unstable': 
+	test_patch_id_file_order relevant --unstable --unstable
 
-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)
+Already on 'same'
+--- patch-id_order---unstable-relevant	2026-09-29 14:52:36.038548970 +0000
++++ patch-id_ordered-order---unstable-relevant	2026-09-29 14:52:36.058548970 +0000
+@@ -1 +1 @@
+-c58fad5dc58fa3f768f4c9a1809f1bf824870825
++892d1d3b08f44511b1fdc7cab43c0ad907ac772b
+ok 10 - file order is relevant with --unstable
 
-expecting success of 4210.10 'config grep.patternType=basic': 
-		git config grep.patternType basic
-	
-ok 10 - config grep.patternType=basic
+expecting success of 4204.11 'whitespace is relevant with --verbatim': 
+	test_patch_id_whitespace relevant --verbatim --verbatim
 
-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)
+--- patch-id_ws---verbatim-relevant	2026-09-29 14:52:36.074548970 +0000
++++ patch-id_ws-ws---verbatim-relevant	2026-09-29 14:52:36.094548970 +0000
+@@ -1 +1 @@
+-bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
++ec56d730a19f56a178db031386e5bcaabfea5677
+ok 11 - whitespace is relevant with --verbatim
 
-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 4204.12 'whitespace is irrelevant without --verbatim': 
+	test_patch_id_whitespace irrelevant --stable --stable
 
-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)
+ok 12 - whitespace is irrelevant without --verbatim
 
-expecting success of 4210.14 'config grep.patternType=extended': 
-		git config grep.patternType extended
-	
-ok 14 - config grep.patternType=extended
+expecting success of 4204.13 'default is unstable': 
+	test_patch_id relevant default
 
-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)
+Already on 'same'
+--- patch-id_order-default-relevant	2026-09-29 14:52:36.138548970 +0000
++++ patch-id_ordered-order-default-relevant	2026-09-29 14:52:36.158548970 +0000
+@@ -1 +1 @@
+-c58fad5dc58fa3f768f4c9a1809f1bf824870825
++892d1d3b08f44511b1fdc7cab43c0ad907ac772b
+ok 13 - default is unstable
 
-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 4204.14 'patchid.stable = true is stable': 
+	test_config patchid.stable true &&
+	test_patch_id irrelevant patchid.stable=true
 
-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)
+Already on 'same'
+ok 14 - patchid.stable = true is stable
 
-expecting success of 4210.18 'config grep.patternType=perl': 
-		git config grep.patternType perl
-	
-ok 18 - config grep.patternType=perl
+expecting success of 4204.15 'patchid.stable = false is unstable': 
+	test_config patchid.stable false &&
+	test_patch_id relevant patchid.stable=false
 
-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)
+Already on 'same'
+--- patch-id_order-patchid.stable=false-relevant	2026-09-29 14:52:36.218548970 +0000
++++ patch-id_ordered-order-patchid.stable=false-relevant	2026-09-29 14:52:36.242548970 +0000
+@@ -1 +1 @@
+-c58fad5dc58fa3f768f4c9a1809f1bf824870825
++892d1d3b08f44511b1fdc7cab43c0ad907ac772b
+ok 15 - patchid.stable = false is unstable
 
-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 4204.16 'patchid.verbatim = true is correct and stable': 
+	test_config patchid.verbatim true &&
+	test_patch_id_whitespace relevant patchid.verbatim=true &&
+	test_patch_id irrelevant patchid.verbatim=true
 
-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)
+--- patch-id_ws-patchid.verbatim=true-relevant	2026-09-29 14:52:36.294548970 +0000
++++ patch-id_ws-ws-patchid.verbatim=true-relevant	2026-09-29 14:52:36.306548970 +0000
+@@ -1 +1 @@
+-bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
++ec56d730a19f56a178db031386e5bcaabfea5677
+Already on 'same'
+ok 16 - patchid.verbatim = true is correct and stable
 
-# passed all 21 test(s)
-1..21
+expecting success of 4204.17 'patchid.verbatim = false is unstable': 
+	test_config patchid.verbatim false &&
+	test_patch_id relevant patchid.verbatim=false
+
+Already on 'same'
+--- patch-id_order-patchid.verbatim=false-relevant	2026-09-29 14:52:36.374548970 +0000
++++ patch-id_ordered-order-patchid.verbatim=false-relevant	2026-09-29 14:52:36.398548970 +0000
+@@ -1 +1 @@
+-c58fad5dc58fa3f768f4c9a1809f1bf824870825
++892d1d3b08f44511b1fdc7cab43c0ad907ac772b
+ok 17 - patchid.verbatim = false is unstable
+
+expecting success of 4204.18 '--unstable overrides patchid.stable = true': 
+	test_config patchid.stable true &&
+	test_patch_id relevant patchid.stable=true--unstable --unstable
+
+Already on 'same'
+--- patch-id_order-patchid.stable=true--unstable-relevant	2026-09-29 14:52:36.430548970 +0000
++++ patch-id_ordered-order-patchid.stable=true--unstable-relevant	2026-09-29 14:52:36.450548970 +0000
+@@ -1 +1 @@
+-c58fad5dc58fa3f768f4c9a1809f1bf824870825
++892d1d3b08f44511b1fdc7cab43c0ad907ac772b
+ok 18 - --unstable overrides patchid.stable = true
+
+expecting success of 4204.19 '--stable overrides patchid.stable = false': 
+	test_config patchid.stable false &&
+	test_patch_id irrelevant patchid.stable=false--stable --stable
+
+Already on 'same'
+ok 19 - --stable overrides patchid.stable = false
+
+expecting success of 4204.20 '--verbatim overrides patchid.stable = false': 
+	test_config patchid.stable false &&
+	test_patch_id_whitespace relevant stable=false--verbatim --verbatim
+
+--- patch-id_ws-stable=false--verbatim-relevant	2026-09-29 14:52:36.530548970 +0000
++++ patch-id_ws-ws-stable=false--verbatim-relevant	2026-09-29 14:52:36.542548970 +0000
+@@ -1 +1 @@
+-bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
++ec56d730a19f56a178db031386e5bcaabfea5677
+ok 20 - --verbatim overrides patchid.stable = false
+
+expecting success of 4204.21 'patch-id supports git-format-patch MIME output': 
+	get_patch_id main &&
+	git checkout same &&
+	git format-patch -1 --attach --stdout >format-patch.output &&
+	calc_patch_id <format-patch.output same &&
+	test_cmp patch-id_main patch-id_same
+
+Already on 'same'
+ok 21 - patch-id supports git-format-patch MIME output
+
+expecting success of 4204.22 'patch-id respects config from subdir': 
+	test_config patchid.stable true &&
+	mkdir subdir &&
+
+	# copy these because test_patch_id() looks for them in
+	# the current directory
+	cp bar-then-foo foo-then-bar subdir &&
+
+	(
+		cd subdir &&
+		test_patch_id irrelevant patchid.stable=true
+	)
+
+Already on 'same'
+ok 22 - patch-id respects config from subdir
+
+expecting success of 4204.23 'patch-id handles no-nl-at-eof markers': 
+	cat >nonl <<-\EOF &&
+	diff --git i/a w/a
+	index e69de29..2e65efe 100644
+	--- i/a
+	+++ w/a
+	@@ -0,0 +1 @@
+	+a
+	\ No newline at end of file
+	diff --git i/b w/b
+	index e69de29..6178079 100644
+	--- i/b
+	+++ w/b
+	@@ -0,0 +1 @@
+	+b
+	EOF
+	cat >withnl <<-\EOF &&
+	diff --git i/a w/a
+	index e69de29..7898192 100644
+	--- i/a
+	+++ w/a
+	@@ -0,0 +1 @@
+	+a
+	diff --git i/b w/b
+	index e69de29..6178079 100644
+	--- i/b
+	+++ w/b
+	@@ -0,0 +1 @@
+	+b
+	EOF
+	calc_patch_id nonl <nonl &&
+	calc_patch_id withnl <withnl &&
+	test_cmp patch-id_nonl patch-id_withnl &&
+	calc_patch_id nonl-inc-ws --verbatim <nonl &&
+	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-09-29 14:52:36.686548970 +0000
++++ patch-id_withnl-inc-ws	2026-09-29 14:52:36.698548970 +0000
+@@ -1 +1 @@
+-7ff2bcb9c001e010d881f0fccddc20be3af94012
++897be18d6338cd2e68bf17f3848b1c48bbc17459
+ok 23 - patch-id handles no-nl-at-eof markers
+
+expecting success of 4204.24 'patch-id handles diffs with one line of before/after': 
+	cat >diffu1 <<-\EOF &&
+	diff --git a/bar b/bar
+	index bdaf90f..31051f6 100644
+	--- a/bar
+	+++ b/bar
+	@@ -2 +2,2 @@
+	 b
+	+c
+	diff --git a/car b/car
+	index 00750ed..2ae5e34 100644
+	--- a/car
+	+++ b/car
+	@@ -1 +1,2 @@
+	 3
+	+d
+	diff --git a/foo b/foo
+	index e439850..7146eb8 100644
+	--- a/foo
+	+++ b/foo
+	@@ -2 +2,2 @@
+	 a
+	+e
+	EOF
+	calc_patch_id diffu1 <diffu1 &&
+	test_config patchid.stable true &&
+	calc_patch_id diffu1stable <diffu1
+
+ok 24 - patch-id handles diffs with one line of before/after
+
+checking known breakage of 4204.25 'patch-id computes same ID with different object hashes': 
+	test_when_finished "rm -rf repo-sha1 repo-sha256" &&
+
+	cat >diff <<-\EOF &&
+	diff --git a/bar b/bar
+	index bdaf90f..31051f6 100644
+	--- a/bar
+	+++ b/bar
+	@@ -2 +2,2 @@
+	 b
+	+c
+	EOF
+
+	git init --object-format=sha1 repo-sha1 &&
+	git -C repo-sha1 patch-id <diff >patch-id-sha1 &&
+	git init --object-format=sha256 repo-sha256 &&
+	git -C repo-sha256 patch-id <diff >patch-id-sha256 &&
+	test_cmp patch-id-sha1 patch-id-sha256
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4204-patch-id/repo-sha1/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4204-patch-id/repo-sha256/.git/
+--- patch-id-sha1	2026-09-29 14:52:36.746548970 +0000
++++ patch-id-sha256	2026-09-29 14:52:36.758548970 +0000
+@@ -1 +1 @@
+-412211131a680f60efe39ff97826b8a673042664 0000000000000000000000000000000000000000
++f8e1e9607584d07254be0d54eebb3f8ce98ce90acb09c653b9bbda1ad2ffc516 0000000000000000000000000000000000000000000000000000000000000000
+not ok 25 - patch-id computes same ID with different object hashes # TODO known breakage
+
+expecting success of 4204.26 'patch-id without repository': 
+	cat >diff <<-\EOF &&
+	diff --git a/bar b/bar
+	index bdaf90f..31051f6 100644
+	--- a/bar
+	+++ b/bar
+	@@ -2 +2,2 @@
+	 b
+	+c
+	EOF
+	nongit git patch-id <diff
+
+412211131a680f60efe39ff97826b8a673042664 0000000000000000000000000000000000000000
+ok 26 - patch-id without repository
+
+# still have 1 known breakage(s)
+# passed all remaining 25 test(s)
+1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4124-apply-ws-rule.sh ***
@@ -284723,1990 +285657,6 @@
 1..36
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4211-line-log.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4211-line-log/.git/
-expecting success of 4211.1 'setup (import history)': 
-	git fast-import < "$TEST_DIRECTORY"/t4211/history.export &&
-	git reset --hard
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           35 (         0 duplicates                  )
-      blobs  :           11 (         0 duplicates         10 deltas of         10 attempts)
-      trees  :           12 (         0 duplicates          0 deltas of         11 attempts)
-      commits:           12 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           4 (         4 loads     )
-      marks:           1024 (        23 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            =          7
-pack_report: pack_mmap_calls          =          4
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       3020
----------------------------------------------------------------------
-
-HEAD is now at 0d8dcfc move within the file
-ok 1 - setup (import history)
-
-expecting success of 4211.2 'basic command line parsing': 
-	# This may fail due to "no such path a.c in commit", or
-	# "-L is incompatible with pathspec", depending on the
-	# order the error is checked.  Either is acceptable.
-	test_must_fail git log -L1,1:a.c -- a.c &&
-
-	# -L requires there is no pathspec
-	test_must_fail git log -L1,1:b.c -- b.c 2>error &&
-	test_grep "cannot be used with pathspec" error &&
-
-	# This would fail because --follow wants a single path, but
-	# we may fail due to incompatibility between -L/--follow in
-	# the future.  Either is acceptable.
-	test_must_fail git log -L1,1:b.c --follow &&
-	test_must_fail git log --follow -L1,1:b.c &&
-
-	# This would fail because -L wants no pathspec, but
-	# we may fail due to incompatibility between -L/--follow in
-	# the future.  Either is acceptable.
-	test_must_fail git log --follow -L1,1:b.c -- b.c
-
-fatal: -L<range>:<file> cannot be used with pathspec
-fatal: -L<range>:<file> cannot be used with pathspec
-fatal: --follow requires exactly one pathspec
-fatal: --follow requires exactly one pathspec
-fatal: -L<range>:<file> cannot be used with pathspec
-ok 2 - basic command line parsing
-
-expecting success of 4211.3 '-L 4,12:a.c simple': 
-		git log -L 4,12:a.c simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.simple-f actual
-	
-ok 3 - -L 4,12:a.c simple
-
-expecting success of 4211.4 '-L 4,+9:a.c simple': 
-		git log -L 4,+9:a.c simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.simple-f actual
-	
-ok 4 - -L 4,+9:a.c simple
-
-expecting success of 4211.5 '-L '/long f/,/^}/:a.c' simple': 
-		git log -L '/long f/,/^}/:a.c' simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.simple-f actual
-	
-ok 5 - -L '/long f/,/^}/:a.c' simple
-
-expecting success of 4211.6 '-L :f:a.c simple': 
-		git log -L :f:a.c simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.simple-f-to-main actual
-	
-ok 6 - -L :f:a.c simple
-
-expecting success of 4211.7 '-L '/main/,/^}/:a.c' simple': 
-		git log -L '/main/,/^}/:a.c' simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.simple-main actual
-	
-ok 7 - -L '/main/,/^}/:a.c' simple
-
-expecting success of 4211.8 '-L :main:a.c simple': 
-		git log -L :main:a.c simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.simple-main-to-end actual
-	
-ok 8 - -L :main:a.c simple
-
-expecting success of 4211.9 '-L 1,+4:a.c simple': 
-		git log -L 1,+4:a.c simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.beginning-of-file actual
-	
-ok 9 - -L 1,+4:a.c simple
-
-expecting success of 4211.10 '-L 20:a.c simple': 
-		git log -L 20:a.c simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.end-of-file actual
-	
-ok 10 - -L 20:a.c simple
-
-expecting success of 4211.11 '-L '/long f/',/^}/:a.c -L /main/,/^}/:a.c simple': 
-		git log -L '/long f/',/^}/:a.c -L /main/,/^}/:a.c simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.two-ranges actual
-	
-ok 11 - -L '/long f/',/^}/:a.c -L /main/,/^}/:a.c simple
-
-expecting success of 4211.12 '-L 24,+1:a.c simple': 
-		git log -L 24,+1:a.c simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.vanishes-early actual
-	
-ok 12 - -L 24,+1:a.c simple
-
-expecting success of 4211.13 '-M -L '/long f/,/^}/:b.c' move-support': 
-		git log -M -L '/long f/,/^}/:b.c' move-support >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.move-support-f actual
-	
-ok 13 - -M -L '/long f/,/^}/:b.c' move-support
-
-expecting success of 4211.14 '-M -L ':f:b.c' parallel-change': 
-		git log -M -L ':f:b.c' parallel-change >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.parallel-change-f-to-main actual
-	
-ok 14 - -M -L ':f:b.c' parallel-change
-
-expecting success of 4211.15 '-L 4,12:a.c -L :main:a.c simple': 
-		git log -L 4,12:a.c -L :main:a.c simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.multiple actual
-	
-ok 15 - -L 4,12:a.c -L :main:a.c simple
-
-expecting success of 4211.16 '-L 4,18:a.c -L ^:main:a.c simple': 
-		git log -L 4,18:a.c -L ^:main:a.c simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.multiple-overlapping actual
-	
-ok 16 - -L 4,18:a.c -L ^:main:a.c simple
-
-expecting success of 4211.17 '-L :main:a.c -L 4,18:a.c simple': 
-		git log -L :main:a.c -L 4,18:a.c simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.multiple-overlapping actual
-	
-ok 17 - -L :main:a.c -L 4,18:a.c simple
-
-expecting success of 4211.18 '-L 4:a.c -L 8,12:a.c simple': 
-		git log -L 4:a.c -L 8,12:a.c simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.multiple-superset actual
-	
-ok 18 - -L 4:a.c -L 8,12:a.c simple
-
-expecting success of 4211.19 '-L 8,12:a.c -L 4:a.c simple': 
-		git log -L 8,12:a.c -L 4:a.c simple >actual &&
-		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.multiple-superset actual
-	
-ok 19 - -L 8,12:a.c -L 4:a.c simple
-
-expecting success of 4211.20 'invalid args: -L': 
-		test_must_fail git log -L 2>errors &&
-		test_grep 'switch.*requires a value' errors
-	
-error: switch `L' requires a value
-ok 20 - invalid args: -L
-
-expecting success of 4211.21 'invalid args: -L b.c': 
-		test_must_fail git log -L b.c 2>errors &&
-		test_grep 'argument not .start,end:file' errors
-	
-fatal: -L argument not 'start,end:file' or ':funcname:file': b.c
-ok 21 - invalid args: -L b.c
-
-expecting success of 4211.22 'invalid args: -L 1:': 
-		test_must_fail git log -L 1: 2>errors &&
-		test_grep 'argument not .start,end:file' errors
-	
-fatal: -L argument not 'start,end:file' or ':funcname:file': 1:
-ok 22 - invalid args: -L 1:
-
-expecting success of 4211.23 'invalid args: -L 1:nonexistent': 
-		test_must_fail git log -L 1:nonexistent 2>errors &&
-		test_grep 'There is no path' errors
-	
-fatal: There is no path nonexistent in the commit
-ok 23 - invalid args: -L 1:nonexistent
-
-expecting success of 4211.24 'invalid args: -L 1:simple': 
-		test_must_fail git log -L 1:simple 2>errors &&
-		test_grep 'There is no path' errors
-	
-fatal: There is no path simple in the commit
-ok 24 - invalid args: -L 1:simple
-
-expecting success of 4211.25 'invalid args: -L '/foo:b.c'': 
-		test_must_fail git log -L '/foo:b.c' 2>errors &&
-		test_grep 'argument not .start,end:file' errors
-	
-fatal: -L argument not 'start,end:file' or ':funcname:file': /foo:b.c
-ok 25 - invalid args: -L '/foo:b.c'
-
-expecting success of 4211.26 'invalid args: -L 1000:b.c': 
-		test_must_fail git log -L 1000:b.c 2>errors &&
-		test_grep 'has only.*lines' errors
-	
-fatal: file b.c has only 26 lines
-ok 26 - invalid args: -L 1000:b.c
-
-expecting success of 4211.27 'invalid args: -L :b.c': 
-		test_must_fail git log -L :b.c 2>errors &&
-		test_grep 'argument not .start,end:file' errors
-	
-fatal: -L argument not 'start,end:file' or ':funcname:file': :b.c
-ok 27 - invalid args: -L :b.c
-
-expecting success of 4211.28 'invalid args: -L :foo:b.c': 
-		test_must_fail git log -L :foo:b.c 2>errors &&
-		test_grep 'no match' errors
-	
-fatal: -L parameter 'foo' starting at line 1: no match
-ok 28 - invalid args: -L :foo:b.c
-
-expecting success of 4211.29 '-L X (X == nlines)': 
-	n=$(wc -l <b.c) &&
-	git log -L $n:b.c
-
-commit 0d8dcfc6b968e06a27d5215bad1fdde3de9d6235
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:50:24 2013 +0100
-
-    move within the file
-
-diff --git a/b.c b/b.c
---- a/b.c
-+++ b/b.c
-@@ -25,0 +26,1 @@
-+}
-ok 29 - -L X (X == nlines)
-
-expecting success of 4211.30 '-L X (X == nlines + 1)': 
-	n=$(expr $(wc -l <b.c) + 1) &&
-	test_must_fail git log -L $n:b.c
-
-fatal: file b.c has only 26 lines
-ok 30 - -L X (X == nlines + 1)
-
-expecting success of 4211.31 '-L X (X == nlines + 2)': 
-	n=$(expr $(wc -l <b.c) + 2) &&
-	test_must_fail git log -L $n:b.c
-
-fatal: file b.c has only 26 lines
-ok 31 - -L X (X == nlines + 2)
-
-expecting success of 4211.32 '-L ,Y (Y == nlines)': 
-	n=$(printf "%d" $(wc -l <b.c)) &&
-	git log -L ,$n:b.c
-
-commit 0d8dcfc6b968e06a27d5215bad1fdde3de9d6235
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:50:24 2013 +0100
-
-    move within the file
-
-diff --git a/b.c b/b.c
---- a/b.c
-+++ b/b.c
-@@ -1,24 +1,26 @@
- #include <unistd.h>
- #include <stdio.h>
- 
--long f(long x)
--{
--	int s = 0;
--	while (x) {
--		x /= 2;
--		s++;
--	}
--	return s;
--}
-+long f(long x);
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
- 
- /* incomplete lines are bad! */
-+
-+long f(long x)
-+{
-+	int s = 0;
-+	while (x) {
-+		x /= 2;
-+		s++;
-+	}
-+	return s;
-+}
-
-commit 6ce3c4ff690136099bb17e1a8766b75764726ea7
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:49:50 2013 +0100
-
-    another simple change
-
-diff --git a/b.c b/b.c
---- a/b.c
-+++ b/b.c
-@@ -1,24 +1,24 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
--		x >>= 1;
-+		x /= 2;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
- 
- /* incomplete lines are bad! */
-
-commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:48:43 2013 +0100
-
-    change back to complete line
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,22 +1,24 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
--}
-\ No newline at end of file
-+}
-+
-+/* incomplete lines are bad! */
-
-commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:48:10 2013 +0100
-
-    change to an incomplete line at end
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,22 +1,22 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
--}
-+}
-\ No newline at end of file
-
-commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:47:40 2013 +0100
-
-    change at very beginning
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,22 @@
-+#include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:41 2013 +0100
-
-    touch comment
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,21 @@
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-- * A comment.
-+ * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:16 2013 +0100
-
-    touch both functions
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,21 @@
- #include <stdio.h>
- 
--int f(int x)
-+long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
- int main ()
- {
--	printf("%d\n", f(15));
-+	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit f04fb20f2c77850996cba739709acc6faecc58f7
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:55 2013 +0100
-
-    change f()
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,20 +1,21 @@
- #include <stdio.h>
- 
- int f(int x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
-+	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
- int main ()
- {
- 	printf("%d\n", f(15));
- 	return 0;
- }
-
-commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:48 2013 +0100
-
-    initial
-
-diff --git a/a.c b/a.c
---- /dev/null
-+++ b/a.c
-@@ -0,0 +1,20 @@
-+#include <stdio.h>
-+
-+int f(int x)
-+{
-+	int s = 0;
-+	while (x) {
-+		x >>= 1;
-+		s++;
-+	}
-+}
-+
-+/*
-+ * A comment.
-+ */
-+
-+int main ()
-+{
-+	printf("%d\n", f(15));
-+	return 0;
-+}
-ok 32 - -L ,Y (Y == nlines)
-
-expecting success of 4211.33 '-L ,Y (Y == nlines + 1)': 
-	n=$(expr $(wc -l <b.c) + 1) &&
-	git log -L ,$n:b.c
-
-commit 0d8dcfc6b968e06a27d5215bad1fdde3de9d6235
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:50:24 2013 +0100
-
-    move within the file
-
-diff --git a/b.c b/b.c
---- a/b.c
-+++ b/b.c
-@@ -1,24 +1,26 @@
- #include <unistd.h>
- #include <stdio.h>
- 
--long f(long x)
--{
--	int s = 0;
--	while (x) {
--		x /= 2;
--		s++;
--	}
--	return s;
--}
-+long f(long x);
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
- 
- /* incomplete lines are bad! */
-+
-+long f(long x)
-+{
-+	int s = 0;
-+	while (x) {
-+		x /= 2;
-+		s++;
-+	}
-+	return s;
-+}
-
-commit 6ce3c4ff690136099bb17e1a8766b75764726ea7
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:49:50 2013 +0100
-
-    another simple change
-
-diff --git a/b.c b/b.c
---- a/b.c
-+++ b/b.c
-@@ -1,24 +1,24 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
--		x >>= 1;
-+		x /= 2;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
- 
- /* incomplete lines are bad! */
-
-commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:48:43 2013 +0100
-
-    change back to complete line
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,22 +1,24 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
--}
-\ No newline at end of file
-+}
-+
-+/* incomplete lines are bad! */
-
-commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:48:10 2013 +0100
-
-    change to an incomplete line at end
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,22 +1,22 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
--}
-+}
-\ No newline at end of file
-
-commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:47:40 2013 +0100
-
-    change at very beginning
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,22 @@
-+#include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:41 2013 +0100
-
-    touch comment
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,21 @@
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-- * A comment.
-+ * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:16 2013 +0100
-
-    touch both functions
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,21 @@
- #include <stdio.h>
- 
--int f(int x)
-+long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
- int main ()
- {
--	printf("%d\n", f(15));
-+	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit f04fb20f2c77850996cba739709acc6faecc58f7
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:55 2013 +0100
-
-    change f()
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,20 +1,21 @@
- #include <stdio.h>
- 
- int f(int x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
-+	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
- int main ()
- {
- 	printf("%d\n", f(15));
- 	return 0;
- }
-
-commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:48 2013 +0100
-
-    initial
-
-diff --git a/a.c b/a.c
---- /dev/null
-+++ b/a.c
-@@ -0,0 +1,20 @@
-+#include <stdio.h>
-+
-+int f(int x)
-+{
-+	int s = 0;
-+	while (x) {
-+		x >>= 1;
-+		s++;
-+	}
-+}
-+
-+/*
-+ * A comment.
-+ */
-+
-+int main ()
-+{
-+	printf("%d\n", f(15));
-+	return 0;
-+}
-ok 33 - -L ,Y (Y == nlines + 1)
-
-expecting success of 4211.34 '-L ,Y (Y == nlines + 2)': 
-	n=$(expr $(wc -l <b.c) + 2) &&
-	git log -L ,$n:b.c
-
-commit 0d8dcfc6b968e06a27d5215bad1fdde3de9d6235
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:50:24 2013 +0100
-
-    move within the file
-
-diff --git a/b.c b/b.c
---- a/b.c
-+++ b/b.c
-@@ -1,24 +1,26 @@
- #include <unistd.h>
- #include <stdio.h>
- 
--long f(long x)
--{
--	int s = 0;
--	while (x) {
--		x /= 2;
--		s++;
--	}
--	return s;
--}
-+long f(long x);
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
- 
- /* incomplete lines are bad! */
-+
-+long f(long x)
-+{
-+	int s = 0;
-+	while (x) {
-+		x /= 2;
-+		s++;
-+	}
-+	return s;
-+}
-
-commit 6ce3c4ff690136099bb17e1a8766b75764726ea7
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:49:50 2013 +0100
-
-    another simple change
-
-diff --git a/b.c b/b.c
---- a/b.c
-+++ b/b.c
-@@ -1,24 +1,24 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
--		x >>= 1;
-+		x /= 2;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
- 
- /* incomplete lines are bad! */
-
-commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:48:43 2013 +0100
-
-    change back to complete line
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,22 +1,24 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
--}
-\ No newline at end of file
-+}
-+
-+/* incomplete lines are bad! */
-
-commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:48:10 2013 +0100
-
-    change to an incomplete line at end
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,22 +1,22 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
--}
-+}
-\ No newline at end of file
-
-commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:47:40 2013 +0100
-
-    change at very beginning
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,22 @@
-+#include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:41 2013 +0100
-
-    touch comment
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,21 @@
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-- * A comment.
-+ * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:16 2013 +0100
-
-    touch both functions
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,21 @@
- #include <stdio.h>
- 
--int f(int x)
-+long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
- int main ()
- {
--	printf("%d\n", f(15));
-+	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit f04fb20f2c77850996cba739709acc6faecc58f7
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:55 2013 +0100
-
-    change f()
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,20 +1,21 @@
- #include <stdio.h>
- 
- int f(int x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
-+	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
- int main ()
- {
- 	printf("%d\n", f(15));
- 	return 0;
- }
-
-commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:48 2013 +0100
-
-    initial
-
-diff --git a/a.c b/a.c
---- /dev/null
-+++ b/a.c
-@@ -0,0 +1,20 @@
-+#include <stdio.h>
-+
-+int f(int x)
-+{
-+	int s = 0;
-+	while (x) {
-+		x >>= 1;
-+		s++;
-+	}
-+}
-+
-+/*
-+ * A comment.
-+ */
-+
-+int main ()
-+{
-+	printf("%d\n", f(15));
-+	return 0;
-+}
-ok 34 - -L ,Y (Y == nlines + 2)
-
-expecting success of 4211.35 '-L with --first-parent and a merge': 
-	git checkout parallel-change &&
-	git log --first-parent -L 1,1:b.c
-
-Switched to branch 'parallel-change'
-commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:47:40 2013 +0100
-
-    change at very beginning
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -0,0 +1,1 @@
-+#include <unistd.h>
-ok 35 - -L with --first-parent and a merge
-
-expecting success of 4211.36 '-L with --output': 
-	git checkout parallel-change &&
-	git log --output=log -L :main:b.c >output &&
-	test_must_be_empty output &&
-	test_line_count = 70 log
-
-Already on 'parallel-change'
-ok 36 - -L with --output
-
-expecting success of 4211.37 'range_set_union': 
-	test_seq 500 > c.c &&
-	git add c.c &&
-	git commit -m "many lines" &&
-	test_seq 1000 > c.c &&
-	git add c.c &&
-	git commit -m "modify many lines" &&
-	git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c || return 1; done)
-
-[parallel-change d6e4eb5] many lines
- Author: A U Thor <author@example.com>
- 1 file changed, 500 insertions(+)
- create mode 100644 c.c
-[parallel-change 23d0144] modify many lines
- Author: A U Thor <author@example.com>
- 1 file changed, 500 insertions(+)
-commit d6e4eb5bea25e60e2079aaeae319e9fff12659aa
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    many lines
-
-diff --git a/c.c b/c.c
---- /dev/null
-+++ b/c.c
-@@ -0,0 +2,1 @@
-+2
-ok 37 - range_set_union
-
-expecting success of 4211.38 '-s shows only line-log commits': 
-	git log --format="commit %s" -L1,24:b.c >expect.raw &&
-	grep ^commit expect.raw >expect &&
-	git log --format="commit %s" -L1,24:b.c -s >actual &&
-	test_cmp expect actual
-
-ok 38 - -s shows only line-log commits
-
-expecting success of 4211.39 '-p shows the default patch output': 
-	git log -L1,24:b.c >expect &&
-	git log -L1,24:b.c -p >actual &&
-	test_cmp expect actual
-
-ok 39 - -p shows the default patch output
-
-expecting success of 4211.40 '--raw is forbidden': 
-	test_must_fail git log -L1,24:b.c --raw
-
-fatal: -L does not yet support diff formats besides -p and -s
-ok 40 - --raw is forbidden
-
-expecting success of 4211.41 'setup for checking fancy rename following': 
-	git checkout --orphan moves-start &&
-	git reset --hard &&
-
-	printf "%s\n"    12 13 14 15      b c d e   >file-1 &&
-	printf "%s\n"    22 23 24 25      B C D E   >file-2 &&
-	git add file-1 file-2 &&
-	test_tick &&
-	git commit -m "Add file-1 and file-2" &&
-	oid_add_f1_f2=$(git rev-parse --short HEAD) &&
-
-	git checkout -b moves-main &&
-	printf "%s\n" 11 12 13 14 15      b c d e   >file-1 &&
-	git commit -a -m "Modify file-1 on main" &&
-	oid_mod_f1_main=$(git rev-parse --short HEAD) &&
-
-	printf "%s\n" 21 22 23 24 25      B C D E   >file-2 &&
-	git commit -a -m "Modify file-2 on main #1" &&
-	oid_mod_f2_main_1=$(git rev-parse --short HEAD) &&
-
-	git mv file-1 renamed-1 &&
-	git commit -m "Rename file-1 to renamed-1 on main" &&
-
-	printf "%s\n" 11 12 13 14 15      b c d e f >renamed-1 &&
-	git commit -a -m "Modify renamed-1 on main" &&
-	oid_mod_r1_main=$(git rev-parse --short HEAD) &&
-
-	printf "%s\n" 21 22 23 24 25      B C D E F >file-2 &&
-	git commit -a -m "Modify file-2 on main #2" &&
-	oid_mod_f2_main_2=$(git rev-parse --short HEAD) &&
-
-	git checkout -b moves-side moves-start &&
-	printf "%s\n"    12 13 14 15 16   b c d e   >file-1 &&
-	git commit -a -m "Modify file-1 on side #1" &&
-	oid_mod_f1_side_1=$(git rev-parse --short HEAD) &&
-
-	printf "%s\n"    22 23 24 25 26   B C D E   >file-2 &&
-	git commit -a -m "Modify file-2 on side" &&
-	oid_mod_f2_side=$(git rev-parse --short HEAD) &&
-
-	git mv file-2 renamed-2 &&
-	git commit -m "Rename file-2 to renamed-2 on side" &&
-
-	printf "%s\n"    12 13 14 15 16 a b c d e   >file-1 &&
-	git commit -a -m "Modify file-1 on side #2" &&
-	oid_mod_f1_side_2=$(git rev-parse --short HEAD) &&
-
-	printf "%s\n"    22 23 24 25 26 A B C D E   >renamed-2 &&
-	git commit -a -m "Modify renamed-2 on side" &&
-	oid_mod_r2_side=$(git rev-parse --short HEAD) &&
-
-	git checkout moves-main &&
-	git merge moves-side &&
-	oid_merge=$(git rev-parse --short HEAD)
-
-Switched to a new branch 'moves-start'
-[moves-start (root-commit) 306d665] Add file-1 and file-2
- Author: A U Thor <author@example.com>
- 2 files changed, 16 insertions(+)
- create mode 100644 file-1
- create mode 100644 file-2
-Switched to a new branch 'moves-main'
-[moves-main d42d674] Modify file-1 on main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[moves-main 30ac750] Modify file-2 on main #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[moves-main 0bb858c] Rename file-1 to renamed-1 on main
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file-1 => renamed-1 (100%)
-[moves-main 85f9f03] Modify renamed-1 on main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[moves-main da62335] Modify file-2 on main #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'moves-side'
-[moves-side aced016] Modify file-1 on side #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[moves-side f423e86] Modify file-2 on side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[moves-side 87b3e53] Rename file-2 to renamed-2 on side
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file-2 => renamed-2 (100%)
-[moves-side 6073daf] Modify file-1 on side #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[moves-side 43e9b43] Modify renamed-2 on side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'moves-main'
-Auto-merging renamed-1
-Auto-merging renamed-2
-Merge made by the 'ort' strategy.
- renamed-1           | 2 ++
- file-2 => renamed-2 | 2 ++
- 2 files changed, 4 insertions(+)
- rename file-2 => renamed-2 (83%)
-ok 41 - setup for checking fancy rename following
-
-expecting success of 4211.42 'fancy rename following #1': 
-	cat >expect <<-EOF &&
-	$oid_merge Merge branch 'moves-side' into moves-main
-	$oid_mod_f1_side_2 Modify file-1 on side #2
-	$oid_mod_f1_side_1 Modify file-1 on side #1
-	$oid_mod_r1_main Modify renamed-1 on main
-	$oid_mod_f1_main Modify file-1 on main
-	$oid_add_f1_f2 Add file-1 and file-2
-	EOF
-	git log -L1:renamed-1 --oneline --no-patch >actual &&
-	test_cmp expect actual
-
-ok 42 - fancy rename following #1
-
-expecting success of 4211.43 'fancy rename following #2': 
-	cat >expect <<-EOF &&
-	$oid_merge Merge branch 'moves-side' into moves-main
-	$oid_mod_r2_side Modify renamed-2 on side
-	$oid_mod_f2_side Modify file-2 on side
-	$oid_mod_f2_main_2 Modify file-2 on main #2
-	$oid_mod_f2_main_1 Modify file-2 on main #1
-	$oid_add_f1_f2 Add file-1 and file-2
-	EOF
-	git log -L1:renamed-2 --oneline --no-patch >actual &&
-	test_cmp expect actual
-
-ok 43 - fancy rename following #2
-
-expecting success of 4211.44 'setup for checking line-log and parent oids': 
-	git checkout --orphan parent-oids &&
-	git reset --hard &&
-
-	cat >file.c <<-\EOF &&
-	int func1()
-	{
-	    return F1;
-	}
-
-	int func2()
-	{
-	    return F2;
-	}
-	EOF
-	git add file.c &&
-	test_tick &&
-	first_tick=$test_tick &&
-	git commit -m "Add func1() and func2() in file.c" &&
-
-	echo 1 >other-file &&
-	git add other-file &&
-	test_tick &&
-	git commit -m "Add other-file" &&
-
-	sed -e "s/F1/F1 + 1/" file.c >tmp &&
-	mv tmp file.c &&
-	git commit -a -m "Modify func1() in file.c" &&
-
-	echo 2 >other-file &&
-	git commit -a -m "Modify other-file" &&
-
-	sed -e "s/F2/F2 + 2/" file.c >tmp &&
-	mv tmp file.c &&
-	git commit -a -m "Modify func2() in file.c" &&
-
-	head_oid=$(git rev-parse --short HEAD) &&
-	prev_oid=$(git rev-parse --short HEAD^) &&
-	root_oid=$(git rev-parse --short HEAD~4)
-
-Switched to a new branch 'parent-oids'
-[parent-oids (root-commit) df67db9] Add func1() and func2() in file.c
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 file.c
-[parent-oids ee91250] Add other-file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other-file
-[parent-oids 431262f] Modify func1() in file.c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[parent-oids e3bd121] Modify other-file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[parent-oids 0202e75] Modify func2() in file.c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 44 - setup for checking line-log and parent oids
-
-expecting success of 4211.45 'parent oids without parent rewriting': 
-	cat >expect <<-EOF &&
-	$head_oid $prev_oid Modify func2() in file.c
-	$root_oid  Add func1() and func2() in file.c
-	EOF
-	git log --format="%h %p %s" --no-patch -L:func2:file.c >actual &&
-	test_cmp expect actual
-
-ok 45 - parent oids without parent rewriting
-
-expecting success of 4211.46 'parent oids with parent rewriting': 
-	cat >expect <<-EOF &&
-	$head_oid $root_oid Modify func2() in file.c
-	$root_oid  Add func1() and func2() in file.c
-	EOF
-	git log --format="%h %p %s" --no-patch -L:func2:file.c --parents >actual &&
-	test_cmp expect actual
-
-ok 46 - parent oids with parent rewriting
-
-expecting success of 4211.47 'line-log with --before': 
-	echo $root_oid >expect &&
-	git log --format=%h --no-patch -L:func2:file.c --before=$first_tick >actual &&
-	test_cmp expect actual
-
-ok 47 - line-log with --before
-
-expecting success of 4211.48 'setup tests for zero-width regular expressions': 
-	cat >expect <<-EOF
-	Modify func1() in file.c
-	Add func1() and func2() in file.c
-	EOF
-
-ok 48 - setup tests for zero-width regular expressions
-
-expecting success of 4211.49 'zero-width regex $ matches any function name': 
-	git log --format="%s" --no-patch "-L:$:file.c" >actual &&
-	test_cmp expect actual
-
-ok 49 - zero-width regex $ matches any function name
-
-expecting success of 4211.50 'zero-width regex ^ matches any function name': 
-	git log --format="%s" --no-patch "-L:^:file.c" >actual &&
-	test_cmp expect actual
-
-ok 50 - zero-width regex ^ matches any function name
-
-expecting success of 4211.51 'zero-width regex .* matches any function name': 
-	git log --format="%s" --no-patch "-L:.*:file.c" >actual &&
-	test_cmp expect actual
-
-ok 51 - zero-width regex .* matches any function name
-
-expecting success of 4211.52 'show line-log with graph': 
-	qz_to_tab_space >expect <<-EOF &&
-	* $head_oid Modify func2() in file.c
-	|Z
-	| diff --git a/file.c b/file.c
-	| --- a/file.c
-	| +++ b/file.c
-	| @@ -6,4 +6,4 @@
-	|  int func2()
-	|  {
-	| -    return F2;
-	| +    return F2 + 2;
-	|  }
-	* $root_oid Add func1() and func2() in file.c
-	ZZ
-	  diff --git a/file.c b/file.c
-	  --- /dev/null
-	  +++ b/file.c
-	  @@ -0,0 +6,4 @@
-	  +int func2()
-	  +{
-	  +    return F2;
-	  +}
-	EOF
-	git log --graph --oneline -L:func2:file.c >actual &&
-	test_cmp expect actual
-
-ok 52 - show line-log with graph
-
-# passed all 52 test(s)
-1..52
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4214-log-graph-octopus.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4203-mailmap.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4203-mailmap/.git/
 expecting success of 4203.1 'setup commits and contacts file': 
@@ -288104,34 +287054,413 @@
  Author: Different Author <different@example.com>
 ok 74 - git cat-file --mailmap maps both author and committer when both need mapping
 
-# passed all 74 test(s)
-1..74
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4256-am-format-flowed.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4256-am-format-flowed/.git/
-expecting success of 4256.1 'setup': 
-	cp "$TEST_DIRECTORY/t4256/1/mailinfo.c.orig" mailinfo.c &&
-	git add mailinfo.c &&
-	git commit -m initial
+# passed all 74 test(s)
+1..74
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4214-log-graph-octopus.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-[master (root-commit) 5e5e4b2] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1185 insertions(+)
- create mode 100644 mailinfo.c
-ok 1 - setup
+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
 
-expecting success of 4256.2 'am with format=flowed': 
-	git am <"$TEST_DIRECTORY/t4256/1/patch" 2>stderr &&
-	test_grep "warning: Patch sent with format=flowed" stderr &&
-	test_cmp "$TEST_DIRECTORY/t4256/1/mailinfo.c" mailinfo.c
+ok 16 - log --graph with unrelated commit and octopus child, no color
 
-Applying: mailinfo: support format=flowed
-warning: Patch sent with format=flowed; space at the end of lines might be lost.
-ok 2 - am with format=flowed
+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
 
-# passed all 2 test(s)
-1..2
+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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4252-am-options.sh ***
@@ -288321,71 +287650,1583 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4254-am-corrupt.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4254-am-corrupt/.git/
-expecting success of 4254.1 'setup': 
-	# Note the missing "+++" line:
-	cat >bad-patch.diff <<-\EOF &&
-	From: A U Thor <au.thor@example.com>
-	diff --git a/f b/f
-	index 7898192..6178079 100644
-	--- a/f
-	@@ -1 +1 @@
-	-a
-	+b
+*** t4211-line-log.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4211-line-log/.git/
+expecting success of 4211.1 'setup (import history)': 
+	git fast-import < "$TEST_DIRECTORY"/t4211/history.export &&
+	git reset --hard
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           35 (         0 duplicates                  )
+      blobs  :           11 (         0 duplicates         10 deltas of         10 attempts)
+      trees  :           12 (         0 duplicates          0 deltas of         11 attempts)
+      commits:           12 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           4 (         4 loads     )
+      marks:           1024 (        23 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            =          7
+pack_report: pack_mmap_calls          =          4
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       3020
+---------------------------------------------------------------------
+
+HEAD is now at 0d8dcfc move within the file
+ok 1 - setup (import history)
+
+expecting success of 4211.2 'basic command line parsing': 
+	# This may fail due to "no such path a.c in commit", or
+	# "-L is incompatible with pathspec", depending on the
+	# order the error is checked.  Either is acceptable.
+	test_must_fail git log -L1,1:a.c -- a.c &&
+
+	# -L requires there is no pathspec
+	test_must_fail git log -L1,1:b.c -- b.c 2>error &&
+	test_grep "cannot be used with pathspec" error &&
+
+	# This would fail because --follow wants a single path, but
+	# we may fail due to incompatibility between -L/--follow in
+	# the future.  Either is acceptable.
+	test_must_fail git log -L1,1:b.c --follow &&
+	test_must_fail git log --follow -L1,1:b.c &&
+
+	# This would fail because -L wants no pathspec, but
+	# we may fail due to incompatibility between -L/--follow in
+	# the future.  Either is acceptable.
+	test_must_fail git log --follow -L1,1:b.c -- b.c
+
+fatal: -L<range>:<file> cannot be used with pathspec
+fatal: -L<range>:<file> cannot be used with pathspec
+fatal: --follow requires exactly one pathspec
+fatal: --follow requires exactly one pathspec
+fatal: -L<range>:<file> cannot be used with pathspec
+ok 2 - basic command line parsing
+
+expecting success of 4211.3 '-L 4,12:a.c simple': 
+		git log -L 4,12:a.c simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.simple-f actual
+	
+ok 3 - -L 4,12:a.c simple
+
+expecting success of 4211.4 '-L 4,+9:a.c simple': 
+		git log -L 4,+9:a.c simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.simple-f actual
+	
+ok 4 - -L 4,+9:a.c simple
+
+expecting success of 4211.5 '-L '/long f/,/^}/:a.c' simple': 
+		git log -L '/long f/,/^}/:a.c' simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.simple-f actual
+	
+ok 5 - -L '/long f/,/^}/:a.c' simple
+
+expecting success of 4211.6 '-L :f:a.c simple': 
+		git log -L :f:a.c simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.simple-f-to-main actual
+	
+ok 6 - -L :f:a.c simple
+
+expecting success of 4211.7 '-L '/main/,/^}/:a.c' simple': 
+		git log -L '/main/,/^}/:a.c' simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.simple-main actual
+	
+ok 7 - -L '/main/,/^}/:a.c' simple
+
+expecting success of 4211.8 '-L :main:a.c simple': 
+		git log -L :main:a.c simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.simple-main-to-end actual
+	
+ok 8 - -L :main:a.c simple
+
+expecting success of 4211.9 '-L 1,+4:a.c simple': 
+		git log -L 1,+4:a.c simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.beginning-of-file actual
+	
+ok 9 - -L 1,+4:a.c simple
+
+expecting success of 4211.10 '-L 20:a.c simple': 
+		git log -L 20:a.c simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.end-of-file actual
+	
+ok 10 - -L 20:a.c simple
+
+expecting success of 4211.11 '-L '/long f/',/^}/:a.c -L /main/,/^}/:a.c simple': 
+		git log -L '/long f/',/^}/:a.c -L /main/,/^}/:a.c simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.two-ranges actual
+	
+ok 11 - -L '/long f/',/^}/:a.c -L /main/,/^}/:a.c simple
+
+expecting success of 4211.12 '-L 24,+1:a.c simple': 
+		git log -L 24,+1:a.c simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.vanishes-early actual
+	
+ok 12 - -L 24,+1:a.c simple
+
+expecting success of 4211.13 '-M -L '/long f/,/^}/:b.c' move-support': 
+		git log -M -L '/long f/,/^}/:b.c' move-support >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.move-support-f actual
+	
+ok 13 - -M -L '/long f/,/^}/:b.c' move-support
+
+expecting success of 4211.14 '-M -L ':f:b.c' parallel-change': 
+		git log -M -L ':f:b.c' parallel-change >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.parallel-change-f-to-main actual
+	
+ok 14 - -M -L ':f:b.c' parallel-change
+
+expecting success of 4211.15 '-L 4,12:a.c -L :main:a.c simple': 
+		git log -L 4,12:a.c -L :main:a.c simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.multiple actual
+	
+ok 15 - -L 4,12:a.c -L :main:a.c simple
+
+expecting success of 4211.16 '-L 4,18:a.c -L ^:main:a.c simple': 
+		git log -L 4,18:a.c -L ^:main:a.c simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.multiple-overlapping actual
+	
+ok 16 - -L 4,18:a.c -L ^:main:a.c simple
+
+expecting success of 4211.17 '-L :main:a.c -L 4,18:a.c simple': 
+		git log -L :main:a.c -L 4,18:a.c simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.multiple-overlapping actual
+	
+ok 17 - -L :main:a.c -L 4,18:a.c simple
+
+expecting success of 4211.18 '-L 4:a.c -L 8,12:a.c simple': 
+		git log -L 4:a.c -L 8,12:a.c simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.multiple-superset actual
+	
+ok 18 - -L 4:a.c -L 8,12:a.c simple
+
+expecting success of 4211.19 '-L 8,12:a.c -L 4:a.c simple': 
+		git log -L 8,12:a.c -L 4:a.c simple >actual &&
+		test_cmp "$TEST_DIRECTORY"/t4211/sha1/expect.multiple-superset actual
+	
+ok 19 - -L 8,12:a.c -L 4:a.c simple
+
+expecting success of 4211.20 'invalid args: -L': 
+		test_must_fail git log -L 2>errors &&
+		test_grep 'switch.*requires a value' errors
+	
+error: switch `L' requires a value
+ok 20 - invalid args: -L
+
+expecting success of 4211.21 'invalid args: -L b.c': 
+		test_must_fail git log -L b.c 2>errors &&
+		test_grep 'argument not .start,end:file' errors
+	
+fatal: -L argument not 'start,end:file' or ':funcname:file': b.c
+ok 21 - invalid args: -L b.c
+
+expecting success of 4211.22 'invalid args: -L 1:': 
+		test_must_fail git log -L 1: 2>errors &&
+		test_grep 'argument not .start,end:file' errors
+	
+fatal: -L argument not 'start,end:file' or ':funcname:file': 1:
+ok 22 - invalid args: -L 1:
+
+expecting success of 4211.23 'invalid args: -L 1:nonexistent': 
+		test_must_fail git log -L 1:nonexistent 2>errors &&
+		test_grep 'There is no path' errors
+	
+fatal: There is no path nonexistent in the commit
+ok 23 - invalid args: -L 1:nonexistent
+
+expecting success of 4211.24 'invalid args: -L 1:simple': 
+		test_must_fail git log -L 1:simple 2>errors &&
+		test_grep 'There is no path' errors
+	
+fatal: There is no path simple in the commit
+ok 24 - invalid args: -L 1:simple
+
+expecting success of 4211.25 'invalid args: -L '/foo:b.c'': 
+		test_must_fail git log -L '/foo:b.c' 2>errors &&
+		test_grep 'argument not .start,end:file' errors
+	
+fatal: -L argument not 'start,end:file' or ':funcname:file': /foo:b.c
+ok 25 - invalid args: -L '/foo:b.c'
+
+expecting success of 4211.26 'invalid args: -L 1000:b.c': 
+		test_must_fail git log -L 1000:b.c 2>errors &&
+		test_grep 'has only.*lines' errors
+	
+fatal: file b.c has only 26 lines
+ok 26 - invalid args: -L 1000:b.c
+
+expecting success of 4211.27 'invalid args: -L :b.c': 
+		test_must_fail git log -L :b.c 2>errors &&
+		test_grep 'argument not .start,end:file' errors
+	
+fatal: -L argument not 'start,end:file' or ':funcname:file': :b.c
+ok 27 - invalid args: -L :b.c
+
+expecting success of 4211.28 'invalid args: -L :foo:b.c': 
+		test_must_fail git log -L :foo:b.c 2>errors &&
+		test_grep 'no match' errors
+	
+fatal: -L parameter 'foo' starting at line 1: no match
+ok 28 - invalid args: -L :foo:b.c
+
+expecting success of 4211.29 '-L X (X == nlines)': 
+	n=$(wc -l <b.c) &&
+	git log -L $n:b.c
+
+commit 0d8dcfc6b968e06a27d5215bad1fdde3de9d6235
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:50:24 2013 +0100
+
+    move within the file
+
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -25,0 +26,1 @@
++}
+ok 29 - -L X (X == nlines)
+
+expecting success of 4211.30 '-L X (X == nlines + 1)': 
+	n=$(expr $(wc -l <b.c) + 1) &&
+	test_must_fail git log -L $n:b.c
+
+fatal: file b.c has only 26 lines
+ok 30 - -L X (X == nlines + 1)
+
+expecting success of 4211.31 '-L X (X == nlines + 2)': 
+	n=$(expr $(wc -l <b.c) + 2) &&
+	test_must_fail git log -L $n:b.c
+
+fatal: file b.c has only 26 lines
+ok 31 - -L X (X == nlines + 2)
+
+expecting success of 4211.32 '-L ,Y (Y == nlines)': 
+	n=$(printf "%d" $(wc -l <b.c)) &&
+	git log -L ,$n:b.c
+
+commit 0d8dcfc6b968e06a27d5215bad1fdde3de9d6235
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:50:24 2013 +0100
+
+    move within the file
+
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -1,24 +1,26 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+-long f(long x)
+-{
+-	int s = 0;
+-	while (x) {
+-		x /= 2;
+-		s++;
+-	}
+-	return s;
+-}
++long f(long x);
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+ 
+ /* incomplete lines are bad! */
++
++long f(long x)
++{
++	int s = 0;
++	while (x) {
++		x /= 2;
++		s++;
++	}
++	return s;
++}
+
+commit 6ce3c4ff690136099bb17e1a8766b75764726ea7
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:49:50 2013 +0100
+
+    another simple change
+
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -1,24 +1,24 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+-		x >>= 1;
++		x /= 2;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+ 
+ /* incomplete lines are bad! */
+
+commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,22 +1,24 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
+
+commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,22 +1,22 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:47:40 2013 +0100
+
+    change at very beginning
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,22 @@
++#include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
+
+    touch comment
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,21 @@
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,21 @@
+ #include <stdio.h>
+ 
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit f04fb20f2c77850996cba739709acc6faecc58f7
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,20 +1,21 @@
+ #include <stdio.h>
+ 
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+ 	printf("%d\n", f(15));
+ 	return 0;
+ }
+
+commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +1,20 @@
++#include <stdio.h>
++
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
+ok 32 - -L ,Y (Y == nlines)
+
+expecting success of 4211.33 '-L ,Y (Y == nlines + 1)': 
+	n=$(expr $(wc -l <b.c) + 1) &&
+	git log -L ,$n:b.c
+
+commit 0d8dcfc6b968e06a27d5215bad1fdde3de9d6235
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:50:24 2013 +0100
+
+    move within the file
+
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -1,24 +1,26 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+-long f(long x)
+-{
+-	int s = 0;
+-	while (x) {
+-		x /= 2;
+-		s++;
+-	}
+-	return s;
+-}
++long f(long x);
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+ 
+ /* incomplete lines are bad! */
++
++long f(long x)
++{
++	int s = 0;
++	while (x) {
++		x /= 2;
++		s++;
++	}
++	return s;
++}
+
+commit 6ce3c4ff690136099bb17e1a8766b75764726ea7
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:49:50 2013 +0100
+
+    another simple change
+
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -1,24 +1,24 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+-		x >>= 1;
++		x /= 2;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+ 
+ /* incomplete lines are bad! */
+
+commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,22 +1,24 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
+
+commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,22 +1,22 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:47:40 2013 +0100
+
+    change at very beginning
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,22 @@
++#include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
+
+    touch comment
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,21 @@
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,21 @@
+ #include <stdio.h>
+ 
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit f04fb20f2c77850996cba739709acc6faecc58f7
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,20 +1,21 @@
+ #include <stdio.h>
+ 
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+ 	printf("%d\n", f(15));
+ 	return 0;
+ }
+
+commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +1,20 @@
++#include <stdio.h>
++
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
+ok 33 - -L ,Y (Y == nlines + 1)
+
+expecting success of 4211.34 '-L ,Y (Y == nlines + 2)': 
+	n=$(expr $(wc -l <b.c) + 2) &&
+	git log -L ,$n:b.c
+
+commit 0d8dcfc6b968e06a27d5215bad1fdde3de9d6235
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:50:24 2013 +0100
+
+    move within the file
+
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -1,24 +1,26 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+-long f(long x)
+-{
+-	int s = 0;
+-	while (x) {
+-		x /= 2;
+-		s++;
+-	}
+-	return s;
+-}
++long f(long x);
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+ 
+ /* incomplete lines are bad! */
++
++long f(long x)
++{
++	int s = 0;
++	while (x) {
++		x /= 2;
++		s++;
++	}
++	return s;
++}
+
+commit 6ce3c4ff690136099bb17e1a8766b75764726ea7
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:49:50 2013 +0100
+
+    another simple change
+
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -1,24 +1,24 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+-		x >>= 1;
++		x /= 2;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+ 
+ /* incomplete lines are bad! */
+
+commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,22 +1,24 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
+
+commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,22 +1,22 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:47:40 2013 +0100
+
+    change at very beginning
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,22 @@
++#include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
+
+    touch comment
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,21 @@
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,21 @@
+ #include <stdio.h>
+ 
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit f04fb20f2c77850996cba739709acc6faecc58f7
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,20 +1,21 @@
+ #include <stdio.h>
+ 
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+ 	printf("%d\n", f(15));
+ 	return 0;
+ }
+
+commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +1,20 @@
++#include <stdio.h>
++
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
+ok 34 - -L ,Y (Y == nlines + 2)
+
+expecting success of 4211.35 '-L with --first-parent and a merge': 
+	git checkout parallel-change &&
+	git log --first-parent -L 1,1:b.c
+
+Switched to branch 'parallel-change'
+commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:47:40 2013 +0100
+
+    change at very beginning
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -0,0 +1,1 @@
++#include <unistd.h>
+ok 35 - -L with --first-parent and a merge
+
+expecting success of 4211.36 '-L with --output': 
+	git checkout parallel-change &&
+	git log --output=log -L :main:b.c >output &&
+	test_must_be_empty output &&
+	test_line_count = 70 log
+
+Already on 'parallel-change'
+ok 36 - -L with --output
+
+expecting success of 4211.37 'range_set_union': 
+	test_seq 500 > c.c &&
+	git add c.c &&
+	git commit -m "many lines" &&
+	test_seq 1000 > c.c &&
+	git add c.c &&
+	git commit -m "modify many lines" &&
+	git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c || return 1; done)
+
+[parallel-change d6e4eb5] many lines
+ Author: A U Thor <author@example.com>
+ 1 file changed, 500 insertions(+)
+ create mode 100644 c.c
+[parallel-change 23d0144] modify many lines
+ Author: A U Thor <author@example.com>
+ 1 file changed, 500 insertions(+)
+commit d6e4eb5bea25e60e2079aaeae319e9fff12659aa
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    many lines
+
+diff --git a/c.c b/c.c
+--- /dev/null
++++ b/c.c
+@@ -0,0 +2,1 @@
++2
+ok 37 - range_set_union
+
+expecting success of 4211.38 '-s shows only line-log commits': 
+	git log --format="commit %s" -L1,24:b.c >expect.raw &&
+	grep ^commit expect.raw >expect &&
+	git log --format="commit %s" -L1,24:b.c -s >actual &&
+	test_cmp expect actual
+
+ok 38 - -s shows only line-log commits
+
+expecting success of 4211.39 '-p shows the default patch output': 
+	git log -L1,24:b.c >expect &&
+	git log -L1,24:b.c -p >actual &&
+	test_cmp expect actual
+
+ok 39 - -p shows the default patch output
+
+expecting success of 4211.40 '--raw is forbidden': 
+	test_must_fail git log -L1,24:b.c --raw
+
+fatal: -L does not yet support diff formats besides -p and -s
+ok 40 - --raw is forbidden
+
+expecting success of 4211.41 'setup for checking fancy rename following': 
+	git checkout --orphan moves-start &&
+	git reset --hard &&
+
+	printf "%s\n"    12 13 14 15      b c d e   >file-1 &&
+	printf "%s\n"    22 23 24 25      B C D E   >file-2 &&
+	git add file-1 file-2 &&
+	test_tick &&
+	git commit -m "Add file-1 and file-2" &&
+	oid_add_f1_f2=$(git rev-parse --short HEAD) &&
+
+	git checkout -b moves-main &&
+	printf "%s\n" 11 12 13 14 15      b c d e   >file-1 &&
+	git commit -a -m "Modify file-1 on main" &&
+	oid_mod_f1_main=$(git rev-parse --short HEAD) &&
+
+	printf "%s\n" 21 22 23 24 25      B C D E   >file-2 &&
+	git commit -a -m "Modify file-2 on main #1" &&
+	oid_mod_f2_main_1=$(git rev-parse --short HEAD) &&
+
+	git mv file-1 renamed-1 &&
+	git commit -m "Rename file-1 to renamed-1 on main" &&
+
+	printf "%s\n" 11 12 13 14 15      b c d e f >renamed-1 &&
+	git commit -a -m "Modify renamed-1 on main" &&
+	oid_mod_r1_main=$(git rev-parse --short HEAD) &&
+
+	printf "%s\n" 21 22 23 24 25      B C D E F >file-2 &&
+	git commit -a -m "Modify file-2 on main #2" &&
+	oid_mod_f2_main_2=$(git rev-parse --short HEAD) &&
+
+	git checkout -b moves-side moves-start &&
+	printf "%s\n"    12 13 14 15 16   b c d e   >file-1 &&
+	git commit -a -m "Modify file-1 on side #1" &&
+	oid_mod_f1_side_1=$(git rev-parse --short HEAD) &&
+
+	printf "%s\n"    22 23 24 25 26   B C D E   >file-2 &&
+	git commit -a -m "Modify file-2 on side" &&
+	oid_mod_f2_side=$(git rev-parse --short HEAD) &&
+
+	git mv file-2 renamed-2 &&
+	git commit -m "Rename file-2 to renamed-2 on side" &&
+
+	printf "%s\n"    12 13 14 15 16 a b c d e   >file-1 &&
+	git commit -a -m "Modify file-1 on side #2" &&
+	oid_mod_f1_side_2=$(git rev-parse --short HEAD) &&
+
+	printf "%s\n"    22 23 24 25 26 A B C D E   >renamed-2 &&
+	git commit -a -m "Modify renamed-2 on side" &&
+	oid_mod_r2_side=$(git rev-parse --short HEAD) &&
+
+	git checkout moves-main &&
+	git merge moves-side &&
+	oid_merge=$(git rev-parse --short HEAD)
+
+Switched to a new branch 'moves-start'
+[moves-start (root-commit) 306d665] Add file-1 and file-2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 16 insertions(+)
+ create mode 100644 file-1
+ create mode 100644 file-2
+Switched to a new branch 'moves-main'
+[moves-main d42d674] Modify file-1 on main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[moves-main 30ac750] Modify file-2 on main #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[moves-main 0bb858c] Rename file-1 to renamed-1 on main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file-1 => renamed-1 (100%)
+[moves-main 85f9f03] Modify renamed-1 on main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[moves-main da62335] Modify file-2 on main #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'moves-side'
+[moves-side aced016] Modify file-1 on side #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[moves-side f423e86] Modify file-2 on side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[moves-side 87b3e53] Rename file-2 to renamed-2 on side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file-2 => renamed-2 (100%)
+[moves-side 6073daf] Modify file-1 on side #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[moves-side 43e9b43] Modify renamed-2 on side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'moves-main'
+Auto-merging renamed-1
+Auto-merging renamed-2
+Merge made by the 'ort' strategy.
+ renamed-1           | 2 ++
+ file-2 => renamed-2 | 2 ++
+ 2 files changed, 4 insertions(+)
+ rename file-2 => renamed-2 (83%)
+ok 41 - setup for checking fancy rename following
+
+expecting success of 4211.42 'fancy rename following #1': 
+	cat >expect <<-EOF &&
+	$oid_merge Merge branch 'moves-side' into moves-main
+	$oid_mod_f1_side_2 Modify file-1 on side #2
+	$oid_mod_f1_side_1 Modify file-1 on side #1
+	$oid_mod_r1_main Modify renamed-1 on main
+	$oid_mod_f1_main Modify file-1 on main
+	$oid_add_f1_f2 Add file-1 and file-2
 	EOF
+	git log -L1:renamed-1 --oneline --no-patch >actual &&
+	test_cmp expect actual
 
-	echo a >f &&
-	git add f &&
+ok 42 - fancy rename following #1
+
+expecting success of 4211.43 'fancy rename following #2': 
+	cat >expect <<-EOF &&
+	$oid_merge Merge branch 'moves-side' into moves-main
+	$oid_mod_r2_side Modify renamed-2 on side
+	$oid_mod_f2_side Modify file-2 on side
+	$oid_mod_f2_main_2 Modify file-2 on main #2
+	$oid_mod_f2_main_1 Modify file-2 on main #1
+	$oid_add_f1_f2 Add file-1 and file-2
+	EOF
+	git log -L1:renamed-2 --oneline --no-patch >actual &&
+	test_cmp expect actual
+
+ok 43 - fancy rename following #2
+
+expecting success of 4211.44 'setup for checking line-log and parent oids': 
+	git checkout --orphan parent-oids &&
+	git reset --hard &&
+
+	cat >file.c <<-\EOF &&
+	int func1()
+	{
+	    return F1;
+	}
+
+	int func2()
+	{
+	    return F2;
+	}
+	EOF
+	git add file.c &&
 	test_tick &&
-	git commit -m initial
+	first_tick=$test_tick &&
+	git commit -m "Add func1() and func2() in file.c" &&
 
-[master (root-commit) 07398d1] initial
+	echo 1 >other-file &&
+	git add other-file &&
+	test_tick &&
+	git commit -m "Add other-file" &&
+
+	sed -e "s/F1/F1 + 1/" file.c >tmp &&
+	mv tmp file.c &&
+	git commit -a -m "Modify func1() in file.c" &&
+
+	echo 2 >other-file &&
+	git commit -a -m "Modify other-file" &&
+
+	sed -e "s/F2/F2 + 2/" file.c >tmp &&
+	mv tmp file.c &&
+	git commit -a -m "Modify func2() in file.c" &&
+
+	head_oid=$(git rev-parse --short HEAD) &&
+	prev_oid=$(git rev-parse --short HEAD^) &&
+	root_oid=$(git rev-parse --short HEAD~4)
+
+Switched to a new branch 'parent-oids'
+[parent-oids (root-commit) df67db9] Add func1() and func2() in file.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+)
+ create mode 100644 file.c
+[parent-oids ee91250] Add other-file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 f
-ok 1 - setup
+ create mode 100644 other-file
+[parent-oids 431262f] Modify func1() in file.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[parent-oids e3bd121] Modify other-file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[parent-oids 0202e75] Modify func2() in file.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 44 - setup for checking line-log and parent oids
 
-expecting success of 4254.2 'try to apply corrupted patch': 
-	test_when_finished "git am --abort" &&
-	test_must_fail git -c advice.amWorkDir=false -c advice.mergeConflict=false am bad-patch.diff 2>actual &&
-	echo "error: git diff header lacks filename information (line 4)" >expected &&
-	test_path_is_file f &&
-	test_cmp expected actual
+expecting success of 4211.45 'parent oids without parent rewriting': 
+	cat >expect <<-EOF &&
+	$head_oid $prev_oid Modify func2() in file.c
+	$root_oid  Add func1() and func2() in file.c
+	EOF
+	git log --format="%h %p %s" --no-patch -L:func2:file.c >actual &&
+	test_cmp expect actual
 
-Applying: 
-Patch failed at 0001 
-ok 2 - try to apply corrupted patch
+ok 45 - parent oids without parent rewriting
 
-expecting success of 4254.3 'NUL in commit message's body': 
-	test_when_finished "git am --abort" &&
-	make_mbox_with_nul body >body.patch &&
-	test_must_fail git am body.patch 2>err &&
-	grep "a NUL byte in commit log message not allowed" err
+expecting success of 4211.46 'parent oids with parent rewriting': 
+	cat >expect <<-EOF &&
+	$head_oid $root_oid Modify func2() in file.c
+	$root_oid  Add func1() and func2() in file.c
+	EOF
+	git log --format="%h %p %s" --no-patch -L:func2:file.c --parents >actual &&
+	test_cmp expect actual
 
-Applying: ÄËÑ�Ö
-error: a NUL byte in commit log message not allowed.
-ok 3 - NUL in commit message's body
+ok 46 - parent oids with parent rewriting
 
-expecting success of 4254.4 'NUL in commit message's header': 
-	test_when_finished 'git am --abort' &&
-	make_mbox_with_nul subject >subject.patch &&
-	test_must_fail git mailinfo msg patch <subject.patch 2>err &&
-	grep "a NUL byte in 'Subject' is not allowed" err &&
-	test_must_fail git am subject.patch 2>err &&
-	grep "a NUL byte in 'Subject' is not allowed" err
+expecting success of 4211.47 'line-log with --before': 
+	echo $root_oid >expect &&
+	git log --format=%h --no-patch -L:func2:file.c --before=$first_tick >actual &&
+	test_cmp expect actual
 
-Author: A U Thor
-Email: author@example.com
-Subject: ÄË
-Date: Sun, 19 Apr 2020 13:42:07 +0700
+ok 47 - line-log with --before
 
-error: a NUL byte in 'Subject' is not allowed.
-error: a NUL byte in 'Subject' is not allowed.
-ok 4 - NUL in commit message's header
+expecting success of 4211.48 'setup tests for zero-width regular expressions': 
+	cat >expect <<-EOF
+	Modify func1() in file.c
+	Add func1() and func2() in file.c
+	EOF
 
-# passed all 4 test(s)
-1..4
+ok 48 - setup tests for zero-width regular expressions
+
+expecting success of 4211.49 'zero-width regex $ matches any function name': 
+	git log --format="%s" --no-patch "-L:$:file.c" >actual &&
+	test_cmp expect actual
+
+ok 49 - zero-width regex $ matches any function name
+
+expecting success of 4211.50 'zero-width regex ^ matches any function name': 
+	git log --format="%s" --no-patch "-L:^:file.c" >actual &&
+	test_cmp expect actual
+
+ok 50 - zero-width regex ^ matches any function name
+
+expecting success of 4211.51 'zero-width regex .* matches any function name': 
+	git log --format="%s" --no-patch "-L:.*:file.c" >actual &&
+	test_cmp expect actual
+
+ok 51 - zero-width regex .* matches any function name
+
+expecting success of 4211.52 'show line-log with graph': 
+	qz_to_tab_space >expect <<-EOF &&
+	* $head_oid Modify func2() in file.c
+	|Z
+	| diff --git a/file.c b/file.c
+	| --- a/file.c
+	| +++ b/file.c
+	| @@ -6,4 +6,4 @@
+	|  int func2()
+	|  {
+	| -    return F2;
+	| +    return F2 + 2;
+	|  }
+	* $root_oid Add func1() and func2() in file.c
+	ZZ
+	  diff --git a/file.c b/file.c
+	  --- /dev/null
+	  +++ b/file.c
+	  @@ -0,0 +6,4 @@
+	  +int func2()
+	  +{
+	  +    return F2;
+	  +}
+	EOF
+	git log --graph --oneline -L:func2:file.c >actual &&
+	test_cmp expect actual
+
+ok 52 - show line-log with graph
+
+# passed all 52 test(s)
+1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4253-am-keep-cr-dos.sh ***
@@ -288547,6 +289388,99 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4254-am-corrupt.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4254-am-corrupt/.git/
+expecting success of 4254.1 'setup': 
+	# Note the missing "+++" line:
+	cat >bad-patch.diff <<-\EOF &&
+	From: A U Thor <au.thor@example.com>
+	diff --git a/f b/f
+	index 7898192..6178079 100644
+	--- a/f
+	@@ -1 +1 @@
+	-a
+	+b
+	EOF
+
+	echo a >f &&
+	git add f &&
+	test_tick &&
+	git commit -m initial
+
+[master (root-commit) 07398d1] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f
+ok 1 - setup
+
+expecting success of 4254.2 'try to apply corrupted patch': 
+	test_when_finished "git am --abort" &&
+	test_must_fail git -c advice.amWorkDir=false -c advice.mergeConflict=false am bad-patch.diff 2>actual &&
+	echo "error: git diff header lacks filename information (line 4)" >expected &&
+	test_path_is_file f &&
+	test_cmp expected actual
+
+Applying: 
+Patch failed at 0001 
+ok 2 - try to apply corrupted patch
+
+expecting success of 4254.3 'NUL in commit message's body': 
+	test_when_finished "git am --abort" &&
+	make_mbox_with_nul body >body.patch &&
+	test_must_fail git am body.patch 2>err &&
+	grep "a NUL byte in commit log message not allowed" err
+
+Applying: ÄËÑ�Ö
+error: a NUL byte in commit log message not allowed.
+ok 3 - NUL in commit message's body
+
+expecting success of 4254.4 'NUL in commit message's header': 
+	test_when_finished 'git am --abort' &&
+	make_mbox_with_nul subject >subject.patch &&
+	test_must_fail git mailinfo msg patch <subject.patch 2>err &&
+	grep "a NUL byte in 'Subject' is not allowed" err &&
+	test_must_fail git am subject.patch 2>err &&
+	grep "a NUL byte in 'Subject' is not allowed" err
+
+Author: A U Thor
+Email: author@example.com
+Subject: ÄË
+Date: Sun, 19 Apr 2020 13:42:07 +0700
+
+error: a NUL byte in 'Subject' is not allowed.
+error: a NUL byte in 'Subject' is not allowed.
+ok 4 - NUL in commit message's header
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4256-am-format-flowed.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4256-am-format-flowed/.git/
+expecting success of 4256.1 'setup': 
+	cp "$TEST_DIRECTORY/t4256/1/mailinfo.c.orig" mailinfo.c &&
+	git add mailinfo.c &&
+	git commit -m initial
+
+[master (root-commit) 5e5e4b2] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1185 insertions(+)
+ create mode 100644 mailinfo.c
+ok 1 - setup
+
+expecting success of 4256.2 'am with format=flowed': 
+	git am <"$TEST_DIRECTORY/t4256/1/patch" 2>stderr &&
+	test_grep "warning: Patch sent with format=flowed" stderr &&
+	test_cmp "$TEST_DIRECTORY/t4256/1/mailinfo.c" mailinfo.c
+
+Applying: mailinfo: support format=flowed
+warning: Patch sent with format=flowed; space at the end of lines might be lost.
+ok 2 - am with format=flowed
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4213-log-tabexpand.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4213-log-tabexpand/.git/
 expecting success of 4213.1 'setup': 
@@ -288855,6 +289789,131 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5002-archive-attr-pattern.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5002-archive-attr-pattern/.git/
+expecting success of 5002.1 'setup': 
+	echo ignored >ignored &&
+	mkdir .git/info &&
+	echo ignored export-ignore >>.git/info/attributes &&
+	git add ignored &&
+
+	mkdir not-ignored-dir &&
+	echo ignored-in-tree >not-ignored-dir/ignored &&
+	echo not-ignored-in-tree >not-ignored-dir/ignored-only-if-dir &&
+	git add not-ignored-dir &&
+
+	mkdir ignored-only-if-dir &&
+	echo ignored by ignored dir >ignored-only-if-dir/ignored-by-ignored-dir &&
+	echo ignored-only-if-dir/ export-ignore >>.git/info/attributes &&
+	git add ignored-only-if-dir &&
+
+	mkdir -p ignored-without-slash &&
+	echo "ignored without slash" >ignored-without-slash/foo &&
+	git add ignored-without-slash/foo &&
+	echo "ignored-without-slash export-ignore" >>.git/info/attributes &&
+
+	mkdir -p wildcard-without-slash &&
+	echo "ignored without slash" >wildcard-without-slash/foo &&
+	git add wildcard-without-slash/foo &&
+	echo "wild*-without-slash export-ignore" >>.git/info/attributes &&
+
+	mkdir -p deep/and/slashless &&
+	echo "ignored without slash" >deep/and/slashless/foo &&
+	git add deep/and/slashless/foo &&
+	echo "deep/and/slashless export-ignore" >>.git/info/attributes &&
+
+	mkdir -p deep/with/wildcard &&
+	echo "ignored without slash" >deep/with/wildcard/foo &&
+	git add deep/with/wildcard/foo &&
+	echo "deep/*t*/wildcard export-ignore" >>.git/info/attributes &&
+
+	mkdir -p one-level-lower/two-levels-lower/ignored-only-if-dir &&
+	echo ignored by ignored dir >one-level-lower/two-levels-lower/ignored-only-if-dir/ignored-by-ignored-dir &&
+	git add one-level-lower &&
+
+	git commit -m. &&
+
+	git clone --template= --bare . bare &&
+	mkdir bare/info &&
+	cp .git/info/attributes bare/info/attributes
+
+[master (root-commit) 47c5c5b] .
+ Author: A U Thor <author@example.com>
+ 9 files changed, 9 insertions(+)
+ create mode 100644 deep/and/slashless/foo
+ create mode 100644 deep/with/wildcard/foo
+ create mode 100644 ignored
+ create mode 100644 ignored-only-if-dir/ignored-by-ignored-dir
+ create mode 100644 ignored-without-slash/foo
+ create mode 100644 not-ignored-dir/ignored
+ create mode 100644 not-ignored-dir/ignored-only-if-dir
+ create mode 100644 one-level-lower/two-levels-lower/ignored-only-if-dir/ignored-by-ignored-dir
+ create mode 100644 wildcard-without-slash/foo
+Cloning into bare repository 'bare'...
+done.
+ok 1 - setup
+
+expecting success of 5002.2 'git archive': 
+	git archive HEAD >archive.tar &&
+	(mkdir archive && cd archive && "$TAR" xf -) <archive.tar
+
+ok 2 - git archive
+
+expecting success of 5002.3 ' archive/ignored does not exist': test ! -e archive/ignored
+ok 3 -  archive/ignored does not exist
+
+expecting success of 5002.4 ' archive/not-ignored-dir/ignored does not exist': test ! -e archive/not-ignored-dir/ignored
+ok 4 -  archive/not-ignored-dir/ignored does not exist
+
+expecting success of 5002.5 ' archive/not-ignored-dir/ignored-only-if-dir exists': test -e archive/not-ignored-dir/ignored-only-if-dir
+ok 5 -  archive/not-ignored-dir/ignored-only-if-dir exists
+
+expecting success of 5002.6 ' archive/not-ignored-dir/ exists': test -e archive/not-ignored-dir/
+ok 6 -  archive/not-ignored-dir/ exists
+
+expecting success of 5002.7 ' archive/ignored-only-if-dir/ does not exist': test ! -e archive/ignored-only-if-dir/
+ok 7 -  archive/ignored-only-if-dir/ does not exist
+
+expecting success of 5002.8 ' archive/ignored-ony-if-dir/ignored-by-ignored-dir does not exist': test ! -e archive/ignored-ony-if-dir/ignored-by-ignored-dir
+ok 8 -  archive/ignored-ony-if-dir/ignored-by-ignored-dir does not exist
+
+expecting success of 5002.9 ' archive/ignored-without-slash/ does not exist': test ! -e archive/ignored-without-slash/
+ok 9 -  archive/ignored-without-slash/ does not exist
+
+expecting success of 5002.10 ' archive/ignored-without-slash/foo does not exist': test ! -e archive/ignored-without-slash/foo
+ok 10 -  archive/ignored-without-slash/foo does not exist
+
+expecting success of 5002.11 ' archive/wildcard-without-slash/ does not exist': test ! -e archive/wildcard-without-slash/
+ok 11 -  archive/wildcard-without-slash/ does not exist
+
+expecting success of 5002.12 ' archive/wildcard-without-slash/foo does not exist': test ! -e archive/wildcard-without-slash/foo
+ok 12 -  archive/wildcard-without-slash/foo does not exist
+
+expecting success of 5002.13 ' archive/deep/and/slashless/ does not exist': test ! -e archive/deep/and/slashless/
+ok 13 -  archive/deep/and/slashless/ does not exist
+
+expecting success of 5002.14 ' archive/deep/and/slashless/foo does not exist': test ! -e archive/deep/and/slashless/foo
+ok 14 -  archive/deep/and/slashless/foo does not exist
+
+expecting success of 5002.15 ' archive/deep/with/wildcard/ does not exist': test ! -e archive/deep/with/wildcard/
+ok 15 -  archive/deep/with/wildcard/ does not exist
+
+expecting success of 5002.16 ' archive/deep/with/wildcard/foo does not exist': test ! -e archive/deep/with/wildcard/foo
+ok 16 -  archive/deep/with/wildcard/foo does not exist
+
+expecting success of 5002.17 ' archive/one-level-lower/ does not exist': test ! -e archive/one-level-lower/
+ok 17 -  archive/one-level-lower/ does not exist
+
+expecting success of 5002.18 ' archive/one-level-lower/two-levels-lower/ignored-only-if-dir/ does not exist': test ! -e archive/one-level-lower/two-levels-lower/ignored-only-if-dir/
+ok 18 -  archive/one-level-lower/two-levels-lower/ignored-only-if-dir/ does not exist
+
+expecting success of 5002.19 ' archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir does not exist': test ! -e archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir
+ok 19 -  archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir does not exist
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4205-log-pretty-formats.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4205-log-pretty-formats/.git/
 expecting success of 4205.1 'set up basic repos': 
@@ -290328,8 +291387,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	2025-08-27 08:21:22.107811235 +0000
-+++ actual	2025-08-27 08:21:22.111811261 +0000
+--- expected	2026-09-29 14:52:38.518548970 +0000
++++ actual	2026-09-29 14:52:38.522548970 +0000
 @@ -1,4 +1,4 @@
 -👨..👨⋮
 -e�..e�e�
@@ -290344,131 +291403,6 @@
 1..125
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5002-archive-attr-pattern.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5002-archive-attr-pattern/.git/
-expecting success of 5002.1 'setup': 
-	echo ignored >ignored &&
-	mkdir .git/info &&
-	echo ignored export-ignore >>.git/info/attributes &&
-	git add ignored &&
-
-	mkdir not-ignored-dir &&
-	echo ignored-in-tree >not-ignored-dir/ignored &&
-	echo not-ignored-in-tree >not-ignored-dir/ignored-only-if-dir &&
-	git add not-ignored-dir &&
-
-	mkdir ignored-only-if-dir &&
-	echo ignored by ignored dir >ignored-only-if-dir/ignored-by-ignored-dir &&
-	echo ignored-only-if-dir/ export-ignore >>.git/info/attributes &&
-	git add ignored-only-if-dir &&
-
-	mkdir -p ignored-without-slash &&
-	echo "ignored without slash" >ignored-without-slash/foo &&
-	git add ignored-without-slash/foo &&
-	echo "ignored-without-slash export-ignore" >>.git/info/attributes &&
-
-	mkdir -p wildcard-without-slash &&
-	echo "ignored without slash" >wildcard-without-slash/foo &&
-	git add wildcard-without-slash/foo &&
-	echo "wild*-without-slash export-ignore" >>.git/info/attributes &&
-
-	mkdir -p deep/and/slashless &&
-	echo "ignored without slash" >deep/and/slashless/foo &&
-	git add deep/and/slashless/foo &&
-	echo "deep/and/slashless export-ignore" >>.git/info/attributes &&
-
-	mkdir -p deep/with/wildcard &&
-	echo "ignored without slash" >deep/with/wildcard/foo &&
-	git add deep/with/wildcard/foo &&
-	echo "deep/*t*/wildcard export-ignore" >>.git/info/attributes &&
-
-	mkdir -p one-level-lower/two-levels-lower/ignored-only-if-dir &&
-	echo ignored by ignored dir >one-level-lower/two-levels-lower/ignored-only-if-dir/ignored-by-ignored-dir &&
-	git add one-level-lower &&
-
-	git commit -m. &&
-
-	git clone --template= --bare . bare &&
-	mkdir bare/info &&
-	cp .git/info/attributes bare/info/attributes
-
-[master (root-commit) 47c5c5b] .
- Author: A U Thor <author@example.com>
- 9 files changed, 9 insertions(+)
- create mode 100644 deep/and/slashless/foo
- create mode 100644 deep/with/wildcard/foo
- create mode 100644 ignored
- create mode 100644 ignored-only-if-dir/ignored-by-ignored-dir
- create mode 100644 ignored-without-slash/foo
- create mode 100644 not-ignored-dir/ignored
- create mode 100644 not-ignored-dir/ignored-only-if-dir
- create mode 100644 one-level-lower/two-levels-lower/ignored-only-if-dir/ignored-by-ignored-dir
- create mode 100644 wildcard-without-slash/foo
-Cloning into bare repository 'bare'...
-done.
-ok 1 - setup
-
-expecting success of 5002.2 'git archive': 
-	git archive HEAD >archive.tar &&
-	(mkdir archive && cd archive && "$TAR" xf -) <archive.tar
-
-ok 2 - git archive
-
-expecting success of 5002.3 ' archive/ignored does not exist': test ! -e archive/ignored
-ok 3 -  archive/ignored does not exist
-
-expecting success of 5002.4 ' archive/not-ignored-dir/ignored does not exist': test ! -e archive/not-ignored-dir/ignored
-ok 4 -  archive/not-ignored-dir/ignored does not exist
-
-expecting success of 5002.5 ' archive/not-ignored-dir/ignored-only-if-dir exists': test -e archive/not-ignored-dir/ignored-only-if-dir
-ok 5 -  archive/not-ignored-dir/ignored-only-if-dir exists
-
-expecting success of 5002.6 ' archive/not-ignored-dir/ exists': test -e archive/not-ignored-dir/
-ok 6 -  archive/not-ignored-dir/ exists
-
-expecting success of 5002.7 ' archive/ignored-only-if-dir/ does not exist': test ! -e archive/ignored-only-if-dir/
-ok 7 -  archive/ignored-only-if-dir/ does not exist
-
-expecting success of 5002.8 ' archive/ignored-ony-if-dir/ignored-by-ignored-dir does not exist': test ! -e archive/ignored-ony-if-dir/ignored-by-ignored-dir
-ok 8 -  archive/ignored-ony-if-dir/ignored-by-ignored-dir does not exist
-
-expecting success of 5002.9 ' archive/ignored-without-slash/ does not exist': test ! -e archive/ignored-without-slash/
-ok 9 -  archive/ignored-without-slash/ does not exist
-
-expecting success of 5002.10 ' archive/ignored-without-slash/foo does not exist': test ! -e archive/ignored-without-slash/foo
-ok 10 -  archive/ignored-without-slash/foo does not exist
-
-expecting success of 5002.11 ' archive/wildcard-without-slash/ does not exist': test ! -e archive/wildcard-without-slash/
-ok 11 -  archive/wildcard-without-slash/ does not exist
-
-expecting success of 5002.12 ' archive/wildcard-without-slash/foo does not exist': test ! -e archive/wildcard-without-slash/foo
-ok 12 -  archive/wildcard-without-slash/foo does not exist
-
-expecting success of 5002.13 ' archive/deep/and/slashless/ does not exist': test ! -e archive/deep/and/slashless/
-ok 13 -  archive/deep/and/slashless/ does not exist
-
-expecting success of 5002.14 ' archive/deep/and/slashless/foo does not exist': test ! -e archive/deep/and/slashless/foo
-ok 14 -  archive/deep/and/slashless/foo does not exist
-
-expecting success of 5002.15 ' archive/deep/with/wildcard/ does not exist': test ! -e archive/deep/with/wildcard/
-ok 15 -  archive/deep/with/wildcard/ does not exist
-
-expecting success of 5002.16 ' archive/deep/with/wildcard/foo does not exist': test ! -e archive/deep/with/wildcard/foo
-ok 16 -  archive/deep/with/wildcard/foo does not exist
-
-expecting success of 5002.17 ' archive/one-level-lower/ does not exist': test ! -e archive/one-level-lower/
-ok 17 -  archive/one-level-lower/ does not exist
-
-expecting success of 5002.18 ' archive/one-level-lower/two-levels-lower/ignored-only-if-dir/ does not exist': test ! -e archive/one-level-lower/two-levels-lower/ignored-only-if-dir/
-ok 18 -  archive/one-level-lower/two-levels-lower/ignored-only-if-dir/ does not exist
-
-expecting success of 5002.19 ' archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir does not exist': test ! -e archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir
-ok 19 -  archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir does not exist
-
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5001-archive-attr.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5001-archive-attr/.git/
 expecting success of 5001.1 'setup': 
@@ -292930,1637 +293864,6 @@
 1..149
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5003-archive-zip.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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) 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 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
-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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t4300-merge-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4300-merge-tree/.git/
-expecting success of 4300.1 'setup': 
-	test_commit "initial" "initial-file" "initial"
-
-[master (root-commit) c1d16d8] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial-file
-ok 1 - setup
-
-expecting success of 4300.2 'file add A, !B': 
-	git reset --hard initial &&
-	test_commit "add-a-not-b" "ONE" "AAA" &&
-	git merge-tree initial initial add-a-not-b >actual &&
-	cat >expected <<EXPECTED &&
-added in remote
-  their  100644 $(git rev-parse HEAD:ONE) ONE
-@@ -0,0 +1 @@
-+AAA
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master e55b628] add-a-not-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-ok 2 - file add A, !B
-
-expecting success of 4300.3 'file add !A, B': 
-	git reset --hard initial &&
-	test_commit "add-not-a-b" "ONE" "AAA" &&
-	git merge-tree initial add-not-a-b initial >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master fe72a09] add-not-a-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-ok 3 - file add !A, B
-
-expecting success of 4300.4 'file add A, B (same)': 
-	git reset --hard initial &&
-	test_commit "add-a-b-same-A" "ONE" "AAA" &&
-	git reset --hard initial &&
-	test_commit "add-a-b-same-B" "ONE" "AAA" &&
-	git merge-tree initial add-a-b-same-A add-a-b-same-B >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master adad022] add-a-b-same-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-HEAD is now at c1d16d8 initial
-[master c566426] add-a-b-same-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-ok 4 - file add A, B (same)
-
-expecting success of 4300.5 'file add A, B (different)': 
-	git reset --hard initial &&
-	test_commit "add-a-b-diff-A" "ONE" "AAA" &&
-	git reset --hard initial &&
-	test_commit "add-a-b-diff-B" "ONE" "BBB" &&
-	git merge-tree initial add-a-b-diff-A add-a-b-diff-B >actual &&
-	cat >expected <<EXPECTED &&
-added in both
-  our    100644 $(git rev-parse add-a-b-diff-A:ONE) ONE
-  their  100644 $(git rev-parse add-a-b-diff-B:ONE) ONE
-@@ -1 +1,5 @@
-+<<<<<<< .our
- AAA
-+=======
-+BBB
-+>>>>>>> .their
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master 59aa417] add-a-b-diff-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-HEAD is now at c1d16d8 initial
-[master 06b549e] add-a-b-diff-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-ok 5 - file add A, B (different)
-
-expecting success of 4300.6 'file change A, !B': 
-	git reset --hard initial &&
-	test_commit "change-a-not-b" "initial-file" "BBB" &&
-	git merge-tree initial change-a-not-b initial >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master 46329de] change-a-not-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - file change A, !B
-
-expecting success of 4300.7 'file change !A, B': 
-	git reset --hard initial &&
-	test_commit "change-not-a-b" "initial-file" "BBB" &&
-	git merge-tree initial initial change-not-a-b >actual &&
-	cat >expected <<EXPECTED &&
-merged
-  result 100644 $(git rev-parse change-a-not-b:initial-file) initial-file
-  our    100644 $(git rev-parse initial:initial-file       ) initial-file
-@@ -1 +1 @@
--initial
-+BBB
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master 4667cad] change-not-a-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - file change !A, B
-
-expecting success of 4300.8 '3-way merge with --attr-source': 
-	test_when_finished rm -rf 3-way &&
-	git init 3-way &&
-	(
-		cd 3-way &&
-		test_commit initial file1 foo &&
-		base=$(git rev-parse HEAD) &&
-		git checkout -b brancha &&
-		echo bar >>file1 &&
-		git commit -am "adding bar" &&
-		source=$(git rev-parse HEAD) &&
-		git checkout @{-1} &&
-		git checkout -b branchb &&
-		echo baz >>file1 &&
-		git commit -am "adding baz" &&
-		merge=$(git rev-parse HEAD) &&
-		git checkout -b gitattributes &&
-		test_commit "gitattributes" .gitattributes "file1 merge=union" &&
-		git checkout @{-1} &&
-		tree=$(git --attr-source=gitattributes merge-tree --write-tree \
-		--merge-base "$base" --end-of-options "$source" "$merge") &&
-		test_write_lines foo bar baz >expect &&
-		git cat-file -p "$tree:file1" >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4300-merge-tree/3-way/.git/
-[master (root-commit) fd74319] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Switched to a new branch 'brancha'
-[brancha fe97420] adding bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'master'
-Switched to a new branch 'branchb'
-[branchb 0d361c1] adding baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'gitattributes'
-[gitattributes 7228331] gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 .gitattributes
-Switched to branch 'branchb'
-warning: refname 'gitattributes' is ambiguous.
-ok 8 - 3-way merge with --attr-source
-
-expecting success of 4300.9 'file change A, B (same)': 
-	git reset --hard initial &&
-	test_commit "change-a-b-same-A" "initial-file" "AAA" &&
-	git reset --hard initial &&
-	test_commit "change-a-b-same-B" "initial-file" "AAA" &&
-	git merge-tree initial change-a-b-same-A change-a-b-same-B >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master 17f6774] change-a-b-same-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at c1d16d8 initial
-[master c618aaa] change-a-b-same-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 9 - file change A, B (same)
-
-expecting success of 4300.10 'file change A, B (different)': 
-	git reset --hard initial &&
-	test_commit "change-a-b-diff-A" "initial-file" "AAA" &&
-	git reset --hard initial &&
-	test_commit "change-a-b-diff-B" "initial-file" "BBB" &&
-	git merge-tree initial change-a-b-diff-A change-a-b-diff-B >actual &&
-	cat >expected <<EXPECTED &&
-changed in both
-  base   100644 $(git rev-parse initial:initial-file          ) initial-file
-  our    100644 $(git rev-parse change-a-b-diff-A:initial-file) initial-file
-  their  100644 $(git rev-parse change-a-b-diff-B:initial-file) initial-file
-@@ -1 +1,5 @@
-+<<<<<<< .our
- AAA
-+=======
-+BBB
-+>>>>>>> .their
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master f14ee41] change-a-b-diff-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at c1d16d8 initial
-[master 6faccc3] change-a-b-diff-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 10 - file change A, B (different)
-
-expecting success of 4300.11 'file change A, B (mixed)': 
-	git reset --hard initial &&
-	test_commit "change-a-b-mix-base" "ONE" "
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA" &&
-	test_commit "change-a-b-mix-A" "ONE" \
-		"$(sed -e "1{s/AAA/BBB/;}" -e "10{s/AAA/BBB/;}" <ONE)" &&
-	git reset --hard change-a-b-mix-base &&
-	test_commit "change-a-b-mix-B" "ONE" \
-		"$(sed -e "1{s/AAA/BBB/;}" -e "10{s/AAA/CCC/;}" <ONE)" &&
-	git merge-tree change-a-b-mix-base change-a-b-mix-A change-a-b-mix-B \
-		>actual &&
-
-	cat >expected <<EXPECTED &&
-changed in both
-  base   100644 $(git rev-parse change-a-b-mix-base:ONE) ONE
-  our    100644 $(git rev-parse change-a-b-mix-A:ONE   ) ONE
-  their  100644 $(git rev-parse change-a-b-mix-B:ONE   ) ONE
-@@ -7,7 +7,11 @@
- AAA
- AAA
- AAA
-+<<<<<<< .our
- BBB
-+=======
-+CCC
-+>>>>>>> .their
- AAA
- AAA
- AAA
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master 8f24aa4] change-a-b-mix-base
- Author: A U Thor <author@example.com>
- 1 file changed, 16 insertions(+)
- create mode 100644 ONE
-[master 37be425] change-a-b-mix-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 8f24aa4 change-a-b-mix-base
-[master 9bb3ceb] change-a-b-mix-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 11 - file change A, B (mixed)
-
-expecting success of 4300.12 'file remove A, !B': 
-	git reset --hard initial &&
-	test_commit "rm-a-not-b-base" "ONE" "AAA" &&
-	git rm ONE &&
-	git commit -m "rm-a-not-b" &&
-	git tag "rm-a-not-b" &&
-	git merge-tree rm-a-not-b-base rm-a-not-b rm-a-not-b-base >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master 6bc469c] rm-a-not-b-base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-rm 'ONE'
-[master eaee347] rm-a-not-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 ONE
-ok 12 - file remove A, !B
-
-expecting success of 4300.13 'file remove !A, B': 
-	git reset --hard initial &&
-	test_commit "rm-not-a-b-base" "ONE" "AAA" &&
-	git rm ONE &&
-	git commit -m "rm-not-a-b" &&
-	git tag "rm-not-a-b" &&
-	git merge-tree rm-a-not-b-base rm-a-not-b-base rm-a-not-b >actual &&
-	cat >expected <<EXPECTED &&
-removed in remote
-  base   100644 $(git rev-parse rm-a-not-b-base:ONE) ONE
-  our    100644 $(git rev-parse rm-a-not-b-base:ONE) ONE
-@@ -1 +0,0 @@
--AAA
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master 4c80bfe] rm-not-a-b-base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-rm 'ONE'
-[master f5c368c] rm-not-a-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 ONE
-ok 13 - file remove !A, B
-
-expecting success of 4300.14 'file remove A, B (same)': 
-	git reset --hard initial &&
-	test_commit "rm-a-b-base" "ONE" "AAA" &&
-	git rm ONE &&
-	git commit -m "rm-a-b" &&
-	git tag "rm-a-b" &&
-	git merge-tree rm-a-b-base rm-a-b rm-a-b >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master ba896b0] rm-a-b-base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-rm 'ONE'
-[master e5794d5] rm-a-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 ONE
-ok 14 - file remove A, B (same)
-
-expecting success of 4300.15 'file change A, remove B': 
-	git reset --hard initial &&
-	test_commit "change-a-rm-b-base" "ONE" "AAA" &&
-	test_commit "change-a-rm-b-A" "ONE" "BBB" &&
-	git reset --hard change-a-rm-b-base &&
-	git rm ONE &&
-	git commit -m "change-a-rm-b-B" &&
-	git tag "change-a-rm-b-B" &&
-	git merge-tree change-a-rm-b-base change-a-rm-b-A change-a-rm-b-B \
-		>actual &&
-	cat >expected <<EXPECTED &&
-removed in remote
-  base   100644 $(git rev-parse change-a-rm-b-base:ONE) ONE
-  our    100644 $(git rev-parse change-a-rm-b-A:ONE   ) ONE
-@@ -1 +0,0 @@
--BBB
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master 425fe11] change-a-rm-b-base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-[master d7b5417] change-a-rm-b-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 425fe11 change-a-rm-b-base
-rm 'ONE'
-[master a35c11c] change-a-rm-b-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 ONE
-ok 15 - file change A, remove B
-
-expecting success of 4300.16 'file remove A, change B': 
-	git reset --hard initial &&
-	test_commit "rm-a-change-b-base" "ONE" "AAA" &&
-
-	git rm ONE &&
-	git commit -m "rm-a-change-b-A" &&
-	git tag "rm-a-change-b-A" &&
-	git reset --hard rm-a-change-b-base &&
-	test_commit "rm-a-change-b-B" "ONE" "BBB" &&
-	git merge-tree rm-a-change-b-base rm-a-change-b-A rm-a-change-b-B \
-		>actual &&
-	cat >expected <<EXPECTED &&
-removed in local
-  base   100644 $(git rev-parse rm-a-change-b-base:ONE) ONE
-  their  100644 $(git rev-parse rm-a-change-b-B:ONE   ) ONE
-EXPECTED
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master e3f76d1] rm-a-change-b-base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-rm 'ONE'
-[master 12305ab] rm-a-change-b-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 ONE
-HEAD is now at e3f76d1 rm-a-change-b-base
-[master 30c5a34] rm-a-change-b-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 16 - file remove A, change B
-
-expecting success of 4300.17 'tree add A, B (same)': 
-	git reset --hard initial &&
-	mkdir sub &&
-	test_commit "add sub/file" "sub/file" "file" add-tree-A &&
-	git merge-tree initial add-tree-A add-tree-A >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master f146135] add sub/file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub/file
-ok 17 - tree add A, B (same)
-
-expecting success of 4300.18 'tree add A, B (different)': 
-	git reset --hard initial &&
-	mkdir sub &&
-	test_commit "add sub/file" "sub/file" "AAA" add-tree-a-b-A &&
-	git reset --hard initial &&
-	mkdir sub &&
-	test_commit "add sub/file" "sub/file" "BBB" add-tree-a-b-B &&
-	git merge-tree initial add-tree-a-b-A add-tree-a-b-B >actual &&
-	cat >expect <<-EOF &&
-	added in both
-	  our    100644 $(git rev-parse add-tree-a-b-A:sub/file) sub/file
-	  their  100644 $(git rev-parse add-tree-a-b-B:sub/file) sub/file
-	@@ -1 +1,5 @@
-	+<<<<<<< .our
-	 AAA
-	+=======
-	+BBB
-	+>>>>>>> .their
-	EOF
-	test_cmp expect actual
-
-HEAD is now at c1d16d8 initial
-[master 278e538] add sub/file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub/file
-HEAD is now at c1d16d8 initial
-[master b437163] add sub/file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub/file
-ok 18 - tree add A, B (different)
-
-expecting success of 4300.19 'tree unchanged A, removed B': 
-	git reset --hard initial &&
-	mkdir sub &&
-	test_commit "add sub/file" "sub/file" "AAA" tree-remove-b-initial &&
-	git rm sub/file &&
-	test_tick &&
-	git commit -m "remove sub/file" &&
-	git tag tree-remove-b-B &&
-	git merge-tree tree-remove-b-initial tree-remove-b-initial tree-remove-b-B >actual &&
-	cat >expect <<-EOF &&
-	removed in remote
-	  base   100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file
-	  our    100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file
-	@@ -1 +0,0 @@
-	-AAA
-	EOF
-	test_cmp expect actual
-
-HEAD is now at c1d16d8 initial
-[master 06f44d6] add sub/file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub/file
-rm 'sub/file'
-[master 7d2ab7e] remove sub/file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 sub/file
-ok 19 - tree unchanged A, removed B
-
-expecting success of 4300.20 'turn file to tree': 
-	git reset --hard initial &&
-	rm initial-file &&
-	mkdir initial-file &&
-	test_commit "turn-file-to-tree" "initial-file/ONE" "CCC" &&
-	git merge-tree initial initial turn-file-to-tree >actual &&
-	cat >expect <<-EOF &&
-	added in remote
-	  their  100644 $(git rev-parse turn-file-to-tree:initial-file/ONE) initial-file/ONE
-	@@ -0,0 +1 @@
-	+CCC
-	removed in remote
-	  base   100644 $(git rev-parse initial:initial-file) initial-file
-	  our    100644 $(git rev-parse initial:initial-file) initial-file
-	@@ -1 +0,0 @@
-	-initial
-	EOF
-	test_cmp expect actual
-
-HEAD is now at c1d16d8 initial
-[master c7dbe97] turn-file-to-tree
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 initial-file
- create mode 100644 initial-file/ONE
-ok 20 - turn file to tree
-
-expecting success of 4300.21 'turn tree to file': 
-	git reset --hard initial &&
-	mkdir dir &&
-	test_commit "add-tree" "dir/path" "AAA" &&
-	test_commit "add-another-tree" "dir/another" "BBB" &&
-	rm -fr dir &&
-	test_commit "make-file" "dir" "CCC" &&
-	git merge-tree add-tree add-another-tree make-file >actual &&
-	cat >expect <<-EOF &&
-	removed in remote
-	  base   100644 $(git rev-parse add-tree:dir/path) dir/path
-	  our    100644 $(git rev-parse add-tree:dir/path) dir/path
-	@@ -1 +0,0 @@
-	-AAA
-	added in remote
-	  their  100644 $(git rev-parse make-file:dir) dir
-	@@ -0,0 +1 @@
-	+CCC
-	EOF
-	test_cmp expect actual
-
-HEAD is now at c1d16d8 initial
-[master fadeed0] add-tree
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/path
-[master 2076f67] add-another-tree
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/another
-[master 8ffb08d] make-file
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 2 deletions(-)
- create mode 100644 dir
- delete mode 100644 dir/another
- delete mode 100644 dir/path
-ok 21 - turn tree to file
-
-expecting success of 4300.22 'merge-tree respects core.useReplaceRefs=false': 
-	test_commit merge-to &&
-	test_commit valid base &&
-	git reset --hard HEAD^ &&
-	test_commit malicious base &&
-
-	test_when_finished "git replace -d $(git rev-parse valid^0)" &&
-	git replace valid^0 malicious^0 &&
-
-	tree=$(git -c core.useReplaceRefs=true merge-tree --write-tree merge-to valid) &&
-	merged=$(git cat-file -p $tree:base) &&
-	test malicious = $merged &&
-
-	tree=$(git -c core.useReplaceRefs=false merge-tree --write-tree merge-to valid) &&
-	merged=$(git cat-file -p $tree:base) &&
-	test valid = $merged
-
-[master cc93885] merge-to
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 merge-to.t
-[master 99060ff] valid
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base
-HEAD is now at cc93885 merge-to
-[master 069f0c6] malicious
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base
-Deleted replace ref '99060ffb2d3618a898040626d81aa60f425c225a'
-ok 22 - merge-tree respects core.useReplaceRefs=false
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5100-mailinfo.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5100-mailinfo/.git/
 expecting success of 5100.1 'split sample box': git mailsplit -o. "$DATA/sample.mbox" >last &&
@@ -295263,105 +294566,643 @@
 	check_quoted_cr_mail quoted-cr/0002 --quoted-cr=strip &&
 	test_must_be_empty quoted-cr/0002.err
 
-warning: quoted CRLF detected
-ok 50 - mailinfo warn CR in base64 encoded email
+warning: quoted CRLF detected
+ok 50 - mailinfo warn CR in base64 encoded email
+
+expecting success of 5100.51 'from line with unterminated quoted string': 
+	echo "From: bob \"unterminated string smith <bob@example.com>" >in &&
+	git mailinfo /dev/null /dev/null <in >actual &&
+	cat >expect <<-\EOF &&
+	Author: bob unterminated string smith
+	Email: bob@example.com
+
+	EOF
+	test_cmp expect actual
+
+ok 51 - from line with unterminated quoted string
+
+expecting success of 5100.52 'from line with unterminated comment': 
+	echo "From: bob (unterminated comment smith <bob@example.com>" >in &&
+	git mailinfo /dev/null /dev/null <in >actual &&
+	cat >expect <<-\EOF &&
+	Author: bob (unterminated comment smith
+	Email: bob@example.com
+
+	EOF
+	test_cmp expect actual
+
+ok 52 - from line with unterminated comment
+
+# passed all 52 test(s)
+1..52
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t4300-merge-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4300-merge-tree/.git/
+expecting success of 4300.1 'setup': 
+	test_commit "initial" "initial-file" "initial"
+
+[master (root-commit) c1d16d8] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial-file
+ok 1 - setup
+
+expecting success of 4300.2 'file add A, !B': 
+	git reset --hard initial &&
+	test_commit "add-a-not-b" "ONE" "AAA" &&
+	git merge-tree initial initial add-a-not-b >actual &&
+	cat >expected <<EXPECTED &&
+added in remote
+  their  100644 $(git rev-parse HEAD:ONE) ONE
+@@ -0,0 +1 @@
++AAA
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master e55b628] add-a-not-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+ok 2 - file add A, !B
+
+expecting success of 4300.3 'file add !A, B': 
+	git reset --hard initial &&
+	test_commit "add-not-a-b" "ONE" "AAA" &&
+	git merge-tree initial add-not-a-b initial >actual &&
+	test_must_be_empty actual
+
+HEAD is now at c1d16d8 initial
+[master fe72a09] add-not-a-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+ok 3 - file add !A, B
+
+expecting success of 4300.4 'file add A, B (same)': 
+	git reset --hard initial &&
+	test_commit "add-a-b-same-A" "ONE" "AAA" &&
+	git reset --hard initial &&
+	test_commit "add-a-b-same-B" "ONE" "AAA" &&
+	git merge-tree initial add-a-b-same-A add-a-b-same-B >actual &&
+	test_must_be_empty actual
+
+HEAD is now at c1d16d8 initial
+[master adad022] add-a-b-same-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+HEAD is now at c1d16d8 initial
+[master c566426] add-a-b-same-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+ok 4 - file add A, B (same)
+
+expecting success of 4300.5 'file add A, B (different)': 
+	git reset --hard initial &&
+	test_commit "add-a-b-diff-A" "ONE" "AAA" &&
+	git reset --hard initial &&
+	test_commit "add-a-b-diff-B" "ONE" "BBB" &&
+	git merge-tree initial add-a-b-diff-A add-a-b-diff-B >actual &&
+	cat >expected <<EXPECTED &&
+added in both
+  our    100644 $(git rev-parse add-a-b-diff-A:ONE) ONE
+  their  100644 $(git rev-parse add-a-b-diff-B:ONE) ONE
+@@ -1 +1,5 @@
++<<<<<<< .our
+ AAA
++=======
++BBB
++>>>>>>> .their
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master 59aa417] add-a-b-diff-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+HEAD is now at c1d16d8 initial
+[master 06b549e] add-a-b-diff-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+ok 5 - file add A, B (different)
+
+expecting success of 4300.6 'file change A, !B': 
+	git reset --hard initial &&
+	test_commit "change-a-not-b" "initial-file" "BBB" &&
+	git merge-tree initial change-a-not-b initial >actual &&
+	test_must_be_empty actual
+
+HEAD is now at c1d16d8 initial
+[master 46329de] change-a-not-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - file change A, !B
+
+expecting success of 4300.7 'file change !A, B': 
+	git reset --hard initial &&
+	test_commit "change-not-a-b" "initial-file" "BBB" &&
+	git merge-tree initial initial change-not-a-b >actual &&
+	cat >expected <<EXPECTED &&
+merged
+  result 100644 $(git rev-parse change-a-not-b:initial-file) initial-file
+  our    100644 $(git rev-parse initial:initial-file       ) initial-file
+@@ -1 +1 @@
+-initial
++BBB
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master 4667cad] change-not-a-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 7 - file change !A, B
+
+expecting success of 4300.8 '3-way merge with --attr-source': 
+	test_when_finished rm -rf 3-way &&
+	git init 3-way &&
+	(
+		cd 3-way &&
+		test_commit initial file1 foo &&
+		base=$(git rev-parse HEAD) &&
+		git checkout -b brancha &&
+		echo bar >>file1 &&
+		git commit -am "adding bar" &&
+		source=$(git rev-parse HEAD) &&
+		git checkout @{-1} &&
+		git checkout -b branchb &&
+		echo baz >>file1 &&
+		git commit -am "adding baz" &&
+		merge=$(git rev-parse HEAD) &&
+		git checkout -b gitattributes &&
+		test_commit "gitattributes" .gitattributes "file1 merge=union" &&
+		git checkout @{-1} &&
+		tree=$(git --attr-source=gitattributes merge-tree --write-tree \
+		--merge-base "$base" --end-of-options "$source" "$merge") &&
+		test_write_lines foo bar baz >expect &&
+		git cat-file -p "$tree:file1" >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4300-merge-tree/3-way/.git/
+[master (root-commit) fd74319] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Switched to a new branch 'brancha'
+[brancha fe97420] adding bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'master'
+Switched to a new branch 'branchb'
+[branchb 0d361c1] adding baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'gitattributes'
+[gitattributes 7228331] gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 .gitattributes
+Switched to branch 'branchb'
+warning: refname 'gitattributes' is ambiguous.
+ok 8 - 3-way merge with --attr-source
+
+expecting success of 4300.9 'file change A, B (same)': 
+	git reset --hard initial &&
+	test_commit "change-a-b-same-A" "initial-file" "AAA" &&
+	git reset --hard initial &&
+	test_commit "change-a-b-same-B" "initial-file" "AAA" &&
+	git merge-tree initial change-a-b-same-A change-a-b-same-B >actual &&
+	test_must_be_empty actual
+
+HEAD is now at c1d16d8 initial
+[master 17f6774] change-a-b-same-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at c1d16d8 initial
+[master c618aaa] change-a-b-same-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 9 - file change A, B (same)
+
+expecting success of 4300.10 'file change A, B (different)': 
+	git reset --hard initial &&
+	test_commit "change-a-b-diff-A" "initial-file" "AAA" &&
+	git reset --hard initial &&
+	test_commit "change-a-b-diff-B" "initial-file" "BBB" &&
+	git merge-tree initial change-a-b-diff-A change-a-b-diff-B >actual &&
+	cat >expected <<EXPECTED &&
+changed in both
+  base   100644 $(git rev-parse initial:initial-file          ) initial-file
+  our    100644 $(git rev-parse change-a-b-diff-A:initial-file) initial-file
+  their  100644 $(git rev-parse change-a-b-diff-B:initial-file) initial-file
+@@ -1 +1,5 @@
++<<<<<<< .our
+ AAA
++=======
++BBB
++>>>>>>> .their
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master f14ee41] change-a-b-diff-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at c1d16d8 initial
+[master 6faccc3] change-a-b-diff-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 10 - file change A, B (different)
+
+expecting success of 4300.11 'file change A, B (mixed)': 
+	git reset --hard initial &&
+	test_commit "change-a-b-mix-base" "ONE" "
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA" &&
+	test_commit "change-a-b-mix-A" "ONE" \
+		"$(sed -e "1{s/AAA/BBB/;}" -e "10{s/AAA/BBB/;}" <ONE)" &&
+	git reset --hard change-a-b-mix-base &&
+	test_commit "change-a-b-mix-B" "ONE" \
+		"$(sed -e "1{s/AAA/BBB/;}" -e "10{s/AAA/CCC/;}" <ONE)" &&
+	git merge-tree change-a-b-mix-base change-a-b-mix-A change-a-b-mix-B \
+		>actual &&
+
+	cat >expected <<EXPECTED &&
+changed in both
+  base   100644 $(git rev-parse change-a-b-mix-base:ONE) ONE
+  our    100644 $(git rev-parse change-a-b-mix-A:ONE   ) ONE
+  their  100644 $(git rev-parse change-a-b-mix-B:ONE   ) ONE
+@@ -7,7 +7,11 @@
+ AAA
+ AAA
+ AAA
++<<<<<<< .our
+ BBB
++=======
++CCC
++>>>>>>> .their
+ AAA
+ AAA
+ AAA
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master 8f24aa4] change-a-b-mix-base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 16 insertions(+)
+ create mode 100644 ONE
+[master 37be425] change-a-b-mix-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 8f24aa4 change-a-b-mix-base
+[master 9bb3ceb] change-a-b-mix-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 11 - file change A, B (mixed)
+
+expecting success of 4300.12 'file remove A, !B': 
+	git reset --hard initial &&
+	test_commit "rm-a-not-b-base" "ONE" "AAA" &&
+	git rm ONE &&
+	git commit -m "rm-a-not-b" &&
+	git tag "rm-a-not-b" &&
+	git merge-tree rm-a-not-b-base rm-a-not-b rm-a-not-b-base >actual &&
+	test_must_be_empty actual
+
+HEAD is now at c1d16d8 initial
+[master 6bc469c] rm-a-not-b-base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+rm 'ONE'
+[master eaee347] rm-a-not-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 ONE
+ok 12 - file remove A, !B
+
+expecting success of 4300.13 'file remove !A, B': 
+	git reset --hard initial &&
+	test_commit "rm-not-a-b-base" "ONE" "AAA" &&
+	git rm ONE &&
+	git commit -m "rm-not-a-b" &&
+	git tag "rm-not-a-b" &&
+	git merge-tree rm-a-not-b-base rm-a-not-b-base rm-a-not-b >actual &&
+	cat >expected <<EXPECTED &&
+removed in remote
+  base   100644 $(git rev-parse rm-a-not-b-base:ONE) ONE
+  our    100644 $(git rev-parse rm-a-not-b-base:ONE) ONE
+@@ -1 +0,0 @@
+-AAA
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master 4c80bfe] rm-not-a-b-base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+rm 'ONE'
+[master f5c368c] rm-not-a-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 ONE
+ok 13 - file remove !A, B
+
+expecting success of 4300.14 'file remove A, B (same)': 
+	git reset --hard initial &&
+	test_commit "rm-a-b-base" "ONE" "AAA" &&
+	git rm ONE &&
+	git commit -m "rm-a-b" &&
+	git tag "rm-a-b" &&
+	git merge-tree rm-a-b-base rm-a-b rm-a-b >actual &&
+	test_must_be_empty actual
+
+HEAD is now at c1d16d8 initial
+[master ba896b0] rm-a-b-base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+rm 'ONE'
+[master e5794d5] rm-a-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 ONE
+ok 14 - file remove A, B (same)
+
+expecting success of 4300.15 'file change A, remove B': 
+	git reset --hard initial &&
+	test_commit "change-a-rm-b-base" "ONE" "AAA" &&
+	test_commit "change-a-rm-b-A" "ONE" "BBB" &&
+	git reset --hard change-a-rm-b-base &&
+	git rm ONE &&
+	git commit -m "change-a-rm-b-B" &&
+	git tag "change-a-rm-b-B" &&
+	git merge-tree change-a-rm-b-base change-a-rm-b-A change-a-rm-b-B \
+		>actual &&
+	cat >expected <<EXPECTED &&
+removed in remote
+  base   100644 $(git rev-parse change-a-rm-b-base:ONE) ONE
+  our    100644 $(git rev-parse change-a-rm-b-A:ONE   ) ONE
+@@ -1 +0,0 @@
+-BBB
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master 425fe11] change-a-rm-b-base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+[master d7b5417] change-a-rm-b-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 425fe11 change-a-rm-b-base
+rm 'ONE'
+[master a35c11c] change-a-rm-b-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 ONE
+ok 15 - file change A, remove B
+
+expecting success of 4300.16 'file remove A, change B': 
+	git reset --hard initial &&
+	test_commit "rm-a-change-b-base" "ONE" "AAA" &&
+
+	git rm ONE &&
+	git commit -m "rm-a-change-b-A" &&
+	git tag "rm-a-change-b-A" &&
+	git reset --hard rm-a-change-b-base &&
+	test_commit "rm-a-change-b-B" "ONE" "BBB" &&
+	git merge-tree rm-a-change-b-base rm-a-change-b-A rm-a-change-b-B \
+		>actual &&
+	cat >expected <<EXPECTED &&
+removed in local
+  base   100644 $(git rev-parse rm-a-change-b-base:ONE) ONE
+  their  100644 $(git rev-parse rm-a-change-b-B:ONE   ) ONE
+EXPECTED
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master e3f76d1] rm-a-change-b-base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+rm 'ONE'
+[master 12305ab] rm-a-change-b-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 ONE
+HEAD is now at e3f76d1 rm-a-change-b-base
+[master 30c5a34] rm-a-change-b-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 16 - file remove A, change B
+
+expecting success of 4300.17 'tree add A, B (same)': 
+	git reset --hard initial &&
+	mkdir sub &&
+	test_commit "add sub/file" "sub/file" "file" add-tree-A &&
+	git merge-tree initial add-tree-A add-tree-A >actual &&
+	test_must_be_empty actual
 
-expecting success of 5100.51 'from line with unterminated quoted string': 
-	echo "From: bob \"unterminated string smith <bob@example.com>" >in &&
-	git mailinfo /dev/null /dev/null <in >actual &&
-	cat >expect <<-\EOF &&
-	Author: bob unterminated string smith
-	Email: bob@example.com
+HEAD is now at c1d16d8 initial
+[master f146135] add sub/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub/file
+ok 17 - tree add A, B (same)
 
+expecting success of 4300.18 'tree add A, B (different)': 
+	git reset --hard initial &&
+	mkdir sub &&
+	test_commit "add sub/file" "sub/file" "AAA" add-tree-a-b-A &&
+	git reset --hard initial &&
+	mkdir sub &&
+	test_commit "add sub/file" "sub/file" "BBB" add-tree-a-b-B &&
+	git merge-tree initial add-tree-a-b-A add-tree-a-b-B >actual &&
+	cat >expect <<-EOF &&
+	added in both
+	  our    100644 $(git rev-parse add-tree-a-b-A:sub/file) sub/file
+	  their  100644 $(git rev-parse add-tree-a-b-B:sub/file) sub/file
+	@@ -1 +1,5 @@
+	+<<<<<<< .our
+	 AAA
+	+=======
+	+BBB
+	+>>>>>>> .their
 	EOF
 	test_cmp expect actual
 
-ok 51 - from line with unterminated quoted string
-
-expecting success of 5100.52 'from line with unterminated comment': 
-	echo "From: bob (unterminated comment smith <bob@example.com>" >in &&
-	git mailinfo /dev/null /dev/null <in >actual &&
-	cat >expect <<-\EOF &&
-	Author: bob (unterminated comment smith
-	Email: bob@example.com
+HEAD is now at c1d16d8 initial
+[master 278e538] add sub/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub/file
+HEAD is now at c1d16d8 initial
+[master b437163] add sub/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub/file
+ok 18 - tree add A, B (different)
 
+expecting success of 4300.19 'tree unchanged A, removed B': 
+	git reset --hard initial &&
+	mkdir sub &&
+	test_commit "add sub/file" "sub/file" "AAA" tree-remove-b-initial &&
+	git rm sub/file &&
+	test_tick &&
+	git commit -m "remove sub/file" &&
+	git tag tree-remove-b-B &&
+	git merge-tree tree-remove-b-initial tree-remove-b-initial tree-remove-b-B >actual &&
+	cat >expect <<-EOF &&
+	removed in remote
+	  base   100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file
+	  our    100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file
+	@@ -1 +0,0 @@
+	-AAA
 	EOF
 	test_cmp expect actual
 
-ok 52 - from line with unterminated comment
-
-# passed all 52 test(s)
-1..52
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5200-update-server-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5200-update-server-info/.git/
-expecting success of 5200.1 'setup': test_commit file
-[master (root-commit) 4c1911f] file
+HEAD is now at c1d16d8 initial
+[master 06f44d6] add sub/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
+ create mode 100644 sub/file
+rm 'sub/file'
+[master 7d2ab7e] remove sub/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 sub/file
+ok 19 - tree unchanged A, removed B
 
-ok 3 - modify and store mtime
+expecting success of 4300.20 'turn file to tree': 
+	git reset --hard initial &&
+	rm initial-file &&
+	mkdir initial-file &&
+	test_commit "turn-file-to-tree" "initial-file/ONE" "CCC" &&
+	git merge-tree initial initial turn-file-to-tree >actual &&
+	cat >expect <<-EOF &&
+	added in remote
+	  their  100644 $(git rev-parse turn-file-to-tree:initial-file/ONE) initial-file/ONE
+	@@ -0,0 +1 @@
+	+CCC
+	removed in remote
+	  base   100644 $(git rev-parse initial:initial-file) initial-file
+	  our    100644 $(git rev-parse initial:initial-file) initial-file
+	@@ -1 +0,0 @@
+	-initial
+	EOF
+	test_cmp expect actual
 
-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
+HEAD is now at c1d16d8 initial
+[master c7dbe97] turn-file-to-tree
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 initial-file
+ create mode 100644 initial-file/ONE
+ok 20 - turn file to tree
 
-ok 4 - info/refs is not needlessly overwritten
+expecting success of 4300.21 'turn tree to file': 
+	git reset --hard initial &&
+	mkdir dir &&
+	test_commit "add-tree" "dir/path" "AAA" &&
+	test_commit "add-another-tree" "dir/another" "BBB" &&
+	rm -fr dir &&
+	test_commit "make-file" "dir" "CCC" &&
+	git merge-tree add-tree add-another-tree make-file >actual &&
+	cat >expect <<-EOF &&
+	removed in remote
+	  base   100644 $(git rev-parse add-tree:dir/path) dir/path
+	  our    100644 $(git rev-parse add-tree:dir/path) dir/path
+	@@ -1 +0,0 @@
+	-AAA
+	added in remote
+	  their  100644 $(git rev-parse make-file:dir) dir
+	@@ -0,0 +1 @@
+	+CCC
+	EOF
+	test_cmp expect actual
 
-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
+HEAD is now at c1d16d8 initial
+[master fadeed0] add-tree
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/path
+[master 2076f67] add-another-tree
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/another
+[master 8ffb08d] make-file
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 2 deletions(-)
+ create mode 100644 dir
+ delete mode 100644 dir/another
+ delete mode 100644 dir/path
+ok 21 - turn tree to file
 
---- a	2025-08-27 08:21:24.275825535 +0000
-+++ b	2025-08-27 08:21:24.307825746 +0000
-@@ -1 +1 @@
--0
-+1756282884
-ok 5 - info/refs can be forced to update
+expecting success of 4300.22 'merge-tree respects core.useReplaceRefs=false': 
+	test_commit merge-to &&
+	test_commit valid base &&
+	git reset --hard HEAD^ &&
+	test_commit malicious base &&
 
-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
+	test_when_finished "git replace -d $(git rev-parse valid^0)" &&
+	git replace valid^0 malicious^0 &&
 
---- a	2025-08-27 08:21:24.275825535 +0000
-+++ b	2025-08-27 08:21:24.351826037 +0000
-@@ -1 +1 @@
--0
-+1756282884
-ok 6 - info/refs updates when changes are made
+	tree=$(git -c core.useReplaceRefs=true merge-tree --write-tree merge-to valid) &&
+	merged=$(git cat-file -p $tree:base) &&
+	test malicious = $merged &&
 
-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
+	tree=$(git -c core.useReplaceRefs=false merge-tree --write-tree merge-to valid) &&
+	merged=$(git cat-file -p $tree:base) &&
+	test valid = $merged
 
-Nothing new to pack.
-ok 7 - midx does not create duplicate pack entries
+[master cc93885] merge-to
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 merge-to.t
+[master 99060ff] valid
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base
+HEAD is now at cc93885 merge-to
+[master 069f0c6] malicious
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base
+Deleted replace ref '99060ffb2d3618a898040626d81aa60f425c225a'
+ok 22 - merge-tree respects core.useReplaceRefs=false
 
-# passed all 7 test(s)
-1..7
+# passed all 22 test(s)
+1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5000-tar-tree.sh ***
@@ -295379,9 +295220,9 @@
 	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
-fatal: sent error to the client: git upload-archive: archiver died with error
 ok 2 - --list notices extra parameters
 
 expecting success of 5000.3 'end-of-options is correctly eaten': 
@@ -295771,9 +295612,9 @@
  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
+fatal: sent error to the client: 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': 
@@ -297541,8 +297382,8 @@
 
 HEAD is now at 6b2d93f first
 Applying: second
---- at	2025-08-27 08:21:21.927810048 +0000
-+++ ct	2025-08-27 08:21:21.927810048 +0000
+--- at	2026-09-29 14:52:38.106548970 +0000
++++ ct	2026-09-29 14:52:38.110548970 +0000
 @@ -1 +1 @@
 -1112912053 -0700
 +1112912293 -0700
@@ -297571,7 +297412,7 @@
 
 HEAD is now at 6b2d93f first
 Applying: second
-1756282881 +0000
+1790693558 +0000
 ok 62 - am --ignore-date
 
 expecting success of 4150.63 'am into an unborn branch': 
@@ -297592,7 +297433,7 @@
 	) &&
 	test_cmp expected actual
 
-HEAD is now at 6c60fe5 second
+HEAD is now at 21b0e7b second
 subdir/1
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4150-am/subdir/.git/
 applying to an empty history
@@ -297608,16 +297449,16 @@
 	git am <patchnl >output.out 2>&1 &&
 	test_grep "^Applying: second \\\n foo$" output.out
 
-HEAD is now at 6c60fe5 second
+HEAD is now at 21b0e7b second
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  6c60fe5 second
+  21b0e7b 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> 6c60fe5
+ git branch <new-branch-name> 21b0e7b
 
 HEAD is now at 6b2d93f first
 Applying: second \n foo
@@ -298383,6 +298224,76 @@
 1..87
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5200-update-server-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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	2026-09-29 14:52:39.918548970 +0000
++++ b	2026-09-29 14:52:39.938548970 +0000
+@@ -1 +1 @@
+-0
++1790693559
+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	2026-09-29 14:52:39.918548970 +0000
++++ b	2026-09-29 14:52:39.966548970 +0000
+@@ -1 +1 @@
+-0
++1790693559
+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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4215-log-skewed-merges.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4215-log-skewed-merges/.git/
 expecting success of 4215.1 'log --graph with merge fusing with its left and right neighbors': 
@@ -299592,6 +299503,1029 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5003-archive-zip.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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) 712906b] 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
+712906bbf47c897a4596c5c425e8edfa4e53a5cb
+   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.51.0/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
+712906bbf47c897a4596c5c425e8edfa4e53a5cb
+   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
+712906bbf47c897a4596c5c425e8edfa4e53a5cb
+   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
+712906bbf47c897a4596c5c425e8edfa4e53a5cb
+   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
+712906bbf47c897a4596c5c425e8edfa4e53a5cb
+   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
+712906bbf47c897a4596c5c425e8edfa4e53a5cb
+   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
+712906bbf47c897a4596c5c425e8edfa4e53a5cb
+   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
+712906bbf47c897a4596c5c425e8edfa4e53a5cb
+   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
+712906bbf47c897a4596c5c425e8edfa4e53a5cb
+   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
+712906bbf47c897a4596c5c425e8edfa4e53a5cb
+   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
+712906bbf47c897a4596c5c425e8edfa4e53a5cb
+   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
+712906bbf47c897a4596c5c425e8edfa4e53a5cb
+   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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5305-include-tag.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5305-include-tag/.git/
 expecting success of 5305.1 'setup': 
@@ -299749,91 +300683,495 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5306-pack-nobase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5306-pack-nobase/.git/
-expecting success of 5306.1 'setup base': 
-	test_write_lines a b c d e f g h i >text &&
-	echo side >side &&
-	git update-index --add text side &&
-	A=$(echo A | git commit-tree $(git write-tree)) &&
+*** t5004-archive-corner-cases.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5004-archive-corner-cases/.git/
+expecting success of 5004.1 'create commit with empty tree and fake empty tar': 
+	git commit --allow-empty -m foo &&
+	perl -e "print \"\\0\" x 10240" >10knuls.tar
 
-	echo m >>text &&
-	git update-index text &&
-	B=$(echo B | git commit-tree $(git write-tree) -p $A) &&
-	git update-ref HEAD $B
+[master (root-commit) 2093db0] foo
+ Author: A U Thor <author@example.com>
+ok 1 - create commit with empty tree and fake empty tar
 
-ok 1 - setup base
+expecting success of 5004.2 'tar archive of commit with empty tree': 
+	git archive --format=tar HEAD >empty-with-pax-header.tar &&
+	make_dir extract &&
+	"$TAR" xf empty-with-pax-header.tar -C extract &&
+	check_dir extract
 
-expecting success of 5306.2 'setup patch_clone': 
-	base_objects=$(pwd)/.git/objects &&
-	(mkdir patch_clone &&
-	cd patch_clone &&
-	git init &&
-	echo "$base_objects" >.git/objects/info/alternates &&
-	echo q >>text &&
-	git read-tree $B &&
-	git update-index text &&
-	git update-ref HEAD $(echo C | git commit-tree $(git write-tree) -p $B) &&
-	rm .git/objects/info/alternates &&
+ok 2 - tar archive of commit with empty tree
 
-	git --git-dir=../.git cat-file commit $B |
-	git hash-object -t commit -w --stdin &&
+expecting success of 5004.3 'tar archive of empty tree is empty': 
+	git archive --format=tar HEAD: >empty.tar &&
+	test_cmp_bin 10knuls.tar empty.tar
 
-	git --git-dir=../.git cat-file tree "$B^{tree}" |
-	git hash-object -t tree -w --stdin
+ok 3 - tar archive of empty tree is empty
+
+expecting success of 5004.4 'tar archive of empty tree with prefix': 
+	git archive --format=tar --prefix=foo/ HEAD >prefix.tar &&
+	make_dir extract &&
+	"$TAR" xf prefix.tar -C extract &&
+	check_dir extract foo
+
+ok 4 - tar archive of empty tree with prefix
+
+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 5004.5 'zip archive of empty tree is empty': 
+	# Detect the exit code produced when our particular flavor of unzip
+	# sees an empty archive. Infozip will generate a warning and exit with
+	# code 1. But in the name of sanity, we do not expect other unzip
+	# implementations to do the same thing (it would be perfectly
+	# reasonable to exit 0, for example).
+	#
+	# This makes our test less rigorous on some platforms (unzip may not
+	# handle the empty repo at all, making our later check of its exit code
+	# a no-op). But we cannot do anything reasonable except skip the test
+	# on such platforms anyway, and this is the moral equivalent.
+	{
+		"$GIT_UNZIP" "$TEST_DIRECTORY"/t5004/empty.zip
+		expect_code=$?
+	} &&
+
+	git archive --format=zip HEAD >empty.zip &&
+	make_dir extract &&
+	(
+		cd extract &&
+		test_expect_code $expect_code "$GIT_UNZIP" ../empty.zip
 	) &&
-	C=$(git --git-dir=patch_clone/.git rev-parse HEAD)
+	check_dir extract
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5306-pack-nobase/patch_clone/.git/
-b9ed80ffce4d29008783a547cd99709480fe6c9f
-f9037bf6e8d95d31af48907ab2c93c2d6c2c7fcd
-ok 2 - setup patch_clone
+Archive:  /build/reproducible-path/git-2.51.0/t/t5004/empty.zip
+fc8e0d59c1cc5c14b6919fb2006b27fe337e7d0e
+warning [/build/reproducible-path/git-2.51.0/t/t5004/empty.zip]:  zipfile is empty
+Archive:  ../empty.zip
+2093db06f424f426e05da2ca90f40d2663e89387
+warning [../empty.zip]:  zipfile is empty
+ok 5 - zip archive of empty tree is empty
 
-expecting success of 5306.3 'indirectly clone patch_clone': 
-	(mkdir user_clone &&
-	 cd user_clone &&
-	 git init &&
-	 git pull ../.git &&
-	 test $(git rev-parse HEAD) = $B &&
+expecting success of 5004.6 'zip archive of empty tree with prefix': 
+	# We do not have to play exit-code tricks here, because our
+	# result should not be empty; it has a directory in it.
+	git archive --format=zip --prefix=foo/ HEAD >prefix.zip &&
+	make_dir extract &&
+	(
+		cd extract &&
+		"$GIT_UNZIP" ../prefix.zip
+	) &&
+	check_dir extract foo
 
-	# The --path-walk feature of "git pack-objects" is not
-	# compatible with this kind of fetch from an incomplete repo.
-	GIT_TEST_PACK_PATH_WALK=0 &&
-	export GIT_TEST_PACK_PATH_WALK &&
+Archive:  ../prefix.zip
+2093db06f424f426e05da2ca90f40d2663e89387
+   creating: foo/
+ok 6 - zip archive of empty tree with prefix
 
-	 git pull ../patch_clone/.git &&
-	 test $(git rev-parse HEAD) = $C
-	)
+expecting success of 5004.7 'archive complains about pathspec on empty tree': 
+	test_must_fail git archive --format=tar HEAD -- foo >/dev/null
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5306-pack-nobase/user_clone/.git/
-From ../
- * branch            HEAD       -> FETCH_HEAD
-From ../patch_clone/
- * branch            HEAD       -> FETCH_HEAD
-Updating b9ed80f..12634d7
-Fast-forward
- text | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
-ok 3 - indirectly clone patch_clone
+fatal: pathspec 'foo' did not match any files
+ok 7 - archive complains about pathspec on empty tree
 
-expecting success of 5306.4 'clone of patch_clone is incomplete': 
-	(mkdir user_direct &&
-	 cd user_direct &&
-	 git init &&
-	 test_must_fail git fetch ../patch_clone/.git
-	)
+expecting success of 5004.8 'create a commit with an empty subtree': 
+	empty_tree=$(git hash-object -t tree /dev/null) &&
+	root_tree=$(printf "040000 tree $empty_tree\tsub\n" | git mktree)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5306-pack-nobase/user_direct/.git/
-error: git upload-pack: git-pack-objects died with error.
-fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
-remote: error: Could not read 53030622b7a745eeb28ab02e2e8d26d5e3d5cab4        
-remote: fatal: Failed to traverse parents of commit b9ed80ffce4d29008783a547cd99709480fe6c9f        
-remote: aborting due to possible repository corruption on the remote side.
-fatal: protocol error: bad pack header
-ok 4 - clone of patch_clone is incomplete
+ok 8 - create a commit with an empty subtree
 
-# passed all 4 test(s)
-1..4
+expecting success of 5004.9 'archive empty subtree with no pathspec': 
+	git archive --format=tar $root_tree >subtree-all.tar &&
+	test_cmp_bin 10knuls.tar subtree-all.tar
+
+ok 9 - archive empty subtree with no pathspec
+
+expecting success of 5004.10 'archive empty subtree by direct pathspec': 
+	git archive --format=tar $root_tree -- sub >subtree-path.tar &&
+	test_cmp_bin 10knuls.tar subtree-path.tar
+
+ok 10 - archive empty subtree by direct pathspec
+
+checking prerequisite: ZIPINFO
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-ZIPINFO" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-ZIPINFO" &&
+	n=$("$ZIPINFO" "$TEST_DIRECTORY"/t5004/empty.zip | sed -n "2s/.* //p")
+	test "x$n" = "x0"
+
+)
+prerequisite ZIPINFO ok
+expecting success of 5004.11 'zip archive with many entries': 
+	# add a directory with 256 files
+	mkdir 00 &&
+	for a in 0 1 2 3 4 5 6 7 8 9 a b c d e f
+	do
+		for b in 0 1 2 3 4 5 6 7 8 9 a b c d e f
+		do
+			: >00/$a$b || return 1
+		done
+	done &&
+	git add 00 &&
+	git commit -m "256 files in 1 directory" &&
+
+	# duplicate it to get 65536 files in 256 directories
+	subtree=$(git write-tree --prefix=00/) &&
+	for c in 0 1 2 3 4 5 6 7 8 9 a b c d e f
+	do
+		for d in 0 1 2 3 4 5 6 7 8 9 a b c d e f
+		do
+			echo "040000 tree $subtree	$c$d" || return 1
+		done
+	done >tree &&
+	tree=$(git mktree <tree) &&
+
+	# zip them
+	git archive -o many.zip $tree &&
+
+	# check the number of entries in the ZIP file directory
+	expr 65536 + 256 >expect &&
+	"$ZIPINFO" -h many.zip >zipinfo &&
+	sed -n "2s/.* //p" <zipinfo >actual &&
+	test_cmp expect actual
+
+[master 3c2fce3] 256 files in 1 directory
+ Author: A U Thor <author@example.com>
+ 256 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 00/00
+ create mode 100644 00/01
+ create mode 100644 00/02
+ create mode 100644 00/03
+ create mode 100644 00/04
+ create mode 100644 00/05
+ create mode 100644 00/06
+ create mode 100644 00/07
+ create mode 100644 00/08
+ create mode 100644 00/09
+ create mode 100644 00/0a
+ create mode 100644 00/0b
+ create mode 100644 00/0c
+ create mode 100644 00/0d
+ create mode 100644 00/0e
+ create mode 100644 00/0f
+ create mode 100644 00/10
+ create mode 100644 00/11
+ create mode 100644 00/12
+ create mode 100644 00/13
+ create mode 100644 00/14
+ create mode 100644 00/15
+ create mode 100644 00/16
+ create mode 100644 00/17
+ create mode 100644 00/18
+ create mode 100644 00/19
+ create mode 100644 00/1a
+ create mode 100644 00/1b
+ create mode 100644 00/1c
+ create mode 100644 00/1d
+ create mode 100644 00/1e
+ create mode 100644 00/1f
+ create mode 100644 00/20
+ create mode 100644 00/21
+ create mode 100644 00/22
+ create mode 100644 00/23
+ create mode 100644 00/24
+ create mode 100644 00/25
+ create mode 100644 00/26
+ create mode 100644 00/27
+ create mode 100644 00/28
+ create mode 100644 00/29
+ create mode 100644 00/2a
+ create mode 100644 00/2b
+ create mode 100644 00/2c
+ create mode 100644 00/2d
+ create mode 100644 00/2e
+ create mode 100644 00/2f
+ create mode 100644 00/30
+ create mode 100644 00/31
+ create mode 100644 00/32
+ create mode 100644 00/33
+ create mode 100644 00/34
+ create mode 100644 00/35
+ create mode 100644 00/36
+ create mode 100644 00/37
+ create mode 100644 00/38
+ create mode 100644 00/39
+ create mode 100644 00/3a
+ create mode 100644 00/3b
+ create mode 100644 00/3c
+ create mode 100644 00/3d
+ create mode 100644 00/3e
+ create mode 100644 00/3f
+ create mode 100644 00/40
+ create mode 100644 00/41
+ create mode 100644 00/42
+ create mode 100644 00/43
+ create mode 100644 00/44
+ create mode 100644 00/45
+ create mode 100644 00/46
+ create mode 100644 00/47
+ create mode 100644 00/48
+ create mode 100644 00/49
+ create mode 100644 00/4a
+ create mode 100644 00/4b
+ create mode 100644 00/4c
+ create mode 100644 00/4d
+ create mode 100644 00/4e
+ create mode 100644 00/4f
+ create mode 100644 00/50
+ create mode 100644 00/51
+ create mode 100644 00/52
+ create mode 100644 00/53
+ create mode 100644 00/54
+ create mode 100644 00/55
+ create mode 100644 00/56
+ create mode 100644 00/57
+ create mode 100644 00/58
+ create mode 100644 00/59
+ create mode 100644 00/5a
+ create mode 100644 00/5b
+ create mode 100644 00/5c
+ create mode 100644 00/5d
+ create mode 100644 00/5e
+ create mode 100644 00/5f
+ create mode 100644 00/60
+ create mode 100644 00/61
+ create mode 100644 00/62
+ create mode 100644 00/63
+ create mode 100644 00/64
+ create mode 100644 00/65
+ create mode 100644 00/66
+ create mode 100644 00/67
+ create mode 100644 00/68
+ create mode 100644 00/69
+ create mode 100644 00/6a
+ create mode 100644 00/6b
+ create mode 100644 00/6c
+ create mode 100644 00/6d
+ create mode 100644 00/6e
+ create mode 100644 00/6f
+ create mode 100644 00/70
+ create mode 100644 00/71
+ create mode 100644 00/72
+ create mode 100644 00/73
+ create mode 100644 00/74
+ create mode 100644 00/75
+ create mode 100644 00/76
+ create mode 100644 00/77
+ create mode 100644 00/78
+ create mode 100644 00/79
+ create mode 100644 00/7a
+ create mode 100644 00/7b
+ create mode 100644 00/7c
+ create mode 100644 00/7d
+ create mode 100644 00/7e
+ create mode 100644 00/7f
+ create mode 100644 00/80
+ create mode 100644 00/81
+ create mode 100644 00/82
+ create mode 100644 00/83
+ create mode 100644 00/84
+ create mode 100644 00/85
+ create mode 100644 00/86
+ create mode 100644 00/87
+ create mode 100644 00/88
+ create mode 100644 00/89
+ create mode 100644 00/8a
+ create mode 100644 00/8b
+ create mode 100644 00/8c
+ create mode 100644 00/8d
+ create mode 100644 00/8e
+ create mode 100644 00/8f
+ create mode 100644 00/90
+ create mode 100644 00/91
+ create mode 100644 00/92
+ create mode 100644 00/93
+ create mode 100644 00/94
+ create mode 100644 00/95
+ create mode 100644 00/96
+ create mode 100644 00/97
+ create mode 100644 00/98
+ create mode 100644 00/99
+ create mode 100644 00/9a
+ create mode 100644 00/9b
+ create mode 100644 00/9c
+ create mode 100644 00/9d
+ create mode 100644 00/9e
+ create mode 100644 00/9f
+ create mode 100644 00/a0
+ create mode 100644 00/a1
+ create mode 100644 00/a2
+ create mode 100644 00/a3
+ create mode 100644 00/a4
+ create mode 100644 00/a5
+ create mode 100644 00/a6
+ create mode 100644 00/a7
+ create mode 100644 00/a8
+ create mode 100644 00/a9
+ create mode 100644 00/aa
+ create mode 100644 00/ab
+ create mode 100644 00/ac
+ create mode 100644 00/ad
+ create mode 100644 00/ae
+ create mode 100644 00/af
+ create mode 100644 00/b0
+ create mode 100644 00/b1
+ create mode 100644 00/b2
+ create mode 100644 00/b3
+ create mode 100644 00/b4
+ create mode 100644 00/b5
+ create mode 100644 00/b6
+ create mode 100644 00/b7
+ create mode 100644 00/b8
+ create mode 100644 00/b9
+ create mode 100644 00/ba
+ create mode 100644 00/bb
+ create mode 100644 00/bc
+ create mode 100644 00/bd
+ create mode 100644 00/be
+ create mode 100644 00/bf
+ create mode 100644 00/c0
+ create mode 100644 00/c1
+ create mode 100644 00/c2
+ create mode 100644 00/c3
+ create mode 100644 00/c4
+ create mode 100644 00/c5
+ create mode 100644 00/c6
+ create mode 100644 00/c7
+ create mode 100644 00/c8
+ create mode 100644 00/c9
+ create mode 100644 00/ca
+ create mode 100644 00/cb
+ create mode 100644 00/cc
+ create mode 100644 00/cd
+ create mode 100644 00/ce
+ create mode 100644 00/cf
+ create mode 100644 00/d0
+ create mode 100644 00/d1
+ create mode 100644 00/d2
+ create mode 100644 00/d3
+ create mode 100644 00/d4
+ create mode 100644 00/d5
+ create mode 100644 00/d6
+ create mode 100644 00/d7
+ create mode 100644 00/d8
+ create mode 100644 00/d9
+ create mode 100644 00/da
+ create mode 100644 00/db
+ create mode 100644 00/dc
+ create mode 100644 00/dd
+ create mode 100644 00/de
+ create mode 100644 00/df
+ create mode 100644 00/e0
+ create mode 100644 00/e1
+ create mode 100644 00/e2
+ create mode 100644 00/e3
+ create mode 100644 00/e4
+ create mode 100644 00/e5
+ create mode 100644 00/e6
+ create mode 100644 00/e7
+ create mode 100644 00/e8
+ create mode 100644 00/e9
+ create mode 100644 00/ea
+ create mode 100644 00/eb
+ create mode 100644 00/ec
+ create mode 100644 00/ed
+ create mode 100644 00/ee
+ create mode 100644 00/ef
+ create mode 100644 00/f0
+ create mode 100644 00/f1
+ create mode 100644 00/f2
+ create mode 100644 00/f3
+ create mode 100644 00/f4
+ create mode 100644 00/f5
+ create mode 100644 00/f6
+ create mode 100644 00/f7
+ create mode 100644 00/f8
+ create mode 100644 00/f9
+ create mode 100644 00/fa
+ create mode 100644 00/fb
+ create mode 100644 00/fc
+ create mode 100644 00/fd
+ create mode 100644 00/fe
+ create mode 100644 00/ff
+ok 11 - zip archive with many entries
+
+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
+checking prerequisite: UNZIP_ZIP64_SUPPORT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_ZIP64_SUPPORT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_ZIP64_SUPPORT" &&
+	"$GIT_UNZIP" -v | grep ZIP64_SUPPORT
+
+)
+        ZIP64_SUPPORT (archives using Zip64 for large files supported)
+prerequisite UNZIP_ZIP64_SUPPORT ok
+ok 12 # skip zip archive bigger than 4GB (missing EXPENSIVE of EXPENSIVE,UNZIP,UNZIP_ZIP64_SUPPORT)
+
+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
+ok 13 # skip zip archive with files bigger than 4GB (missing EXPENSIVE of EXPENSIVE,LONG_IS_64BIT,UNZIP,UNZIP_ZIP64_SUPPORT,ZIPINFO)
+
+expecting success of 5004.14 'tar archive with long paths': 
+	blob=$(echo foo | git hash-object -w --stdin) &&
+	tree=$(build_tree $blob | git mktree) &&
+	git archive -o long_paths.tar $tree
+
+ok 14 - tar archive with long paths
+
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4301-merge-tree-write-tree.sh ***
@@ -301244,6 +302582,93 @@
 1..44
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5306-pack-nobase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5306-pack-nobase/.git/
+expecting success of 5306.1 'setup base': 
+	test_write_lines a b c d e f g h i >text &&
+	echo side >side &&
+	git update-index --add text side &&
+	A=$(echo A | git commit-tree $(git write-tree)) &&
+
+	echo m >>text &&
+	git update-index text &&
+	B=$(echo B | git commit-tree $(git write-tree) -p $A) &&
+	git update-ref HEAD $B
+
+ok 1 - setup base
+
+expecting success of 5306.2 'setup patch_clone': 
+	base_objects=$(pwd)/.git/objects &&
+	(mkdir patch_clone &&
+	cd patch_clone &&
+	git init &&
+	echo "$base_objects" >.git/objects/info/alternates &&
+	echo q >>text &&
+	git read-tree $B &&
+	git update-index text &&
+	git update-ref HEAD $(echo C | git commit-tree $(git write-tree) -p $B) &&
+	rm .git/objects/info/alternates &&
+
+	git --git-dir=../.git cat-file commit $B |
+	git hash-object -t commit -w --stdin &&
+
+	git --git-dir=../.git cat-file tree "$B^{tree}" |
+	git hash-object -t tree -w --stdin
+	) &&
+	C=$(git --git-dir=patch_clone/.git rev-parse HEAD)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5306-pack-nobase/patch_clone/.git/
+b9ed80ffce4d29008783a547cd99709480fe6c9f
+f9037bf6e8d95d31af48907ab2c93c2d6c2c7fcd
+ok 2 - setup patch_clone
+
+expecting success of 5306.3 'indirectly clone patch_clone': 
+	(mkdir user_clone &&
+	 cd user_clone &&
+	 git init &&
+	 git pull ../.git &&
+	 test $(git rev-parse HEAD) = $B &&
+
+	# The --path-walk feature of "git pack-objects" is not
+	# compatible with this kind of fetch from an incomplete repo.
+	GIT_TEST_PACK_PATH_WALK=0 &&
+	export GIT_TEST_PACK_PATH_WALK &&
+
+	 git pull ../patch_clone/.git &&
+	 test $(git rev-parse HEAD) = $C
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5306-pack-nobase/user_clone/.git/
+From ../
+ * branch            HEAD       -> FETCH_HEAD
+From ../patch_clone/
+ * branch            HEAD       -> FETCH_HEAD
+Updating b9ed80f..12634d7
+Fast-forward
+ text | 11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+ok 3 - indirectly clone patch_clone
+
+expecting success of 5306.4 'clone of patch_clone is incomplete': 
+	(mkdir user_direct &&
+	 cd user_direct &&
+	 git init &&
+	 test_must_fail git fetch ../patch_clone/.git
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5306-pack-nobase/user_direct/.git/
+remote: error: Could not read 53030622b7a745eeb28ab02e2e8d26d5e3d5cab4        
+remote: fatal: Failed to traverse parents of commit b9ed80ffce4d29008783a547cd99709480fe6c9f        
+error: git upload-pack: git-pack-objects died with error.
+fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
+remote: aborting due to possible repository corruption on the remote side.
+fatal: protocol error: bad pack header
+ok 4 - clone of patch_clone is incomplete
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5307-pack-missing-commit.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5307-pack-missing-commit/.git/
 expecting success of 5307.1 'setup': 
@@ -301385,153 +302810,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5309-pack-delta-cycles.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5309-pack-delta-cycles/.git/
-expecting success of 5309.1 'index-pack works with a single delta (A->B)': 
-	clear_packs &&
-	{
-		pack_header 2 &&
-		pack_obj $A $B &&
-		pack_obj $B
-	} >ab.pack &&
-	pack_trailer ab.pack &&
-	git index-pack --stdin <ab.pack &&
-	git cat-file -t $A &&
-	git cat-file -t $B
-
-pack	8af524300e46c11647862073e882d467bc0dd22d
-blob
-blob
-ok 1 - index-pack works with a single delta (A->B)
-
-expecting success of 5309.2 'index-pack works with a single delta (B->A)': 
-	clear_packs &&
-	{
-		pack_header 2 &&
-		pack_obj $A &&
-		pack_obj $B $A
-	} >ba.pack &&
-	pack_trailer ba.pack &&
-	git index-pack --stdin <ba.pack &&
-	git cat-file -t $A &&
-	git cat-file -t $B
-
-pack	80442ca09df79dab1a7b2ac6fc4928bfbeeddc20
-blob
-blob
-ok 2 - index-pack works with a single delta (B->A)
-
-expecting success of 5309.3 'index-pack detects missing base objects': 
-	clear_packs &&
-	{
-		pack_header 1 &&
-		pack_obj $A $B
-	} >missing.pack &&
-	pack_trailer missing.pack &&
-	test_must_fail git index-pack --fix-thin --stdin <missing.pack
-
-fatal: pack has 1 unresolved delta
-ok 3 - index-pack detects missing base objects
-
-expecting success of 5309.4 'index-pack detects REF_DELTA cycles': 
-	clear_packs &&
-	{
-		pack_header 2 &&
-		pack_obj $A $B &&
-		pack_obj $B $A
-	} >cycle.pack &&
-	pack_trailer cycle.pack &&
-	test_must_fail git index-pack --fix-thin --stdin <cycle.pack
-
-fatal: pack has 2 unresolved deltas
-ok 4 - index-pack detects REF_DELTA cycles
-
-expecting success of 5309.5 'failover to an object in another pack': 
-	clear_packs &&
-	git index-pack --stdin <ab.pack &&
-
-	# This cycle does not fail since the existence of A & B in
-	# the repo allows us to resolve the cycle.
-	git index-pack --stdin --fix-thin <cycle.pack
-
-pack	8af524300e46c11647862073e882d467bc0dd22d
-pack	7151b1935b291dfcff479810c71c82a2e9d6f325
-ok 5 - failover to an object in another pack
-
-expecting success of 5309.6 'failover to a duplicate object in the same pack': 
-	clear_packs &&
-	{
-		pack_header 3 &&
-		pack_obj $A $B &&
-		pack_obj $B $A &&
-		pack_obj $A
-	} >recoverable.pack &&
-	pack_trailer recoverable.pack &&
-
-	# This cycle does not fail since the existence of a full copy
-	# of A in the pack allows us to resolve the cycle.
-	git index-pack --fix-thin --stdin <recoverable.pack
-
-pack	60765b3b506ff08f13ef87e3588a43b76faabe14
-ok 6 - failover to a duplicate object in the same pack
-
-expecting success of 5309.7 'index-pack works with thin pack A->B->C with B on disk': 
-	git init server &&
-	(
-		cd server &&
-		test_commit_bulk 4
-	) &&
-
-	A=$(git -C server rev-parse HEAD^{tree}) &&
-	B=$(git -C server rev-parse HEAD~1^{tree}) &&
-	C=$(git -C server rev-parse HEAD~2^{tree}) &&
-	git -C server reset --hard HEAD~1 &&
-
-	test-tool -C server pack-deltas --num-objects=2 >thin.pack <<-EOF &&
-	REF_DELTA $A $B
-	REF_DELTA $B $C
-	EOF
-
-	git clone "file://$(pwd)/server" client &&
-	(
-		cd client &&
-		git index-pack --fix-thin --stdin <../thin.pack
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5309-pack-delta-cycles/server/.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 (         0 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            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        887 /        887
----------------------------------------------------------------------
-
-HEAD is now at 123d744 commit 3
-Cloning into 'client'...
-pack	cf82961a570c554bf87b1e65c55e1d4e27943d48
-ok 7 - index-pack works with thin pack A->B->C with B on disk
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5150-request-pull.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5150-request-pull/.git/
 expecting success of 5150.1 'setup': 
@@ -302078,6 +303356,153 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5309-pack-delta-cycles.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5309-pack-delta-cycles/.git/
+expecting success of 5309.1 'index-pack works with a single delta (A->B)': 
+	clear_packs &&
+	{
+		pack_header 2 &&
+		pack_obj $A $B &&
+		pack_obj $B
+	} >ab.pack &&
+	pack_trailer ab.pack &&
+	git index-pack --stdin <ab.pack &&
+	git cat-file -t $A &&
+	git cat-file -t $B
+
+pack	8af524300e46c11647862073e882d467bc0dd22d
+blob
+blob
+ok 1 - index-pack works with a single delta (A->B)
+
+expecting success of 5309.2 'index-pack works with a single delta (B->A)': 
+	clear_packs &&
+	{
+		pack_header 2 &&
+		pack_obj $A &&
+		pack_obj $B $A
+	} >ba.pack &&
+	pack_trailer ba.pack &&
+	git index-pack --stdin <ba.pack &&
+	git cat-file -t $A &&
+	git cat-file -t $B
+
+pack	80442ca09df79dab1a7b2ac6fc4928bfbeeddc20
+blob
+blob
+ok 2 - index-pack works with a single delta (B->A)
+
+expecting success of 5309.3 'index-pack detects missing base objects': 
+	clear_packs &&
+	{
+		pack_header 1 &&
+		pack_obj $A $B
+	} >missing.pack &&
+	pack_trailer missing.pack &&
+	test_must_fail git index-pack --fix-thin --stdin <missing.pack
+
+fatal: pack has 1 unresolved delta
+ok 3 - index-pack detects missing base objects
+
+expecting success of 5309.4 'index-pack detects REF_DELTA cycles': 
+	clear_packs &&
+	{
+		pack_header 2 &&
+		pack_obj $A $B &&
+		pack_obj $B $A
+	} >cycle.pack &&
+	pack_trailer cycle.pack &&
+	test_must_fail git index-pack --fix-thin --stdin <cycle.pack
+
+fatal: pack has 2 unresolved deltas
+ok 4 - index-pack detects REF_DELTA cycles
+
+expecting success of 5309.5 'failover to an object in another pack': 
+	clear_packs &&
+	git index-pack --stdin <ab.pack &&
+
+	# This cycle does not fail since the existence of A & B in
+	# the repo allows us to resolve the cycle.
+	git index-pack --stdin --fix-thin <cycle.pack
+
+pack	8af524300e46c11647862073e882d467bc0dd22d
+pack	7151b1935b291dfcff479810c71c82a2e9d6f325
+ok 5 - failover to an object in another pack
+
+expecting success of 5309.6 'failover to a duplicate object in the same pack': 
+	clear_packs &&
+	{
+		pack_header 3 &&
+		pack_obj $A $B &&
+		pack_obj $B $A &&
+		pack_obj $A
+	} >recoverable.pack &&
+	pack_trailer recoverable.pack &&
+
+	# This cycle does not fail since the existence of a full copy
+	# of A in the pack allows us to resolve the cycle.
+	git index-pack --fix-thin --stdin <recoverable.pack
+
+pack	60765b3b506ff08f13ef87e3588a43b76faabe14
+ok 6 - failover to a duplicate object in the same pack
+
+expecting success of 5309.7 'index-pack works with thin pack A->B->C with B on disk': 
+	git init server &&
+	(
+		cd server &&
+		test_commit_bulk 4
+	) &&
+
+	A=$(git -C server rev-parse HEAD^{tree}) &&
+	B=$(git -C server rev-parse HEAD~1^{tree}) &&
+	C=$(git -C server rev-parse HEAD~2^{tree}) &&
+	git -C server reset --hard HEAD~1 &&
+
+	test-tool -C server pack-deltas --num-objects=2 >thin.pack <<-EOF &&
+	REF_DELTA $A $B
+	REF_DELTA $B $C
+	EOF
+
+	git clone "file://$(pwd)/server" client &&
+	(
+		cd client &&
+		git index-pack --fix-thin --stdin <../thin.pack
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5309-pack-delta-cycles/server/.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 (         0 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            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =        887 /        887
+---------------------------------------------------------------------
+
+HEAD is now at 123d744 commit 3
+Cloning into 'client'...
+pack	cf82961a570c554bf87b1e65c55e1d4e27943d48
+ok 7 - index-pack works with thin pack A->B->C with B on disk
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5311-pack-bitmaps-shallow.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5311-pack-bitmaps-shallow/.git/
 expecting success of 5311.1 'setup shallow repo': 
@@ -302162,6 +303587,61 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5314-pack-cycle-detection.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5312-prune-corruption.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5312-prune-corruption/.git/
 expecting success of 5312.1 'disable reflogs': 
@@ -302303,7 +303783,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 2.604e-05 s, 38.4 kB/s
+1 byte copied, 2.944e-05 s, 34.0 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
@@ -302432,7 +303912,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.46e-05 s, 40.7 kB/s
+1 byte copied, 2.448e-05 s, 40.8 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
@@ -302537,7 +304017,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.548e-05 s, 39.2 kB/s
+1 byte copied, 2.524e-05 s, 39.6 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
@@ -302584,7 +304064,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.528e-05 s, 39.6 kB/s
+1 byte copied, 2.556e-05 s, 39.1 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
@@ -302632,7 +304112,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.5601e-05 s, 39.1 kB/s
+1 byte copied, 2.808e-05 s, 35.6 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
@@ -302689,7 +304169,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 2.668e-05 s, 37.5 kB/s
+1 byte copied, 2.476e-05 s, 40.4 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
@@ -302718,7 +304198,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 2+0 records in
 2+0 records out
-2 bytes copied, 2.8e-05 s, 71.4 kB/s
+2 bytes copied, 2.696e-05 s, 74.2 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
@@ -302765,7 +304245,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 2+0 records in
 2+0 records out
-2 bytes copied, 2.564e-05 s, 78.0 kB/s
+2 bytes copied, 2.684e-05 s, 74.5 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
@@ -302908,7 +304388,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 0.00143301 s, 2.8 kB/s
+4 bytes copied, 0.00150876 s, 2.7 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
@@ -302943,10 +304423,10 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 3.78e-05 s, 106 kB/s
+4 bytes copied, 3.768e-05 s, 106 kB/s
 4+0 records in
 4+0 records out
-4 bytes copied, 2.72e-05 s, 147 kB/s
+4 bytes copied, 3.38e-05 s, 118 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
@@ -302969,7 +304449,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 3.376e-05 s, 118 kB/s
+4 bytes copied, 3.596e-05 s, 111 kB/s
 fatal: offset beyond end of packfile (truncated pack?)
 fatal: offset beyond end of packfile (truncated pack?)
 ok 5 - bogus object offset (v1)
@@ -302983,7 +304463,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 3.096e-05 s, 129 kB/s
+4 bytes copied, 3.08e-05 s, 130 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)
@@ -302997,7 +304477,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 3.724e-05 s, 107 kB/s
+4 bytes copied, 3.608e-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
@@ -303028,10 +304508,10 @@
 
 1084+0 records in
 1084+0 records out
-1084 bytes (1.1 kB, 1.1 KiB) copied, 0.000792325 s, 1.4 MB/s
+1084 bytes (1.1 kB, 1.1 KiB) copied, 0.00079064 s, 1.4 MB/s
 40+0 records in
 40+0 records out
-40 bytes copied, 5.2521e-05 s, 762 kB/s
+40 bytes copied, 5.812e-05 s, 688 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
@@ -303058,7 +304538,7 @@
 
 2+0 records in
 2+0 records out
-2 bytes copied, 0.00711753 s, 0.3 kB/s
+2 bytes copied, 3.884e-05 s, 51.5 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
@@ -303067,59 +304547,116 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5314-pack-cycle-detection.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
+*** t5315-pack-objects-compression.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5315-pack-objects-compression/.git/
+expecting success of 5315.1 'setup': 
+	printf "%2000000s" X |
+	git hash-object -w --stdin >object-name &&
+	# make sure it resulted in a loose object
+	ob=$(sed -e "s/\(..\).*/\1/" object-name) &&
+	ject=$(sed -e "s/..\(.*\)/\1/" object-name) &&
+	test -f .git/objects/$ob/$ject
 
-		# ...whereas dummy should be short, because we do not want
-		# deltas that would create duplicates when we --fix-thin
-		echo $i >dummy &&
+ok 1 - setup
 
-		git add file dummy &&
-		test_tick &&
-		git commit -m $i ||
-		return 1
-	done &&
+expecting success of 5315.2 'pack-objects with -c core.compression=0': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+914337c67e9cd1ab74ffb73c96318b9e5409e0b1
+ok 2 - pack-objects with -c core.compression=0
 
-	make_pack HEAD^ HEAD &&
-	make_pack HEAD HEAD^
+expecting success of 5315.3 'pack-objects with -c core.compression=9': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+deee478811b863f9bb7b87717ddca65a1d6c6e18
+ok 3 - pack-objects with -c core.compression=9
 
-[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 5315.4 'pack-objects with -c core.compression=0 -c pack.compression=0': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+914337c67e9cd1ab74ffb73c96318b9e5409e0b1
+ok 4 - pack-objects with -c core.compression=0 -c pack.compression=0
 
-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 5315.5 'pack-objects with -c core.compression=9 -c pack.compression=0': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+914337c67e9cd1ab74ffb73c96318b9e5409e0b1
+ok 5 - pack-objects with -c core.compression=9 -c pack.compression=0
 
-	# 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
+expecting success of 5315.6 'pack-objects with -c core.compression=0 -c pack.compression=9': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+deee478811b863f9bb7b87717ddca65a1d6c6e18
+ok 6 - pack-objects with -c core.compression=0 -c pack.compression=9
 
-ok 2 - repack
+expecting success of 5315.7 'pack-objects with -c core.compression=9 -c pack.compression=9': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+deee478811b863f9bb7b87717ddca65a1d6c6e18
+ok 7 - pack-objects with -c core.compression=9 -c pack.compression=9
 
-# passed all 2 test(s)
-1..2
+expecting success of 5315.8 'pack-objects with -c pack.compression=0': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+914337c67e9cd1ab74ffb73c96318b9e5409e0b1
+ok 8 - pack-objects with -c pack.compression=0
+
+expecting success of 5315.9 'pack-objects with -c pack.compression=9': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+deee478811b863f9bb7b87717ddca65a1d6c6e18
+ok 9 - pack-objects with -c pack.compression=9
+
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5304-prune.sh ***
@@ -303593,609 +305130,6 @@
 1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5004-archive-corner-cases.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5004-archive-corner-cases/.git/
-expecting success of 5004.1 'create commit with empty tree and fake empty tar': 
-	git commit --allow-empty -m foo &&
-	perl -e "print \"\\0\" x 10240" >10knuls.tar
-
-[master (root-commit) 2093db0] foo
- Author: A U Thor <author@example.com>
-ok 1 - create commit with empty tree and fake empty tar
-
-expecting success of 5004.2 'tar archive of commit with empty tree': 
-	git archive --format=tar HEAD >empty-with-pax-header.tar &&
-	make_dir extract &&
-	"$TAR" xf empty-with-pax-header.tar -C extract &&
-	check_dir extract
-
-ok 2 - tar archive of commit with empty tree
-
-expecting success of 5004.3 'tar archive of empty tree is empty': 
-	git archive --format=tar HEAD: >empty.tar &&
-	test_cmp_bin 10knuls.tar empty.tar
-
-ok 3 - tar archive of empty tree is empty
-
-expecting success of 5004.4 'tar archive of empty tree with prefix': 
-	git archive --format=tar --prefix=foo/ HEAD >prefix.tar &&
-	make_dir extract &&
-	"$TAR" xf prefix.tar -C extract &&
-	check_dir extract foo
-
-ok 4 - tar archive of empty tree with prefix
-
-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 5004.5 'zip archive of empty tree is empty': 
-	# Detect the exit code produced when our particular flavor of unzip
-	# sees an empty archive. Infozip will generate a warning and exit with
-	# code 1. But in the name of sanity, we do not expect other unzip
-	# implementations to do the same thing (it would be perfectly
-	# reasonable to exit 0, for example).
-	#
-	# This makes our test less rigorous on some platforms (unzip may not
-	# handle the empty repo at all, making our later check of its exit code
-	# a no-op). But we cannot do anything reasonable except skip the test
-	# on such platforms anyway, and this is the moral equivalent.
-	{
-		"$GIT_UNZIP" "$TEST_DIRECTORY"/t5004/empty.zip
-		expect_code=$?
-	} &&
-
-	git archive --format=zip HEAD >empty.zip &&
-	make_dir extract &&
-	(
-		cd extract &&
-		test_expect_code $expect_code "$GIT_UNZIP" ../empty.zip
-	) &&
-	check_dir extract
-
-Archive:  /build/reproducible-path/git-2.51.0/t/t5004/empty.zip
-fc8e0d59c1cc5c14b6919fb2006b27fe337e7d0e
-warning [/build/reproducible-path/git-2.51.0/t/t5004/empty.zip]:  zipfile is empty
-Archive:  ../empty.zip
-2093db06f424f426e05da2ca90f40d2663e89387
-warning [../empty.zip]:  zipfile is empty
-ok 5 - zip archive of empty tree is empty
-
-expecting success of 5004.6 'zip archive of empty tree with prefix': 
-	# We do not have to play exit-code tricks here, because our
-	# result should not be empty; it has a directory in it.
-	git archive --format=zip --prefix=foo/ HEAD >prefix.zip &&
-	make_dir extract &&
-	(
-		cd extract &&
-		"$GIT_UNZIP" ../prefix.zip
-	) &&
-	check_dir extract foo
-
-Archive:  ../prefix.zip
-2093db06f424f426e05da2ca90f40d2663e89387
-   creating: foo/
-ok 6 - zip archive of empty tree with prefix
-
-expecting success of 5004.7 'archive complains about pathspec on empty tree': 
-	test_must_fail git archive --format=tar HEAD -- foo >/dev/null
-
-fatal: pathspec 'foo' did not match any files
-ok 7 - archive complains about pathspec on empty tree
-
-expecting success of 5004.8 'create a commit with an empty subtree': 
-	empty_tree=$(git hash-object -t tree /dev/null) &&
-	root_tree=$(printf "040000 tree $empty_tree\tsub\n" | git mktree)
-
-ok 8 - create a commit with an empty subtree
-
-expecting success of 5004.9 'archive empty subtree with no pathspec': 
-	git archive --format=tar $root_tree >subtree-all.tar &&
-	test_cmp_bin 10knuls.tar subtree-all.tar
-
-ok 9 - archive empty subtree with no pathspec
-
-expecting success of 5004.10 'archive empty subtree by direct pathspec': 
-	git archive --format=tar $root_tree -- sub >subtree-path.tar &&
-	test_cmp_bin 10knuls.tar subtree-path.tar
-
-ok 10 - archive empty subtree by direct pathspec
-
-checking prerequisite: ZIPINFO
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-ZIPINFO" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-ZIPINFO" &&
-	n=$("$ZIPINFO" "$TEST_DIRECTORY"/t5004/empty.zip | sed -n "2s/.* //p")
-	test "x$n" = "x0"
-
-)
-prerequisite ZIPINFO ok
-expecting success of 5004.11 'zip archive with many entries': 
-	# add a directory with 256 files
-	mkdir 00 &&
-	for a in 0 1 2 3 4 5 6 7 8 9 a b c d e f
-	do
-		for b in 0 1 2 3 4 5 6 7 8 9 a b c d e f
-		do
-			: >00/$a$b || return 1
-		done
-	done &&
-	git add 00 &&
-	git commit -m "256 files in 1 directory" &&
-
-	# duplicate it to get 65536 files in 256 directories
-	subtree=$(git write-tree --prefix=00/) &&
-	for c in 0 1 2 3 4 5 6 7 8 9 a b c d e f
-	do
-		for d in 0 1 2 3 4 5 6 7 8 9 a b c d e f
-		do
-			echo "040000 tree $subtree	$c$d" || return 1
-		done
-	done >tree &&
-	tree=$(git mktree <tree) &&
-
-	# zip them
-	git archive -o many.zip $tree &&
-
-	# check the number of entries in the ZIP file directory
-	expr 65536 + 256 >expect &&
-	"$ZIPINFO" -h many.zip >zipinfo &&
-	sed -n "2s/.* //p" <zipinfo >actual &&
-	test_cmp expect actual
-
-[master 3c2fce3] 256 files in 1 directory
- Author: A U Thor <author@example.com>
- 256 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 00/00
- create mode 100644 00/01
- create mode 100644 00/02
- create mode 100644 00/03
- create mode 100644 00/04
- create mode 100644 00/05
- create mode 100644 00/06
- create mode 100644 00/07
- create mode 100644 00/08
- create mode 100644 00/09
- create mode 100644 00/0a
- create mode 100644 00/0b
- create mode 100644 00/0c
- create mode 100644 00/0d
- create mode 100644 00/0e
- create mode 100644 00/0f
- create mode 100644 00/10
- create mode 100644 00/11
- create mode 100644 00/12
- create mode 100644 00/13
- create mode 100644 00/14
- create mode 100644 00/15
- create mode 100644 00/16
- create mode 100644 00/17
- create mode 100644 00/18
- create mode 100644 00/19
- create mode 100644 00/1a
- create mode 100644 00/1b
- create mode 100644 00/1c
- create mode 100644 00/1d
- create mode 100644 00/1e
- create mode 100644 00/1f
- create mode 100644 00/20
- create mode 100644 00/21
- create mode 100644 00/22
- create mode 100644 00/23
- create mode 100644 00/24
- create mode 100644 00/25
- create mode 100644 00/26
- create mode 100644 00/27
- create mode 100644 00/28
- create mode 100644 00/29
- create mode 100644 00/2a
- create mode 100644 00/2b
- create mode 100644 00/2c
- create mode 100644 00/2d
- create mode 100644 00/2e
- create mode 100644 00/2f
- create mode 100644 00/30
- create mode 100644 00/31
- create mode 100644 00/32
- create mode 100644 00/33
- create mode 100644 00/34
- create mode 100644 00/35
- create mode 100644 00/36
- create mode 100644 00/37
- create mode 100644 00/38
- create mode 100644 00/39
- create mode 100644 00/3a
- create mode 100644 00/3b
- create mode 100644 00/3c
- create mode 100644 00/3d
- create mode 100644 00/3e
- create mode 100644 00/3f
- create mode 100644 00/40
- create mode 100644 00/41
- create mode 100644 00/42
- create mode 100644 00/43
- create mode 100644 00/44
- create mode 100644 00/45
- create mode 100644 00/46
- create mode 100644 00/47
- create mode 100644 00/48
- create mode 100644 00/49
- create mode 100644 00/4a
- create mode 100644 00/4b
- create mode 100644 00/4c
- create mode 100644 00/4d
- create mode 100644 00/4e
- create mode 100644 00/4f
- create mode 100644 00/50
- create mode 100644 00/51
- create mode 100644 00/52
- create mode 100644 00/53
- create mode 100644 00/54
- create mode 100644 00/55
- create mode 100644 00/56
- create mode 100644 00/57
- create mode 100644 00/58
- create mode 100644 00/59
- create mode 100644 00/5a
- create mode 100644 00/5b
- create mode 100644 00/5c
- create mode 100644 00/5d
- create mode 100644 00/5e
- create mode 100644 00/5f
- create mode 100644 00/60
- create mode 100644 00/61
- create mode 100644 00/62
- create mode 100644 00/63
- create mode 100644 00/64
- create mode 100644 00/65
- create mode 100644 00/66
- create mode 100644 00/67
- create mode 100644 00/68
- create mode 100644 00/69
- create mode 100644 00/6a
- create mode 100644 00/6b
- create mode 100644 00/6c
- create mode 100644 00/6d
- create mode 100644 00/6e
- create mode 100644 00/6f
- create mode 100644 00/70
- create mode 100644 00/71
- create mode 100644 00/72
- create mode 100644 00/73
- create mode 100644 00/74
- create mode 100644 00/75
- create mode 100644 00/76
- create mode 100644 00/77
- create mode 100644 00/78
- create mode 100644 00/79
- create mode 100644 00/7a
- create mode 100644 00/7b
- create mode 100644 00/7c
- create mode 100644 00/7d
- create mode 100644 00/7e
- create mode 100644 00/7f
- create mode 100644 00/80
- create mode 100644 00/81
- create mode 100644 00/82
- create mode 100644 00/83
- create mode 100644 00/84
- create mode 100644 00/85
- create mode 100644 00/86
- create mode 100644 00/87
- create mode 100644 00/88
- create mode 100644 00/89
- create mode 100644 00/8a
- create mode 100644 00/8b
- create mode 100644 00/8c
- create mode 100644 00/8d
- create mode 100644 00/8e
- create mode 100644 00/8f
- create mode 100644 00/90
- create mode 100644 00/91
- create mode 100644 00/92
- create mode 100644 00/93
- create mode 100644 00/94
- create mode 100644 00/95
- create mode 100644 00/96
- create mode 100644 00/97
- create mode 100644 00/98
- create mode 100644 00/99
- create mode 100644 00/9a
- create mode 100644 00/9b
- create mode 100644 00/9c
- create mode 100644 00/9d
- create mode 100644 00/9e
- create mode 100644 00/9f
- create mode 100644 00/a0
- create mode 100644 00/a1
- create mode 100644 00/a2
- create mode 100644 00/a3
- create mode 100644 00/a4
- create mode 100644 00/a5
- create mode 100644 00/a6
- create mode 100644 00/a7
- create mode 100644 00/a8
- create mode 100644 00/a9
- create mode 100644 00/aa
- create mode 100644 00/ab
- create mode 100644 00/ac
- create mode 100644 00/ad
- create mode 100644 00/ae
- create mode 100644 00/af
- create mode 100644 00/b0
- create mode 100644 00/b1
- create mode 100644 00/b2
- create mode 100644 00/b3
- create mode 100644 00/b4
- create mode 100644 00/b5
- create mode 100644 00/b6
- create mode 100644 00/b7
- create mode 100644 00/b8
- create mode 100644 00/b9
- create mode 100644 00/ba
- create mode 100644 00/bb
- create mode 100644 00/bc
- create mode 100644 00/bd
- create mode 100644 00/be
- create mode 100644 00/bf
- create mode 100644 00/c0
- create mode 100644 00/c1
- create mode 100644 00/c2
- create mode 100644 00/c3
- create mode 100644 00/c4
- create mode 100644 00/c5
- create mode 100644 00/c6
- create mode 100644 00/c7
- create mode 100644 00/c8
- create mode 100644 00/c9
- create mode 100644 00/ca
- create mode 100644 00/cb
- create mode 100644 00/cc
- create mode 100644 00/cd
- create mode 100644 00/ce
- create mode 100644 00/cf
- create mode 100644 00/d0
- create mode 100644 00/d1
- create mode 100644 00/d2
- create mode 100644 00/d3
- create mode 100644 00/d4
- create mode 100644 00/d5
- create mode 100644 00/d6
- create mode 100644 00/d7
- create mode 100644 00/d8
- create mode 100644 00/d9
- create mode 100644 00/da
- create mode 100644 00/db
- create mode 100644 00/dc
- create mode 100644 00/dd
- create mode 100644 00/de
- create mode 100644 00/df
- create mode 100644 00/e0
- create mode 100644 00/e1
- create mode 100644 00/e2
- create mode 100644 00/e3
- create mode 100644 00/e4
- create mode 100644 00/e5
- create mode 100644 00/e6
- create mode 100644 00/e7
- create mode 100644 00/e8
- create mode 100644 00/e9
- create mode 100644 00/ea
- create mode 100644 00/eb
- create mode 100644 00/ec
- create mode 100644 00/ed
- create mode 100644 00/ee
- create mode 100644 00/ef
- create mode 100644 00/f0
- create mode 100644 00/f1
- create mode 100644 00/f2
- create mode 100644 00/f3
- create mode 100644 00/f4
- create mode 100644 00/f5
- create mode 100644 00/f6
- create mode 100644 00/f7
- create mode 100644 00/f8
- create mode 100644 00/f9
- create mode 100644 00/fa
- create mode 100644 00/fb
- create mode 100644 00/fc
- create mode 100644 00/fd
- create mode 100644 00/fe
- create mode 100644 00/ff
-ok 11 - zip archive with many entries
-
-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
-checking prerequisite: UNZIP_ZIP64_SUPPORT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_ZIP64_SUPPORT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_ZIP64_SUPPORT" &&
-	"$GIT_UNZIP" -v | grep ZIP64_SUPPORT
-
-)
-        ZIP64_SUPPORT (archives using Zip64 for large files supported)
-prerequisite UNZIP_ZIP64_SUPPORT ok
-ok 12 # skip zip archive bigger than 4GB (missing EXPENSIVE of EXPENSIVE,UNZIP,UNZIP_ZIP64_SUPPORT)
-
-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
-ok 13 # skip zip archive with files bigger than 4GB (missing EXPENSIVE of EXPENSIVE,LONG_IS_64BIT,UNZIP,UNZIP_ZIP64_SUPPORT,ZIPINFO)
-
-expecting success of 5004.14 'tar archive with long paths': 
-	blob=$(echo foo | git hash-object -w --stdin) &&
-	tree=$(build_tree $blob | git mktree) &&
-	git archive -o long_paths.tar $tree
-
-ok 14 - tar archive with long paths
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5315-pack-objects-compression.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5315-pack-objects-compression/.git/
-expecting success of 5315.1 'setup': 
-	printf "%2000000s" X |
-	git hash-object -w --stdin >object-name &&
-	# make sure it resulted in a loose object
-	ob=$(sed -e "s/\(..\).*/\1/" object-name) &&
-	ject=$(sed -e "s/..\(.*\)/\1/" object-name) &&
-	test -f .git/objects/$ob/$ject
-
-ok 1 - setup
-
-expecting success of 5315.2 'pack-objects with -c core.compression=0': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-914337c67e9cd1ab74ffb73c96318b9e5409e0b1
-ok 2 - pack-objects with -c core.compression=0
-
-expecting success of 5315.3 'pack-objects with -c core.compression=9': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-deee478811b863f9bb7b87717ddca65a1d6c6e18
-ok 3 - pack-objects with -c core.compression=9
-
-expecting success of 5315.4 'pack-objects with -c core.compression=0 -c pack.compression=0': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-914337c67e9cd1ab74ffb73c96318b9e5409e0b1
-ok 4 - pack-objects with -c core.compression=0 -c pack.compression=0
-
-expecting success of 5315.5 'pack-objects with -c core.compression=9 -c pack.compression=0': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-914337c67e9cd1ab74ffb73c96318b9e5409e0b1
-ok 5 - pack-objects with -c core.compression=9 -c pack.compression=0
-
-expecting success of 5315.6 'pack-objects with -c core.compression=0 -c pack.compression=9': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-deee478811b863f9bb7b87717ddca65a1d6c6e18
-ok 6 - pack-objects with -c core.compression=0 -c pack.compression=9
-
-expecting success of 5315.7 'pack-objects with -c core.compression=9 -c pack.compression=9': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-deee478811b863f9bb7b87717ddca65a1d6c6e18
-ok 7 - pack-objects with -c core.compression=9 -c pack.compression=9
-
-expecting success of 5315.8 'pack-objects with -c pack.compression=0': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-914337c67e9cd1ab74ffb73c96318b9e5409e0b1
-ok 8 - pack-objects with -c pack.compression=0
-
-expecting success of 5315.9 'pack-objects with -c pack.compression=9': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-deee478811b863f9bb7b87717ddca65a1d6c6e18
-ok 9 - pack-objects with -c pack.compression=9
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5321-pack-large-objects.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5321-pack-large-objects/.git/
 expecting success of 5321.1 'setup': 
@@ -304353,144 +305287,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5320-delta-islands.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4137-apply-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4137-apply-submodule/.git/
 expecting success of 4137.1 'apply_index: added submodule creates empty directory': 
@@ -304930,9 +305726,9 @@
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
 warning: unable to rmdir 'sub1': Directory not empty
-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.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
 ok 12 - apply_index: modified submodule does not update submodule work tree to invalid commit
 
 expecting success of 4137.13 'apply_index: modified submodule does not update submodule work tree from invalid commit': 
@@ -305408,6 +306204,144 @@
 1..28
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5320-delta-islands.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5322-pack-objects-sparse.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5322-pack-objects-sparse/.git/
 expecting success of 5322.1 'setup repo': 
@@ -306513,7 +307447,7 @@
 68c6c8c8538900694c32380ac1484201c8b60d8d
 4+0 records in
 4+0 records out
-4 bytes copied, 3.44e-05 s, 116 kB/s
+4 bytes copied, 3.464e-05 s, 115 kB/s
 fatal: sha1 file '.git/objects/pack/pack-68c6c8c8538900694c32380ac1484201c8b60d8d.rev' validation error
 ok 4 - index-pack can verify reverse indexes
 
@@ -306646,7 +307580,7 @@
 
 5+0 records in
 5+0 records out
-5 bytes copied, 0.0026069 s, 1.9 kB/s
+5 bytes copied, 4.072e-05 s, 123 kB/s
 error: invalid checksum
 ok 12 - fsck catches invalid checksum
 
@@ -306656,7 +307590,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.612e-05 s, 27.7 kB/s
+1 byte copied, 3.264e-05 s, 30.6 kB/s
 error: invalid rev-index position at 0: 1 != 1793
 ok 13 - fsck catches invalid row position
 
@@ -306666,7 +307600,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.0026879 s, 0.4 kB/s
+1 byte copied, 3.14e-05 s, 31.8 kB/s
 error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unknown signature
 ok 14 - fsck catches invalid header: magic number
 
@@ -306676,7 +307610,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.248e-05 s, 30.8 kB/s
+1 byte copied, 3.284e-05 s, 30.5 kB/s
 error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unsupported version 2
 ok 15 - fsck catches invalid header: version
 
@@ -306686,7 +307620,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.86e-05 s, 25.9 kB/s
+1 byte copied, 3.576e-05 s, 28.0 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
 
@@ -306982,17 +307916,17 @@
 3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc
 c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0
 total 36
-drwxr-xr-x  2 pbuilder1 pbuilder1  220 Aug 27 08:21 .
-drwxr-xr-x 13 pbuilder1 pbuilder1  260 Aug 27 08:21 ..
--r--r--r--  1 pbuilder1 pbuilder1 1156 Aug 27 08:21 pack-A-794781495799da912f5473db27abed9641406f96.idx
--r--r--r--  1 pbuilder1 pbuilder1  210 Aug 27 08:21 pack-A-794781495799da912f5473db27abed9641406f96.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Aug 27 08:21 pack-A-794781495799da912f5473db27abed9641406f96.rev
--r--r--r--  1 pbuilder1 pbuilder1 1156 Aug 27 08:21 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.idx
--r--r--r--  1 pbuilder1 pbuilder1  267 Aug 27 08:21 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Aug 27 08:21 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.rev
--r--r--r--  1 pbuilder1 pbuilder1 1156 Aug 27 08:21 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.idx
--r--r--r--  1 pbuilder1 pbuilder1  292 Aug 27 08:21 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Aug 27 08:21 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.rev
+drwxr-xr-x  2 pbuilder2 pbuilder2  220 Sep 29 14:52 .
+drwxr-xr-x 13 pbuilder2 pbuilder2  260 Sep 29 14:52 ..
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Sep 29 14:52 pack-A-794781495799da912f5473db27abed9641406f96.idx
+-r--r--r--  1 pbuilder2 pbuilder2  210 Sep 29 14:52 pack-A-794781495799da912f5473db27abed9641406f96.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Sep 29 14:52 pack-A-794781495799da912f5473db27abed9641406f96.rev
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Sep 29 14:52 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.idx
+-r--r--r--  1 pbuilder2 pbuilder2  267 Sep 29 14:52 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Sep 29 14:52 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.rev
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Sep 29 14:52 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.idx
+-r--r--r--  1 pbuilder2 pbuilder2  292 Sep 29 14:52 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Sep 29 14:52 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.rev
 ok 1 - setup for --stdin-packs tests
 
 expecting success of 5331.2 '--stdin-packs with excluded packs': 
@@ -307082,24 +308016,24 @@
  create mode 100644 D.t
 ac8103895b4f6d2ce5bec819104ee1f531ccbfb9
 total 60
-drwxr-xr-x 3 pbuilder1 pbuilder1  360 Aug 27 08:21 .
-drwxr-xr-x 4 pbuilder1 pbuilder1   80 Aug 27 08:21 ..
-drwxr-xr-x 7 pbuilder1 pbuilder1  240 Aug 27 08:21 .git
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Aug 27 08:21 A.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Aug 27 08:21 B.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Aug 27 08:21 C.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Aug 27 08:21 D.t
--rw-r--r-- 1 pbuilder1 pbuilder1  246 Aug 27 08:21 actual
--rw-r--r-- 1 pbuilder1 pbuilder1  335 Aug 27 08:21 actual.raw
--rw-r--r-- 1 pbuilder1 pbuilder1   55 Aug 27 08:21 err
--rw-r--r-- 1 pbuilder1 pbuilder1  246 Aug 27 08:21 expect
--rw-r--r-- 1 pbuilder1 pbuilder1  457 Aug 27 08:21 expect.raw
--r--r--r-- 1 pbuilder1 pbuilder1 1240 Aug 27 08:21 test-d79f0a91fe88b889c156c95980949119173ad813.idx
--r--r--r-- 1 pbuilder1 pbuilder1  470 Aug 27 08:21 test-d79f0a91fe88b889c156c95980949119173ad813.pack
--r--r--r-- 1 pbuilder1 pbuilder1   76 Aug 27 08:21 test-d79f0a91fe88b889c156c95980949119173ad813.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1324 Aug 27 08:21 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.idx
--r--r--r-- 1 pbuilder1 pbuilder1  693 Aug 27 08:21 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.pack
--r--r--r-- 1 pbuilder1 pbuilder1   88 Aug 27 08:21 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.rev
+drwxr-xr-x 3 pbuilder2 pbuilder2  360 Sep 29 14:52 .
+drwxr-xr-x 4 pbuilder2 pbuilder2   80 Sep 29 14:52 ..
+drwxr-xr-x 7 pbuilder2 pbuilder2  240 Sep 29 14:52 .git
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Sep 29 14:52 A.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Sep 29 14:52 B.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Sep 29 14:52 C.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Sep 29 14:52 D.t
+-rw-r--r-- 1 pbuilder2 pbuilder2  246 Sep 29 14:52 actual
+-rw-r--r-- 1 pbuilder2 pbuilder2  335 Sep 29 14:52 actual.raw
+-rw-r--r-- 1 pbuilder2 pbuilder2   55 Sep 29 14:52 err
+-rw-r--r-- 1 pbuilder2 pbuilder2  246 Sep 29 14:52 expect
+-rw-r--r-- 1 pbuilder2 pbuilder2  457 Sep 29 14:52 expect.raw
+-r--r--r-- 1 pbuilder2 pbuilder2 1240 Sep 29 14:52 test-d79f0a91fe88b889c156c95980949119173ad813.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  470 Sep 29 14:52 test-d79f0a91fe88b889c156c95980949119173ad813.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   76 Sep 29 14:52 test-d79f0a91fe88b889c156c95980949119173ad813.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1324 Sep 29 14:52 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  693 Sep 29 14:52 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   88 Sep 29 14:52 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.rev
 ok 5 - --stdin-packs with loose objects
 
 expecting success of 5331.6 '--stdin-packs with broken links': 
@@ -308449,8 +309383,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":"20250827T082130.862794Z-Hcf858c9d-P000972cd","thread":"main","time":"2025-08-27T08:21:30.871402Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.008813,"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":"20250827T082130.905115Z-Hcf858c9d-P00097310","thread":"main","time":"2025-08-27T08:21:30.907569Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002658,"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}}
+{"event":"data_json","sid":"20260929T145244.491012Z-H5c947e1c-P0022b34e","thread":"main","time":"2026-09-29T14:52:44.495817Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.005019,"t_rel":0.000021,"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":"20260929T145244.504180Z-H5c947e1c-P0022b383","thread":"main","time":"2026-09-29T14:52:44.510522Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.006546,"t_rel":0.000015,"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': 
@@ -308553,9 +309487,9 @@
  create mode 100644 foo.txt
  create mode 100644 foo/bar
  create mode 100644 mode/script.sh
-{"event":"data_json","sid":"20250827T082130.954771Z-Hcf858c9d-P000973bd","thread":"main","time":"2025-08-27T08:21:30.957475Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002923,"t_rel":0.000027,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":10}}
-{"event":"data","sid":"20250827T082130.954771Z-Hcf858c9d-P000973bd","thread":"main","time":"2025-08-27T08:21:30.956360Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001806,"t_rel":0.001806,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250827T082130.954771Z-Hcf858c9d-P000973bd","thread":"main","time":"2025-08-27T08:21:30.956389Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001838,"t_rel":0.001838,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"1"}
+{"event":"data_json","sid":"20260929T145244.570442Z-H5c947e1c-P0022b48a","thread":"main","time":"2026-09-29T14:52:44.572388Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002178,"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":"20260929T145244.570442Z-H5c947e1c-P0022b48a","thread":"main","time":"2026-09-29T14:52:44.572221Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002008,"t_rel":0.002008,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260929T145244.570442Z-H5c947e1c-P0022b48a","thread":"main","time":"2026-09-29T14:52:44.572250Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002041,"t_rel":0.002041,"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(-)
@@ -308564,12 +309498,12 @@
  create mode 100644 foo
  delete mode 100644 foo/bar
  mode change 100644 => 100755 mode/script.sh
-{"event":"data_json","sid":"20250827T082131.094570Z-Hcf858c9d-P00097519","thread":"main","time":"2025-08-27T08:21:31.101652Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.007301,"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":"20250827T082131.094570Z-Hcf858c9d-P00097519","thread":"main","time":"2025-08-27T08:21:31.101484Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.007130,"t_rel":0.007130,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20250827T082131.094570Z-Hcf858c9d-P00097519","thread":"main","time":"2025-08-27T08:21:31.101515Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.007165,"t_rel":0.007165,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"2"}
-{"event":"data_json","sid":"20250827T082131.242569Z-Hcf858c9d-P00097697","thread":"main","time":"2025-08-27T08:21:31.244541Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002193,"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":"20250827T082131.242569Z-Hcf858c9d-P00097697","thread":"main","time":"2025-08-27T08:21:31.244368Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002018,"t_rel":0.002018,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20250827T082131.242569Z-Hcf858c9d-P00097697","thread":"main","time":"2025-08-27T08:21:31.244395Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002047,"t_rel":0.002047,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data_json","sid":"20260929T145244.711264Z-H5c947e1c-P0022b697","thread":"main","time":"2026-09-29T14:52:44.713260Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002205,"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":"20260929T145244.711264Z-H5c947e1c-P0022b697","thread":"main","time":"2026-09-29T14:52:44.713106Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002047,"t_rel":0.002047,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20260929T145244.711264Z-H5c947e1c-P0022b697","thread":"main","time":"2026-09-29T14:52:44.713133Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002079,"t_rel":0.002079,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"2"}
+{"event":"data_json","sid":"20260929T145244.846285Z-H5c947e1c-P0022b85e","thread":"main","time":"2026-09-29T14:52:44.848234Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002146,"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":"20260929T145244.846285Z-H5c947e1c-P0022b85e","thread":"main","time":"2026-09-29T14:52:44.848074Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001983,"t_rel":0.001983,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20260929T145244.846285Z-H5c947e1c-P0022b85e","thread":"main","time":"2026-09-29T14:52:44.848102Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002014,"t_rel":0.002014,"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': 
@@ -308591,10 +309525,10 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4216-log-bloom/empty/.git/
 [main (root-commit) 9c26810] initial commit
  Author: A U Thor <author@example.com>
-{"event":"data","sid":"20250827T082131.446437Z-Hcf858c9d-P00097843","thread":"main","time":"2025-08-27T08:21:31.447972Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001746,"t_rel":0.001746,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250827T082131.446437Z-Hcf858c9d-P00097843","thread":"main","time":"2025-08-27T08:21:31.447989Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001765,"t_rel":0.001765,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"0"}
-{"event":"data","sid":"20250827T082131.446437Z-Hcf858c9d-P00097843","thread":"main","time":"2025-08-27T08:21:31.447994Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001771,"t_rel":0.001771,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"1"}
-{"event":"data","sid":"20250827T082131.446437Z-Hcf858c9d-P00097843","thread":"main","time":"2025-08-27T08:21:31.447999Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001775,"t_rel":0.001775,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20260929T145244.986720Z-H5c947e1c-P0022ba27","thread":"main","time":"2026-09-29T14:52:44.988341Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001831,"t_rel":0.001831,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260929T145244.986720Z-H5c947e1c-P0022ba27","thread":"main","time":"2026-09-29T14:52:44.988359Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001852,"t_rel":0.001852,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"0"}
+{"event":"data","sid":"20260929T145244.986720Z-H5c947e1c-P0022ba27","thread":"main","time":"2026-09-29T14:52:44.988366Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001859,"t_rel":0.001859,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"1"}
+{"event":"data","sid":"20260929T145244.986720Z-H5c947e1c-P0022ba27","thread":"main","time":"2026-09-29T14:52:44.988371Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001864,"t_rel":0.001864,"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': 
@@ -308626,10 +309560,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 no-filter
-{"event":"data","sid":"20250827T082131.582532Z-Hcf858c9d-P0009797a","thread":"main","time":"2025-08-27T08:21:31.584301Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001964,"t_rel":0.001964,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20250827T082131.582532Z-Hcf858c9d-P0009797a","thread":"main","time":"2025-08-27T08:21:31.584317Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001983,"t_rel":0.001983,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"3"}
-{"event":"data","sid":"20250827T082131.582532Z-Hcf858c9d-P0009797a","thread":"main","time":"2025-08-27T08:21:31.584322Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001988,"t_rel":0.001988,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20250827T082131.582532Z-Hcf858c9d-P0009797a","thread":"main","time":"2025-08-27T08:21:31.584327Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001993,"t_rel":0.001993,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20260929T145245.071113Z-H5c947e1c-P0022bb49","thread":"main","time":"2026-09-29T14:52:45.072951Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002041,"t_rel":0.002041,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20260929T145245.071113Z-H5c947e1c-P0022bb49","thread":"main","time":"2026-09-29T14:52:45.072972Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.002065,"t_rel":0.002065,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"3"}
+{"event":"data","sid":"20260929T145245.071113Z-H5c947e1c-P0022bb49","thread":"main","time":"2026-09-29T14:52:45.072977Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.002070,"t_rel":0.002070,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20260929T145245.071113Z-H5c947e1c-P0022bb49","thread":"main","time":"2026-09-29T14:52:45.072981Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002075,"t_rel":0.002075,"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': 
@@ -308648,10 +309582,10 @@
 		test_filter_trunc_large 0 trace.event
 	)
 
-{"event":"data","sid":"20250827T082131.642748Z-Hcf858c9d-P000979fa","thread":"main","time":"2025-08-27T08:21:31.644419Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001871,"t_rel":0.001871,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250827T082131.642748Z-Hcf858c9d-P000979fa","thread":"main","time":"2025-08-27T08:21:31.644435Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001891,"t_rel":0.001891,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20250827T082131.642748Z-Hcf858c9d-P000979fa","thread":"main","time":"2025-08-27T08:21:31.644441Z","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":"0"}
-{"event":"data","sid":"20250827T082131.642748Z-Hcf858c9d-P000979fa","thread":"main","time":"2025-08-27T08:21:31.644445Z","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":"20260929T145245.102992Z-H5c947e1c-P0022bbae","thread":"main","time":"2026-09-29T14:52:45.104774Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001991,"t_rel":0.001991,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260929T145245.102992Z-H5c947e1c-P0022bbae","thread":"main","time":"2026-09-29T14:52:45.104791Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.002011,"t_rel":0.002011,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20260929T145245.102992Z-H5c947e1c-P0022bbae","thread":"main","time":"2026-09-29T14:52:45.104796Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.002016,"t_rel":0.002016,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20260929T145245.102992Z-H5c947e1c-P0022bbae","thread":"main","time":"2026-09-29T14:52:45.104801Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002021,"t_rel":0.002021,"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': 
@@ -308682,10 +309616,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-{"event":"data","sid":"20250827T082131.782206Z-Hcf858c9d-P00097b1a","thread":"main","time":"2025-08-27T08:21:31.786684Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.004691,"t_rel":0.004691,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250827T082131.782206Z-Hcf858c9d-P00097b1a","thread":"main","time":"2025-08-27T08:21:31.786703Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.004714,"t_rel":0.004714,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"1"}
-{"event":"data","sid":"20250827T082131.782206Z-Hcf858c9d-P00097b1a","thread":"main","time":"2025-08-27T08:21:31.786708Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.004719,"t_rel":0.004719,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20250827T082131.782206Z-Hcf858c9d-P00097b1a","thread":"main","time":"2025-08-27T08:21:31.786713Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.004724,"t_rel":0.004724,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20260929T145245.191950Z-H5c947e1c-P0022bcb4","thread":"main","time":"2026-09-29T14:52:45.194556Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002817,"t_rel":0.002817,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260929T145245.191950Z-H5c947e1c-P0022bcb4","thread":"main","time":"2026-09-29T14:52:45.194575Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.002839,"t_rel":0.002839,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"1"}
+{"event":"data","sid":"20260929T145245.191950Z-H5c947e1c-P0022bcb4","thread":"main","time":"2026-09-29T14:52:45.194580Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.002844,"t_rel":0.002844,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20260929T145245.191950Z-H5c947e1c-P0022bcb4","thread":"main","time":"2026-09-29T14:52:45.194585Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002849,"t_rel":0.002849,"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': 
@@ -308717,2029 +309651,449 @@
 		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
 			git commit-graph write --reachable \
 				--changed-paths --max-new-filters=2 &&
-		test_filter_computed 0 trace.event &&
-		test_filter_not_computed 6 trace.event &&
-		test_filter_trunc_empty 0 trace.event &&
-		test_filter_trunc_large 0 trace.event
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4216-log-bloom/empty/.git/
-[main (root-commit) 36bf629] 1
- Author: A U Thor <author@example.com>
-[main 73266b6] 2
- Author: A U Thor <author@example.com>
-[main efbc158] 3
- Author: A U Thor <author@example.com>
-[main f013c5f] 4
- Author: A U Thor <author@example.com>
-[main 29fe1c6] 5
- Author: A U Thor <author@example.com>
-[main 55bcad0] 6
- Author: A U Thor <author@example.com>
-{"event":"data","sid":"20250827T082131.942636Z-Hcf858c9d-P00097c75","thread":"main","time":"2025-08-27T08:21:31.944291Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001859,"t_rel":0.001859,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20250827T082131.942636Z-Hcf858c9d-P00097c75","thread":"main","time":"2025-08-27T08:21:31.944308Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001878,"t_rel":0.001878,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20250827T082131.942636Z-Hcf858c9d-P00097c75","thread":"main","time":"2025-08-27T08:21:31.944313Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001883,"t_rel":0.001883,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20250827T082131.942636Z-Hcf858c9d-P00097c75","thread":"main","time":"2025-08-27T08:21:31.944318Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001888,"t_rel":0.001888,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20250827T082131.964732Z-Hcf858c9d-P00097cb1","thread":"main","time":"2025-08-27T08:21:31.966453Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001953,"t_rel":0.001953,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20250827T082131.964732Z-Hcf858c9d-P00097cb1","thread":"main","time":"2025-08-27T08:21:31.966471Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001974,"t_rel":0.001974,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20250827T082131.964732Z-Hcf858c9d-P00097cb1","thread":"main","time":"2025-08-27T08:21:31.966476Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001979,"t_rel":0.001979,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20250827T082131.964732Z-Hcf858c9d-P00097cb1","thread":"main","time":"2025-08-27T08:21:31.966481Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001984,"t_rel":0.001984,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20250827T082132.000911Z-Hcf858c9d-P00097d08","thread":"main","time":"2025-08-27T08:21:32.002696Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002003,"t_rel":0.002003,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20250827T082132.000911Z-Hcf858c9d-P00097d08","thread":"main","time":"2025-08-27T08:21:32.002715Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.002025,"t_rel":0.002025,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20250827T082132.000911Z-Hcf858c9d-P00097d08","thread":"main","time":"2025-08-27T08:21:32.002720Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.002031,"t_rel":0.002031,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20250827T082132.000911Z-Hcf858c9d-P00097d08","thread":"main","time":"2025-08-27T08:21:32.002725Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002035,"t_rel":0.002035,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20250827T082132.029101Z-Hcf858c9d-P00097d55","thread":"main","time":"2025-08-27T08:21:32.030742Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001817,"t_rel":0.001817,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
-{"event":"data","sid":"20250827T082132.029101Z-Hcf858c9d-P00097d55","thread":"main","time":"2025-08-27T08:21:32.030762Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001839,"t_rel":0.001839,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"6"}
-{"event":"data","sid":"20250827T082132.029101Z-Hcf858c9d-P00097d55","thread":"main","time":"2025-08-27T08:21:32.030767Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001845,"t_rel":0.001845,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20250827T082132.029101Z-Hcf858c9d-P00097d55","thread":"main","time":"2025-08-27T08:21:32.030772Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001850,"t_rel":0.001850,"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': 
-	repo=mixed-bloom-settings &&
-
-	git init $repo &&
-	for i in one two three
-	do
-		test_commit -C $repo $i file || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4216-log-bloom/mixed-bloom-settings/.git/
-[main (root-commit) 756b681] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 55d464c] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main e3ee3ce] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 141 - setup for mixed Bloom setting tests
-
-expecting success of 4216.142 'ensure Bloom filters with incompatible settings are ignored': 
-	# Compute Bloom filters with "unusual" settings.
-	git -C $repo rev-parse one >in &&
-	GIT_TEST_BLOOM_SETTINGS_NUM_HASHES=3 git -C $repo commit-graph write \
-		--stdin-commits --changed-paths --split <in &&
-	layer=$(head -n 1 $repo/$chain) &&
-
-	# A commit-graph layer without Bloom filters "hides" the layers
-	# below ...
-	git -C $repo rev-parse two >in &&
-	git -C $repo commit-graph write --stdin-commits --no-changed-paths \
-		--split=no-merge <in &&
-
-	# Another commit-graph layer that has Bloom filters, but with
-	# standard settings, and is thus incompatible with the base
-	# layer written above.
-	git -C $repo rev-parse HEAD >in &&
-	git -C $repo commit-graph write --stdin-commits --changed-paths \
-		--split=no-merge <in &&
-
-	test_line_count = 3 $repo/$chain &&
-
-	# Ensure that incompatible Bloom filters are ignored.
-	git -C $repo -c core.commitGraph=false log --oneline --no-decorate -- file \
-		>expect 2>err &&
-	git -C $repo log --oneline --no-decorate -- file >actual 2>err &&
-	test_cmp expect actual &&
-	grep "disabling Bloom filters for commit-graph layer .$layer." err
-
-warning: disabling Bloom filters for commit-graph layer '012b593000b4075aa9fd8e011d8d65ec0907d392' due to incompatible settings
-ok 142 - ensure Bloom filters with incompatible settings are ignored
-
-expecting success of 4216.143 'merge graph layers with incompatible Bloom settings': 
-	# Ensure that incompatible Bloom filters are ignored when
-	# merging existing layers.
-	>trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C $repo commit-graph write --reachable --changed-paths 2>err &&
-	grep "disabling Bloom filters for commit-graph layer .$layer." err &&
-	grep "{\"hash_version\":1,\"num_hashes\":7,\"bits_per_entry\":10,\"max_changed_paths\":512" trace2.txt &&
-
-	test_path_is_file $repo/$graph &&
-	test_dir_is_empty $repo/$graphdir &&
-
-	git -C $repo -c core.commitGraph=false log --oneline --no-decorate -- \
-		file >expect &&
-	trace_out="$(pwd)/trace.perf" &&
-	GIT_TRACE2_PERF="$trace_out" \
-		git -C $repo log --oneline --no-decorate -- file >actual 2>err &&
-
-	test_cmp expect actual &&
-	grep "statistics:{\"filter_not_present\":0," trace.perf &&
-	test_must_be_empty err
-
-warning: disabling Bloom filters for commit-graph layer '012b593000b4075aa9fd8e011d8d65ec0907d392' due to incompatible settings
-{"event":"data_json","sid":"20250827T082132.236426Z-Hcf858c9d-P00097f41","thread":"main","time":"2025-08-27T08:21:32.243629Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.007392,"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}}
-08:21:32.276184 revision.c:667               | d0 | main                     | data_json    | r1  |  0.002363 |  0.002363 | 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': 
-	rm "$repo/$graph" &&
-
-	git -C $repo log --oneline --no-decorate -- $CENT >expect &&
-
-	# Compute v1 Bloom filters for commits at the bottom.
-	git -C $repo rev-parse HEAD^ >in &&
-	git -C $repo commit-graph write --stdin-commits --changed-paths \
-		--split <in &&
-
-	# Compute v2 Bloomfilters for the rest of the commits at the top.
-	git -C $repo rev-parse HEAD >in &&
-	git -C $repo -c commitGraph.changedPathsVersion=2 commit-graph write \
-		--stdin-commits --changed-paths --split=no-merge <in &&
-
-	test_line_count = 2 $repo/$chain &&
-
-	git -C $repo log --oneline --no-decorate -- $CENT >actual 2>err &&
-	test_cmp expect actual &&
-
-	layer="$(head -n 1 $repo/$chain)" &&
-	cat >expect.err <<-EOF &&
-	warning: disabling Bloom filters for commit-graph layer $SQ$layer$SQ due to incompatible settings
-	EOF
-	test_cmp expect.err err &&
-
-	# Merge the two layers with incompatible bloom filter versions,
-	# ensuring that the v2 filters are used.
-	>trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C $repo -c commitGraph.changedPathsVersion=2 commit-graph write --reachable --changed-paths 2>err &&
-	grep "disabling Bloom filters for commit-graph layer .$layer." err &&
-	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":"20250827T082132.345486Z-Hcf858c9d-P00098049","thread":"main","time":"2025-08-27T08:21:32.347455Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002163,"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': 
-	git init highbit1 &&
-	test_commit -C highbit1 c1 "$CENT" &&
-	git -C highbit1 commit-graph write --reachable --changed-paths
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4216-log-bloom/highbit1/.git/
-[main (root-commit) 038971c] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\302\242"
-ok 145 - set up repo with high bit path, version 1 changed-path
-
-expecting success of 4216.146 'setup check value of version 1 changed-path': 
-	(
-		cd highbit1 &&
-		echo "52a9" >expect &&
-		get_first_changed_path_filter >actual
-	)
-
-ok 146 - setup check value of version 1 changed-path
-
---- highbit1/expect	2025-08-27 08:21:32.403879149 +0000
-+++ highbit1/actual	2025-08-27 08:21:32.427879307 +0000
-@@ -1 +1 @@
--52a9
-+c01f
-ok 147 # skip check value of version 1 changed-path (missing SIGNED_CHAR_BY_DEFAULT)
-
-expecting success of 4216.148 'setup make another commit': 
-	# "git log" does not use Bloom filters for root commits - see how, in
-	# revision.c, rev_compare_tree() (the only code path that eventually calls
-	# get_bloom_filter()) is only called by try_to_simplify_commit() when the commit
-	# has one parent. Therefore, make another commit so that we perform the tests on
-	# a non-root commit.
-	test_commit -C highbit1 anotherc1 "another$CENT"
-
-[main 3b45161] anotherc1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "another\302\242"
-ok 148 - setup make another commit
-
-expecting success of 4216.149 'version 1 changed-path used when version 1 requested': 
-	(
-		cd highbit1 &&
-		test_bloom_filters_used "-- another$CENT"
-	)
-
-ok 149 - version 1 changed-path used when version 1 requested
-
-expecting success of 4216.150 'version 1 changed-path not used when version 2 requested': 
-	(
-		cd highbit1 &&
-		git config --add commitGraph.changedPathsVersion 2 &&
-		test_bloom_filters_not_used "-- another$CENT"
-	)
-
-ok 150 - version 1 changed-path not used when version 2 requested
-
-expecting success of 4216.151 'version 1 changed-path used when autodetect requested': 
-	(
-		cd highbit1 &&
-		git config --add commitGraph.changedPathsVersion -1 &&
-		test_bloom_filters_used "-- another$CENT"
-	)
-
-ok 151 - version 1 changed-path used when autodetect requested
-
-expecting success of 4216.152 'when writing another commit graph, preserve existing version 1 of changed-path': 
-	test_commit -C highbit1 c1double "$CENT$CENT" &&
-	git -C highbit1 commit-graph write --reachable --changed-paths &&
-	(
-		cd highbit1 &&
-		git config --add commitGraph.changedPathsVersion -1 &&
-		echo "options: bloom(1,10,7) read_generation_data" >expect &&
-		test-tool read-graph >full &&
-		grep options full >actual &&
-		test_cmp expect actual
-	)
-
-[main 8b0508a] c1double
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\302\242\302\242"
-ok 152 - when writing another commit graph, preserve existing version 1 of changed-path
-
-expecting success of 4216.153 'set up repo with high bit path, version 2 changed-path': 
-	git init highbit2 &&
-	git -C highbit2 config --add commitGraph.changedPathsVersion 2 &&
-	test_commit -C highbit2 c2 "$CENT" &&
-	git -C highbit2 commit-graph write --reachable --changed-paths
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4216-log-bloom/highbit2/.git/
-[main (root-commit) bc1f8bf] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\302\242"
-ok 153 - set up repo with high bit path, version 2 changed-path
-
-expecting success of 4216.154 'check value of version 2 changed-path': 
-	(
-		cd highbit2 &&
-		echo "c01f" >expect &&
-		get_first_changed_path_filter >actual &&
-		test_cmp expect actual
-	)
-
-ok 154 - check value of version 2 changed-path
-
-expecting success of 4216.155 'setup make another commit': 
-	# "git log" does not use Bloom filters for root commits - see how, in
-	# revision.c, rev_compare_tree() (the only code path that eventually calls
-	# get_bloom_filter()) is only called by try_to_simplify_commit() when the commit
-	# has one parent. Therefore, make another commit so that we perform the tests on
-	# a non-root commit.
-	test_commit -C highbit2 anotherc2 "another$CENT"
-
-[main 285bfce] anotherc2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "another\302\242"
-ok 155 - setup make another commit
-
-expecting success of 4216.156 'version 2 changed-path used when version 2 requested': 
-	(
-		cd highbit2 &&
-		test_bloom_filters_used "-- another$CENT"
-	)
-
-ok 156 - version 2 changed-path used when version 2 requested
-
-expecting success of 4216.157 'version 2 changed-path not used when version 1 requested': 
-	(
-		cd highbit2 &&
-		git config --add commitGraph.changedPathsVersion 1 &&
-		test_bloom_filters_not_used "-- another$CENT"
-	)
-
-ok 157 - version 2 changed-path not used when version 1 requested
-
-expecting success of 4216.158 'version 2 changed-path used when autodetect requested': 
-	(
-		cd highbit2 &&
-		git config --add commitGraph.changedPathsVersion -1 &&
-		test_bloom_filters_used "-- another$CENT"
-	)
-
-ok 158 - version 2 changed-path used when autodetect requested
-
-expecting success of 4216.159 'when writing another commit graph, preserve existing version 2 of changed-path': 
-	test_commit -C highbit2 c2double "$CENT$CENT" &&
-	git -C highbit2 commit-graph write --reachable --changed-paths &&
-	(
-		cd highbit2 &&
-		git config --add commitGraph.changedPathsVersion -1 &&
-		echo "options: bloom(2,10,7) read_generation_data" >expect &&
-		test-tool read-graph >full &&
-		grep options full >actual &&
-		test_cmp expect actual
-	)
-
-[main 00b3fc0] c2double
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\302\242\302\242"
-ok 159 - when writing another commit graph, preserve existing version 2 of changed-path
-
-expecting success of 4216.160 'when writing commit graph, do not reuse changed-path of another version': 
-	git init doublewrite &&
-	test_commit -C doublewrite c "$CENT" &&
-
-	git -C doublewrite config --add commitGraph.changedPathsVersion 1 &&
-	>trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C doublewrite commit-graph write --reachable --changed-paths &&
-	test_filter_computed 1 trace2.txt &&
-	test_filter_upgraded 0 trace2.txt &&
-
-	git -C doublewrite commit-graph write --reachable --changed-paths &&
-	for v in -2 3
-	do
-		git -C doublewrite config --add commitGraph.changedPathsVersion $v &&
-		git -C doublewrite commit-graph write --reachable --changed-paths 2>err &&
-		cat >expect <<-EOF &&
-		warning: attempting to write a commit-graph, but ${SQ}commitGraph.changedPathsVersion${SQ} ($v) is not supported
-		EOF
-		test_cmp expect err || return 1
-	done &&
-
-	git -C doublewrite config --add commitGraph.changedPathsVersion 2 &&
-	>trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C doublewrite commit-graph write --reachable --changed-paths &&
-	test_filter_computed 1 trace2.txt &&
-	test_filter_upgraded 0 trace2.txt &&
-
-	(
-		cd doublewrite &&
-		echo "c01f" >expect &&
-		get_first_changed_path_filter >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4216-log-bloom/doublewrite/.git/
-[main (root-commit) 6d8aa3d] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\302\242"
-{"event":"data","sid":"20250827T082132.986624Z-Hcf858c9d-P000986c1","thread":"main","time":"2025-08-27T08:21:32.988124Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001689,"t_rel":0.001689,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250827T082132.986624Z-Hcf858c9d-P000986c1","thread":"main","time":"2025-08-27T08:21:32.988154Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.001722,"t_rel":0.001722,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
-{"event":"data","sid":"20250827T082133.076002Z-Hcf858c9d-P00098776","thread":"main","time":"2025-08-27T08:21:33.077582Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001799,"t_rel":0.001799,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250827T082133.076002Z-Hcf858c9d-P00098776","thread":"main","time":"2025-08-27T08:21:33.077615Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.001835,"t_rel":0.001835,"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': 
-	git init upgrade &&
-
-	test_commit -C upgrade base no-high-bits &&
-
-	git -C upgrade config --add commitGraph.changedPathsVersion 1 &&
-	>trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C upgrade commit-graph write --reachable --changed-paths &&
-	test_filter_computed 1 trace2.txt &&
-	test_filter_upgraded 0 trace2.txt &&
-
-	git -C upgrade config --add commitGraph.changedPathsVersion 2 &&
-	>trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C upgrade commit-graph write --reachable --changed-paths &&
-	test_filter_computed 0 trace2.txt &&
-	test_filter_upgraded 1 trace2.txt
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4216-log-bloom/upgrade/.git/
-[main (root-commit) 454ab1d] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 no-high-bits
-{"event":"data","sid":"20250827T082133.150843Z-Hcf858c9d-P00098841","thread":"main","time":"2025-08-27T08:21:33.152263Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001615,"t_rel":0.001615,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250827T082133.150843Z-Hcf858c9d-P00098841","thread":"main","time":"2025-08-27T08:21:33.152294Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.001649,"t_rel":0.001649,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
-{"event":"data","sid":"20250827T082133.209841Z-Hcf858c9d-P000988bd","thread":"main","time":"2025-08-27T08:21:33.211277Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.014285,"t_rel":0.014285,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
-{"event":"data","sid":"20250827T082133.209841Z-Hcf858c9d-P000988bd","thread":"main","time":"2025-08-27T08:21:33.211307Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.014318,"t_rel":0.014318,"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': 
-	check_corrupt_graph BDAT clear 00000000 &&
-	echo "warning: ignoring too-small changed-path chunk" \
-		"(4 < 12) in commit-graph file" >expect.err &&
-	test_cmp expect.err err
-
-ok 162 - Bloom reader notices too-small data chunk
-
-expecting success of 4216.163 'Bloom reader notices out-of-bounds filter offsets': 
-	check_corrupt_graph BIDX 12 FFFFFFFF &&
-	# use grep to avoid depending on exact chunk size
-	grep "warning: ignoring out-of-range offset (4294967295) for changed-path filter at pos 3 of .git/objects/info/commit-graph" err
-
-warning: ignoring out-of-range offset (4294967295) for changed-path filter at pos 3 of .git/objects/info/commit-graph (chunk size: 77)
-warning: ignoring out-of-range offset (4294967295) for changed-path filter at pos 3 of .git/objects/info/commit-graph (chunk size: 77)
-ok 163 - Bloom reader notices out-of-bounds filter offsets
-
-expecting success of 4216.164 'Bloom reader notices too-small index chunk': 
-	# replace the index with a single entry, making most
-	# lookups out-of-bounds
-	check_corrupt_graph BIDX clear 00000000 &&
-	echo "warning: commit-graph changed-path index chunk" \
-		"is too small" >expect.err &&
-	test_cmp expect.err err
-
-ok 164 - Bloom reader notices too-small index chunk
-
-expecting success of 4216.165 'Bloom reader notices out-of-order index offsets': 
-	# we do not know any real offsets, but we can pick
-	# something plausible; we should not get to the point of
-	# actually reading from the bogus offsets anyway.
-	corrupt_graph BIDX 4 0000000c00000005 &&
-	echo "warning: ignoring decreasing changed-path index offsets" \
-		"(12 > 5) for positions 1 and 2 of .git/objects/info/commit-graph" >expect.err &&
-	git -c core.commitGraph=false log -- A/B/file2 >expect.out &&
-	git -c core.commitGraph=true log -- A/B/file2 >out 2>err &&
-	test_cmp expect.out out &&
-	test_cmp expect.err err
-
-ok 165 - Bloom reader notices out-of-order index offsets
-
-# passed all 165 test(s)
-1..165
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5302-pack-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5302-pack-index/.git/
-ok 1 - setup
-
-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"
-
-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_filter_computed 0 trace.event &&
+		test_filter_not_computed 6 trace.event &&
+		test_filter_trunc_empty 0 trace.event &&
+		test_filter_trunc_large 0 trace.event
+	)
 
-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"
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4216-log-bloom/empty/.git/
+[main (root-commit) 36bf629] 1
+ Author: A U Thor <author@example.com>
+[main 73266b6] 2
+ Author: A U Thor <author@example.com>
+[main efbc158] 3
+ Author: A U Thor <author@example.com>
+[main f013c5f] 4
+ Author: A U Thor <author@example.com>
+[main 29fe1c6] 5
+ Author: A U Thor <author@example.com>
+[main 55bcad0] 6
+ Author: A U Thor <author@example.com>
+{"event":"data","sid":"20260929T145245.280791Z-H5c947e1c-P0022bd94","thread":"main","time":"2026-09-29T14:52:45.289622Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.009040,"t_rel":0.009040,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20260929T145245.280791Z-H5c947e1c-P0022bd94","thread":"main","time":"2026-09-29T14:52:45.289641Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.009063,"t_rel":0.009063,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20260929T145245.280791Z-H5c947e1c-P0022bd94","thread":"main","time":"2026-09-29T14:52:45.289647Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.009069,"t_rel":0.009069,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20260929T145245.280791Z-H5c947e1c-P0022bd94","thread":"main","time":"2026-09-29T14:52:45.289651Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.009074,"t_rel":0.009074,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20260929T145245.309643Z-H5c947e1c-P0022bddb","thread":"main","time":"2026-09-29T14:52:45.311464Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002042,"t_rel":0.002042,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20260929T145245.309643Z-H5c947e1c-P0022bddb","thread":"main","time":"2026-09-29T14:52:45.311482Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.002064,"t_rel":0.002064,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20260929T145245.309643Z-H5c947e1c-P0022bddb","thread":"main","time":"2026-09-29T14:52:45.311487Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.002069,"t_rel":0.002069,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20260929T145245.309643Z-H5c947e1c-P0022bddb","thread":"main","time":"2026-09-29T14:52:45.311492Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002074,"t_rel":0.002074,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20260929T145245.325917Z-H5c947e1c-P0022be09","thread":"main","time":"2026-09-29T14:52:45.327666Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001974,"t_rel":0.001974,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20260929T145245.325917Z-H5c947e1c-P0022be09","thread":"main","time":"2026-09-29T14:52:45.327685Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001998,"t_rel":0.001998,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20260929T145245.325917Z-H5c947e1c-P0022be09","thread":"main","time":"2026-09-29T14:52:45.327691Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.002003,"t_rel":0.002003,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20260929T145245.325917Z-H5c947e1c-P0022be09","thread":"main","time":"2026-09-29T14:52:45.327695Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002008,"t_rel":0.002008,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20260929T145245.348329Z-H5c947e1c-P0022be38","thread":"main","time":"2026-09-29T14:52:45.349974Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.005477,"t_rel":0.005477,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
+{"event":"data","sid":"20260929T145245.348329Z-H5c947e1c-P0022be38","thread":"main","time":"2026-09-29T14:52:45.349995Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.005501,"t_rel":0.005501,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"6"}
+{"event":"data","sid":"20260929T145245.348329Z-H5c947e1c-P0022be38","thread":"main","time":"2026-09-29T14:52:45.350000Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.005507,"t_rel":0.005507,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20260929T145245.348329Z-H5c947e1c-P0022be38","thread":"main","time":"2026-09-29T14:52:45.350004Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.005511,"t_rel":0.005511,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+ok 140 - Bloom generation backfills empty commits
 
-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 4216.141 'setup for mixed Bloom setting tests': 
+	repo=mixed-bloom-settings &&
 
-expecting success of 5302.4 'both packs should be identical': 
-	cmp "test-1-${pack1}.pack" "test-2-${pack2}.pack"
+	git init $repo &&
+	for i in one two three
+	do
+		test_commit -C $repo $i file || return 1
+	done
 
-ok 4 - both packs should be identical
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4216-log-bloom/mixed-bloom-settings/.git/
+[main (root-commit) 756b681] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 55d464c] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main e3ee3ce] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 141 - setup for mixed Bloom setting tests
 
-expecting success of 5302.5 'index v1 and index v2 should be different': 
-	! cmp "test-1-${pack1}.idx" "test-2-${pack2}.idx"
+expecting success of 4216.142 'ensure Bloom filters with incompatible settings are ignored': 
+	# Compute Bloom filters with "unusual" settings.
+	git -C $repo rev-parse one >in &&
+	GIT_TEST_BLOOM_SETTINGS_NUM_HASHES=3 git -C $repo commit-graph write \
+		--stdin-commits --changed-paths --split <in &&
+	layer=$(head -n 1 $repo/$chain) &&
 
-test-1-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx test-2-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx differ: char 1, line 1
-ok 5 - index v1 and index v2 should be different
+	# A commit-graph layer without Bloom filters "hides" the layers
+	# below ...
+	git -C $repo rev-parse two >in &&
+	git -C $repo commit-graph write --stdin-commits --no-changed-paths \
+		--split=no-merge <in &&
 
-expecting success of 5302.6 'index-pack with index version 1': 
-	git index-pack --index-version=1 -o 1.idx "test-1-${pack1}.pack"
+	# Another commit-graph layer that has Bloom filters, but with
+	# standard settings, and is thus incompatible with the base
+	# layer written above.
+	git -C $repo rev-parse HEAD >in &&
+	git -C $repo commit-graph write --stdin-commits --changed-paths \
+		--split=no-merge <in &&
 
-1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 6 - index-pack with index version 1
+	test_line_count = 3 $repo/$chain &&
 
-expecting success of 5302.7 'index-pack with index version 2': 
-	git index-pack --index-version=2 -o 2.idx "test-1-${pack1}.pack"
+	# Ensure that incompatible Bloom filters are ignored.
+	git -C $repo -c core.commitGraph=false log --oneline --no-decorate -- file \
+		>expect 2>err &&
+	git -C $repo log --oneline --no-decorate -- file >actual 2>err &&
+	test_cmp expect actual &&
+	grep "disabling Bloom filters for commit-graph layer .$layer." err
 
-1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 7 - index-pack with index version 2
+warning: disabling Bloom filters for commit-graph layer '012b593000b4075aa9fd8e011d8d65ec0907d392' due to incompatible settings
+ok 142 - ensure Bloom filters with incompatible settings are ignored
 
-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 4216.143 'merge graph layers with incompatible Bloom settings': 
+	# Ensure that incompatible Bloom filters are ignored when
+	# merging existing layers.
+	>trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C $repo commit-graph write --reachable --changed-paths 2>err &&
+	grep "disabling Bloom filters for commit-graph layer .$layer." err &&
+	grep "{\"hash_version\":1,\"num_hashes\":7,\"bits_per_entry\":10,\"max_changed_paths\":512" trace2.txt &&
 
-ok 8 - index-pack results should match pack-objects ones
+	test_path_is_file $repo/$graph &&
+	test_dir_is_empty $repo/$graphdir &&
 
-expecting success of 5302.9 'index-pack --verify on index version 1': 
-	git index-pack --verify "test-1-${pack1}.pack"
+	git -C $repo -c core.commitGraph=false log --oneline --no-decorate -- \
+		file >expect &&
+	trace_out="$(pwd)/trace.perf" &&
+	GIT_TRACE2_PERF="$trace_out" \
+		git -C $repo log --oneline --no-decorate -- file >actual 2>err &&
 
-ok 9 - index-pack --verify on index version 1
+	test_cmp expect actual &&
+	grep "statistics:{\"filter_not_present\":0," trace.perf &&
+	test_must_be_empty err
 
-expecting success of 5302.10 'index-pack --verify on index version 2': 
-	git index-pack --verify "test-2-${pack2}.pack"
+warning: disabling Bloom filters for commit-graph layer '012b593000b4075aa9fd8e011d8d65ec0907d392' due to incompatible settings
+{"event":"data_json","sid":"20260929T145245.506230Z-H5c947e1c-P0022c01f","thread":"main","time":"2026-09-29T14:52:45.508231Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002189,"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}}
+14:52:45.530738 revision.c:667               | d0 | main                     | data_json    | r1  |  0.002508 |  0.002508 | bloom        | statistics:{"filter_not_present":0,"maybe":3,"definitely_not":0,"false_positive":0}
+ok 143 - merge graph layers with incompatible Bloom settings
 
-ok 10 - index-pack --verify on index version 2
+expecting success of 4216.144 'ensure Bloom filter with incompatible versions are ignored': 
+	rm "$repo/$graph" &&
 
-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
+	git -C $repo log --oneline --no-decorate -- $CENT >expect &&
 
-fatal: bad index version '2,'
-ok 11 - pack-objects --index-version=2, is not accepted
+	# Compute v1 Bloom filters for commits at the bottom.
+	git -C $repo rev-parse HEAD^ >in &&
+	git -C $repo commit-graph write --stdin-commits --changed-paths \
+		--split <in &&
 
-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)
+	# Compute v2 Bloomfilters for the rest of the commits at the top.
+	git -C $repo rev-parse HEAD >in &&
+	git -C $repo -c commitGraph.changedPathsVersion=2 commit-graph write \
+		--stdin-commits --changed-paths --split=no-merge <in &&
 
-ok 12 - index v2: force some 64-bit offsets with pack-objects
+	test_line_count = 2 $repo/$chain &&
 
-expecting success of 5302.13 'index v2: verify a pack with some 64-bit offsets': 
-	git verify-pack -v "test-3-${pack3}.pack"
+	git -C $repo log --oneline --no-decorate -- $CENT >actual 2>err &&
+	test_cmp expect actual &&
 
-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
+	layer="$(head -n 1 $repo/$chain)" &&
+	cat >expect.err <<-EOF &&
+	warning: disabling Bloom filters for commit-graph layer $SQ$layer$SQ due to incompatible settings
+	EOF
+	test_cmp expect.err err &&
 
-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"
+	# Merge the two layers with incompatible bloom filter versions,
+	# ensuring that the v2 filters are used.
+	>trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C $repo -c commitGraph.changedPathsVersion=2 commit-graph write --reachable --changed-paths 2>err &&
+	grep "disabling Bloom filters for commit-graph layer .$layer." err &&
+	grep "{\"hash_version\":2,\"num_hashes\":7,\"bits_per_entry\":10,\"max_changed_paths\":512" trace2.txt
 
-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
+warning: disabling Bloom filters for commit-graph layer 'e338a7a1b4cfa5f6bcd31aea3e027df67d06442a' due to incompatible settings
+{"event":"data_json","sid":"20260929T145245.608588Z-H5c947e1c-P0022c142","thread":"main","time":"2026-09-29T14:52:45.610510Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002108,"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}}
+ok 144 - ensure Bloom filter with incompatible versions are ignored
 
-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"
+expecting success of 4216.145 'set up repo with high bit path, version 1 changed-path': 
+	git init highbit1 &&
+	test_commit -C highbit1 c1 "$CENT" &&
+	git -C highbit1 commit-graph write --reachable --changed-paths
 
-1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 15 - index v2: force some 64-bit offsets with index-pack
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4216-log-bloom/highbit1/.git/
+[main (root-commit) 038971c] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\302\242"
+ok 145 - set up repo with high bit path, version 1 changed-path
 
-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 4216.146 'setup check value of version 1 changed-path': 
+	(
+		cd highbit1 &&
+		echo "52a9" >expect &&
+		get_first_changed_path_filter >actual
+	)
 
-ok 16 - 64-bit offsets: index-pack result should match pack-objects one
+ok 146 - setup check value of version 1 changed-path
 
-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"
+--- highbit1/expect	2026-09-29 14:52:45.642548970 +0000
++++ highbit1/actual	2026-09-29 14:52:45.646548970 +0000
+@@ -1 +1 @@
+-52a9
++c01f
+ok 147 # skip check value of version 1 changed-path (missing SIGNED_CHAR_BY_DEFAULT)
 
-ok 17 - index-pack --verify on 64-bit offset v2 (cheat)
+expecting success of 4216.148 'setup make another commit': 
+	# "git log" does not use Bloom filters for root commits - see how, in
+	# revision.c, rev_compare_tree() (the only code path that eventually calls
+	# get_bloom_filter()) is only called by try_to_simplify_commit() when the commit
+	# has one parent. Therefore, make another commit so that we perform the tests on
+	# a non-root commit.
+	test_commit -C highbit1 anotherc1 "another$CENT"
 
-expecting success of 5302.18 'index-pack --verify on 64-bit offset v2': 
-	git index-pack --verify "test-3-${pack3}.pack"
+[main 3b45161] anotherc1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "another\302\242"
+ok 148 - setup make another commit
 
-ok 18 - index-pack --verify on 64-bit offset v2
+expecting success of 4216.149 'version 1 changed-path used when version 1 requested': 
+	(
+		cd highbit1 &&
+		test_bloom_filters_used "-- another$CENT"
+	)
 
-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"
+ok 149 - version 1 changed-path used when version 1 requested
 
-pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 19 - [index v1] 1) stream pack to repository
+expecting success of 4216.150 'version 1 changed-path not used when version 2 requested': 
+	(
+		cd highbit1 &&
+		git config --add commitGraph.changedPathsVersion 2 &&
+		test_bloom_filters_not_used "-- another$CENT"
+	)
 
-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
+ok 150 - version 1 changed-path not used when version 2 requested
 
-20+0 records in
-20+0 records out
-20 bytes copied, 4.1121e-05 s, 486 kB/s
-ok 20 - [index v1] 2) create a stealth corruption in a delta base reference
+expecting success of 4216.151 'version 1 changed-path used when autodetect requested': 
+	(
+		cd highbit1 &&
+		git config --add commitGraph.changedPathsVersion -1 &&
+		test_bloom_filters_used "-- another$CENT"
+	)
 
-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
+ok 151 - version 1 changed-path used when autodetect requested
 
-file_101 file_101_foo1 differ: char 5, line 2
-ok 21 - [index v1] 3) corrupted delta happily returned wrong data
+expecting success of 4216.152 'when writing another commit graph, preserve existing version 1 of changed-path': 
+	test_commit -C highbit1 c1double "$CENT$CENT" &&
+	git -C highbit1 commit-graph write --reachable --changed-paths &&
+	(
+		cd highbit1 &&
+		git config --add commitGraph.changedPathsVersion -1 &&
+		echo "options: bloom(1,10,7) read_generation_data" >expect &&
+		test-tool read-graph >full &&
+		grep options full >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 5302.22 '[index v1] 4) confirm that the pack is actually corrupted': 
-	test_must_fail git fsck --full $commit
+[main 8b0508a] c1double
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\302\242\302\242"
+ok 152 - when writing another commit graph, preserve existing version 1 of changed-path
 
-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 4216.153 'set up repo with high bit path, version 2 changed-path': 
+	git init highbit2 &&
+	git -C highbit2 config --add commitGraph.changedPathsVersion 2 &&
+	test_commit -C highbit2 c2 "$CENT" &&
+	git -C highbit2 commit-graph write --reachable --changed-paths
 
-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"
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4216-log-bloom/highbit2/.git/
+[main (root-commit) bc1f8bf] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\302\242"
+ok 153 - set up repo with high bit path, version 2 changed-path
 
-ok 23 - [index v1] 5) pack-objects happily reuses corrupted data
+expecting success of 4216.154 'check value of version 2 changed-path': 
+	(
+		cd highbit2 &&
+		echo "c01f" >expect &&
+		get_first_changed_path_filter >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 5302.24 '[index v1] 6) newly created pack is BAD !': 
-	test_must_fail git verify-pack -v "test-4-${pack4}.pack"
+ok 154 - check value of version 2 changed-path
 
-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 4216.155 'setup make another commit': 
+	# "git log" does not use Bloom filters for root commits - see how, in
+	# revision.c, rev_compare_tree() (the only code path that eventually calls
+	# get_bloom_filter()) is only called by try_to_simplify_commit() when the commit
+	# has one parent. Therefore, make another commit so that we perform the tests on
+	# a non-root commit.
+	test_commit -C highbit2 anotherc2 "another$CENT"
 
-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"
+[main 285bfce] anotherc2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "another\302\242"
+ok 155 - setup make another commit
 
-pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 25 - [index v2] 1) stream pack to repository
+expecting success of 4216.156 'version 2 changed-path used when version 2 requested': 
+	(
+		cd highbit2 &&
+		test_bloom_filters_used "-- another$CENT"
+	)
 
-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
+ok 156 - version 2 changed-path used when version 2 requested
 
-20+0 records in
-20+0 records out
-20 bytes copied, 4.0841e-05 s, 490 kB/s
-ok 26 - [index v2] 2) create a stealth corruption in a delta base reference
+expecting success of 4216.157 'version 2 changed-path not used when version 1 requested': 
+	(
+		cd highbit2 &&
+		git config --add commitGraph.changedPathsVersion 1 &&
+		test_bloom_filters_not_used "-- another$CENT"
+	)
 
-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
+ok 157 - version 2 changed-path not used when version 1 requested
 
-file_101 file_101_foo2 differ: char 5, line 2
-ok 27 - [index v2] 3) corrupted delta happily returned wrong data
+expecting success of 4216.158 'version 2 changed-path used when autodetect requested': 
+	(
+		cd highbit2 &&
+		git config --add commitGraph.changedPathsVersion -1 &&
+		test_bloom_filters_used "-- another$CENT"
+	)
 
-expecting success of 5302.28 '[index v2] 4) confirm that the pack is actually corrupted': 
-	test_must_fail git fsck --full $commit
+ok 158 - version 2 changed-path used when autodetect requested
 
-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 4216.159 'when writing another commit graph, preserve existing version 2 of changed-path': 
+	test_commit -C highbit2 c2double "$CENT$CENT" &&
+	git -C highbit2 commit-graph write --reachable --changed-paths &&
+	(
+		cd highbit2 &&
+		git config --add commitGraph.changedPathsVersion -1 &&
+		echo "options: bloom(2,10,7) read_generation_data" >expect &&
+		test-tool read-graph >full &&
+		grep options full >actual &&
+		test_cmp expect actual
+	)
 
-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
+[main 00b3fc0] c2double
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\302\242\302\242"
+ok 159 - when writing another commit graph, preserve existing version 2 of changed-path
 
-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 4216.160 'when writing commit graph, do not reuse changed-path of another version': 
+	git init doublewrite &&
+	test_commit -C doublewrite c "$CENT" &&
 
-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"
+	git -C doublewrite config --add commitGraph.changedPathsVersion 1 &&
+	>trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C doublewrite commit-graph write --reachable --changed-paths &&
+	test_filter_computed 1 trace2.txt &&
+	test_filter_upgraded 0 trace2.txt &&
 
-pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-4+0 records in
-4+0 records out
-4 bytes copied, 4.2241e-05 s, 94.7 kB/s
-fatal: sha1 file '.git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx' validation error
-ok 30 - [index v2] 6) verify-pack detects CRC mismatch
+	git -C doublewrite commit-graph write --reachable --changed-paths &&
+	for v in -2 3
+	do
+		git -C doublewrite config --add commitGraph.changedPathsVersion $v &&
+		git -C doublewrite commit-graph write --reachable --changed-paths 2>err &&
+		cat >expect <<-EOF &&
+		warning: attempting to write a commit-graph, but ${SQ}commitGraph.changedPathsVersion${SQ} ($v) is not supported
+		EOF
+		test_cmp expect err || return 1
+	done &&
+
+	git -C doublewrite config --add commitGraph.changedPathsVersion 2 &&
+	>trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C doublewrite commit-graph write --reachable --changed-paths &&
+	test_filter_computed 1 trace2.txt &&
+	test_filter_upgraded 0 trace2.txt &&
 
-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
+		cd doublewrite &&
+		echo "c01f" >expect &&
+		get_first_changed_path_filter >actual &&
+		test_cmp expect actual
+	)
 
-1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 31 - running index-pack in the object store
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4216-log-bloom/doublewrite/.git/
+[main (root-commit) 6d8aa3d] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\302\242"
+{"event":"data","sid":"20260929T145246.083526Z-H5c947e1c-P0022c76e","thread":"main","time":"2026-09-29T14:52:46.088770Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.005434,"t_rel":0.005434,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260929T145246.083526Z-H5c947e1c-P0022c76e","thread":"main","time":"2026-09-29T14:52:46.088804Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.005472,"t_rel":0.005472,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
+{"event":"data","sid":"20260929T145246.143500Z-H5c947e1c-P0022c83f","thread":"main","time":"2026-09-29T14:52:46.145152Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001852,"t_rel":0.001852,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260929T145246.143500Z-H5c947e1c-P0022c83f","thread":"main","time":"2026-09-29T14:52:46.145181Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.001883,"t_rel":0.001883,"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 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
+expecting success of 4216.161 'when writing commit graph, reuse changed-path of another version where possible': 
+	git init upgrade &&
 
-This is an invalid tag.
-EOF
+	test_commit -C upgrade base no-high-bits &&
 
-	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
+	git -C upgrade config --add commitGraph.changedPathsVersion 1 &&
+	>trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C upgrade commit-graph write --reachable --changed-paths &&
+	test_filter_computed 1 trace2.txt &&
+	test_filter_upgraded 0 trace2.txt &&
 
-remove tag object
-67765b8cc9b2d3d6ffa408695798db10a387e826
-warning: object 954f1fc56e5be955c7818ab69b20a3374f351d82: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 32 - index-pack --strict warns upon missing tagger in tag
+	git -C upgrade config --add commitGraph.changedPathsVersion 2 &&
+	>trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C upgrade commit-graph write --reachable --changed-paths &&
+	test_filter_computed 0 trace2.txt &&
+	test_filter_upgraded 1 trace2.txt
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t4216-log-bloom/upgrade/.git/
+[main (root-commit) 454ab1d] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 no-high-bits
+{"event":"data","sid":"20260929T145246.196608Z-H5c947e1c-P0022c90d","thread":"main","time":"2026-09-29T14:52:46.198150Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001720,"t_rel":0.001720,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260929T145246.196608Z-H5c947e1c-P0022c90d","thread":"main","time":"2026-09-29T14:52:46.198181Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.001754,"t_rel":0.001754,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
+{"event":"data","sid":"20260929T145246.215562Z-H5c947e1c-P0022c951","thread":"main","time":"2026-09-29T14:52:46.222112Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.006703,"t_rel":0.006703,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
+{"event":"data","sid":"20260929T145246.215562Z-H5c947e1c-P0022c951","thread":"main","time":"2026-09-29T14:52:46.222143Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.006737,"t_rel":0.006737,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"1"}
+ok 161 - when writing commit graph, reuse changed-path of another version where possible
 
-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 4216.162 'Bloom reader notices too-small data chunk': 
+	check_corrupt_graph BDAT clear 00000000 &&
+	echo "warning: ignoring too-small changed-path chunk" \
+		"(4 < 12) in commit-graph file" >expect.err &&
+	test_cmp expect.err err
 
-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
+ok 162 - Bloom reader notices too-small data chunk
 
-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 | 30.87 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 4216.163 'Bloom reader notices out-of-bounds filter offsets': 
+	check_corrupt_graph BIDX 12 FFFFFFFF &&
+	# use grep to avoid depending on exact chunk size
+	grep "warning: ignoring out-of-range offset (4294967295) for changed-path filter at pos 3 of .git/objects/info/commit-graph" err
 
-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
+warning: ignoring out-of-range offset (4294967295) for changed-path filter at pos 3 of .git/objects/info/commit-graph (chunk size: 77)
+warning: ignoring out-of-range offset (4294967295) for changed-path filter at pos 3 of .git/objects/info/commit-graph (chunk size: 77)
+ok 163 - Bloom reader notices out-of-bounds filter offsets
 
-fatal: pack exceeds maximum allowed size (20 bytes)
-ok 35 - too-large packs report the breach
+expecting success of 4216.164 'Bloom reader notices too-small index chunk': 
+	# replace the index with a single entry, making most
+	# lookups out-of-bounds
+	check_corrupt_graph BIDX clear 00000000 &&
+	echo "warning: commit-graph changed-path index chunk" \
+		"is too small" >expect.err &&
+	test_cmp expect.err err
 
-# passed all 35 test(s)
-1..35
+ok 164 - Bloom reader notices too-small index chunk
+
+expecting success of 4216.165 'Bloom reader notices out-of-order index offsets': 
+	# we do not know any real offsets, but we can pick
+	# something plausible; we should not get to the point of
+	# actually reading from the bogus offsets anyway.
+	corrupt_graph BIDX 4 0000000c00000005 &&
+	echo "warning: ignoring decreasing changed-path index offsets" \
+		"(12 > 5) for positions 1 and 2 of .git/objects/info/commit-graph" >expect.err &&
+	git -c core.commitGraph=false log -- A/B/file2 >expect.out &&
+	git -c core.commitGraph=true log -- A/B/file2 >out 2>err &&
+	test_cmp expect.out out &&
+	test_cmp expect.err err
+
+ok 165 - Bloom reader notices out-of-order index offsets
+
+# passed all 165 test(s)
+1..165
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t4255-am-submodule.sh ***
@@ -311649,9 +311003,9 @@
 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.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
 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': 
@@ -311847,361 +311201,6 @@
 1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5332-multi-pack-reuse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5332-multi-pack-reuse/.git/
-expecting success of 5332.1 'preferred pack is reused for single-pack reuse': 
-	test_config pack.allowPackReuse single &&
-
-	for i in A B
-	do
-		test_commit "$i" &&
-		git repack -d || return 1
-	done &&
-
-	git multi-pack-index write --bitmap &&
-
-	test_pack_objects_reused_all 3 1
-
-[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
-{"event":"data","sid":"20250827T082133.906728Z-Hcf858c9d-P00098eb4","thread":"main","time":"2025-08-27T08:21:33.907974Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.011615,"t_rel":0.011615,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250827T082133.906728Z-Hcf858c9d-P00098eb4","thread":"main","time":"2025-08-27T08:21:33.907978Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.011619,"t_rel":0.011619,"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":"20250827T082133.946027Z-Hcf858c9d-P00098f20","thread":"main","time":"2025-08-27T08:21:33.947262Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001420,"t_rel":0.001420,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250827T082133.946027Z-Hcf858c9d-P00098f20","thread":"main","time":"2025-08-27T08:21:33.947266Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001425,"t_rel":0.001425,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-de700bb9d264590842bcbfd30aa3296a833289e8
-ok 2 - multi-pack reuse is disabled by default
-
-expecting success of 5332.3 'feature.experimental implies multi-pack reuse': 
-	test_config feature.experimental true &&
-
-	test_pack_objects_reused_all 6 2
-
-{"event":"data","sid":"20250827T082133.981029Z-Hcf858c9d-P00098f5c","thread":"main","time":"2025-08-27T08:21:33.982157Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001332,"t_rel":0.001332,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20250827T082133.981029Z-Hcf858c9d-P00098f5c","thread":"main","time":"2025-08-27T08:21:33.982162Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001337,"t_rel":0.001337,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
-de700bb9d264590842bcbfd30aa3296a833289e8
-ok 3 - feature.experimental implies multi-pack reuse
-
-expecting success of 5332.4 'multi-pack reuse can be disabled with feature.experimental': 
-	test_config feature.experimental true &&
-	test_config pack.allowPackReuse single &&
-
-	test_pack_objects_reused_all 3 1
-
-{"event":"data","sid":"20250827T082134.015550Z-Hcf858c9d-P00098faf","thread":"main","time":"2025-08-27T08:21:34.020877Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.005526,"t_rel":0.005526,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250827T082134.015550Z-Hcf858c9d-P00098faf","thread":"main","time":"2025-08-27T08:21:34.020881Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.005530,"t_rel":0.005530,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-de700bb9d264590842bcbfd30aa3296a833289e8
-ok 4 - multi-pack reuse can be disabled with feature.experimental
-
-expecting success of 5332.5 'enable multi-pack reuse': 
-	git config pack.allowPackReuse multi
-
-ok 5 - enable multi-pack reuse
-
-expecting success of 5332.6 'reuse all objects from subset of bitmapped packs': 
-	test_commit C &&
-	git repack -d &&
-
-	git multi-pack-index write --bitmap &&
-
-	cat >in <<-EOF &&
-	$(git rev-parse C)
-	^$(git rev-parse A)
-	EOF
-
-	test_pack_objects_reused 6 2 <in
-
-[master 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-{"event":"data","sid":"20250827T082134.153419Z-Hcf858c9d-P000990be","thread":"main","time":"2025-08-27T08:21:34.154481Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001268,"t_rel":0.001268,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20250827T082134.153419Z-Hcf858c9d-P000990be","thread":"main","time":"2025-08-27T08:21:34.154485Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001272,"t_rel":0.001272,"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":"20250827T082134.171658Z-Hcf858c9d-P000990eb","thread":"main","time":"2025-08-27T08:21:34.176918Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.005455,"t_rel":0.005455,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"9"}
-{"event":"data","sid":"20250827T082134.171658Z-Hcf858c9d-P000990eb","thread":"main","time":"2025-08-27T08:21:34.176922Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.005459,"t_rel":0.005459,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
-1340c9de031f500be0a197f1242f00a34ed6e9b8
-ok 7 - reuse all objects from all packs
-
-expecting success of 5332.8 'reuse objects from first pack with middle gap': 
-	for i in D E F
-	do
-		test_commit "$i" || return 1
-	done &&
-
-	# Set "pack.window" to zero to ensure that we do not create any
-	# deltas, which could alter the amount of pack reuse we perform
-	# (if, for e.g., we are not sending one or more bases).
-	D="$(git -c pack.window=0 pack-objects --all --unpacked $packdir/pack)" &&
-
-	d_pos="$(pack_position $(git rev-parse D) <$packdir/pack-$D.idx)" &&
-	e_pos="$(pack_position $(git rev-parse E) <$packdir/pack-$D.idx)" &&
-	f_pos="$(pack_position $(git rev-parse F) <$packdir/pack-$D.idx)" &&
-
-	# commits F, E, and D, should appear in that order at the
-	# beginning of the pack
-	test $f_pos -lt $e_pos &&
-	test $e_pos -lt $d_pos &&
-
-	# Ensure that the pack we are constructing sorts ahead of any
-	# other packs in lexical/bitmap order by choosing it as the
-	# preferred pack.
-	git multi-pack-index write --bitmap --preferred-pack="pack-$D.idx" &&
-
-	cat >in <<-EOF &&
-	$(git rev-parse E)
-	^$(git rev-parse D)
-	EOF
-
-	test_pack_objects_reused 3 1 <in
-
-[master be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[master ee2ad00] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-[master 5374d8c] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-{"event":"data","sid":"20250827T082134.403926Z-Hcf858c9d-P00099332","thread":"main","time":"2025-08-27T08:21:34.405119Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001380,"t_rel":0.001380,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250827T082134.403926Z-Hcf858c9d-P00099332","thread":"main","time":"2025-08-27T08:21:34.405124Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001387,"t_rel":0.001387,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-cdf9ddd5f15e5bb16ac5756b24c63adf8a8cc1c1
-ok 8 - reuse objects from first pack with middle gap
-
-expecting success of 5332.9 'reuse objects from middle pack with middle gap': 
-	rm -fr $packdir/multi-pack-index* &&
-
-	# Ensure that the pack we are constructing sort into any
-	# position *but* the first one, by choosing a different pack as
-	# the preferred one.
-	git multi-pack-index write --bitmap --preferred-pack="pack-$A.idx" &&
-
-	cat >in <<-EOF &&
-	$(git rev-parse E)
-	^$(git rev-parse D)
-	EOF
-
-	test_pack_objects_reused 3 1 <in
-
-warning: unknown preferred pack: 'pack-.idx'
-{"event":"data","sid":"20250827T082134.466217Z-Hcf858c9d-P000993d4","thread":"main","time":"2025-08-27T08:21:34.467426Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001391,"t_rel":0.001391,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250827T082134.466217Z-Hcf858c9d-P000993d4","thread":"main","time":"2025-08-27T08:21:34.467432Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001398,"t_rel":0.001398,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-cdf9ddd5f15e5bb16ac5756b24c63adf8a8cc1c1
-ok 9 - reuse objects from middle pack with middle gap
-
-expecting success of 5332.10 'omit delta with uninteresting base (same pack)': 
-	git repack -adk &&
-
-	test_seq 32 >f &&
-	git add f &&
-	test_tick &&
-	git commit -m "delta" &&
-	delta="$(git rev-parse HEAD)" &&
-
-	test_seq 64 >f &&
-	test_tick &&
-	git commit -a -m "base" &&
-	base="$(git rev-parse HEAD)" &&
-
-	test_commit other &&
-
-	git repack -d &&
-
-	have_delta "$(git rev-parse $delta:f)" "$(git rev-parse $base:f)" &&
-
-	git multi-pack-index write --bitmap &&
-
-	cat >in <<-EOF &&
-	$(git rev-parse other)
-	^$base
-	EOF
-
-	# We can only reuse the 3 objects corresponding to "other" from
-	# the latest pack.
-	#
-	# This is because even though we want "delta", we do not want
-	# "base", meaning that we have to inflate the delta/base-pair
-	# corresponding to the blob in commit "delta", which bypasses
-	# the pack-reuse mechanism.
-	#
-	# The remaining objects from the other pack are similarly not
-	# reused because their objects are on the uninteresting side of
-	# the query.
-	test_pack_objects_reused 3 1 <in
-
-[master 16753ad] delta
- Author: A U Thor <author@example.com>
- 1 file changed, 32 insertions(+)
- create mode 100644 f
-[master f40fa4a] base
- Author: A U Thor <author@example.com>
- 1 file changed, 32 insertions(+)
-[master e389016] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-{"event":"data","sid":"20250827T082134.661487Z-Hcf858c9d-P000995bb","thread":"main","time":"2025-08-27T08:21:34.662595Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001297,"t_rel":0.001297,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250827T082134.661487Z-Hcf858c9d-P000995bb","thread":"main","time":"2025-08-27T08:21:34.662599Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001301,"t_rel":0.001301,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-341840e0d76cb213079e38bae778b53364232eb5
-ok 10 - omit delta with uninteresting base (same pack)
-
-expecting success of 5332.11 'omit delta from uninteresting base (cross pack)': 
-	cat >in <<-EOF &&
-	$(git rev-parse $base)
-	^$(git rev-parse $delta)
-	EOF
-
-	P="$(git pack-objects --revs $packdir/pack <in)" &&
-
-	git multi-pack-index write --bitmap --preferred-pack="pack-$P.idx" &&
-
-	packs_nr="$(find $packdir -type f -name "pack-*.pack" | wc -l)" &&
-	objects_nr="$(git rev-list --count --all --objects)" &&
-
-	test_pack_objects_reused_all $(($objects_nr - 1)) $packs_nr
-
-{"event":"data","sid":"20250827T082134.744265Z-Hcf858c9d-P0009967f","thread":"main","time":"2025-08-27T08:21:34.745901Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001799,"t_rel":0.001799,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"26"}
-{"event":"data","sid":"20250827T082134.744265Z-Hcf858c9d-P0009967f","thread":"main","time":"2025-08-27T08:21:34.745905Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001803,"t_rel":0.001803,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
-def7cb61a9e70183adbf1acab0912d686622303a
-ok 11 - omit delta from uninteresting base (cross pack)
-
-expecting success of 5332.12 'non-omitted delta in MIDX preferred pack': 
-	test_config pack.allowPackReuse single &&
-
-	cat >p1.objects <<-EOF &&
-	$(git rev-parse $base)
-	^$(git rev-parse $delta^)
-	EOF
-	cat >p2.objects <<-EOF &&
-	$(git rev-parse F)
-	EOF
-
-	p1="$(git pack-objects --revs $packdir/pack <p1.objects)" &&
-	p2="$(git pack-objects --revs $packdir/pack <p2.objects)" &&
-
-	cat >in <<-EOF &&
-	pack-$p1.idx
-	pack-$p2.idx
-	EOF
-	git multi-pack-index write --bitmap --stdin-packs \
-		--preferred-pack=pack-$p1.pack <in &&
-
-	git show-index <$packdir/pack-$p1.idx >expect &&
-
-	test_pack_objects_reused_all $(wc -l <expect) 1
-
-{"event":"data","sid":"20250827T082134.846133Z-Hcf858c9d-P0009975f","thread":"main","time":"2025-08-27T08:21:34.849301Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.003377,"t_rel":0.003377,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20250827T082134.846133Z-Hcf858c9d-P0009975f","thread":"main","time":"2025-08-27T08:21:34.849306Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.003381,"t_rel":0.003381,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-48c334c15e539df3382db77f74c864a1d31091b9
-ok 12 - non-omitted delta in MIDX preferred pack
-
-expecting success of 5332.13 'duplicate objects': 
-	git init duplicate-objects &&
-	(
-		cd duplicate-objects &&
-
-		git config pack.allowPackReuse multi &&
-
-		test_commit base &&
-
-		git repack -a &&
-
-		git rev-parse HEAD^{tree} >in &&
-		p="$(git pack-objects $packdir/pack <in)" &&
-
-		git multi-pack-index write --bitmap --preferred-pack=pack-$p.idx &&
-
-		objects_nr="$(git rev-list --count --all --objects)" &&
-		packs_nr="$(find $packdir -type f -name "pack-*.pack" | wc -l)" &&
-
-		test_pack_objects_reused_all $objects_nr $packs_nr
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5332-multi-pack-reuse/duplicate-objects/.git/
-[master (root-commit) c1bac7b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-{"event":"data","sid":"20250827T082134.956527Z-Hcf858c9d-P0009987b","thread":"main","time":"2025-08-27T08:21:34.957696Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001489,"t_rel":0.001489,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250827T082134.956527Z-Hcf858c9d-P0009987b","thread":"main","time":"2025-08-27T08:21:34.957701Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001493,"t_rel":0.001493,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
-b572b333cdb15dbb54fe65e0e1361617040627d7
-ok 13 - duplicate objects
-
-expecting success of 5332.14 'duplicate objects with verbatim reuse': 
-	git init duplicate-objects-verbatim &&
-	(
-		cd duplicate-objects-verbatim &&
-
-		git config pack.allowPackReuse multi &&
-
-		test_commit_bulk 64 &&
-
-		# take the first object from the main pack...
-		git show-index <$(ls $packdir/pack-*.idx) >obj.raw &&
-		sort -nk1 <obj.raw | head -n1 | cut -d" " -f2 >in &&
-
-		# ...and create a separate pack containing just that object
-		p="$(git pack-objects $packdir/pack <in)" &&
-
-		git multi-pack-index write --bitmap --preferred-pack=pack-$p.idx &&
-
-		test_pack_objects_reused_all 192 2
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5332-multi-pack-reuse/duplicate-objects-verbatim/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          192 (         0 duplicates                  )
-      blobs  :           64 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           64 (         0 duplicates         62 deltas of         62 attempts)
-      commits:           64 (         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:             64
-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              =      15727 /      15727
----------------------------------------------------------------------
-
-{"event":"data","sid":"20250827T082135.079174Z-Hcf858c9d-P0009996e","thread":"main","time":"2025-08-27T08:21:35.084743Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.005771,"t_rel":0.005771,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"192"}
-{"event":"data","sid":"20250827T082135.079174Z-Hcf858c9d-P0009996e","thread":"main","time":"2025-08-27T08:21:35.084747Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.005776,"t_rel":0.005776,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
-1ebceb2b5297fe50c38004c13872ae869e743ceb
-ok 14 - duplicate objects with verbatim reuse
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5329-pack-objects-cruft.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5329-pack-objects-cruft/.git/
 expecting success of 5329.1 'unreachable loose objects are packed (expire never)': 
@@ -312958,510 +311957,3734 @@
 		# 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 &&
+		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.51.0/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 17 - loose objects mtimes upsert others
+
+expecting success of 5329.18 '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 &&
+
+		# Write a cruft pack containing all unreachable objects.
+		git gc --cruft --prune="01-01-1980" &&
+
+		mtimes=$(ls .git/objects/pack/pack-*.mtimes) &&
+		test_path_is_file $mtimes &&
+
+		# Prune all unreachable objects from the cruft pack.
+		git gc --cruft --prune=now &&
+
+		git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
+
+		comm -23 unreachable objects >removed &&
+		test_cmp unreachable removed &&
+		test_path_is_missing $mtimes
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 18 - expiring cruft objects with git gc
+
+expecting success of 5329.19 '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.51.0/t/trash directory.t5329-pack-objects-cruft/alternate/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 (root-commit) 5e824fb] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+df967b96a579e45a18b8251732d16804b2e56a55
+822216280fd1de308f55f27cdd7a4196a8f5a189 1790693565
+ok 19 - cruft --local drops unreachable objects
+
+expecting success of 5329.20 '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.51.0/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 reachable.t
+[master 40cbb3e] cruft
+ 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
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 resurrect.t
+ok 20 - MIDX bitmaps tolerate reachable cruft objects
+
+expecting success of 5329.21 '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)" &&
+
+		test_commit base &&
+
+		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.51.0/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
+822216280fd1de308f55f27cdd7a4196a8f5a189 1790693565
+822216280fd1de308f55f27cdd7a4196a8f5a189
+ok 21 - cruft objects are freshend via loose
+
+expecting success of 5329.22 '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)" &&
+
+		git checkout --orphan new &&
+		git rm -fr . &&
+		test_commit --no-tag cruft.new &&
+		cruft_new="$(git rev-parse HEAD)" &&
+
+		git checkout main &&
+		git branch -D discard old new &&
+		git reflog expire --all --expire=all &&
+
+		# 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)" &&
+
+		# 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 &&
+
+		# 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 &&
+
+		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 the "old" objects are removed after
+		# dropping the gc.recentObjectsHook hook.
+		git config --unset gc.recentObjectsHook &&
+		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 &&
+
+		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 &&
+
+		# 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
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 22 - gc.recentObjectsHook
+
+expecting success of 5329.23 'multi-valued gc.recentObjectsHook': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		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 &&
+
+		# and that the existing cruft pack is left alone
+		test_path_is_file "$mtimes"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+ 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
+ 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 23 - multi-valued gc.recentObjectsHook
+
+expecting success of 5329.24 '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.51.0/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 24 - additional cruft blobs via gc.recentObjectsHook
+
+expecting success of 5329.25 'split cruft packs with --max-cruft-size': 
+	repo=cruft-with--max-cruft-size &&
+	test_when_finished "rm -fr $repo" &&
+
+	git init "$repo" &&
+
+	(
+		cd "$repo" &&
+
+		git config core.compression 0 &&
+
+		sz=$((1024 * 1024)) && # 1MiB
+		test-tool genrandom foo $sz >foo &&
+		test-tool genrandom bar $sz >bar &&
+		foo="$(git hash-object -w -t blob foo)" &&
+		bar="$(git hash-object -w -t blob bar)" &&
+
+		to=$packdir/pack &&
+		# Pack together foo and bar into a single 2MiB pack.
+		pack="$(git pack-objects $to <<-EOF
+		$foo
+		$bar
+		EOF
+		)" &&
+
+		# Then generate a cruft pack containing foo and bar.
+		#
+		# Generate the pack with --max-pack-size equal to the
+		# size of one object, forcing us to write two cruft
+		# packs.
+		git pack-objects --cruft --max-pack-size=$sz $to <<-EOF &&
+		-pack-$pack.pack
+		EOF
+
+		ls $packdir/pack-*.mtimes >crufts &&
+		test_line_count = 2 crufts &&
+
+		for cruft in $(cat crufts)
+		do
+			test-tool pack-mtimes "$(basename "$cruft")" || return 1
+		done >actual.raw &&
+
+		cut -d" " -f1 <actual.raw | sort >actual &&
+		sort >expect <<-EOF &&
+		$foo
+		$bar
+		EOF
+
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5329-pack-objects-cruft/cruft-with--max-cruft-size/.git/
+fb982b26185eb925c4551319e24b76777cc5737c
+bf2b116ceec41facb0158b8f5d3c69c27cdb1734
+ok 25 - split cruft packs with --max-cruft-size
+
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5300-pack-object.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/.git/
+expecting success of 5300.1 'setup': 
+	rm -f .git/index* &&
+	test-tool genzeros 4096 | tr "\000" "a" >a &&
+	test-tool genzeros 4096 | tr "\000" "b" >b &&
+	test-tool genzeros 4096 | tr "\000" "c" >c &&
+	test-tool genrandom "seed a" 2097152 >a_big &&
+	test-tool genrandom "seed b" 2097152 >b_big &&
+	git update-index --add a a_big b b_big c &&
+	cat c >d && echo foo >>d && git update-index --add d &&
+	tree=$(git write-tree) &&
+	commit=$(git commit-tree $tree </dev/null) &&
+	{
+		echo $tree &&
+		echo $commit &&
+		git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
+	} >obj-list &&
+	{
+		git diff-tree --root -p $commit &&
+		while read object
+		do
+			t=$(git cat-file -t $object) &&
+			git cat-file $t $object || return 1
+		done <obj-list
+	} >expect
+
+ok 1 - setup
+
+expecting success of 5300.2 'setup pack-object <stdin': 
+	git init pack-object-stdin &&
+	test_commit -C pack-object-stdin one &&
+	test_commit -C pack-object-stdin two
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/pack-object-stdin/.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
+ok 2 - setup pack-object <stdin
+
+expecting success of 5300.3 'pack-object <stdin parsing: basic [|--revs]': 
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	EOF
+
+	git -C pack-object-stdin pack-objects basic-stdin <in &&
+	idx=$(echo pack-object-stdin/basic-stdin-*.idx) &&
+	git show-index <"$idx" >actual &&
+	test_line_count = 1 actual &&
+
+	git -C pack-object-stdin pack-objects --revs basic-stdin-revs <in &&
+	idx=$(echo pack-object-stdin/basic-stdin-revs-*.idx) &&
+	git show-index <"$idx" >actual &&
+	test_line_count = 3 actual
+
+260a913b65cbec25b7e224d8d3c7360245c0367a
+91db7b4b856b00c3e675824c5bc5389b6810037a
+ok 3 - pack-object <stdin parsing: basic [|--revs]
+
+expecting success of 5300.4 'pack-object <stdin parsing: [|--revs] bad line': 
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	garbage
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
+
+	sed "s/^> //g" >err.expect <<-EOF &&
+	fatal: expected object ID, got garbage:
+	>  garbage
+
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects bad-line-stdin <in 2>err.actual &&
+	test_cmp err.expect err.actual &&
+
+	cat >err.expect <<-EOF &&
+	fatal: bad revision 'garbage'
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects --revs bad-line-stdin-revs <in 2>err.actual &&
+	test_cmp err.expect err.actual
+
+ok 4 - pack-object <stdin parsing: [|--revs] bad line
+
+expecting success of 5300.5 'pack-object <stdin parsing: [|--revs] empty line': 
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
+
+	sed -e "s/^> //g" -e "s/Z$//g" >err.expect <<-EOF &&
+	fatal: expected object ID, got garbage:
+	>  Z
+
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects empty-line-stdin <in 2>err.actual &&
+	test_cmp err.expect err.actual &&
+
+	git -C pack-object-stdin pack-objects --revs empty-line-stdin-revs <in &&
+	idx=$(echo pack-object-stdin/empty-line-stdin-revs-*.idx) &&
+	git show-index <"$idx" >actual &&
+	test_line_count = 3 actual
+
+91db7b4b856b00c3e675824c5bc5389b6810037a
+ok 5 - pack-object <stdin parsing: [|--revs] empty line
+
+expecting success of 5300.6 'pack-object <stdin parsing: [|--revs] with --stdin': 
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
+
+	# There is the "--stdin-packs is incompatible with --revs"
+	# test below, but we should make sure that the revision.c
+	# --stdin is not picked up
+	cat >err.expect <<-EOF &&
+	fatal: disallowed abbreviated or ambiguous option 'stdin'
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects stdin-with-stdin-option --stdin <in 2>err.actual &&
+	test_cmp err.expect err.actual &&
+
+	test_must_fail git -C pack-object-stdin pack-objects --stdin --revs stdin-with-stdin-option-revs 2>err.actual <in &&
+	test_cmp err.expect err.actual
+
+ok 6 - pack-object <stdin parsing: [|--revs] with --stdin
+
+expecting success of 5300.7 'pack-object <stdin parsing: --stdin-packs handles garbage': 
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
+
+	# That we get "two" and not "one" has to do with OID
+	# ordering. It happens to be the same here under SHA-1 and
+	# SHA-256. See commentary in pack-objects.c
+	cat >err.expect <<-EOF &&
+	fatal: could not find pack '$(git -C pack-object-stdin rev-parse two)'
+	EOF
+	test_must_fail git \
+		-C pack-object-stdin \
+		pack-objects stdin-with-stdin-option --stdin-packs \
+		<in 2>err.actual &&
+	test_cmp err.expect err.actual
+
+ok 7 - pack-object <stdin parsing: --stdin-packs handles garbage
+
+expecting success of 5300.8 'pack without delta': 
+	packname_1=$(git pack-objects --progress --window=0 test-1 \
+			<obj-list 2>stderr) &&
+	check_deltas stderr = 0
+
+ok 8 - pack without delta
+
+expecting success of 5300.9 'negative window clamps to 0': 
+	git pack-objects --progress --window=-1 neg-window <obj-list 2>stderr &&
+	check_deltas stderr = 0
+
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+ok 9 - negative window clamps to 0
+
+expecting success of 5300.10 'pack-objects with bogus arguments': 
+	test_must_fail git pack-objects --window=0 test-1 blah blah <obj-list
+
+usage: git pack-objects [-q | --progress | --all-progress] [--all-progress-implied]
+                        [--no-reuse-delta] [--delta-base-offset] [--non-empty]
+                        [--local] [--incremental] [--window=<n>] [--depth=<n>]
+                        [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
+                        [--cruft] [--cruft-expiration=<time>]
+                        [--stdout [--filter=<filter-spec>] | <base-name>]
+                        [--shallow] [--keep-true-parents] [--[no-]sparse]
+                        [--name-hash-version=<n>] [--path-walk] < <object-list>
+
+    -q, --[no-]quiet      do not show progress meter
+    --[no-]progress       show progress meter
+    --[no-]all-progress   show progress meter during object writing phase
+    --[no-]all-progress-implied
+                          similar to --all-progress when progress meter is shown
+    --index-version <version>[,<offset>]
+                          write the pack index file in the specified idx format version
+    --max-pack-size <n>   maximum size of each output pack file
+    --[no-]local          ignore borrowed objects from alternate object store
+    --[no-]incremental    ignore packed objects
+    --[no-]window <n>     limit pack window by objects
+    --window-memory <n>   limit pack window by memory in addition to object limit
+    --[no-]depth <n>      maximum length of delta chain allowed in the resulting pack
+    --[no-]reuse-delta    reuse existing deltas
+    --[no-]reuse-object   reuse existing objects
+    --[no-]delta-base-offset
+                          use OFS_DELTA objects
+    --[no-]threads <n>    use threads when searching for best delta matches
+    --[no-]non-empty      do not create an empty pack output
+    --[no-]revs           read revision arguments from standard input
+    --unpacked            limit the objects to those that are not yet packed
+    --all                 include objects reachable from any reference
+    --reflog              include objects referred by reflog entries
+    --indexed-objects     include objects referred to by the index
+    --[no-]stdin-packs[=<mode>]
+                          read packs from stdin
+    --[no-]stdin-packs    read packs from stdin
+    --[no-]stdout         output pack to stdout
+    --[no-]include-tag    include tag objects that refer to objects to be packed
+    --[no-]keep-unreachable
+                          keep unreachable objects
+    --[no-]pack-loose-unreachable
+                          pack loose unreachable objects
+    --[no-]unpack-unreachable[=<time>]
+                          unpack unreachable objects newer than <time>
+    --[no-]cruft          create a cruft pack
+    --[no-]cruft-expiration[=<time>]
+                          expire cruft objects older than <time>
+    --[no-]sparse         use the sparse reachability algorithm
+    --[no-]thin           create thin packs
+    --[no-]path-walk      use the path-walk API to walk objects when possible
+    --[no-]shallow        create packs suitable for shallow fetches
+    --[no-]honor-pack-keep
+                          ignore packs that have companion .keep file
+    --[no-]keep-pack <name>
+                          ignore this pack
+    --[no-]compression <n>
+                          pack compression level
+    --[no-]keep-true-parents
+                          do not hide commits by grafts
+    --[no-]use-bitmap-index
+                          use a bitmap index if available to speed up counting objects
+    --[no-]write-bitmap-index
+                          write a bitmap index together with the pack index
+    --[no-]filter <args>  object filtering
+    --missing <action>    handling for missing objects
+    --[no-]exclude-promisor-objects
+                          do not pack objects in promisor packfiles
+    --[no-]exclude-promisor-objects-best-effort
+                          implies --missing=allow-any
+    --[no-]delta-islands  respect islands during delta compression
+    --[no-]uri-protocol <protocol>
+                          exclude any configured uploadpack.blobpackfileuri with this protocol
+    --[no-]name-hash-version <n>
+                          use the specified name-hash function to group similar objects
+
+ok 10 - pack-objects with bogus arguments
+
+expecting success of 5300.11 'unpack without delta': 
+	check_unpack test-1-${packname_1} obj-list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
+ok 11 - unpack without delta
+
+expecting success of 5300.12 'unpack without delta (core.fsyncmethod=batch)': 
+	check_unpack test-1-${packname_1} obj-list "$BATCH_CONFIGURATION"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
+ok 12 - unpack without delta (core.fsyncmethod=batch)
+
+expecting success of 5300.13 'pack with REF_DELTA': 
+	packname_2=$(git pack-objects --progress test-2 <obj-list 2>stderr) &&
+	check_deltas stderr -gt 0
+
+ok 13 - pack with REF_DELTA
+
+expecting success of 5300.14 'unpack with REF_DELTA': 
+	check_unpack test-2-${packname_2} obj-list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
+ok 14 - unpack with REF_DELTA
+
+expecting success of 5300.15 'unpack with REF_DELTA (core.fsyncmethod=batch)': 
+       check_unpack test-2-${packname_2} obj-list "$BATCH_CONFIGURATION"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
+ok 15 - unpack with REF_DELTA (core.fsyncmethod=batch)
+
+expecting success of 5300.16 'pack with OFS_DELTA': 
+	packname_3=$(git pack-objects --progress --delta-base-offset test-3 \
+			<obj-list 2>stderr) &&
+	check_deltas stderr -gt 0
+
+ok 16 - pack with OFS_DELTA
+
+expecting success of 5300.17 'unpack with OFS_DELTA': 
+	check_unpack test-3-${packname_3} obj-list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
+ok 17 - unpack with OFS_DELTA
+
+expecting success of 5300.18 'unpack with OFS_DELTA (core.fsyncmethod=batch)': 
+	check_unpack test-3-${packname_3} obj-list "$BATCH_CONFIGURATION"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
+ok 18 - unpack with OFS_DELTA (core.fsyncmethod=batch)
+
+expecting success of 5300.19 'compare delta flavors': 
+	perl -e '
+		defined($_ = -s $_) or die for @ARGV;
+		exit 1 if $ARGV[0] <= $ARGV[1];
+	' test-2-$packname_2.pack test-3-$packname_3.pack
+
+ok 19 - compare delta flavors
+
+expecting success of 5300.20 'use packed objects': 
+	check_use_objects test-1-${packname_1}
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
+ok 20 - use packed objects
+
+expecting success of 5300.21 'use packed deltified (REF_DELTA) objects': 
+	check_use_objects test-2-${packname_2}
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
+ok 21 - use packed deltified (REF_DELTA) objects
+
+expecting success of 5300.22 'use packed deltified (OFS_DELTA) objects': 
+	check_use_objects test-3-${packname_3}
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
+ok 22 - use packed deltified (OFS_DELTA) objects
+
+expecting success of 5300.23 'survive missing objects/pack directory': 
+	(
+		rm -fr missing-pack &&
+		mkdir missing-pack &&
+		cd missing-pack &&
+		git init &&
+		GOP=.git/objects/pack &&
+		rm -fr $GOP &&
+		git index-pack --stdin --keep=test <../test-3-${packname_3}.pack &&
+		test -f $GOP/pack-${packname_3}.pack &&
+		cmp $GOP/pack-${packname_3}.pack ../test-3-${packname_3}.pack &&
+		test -f $GOP/pack-${packname_3}.idx &&
+		cmp $GOP/pack-${packname_3}.idx ../test-3-${packname_3}.idx &&
+		test -f $GOP/pack-${packname_3}.keep
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/missing-pack/.git/
+keep	ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
+ok 23 - survive missing objects/pack directory
+
+expecting success of 5300.24 'verify pack': 
+	git verify-pack test-1-${packname_1}.idx \
+		test-2-${packname_2}.idx \
+		test-3-${packname_3}.idx
+
+ok 24 - verify pack
+
+expecting success of 5300.25 'verify pack -v': 
+	git verify-pack -v test-1-${packname_1}.idx \
+		test-2-${packname_2}.idx \
+		test-3-${packname_3}.idx
+
+3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
+ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe commit 163 123 181
+9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 304
+012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 335
+c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098137
+6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf blob   2097152 2097802 2098168
+0be779221aca65277fd447c8207e1b3c2706ae20 blob   4096 31 4195970
+b010fe5253f7dc59c6605dacb92fcea00d199d4e blob   4100 36 4196001
+non delta: 8 objects
+test-1-0fe7826218e9201ffa2c785aa64f009dc5a98043.pack: ok
+3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
+ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe commit 163 123 181
+9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 304
+012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 335
+c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098137
+6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf blob   2097152 2097802 2098168
+b010fe5253f7dc59c6605dacb92fcea00d199d4e blob   4100 36 4195970
+0be779221aca65277fd447c8207e1b3c2706ae20 blob   6 35 4196006 1 b010fe5253f7dc59c6605dacb92fcea00d199d4e
+non delta: 7 objects
+chain length = 1: 1 object
+test-2-3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5.pack: ok
+3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
+ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe commit 163 123 181
+9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 304
+012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 335
+c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098137
+6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf blob   2097152 2097802 2098168
+b010fe5253f7dc59c6605dacb92fcea00d199d4e blob   4100 36 4195970
+0be779221aca65277fd447c8207e1b3c2706ae20 blob   6 16 4196006 1 b010fe5253f7dc59c6605dacb92fcea00d199d4e
+non delta: 7 objects
+chain length = 1: 1 object
+test-3-ed7d7d439f2b0cbe9b94e803744e331d0b842cd7.pack: ok
+ok 25 - verify pack -v
+
+expecting success of 5300.26 'verify-pack catches mismatched .idx and .pack files': 
+	cat test-1-${packname_1}.idx >test-3.idx &&
+	cat test-2-${packname_2}.pack >test-3.pack &&
+	if git verify-pack test-3.idx
+	then false
+	else :;
+	fi
+
+fatal: sha1 file 'test-3.idx' validation error
+ok 26 - verify-pack catches mismatched .idx and .pack files
+
+expecting success of 5300.27 'verify-pack catches a corrupted pack signature': 
+	cat test-1-${packname_1}.pack >test-3.pack &&
+	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=2 &&
+	if git verify-pack test-3.idx
+	then false
+	else :;
+	fi
+
+1+0 records in
+1+0 records out
+1 byte copied, 3.1e-05 s, 32.3 kB/s
+fatal: pack signature mismatch
+ok 27 - verify-pack catches a corrupted pack signature
+
+expecting success of 5300.28 'verify-pack catches a corrupted pack version': 
+	cat test-1-${packname_1}.pack >test-3.pack &&
+	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=7 &&
+	if git verify-pack test-3.idx
+	then false
+	else :;
+	fi
+
+1+0 records in
+1+0 records out
+1 byte copied, 0.00077744 s, 1.3 kB/s
+fatal: pack version 10 unsupported
+ok 28 - verify-pack catches a corrupted pack version
+
+expecting success of 5300.29 'verify-pack catches a corrupted type/size of the 1st packed object data': 
+	cat test-1-${packname_1}.pack >test-3.pack &&
+	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=12 &&
+	if git verify-pack test-3.idx
+	then false
+	else :;
+	fi
+
+1+0 records in
+1+0 records out
+1 byte copied, 2.772e-05 s, 36.1 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
+
+expecting success of 5300.30 'verify-pack catches a corrupted sum of the index file itself': 
+	l=$(wc -c <test-3.idx) &&
+	l=$(expr $l - 20) &&
+	cat test-1-${packname_1}.pack >test-3.pack &&
+	printf "%20s" "" | dd of=test-3.idx count=20 bs=1 conv=notrunc seek=$l &&
+	if git verify-pack test-3.pack
+	then false
+	else :;
+	fi
+
+20+0 records in
+20+0 records out
+20 bytes copied, 4.868e-05 s, 411 kB/s
+fatal: sha1 file 'test-3.idx' validation error
+ok 30 - verify-pack catches a corrupted sum of the index file itself
+
+expecting success of 5300.31 'build pack index for an existing pack': 
+	cat test-1-${packname_1}.pack >test-3.pack &&
+	git index-pack -o tmp.idx test-3.pack &&
+	cmp tmp.idx test-1-${packname_1}.idx &&
+
+	git index-pack test-3.pack &&
+	cmp test-3.idx test-1-${packname_1}.idx &&
+
+	cat test-2-${packname_2}.pack >test-3.pack &&
+	git index-pack -o tmp.idx test-2-${packname_2}.pack &&
+	cmp tmp.idx test-2-${packname_2}.idx &&
+
+	git index-pack test-3.pack &&
+	cmp test-3.idx test-2-${packname_2}.idx &&
+
+	cat test-3-${packname_3}.pack >test-3.pack &&
+	git index-pack -o tmp.idx test-3-${packname_3}.pack &&
+	cmp tmp.idx test-3-${packname_3}.idx &&
+
+	git index-pack test-3.pack &&
+	cmp test-3.idx test-3-${packname_3}.idx &&
+
+	cat test-1-${packname_1}.pack >test-4.pack &&
+	rm -f test-4.keep &&
+	git index-pack --keep=why test-4.pack &&
+	cmp test-1-${packname_1}.idx test-4.idx &&
+	test -f test-4.keep &&
+
+	:
+
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5
+3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5
+ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
+ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+ok 31 - build pack index for an existing pack
+
+expecting success of 5300.32 'unpacking with --strict': 
+
+	for j in a b c d e f g
+	do
+		for i in 0 1 2 3 4 5 6 7 8 9
+		do
+			o=$(echo $j$i | git hash-object -w --stdin) &&
+			echo "100644 $o	0 $j$i" || return 1
+		done
+	done >LIST &&
+	rm -f .git/index &&
+	git update-index --index-info <LIST &&
+	LIST=$(git write-tree) &&
+	rm -f .git/index &&
+	head -n 10 LIST | git update-index --index-info &&
+	LI=$(git write-tree) &&
+	rm -f .git/index &&
+	tail -n 10 LIST | git update-index --index-info &&
+	ST=$(git write-tree) &&
+	git rev-list --objects "$LIST" "$LI" "$ST" >actual &&
+	PACK5=$( git pack-objects test-5 <actual ) &&
+	PACK6=$( test_write_lines "$LIST" "$LI" "$ST" | git pack-objects test-6 ) &&
+	test_create_repo test-5 &&
+	(
+		cd test-5 &&
+		git unpack-objects --strict <../test-5-$PACK5.pack &&
+		git ls-tree -r $LIST &&
+		git ls-tree -r $LI &&
+		git ls-tree -r $ST
+	) &&
+	test_create_repo test-6 &&
+	(
+		# tree-only into empty repo -- many unreachables
+		cd test-6 &&
+		test_must_fail git unpack-objects --strict <../test-6-$PACK6.pack
+	) &&
+	(
+		# already populated -- no unreachables
+		cd test-5 &&
+		git unpack-objects --strict <../test-6-$PACK6.pack
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/test-5/.git/
+100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
+100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
+100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
+100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
+100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
+100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
+100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
+100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
+100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
+100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
+100644 blob 2270a80fbb71d7109b85e7489f3f307d0141a559	0 b0
+100644 blob c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061	0 b1
+100644 blob e6bfff5c1d0f0ecd501552b43a1e13d8008abc31	0 b2
+100644 blob 6d0875c82a99774922eab07fbc08510fc85d9e0a	0 b3
+100644 blob 8e953e84d803f13fd06416a1bd8161dcd93cfd00	0 b4
+100644 blob 90a5159bf020296276ea5ca1bcd292a9b1de9947	0 b5
+100644 blob 07eb61d36f49569a2b0649af299f9f00013d0969	0 b6
+100644 blob 6e6d33cfc7b1581413a88ae0759202b25ac4cad1	0 b7
+100644 blob 5d453c66b522d8de5d99c03bd2bf8b65ca0bcf33	0 b8
+100644 blob 9a16e0d1a643983973291127012d2694a0b17fe8	0 b9
+100644 blob caecf05cdbb03e144f113ecab2b99e5ee74df706	0 c0
+100644 blob ae9304576a6ec3419b231b2b9c8e33a06f97f9fb	0 c1
+100644 blob 16f9ec009e5568c435f473ba3a1df732d49ce8c3	0 c2
+100644 blob 0771aea884dd394a7b12783d049f05b5599f41a4	0 c3
+100644 blob a103f673dd1b7c5727aa0ae0100419adc50e1b76	0 c4
+100644 blob c36357109ce20af8f90df3c0dd0784e89408d707	0 c5
+100644 blob 86a716504cbdc40a135faa5ab199d15e364c416d	0 c6
+100644 blob 20be68787e59f4cb8983b641d170c4baf8ea25dd	0 c7
+100644 blob bb420bc8fb9e91530fdc25e363f6b822d5195309	0 c8
+100644 blob f899bd1761a5ca5978799bc3189a04d3c52d8435	0 c9
+100644 blob 79a5e858be4a3a969e3b71406fef0d3d36e1d387	0 d0
+100644 blob 6f1852975b9306ae5d8dfdf0d4cb1f5cb36ac229	0 d1
+100644 blob fd3671590780b645e1bef030d550191f6cdf1c95	0 d2
+100644 blob 69c77a9ea746edd27b46107142fc2c5288c1daf5	0 d3
+100644 blob d7b30ee07d4b9819a77a3b122282b4c04528ec21	0 d4
+100644 blob fa590f3f8bfbef6095cf6525e8497b2b2b46445c	0 d5
+100644 blob fef4390d19cb98fa97efd44c09d4e2eb7b084b40	0 d6
+100644 blob a5adf29249757619b8890c86f2cfcfeee611b5d8	0 d7
+100644 blob 1859919d049c078ba63fcecbce60e697c6da8e01	0 d8
+100644 blob b6148c82443a60d1d5ce07872a85e3c544b5f4b0	0 d9
+100644 blob 4fe4106b50b257f3d6ffd23b750d2d1945c2608b	0 e0
+100644 blob 5ff91639494693b1f238b5dc9baf8be95142c3ab	0 e1
+100644 blob 3811af3ca744c2fb44077a8025c23b4d4166a449	0 e2
+100644 blob 9338c3fa1f74d202651154257572d32aed57cc16	0 e3
+100644 blob c5195815f83aa9ef1ebac9e11f14d62b26406c99	0 e4
+100644 blob 0c44c89ef9c29077cceebc6dd9ca0b3a950c95ee	0 e5
+100644 blob f17172bc54cfa55a9e531cc845dff39855cd8df0	0 e6
+100644 blob 29870e9ccff84f86938ee588a47b39cf3a802e6b	0 e7
+100644 blob e8d01d007452cede5c6eafc3343fc80675b1e2f9	0 e8
+100644 blob 0c1945ad576ffc445ad69a3fafd1d3c04cc0bd40	0 e9
+100644 blob 844dc808a1d3d769ddcf5430eac933d4d87ff606	0 f0
+100644 blob 8e1e71d5ce34c01b6fe83bc5051545f2918c8c2b	0 f1
+100644 blob 9de77c18733ab8009a956c25e28c85fe203a17d7	0 f2
+100644 blob 45d9e0e9fc8859787c33081dffdf12f41b54fcf3	0 f3
+100644 blob c48ac4847d3abae8e5899dcc5cf490a98df55755	0 f4
+100644 blob 14c61ecf25961ce674048103c5fa5ea3c535a5cd	0 f5
+100644 blob 59ce90029dfd9e224701a040a26153e9f2feb74c	0 f6
+100644 blob 0a7bd52ffb819609cf65f40eb91be62000db47e5	0 f7
+100644 blob c7e617f6b429a1f3b462df6add2b4ea2cf702faf	0 f8
+100644 blob a720d8c8d277ad31ee5b180bef57379b5f62517c	0 f9
+100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
+100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
+100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
+100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
+100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
+100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
+100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
+100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
+100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
+100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
+100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
+100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
+100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
+100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
+100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
+100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
+100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
+100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
+100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
+100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
+100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
+100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
+100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
+100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
+100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
+100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
+100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
+100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
+100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
+100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/test-6/.git/
+fatal: object of unexpected type
+ok 32 - unpacking with --strict
+
+expecting success of 5300.33 'index-pack with --strict': 
+
+	for j in a b c d e f g
+	do
+		for i in 0 1 2 3 4 5 6 7 8 9
+		do
+			o=$(echo $j$i | git hash-object -w --stdin) &&
+			echo "100644 $o	0 $j$i" || return 1
+		done
+	done >LIST &&
+	rm -f .git/index &&
+	git update-index --index-info <LIST &&
+	LIST=$(git write-tree) &&
+	rm -f .git/index &&
+	head -n 10 LIST | git update-index --index-info &&
+	LI=$(git write-tree) &&
+	rm -f .git/index &&
+	tail -n 10 LIST | git update-index --index-info &&
+	ST=$(git write-tree) &&
+	git rev-list --objects "$LIST" "$LI" "$ST" >actual &&
+	PACK5=$( git pack-objects test-5 <actual ) &&
+	PACK6=$( test_write_lines "$LIST" "$LI" "$ST" | git pack-objects test-6 ) &&
+	test_create_repo test-7 &&
+	(
+		cd test-7 &&
+		git index-pack --strict --stdin <../test-5-$PACK5.pack &&
+		git ls-tree -r $LIST &&
+		git ls-tree -r $LI &&
+		git ls-tree -r $ST
+	) &&
+	test_create_repo test-8 &&
+	(
+		# tree-only into empty repo -- many unreachables
+		cd test-8 &&
+		test_must_fail git index-pack --strict --stdin <../test-6-$PACK6.pack
+	) &&
+	(
+		# already populated -- no unreachables
+		cd test-7 &&
+		git index-pack --strict --stdin <../test-6-$PACK6.pack
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/test-7/.git/
+pack	580f6e9e5f1fc55c922ae4f748e6adb3737375f4
+100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
+100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
+100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
+100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
+100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
+100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
+100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
+100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
+100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
+100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
+100644 blob 2270a80fbb71d7109b85e7489f3f307d0141a559	0 b0
+100644 blob c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061	0 b1
+100644 blob e6bfff5c1d0f0ecd501552b43a1e13d8008abc31	0 b2
+100644 blob 6d0875c82a99774922eab07fbc08510fc85d9e0a	0 b3
+100644 blob 8e953e84d803f13fd06416a1bd8161dcd93cfd00	0 b4
+100644 blob 90a5159bf020296276ea5ca1bcd292a9b1de9947	0 b5
+100644 blob 07eb61d36f49569a2b0649af299f9f00013d0969	0 b6
+100644 blob 6e6d33cfc7b1581413a88ae0759202b25ac4cad1	0 b7
+100644 blob 5d453c66b522d8de5d99c03bd2bf8b65ca0bcf33	0 b8
+100644 blob 9a16e0d1a643983973291127012d2694a0b17fe8	0 b9
+100644 blob caecf05cdbb03e144f113ecab2b99e5ee74df706	0 c0
+100644 blob ae9304576a6ec3419b231b2b9c8e33a06f97f9fb	0 c1
+100644 blob 16f9ec009e5568c435f473ba3a1df732d49ce8c3	0 c2
+100644 blob 0771aea884dd394a7b12783d049f05b5599f41a4	0 c3
+100644 blob a103f673dd1b7c5727aa0ae0100419adc50e1b76	0 c4
+100644 blob c36357109ce20af8f90df3c0dd0784e89408d707	0 c5
+100644 blob 86a716504cbdc40a135faa5ab199d15e364c416d	0 c6
+100644 blob 20be68787e59f4cb8983b641d170c4baf8ea25dd	0 c7
+100644 blob bb420bc8fb9e91530fdc25e363f6b822d5195309	0 c8
+100644 blob f899bd1761a5ca5978799bc3189a04d3c52d8435	0 c9
+100644 blob 79a5e858be4a3a969e3b71406fef0d3d36e1d387	0 d0
+100644 blob 6f1852975b9306ae5d8dfdf0d4cb1f5cb36ac229	0 d1
+100644 blob fd3671590780b645e1bef030d550191f6cdf1c95	0 d2
+100644 blob 69c77a9ea746edd27b46107142fc2c5288c1daf5	0 d3
+100644 blob d7b30ee07d4b9819a77a3b122282b4c04528ec21	0 d4
+100644 blob fa590f3f8bfbef6095cf6525e8497b2b2b46445c	0 d5
+100644 blob fef4390d19cb98fa97efd44c09d4e2eb7b084b40	0 d6
+100644 blob a5adf29249757619b8890c86f2cfcfeee611b5d8	0 d7
+100644 blob 1859919d049c078ba63fcecbce60e697c6da8e01	0 d8
+100644 blob b6148c82443a60d1d5ce07872a85e3c544b5f4b0	0 d9
+100644 blob 4fe4106b50b257f3d6ffd23b750d2d1945c2608b	0 e0
+100644 blob 5ff91639494693b1f238b5dc9baf8be95142c3ab	0 e1
+100644 blob 3811af3ca744c2fb44077a8025c23b4d4166a449	0 e2
+100644 blob 9338c3fa1f74d202651154257572d32aed57cc16	0 e3
+100644 blob c5195815f83aa9ef1ebac9e11f14d62b26406c99	0 e4
+100644 blob 0c44c89ef9c29077cceebc6dd9ca0b3a950c95ee	0 e5
+100644 blob f17172bc54cfa55a9e531cc845dff39855cd8df0	0 e6
+100644 blob 29870e9ccff84f86938ee588a47b39cf3a802e6b	0 e7
+100644 blob e8d01d007452cede5c6eafc3343fc80675b1e2f9	0 e8
+100644 blob 0c1945ad576ffc445ad69a3fafd1d3c04cc0bd40	0 e9
+100644 blob 844dc808a1d3d769ddcf5430eac933d4d87ff606	0 f0
+100644 blob 8e1e71d5ce34c01b6fe83bc5051545f2918c8c2b	0 f1
+100644 blob 9de77c18733ab8009a956c25e28c85fe203a17d7	0 f2
+100644 blob 45d9e0e9fc8859787c33081dffdf12f41b54fcf3	0 f3
+100644 blob c48ac4847d3abae8e5899dcc5cf490a98df55755	0 f4
+100644 blob 14c61ecf25961ce674048103c5fa5ea3c535a5cd	0 f5
+100644 blob 59ce90029dfd9e224701a040a26153e9f2feb74c	0 f6
+100644 blob 0a7bd52ffb819609cf65f40eb91be62000db47e5	0 f7
+100644 blob c7e617f6b429a1f3b462df6add2b4ea2cf702faf	0 f8
+100644 blob a720d8c8d277ad31ee5b180bef57379b5f62517c	0 f9
+100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
+100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
+100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
+100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
+100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
+100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
+100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
+100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
+100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
+100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
+100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
+100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
+100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
+100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
+100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
+100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
+100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
+100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
+100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
+100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
+100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
+100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
+100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
+100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
+100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
+100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
+100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
+100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
+100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
+100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/test-8/.git/
+fatal: did not receive expected object 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02
+pack	499fed00672b4ac4e35132711ee1664a089f355e
+ok 33 - index-pack with --strict
+
+expecting success of 5300.34 'setup for --strict and --fsck-objects downgrading fsck msgs': 
+	git init strict &&
+	(
+		cd strict &&
+		test_commit first hello &&
+		cat >commit <<-EOF &&
+		tree $(git rev-parse HEAD^{tree})
+		parent $(git rev-parse HEAD)
+		author A U Thor
+		committer A U Thor
+
+		commit: this is a commit with bad emails
+
+		EOF
+		git hash-object --literally -t commit -w --stdin <commit >commit_list &&
+		git pack-objects test <commit_list >pack-name
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/strict/.git/
+[master (root-commit) 84f9e61] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello
+ok 34 - setup for --strict and --fsck-objects downgrading fsck msgs
+
+expecting success of 5300.35 'index-pack with --strict downgrading fsck msgs': 
+	test_with_bad_commit --strict --strict="missingEmail=ignore"
+
+error: object 754157ff66855f3f8d7afaa92a2c052776b99a16: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+e4e1649155bf444fbd9cd85e376628d6eaf3d3bd
+ok 35 - index-pack with --strict downgrading fsck msgs
+
+expecting success of 5300.36 'index-pack with --fsck-objects downgrading fsck msgs': 
+	test_with_bad_commit --fsck-objects --fsck-objects="missingEmail=ignore"
+
+error: object 754157ff66855f3f8d7afaa92a2c052776b99a16: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+e4e1649155bf444fbd9cd85e376628d6eaf3d3bd
+ok 36 - index-pack with --fsck-objects downgrading fsck msgs
+
+expecting success of 5300.37 'cleanup for --strict and --fsck-objects downgrading fsck msgs': 
+	rm -rf strict
+
+ok 37 - cleanup for --strict and --fsck-objects downgrading fsck msgs
+
+expecting success of 5300.38 'honor pack.packSizeLimit': 
+	git config pack.packSizeLimit 3m &&
+	packname_10=$(git pack-objects test-10 <obj-list) &&
+	test 2 = $(ls test-10-*.pack | wc -l)
+
+ok 38 - honor pack.packSizeLimit
+
+expecting success of 5300.39 'verify resulting packs': 
+	git verify-pack test-10-*.pack
+
+ok 39 - verify resulting packs
+
+expecting success of 5300.40 'tolerate packsizelimit smaller than biggest object': 
+	git config pack.packSizeLimit 1 &&
+	packname_11=$(git pack-objects test-11 <obj-list) &&
+	test 5 = $(ls test-11-*.pack | wc -l)
+
+warning: minimum pack size limit is 1 MiB
+ok 40 - tolerate packsizelimit smaller than biggest object
+
+expecting success of 5300.41 'verify resulting packs': 
+	git verify-pack test-11-*.pack
+
+ok 41 - verify resulting packs
+
+expecting success of 5300.42 'set up pack for non-repo tests': 
+	# make sure we have a pack with no matching index file
+	cp test-1-*.pack foo.pack
+
+ok 42 - set up pack for non-repo tests
+
+expecting success of 5300.43 'index-pack --stdin complains of non-repo': 
+	nongit test_must_fail git index-pack --object-format=$(test_oid algo) --stdin <foo.pack &&
+	test_path_is_missing non-repo/.git
+
+fatal: --stdin requires a git repository
+ok 43 - index-pack --stdin complains of non-repo
+
+expecting success of 5300.44 'index-pack <pack> works in non-repo': 
+	nongit git index-pack --object-format=$(test_oid algo) ../foo.pack &&
+	test_path_is_file foo.idx
+
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+ok 44 - index-pack <pack> works in non-repo
+
+expecting success of 5300.45 'index-pack --strict <pack> works in non-repo': 
+	rm -f foo.idx &&
+	nongit git index-pack --strict --object-format=$(test_oid algo) ../foo.pack &&
+	test_path_is_file foo.idx
+
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+ok 45 - index-pack --strict <pack> works in non-repo
+
+checking prerequisite: DEFAULT_HASH_ALGORITHM
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_HASH_ALGORITHM" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_HASH_ALGORITHM" &&
+	test "$GIT_TEST_BUILTIN_HASH" = "$GIT_DEFAULT_HASH"
+
+)
+prerequisite DEFAULT_HASH_ALGORITHM ok
+expecting success of 5300.46 'show-index works OK outside a repository': 
+	nongit git show-index <foo.idx
+
+335 012b05d476b4ffc9e62d036156b99467206f1efa (c00fe8a7)
+4195970 0be779221aca65277fd447c8207e1b3c2706ae20 (e9e93ee1)
+12 3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 (8abd2aad)
+2098168 6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf (902113ef)
+304 9d235ed07cd19811a6ceb342de82f190e49c9f68 (bfe5d115)
+4196001 b010fe5253f7dc59c6605dacb92fcea00d199d4e (f8ed20b0)
+2098137 c82de19312b6c3695c0c18f70709a6c535682a67 (cf484043)
+181 ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe (512ec580)
+ok 46 - show-index works OK outside a repository
+
+expecting success of 5300.47 'show-index works OK outside a repository with hash algo passed in via --object-format': 
+		test_when_finished "rm -rf explicit-hash-$hash" &&
+		git init --object-format=$hash explicit-hash-$hash &&
+		test_commit -C explicit-hash-$hash one &&
+		git -C explicit-hash-$hash rev-parse one >in &&
+		git -C explicit-hash-$hash pack-objects explicit-hash-$hash <in &&
+		idx=$(echo explicit-hash-$hash/explicit-hash-$hash*.idx) &&
+		nongit git show-index --object-format=$hash <"$idx" >actual &&
+		test_line_count = 1 actual
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/explicit-hash-sha1/.git/
+[master (root-commit) 4331c28] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+acdb9ae06f04f82d5e6a285e1bafea173d44bc45
+ok 47 - show-index works OK outside a repository with hash algo passed in via --object-format
+
+expecting success of 5300.48 'show-index works OK outside a repository with hash algo passed in via --object-format': 
+		test_when_finished "rm -rf explicit-hash-$hash" &&
+		git init --object-format=$hash explicit-hash-$hash &&
+		test_commit -C explicit-hash-$hash one &&
+		git -C explicit-hash-$hash rev-parse one >in &&
+		git -C explicit-hash-$hash pack-objects explicit-hash-$hash <in &&
+		idx=$(echo explicit-hash-$hash/explicit-hash-$hash*.idx) &&
+		nongit git show-index --object-format=$hash <"$idx" >actual &&
+		test_line_count = 1 actual
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/explicit-hash-sha256/.git/
+[master (root-commit) 9185f47] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+9b2641231de0d658b94f3140148aeae12672826d54b5fbede03e02dbf4f990bd
+ok 48 - show-index works OK outside a repository with hash algo passed in via --object-format
+
+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 49 # skip index-pack --threads=N or pack.threads=N warns when no pthreads (missing !PTHREADS of !PTHREADS,!FAIL_PREREQS)
+
+ok 50 # skip pack-objects --threads=N or pack.threads=N warns when no pthreads (missing !PTHREADS of !PTHREADS,!FAIL_PREREQS)
+
+expecting success of 5300.51 'pack-objects in too-many-packs mode': 
+	GIT_TEST_FULL_IN_PACK_ARRAY=1 git repack -ad &&
+	git fsck
+
+warning: minimum pack size limit is 1 MiB
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tree ebe633107a37152edb13864b30d6878084f68c92
+dangling tree eb486020614a4c764f9df37263317ed4ea372ef8
+dangling commit ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe
+ok 51 - pack-objects in too-many-packs mode
+
+expecting success of 5300.52 'setup: fake a SHA1 hash collision': 
+	git init corrupt &&
+	(
+		cd corrupt &&
+		long_a=$(git hash-object -w ../a | sed -e "s!^..!&/!") &&
+		long_b=$(git hash-object -w ../b | sed -e "s!^..!&/!") &&
+		test -f	.git/objects/$long_b &&
+		cp -f	.git/objects/$long_a \
+			.git/objects/$long_b
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/corrupt/.git/
+ok 52 - setup: fake a SHA1 hash collision
+
+expecting success of 5300.53 'make sure index-pack detects the SHA1 collision': 
+	(
+		cd corrupt &&
+		test_must_fail git index-pack -o ../bad.idx ../test-3.pack 2>msg &&
+		test_grep "SHA1 COLLISION FOUND" msg
+	)
+
+fatal: SHA1 COLLISION FOUND WITH c82de19312b6c3695c0c18f70709a6c535682a67 !
+ok 53 - make sure index-pack detects the SHA1 collision
+
+expecting success of 5300.54 'make sure index-pack detects the SHA1 collision (large blobs)': 
+	(
+		cd corrupt &&
+		test_must_fail git -c core.bigfilethreshold=1 index-pack -o ../bad.idx ../test-3.pack 2>msg &&
+		test_grep "SHA1 COLLISION FOUND" msg
+	)
+
+fatal: SHA1 COLLISION FOUND WITH c82de19312b6c3695c0c18f70709a6c535682a67 !
+ok 54 - make sure index-pack detects the SHA1 collision (large blobs)
+
+expecting success of 5300.55 'prefetch objects': 
+	rm -rf server client &&
+
+	git init server &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server protocol.version 2 &&
+
+	echo one >server/one &&
+	git -C server add one &&
+	git -C server commit -m one &&
+	git -C server branch one_branch &&
+
+	echo two_a >server/two_a &&
+	echo two_b >server/two_b &&
+	git -C server add two_a two_b &&
+	git -C server commit -m two &&
+
+	echo three >server/three &&
+	git -C server add three &&
+	git -C server commit -m three &&
+	git -C server branch three_branch &&
+
+	# Clone, fetch "two" with blobs excluded, and re-push it. This requires
+	# the client to have the blobs of "two" - verify that these are
+	# prefetched in one batch.
+	git clone --filter=blob:none --single-branch -b one_branch \
+		"file://$(pwd)/server" client &&
+	test_config -C client protocol.version 2 &&
+	TWO=$(git -C server rev-parse three_branch^) &&
+	git -C client fetch --filter=blob:none origin "$TWO" &&
+	GIT_TRACE_PACKET=$(pwd)/trace git -C client push origin "$TWO":refs/heads/two_branch &&
+	grep "fetch> done" trace >donelines &&
+	test_line_count = 1 donelines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/server/.git/
+[master (root-commit) 7d92f94] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+[master a9c9a29] two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 two_a
+ create mode 100644 two_b
+[master d4af973] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three
+Cloning into 'client'...
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/server
+ * branch            a9c9a2938d723a122aa8e03710f837cd647b4f30 -> FETCH_HEAD
+To file:///build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/server
+ * [new branch]      a9c9a2938d723a122aa8e03710f837cd647b4f30 -> two_branch
+ok 55 - prefetch objects
+
+expecting success of 5300.56 'verify-pack with sha1 packfile': 
+		test_when_finished "rm -rf repo" &&
+		git init --object-format=$hash repo &&
+		test_commit -C repo initial &&
+		git -C repo repack -ad &&
+		git -C repo verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
+		if test $hash = $GIT_TEST_BUILTIN_HASH
+		then
+			nongit git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx
+		else
+			# We have no way to identify the hash used by packfiles
+			# or indices, so we always fall back to SHA1.
+			nongit test_must_fail git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
+			# But with an explicit object format we should succeed.
+			nongit git verify-pack --object-format=$hash "$(pwd)"/repo/.git/objects/pack/*.idx
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/repo/.git/
+[master (root-commit) 23fa7ba] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 56 - verify-pack with sha1 packfile
+
+expecting success of 5300.57 'index-pack outside of a sha1 repository': 
+		test_when_finished "rm -rf repo" &&
+		git init --object-format=$hash repo &&
+		test_commit -C repo initial &&
+		git -C repo repack -ad &&
+		git -C repo index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack &&
+		if test $hash = $GIT_TEST_BUILTIN_HASH
+		then
+			nongit git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack
+		else
+			# We have no way to identify the hash used by packfiles
+			# or indices, so we always fall back to SHA1.
+			nongit test_must_fail git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack 2>err &&
+			# But with an explicit object format we should succeed.
+			nongit git index-pack --object-format=$hash --verify "$(pwd)"/repo/.git/objects/pack/*.pack
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/repo/.git/
+[master (root-commit) 31243c6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 57 - index-pack outside of a sha1 repository
+
+expecting success of 5300.58 'verify-pack with sha256 packfile': 
+		test_when_finished "rm -rf repo" &&
+		git init --object-format=$hash repo &&
+		test_commit -C repo initial &&
+		git -C repo repack -ad &&
+		git -C repo verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
+		if test $hash = $GIT_TEST_BUILTIN_HASH
+		then
+			nongit git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx
+		else
+			# We have no way to identify the hash used by packfiles
+			# or indices, so we always fall back to SHA1.
+			nongit test_must_fail git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
+			# But with an explicit object format we should succeed.
+			nongit git verify-pack --object-format=$hash "$(pwd)"/repo/.git/objects/pack/*.idx
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/repo/.git/
+[master (root-commit) 24ce812] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+error: wrong index v2 file size in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/repo/.git/objects/pack/pack-1b1240ab533163a4b525e5814f51ec3256428f79647ff13f19dfc1f2fe16cc2a.idx
+fatal: Cannot open existing pack idx file for '/build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/repo/.git/objects/pack/pack-1b1240ab533163a4b525e5814f51ec3256428f79647ff13f19dfc1f2fe16cc2a.idx'
+ok 58 - verify-pack with sha256 packfile
+
+expecting success of 5300.59 'index-pack outside of a sha256 repository': 
+		test_when_finished "rm -rf repo" &&
+		git init --object-format=$hash repo &&
+		test_commit -C repo initial &&
+		git -C repo repack -ad &&
+		git -C repo index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack &&
+		if test $hash = $GIT_TEST_BUILTIN_HASH
+		then
+			nongit git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack
+		else
+			# We have no way to identify the hash used by packfiles
+			# or indices, so we always fall back to SHA1.
+			nongit test_must_fail git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack 2>err &&
+			# But with an explicit object format we should succeed.
+			nongit git index-pack --object-format=$hash --verify "$(pwd)"/repo/.git/objects/pack/*.pack
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/repo/.git/
+[master (root-commit) 699ee1a] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 59 - index-pack outside of a sha256 repository
+
+expecting success of 5300.60 'valid and invalid --name-hash-versions': 
+	sane_unset GIT_TEST_NAME_HASH_VERSION &&
+
+	# Valid values are hard to verify other than "do not fail".
+	# Performance tests will be more valuable to validate these versions.
+	# Negative values are converted to version 1.
+	for value in -1 1 2
+	do
+		git pack-objects base --all --name-hash-version=$value || return 1
+	done &&
+
+	# Invalid values have clear post-conditions.
+	for value in 0 3
+	do
+		test_must_fail git pack-objects base --all --name-hash-version=$value 2>err &&
+		test_grep "invalid --name-hash-version option" err || return 1
+	done
+
+warning: minimum pack size limit is 1 MiB
+029d08823bd8a8eab510ad6ac75c823cfd3ed31e
+warning: minimum pack size limit is 1 MiB
+029d08823bd8a8eab510ad6ac75c823cfd3ed31e
+warning: minimum pack size limit is 1 MiB
+029d08823bd8a8eab510ad6ac75c823cfd3ed31e
+fatal: invalid --name-hash-version option: 0
+fatal: invalid --name-hash-version option: 3
+ok 60 - valid and invalid --name-hash-versions
+
+expecting success of 5300.61 '--name-hash-version=2 and --write-bitmap-index are incompatible': 
+	git pack-objects base --all --name-hash-version=2 --write-bitmap-index 2>err &&
+	test_grep "currently, --write-bitmap-index requires --name-hash-version=1" err &&
+
+	# --stdout option silently removes --write-bitmap-index
+	git pack-objects --stdout --all --name-hash-version=2 --write-bitmap-index >out 2>err &&
+	! test_grep "currently, --write-bitmap-index requires --name-hash-version=1" err
+
+029d08823bd8a8eab510ad6ac75c823cfd3ed31e
+warning: currently, --write-bitmap-index requires --name-hash-version=1
+error: 'grep currently, --write-bitmap-index requires --name-hash-version=1 err' didn't find a match in:
+<File 'err' is empty>
+ok 61 - --name-hash-version=2 and --write-bitmap-index are incompatible
+
+expecting success of 5300.62 '--path-walk pack everything': 
+	git -C server rev-parse HEAD >in &&
+	GIT_PROGRESS_DELAY=0 git -C server pack-objects \
+		--stdout --revs --path-walk --progress <in >out.pack 2>err &&
+	grep "Compressing objects by path" err &&
+	git -C server index-pack --stdin <out.pack
+
+Compressing objects by path:  10% (1/10)
Compressing objects by path:  20% (2/10)
Compressing objects by path:  30% (3/10)
Compressing objects by path:  40% (4/10)
Compressing objects by path:  50% (5/10)
Compressing objects by path: 100% (10/10)
Compressing objects by path: 100% (10/10), done.
+pack	048bec49b34933de3f054cd48af9b2b23b8a100c
+ok 62 - --path-walk pack everything
+
+expecting success of 5300.63 '--path-walk thin pack': 
+	cat >in <<-EOF &&
+	$(git -C server rev-parse HEAD)
+	^$(git -C server rev-parse HEAD~2)
+	EOF
+	GIT_PROGRESS_DELAY=0 git -C server pack-objects \
+		--thin --stdout --revs --path-walk --progress <in >out.pack 2>err &&
+	grep "Compressing objects by path" err &&
+	git -C server index-pack --fix-thin --stdin <out.pack
+
+Compressing objects by path:  11% (1/9)
Compressing objects by path:  22% (2/9)
Compressing objects by path:  33% (3/9)
Compressing objects by path: 100% (9/9)
Compressing objects by path: 100% (9/9), done.
+pack	09393f9419a0ddc800ca1402099cfe87d43177be
+ok 63 - --path-walk thin pack
+
+# passed all 63 test(s)
+1..63
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5332-multi-pack-reuse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5332-multi-pack-reuse/.git/
+expecting success of 5332.1 'preferred pack is reused for single-pack reuse': 
+	test_config pack.allowPackReuse single &&
+
+	for i in A B
+	do
+		test_commit "$i" &&
+		git repack -d || return 1
+	done &&
+
+	git multi-pack-index write --bitmap &&
+
+	test_pack_objects_reused_all 3 1
+
+[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
+{"event":"data","sid":"20260929T145246.143924Z-H5c947e1c-P0022c84a","thread":"main","time":"2026-09-29T14:52:46.145066Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001361,"t_rel":0.001361,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260929T145246.143924Z-H5c947e1c-P0022c84a","thread":"main","time":"2026-09-29T14:52:46.145070Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001365,"t_rel":0.001365,"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":"20260929T145246.169891Z-H5c947e1c-P0022c8a1","thread":"main","time":"2026-09-29T14:52:46.171028Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001331,"t_rel":0.001331,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260929T145246.169891Z-H5c947e1c-P0022c8a1","thread":"main","time":"2026-09-29T14:52:46.171032Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001335,"t_rel":0.001335,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+de700bb9d264590842bcbfd30aa3296a833289e8
+ok 2 - multi-pack reuse is disabled by default
+
+expecting success of 5332.3 'feature.experimental implies multi-pack reuse': 
+	test_config feature.experimental true &&
+
+	test_pack_objects_reused_all 6 2
+
+{"event":"data","sid":"20260929T145246.188707Z-H5c947e1c-P0022c8e7","thread":"main","time":"2026-09-29T14:52:46.189887Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001388,"t_rel":0.001388,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20260929T145246.188707Z-H5c947e1c-P0022c8e7","thread":"main","time":"2026-09-29T14:52:46.189891Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001392,"t_rel":0.001392,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+de700bb9d264590842bcbfd30aa3296a833289e8
+ok 3 - feature.experimental implies multi-pack reuse
+
+expecting success of 5332.4 'multi-pack reuse can be disabled with feature.experimental': 
+	test_config feature.experimental true &&
+	test_config pack.allowPackReuse single &&
+
+	test_pack_objects_reused_all 3 1
+
+{"event":"data","sid":"20260929T145246.224998Z-H5c947e1c-P0022c95f","thread":"main","time":"2026-09-29T14:52:46.226130Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001351,"t_rel":0.001351,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260929T145246.224998Z-H5c947e1c-P0022c95f","thread":"main","time":"2026-09-29T14:52:46.226134Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001354,"t_rel":0.001354,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+de700bb9d264590842bcbfd30aa3296a833289e8
+ok 4 - multi-pack reuse can be disabled with feature.experimental
+
+expecting success of 5332.5 'enable multi-pack reuse': 
+	git config pack.allowPackReuse multi
+
+ok 5 - enable multi-pack reuse
+
+expecting success of 5332.6 'reuse all objects from subset of bitmapped packs': 
+	test_commit C &&
+	git repack -d &&
+
+	git multi-pack-index write --bitmap &&
+
+	cat >in <<-EOF &&
+	$(git rev-parse C)
+	^$(git rev-parse A)
+	EOF
+
+	test_pack_objects_reused 6 2 <in
+
+[master 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+{"event":"data","sid":"20260929T145246.314018Z-H5c947e1c-P0022caa2","thread":"main","time":"2026-09-29T14:52:46.315079Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001251,"t_rel":0.001251,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20260929T145246.314018Z-H5c947e1c-P0022caa2","thread":"main","time":"2026-09-29T14:52:46.315083Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001256,"t_rel":0.001256,"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":"20260929T145246.329889Z-H5c947e1c-P0022cadc","thread":"main","time":"2026-09-29T14:52:46.331006Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001310,"t_rel":0.001310,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"9"}
+{"event":"data","sid":"20260929T145246.329889Z-H5c947e1c-P0022cadc","thread":"main","time":"2026-09-29T14:52:46.331010Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001315,"t_rel":0.001315,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
+1340c9de031f500be0a197f1242f00a34ed6e9b8
+ok 7 - reuse all objects from all packs
+
+expecting success of 5332.8 'reuse objects from first pack with middle gap': 
+	for i in D E F
+	do
+		test_commit "$i" || return 1
+	done &&
+
+	# Set "pack.window" to zero to ensure that we do not create any
+	# deltas, which could alter the amount of pack reuse we perform
+	# (if, for e.g., we are not sending one or more bases).
+	D="$(git -c pack.window=0 pack-objects --all --unpacked $packdir/pack)" &&
+
+	d_pos="$(pack_position $(git rev-parse D) <$packdir/pack-$D.idx)" &&
+	e_pos="$(pack_position $(git rev-parse E) <$packdir/pack-$D.idx)" &&
+	f_pos="$(pack_position $(git rev-parse F) <$packdir/pack-$D.idx)" &&
+
+	# commits F, E, and D, should appear in that order at the
+	# beginning of the pack
+	test $f_pos -lt $e_pos &&
+	test $e_pos -lt $d_pos &&
+
+	# Ensure that the pack we are constructing sorts ahead of any
+	# other packs in lexical/bitmap order by choosing it as the
+	# preferred pack.
+	git multi-pack-index write --bitmap --preferred-pack="pack-$D.idx" &&
+
+	cat >in <<-EOF &&
+	$(git rev-parse E)
+	^$(git rev-parse D)
+	EOF
+
+	test_pack_objects_reused 3 1 <in
+
+[master be8f64f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[master ee2ad00] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+[master 5374d8c] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+{"event":"data","sid":"20260929T145246.486631Z-H5c947e1c-P0022ccf9","thread":"main","time":"2026-09-29T14:52:46.487782Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001344,"t_rel":0.001344,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260929T145246.486631Z-H5c947e1c-P0022ccf9","thread":"main","time":"2026-09-29T14:52:46.487804Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001348,"t_rel":0.001348,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+cdf9ddd5f15e5bb16ac5756b24c63adf8a8cc1c1
+ok 8 - reuse objects from first pack with middle gap
+
+expecting success of 5332.9 'reuse objects from middle pack with middle gap': 
+	rm -fr $packdir/multi-pack-index* &&
+
+	# Ensure that the pack we are constructing sort into any
+	# position *but* the first one, by choosing a different pack as
+	# the preferred one.
+	git multi-pack-index write --bitmap --preferred-pack="pack-$A.idx" &&
+
+	cat >in <<-EOF &&
+	$(git rev-parse E)
+	^$(git rev-parse D)
+	EOF
+
+	test_pack_objects_reused 3 1 <in
+
+warning: unknown preferred pack: 'pack-.idx'
+{"event":"data","sid":"20260929T145246.526863Z-H5c947e1c-P0022cd8e","thread":"main","time":"2026-09-29T14:52:46.528048Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001382,"t_rel":0.001382,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260929T145246.526863Z-H5c947e1c-P0022cd8e","thread":"main","time":"2026-09-29T14:52:46.528052Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001387,"t_rel":0.001387,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+cdf9ddd5f15e5bb16ac5756b24c63adf8a8cc1c1
+ok 9 - reuse objects from middle pack with middle gap
+
+expecting success of 5332.10 'omit delta with uninteresting base (same pack)': 
+	git repack -adk &&
+
+	test_seq 32 >f &&
+	git add f &&
+	test_tick &&
+	git commit -m "delta" &&
+	delta="$(git rev-parse HEAD)" &&
+
+	test_seq 64 >f &&
+	test_tick &&
+	git commit -a -m "base" &&
+	base="$(git rev-parse HEAD)" &&
+
+	test_commit other &&
+
+	git repack -d &&
+
+	have_delta "$(git rev-parse $delta:f)" "$(git rev-parse $base:f)" &&
+
+	git multi-pack-index write --bitmap &&
+
+	cat >in <<-EOF &&
+	$(git rev-parse other)
+	^$base
+	EOF
+
+	# We can only reuse the 3 objects corresponding to "other" from
+	# the latest pack.
+	#
+	# This is because even though we want "delta", we do not want
+	# "base", meaning that we have to inflate the delta/base-pair
+	# corresponding to the blob in commit "delta", which bypasses
+	# the pack-reuse mechanism.
+	#
+	# The remaining objects from the other pack are similarly not
+	# reused because their objects are on the uninteresting side of
+	# the query.
+	test_pack_objects_reused 3 1 <in
+
+[master 16753ad] delta
+ Author: A U Thor <author@example.com>
+ 1 file changed, 32 insertions(+)
+ create mode 100644 f
+[master f40fa4a] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 32 insertions(+)
+[master e389016] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+{"event":"data","sid":"20260929T145246.652760Z-H5c947e1c-P0022cf68","thread":"main","time":"2026-09-29T14:52:46.653926Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001367,"t_rel":0.001367,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260929T145246.652760Z-H5c947e1c-P0022cf68","thread":"main","time":"2026-09-29T14:52:46.653930Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001371,"t_rel":0.001371,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+341840e0d76cb213079e38bae778b53364232eb5
+ok 10 - omit delta with uninteresting base (same pack)
+
+expecting success of 5332.11 'omit delta from uninteresting base (cross pack)': 
+	cat >in <<-EOF &&
+	$(git rev-parse $base)
+	^$(git rev-parse $delta)
+	EOF
+
+	P="$(git pack-objects --revs $packdir/pack <in)" &&
+
+	git multi-pack-index write --bitmap --preferred-pack="pack-$P.idx" &&
+
+	packs_nr="$(find $packdir -type f -name "pack-*.pack" | wc -l)" &&
+	objects_nr="$(git rev-list --count --all --objects)" &&
+
+	test_pack_objects_reused_all $(($objects_nr - 1)) $packs_nr
+
+{"event":"data","sid":"20260929T145246.727846Z-H5c947e1c-P0022d05e","thread":"main","time":"2026-09-29T14:52:46.729683Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.002058,"t_rel":0.002058,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"26"}
+{"event":"data","sid":"20260929T145246.727846Z-H5c947e1c-P0022d05e","thread":"main","time":"2026-09-29T14:52:46.729687Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.002062,"t_rel":0.002062,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
+def7cb61a9e70183adbf1acab0912d686622303a
+ok 11 - omit delta from uninteresting base (cross pack)
+
+expecting success of 5332.12 'non-omitted delta in MIDX preferred pack': 
+	test_config pack.allowPackReuse single &&
+
+	cat >p1.objects <<-EOF &&
+	$(git rev-parse $base)
+	^$(git rev-parse $delta^)
+	EOF
+	cat >p2.objects <<-EOF &&
+	$(git rev-parse F)
+	EOF
+
+	p1="$(git pack-objects --revs $packdir/pack <p1.objects)" &&
+	p2="$(git pack-objects --revs $packdir/pack <p2.objects)" &&
+
+	cat >in <<-EOF &&
+	pack-$p1.idx
+	pack-$p2.idx
+	EOF
+	git multi-pack-index write --bitmap --stdin-packs \
+		--preferred-pack=pack-$p1.pack <in &&
+
+	git show-index <$packdir/pack-$p1.idx >expect &&
+
+	test_pack_objects_reused_all $(wc -l <expect) 1
+
+{"event":"data","sid":"20260929T145246.791602Z-H5c947e1c-P0022d13e","thread":"main","time":"2026-09-29T14:52:46.793626Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.002220,"t_rel":0.002220,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20260929T145246.791602Z-H5c947e1c-P0022d13e","thread":"main","time":"2026-09-29T14:52:46.793630Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.002224,"t_rel":0.002224,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+48c334c15e539df3382db77f74c864a1d31091b9
+ok 12 - non-omitted delta in MIDX preferred pack
+
+expecting success of 5332.13 'duplicate objects': 
+	git init duplicate-objects &&
+	(
+		cd duplicate-objects &&
+
+		git config pack.allowPackReuse multi &&
+
+		test_commit base &&
+
+		git repack -a &&
+
+		git rev-parse HEAD^{tree} >in &&
+		p="$(git pack-objects $packdir/pack <in)" &&
+
+		git multi-pack-index write --bitmap --preferred-pack=pack-$p.idx &&
+
+		objects_nr="$(git rev-list --count --all --objects)" &&
+		packs_nr="$(find $packdir -type f -name "pack-*.pack" | wc -l)" &&
+
+		test_pack_objects_reused_all $objects_nr $packs_nr
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5332-multi-pack-reuse/duplicate-objects/.git/
+[master (root-commit) c1bac7b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+{"event":"data","sid":"20260929T145246.880298Z-H5c947e1c-P0022d27b","thread":"main","time":"2026-09-29T14:52:46.881392Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001283,"t_rel":0.001283,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260929T145246.880298Z-H5c947e1c-P0022d27b","thread":"main","time":"2026-09-29T14:52:46.881396Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001288,"t_rel":0.001288,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+b572b333cdb15dbb54fe65e0e1361617040627d7
+ok 13 - duplicate objects
+
+expecting success of 5332.14 'duplicate objects with verbatim reuse': 
+	git init duplicate-objects-verbatim &&
+	(
+		cd duplicate-objects-verbatim &&
+
+		git config pack.allowPackReuse multi &&
+
+		test_commit_bulk 64 &&
+
+		# take the first object from the main pack...
+		git show-index <$(ls $packdir/pack-*.idx) >obj.raw &&
+		sort -nk1 <obj.raw | head -n1 | cut -d" " -f2 >in &&
+
+		# ...and create a separate pack containing just that object
+		p="$(git pack-objects $packdir/pack <in)" &&
+
+		git multi-pack-index write --bitmap --preferred-pack=pack-$p.idx &&
+
+		test_pack_objects_reused_all 192 2
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5332-multi-pack-reuse/duplicate-objects-verbatim/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          192 (         0 duplicates                  )
+      blobs  :           64 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           64 (         0 duplicates         62 deltas of         62 attempts)
+      commits:           64 (         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:             64
+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              =      15727 /      15727
+---------------------------------------------------------------------
+
+{"event":"data","sid":"20260929T145246.985721Z-H5c947e1c-P0022d3f4","thread":"main","time":"2026-09-29T14:52:46.987188Z","file":"builtin/pack-objects.c","line":5271,"repo":1,"t_abs":0.001669,"t_rel":0.001669,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"192"}
+{"event":"data","sid":"20260929T145246.985721Z-H5c947e1c-P0022d3f4","thread":"main","time":"2026-09-29T14:52:46.987192Z","file":"builtin/pack-objects.c","line":5272,"repo":1,"t_abs":0.001673,"t_rel":0.001673,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+1ebceb2b5297fe50c38004c13872ae869e743ceb
+ok 14 - duplicate objects with verbatim reuse
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5302-pack-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5302-pack-index/.git/
+ok 1 - setup
+
+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"
+
+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
+
+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"
 
-		git checkout main &&
-		git branch -D other &&
-		git tag -d cruft &&
-		git reflog expire --all --expire=all &&
+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
 
-		git repack --cruft -d &&
+expecting success of 5302.4 'both packs should be identical': 
+	cmp "test-1-${pack1}.pack" "test-2-${pack2}.pack"
 
-		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
-	)
+ok 4 - both packs should be identical
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 17 - loose objects mtimes upsert others
+expecting success of 5302.5 'index v1 and index v2 should be different': 
+	! cmp "test-1-${pack1}.idx" "test-2-${pack2}.idx"
 
-expecting success of 5329.18 'expiring cruft objects with git gc': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+test-1-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx test-2-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx differ: char 1, line 1
+ok 5 - index v1 and index v2 should be different
 
-		test_commit reachable &&
-		git branch -M main &&
-		git checkout --orphan other &&
-		test_commit unreachable &&
+expecting success of 5302.6 'index-pack with index version 1': 
+	git index-pack --index-version=1 -o 1.idx "test-1-${pack1}.pack"
 
-		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 &&
+1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 6 - index-pack with index version 1
 
-		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 5302.7 'index-pack with index version 2': 
+	git index-pack --index-version=2 -o 2.idx "test-1-${pack1}.pack"
 
-		# Write a cruft pack containing all unreachable objects.
-		git gc --cruft --prune="01-01-1980" &&
+1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 7 - index-pack with index version 2
 
-		mtimes=$(ls .git/objects/pack/pack-*.mtimes) &&
-		test_path_is_file $mtimes &&
+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"
 
-		# Prune all unreachable objects from the cruft pack.
-		git gc --cruft --prune=now &&
+ok 8 - index-pack results should match pack-objects ones
 
-		git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
+expecting success of 5302.9 'index-pack --verify on index version 1': 
+	git index-pack --verify "test-1-${pack1}.pack"
 
-		comm -23 unreachable objects >removed &&
-		test_cmp unreachable removed &&
-		test_path_is_missing $mtimes
-	)
+ok 9 - index-pack --verify on index version 1
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 18 - expiring cruft objects with git gc
+expecting success of 5302.10 'index-pack --verify on index version 2': 
+	git index-pack --verify "test-2-${pack2}.pack"
 
-expecting success of 5329.19 'cruft --local drops unreachable objects': 
-	git init alternate &&
-	git init repo &&
-	test_when_finished "rm -fr alternate repo" &&
+ok 10 - index-pack --verify on index version 2
 
-	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 &&
+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
 
-	(
-		cd repo &&
+fatal: bad index version '2,'
+ok 11 - pack-objects --index-version=2, is not accepted
 
-		object="$(git -C ../alternate rev-parse HEAD:base.t)" &&
-		git -C ../alternate cat-file -p $object >contents &&
+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)
 
-		# 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)" &&
+ok 12 - index v2: force some 64-bit offsets with pack-objects
 
-		( cd ../alternate/.git/objects && pwd ) \
-		       >.git/objects/info/alternates &&
+expecting success of 5302.13 'index v2: verify a pack with some 64-bit offsets': 
+	git verify-pack -v "test-3-${pack3}.pack"
 
-		test_path_is_file $objdir/$(test_oid_to_path $cruft) &&
-		test_path_is_file $objdir/$(test_oid_to_path $object) &&
+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
 
-		git repack -d --cruft --local &&
+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"
 
-		test-tool pack-mtimes "$(basename $(ls $packdir/pack-*.mtimes))" \
-		       >objects &&
-		! grep $object objects &&
-		grep $cruft objects
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5329-pack-objects-cruft/alternate/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 (root-commit) 5e824fb] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-df967b96a579e45a18b8251732d16804b2e56a55
-822216280fd1de308f55f27cdd7a4196a8f5a189 1756282893
-ok 19 - cruft --local drops unreachable objects
+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"
 
-expecting success of 5329.20 'MIDX bitmaps tolerate reachable cruft objects': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 15 - index v2: force some 64-bit offsets with index-pack
 
-		test_commit reachable &&
-		test_commit cruft &&
-		unreachable="$(git rev-parse cruft)" &&
+expecting success of 5302.16 '64-bit offsets: index-pack result should match pack-objects one': 
+	cmp "test-3-${pack3}.idx" "3.idx"
 
-		git reset --hard $unreachable^ &&
-		git tag -d cruft &&
-		git reflog expire --all --expire=all &&
+ok 16 - 64-bit offsets: index-pack result should match pack-objects one
 
-		git repack --cruft -d &&
+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"
 
-		# 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 &&
+ok 17 - index-pack --verify on 64-bit offset v2 (cheat)
 
-		git repack --write-midx --write-bitmap-index --geometric=2 -d
-	)
+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.51.0/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 reachable.t
-[master 40cbb3e] cruft
- 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
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 resurrect.t
-ok 20 - MIDX bitmaps tolerate reachable cruft objects
+ok 18 - index-pack --verify on 64-bit offset v2
 
-expecting success of 5329.21 'cruft objects are freshend via loose': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd 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"
 
-		echo "cruft" >contents &&
-		blob="$(git hash-object -w -t blob contents)" &&
-		loose="$objdir/$(test_oid_to_path $blob)" &&
+pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 19 - [index v1] 1) stream pack to repository
 
-		test_commit base &&
+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 repack --cruft -d &&
+20+0 records in
+20+0 records out
+20 bytes copied, 4.108e-05 s, 487 kB/s
+ok 20 - [index v1] 2) create a stealth corruption in a delta base reference
 
-		test_path_is_missing "$loose" &&
-		test-tool pack-mtimes "$(basename "$(ls $packdir/pack-*.mtimes)")" >cruft &&
-		grep "$blob" cruft &&
+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
 
-		# write the same object again
-		git hash-object -w -t blob contents &&
+file_101 file_101_foo1 differ: char 5, line 2
+ok 21 - [index v1] 3) corrupted delta happily returned wrong data
 
-		test_path_is_file "$loose"
-	)
+expecting success of 5302.22 '[index v1] 4) confirm that the pack is actually corrupted': 
+	test_must_fail git fsck --full $commit
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-822216280fd1de308f55f27cdd7a4196a8f5a189 1756282893
-822216280fd1de308f55f27cdd7a4196a8f5a189
-ok 21 - cruft objects are freshend via loose
+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 5329.22 'gc.recentObjectsHook': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+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"
 
-		# 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 &&
+ok 23 - [index v1] 5) pack-objects happily reuses corrupted data
 
-		git checkout --orphan discard &&
-		git rm -fr . &&
-		test_commit --no-tag cruft.discard &&
+expecting success of 5302.24 '[index v1] 6) newly created pack is BAD !': 
+	test_must_fail git verify-pack -v "test-4-${pack4}.pack"
 
-		git checkout --orphan old &&
-		git rm -fr . &&
-		test_commit --no-tag cruft.old &&
-		cruft_old="$(git rev-parse HEAD)" &&
+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 !
 
-		git checkout --orphan new &&
-		git rm -fr . &&
-		test_commit --no-tag cruft.new &&
-		cruft_new="$(git rev-parse HEAD)" &&
+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"
 
-		git checkout main &&
-		git branch -D discard old new &&
-		git reflog expire --all --expire=all &&
+pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 25 - [index v2] 1) stream pack to repository
 
-		# 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 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
 
-		# 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 &&
+20+0 records in
+20+0 records out
+20 bytes copied, 4.124e-05 s, 485 kB/s
+ok 26 - [index v2] 2) create a stealth corruption in a delta base reference
 
-		# 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 5302.27 '[index v2] 3) corrupted delta happily returned wrong data': 
+	test -f file_101_foo2 && ! cmp file_101 file_101_foo2
 
-		git repack --cruft --cruft-expiration=now -d &&
+file_101 file_101_foo2 differ: char 5, line 2
+ok 27 - [index v2] 3) corrupted delta happily returned wrong data
 
-		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 5302.28 '[index v2] 4) confirm that the pack is actually corrupted': 
+	test_must_fail git fsck --full $commit
 
-		# 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 &&
+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
 
-		mtimes="$(ls .git/objects/pack/pack-*.mtimes)" &&
-		git show-index <${mtimes%.mtimes}.idx >cruft &&
-		cut -d" " -f2 cruft | sort >cruft.actual &&
+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
 
-		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 &&
+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
 
-		# 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 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"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 22 - gc.recentObjectsHook
+pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+4+0 records in
+4+0 records out
+4 bytes copied, 3.524e-05 s, 114 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 5329.23 'multi-valued gc.recentObjectsHook': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
+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 repo &&
-
-		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 &&
+		cd .git/objects/pack &&
+		git index-pack pack-${pack1}.pack
+	) &&
+	test -f .git/objects/pack/pack-${pack1}.idx
 
-		git rev-list --objects --no-object-names $cruft_a $cruft_b \
-			>cruft.raw &&
-		sort cruft.raw >cruft.expect &&
+1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 31 - running index-pack in the object store
 
-		# 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 &&
+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
 
-		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 &&
+This is an invalid tag.
+EOF
 
-		# 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 &&
+	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
 
-		# and that the existing cruft pack is left alone
-		test_path_is_file "$mtimes"
-	)
+remove tag object
+67765b8cc9b2d3d6ffa408695798db10a387e826
+warning: object 954f1fc56e5be955c7818ab69b20a3374f351d82: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 32 - index-pack --strict warns upon missing tagger in tag
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
- 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
- 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 23 - multi-valued gc.recentObjectsHook
+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
 
-expecting success of 5329.24 'additional cruft blobs via gc.recentObjectsHook': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+67765b8cc9b2d3d6ffa408695798db10a387e826
+warning: object 954f1fc56e5be955c7818ab69b20a3374f351d82: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 33 - index-pack --fsck-objects also warns upon missing tagger in tag
 
-		test_commit base &&
+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
 
-		blob=$(echo "unreachable" | git hash-object -w --stdin) &&
+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 | 69.45 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
 
-		# 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)" &&
+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
 
-		# 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 &&
+fatal: pack exceeds maximum allowed size (20 bytes)
+ok 35 - too-large packs report the breach
 
-		git repack --cruft --cruft-expiration=now -d &&
+# passed all 35 test(s)
+1..35
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5402-post-merge-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-		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
-	)
+Cloning into 'clone1'...
+done.
+Cloning into 'clone2'...
+done.
+ok 1 - setup
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 24 - additional cruft blobs via gc.recentObjectsHook
+expecting success of 5402.2 'setup clone hooks': 
+	test_when_finished "rm -f hook" &&
+	cat >hook <<-\EOF &&
+	echo $@ >>$GIT_DIR/post-merge.args
+	EOF
 
-expecting success of 5329.25 'split cruft packs with --max-cruft-size': 
-	repo=cruft-with--max-cruft-size &&
-	test_when_finished "rm -fr $repo" &&
+	test_hook --setup -C clone1 post-merge <hook &&
+	test_hook --setup -C clone2 post-merge <hook
 
-	git init "$repo" &&
+ok 2 - setup clone hooks
 
-	(
-		cd "$repo" &&
+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
 
-		git config core.compression 0 &&
+Already up to date.
+ok 3 - post-merge does not run for up-to-date 
 
-		sz=$((1024 * 1024)) && # 1MiB
-		test-tool genrandom foo $sz >foo &&
-		test-tool genrandom bar $sz >bar &&
-		foo="$(git hash-object -w -t blob foo)" &&
-		bar="$(git hash-object -w -t blob bar)" &&
+expecting success of 5402.4 'post-merge runs as expected ': 
+	GIT_DIR=clone1/.git git merge $commit1 &&
+	test -e clone1/.git/post-merge.args
 
-		to=$packdir/pack &&
-		# Pack together foo and bar into a single 2MiB pack.
-		pack="$(git pack-objects $to <<-EOF
-		$foo
-		$bar
-		EOF
-		)" &&
+Updating e541488..8833ab1
+Fast-forward
+ a | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - post-merge runs as expected 
 
-		# Then generate a cruft pack containing foo and bar.
-		#
-		# Generate the pack with --max-pack-size equal to the
-		# size of one object, forcing us to write two cruft
-		# packs.
-		git pack-objects --cruft --max-pack-size=$sz $to <<-EOF &&
-		-pack-$pack.pack
-		EOF
+expecting success of 5402.5 'post-merge from normal merge receives the right argument ': 
+	grep 0 clone1/.git/post-merge.args
 
-		ls $packdir/pack-*.mtimes >crufts &&
-		test_line_count = 2 crufts &&
+0
+ok 5 - post-merge from normal merge receives the right argument 
 
-		for cruft in $(cat crufts)
-		do
-			test-tool pack-mtimes "$(basename "$cruft")" || return 1
-		done >actual.raw &&
+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
 
-		cut -d" " -f1 <actual.raw | sort >actual &&
-		sort >expect <<-EOF &&
-		$foo
-		$bar
-		EOF
+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 
 
-		test_cmp expect actual
-	)
+expecting success of 5402.7 'post-merge from squash merge receives the right argument ': 
+	grep 1 clone2/.git/post-merge.args
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5329-pack-objects-cruft/cruft-with--max-cruft-size/.git/
-fb982b26185eb925c4551319e24b76777cc5737c
-bf2b116ceec41facb0158b8f5d3c69c27cdb1734
-ok 25 - split cruft packs with --max-cruft-size
+1
+ok 7 - post-merge from squash merge receives the right argument 
 
-# passed all 25 test(s)
-1..25
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5334-incremental-multi-pack-index.sh ***
@@ -313675,84 +315898,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5402-post-merge-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5401-update-hooks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5401-update-hooks/.git/
 expecting success of 5401.1 'setup': 
@@ -314797,6 +316942,631 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5351-unpack-large-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5351-unpack-large-objects/.git/
+expecting success of 5351.1 'create large objects (1.5 MB) and PACK': 
+	test-tool genrandom foo 1500000 >big-blob &&
+	test_commit --append foo big-blob &&
+	test-tool genrandom bar 1500000 >big-blob &&
+	test_commit --append bar big-blob &&
+	PACK=$(echo HEAD | git pack-objects --revs pack) &&
+	git verify-pack -v pack-$PACK.pack >out &&
+	sed -n -e "s/^\([0-9a-f][0-9a-f]*\).*\(commit\|tree\|blob\).*/\1/p" \
+		<out >obj-list
+
+[master (root-commit) b6b91a6] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 big-blob
+[master 73e7a4c] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 1 - create large objects (1.5 MB) and PACK
+
+expecting success of 5351.2 'set memory limitation to 1MB': 
+	GIT_ALLOC_LIMIT=1m &&
+	export GIT_ALLOC_LIMIT
+
+ok 2 - set memory limitation to 1MB
+
+expecting success of 5351.3 'unpack-objects failed under memory limitation': 
+	prepare_dest 2m &&
+	test_must_fail git -C dest.git unpack-objects <pack-$PACK.pack 2>err &&
+	grep "fatal: attempting to allocate" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5351-unpack-large-objects/dest.git/
+fatal: attempting to allocate 1500005 over limit 1048576
+ok 3 - unpack-objects failed under memory limitation
+
+expecting success of 5351.4 'unpack-objects works with memory limitation in dry-run mode': 
+	prepare_dest 2m &&
+	git -C dest.git unpack-objects -n <pack-$PACK.pack &&
+	test_stdout_line_count = 0 find dest.git/objects -type f &&
+	test_dir_is_empty dest.git/objects/pack
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5351-unpack-large-objects/dest.git/
+ok 4 - unpack-objects works with memory limitation in dry-run mode
+
+expecting success of 5351.5 'unpack big object in stream': 
+	prepare_dest 1m &&
+	git -C dest.git unpack-objects <pack-$PACK.pack &&
+	test_dir_is_empty dest.git/objects/pack
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5351-unpack-large-objects/dest.git/
+ok 5 - unpack big object in stream
+
+expecting success of 5351.6 'unpack big object in stream (core.fsyncmethod=batch)': 
+	prepare_dest 1m &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+	GIT_TEST_FSYNC=true \
+		git -C dest.git $BATCH_CONFIGURATION unpack-objects <pack-$PACK.pack &&
+	if grep "core.fsyncMethod = batch is unsupported" trace2.txt
+	then
+		flush_count=7
+	else
+		flush_count=1
+	fi &&
+	check_fsync_events trace2.txt <<-EOF &&
+	"name":"writeout-only","count":6
+	"name":"hardware-flush","count":$flush_count
+	EOF
+
+	test_dir_is_empty dest.git/objects/pack &&
+	git -C dest.git cat-file --batch-check="%(objectname)" <obj-list >current &&
+	cmp obj-list current
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5351-unpack-large-objects/dest.git/
+ok 6 - unpack big object in stream (core.fsyncmethod=batch)
+
+expecting success of 5351.7 'do not unpack existing large objects': 
+	prepare_dest 1m &&
+	git -C dest.git index-pack --stdin <pack-$PACK.pack &&
+	git -C dest.git unpack-objects <pack-$PACK.pack &&
+
+	# The destination came up with the exact same pack...
+	DEST_PACK=$(echo dest.git/objects/pack/pack-*.pack) &&
+	cmp pack-$PACK.pack $DEST_PACK &&
+
+	# ...and wrote no loose objects
+	test_stdout_line_count = 0 find dest.git/objects -type f ! -name "pack-*"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5351-unpack-large-objects/dest.git/
+pack	4a1be184fdbd6bf82eab500bad78e4fee02c1909
+ok 7 - do not unpack existing large objects
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5405-send-pack-rewind.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5405-send-pack-rewind/.git/
+expecting success of 5405.1 'setup': 
+
+	>file1 && git add file1 && test_tick &&
+	git commit -m Initial &&
+	git config receive.denyCurrentBranch warn &&
+
+	mkdir another && (
+		cd another &&
+		git init &&
+		git fetch --update-head-ok .. main:main
+	) &&
+
+	>file2 && git add file2 && test_tick &&
+	git commit -m Second
+
+
+[main (root-commit) de5945f] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5405-send-pack-rewind/another/.git/
+From ..
+ * [new branch]      main       -> main
+[main 3dc47c1] Second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file2
+ok 1 - setup
+
+expecting success of 5405.2 'non forced push should die not segfault': 
+
+	(
+		cd another &&
+		test_must_fail git push .. main:main
+	)
+
+
+To ..
+ ! [rejected]        main -> main (fetch first)
+error: failed to push some refs to '..'
+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 2 - non forced push should die not segfault
+
+expecting success of 5405.3 'forced push should succeed': 
+
+	(
+		cd another &&
+		git push .. +main:main
+	)
+
+
+remote: warning: updating the current branch        
+To ..
+ + 3dc47c1...de5945f main -> main (forced update)
+ok 3 - forced push should succeed
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5404-tracking-branches.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'aa'...
+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
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+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
+
+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(+)
+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(+)
+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(+)
+ok 2 - prepare pushable branches
+
+expecting success of 5404.3 'mixed-success push returns error': 
+	test_must_fail git push origin :
+
+To /build/reproducible-path/git-2.51.0/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.51.0/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 5404.4 'check tracking branches updated correctly after push': 
+	test "$(git rev-parse origin/main)" = "$(git rev-parse main)"
+
+ok 4 - check tracking branches updated correctly after push
+
+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"
+
+ok 5 - check tracking branches not updated for failed refs
+
+expecting success of 5404.6 'deleted branches have their tracking branches removed': 
+	git push origin :b1 &&
+	test "$(git rev-parse origin/b1)" = "origin/b1"
+
+To /build/reproducible-path/git-2.51.0/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 5404.7 'already deleted tracking branches ignored': 
+	git branch -d -r origin/b3 &&
+	git push origin :b3 >output 2>&1 &&
+	! grep "^error: " output
+
+Deleted remote-tracking branch origin/b3 (was c663a66).
+ok 7 - already deleted tracking branches ignored
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5406-remote-rejects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'child'...
+done.
+[master ee88fdb] 2
+ 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
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5403-post-checkout-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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(+)
+ 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
+
+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
+
+Already on 'main'
+ok 2 - post-checkout receives the right arguments with HEAD unchanged 
+
+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
+
+Switched to a new branch 'new1'
+ok 3 - post-checkout args are correct with git checkout -b 
+
+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
+
+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
+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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5318-commit-graph.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5318-commit-graph/.git/
 expecting success of 5318.1 'usage': 
@@ -315683,10 +318453,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.3921e-05 s, 29.5 kB/s
+1 byte copied, 3.172e-05 s, 31.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.312e-05 s, 0.0 kB/s
+0 bytes copied, 1.952e-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
@@ -315700,10 +318470,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.444e-05 s, 29.0 kB/s
+1 byte copied, 0.00043312 s, 2.3 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.036e-05 s, 0.0 kB/s
+0 bytes copied, 2.232e-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
@@ -315717,10 +318487,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.28e-05 s, 30.5 kB/s
+1 byte copied, 2.868e-05 s, 34.9 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.688e-05 s, 0.0 kB/s
+0 bytes copied, 2.152e-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
@@ -315734,10 +318504,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.296e-05 s, 30.3 kB/s
+1 byte copied, 3.288e-05 s, 30.4 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.9641e-05 s, 0.0 kB/s
+0 bytes copied, 2.124e-05 s, 0.0 kB/s
 error: final chunk has non-zero id 4f49444c
 error: final chunk has non-zero id 4f49444c
 ?? expect
@@ -315751,10 +318521,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00521591 s, 0.2 kB/s
+1 byte copied, 3.688e-05 s, 27.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.164e-05 s, 0.0 kB/s
+0 bytes copied, 2.052e-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
@@ -315768,10 +318538,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.652e-05 s, 27.4 kB/s
+1 byte copied, 3.528e-05 s, 28.3 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.1201e-05 s, 0.0 kB/s
+0 bytes copied, 2.248e-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
@@ -315785,10 +318555,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.5e-05 s, 28.6 kB/s
+1 byte copied, 3.776e-05 s, 26.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.888e-05 s, 0.0 kB/s
+0 bytes copied, 2.324e-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
@@ -315802,10 +318572,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.4121e-05 s, 29.3 kB/s
+1 byte copied, 3.876e-05 s, 25.8 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.224e-05 s, 0.0 kB/s
+0 bytes copied, 2.588e-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
@@ -315821,10 +318591,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.496e-05 s, 28.6 kB/s
+1 byte copied, 3.432e-05 s, 29.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.1321e-05 s, 0.0 kB/s
+0 bytes copied, 2.668e-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
@@ -315840,10 +318610,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00638844 s, 0.2 kB/s
+1 byte copied, 3.476e-05 s, 28.8 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.032e-05 s, 0.0 kB/s
+0 bytes copied, 2.356e-05 s, 0.0 kB/s
 commit-graph has incorrect OID order: d0dcf978085b712ac89a73020e40fb8b7e540ec4 then 01c8575ed6fc205127629848895ac35ba7529ace
 ?? expect
 ?? output
@@ -315855,10 +318625,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.000587764 s, 1.7 kB/s
+1 byte copied, 2.964e-05 s, 33.7 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.076e-05 s, 0.0 kB/s
+0 bytes copied, 1.708e-05 s, 0.0 kB/s
 failed to parse commit 76c4cb0cede3ceaca44a01b27edce46ba498dfad from object database for commit-graph
 ?? expect
 ?? output
@@ -315870,10 +318640,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.264e-05 s, 30.6 kB/s
+1 byte copied, 3.392e-05 s, 29.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.296e-05 s, 0.0 kB/s
+0 bytes copied, 2.004e-05 s, 0.0 kB/s
 root tree OID for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 016f0284c84f93b3e8df8c402054b760afac7e76 != 566f0284c84f93b3e8df8c402054b760afac7e76
 ?? expect
 ?? output
@@ -315885,10 +318655,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.4121e-05 s, 29.3 kB/s
+1 byte copied, 2.968e-05 s, 33.7 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.1281e-05 s, 0.0 kB/s
+0 bytes copied, 2.16e-05 s, 0.0 kB/s
 fatal: invalid parent position 16777220
 ?? expect
 ?? output
@@ -315900,10 +318670,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.3801e-05 s, 29.6 kB/s
+1 byte copied, 3.392e-05 s, 29.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.024e-05 s, 0.0 kB/s
+0 bytes copied, 2.272e-05 s, 0.0 kB/s
 commit-graph parent list for commit 12a06f3a2c235980d878903e940b0570ddda4359 is too long
 ?? expect
 ?? output
@@ -315915,10 +318685,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.88e-05 s, 25.8 kB/s
+1 byte copied, 3.5e-05 s, 28.6 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.42e-05 s, 0.0 kB/s
+0 bytes copied, 2.148e-05 s, 0.0 kB/s
 commit-graph parent for 12a06f3a2c235980d878903e940b0570ddda4359 is 2c45687afab8ea0442fe2feb61881deac6f37339 != 76c4cb0cede3ceaca44a1bb27edce46ba498dfad
 ?? expect
 ?? output
@@ -315930,10 +318700,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.548e-05 s, 28.2 kB/s
+1 byte copied, 3.44e-05 s, 29.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.1321e-05 s, 0.0 kB/s
+0 bytes copied, 2.488e-05 s, 0.0 kB/s
 commit-graph generation for commit 2ff07863aadb0941159dda60d980783f6b7c6213 is 5 < 15
 ?? expect
 ?? output
@@ -315945,10 +318715,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.4e-05 s, 29.4 kB/s
+1 byte copied, 2.704e-05 s, 37.0 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.388e-05 s, 0.0 kB/s
+0 bytes copied, 2.112e-05 s, 0.0 kB/s
 commit date for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 22393313 != 1112912353
 ?? expect
 ?? output
@@ -315960,10 +318730,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 2.864e-05 s, 34.9 kB/s
+1 byte copied, 3.58e-05 s, 27.9 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.18e-05 s, 0.0 kB/s
+0 bytes copied, 2.04e-05 s, 0.0 kB/s
 fatal: invalid parent position 16777216
 ?? expect
 ?? output
@@ -315975,10 +318745,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.052e-05 s, 32.8 kB/s
+1 byte copied, 3.932e-05 s, 25.4 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.36e-05 s, 0.0 kB/s
+0 bytes copied, 2.228e-05 s, 0.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ?? expect
 ?? output
@@ -315991,10 +318761,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.38e-05 s, 29.6 kB/s
+1 byte copied, 3.428e-05 s, 29.2 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.168e-05 s, 0.0 kB/s
+0 bytes copied, 2.048e-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
@@ -316008,10 +318778,10 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 3.412e-05 s, 117 kB/s
+4 bytes copied, 3.732e-05 s, 107 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.644e-05 s, 0.0 kB/s
+0 bytes copied, 2.492e-05 s, 0.0 kB/s
 commit-graph has both zero and non-zero generations (e.g., commits 'ddc8575ed6fc205127629848895ac35ba7529ace' and 'd0dcf978085b712ac89a73020e40fb8b7e540ec4')
 ?? expect
 ?? output
@@ -316022,2011 +318792,489 @@
 		"both zero and non-zero generations"
 
 4+0 records in
-4+0 records out
-4 bytes copied, 3.608e-05 s, 111 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.22e-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)
-
-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
-
-dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
-dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
-1+0 records in
-1+0 records out
-1 byte copied, 3.14e-05 s, 31.8 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.556e-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)
-
-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
-
-dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
-dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
-1+0 records in
-1+0 records out
-1 byte copied, 3.844e-05 s, 26.0 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.068e-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 5318.90 'git fsck (checks commit-graph when config unset)': 
-	test_when_finished "git -C full config core.commitGraph true" &&
-
-	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
-
-dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
-dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
-1+0 records in
-1+0 records out
-1 byte copied, 3.4041e-05 s, 29.4 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.152e-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)
-
-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
-
-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
-
-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
-
-dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
-dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
-ok 92 - git fsck suppresses commit-graph output with --no-progress
-
-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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 93 - setup non-the_repository tests
-
-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 &&
-
-	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 94 - parse_commit_in_graph works for non-the_repository
-
-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-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
-
-ok 95 - get_commit_tree_in_graph works for non-the_repository
-
-expecting success of 5318.96 'corrupt commit-graph write (broken parent)': 
-	rm -rf repo &&
-	git init 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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 5318.97 'corrupt commit-graph write (missing tree)': 
-	rm -rf repo &&
-	git init 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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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" &&
-
-	git init repo &&
-	(
-		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
-	)
-
-Reinitialized existing Git repository in /build/reproducible-path/git-2.51.0/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
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-[master bbde0d8] 6
- 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
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7.t
-[master 1aff441] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8.t
-[master 1ec2f73] 9
- 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
-
-expecting success of 5318.100 'overflow during generation version upgrade': 
-	git init overflow-v2-upgrade &&
-	(
-		cd overflow-v2-upgrade &&
-
-		# 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 &&
-
-		# 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 &&
-
-		git rev-list --all
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-b89bafebd219ef84734f57391e155dcedaccac5c
-ok 100 - overflow during generation version upgrade
-
-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
-
-ok 101 - reader notices too-small oid fanout chunk
-
-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
-
-ok 102 - reader notices fanout/lookup table mismatch
-
-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
-
-ok 103 - reader notices out-of-bounds fanout
-
-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
-
-ok 104 - reader notices too-small commit data chunk
-
-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
-
-ok 105 - reader notices out-of-bounds extra edge
-
-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
-
-ok 106 - reader notices too-small generations chunk
-
-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 &&
-
-		oid=$(git rev-parse B) &&
-		rm .git/objects/"$(test_oid_to_path "$oid")" &&
-
-		# 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
-	)
-
-Reinitialized existing Git repository in /build/reproducible-path/git-2.51.0/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 A.t
-[master 4ce4c2d] B
- 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
-
-expecting success of 5318.108 'stale commit cannot be parsed when traversing graph': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-
-		test_commit A &&
-		test_commit B &&
-		test_commit C &&
-		git commit-graph write --reachable &&
-
-		# 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")" &&
-
-		# 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.51.0/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 A.t
-[master f3c5d37] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[master 6bb8ed6] C
- 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
-
-# passed all 108 test(s)
-1..108
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5300-pack-object.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/.git/
-expecting success of 5300.1 'setup': 
-	rm -f .git/index* &&
-	test-tool genzeros 4096 | tr "\000" "a" >a &&
-	test-tool genzeros 4096 | tr "\000" "b" >b &&
-	test-tool genzeros 4096 | tr "\000" "c" >c &&
-	test-tool genrandom "seed a" 2097152 >a_big &&
-	test-tool genrandom "seed b" 2097152 >b_big &&
-	git update-index --add a a_big b b_big c &&
-	cat c >d && echo foo >>d && git update-index --add d &&
-	tree=$(git write-tree) &&
-	commit=$(git commit-tree $tree </dev/null) &&
-	{
-		echo $tree &&
-		echo $commit &&
-		git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
-	} >obj-list &&
-	{
-		git diff-tree --root -p $commit &&
-		while read object
-		do
-			t=$(git cat-file -t $object) &&
-			git cat-file $t $object || return 1
-		done <obj-list
-	} >expect
-
-ok 1 - setup
-
-expecting success of 5300.2 'setup pack-object <stdin': 
-	git init pack-object-stdin &&
-	test_commit -C pack-object-stdin one &&
-	test_commit -C pack-object-stdin two
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/pack-object-stdin/.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
-ok 2 - setup pack-object <stdin
-
-expecting success of 5300.3 'pack-object <stdin parsing: basic [|--revs]': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-	EOF
-
-	git -C pack-object-stdin pack-objects basic-stdin <in &&
-	idx=$(echo pack-object-stdin/basic-stdin-*.idx) &&
-	git show-index <"$idx" >actual &&
-	test_line_count = 1 actual &&
-
-	git -C pack-object-stdin pack-objects --revs basic-stdin-revs <in &&
-	idx=$(echo pack-object-stdin/basic-stdin-revs-*.idx) &&
-	git show-index <"$idx" >actual &&
-	test_line_count = 3 actual
-
-260a913b65cbec25b7e224d8d3c7360245c0367a
-91db7b4b856b00c3e675824c5bc5389b6810037a
-ok 3 - pack-object <stdin parsing: basic [|--revs]
-
-expecting success of 5300.4 'pack-object <stdin parsing: [|--revs] bad line': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-	garbage
-	$(git -C pack-object-stdin rev-parse two)
-	EOF
-
-	sed "s/^> //g" >err.expect <<-EOF &&
-	fatal: expected object ID, got garbage:
-	>  garbage
-
-	EOF
-	test_must_fail git -C pack-object-stdin pack-objects bad-line-stdin <in 2>err.actual &&
-	test_cmp err.expect err.actual &&
-
-	cat >err.expect <<-EOF &&
-	fatal: bad revision 'garbage'
-	EOF
-	test_must_fail git -C pack-object-stdin pack-objects --revs bad-line-stdin-revs <in 2>err.actual &&
-	test_cmp err.expect err.actual
-
-ok 4 - pack-object <stdin parsing: [|--revs] bad line
-
-expecting success of 5300.5 'pack-object <stdin parsing: [|--revs] empty line': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-
-	$(git -C pack-object-stdin rev-parse two)
-	EOF
-
-	sed -e "s/^> //g" -e "s/Z$//g" >err.expect <<-EOF &&
-	fatal: expected object ID, got garbage:
-	>  Z
-
-	EOF
-	test_must_fail git -C pack-object-stdin pack-objects empty-line-stdin <in 2>err.actual &&
-	test_cmp err.expect err.actual &&
-
-	git -C pack-object-stdin pack-objects --revs empty-line-stdin-revs <in &&
-	idx=$(echo pack-object-stdin/empty-line-stdin-revs-*.idx) &&
-	git show-index <"$idx" >actual &&
-	test_line_count = 3 actual
-
-91db7b4b856b00c3e675824c5bc5389b6810037a
-ok 5 - pack-object <stdin parsing: [|--revs] empty line
-
-expecting success of 5300.6 'pack-object <stdin parsing: [|--revs] with --stdin': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-	$(git -C pack-object-stdin rev-parse two)
-	EOF
-
-	# There is the "--stdin-packs is incompatible with --revs"
-	# test below, but we should make sure that the revision.c
-	# --stdin is not picked up
-	cat >err.expect <<-EOF &&
-	fatal: disallowed abbreviated or ambiguous option 'stdin'
-	EOF
-	test_must_fail git -C pack-object-stdin pack-objects stdin-with-stdin-option --stdin <in 2>err.actual &&
-	test_cmp err.expect err.actual &&
-
-	test_must_fail git -C pack-object-stdin pack-objects --stdin --revs stdin-with-stdin-option-revs 2>err.actual <in &&
-	test_cmp err.expect err.actual
-
-ok 6 - pack-object <stdin parsing: [|--revs] with --stdin
-
-expecting success of 5300.7 'pack-object <stdin parsing: --stdin-packs handles garbage': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-	$(git -C pack-object-stdin rev-parse two)
-	EOF
-
-	# That we get "two" and not "one" has to do with OID
-	# ordering. It happens to be the same here under SHA-1 and
-	# SHA-256. See commentary in pack-objects.c
-	cat >err.expect <<-EOF &&
-	fatal: could not find pack '$(git -C pack-object-stdin rev-parse two)'
-	EOF
-	test_must_fail git \
-		-C pack-object-stdin \
-		pack-objects stdin-with-stdin-option --stdin-packs \
-		<in 2>err.actual &&
-	test_cmp err.expect err.actual
-
-ok 7 - pack-object <stdin parsing: --stdin-packs handles garbage
-
-expecting success of 5300.8 'pack without delta': 
-	packname_1=$(git pack-objects --progress --window=0 test-1 \
-			<obj-list 2>stderr) &&
-	check_deltas stderr = 0
-
-ok 8 - pack without delta
-
-expecting success of 5300.9 'negative window clamps to 0': 
-	git pack-objects --progress --window=-1 neg-window <obj-list 2>stderr &&
-	check_deltas stderr = 0
-
-0fe7826218e9201ffa2c785aa64f009dc5a98043
-ok 9 - negative window clamps to 0
-
-expecting success of 5300.10 'pack-objects with bogus arguments': 
-	test_must_fail git pack-objects --window=0 test-1 blah blah <obj-list
-
-usage: git pack-objects [-q | --progress | --all-progress] [--all-progress-implied]
-                        [--no-reuse-delta] [--delta-base-offset] [--non-empty]
-                        [--local] [--incremental] [--window=<n>] [--depth=<n>]
-                        [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
-                        [--cruft] [--cruft-expiration=<time>]
-                        [--stdout [--filter=<filter-spec>] | <base-name>]
-                        [--shallow] [--keep-true-parents] [--[no-]sparse]
-                        [--name-hash-version=<n>] [--path-walk] < <object-list>
-
-    -q, --[no-]quiet      do not show progress meter
-    --[no-]progress       show progress meter
-    --[no-]all-progress   show progress meter during object writing phase
-    --[no-]all-progress-implied
-                          similar to --all-progress when progress meter is shown
-    --index-version <version>[,<offset>]
-                          write the pack index file in the specified idx format version
-    --max-pack-size <n>   maximum size of each output pack file
-    --[no-]local          ignore borrowed objects from alternate object store
-    --[no-]incremental    ignore packed objects
-    --[no-]window <n>     limit pack window by objects
-    --window-memory <n>   limit pack window by memory in addition to object limit
-    --[no-]depth <n>      maximum length of delta chain allowed in the resulting pack
-    --[no-]reuse-delta    reuse existing deltas
-    --[no-]reuse-object   reuse existing objects
-    --[no-]delta-base-offset
-                          use OFS_DELTA objects
-    --[no-]threads <n>    use threads when searching for best delta matches
-    --[no-]non-empty      do not create an empty pack output
-    --[no-]revs           read revision arguments from standard input
-    --unpacked            limit the objects to those that are not yet packed
-    --all                 include objects reachable from any reference
-    --reflog              include objects referred by reflog entries
-    --indexed-objects     include objects referred to by the index
-    --[no-]stdin-packs[=<mode>]
-                          read packs from stdin
-    --[no-]stdin-packs    read packs from stdin
-    --[no-]stdout         output pack to stdout
-    --[no-]include-tag    include tag objects that refer to objects to be packed
-    --[no-]keep-unreachable
-                          keep unreachable objects
-    --[no-]pack-loose-unreachable
-                          pack loose unreachable objects
-    --[no-]unpack-unreachable[=<time>]
-                          unpack unreachable objects newer than <time>
-    --[no-]cruft          create a cruft pack
-    --[no-]cruft-expiration[=<time>]
-                          expire cruft objects older than <time>
-    --[no-]sparse         use the sparse reachability algorithm
-    --[no-]thin           create thin packs
-    --[no-]path-walk      use the path-walk API to walk objects when possible
-    --[no-]shallow        create packs suitable for shallow fetches
-    --[no-]honor-pack-keep
-                          ignore packs that have companion .keep file
-    --[no-]keep-pack <name>
-                          ignore this pack
-    --[no-]compression <n>
-                          pack compression level
-    --[no-]keep-true-parents
-                          do not hide commits by grafts
-    --[no-]use-bitmap-index
-                          use a bitmap index if available to speed up counting objects
-    --[no-]write-bitmap-index
-                          write a bitmap index together with the pack index
-    --[no-]filter <args>  object filtering
-    --missing <action>    handling for missing objects
-    --[no-]exclude-promisor-objects
-                          do not pack objects in promisor packfiles
-    --[no-]exclude-promisor-objects-best-effort
-                          implies --missing=allow-any
-    --[no-]delta-islands  respect islands during delta compression
-    --[no-]uri-protocol <protocol>
-                          exclude any configured uploadpack.blobpackfileuri with this protocol
-    --[no-]name-hash-version <n>
-                          use the specified name-hash function to group similar objects
-
-ok 10 - pack-objects with bogus arguments
-
-expecting success of 5300.11 'unpack without delta': 
-	check_unpack test-1-${packname_1} obj-list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
-ok 11 - unpack without delta
-
-expecting success of 5300.12 'unpack without delta (core.fsyncmethod=batch)': 
-	check_unpack test-1-${packname_1} obj-list "$BATCH_CONFIGURATION"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
-ok 12 - unpack without delta (core.fsyncmethod=batch)
-
-expecting success of 5300.13 'pack with REF_DELTA': 
-	packname_2=$(git pack-objects --progress test-2 <obj-list 2>stderr) &&
-	check_deltas stderr -gt 0
-
-ok 13 - pack with REF_DELTA
-
-expecting success of 5300.14 'unpack with REF_DELTA': 
-	check_unpack test-2-${packname_2} obj-list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
-ok 14 - unpack with REF_DELTA
-
-expecting success of 5300.15 'unpack with REF_DELTA (core.fsyncmethod=batch)': 
-       check_unpack test-2-${packname_2} obj-list "$BATCH_CONFIGURATION"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
-ok 15 - unpack with REF_DELTA (core.fsyncmethod=batch)
-
-expecting success of 5300.16 'pack with OFS_DELTA': 
-	packname_3=$(git pack-objects --progress --delta-base-offset test-3 \
-			<obj-list 2>stderr) &&
-	check_deltas stderr -gt 0
-
-ok 16 - pack with OFS_DELTA
-
-expecting success of 5300.17 'unpack with OFS_DELTA': 
-	check_unpack test-3-${packname_3} obj-list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
-ok 17 - unpack with OFS_DELTA
-
-expecting success of 5300.18 'unpack with OFS_DELTA (core.fsyncmethod=batch)': 
-	check_unpack test-3-${packname_3} obj-list "$BATCH_CONFIGURATION"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
-ok 18 - unpack with OFS_DELTA (core.fsyncmethod=batch)
-
-expecting success of 5300.19 'compare delta flavors': 
-	perl -e '
-		defined($_ = -s $_) or die for @ARGV;
-		exit 1 if $ARGV[0] <= $ARGV[1];
-	' test-2-$packname_2.pack test-3-$packname_3.pack
-
-ok 19 - compare delta flavors
-
-expecting success of 5300.20 'use packed objects': 
-	check_use_objects test-1-${packname_1}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
-ok 20 - use packed objects
-
-expecting success of 5300.21 'use packed deltified (REF_DELTA) objects': 
-	check_use_objects test-2-${packname_2}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
-ok 21 - use packed deltified (REF_DELTA) objects
-
-expecting success of 5300.22 'use packed deltified (OFS_DELTA) objects': 
-	check_use_objects test-3-${packname_3}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/git2/
-ok 22 - use packed deltified (OFS_DELTA) objects
-
-expecting success of 5300.23 'survive missing objects/pack directory': 
-	(
-		rm -fr missing-pack &&
-		mkdir missing-pack &&
-		cd missing-pack &&
-		git init &&
-		GOP=.git/objects/pack &&
-		rm -fr $GOP &&
-		git index-pack --stdin --keep=test <../test-3-${packname_3}.pack &&
-		test -f $GOP/pack-${packname_3}.pack &&
-		cmp $GOP/pack-${packname_3}.pack ../test-3-${packname_3}.pack &&
-		test -f $GOP/pack-${packname_3}.idx &&
-		cmp $GOP/pack-${packname_3}.idx ../test-3-${packname_3}.idx &&
-		test -f $GOP/pack-${packname_3}.keep
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/missing-pack/.git/
-keep	ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
-ok 23 - survive missing objects/pack directory
-
-expecting success of 5300.24 'verify pack': 
-	git verify-pack test-1-${packname_1}.idx \
-		test-2-${packname_2}.idx \
-		test-3-${packname_3}.idx
-
-ok 24 - verify pack
-
-expecting success of 5300.25 'verify pack -v': 
-	git verify-pack -v test-1-${packname_1}.idx \
-		test-2-${packname_2}.idx \
-		test-3-${packname_3}.idx
-
-3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
-ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe commit 163 123 181
-9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 304
-012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 335
-c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098137
-6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf blob   2097152 2097802 2098168
-0be779221aca65277fd447c8207e1b3c2706ae20 blob   4096 31 4195970
-b010fe5253f7dc59c6605dacb92fcea00d199d4e blob   4100 36 4196001
-non delta: 8 objects
-test-1-0fe7826218e9201ffa2c785aa64f009dc5a98043.pack: ok
-3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
-ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe commit 163 123 181
-9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 304
-012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 335
-c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098137
-6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf blob   2097152 2097802 2098168
-b010fe5253f7dc59c6605dacb92fcea00d199d4e blob   4100 36 4195970
-0be779221aca65277fd447c8207e1b3c2706ae20 blob   6 35 4196006 1 b010fe5253f7dc59c6605dacb92fcea00d199d4e
-non delta: 7 objects
-chain length = 1: 1 object
-test-2-3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5.pack: ok
-3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
-ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe commit 163 123 181
-9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 304
-012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 335
-c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098137
-6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf blob   2097152 2097802 2098168
-b010fe5253f7dc59c6605dacb92fcea00d199d4e blob   4100 36 4195970
-0be779221aca65277fd447c8207e1b3c2706ae20 blob   6 16 4196006 1 b010fe5253f7dc59c6605dacb92fcea00d199d4e
-non delta: 7 objects
-chain length = 1: 1 object
-test-3-ed7d7d439f2b0cbe9b94e803744e331d0b842cd7.pack: ok
-ok 25 - verify pack -v
-
-expecting success of 5300.26 'verify-pack catches mismatched .idx and .pack files': 
-	cat test-1-${packname_1}.idx >test-3.idx &&
-	cat test-2-${packname_2}.pack >test-3.pack &&
-	if git verify-pack test-3.idx
-	then false
-	else :;
-	fi
-
-fatal: sha1 file 'test-3.idx' validation error
-ok 26 - verify-pack catches mismatched .idx and .pack files
-
-expecting success of 5300.27 'verify-pack catches a corrupted pack signature': 
-	cat test-1-${packname_1}.pack >test-3.pack &&
-	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=2 &&
-	if git verify-pack test-3.idx
-	then false
-	else :;
-	fi
-
-1+0 records in
-1+0 records out
-1 byte copied, 3.696e-05 s, 27.1 kB/s
-fatal: pack signature mismatch
-ok 27 - verify-pack catches a corrupted pack signature
-
-expecting success of 5300.28 'verify-pack catches a corrupted pack version': 
-	cat test-1-${packname_1}.pack >test-3.pack &&
-	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=7 &&
-	if git verify-pack test-3.idx
-	then false
-	else :;
-	fi
-
-1+0 records in
-1+0 records out
-1 byte copied, 3.152e-05 s, 31.7 kB/s
-fatal: pack version 10 unsupported
-ok 28 - verify-pack catches a corrupted pack version
-
-expecting success of 5300.29 'verify-pack catches a corrupted type/size of the 1st packed object data': 
-	cat test-1-${packname_1}.pack >test-3.pack &&
-	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=12 &&
-	if git verify-pack test-3.idx
-	then false
-	else :;
-	fi
-
-1+0 records in
-1+0 records out
-1 byte copied, 3.292e-05 s, 30.4 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
-
-expecting success of 5300.30 'verify-pack catches a corrupted sum of the index file itself': 
-	l=$(wc -c <test-3.idx) &&
-	l=$(expr $l - 20) &&
-	cat test-1-${packname_1}.pack >test-3.pack &&
-	printf "%20s" "" | dd of=test-3.idx count=20 bs=1 conv=notrunc seek=$l &&
-	if git verify-pack test-3.pack
-	then false
-	else :;
-	fi
-
-20+0 records in
-20+0 records out
-20 bytes copied, 4.8961e-05 s, 408 kB/s
-fatal: sha1 file 'test-3.idx' validation error
-ok 30 - verify-pack catches a corrupted sum of the index file itself
-
-expecting success of 5300.31 'build pack index for an existing pack': 
-	cat test-1-${packname_1}.pack >test-3.pack &&
-	git index-pack -o tmp.idx test-3.pack &&
-	cmp tmp.idx test-1-${packname_1}.idx &&
-
-	git index-pack test-3.pack &&
-	cmp test-3.idx test-1-${packname_1}.idx &&
-
-	cat test-2-${packname_2}.pack >test-3.pack &&
-	git index-pack -o tmp.idx test-2-${packname_2}.pack &&
-	cmp tmp.idx test-2-${packname_2}.idx &&
-
-	git index-pack test-3.pack &&
-	cmp test-3.idx test-2-${packname_2}.idx &&
-
-	cat test-3-${packname_3}.pack >test-3.pack &&
-	git index-pack -o tmp.idx test-3-${packname_3}.pack &&
-	cmp tmp.idx test-3-${packname_3}.idx &&
-
-	git index-pack test-3.pack &&
-	cmp test-3.idx test-3-${packname_3}.idx &&
-
-	cat test-1-${packname_1}.pack >test-4.pack &&
-	rm -f test-4.keep &&
-	git index-pack --keep=why test-4.pack &&
-	cmp test-1-${packname_1}.idx test-4.idx &&
-	test -f test-4.keep &&
-
-	:
-
-0fe7826218e9201ffa2c785aa64f009dc5a98043
-0fe7826218e9201ffa2c785aa64f009dc5a98043
-3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5
-3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5
-ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
-ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
-0fe7826218e9201ffa2c785aa64f009dc5a98043
-ok 31 - build pack index for an existing pack
-
-expecting success of 5300.32 'unpacking with --strict': 
-
-	for j in a b c d e f g
-	do
-		for i in 0 1 2 3 4 5 6 7 8 9
-		do
-			o=$(echo $j$i | git hash-object -w --stdin) &&
-			echo "100644 $o	0 $j$i" || return 1
-		done
-	done >LIST &&
-	rm -f .git/index &&
-	git update-index --index-info <LIST &&
-	LIST=$(git write-tree) &&
-	rm -f .git/index &&
-	head -n 10 LIST | git update-index --index-info &&
-	LI=$(git write-tree) &&
-	rm -f .git/index &&
-	tail -n 10 LIST | git update-index --index-info &&
-	ST=$(git write-tree) &&
-	git rev-list --objects "$LIST" "$LI" "$ST" >actual &&
-	PACK5=$( git pack-objects test-5 <actual ) &&
-	PACK6=$( test_write_lines "$LIST" "$LI" "$ST" | git pack-objects test-6 ) &&
-	test_create_repo test-5 &&
-	(
-		cd test-5 &&
-		git unpack-objects --strict <../test-5-$PACK5.pack &&
-		git ls-tree -r $LIST &&
-		git ls-tree -r $LI &&
-		git ls-tree -r $ST
-	) &&
-	test_create_repo test-6 &&
-	(
-		# tree-only into empty repo -- many unreachables
-		cd test-6 &&
-		test_must_fail git unpack-objects --strict <../test-6-$PACK6.pack
-	) &&
-	(
-		# already populated -- no unreachables
-		cd test-5 &&
-		git unpack-objects --strict <../test-6-$PACK6.pack
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/test-5/.git/
-100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
-100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
-100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
-100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
-100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
-100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
-100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
-100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
-100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
-100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
-100644 blob 2270a80fbb71d7109b85e7489f3f307d0141a559	0 b0
-100644 blob c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061	0 b1
-100644 blob e6bfff5c1d0f0ecd501552b43a1e13d8008abc31	0 b2
-100644 blob 6d0875c82a99774922eab07fbc08510fc85d9e0a	0 b3
-100644 blob 8e953e84d803f13fd06416a1bd8161dcd93cfd00	0 b4
-100644 blob 90a5159bf020296276ea5ca1bcd292a9b1de9947	0 b5
-100644 blob 07eb61d36f49569a2b0649af299f9f00013d0969	0 b6
-100644 blob 6e6d33cfc7b1581413a88ae0759202b25ac4cad1	0 b7
-100644 blob 5d453c66b522d8de5d99c03bd2bf8b65ca0bcf33	0 b8
-100644 blob 9a16e0d1a643983973291127012d2694a0b17fe8	0 b9
-100644 blob caecf05cdbb03e144f113ecab2b99e5ee74df706	0 c0
-100644 blob ae9304576a6ec3419b231b2b9c8e33a06f97f9fb	0 c1
-100644 blob 16f9ec009e5568c435f473ba3a1df732d49ce8c3	0 c2
-100644 blob 0771aea884dd394a7b12783d049f05b5599f41a4	0 c3
-100644 blob a103f673dd1b7c5727aa0ae0100419adc50e1b76	0 c4
-100644 blob c36357109ce20af8f90df3c0dd0784e89408d707	0 c5
-100644 blob 86a716504cbdc40a135faa5ab199d15e364c416d	0 c6
-100644 blob 20be68787e59f4cb8983b641d170c4baf8ea25dd	0 c7
-100644 blob bb420bc8fb9e91530fdc25e363f6b822d5195309	0 c8
-100644 blob f899bd1761a5ca5978799bc3189a04d3c52d8435	0 c9
-100644 blob 79a5e858be4a3a969e3b71406fef0d3d36e1d387	0 d0
-100644 blob 6f1852975b9306ae5d8dfdf0d4cb1f5cb36ac229	0 d1
-100644 blob fd3671590780b645e1bef030d550191f6cdf1c95	0 d2
-100644 blob 69c77a9ea746edd27b46107142fc2c5288c1daf5	0 d3
-100644 blob d7b30ee07d4b9819a77a3b122282b4c04528ec21	0 d4
-100644 blob fa590f3f8bfbef6095cf6525e8497b2b2b46445c	0 d5
-100644 blob fef4390d19cb98fa97efd44c09d4e2eb7b084b40	0 d6
-100644 blob a5adf29249757619b8890c86f2cfcfeee611b5d8	0 d7
-100644 blob 1859919d049c078ba63fcecbce60e697c6da8e01	0 d8
-100644 blob b6148c82443a60d1d5ce07872a85e3c544b5f4b0	0 d9
-100644 blob 4fe4106b50b257f3d6ffd23b750d2d1945c2608b	0 e0
-100644 blob 5ff91639494693b1f238b5dc9baf8be95142c3ab	0 e1
-100644 blob 3811af3ca744c2fb44077a8025c23b4d4166a449	0 e2
-100644 blob 9338c3fa1f74d202651154257572d32aed57cc16	0 e3
-100644 blob c5195815f83aa9ef1ebac9e11f14d62b26406c99	0 e4
-100644 blob 0c44c89ef9c29077cceebc6dd9ca0b3a950c95ee	0 e5
-100644 blob f17172bc54cfa55a9e531cc845dff39855cd8df0	0 e6
-100644 blob 29870e9ccff84f86938ee588a47b39cf3a802e6b	0 e7
-100644 blob e8d01d007452cede5c6eafc3343fc80675b1e2f9	0 e8
-100644 blob 0c1945ad576ffc445ad69a3fafd1d3c04cc0bd40	0 e9
-100644 blob 844dc808a1d3d769ddcf5430eac933d4d87ff606	0 f0
-100644 blob 8e1e71d5ce34c01b6fe83bc5051545f2918c8c2b	0 f1
-100644 blob 9de77c18733ab8009a956c25e28c85fe203a17d7	0 f2
-100644 blob 45d9e0e9fc8859787c33081dffdf12f41b54fcf3	0 f3
-100644 blob c48ac4847d3abae8e5899dcc5cf490a98df55755	0 f4
-100644 blob 14c61ecf25961ce674048103c5fa5ea3c535a5cd	0 f5
-100644 blob 59ce90029dfd9e224701a040a26153e9f2feb74c	0 f6
-100644 blob 0a7bd52ffb819609cf65f40eb91be62000db47e5	0 f7
-100644 blob c7e617f6b429a1f3b462df6add2b4ea2cf702faf	0 f8
-100644 blob a720d8c8d277ad31ee5b180bef57379b5f62517c	0 f9
-100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
-100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
-100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
-100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
-100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
-100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
-100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
-100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
-100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
-100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
-100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
-100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
-100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
-100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
-100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
-100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
-100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
-100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
-100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
-100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
-100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
-100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
-100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
-100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
-100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
-100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
-100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
-100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
-100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
-100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/test-6/.git/
-fatal: object of unexpected type
-ok 32 - unpacking with --strict
-
-expecting success of 5300.33 'index-pack with --strict': 
-
-	for j in a b c d e f g
-	do
-		for i in 0 1 2 3 4 5 6 7 8 9
-		do
-			o=$(echo $j$i | git hash-object -w --stdin) &&
-			echo "100644 $o	0 $j$i" || return 1
-		done
-	done >LIST &&
-	rm -f .git/index &&
-	git update-index --index-info <LIST &&
-	LIST=$(git write-tree) &&
-	rm -f .git/index &&
-	head -n 10 LIST | git update-index --index-info &&
-	LI=$(git write-tree) &&
-	rm -f .git/index &&
-	tail -n 10 LIST | git update-index --index-info &&
-	ST=$(git write-tree) &&
-	git rev-list --objects "$LIST" "$LI" "$ST" >actual &&
-	PACK5=$( git pack-objects test-5 <actual ) &&
-	PACK6=$( test_write_lines "$LIST" "$LI" "$ST" | git pack-objects test-6 ) &&
-	test_create_repo test-7 &&
-	(
-		cd test-7 &&
-		git index-pack --strict --stdin <../test-5-$PACK5.pack &&
-		git ls-tree -r $LIST &&
-		git ls-tree -r $LI &&
-		git ls-tree -r $ST
-	) &&
-	test_create_repo test-8 &&
-	(
-		# tree-only into empty repo -- many unreachables
-		cd test-8 &&
-		test_must_fail git index-pack --strict --stdin <../test-6-$PACK6.pack
-	) &&
-	(
-		# already populated -- no unreachables
-		cd test-7 &&
-		git index-pack --strict --stdin <../test-6-$PACK6.pack
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/test-7/.git/
-pack	580f6e9e5f1fc55c922ae4f748e6adb3737375f4
-100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
-100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
-100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
-100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
-100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
-100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
-100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
-100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
-100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
-100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
-100644 blob 2270a80fbb71d7109b85e7489f3f307d0141a559	0 b0
-100644 blob c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061	0 b1
-100644 blob e6bfff5c1d0f0ecd501552b43a1e13d8008abc31	0 b2
-100644 blob 6d0875c82a99774922eab07fbc08510fc85d9e0a	0 b3
-100644 blob 8e953e84d803f13fd06416a1bd8161dcd93cfd00	0 b4
-100644 blob 90a5159bf020296276ea5ca1bcd292a9b1de9947	0 b5
-100644 blob 07eb61d36f49569a2b0649af299f9f00013d0969	0 b6
-100644 blob 6e6d33cfc7b1581413a88ae0759202b25ac4cad1	0 b7
-100644 blob 5d453c66b522d8de5d99c03bd2bf8b65ca0bcf33	0 b8
-100644 blob 9a16e0d1a643983973291127012d2694a0b17fe8	0 b9
-100644 blob caecf05cdbb03e144f113ecab2b99e5ee74df706	0 c0
-100644 blob ae9304576a6ec3419b231b2b9c8e33a06f97f9fb	0 c1
-100644 blob 16f9ec009e5568c435f473ba3a1df732d49ce8c3	0 c2
-100644 blob 0771aea884dd394a7b12783d049f05b5599f41a4	0 c3
-100644 blob a103f673dd1b7c5727aa0ae0100419adc50e1b76	0 c4
-100644 blob c36357109ce20af8f90df3c0dd0784e89408d707	0 c5
-100644 blob 86a716504cbdc40a135faa5ab199d15e364c416d	0 c6
-100644 blob 20be68787e59f4cb8983b641d170c4baf8ea25dd	0 c7
-100644 blob bb420bc8fb9e91530fdc25e363f6b822d5195309	0 c8
-100644 blob f899bd1761a5ca5978799bc3189a04d3c52d8435	0 c9
-100644 blob 79a5e858be4a3a969e3b71406fef0d3d36e1d387	0 d0
-100644 blob 6f1852975b9306ae5d8dfdf0d4cb1f5cb36ac229	0 d1
-100644 blob fd3671590780b645e1bef030d550191f6cdf1c95	0 d2
-100644 blob 69c77a9ea746edd27b46107142fc2c5288c1daf5	0 d3
-100644 blob d7b30ee07d4b9819a77a3b122282b4c04528ec21	0 d4
-100644 blob fa590f3f8bfbef6095cf6525e8497b2b2b46445c	0 d5
-100644 blob fef4390d19cb98fa97efd44c09d4e2eb7b084b40	0 d6
-100644 blob a5adf29249757619b8890c86f2cfcfeee611b5d8	0 d7
-100644 blob 1859919d049c078ba63fcecbce60e697c6da8e01	0 d8
-100644 blob b6148c82443a60d1d5ce07872a85e3c544b5f4b0	0 d9
-100644 blob 4fe4106b50b257f3d6ffd23b750d2d1945c2608b	0 e0
-100644 blob 5ff91639494693b1f238b5dc9baf8be95142c3ab	0 e1
-100644 blob 3811af3ca744c2fb44077a8025c23b4d4166a449	0 e2
-100644 blob 9338c3fa1f74d202651154257572d32aed57cc16	0 e3
-100644 blob c5195815f83aa9ef1ebac9e11f14d62b26406c99	0 e4
-100644 blob 0c44c89ef9c29077cceebc6dd9ca0b3a950c95ee	0 e5
-100644 blob f17172bc54cfa55a9e531cc845dff39855cd8df0	0 e6
-100644 blob 29870e9ccff84f86938ee588a47b39cf3a802e6b	0 e7
-100644 blob e8d01d007452cede5c6eafc3343fc80675b1e2f9	0 e8
-100644 blob 0c1945ad576ffc445ad69a3fafd1d3c04cc0bd40	0 e9
-100644 blob 844dc808a1d3d769ddcf5430eac933d4d87ff606	0 f0
-100644 blob 8e1e71d5ce34c01b6fe83bc5051545f2918c8c2b	0 f1
-100644 blob 9de77c18733ab8009a956c25e28c85fe203a17d7	0 f2
-100644 blob 45d9e0e9fc8859787c33081dffdf12f41b54fcf3	0 f3
-100644 blob c48ac4847d3abae8e5899dcc5cf490a98df55755	0 f4
-100644 blob 14c61ecf25961ce674048103c5fa5ea3c535a5cd	0 f5
-100644 blob 59ce90029dfd9e224701a040a26153e9f2feb74c	0 f6
-100644 blob 0a7bd52ffb819609cf65f40eb91be62000db47e5	0 f7
-100644 blob c7e617f6b429a1f3b462df6add2b4ea2cf702faf	0 f8
-100644 blob a720d8c8d277ad31ee5b180bef57379b5f62517c	0 f9
-100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
-100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
-100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
-100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
-100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
-100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
-100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
-100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
-100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
-100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
-100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
-100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
-100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
-100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
-100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
-100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
-100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
-100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
-100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
-100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
-100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
-100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
-100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
-100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
-100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
-100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
-100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
-100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
-100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
-100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/test-8/.git/
-fatal: did not receive expected object 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02
-pack	499fed00672b4ac4e35132711ee1664a089f355e
-ok 33 - index-pack with --strict
-
-expecting success of 5300.34 'setup for --strict and --fsck-objects downgrading fsck msgs': 
-	git init strict &&
-	(
-		cd strict &&
-		test_commit first hello &&
-		cat >commit <<-EOF &&
-		tree $(git rev-parse HEAD^{tree})
-		parent $(git rev-parse HEAD)
-		author A U Thor
-		committer A U Thor
-
-		commit: this is a commit with bad emails
-
-		EOF
-		git hash-object --literally -t commit -w --stdin <commit >commit_list &&
-		git pack-objects test <commit_list >pack-name
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/strict/.git/
-[master (root-commit) 84f9e61] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello
-ok 34 - setup for --strict and --fsck-objects downgrading fsck msgs
-
-expecting success of 5300.35 'index-pack with --strict downgrading fsck msgs': 
-	test_with_bad_commit --strict --strict="missingEmail=ignore"
-
-error: object 754157ff66855f3f8d7afaa92a2c052776b99a16: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-e4e1649155bf444fbd9cd85e376628d6eaf3d3bd
-ok 35 - index-pack with --strict downgrading fsck msgs
-
-expecting success of 5300.36 'index-pack with --fsck-objects downgrading fsck msgs': 
-	test_with_bad_commit --fsck-objects --fsck-objects="missingEmail=ignore"
-
-error: object 754157ff66855f3f8d7afaa92a2c052776b99a16: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-e4e1649155bf444fbd9cd85e376628d6eaf3d3bd
-ok 36 - index-pack with --fsck-objects downgrading fsck msgs
-
-expecting success of 5300.37 'cleanup for --strict and --fsck-objects downgrading fsck msgs': 
-	rm -rf strict
-
-ok 37 - cleanup for --strict and --fsck-objects downgrading fsck msgs
-
-expecting success of 5300.38 'honor pack.packSizeLimit': 
-	git config pack.packSizeLimit 3m &&
-	packname_10=$(git pack-objects test-10 <obj-list) &&
-	test 2 = $(ls test-10-*.pack | wc -l)
-
-ok 38 - honor pack.packSizeLimit
-
-expecting success of 5300.39 'verify resulting packs': 
-	git verify-pack test-10-*.pack
-
-ok 39 - verify resulting packs
-
-expecting success of 5300.40 'tolerate packsizelimit smaller than biggest object': 
-	git config pack.packSizeLimit 1 &&
-	packname_11=$(git pack-objects test-11 <obj-list) &&
-	test 5 = $(ls test-11-*.pack | wc -l)
-
-warning: minimum pack size limit is 1 MiB
-ok 40 - tolerate packsizelimit smaller than biggest object
-
-expecting success of 5300.41 'verify resulting packs': 
-	git verify-pack test-11-*.pack
-
-ok 41 - verify resulting packs
-
-expecting success of 5300.42 'set up pack for non-repo tests': 
-	# make sure we have a pack with no matching index file
-	cp test-1-*.pack foo.pack
-
-ok 42 - set up pack for non-repo tests
-
-expecting success of 5300.43 'index-pack --stdin complains of non-repo': 
-	nongit test_must_fail git index-pack --object-format=$(test_oid algo) --stdin <foo.pack &&
-	test_path_is_missing non-repo/.git
-
-fatal: --stdin requires a git repository
-ok 43 - index-pack --stdin complains of non-repo
-
-expecting success of 5300.44 'index-pack <pack> works in non-repo': 
-	nongit git index-pack --object-format=$(test_oid algo) ../foo.pack &&
-	test_path_is_file foo.idx
-
-0fe7826218e9201ffa2c785aa64f009dc5a98043
-ok 44 - index-pack <pack> works in non-repo
-
-expecting success of 5300.45 'index-pack --strict <pack> works in non-repo': 
-	rm -f foo.idx &&
-	nongit git index-pack --strict --object-format=$(test_oid algo) ../foo.pack &&
-	test_path_is_file foo.idx
-
-0fe7826218e9201ffa2c785aa64f009dc5a98043
-ok 45 - index-pack --strict <pack> works in non-repo
-
-checking prerequisite: DEFAULT_HASH_ALGORITHM
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_HASH_ALGORITHM" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_HASH_ALGORITHM" &&
-	test "$GIT_TEST_BUILTIN_HASH" = "$GIT_DEFAULT_HASH"
-
-)
-prerequisite DEFAULT_HASH_ALGORITHM ok
-expecting success of 5300.46 'show-index works OK outside a repository': 
-	nongit git show-index <foo.idx
-
-335 012b05d476b4ffc9e62d036156b99467206f1efa (c00fe8a7)
-4195970 0be779221aca65277fd447c8207e1b3c2706ae20 (e9e93ee1)
-12 3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 (8abd2aad)
-2098168 6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf (902113ef)
-304 9d235ed07cd19811a6ceb342de82f190e49c9f68 (bfe5d115)
-4196001 b010fe5253f7dc59c6605dacb92fcea00d199d4e (f8ed20b0)
-2098137 c82de19312b6c3695c0c18f70709a6c535682a67 (cf484043)
-181 ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe (512ec580)
-ok 46 - show-index works OK outside a repository
-
-expecting success of 5300.47 'show-index works OK outside a repository with hash algo passed in via --object-format': 
-		test_when_finished "rm -rf explicit-hash-$hash" &&
-		git init --object-format=$hash explicit-hash-$hash &&
-		test_commit -C explicit-hash-$hash one &&
-		git -C explicit-hash-$hash rev-parse one >in &&
-		git -C explicit-hash-$hash pack-objects explicit-hash-$hash <in &&
-		idx=$(echo explicit-hash-$hash/explicit-hash-$hash*.idx) &&
-		nongit git show-index --object-format=$hash <"$idx" >actual &&
-		test_line_count = 1 actual
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/explicit-hash-sha1/.git/
-[master (root-commit) 4331c28] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-acdb9ae06f04f82d5e6a285e1bafea173d44bc45
-ok 47 - show-index works OK outside a repository with hash algo passed in via --object-format
-
-expecting success of 5300.48 'show-index works OK outside a repository with hash algo passed in via --object-format': 
-		test_when_finished "rm -rf explicit-hash-$hash" &&
-		git init --object-format=$hash explicit-hash-$hash &&
-		test_commit -C explicit-hash-$hash one &&
-		git -C explicit-hash-$hash rev-parse one >in &&
-		git -C explicit-hash-$hash pack-objects explicit-hash-$hash <in &&
-		idx=$(echo explicit-hash-$hash/explicit-hash-$hash*.idx) &&
-		nongit git show-index --object-format=$hash <"$idx" >actual &&
-		test_line_count = 1 actual
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/explicit-hash-sha256/.git/
-[master (root-commit) 9185f47] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-9b2641231de0d658b94f3140148aeae12672826d54b5fbede03e02dbf4f990bd
-ok 48 - show-index works OK outside a repository with hash algo passed in via --object-format
-
-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 49 # skip index-pack --threads=N or pack.threads=N warns when no pthreads (missing !PTHREADS of !PTHREADS,!FAIL_PREREQS)
-
-ok 50 # skip pack-objects --threads=N or pack.threads=N warns when no pthreads (missing !PTHREADS of !PTHREADS,!FAIL_PREREQS)
-
-expecting success of 5300.51 'pack-objects in too-many-packs mode': 
-	GIT_TEST_FULL_IN_PACK_ARRAY=1 git repack -ad &&
-	git fsck
-
-warning: minimum pack size limit is 1 MiB
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tree ebe633107a37152edb13864b30d6878084f68c92
-dangling tree eb486020614a4c764f9df37263317ed4ea372ef8
-dangling commit ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe
-ok 51 - pack-objects in too-many-packs mode
-
-expecting success of 5300.52 'setup: fake a SHA1 hash collision': 
-	git init corrupt &&
-	(
-		cd corrupt &&
-		long_a=$(git hash-object -w ../a | sed -e "s!^..!&/!") &&
-		long_b=$(git hash-object -w ../b | sed -e "s!^..!&/!") &&
-		test -f	.git/objects/$long_b &&
-		cp -f	.git/objects/$long_a \
-			.git/objects/$long_b
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/corrupt/.git/
-ok 52 - setup: fake a SHA1 hash collision
-
-expecting success of 5300.53 'make sure index-pack detects the SHA1 collision': 
-	(
-		cd corrupt &&
-		test_must_fail git index-pack -o ../bad.idx ../test-3.pack 2>msg &&
-		test_grep "SHA1 COLLISION FOUND" msg
-	)
-
-fatal: SHA1 COLLISION FOUND WITH c82de19312b6c3695c0c18f70709a6c535682a67 !
-ok 53 - make sure index-pack detects the SHA1 collision
-
-expecting success of 5300.54 'make sure index-pack detects the SHA1 collision (large blobs)': 
-	(
-		cd corrupt &&
-		test_must_fail git -c core.bigfilethreshold=1 index-pack -o ../bad.idx ../test-3.pack 2>msg &&
-		test_grep "SHA1 COLLISION FOUND" msg
-	)
-
-fatal: SHA1 COLLISION FOUND WITH c82de19312b6c3695c0c18f70709a6c535682a67 !
-ok 54 - make sure index-pack detects the SHA1 collision (large blobs)
-
-expecting success of 5300.55 'prefetch objects': 
-	rm -rf server client &&
-
-	git init server &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server protocol.version 2 &&
-
-	echo one >server/one &&
-	git -C server add one &&
-	git -C server commit -m one &&
-	git -C server branch one_branch &&
-
-	echo two_a >server/two_a &&
-	echo two_b >server/two_b &&
-	git -C server add two_a two_b &&
-	git -C server commit -m two &&
-
-	echo three >server/three &&
-	git -C server add three &&
-	git -C server commit -m three &&
-	git -C server branch three_branch &&
-
-	# Clone, fetch "two" with blobs excluded, and re-push it. This requires
-	# the client to have the blobs of "two" - verify that these are
-	# prefetched in one batch.
-	git clone --filter=blob:none --single-branch -b one_branch \
-		"file://$(pwd)/server" client &&
-	test_config -C client protocol.version 2 &&
-	TWO=$(git -C server rev-parse three_branch^) &&
-	git -C client fetch --filter=blob:none origin "$TWO" &&
-	GIT_TRACE_PACKET=$(pwd)/trace git -C client push origin "$TWO":refs/heads/two_branch &&
-	grep "fetch> done" trace >donelines &&
-	test_line_count = 1 donelines
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/server/.git/
-[master (root-commit) 7d92f94] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-[master a9c9a29] two
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 two_a
- create mode 100644 two_b
-[master d4af973] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three
-Cloning into 'client'...
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/server
- * branch            a9c9a2938d723a122aa8e03710f837cd647b4f30 -> FETCH_HEAD
-To file:///build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/server
- * [new branch]      a9c9a2938d723a122aa8e03710f837cd647b4f30 -> two_branch
-ok 55 - prefetch objects
-
-expecting success of 5300.56 'verify-pack with sha1 packfile': 
-		test_when_finished "rm -rf repo" &&
-		git init --object-format=$hash repo &&
-		test_commit -C repo initial &&
-		git -C repo repack -ad &&
-		git -C repo verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
-		if test $hash = $GIT_TEST_BUILTIN_HASH
-		then
-			nongit git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx
-		else
-			# We have no way to identify the hash used by packfiles
-			# or indices, so we always fall back to SHA1.
-			nongit test_must_fail git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
-			# But with an explicit object format we should succeed.
-			nongit git verify-pack --object-format=$hash "$(pwd)"/repo/.git/objects/pack/*.idx
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/repo/.git/
-[master (root-commit) 23fa7ba] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 56 - verify-pack with sha1 packfile
-
-expecting success of 5300.57 'index-pack outside of a sha1 repository': 
-		test_when_finished "rm -rf repo" &&
-		git init --object-format=$hash repo &&
-		test_commit -C repo initial &&
-		git -C repo repack -ad &&
-		git -C repo index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack &&
-		if test $hash = $GIT_TEST_BUILTIN_HASH
-		then
-			nongit git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack
-		else
-			# We have no way to identify the hash used by packfiles
-			# or indices, so we always fall back to SHA1.
-			nongit test_must_fail git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack 2>err &&
-			# But with an explicit object format we should succeed.
-			nongit git index-pack --object-format=$hash --verify "$(pwd)"/repo/.git/objects/pack/*.pack
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/repo/.git/
-[master (root-commit) 31243c6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 57 - index-pack outside of a sha1 repository
-
-expecting success of 5300.58 'verify-pack with sha256 packfile': 
-		test_when_finished "rm -rf repo" &&
-		git init --object-format=$hash repo &&
-		test_commit -C repo initial &&
-		git -C repo repack -ad &&
-		git -C repo verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
-		if test $hash = $GIT_TEST_BUILTIN_HASH
-		then
-			nongit git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx
-		else
-			# We have no way to identify the hash used by packfiles
-			# or indices, so we always fall back to SHA1.
-			nongit test_must_fail git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
-			# But with an explicit object format we should succeed.
-			nongit git verify-pack --object-format=$hash "$(pwd)"/repo/.git/objects/pack/*.idx
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/repo/.git/
-[master (root-commit) 24ce812] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-error: wrong index v2 file size in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/repo/.git/objects/pack/pack-1b1240ab533163a4b525e5814f51ec3256428f79647ff13f19dfc1f2fe16cc2a.idx
-fatal: Cannot open existing pack idx file for '/build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/repo/.git/objects/pack/pack-1b1240ab533163a4b525e5814f51ec3256428f79647ff13f19dfc1f2fe16cc2a.idx'
-ok 58 - verify-pack with sha256 packfile
-
-expecting success of 5300.59 'index-pack outside of a sha256 repository': 
-		test_when_finished "rm -rf repo" &&
-		git init --object-format=$hash repo &&
-		test_commit -C repo initial &&
-		git -C repo repack -ad &&
-		git -C repo index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack &&
-		if test $hash = $GIT_TEST_BUILTIN_HASH
-		then
-			nongit git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack
-		else
-			# We have no way to identify the hash used by packfiles
-			# or indices, so we always fall back to SHA1.
-			nongit test_must_fail git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack 2>err &&
-			# But with an explicit object format we should succeed.
-			nongit git index-pack --object-format=$hash --verify "$(pwd)"/repo/.git/objects/pack/*.pack
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5300-pack-object/repo/.git/
-[master (root-commit) 699ee1a] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 59 - index-pack outside of a sha256 repository
-
-expecting success of 5300.60 'valid and invalid --name-hash-versions': 
-	sane_unset GIT_TEST_NAME_HASH_VERSION &&
-
-	# Valid values are hard to verify other than "do not fail".
-	# Performance tests will be more valuable to validate these versions.
-	# Negative values are converted to version 1.
-	for value in -1 1 2
-	do
-		git pack-objects base --all --name-hash-version=$value || return 1
-	done &&
+4+0 records out
+4 bytes copied, 3.524e-05 s, 114 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.276e-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)
 
-	# Invalid values have clear post-conditions.
-	for value in 0 3
-	do
-		test_must_fail git pack-objects base --all --name-hash-version=$value 2>err &&
-		test_grep "invalid --name-hash-version option" err || return 1
-	done
+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
 
-warning: minimum pack size limit is 1 MiB
-029d08823bd8a8eab510ad6ac75c823cfd3ed31e
-warning: minimum pack size limit is 1 MiB
-029d08823bd8a8eab510ad6ac75c823cfd3ed31e
-warning: minimum pack size limit is 1 MiB
-029d08823bd8a8eab510ad6ac75c823cfd3ed31e
-fatal: invalid --name-hash-version option: 0
-fatal: invalid --name-hash-version option: 3
-ok 60 - valid and invalid --name-hash-versions
+dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
+dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
+1+0 records in
+1+0 records out
+1 byte copied, 3.468e-05 s, 28.8 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.268e-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)
 
-expecting success of 5300.61 '--name-hash-version=2 and --write-bitmap-index are incompatible': 
-	git pack-objects base --all --name-hash-version=2 --write-bitmap-index 2>err &&
-	test_grep "currently, --write-bitmap-index requires --name-hash-version=1" err &&
+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
 
-	# --stdout option silently removes --write-bitmap-index
-	git pack-objects --stdout --all --name-hash-version=2 --write-bitmap-index >out 2>err &&
-	! test_grep "currently, --write-bitmap-index requires --name-hash-version=1" err
+dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
+dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
+1+0 records in
+1+0 records out
+1 byte copied, 3.46e-05 s, 28.9 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.028e-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)
 
-029d08823bd8a8eab510ad6ac75c823cfd3ed31e
-warning: currently, --write-bitmap-index requires --name-hash-version=1
-error: 'grep currently, --write-bitmap-index requires --name-hash-version=1 err' didn't find a match in:
-<File 'err' is empty>
-ok 61 - --name-hash-version=2 and --write-bitmap-index are incompatible
+expecting success of 5318.90 'git fsck (checks commit-graph when config unset)': 
+	test_when_finished "git -C full config core.commitGraph true" &&
 
-expecting success of 5300.62 '--path-walk pack everything': 
-	git -C server rev-parse HEAD >in &&
-	GIT_PROGRESS_DELAY=0 git -C server pack-objects \
-		--stdout --revs --path-walk --progress <in >out.pack 2>err &&
-	grep "Compressing objects by path" err &&
-	git -C server index-pack --stdin <out.pack
+	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
 
-Compressing objects by path:  10% (1/10)
Compressing objects by path:  20% (2/10)
Compressing objects by path:  30% (3/10)
Compressing objects by path:  40% (4/10)
Compressing objects by path:  50% (5/10)
Compressing objects by path: 100% (10/10)
Compressing objects by path: 100% (10/10), done.
-pack	048bec49b34933de3f054cd48af9b2b23b8a100c
-ok 62 - --path-walk pack everything
+dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
+dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
+1+0 records in
+1+0 records out
+1 byte copied, 3.256e-05 s, 30.7 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.312e-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)
 
-expecting success of 5300.63 '--path-walk thin pack': 
-	cat >in <<-EOF &&
-	$(git -C server rev-parse HEAD)
-	^$(git -C server rev-parse HEAD~2)
-	EOF
-	GIT_PROGRESS_DELAY=0 git -C server pack-objects \
-		--thin --stdout --revs --path-walk --progress <in >out.pack 2>err &&
-	grep "Compressing objects by path" err &&
-	git -C server index-pack --fix-thin --stdin <out.pack
+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
 
-Compressing objects by path:  11% (1/9)
Compressing objects by path:  22% (2/9)
Compressing objects by path:  33% (3/9)
Compressing objects by path: 100% (9/9)
Compressing objects by path: 100% (9/9), done.
-pack	09393f9419a0ddc800ca1402099cfe87d43177be
-ok 63 - --path-walk thin 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
 
-# passed all 63 test(s)
-1..63
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5404-tracking-branches.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+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
 
-[main (root-commit) c663a66] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'aa'...
-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
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
+dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
+dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
+ok 92 - git fsck suppresses commit-graph output with --no-progress
 
-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 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
 
-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(+)
-Switched to a new branch 'b2'
-branch 'b2' set up to track 'origin/b2'.
-[b2 4441e28] aa-b2
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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(+)
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 5f550d5] aa-main
+ create mode 100644 one.t
+[master 4ae1176] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 2 - prepare pushable branches
+ create mode 100644 two.t
+ok 93 - setup non-the_repository tests
 
-expecting success of 5404.3 'mixed-success push returns error': 
-	test_must_fail git push origin :
+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 &&
 
-To /build/reproducible-path/git-2.51.0/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.51.0/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
+	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
 
-expecting success of 5404.4 'check tracking branches updated correctly after push': 
-	test "$(git rev-parse origin/main)" = "$(git rev-parse main)"
+ok 94 - parse_commit_in_graph works for non-the_repository
 
-ok 4 - check tracking branches updated correctly after push
+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 &&
 
-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"
+	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
 
-ok 5 - check tracking branches not updated for failed refs
+ok 95 - get_commit_tree_in_graph works for non-the_repository
 
-expecting success of 5404.6 'deleted branches have their tracking branches removed': 
-	git push origin :b1 &&
-	test "$(git rev-parse origin/b1)" = "origin/b1"
+expecting success of 5318.96 'corrupt commit-graph write (broken parent)': 
+	rm -rf repo &&
+	git init 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
 
-To /build/reproducible-path/git-2.51.0/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
+		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
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5318-commit-graph/repo/.git/
+fatal: unable to parse commit 0000000000000000000000000000000000000000
+ok 96 - corrupt commit-graph write (broken parent)
 
-Deleted remote-tracking branch origin/b3 (was c663a66).
-ok 7 - already deleted tracking branches ignored
+expecting success of 5318.97 'corrupt commit-graph write (missing tree)': 
+	rm -rf repo &&
+	git init 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
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5405-send-pack-rewind.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5405-send-pack-rewind/.git/
-expecting success of 5405.1 'setup': 
+		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
+	)
 
-	>file1 && git add file1 && test_tick &&
-	git commit -m Initial &&
-	git config receive.denyCurrentBranch warn &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5318-commit-graph/repo/.git/
+fatal: unable to parse commit 2b6f5e209fea0912fdff2d553964d7a56d9fd44d
+ok 97 - corrupt commit-graph write (missing tree)
 
-	mkdir another && (
-		cd another &&
-		git init &&
-		git fetch --update-head-ok .. main:main
-	) &&
+expecting success of 5318.98 'set up and verify repo with generation data overflow chunk': 
+	UNIX_EPOCH_ZERO="@0 +0000" &&
+	FUTURE_DATE="@2147483646 +0000" &&
 
-	>file2 && git add file2 && test_tick &&
-	git commit -m Second
+	git init repo &&
+	(
+		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
+	)
 
-[main (root-commit) de5945f] Initial
+Reinitialized existing Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5318-commit-graph/repo/.git/
+[master (root-commit) 0131a52] 1
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5405-send-pack-rewind/another/.git/
-From ..
- * [new branch]      main       -> main
-[main 3dc47c1] Second
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 4f95b2b] 2
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-ok 1 - setup
+ 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
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+[master bbde0d8] 6
+ 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
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7.t
+[master 1aff441] 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8.t
+[master 1ec2f73] 9
+ 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 5405.2 'non forced push should die not segfault': 
+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
 
+expecting success of 5318.100 'overflow during generation version upgrade': 
+	git init overflow-v2-upgrade &&
 	(
-		cd another &&
-		test_must_fail git push .. main:main
-	)
-
+		cd overflow-v2-upgrade &&
 
-To ..
- ! [rejected]        main -> main (fetch first)
-error: failed to push some refs to '..'
-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 2 - non forced push should die not segfault
+		# 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 &&
 
-expecting success of 5405.3 'forced push should succeed': 
+		# 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 &&
 
-	(
-		cd another &&
-		git push .. +main:main
+		git rev-list --all
 	)
 
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+b89bafebd219ef84734f57391e155dcedaccac5c
+ok 100 - overflow during generation version upgrade
 
-remote: warning: updating the current branch        
-To ..
- + 3dc47c1...de5945f main -> main (forced update)
-ok 3 - forced push should succeed
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5406-remote-rejects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5406-remote-rejects/.git/
-expecting success of 5406.1 'setup': 
-	test_hook update <<-\EOF &&
-	exit 1
+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
-	echo 1 >file &&
-	git add file &&
-	git commit -m 1 &&
-	git clone . child &&
-	cd child &&
-	echo 2 >file &&
-	git commit -a -m 2
+	test_cmp expect.err err
 
-[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 ee88fdb] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+ok 101 - reader notices too-small oid fanout chunk
 
-expecting success of 5406.2 'push reports error': test_must_fail git push 2>stderr
-ok 2 - push reports error
+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
 
-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
+ok 102 - reader notices fanout/lookup table mismatch
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5351-unpack-large-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5351-unpack-large-objects/.git/
-expecting success of 5351.1 'create large objects (1.5 MB) and PACK': 
-	test-tool genrandom foo 1500000 >big-blob &&
-	test_commit --append foo big-blob &&
-	test-tool genrandom bar 1500000 >big-blob &&
-	test_commit --append bar big-blob &&
-	PACK=$(echo HEAD | git pack-objects --revs pack) &&
-	git verify-pack -v pack-$PACK.pack >out &&
-	sed -n -e "s/^\([0-9a-f][0-9a-f]*\).*\(commit\|tree\|blob\).*/\1/p" \
-		<out >obj-list
+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
 
-[master (root-commit) b6b91a6] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 big-blob
-[master 73e7a4c] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 1 - create large objects (1.5 MB) and PACK
+ok 103 - reader notices out-of-bounds fanout
 
-expecting success of 5351.2 'set memory limitation to 1MB': 
-	GIT_ALLOC_LIMIT=1m &&
-	export GIT_ALLOC_LIMIT
+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
 
-ok 2 - set memory limitation to 1MB
+ok 104 - reader notices too-small commit data chunk
 
-expecting success of 5351.3 'unpack-objects failed under memory limitation': 
-	prepare_dest 2m &&
-	test_must_fail git -C dest.git unpack-objects <pack-$PACK.pack 2>err &&
-	grep "fatal: attempting to allocate" err
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5351-unpack-large-objects/dest.git/
-fatal: attempting to allocate 1500005 over limit 1048576
-ok 3 - unpack-objects failed under memory limitation
+ok 105 - reader notices out-of-bounds extra edge
 
-expecting success of 5351.4 'unpack-objects works with memory limitation in dry-run mode': 
-	prepare_dest 2m &&
-	git -C dest.git unpack-objects -n <pack-$PACK.pack &&
-	test_stdout_line_count = 0 find dest.git/objects -type f &&
-	test_dir_is_empty dest.git/objects/pack
+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.51.0/t/trash directory.t5351-unpack-large-objects/dest.git/
-ok 4 - unpack-objects works with memory limitation in dry-run mode
+ok 106 - reader notices too-small generations chunk
 
-expecting success of 5351.5 'unpack big object in stream': 
-	prepare_dest 1m &&
-	git -C dest.git unpack-objects <pack-$PACK.pack &&
-	test_dir_is_empty dest.git/objects/pack
+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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5351-unpack-large-objects/dest.git/
-ok 5 - unpack big object in stream
+		oid=$(git rev-parse B) &&
+		rm .git/objects/"$(test_oid_to_path "$oid")" &&
 
-expecting success of 5351.6 'unpack big object in stream (core.fsyncmethod=batch)': 
-	prepare_dest 1m &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-	GIT_TEST_FSYNC=true \
-		git -C dest.git $BATCH_CONFIGURATION unpack-objects <pack-$PACK.pack &&
-	if grep "core.fsyncMethod = batch is unsupported" trace2.txt
-	then
-		flush_count=7
-	else
-		flush_count=1
-	fi &&
-	check_fsync_events trace2.txt <<-EOF &&
-	"name":"writeout-only","count":6
-	"name":"hardware-flush","count":$flush_count
-	EOF
+		# 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
+	)
 
-	test_dir_is_empty dest.git/objects/pack &&
-	git -C dest.git cat-file --batch-check="%(objectname)" <obj-list >current &&
-	cmp obj-list current
+Reinitialized existing Git repository in /build/reproducible-path/git-2.51.0/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 A.t
+[master 4ce4c2d] B
+ 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5351-unpack-large-objects/dest.git/
-ok 6 - unpack big object in stream (core.fsyncmethod=batch)
+expecting success of 5318.108 'stale commit cannot be parsed when traversing graph': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
 
-expecting success of 5351.7 'do not unpack existing large objects': 
-	prepare_dest 1m &&
-	git -C dest.git index-pack --stdin <pack-$PACK.pack &&
-	git -C dest.git unpack-objects <pack-$PACK.pack &&
+		test_commit A &&
+		test_commit B &&
+		test_commit C &&
+		git commit-graph write --reachable &&
 
-	# The destination came up with the exact same pack...
-	DEST_PACK=$(echo dest.git/objects/pack/pack-*.pack) &&
-	cmp pack-$PACK.pack $DEST_PACK &&
+		# 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")" &&
 
-	# ...and wrote no loose objects
-	test_stdout_line_count = 0 find dest.git/objects -type f ! -name "pack-*"
+		# 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.51.0/t/trash directory.t5351-unpack-large-objects/dest.git/
-pack	4a1be184fdbd6bf82eab500bad78e4fee02c1909
-ok 7 - do not unpack existing large objects
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 A.t
+[master f3c5d37] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[master 6bb8ed6] C
+ 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
 
-# passed all 7 test(s)
-1..7
+# passed all 108 test(s)
+1..108
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5319-multi-pack-index.sh ***
@@ -318530,7 +319778,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.3401e-05 s, 29.9 kB/s
+1 byte copied, 3.588e-05 s, 27.9 kB/s
 fatal: multi-pack-index signature 0x00494458 does not match signature 0x4d494458
 ok 31 - verify bad signature
 
@@ -318540,7 +319788,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.256e-05 s, 30.7 kB/s
+1 byte copied, 4.06e-05 s, 24.6 kB/s
 fatal: multi-pack-index version 0 not recognized
 ok 32 - verify bad version
 
@@ -318550,7 +319798,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.2e-05 s, 31 kB/s
+1 byte copied, 3.344e-05 s, 29.9 kB/s
 error: multi-pack-index hash version 3 does not match version 1
 ok 33 - verify bad OID version
 
@@ -318560,7 +319808,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.352e-05 s, 29.8 kB/s
+1 byte copied, 4.096e-05 s, 24.4 kB/s
 error: final chunk has non-zero id 4f494446
 ok 34 - verify truncated chunk count
 
@@ -318570,7 +319818,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.4e-05 s, 29.4 kB/s
+1 byte copied, 3.228e-05 s, 31.0 kB/s
 error: terminating chunk id appears earlier than expected
 ok 35 - verify extended chunk count
 
@@ -318580,7 +319828,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.532e-05 s, 28.3 kB/s
+1 byte copied, 3.292e-05 s, 30.4 kB/s
 fatal: multi-pack-index required pack-name chunk missing or corrupted
 ok 36 - verify missing required chunk
 
@@ -318590,7 +319838,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.62e-05 s, 27.6 kB/s
+1 byte copied, 3.368e-05 s, 29.7 kB/s
 error: improper chunk offset(s) 100000000000048 and 2d4
 ok 37 - verify invalid chunk offset
 
@@ -318600,7 +319848,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.752e-05 s, 26.7 kB/s
+1 byte copied, 2.56e-05 s, 39.1 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
 
@@ -318610,7 +319858,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00288094 s, 0.3 kB/s
+1 byte copied, 3.356e-05 s, 29.8 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
@@ -318621,7 +319869,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.34e-05 s, 29.9 kB/s
+1 byte copied, 3.172e-05 s, 31.5 kB/s
 error: oid fanout out of order: fanout[250] = 1004a > 4a = fanout[251]
 ok 40 - verify oid fanout out of order
 
@@ -318631,7 +319879,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.4401e-05 s, 29.1 kB/s
+1 byte copied, 3.392e-05 s, 29.5 kB/s
 oid lookup out of order: oid[15] = 2f695f39a9ae90106abc3a1efc22b6cfe2522e89 >= 005f923c2d2e1fff9ec067b42443fff88aeebc67 = oid[16]
 ok 41 - verify oid lookup out of order
 
@@ -318641,7 +319889,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.000557044 s, 1.8 kB/s
+1 byte copied, 3.452e-05 s, 29.0 kB/s
 fatal: bad pack-int-id: 1797 (12 total packs)
 ok 42 - verify incorrect pack-int-id
 
@@ -318651,7 +319899,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.244e-05 s, 30.8 kB/s
+1 byte copied, 3.68e-05 s, 27.2 kB/s
 incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
 ok 43 - verify incorrect offset
 
@@ -318665,7 +319913,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.2961e-05 s, 30.3 kB/s
+1 byte copied, 2.824e-05 s, 35.4 kB/s
 incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
 incorrect checksum
 incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
@@ -318696,7 +319944,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00420195 s, 0.2 kB/s
+1 byte copied, 3.388e-05 s, 29.5 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
@@ -318709,7 +319957,7 @@
 
 10+0 records in
 10+0 records out
-10 bytes copied, 0.00668776 s, 1.5 kB/s
+10 bytes copied, 4.02e-05 s, 249 kB/s
 incorrect checksum
 ok 48 - verify incorrect checksum
 
@@ -318795,21 +320043,21 @@
  1 file changed, 1 insertion(+)
  create mode 100644 4.t
 total 44
-drwxr-xr-x 2 pbuilder1 pbuilder1  300 Aug 27 08:21 .
-drwxr-xr-x 4 pbuilder1 pbuilder1   80 Aug 27 08:21 ..
--rw-r--r-- 1 pbuilder1 pbuilder1 1300 Aug 27 08:21 multi-pack-index
--rw-r--r-- 1 pbuilder1 pbuilder1 1300 Aug 27 08:21 multi-pack-index.bak
--r--r--r-- 1 pbuilder1 pbuilder1 1072 Aug 27 08:21 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.idx
--rw-r--r-- 1 pbuilder1 pbuilder1    0 Aug 27 08:21 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.keep
--r--r--r-- 1 pbuilder1 pbuilder1   32 Aug 27 08:21 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.pack
--r--r--r-- 1 pbuilder1 pbuilder1   52 Aug 27 08:21 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1156 Aug 27 08:21 pack-759d6abd76f238b50cff99be39e99979d3691e8c.idx
--rw-r--r-- 1 pbuilder1 pbuilder1    0 Aug 27 08:21 pack-759d6abd76f238b50cff99be39e99979d3691e8c.keep
--r--r--r-- 1 pbuilder1 pbuilder1  211 Aug 27 08:21 pack-759d6abd76f238b50cff99be39e99979d3691e8c.pack
--r--r--r-- 1 pbuilder1 pbuilder1   64 Aug 27 08:21 pack-759d6abd76f238b50cff99be39e99979d3691e8c.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1324 Aug 27 08:21 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.idx
--r--r--r-- 1 pbuilder1 pbuilder1  676 Aug 27 08:21 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.pack
--r--r--r-- 1 pbuilder1 pbuilder1   88 Aug 27 08:21 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.rev
+drwxr-xr-x 2 pbuilder2 pbuilder2  300 Sep 29 14:52 .
+drwxr-xr-x 4 pbuilder2 pbuilder2   80 Sep 29 14:52 ..
+-rw-r--r-- 1 pbuilder2 pbuilder2 1300 Sep 29 14:52 multi-pack-index
+-rw-r--r-- 1 pbuilder2 pbuilder2 1300 Sep 29 14:52 multi-pack-index.bak
+-r--r--r-- 1 pbuilder2 pbuilder2 1072 Sep 29 14:52 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.idx
+-rw-r--r-- 1 pbuilder2 pbuilder2    0 Sep 29 14:52 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.keep
+-r--r--r-- 1 pbuilder2 pbuilder2   32 Sep 29 14:52 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   52 Sep 29 14:52 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1156 Sep 29 14:52 pack-759d6abd76f238b50cff99be39e99979d3691e8c.idx
+-rw-r--r-- 1 pbuilder2 pbuilder2    0 Sep 29 14:52 pack-759d6abd76f238b50cff99be39e99979d3691e8c.keep
+-r--r--r-- 1 pbuilder2 pbuilder2  211 Sep 29 14:52 pack-759d6abd76f238b50cff99be39e99979d3691e8c.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   64 Sep 29 14:52 pack-759d6abd76f238b50cff99be39e99979d3691e8c.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1324 Sep 29 14:52 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  676 Sep 29 14:52 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   88 Sep 29 14:52 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.rev
 ok 53 - repack preserves multi-pack-index when creating packs
 
 expecting success of 5319.54 'check normal git operations: after repack': 
@@ -318918,7 +320166,7 @@
 HEAD is now at 287f5d9
 1+0 records in
 1+0 records out
-1 byte copied, 3.5241e-05 s, 28.4 kB/s
+1 byte copied, 3.552e-05 s, 28.2 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5319-multi-pack-index/repo/.git/
 ok 60 - force some 64-bit offsets with pack-objects
 
@@ -318933,7 +320181,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.06e-05 s, 32.7 kB/s
+1 byte copied, 3.996e-05 s, 25.0 kB/s
 incorrect object offset for oid[61] = f2377b316d0d92e3c29a2d6dba598ca02fb80e9c: 70be4 != be4
 ok 62 - verify incorrect 64-bit offset
 
@@ -319309,12 +320557,12 @@
 		test_line_count = 4 midx-list
 	)
 
--r--r--r-- 1 pbuilder1 pbuilder1 1173 Aug 27 08:21 .git/objects/pack/pack-9f73b959cfe08e36fd7f07d25de6069c4ad20450.pack
--r--r--r-- 1 pbuilder1 pbuilder1 2239 Aug 27 08:21 .git/objects/pack/pack-A-40289997979ee9f2d7198a5b4ac9fe14e27cbe4b.pack
--r--r--r-- 1 pbuilder1 pbuilder1 1385 Aug 27 08:21 .git/objects/pack/pack-B-926e20b0e641003b2f6bcddd6ccf53e7741c8642.pack
--r--r--r-- 1 pbuilder1 pbuilder1  838 Aug 27 08:21 .git/objects/pack/pack-C-b33c048d7202659249bb0cea7bbc997ce448c75d.pack
--r--r--r-- 1 pbuilder1 pbuilder1  560 Aug 27 08:21 .git/objects/pack/pack-D-49ca36507a52bbba6d1768e28666eb0f4e5f7d95.pack
--r--r--r-- 1 pbuilder1 pbuilder1 4587 Aug 27 08:21 .git/objects/pack/pack-E-31ea0966bb15206fbfd1b4c2f5be4b24a03050f5.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 1173 Sep 29 14:52 .git/objects/pack/pack-9f73b959cfe08e36fd7f07d25de6069c4ad20450.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 2239 Sep 29 14:52 .git/objects/pack/pack-A-40289997979ee9f2d7198a5b4ac9fe14e27cbe4b.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 1385 Sep 29 14:52 .git/objects/pack/pack-B-926e20b0e641003b2f6bcddd6ccf53e7741c8642.pack
+-r--r--r-- 1 pbuilder2 pbuilder2  838 Sep 29 14:52 .git/objects/pack/pack-C-b33c048d7202659249bb0cea7bbc997ce448c75d.pack
+-r--r--r-- 1 pbuilder2 pbuilder2  560 Sep 29 14:52 .git/objects/pack/pack-D-49ca36507a52bbba6d1768e28666eb0f4e5f7d95.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 4587 Sep 29 14:52 .git/objects/pack/pack-E-31ea0966bb15206fbfd1b4c2f5be4b24a03050f5.pack
 ok 74 - expire removes repacked packs
 
 expecting success of 5319.75 'expire works when adding new packs': 
@@ -319829,593 +321077,6 @@
 1..93
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5403-post-checkout-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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(+)
- 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
-
-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
-
-Already on 'main'
-ok 2 - post-checkout receives the right arguments with HEAD unchanged 
-
-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
-
-Switched to a new branch 'new1'
-ok 3 - post-checkout args are correct with git checkout -b 
-
-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
-
-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
-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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5410-receive-pack.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5410-receive-pack/.git/
-expecting success of 5410.1 'setup': 
-	test_commit base &&
-	git clone -s --bare . fork &&
-	git checkout -b public/branch main &&
-	test_commit public &&
-	git checkout -b private/branch main &&
-	test_commit private
-
-[main (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Cloning into bare repository 'fork'...
-done.
-Switched to a new branch 'public/branch'
-[public/branch d7bb355] public
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 public.t
-Switched to a new branch 'private/branch'
-[private/branch 9725dbe] private
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 private.t
-ok 1 - setup
-
-expecting success of 5410.2 'with core.alternateRefsCommand': 
-	write_script fork/alternate-refs <<-\EOF &&
-		git --git-dir="$1" for-each-ref \
-			--format="%(objectname)" \
-			refs/heads/public/
-	EOF
-	test_config -C fork core.alternateRefsCommand ./alternate-refs &&
-	git rev-parse public/branch >expect &&
-	printf "0000" | git receive-pack fork >actual &&
-	extract_haves <actual >actual.haves &&
-	test_cmp expect actual.haves
-
-ok 2 - with core.alternateRefsCommand
-
-expecting success of 5410.3 'with core.alternateRefsPrefixes': 
-	test_config -C fork core.alternateRefsPrefixes "refs/heads/private" &&
-	git rev-parse private/branch >expect &&
-	printf "0000" | git receive-pack fork >actual &&
-	extract_haves <actual >actual.haves &&
-	test_cmp expect actual.haves
-
-ok 3 - with core.alternateRefsPrefixes
-
-checking prerequisite: TEE_DOES_NOT_HANG
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TEE_DOES_NOT_HANG" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TEE_DOES_NOT_HANG" &&
-	test_have_prereq !MINGW &&
-	case "$(uname -a)" in *3.5.7-463ebcdc.x86_64*) false;; esac
-
-)
-prerequisite TEE_DOES_NOT_HANG ok
-expecting success of 5410.4 'receive-pack missing objects fails connectivity check': 
-	test_when_finished rm -rf repo remote.git setup.git &&
-
-	git init repo &&
-	git -C repo commit --allow-empty -m 1 &&
-	git clone --bare repo setup.git &&
-	git -C repo commit --allow-empty -m 2 &&
-
-	# Capture git-send-pack(1) output sent to git-receive-pack(1).
-	git -C repo send-pack ../setup.git --all \
-		--receive-pack="tee ${SQ}$(pwd)/out${SQ} | git-receive-pack" &&
-
-	# Replay captured git-send-pack(1) output on new empty repository.
-	git init --bare remote.git &&
-	git receive-pack remote.git <out >actual 2>err &&
-
-	test_grep "missing necessary objects" actual &&
-	test_grep "fatal: Failed to traverse parents" err &&
-	test_must_fail git -C remote.git cat-file -e $(git -C repo rev-parse HEAD)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5410-receive-pack/repo/.git/
-[main (root-commit) 1b4481a] 1
- Author: A U Thor <author@example.com>
-Cloning into bare repository 'setup.git'...
-done.
-[main 9fcdc75] 2
- Author: A U Thor <author@example.com>
-To ../setup.git
-   1b4481a..9fcdc75  main -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5410-receive-pack/remote.git/
-grep: actual: binary file matches
-fatal: Failed to traverse parents of commit 9fcdc75c81914e0285868fdaa06669e3dcdde4cf
-ok 4 - receive-pack missing objects fails connectivity check
-
-expecting success of 5410.5 'receive-pack missing objects bypasses connectivity check': 
-	test_when_finished rm -rf repo remote.git setup.git &&
-
-	git init repo &&
-	git -C repo commit --allow-empty -m 1 &&
-	git clone --bare repo setup.git &&
-	git -C repo commit --allow-empty -m 2 &&
-
-	# Capture git-send-pack(1) output sent to git-receive-pack(1).
-	git -C repo send-pack ../setup.git --all \
-		--receive-pack="tee ${SQ}$(pwd)/out${SQ} | git-receive-pack" &&
-
-	# Replay captured git-send-pack(1) output on new empty repository.
-	git init --bare remote.git &&
-	git receive-pack --skip-connectivity-check remote.git <out >actual 2>err &&
-
-	test_grep ! "missing necessary objects" actual &&
-	test_must_be_empty err &&
-	git -C remote.git cat-file -e $(git -C repo rev-parse HEAD) &&
-	test_must_fail git -C remote.git rev-list $(git -C repo rev-parse HEAD)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5410-receive-pack/repo/.git/
-[main (root-commit) 1b4481a] 1
- Author: A U Thor <author@example.com>
-Cloning into bare repository 'setup.git'...
-done.
-[main 9fcdc75] 2
- Author: A U Thor <author@example.com>
-To ../setup.git
-   1b4481a..9fcdc75  main -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5410-receive-pack/remote.git/
-error: Could not read 1b4481a25944db8431d3ec6fdd5075e3686a35bb
-fatal: Failed to traverse parents of commit 9fcdc75c81914e0285868fdaa06669e3dcdde4cf
-ok 5 - receive-pack missing objects bypasses connectivity check
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5409-colorize-remote-messages.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5408-send-pack-stdin.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5408-send-pack-stdin/.git/
 expecting success of 5408.1 'setup refs': 
@@ -320619,6 +321280,279 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5409-colorize-remote-messages.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5410-receive-pack.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5410-receive-pack/.git/
+expecting success of 5410.1 'setup': 
+	test_commit base &&
+	git clone -s --bare . fork &&
+	git checkout -b public/branch main &&
+	test_commit public &&
+	git checkout -b private/branch main &&
+	test_commit private
+
+[main (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+Cloning into bare repository 'fork'...
+done.
+Switched to a new branch 'public/branch'
+[public/branch d7bb355] public
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 public.t
+Switched to a new branch 'private/branch'
+[private/branch 9725dbe] private
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 private.t
+ok 1 - setup
+
+expecting success of 5410.2 'with core.alternateRefsCommand': 
+	write_script fork/alternate-refs <<-\EOF &&
+		git --git-dir="$1" for-each-ref \
+			--format="%(objectname)" \
+			refs/heads/public/
+	EOF
+	test_config -C fork core.alternateRefsCommand ./alternate-refs &&
+	git rev-parse public/branch >expect &&
+	printf "0000" | git receive-pack fork >actual &&
+	extract_haves <actual >actual.haves &&
+	test_cmp expect actual.haves
+
+ok 2 - with core.alternateRefsCommand
+
+expecting success of 5410.3 'with core.alternateRefsPrefixes': 
+	test_config -C fork core.alternateRefsPrefixes "refs/heads/private" &&
+	git rev-parse private/branch >expect &&
+	printf "0000" | git receive-pack fork >actual &&
+	extract_haves <actual >actual.haves &&
+	test_cmp expect actual.haves
+
+ok 3 - with core.alternateRefsPrefixes
+
+checking prerequisite: TEE_DOES_NOT_HANG
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TEE_DOES_NOT_HANG" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TEE_DOES_NOT_HANG" &&
+	test_have_prereq !MINGW &&
+	case "$(uname -a)" in *3.5.7-463ebcdc.x86_64*) false;; esac
+
+)
+prerequisite TEE_DOES_NOT_HANG ok
+expecting success of 5410.4 'receive-pack missing objects fails connectivity check': 
+	test_when_finished rm -rf repo remote.git setup.git &&
+
+	git init repo &&
+	git -C repo commit --allow-empty -m 1 &&
+	git clone --bare repo setup.git &&
+	git -C repo commit --allow-empty -m 2 &&
+
+	# Capture git-send-pack(1) output sent to git-receive-pack(1).
+	git -C repo send-pack ../setup.git --all \
+		--receive-pack="tee ${SQ}$(pwd)/out${SQ} | git-receive-pack" &&
+
+	# Replay captured git-send-pack(1) output on new empty repository.
+	git init --bare remote.git &&
+	git receive-pack remote.git <out >actual 2>err &&
+
+	test_grep "missing necessary objects" actual &&
+	test_grep "fatal: Failed to traverse parents" err &&
+	test_must_fail git -C remote.git cat-file -e $(git -C repo rev-parse HEAD)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5410-receive-pack/repo/.git/
+[main (root-commit) 1b4481a] 1
+ Author: A U Thor <author@example.com>
+Cloning into bare repository 'setup.git'...
+done.
+[main 9fcdc75] 2
+ Author: A U Thor <author@example.com>
+To ../setup.git
+   1b4481a..9fcdc75  main -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5410-receive-pack/remote.git/
+grep: actual: binary file matches
+fatal: Failed to traverse parents of commit 9fcdc75c81914e0285868fdaa06669e3dcdde4cf
+ok 4 - receive-pack missing objects fails connectivity check
+
+expecting success of 5410.5 'receive-pack missing objects bypasses connectivity check': 
+	test_when_finished rm -rf repo remote.git setup.git &&
+
+	git init repo &&
+	git -C repo commit --allow-empty -m 1 &&
+	git clone --bare repo setup.git &&
+	git -C repo commit --allow-empty -m 2 &&
+
+	# Capture git-send-pack(1) output sent to git-receive-pack(1).
+	git -C repo send-pack ../setup.git --all \
+		--receive-pack="tee ${SQ}$(pwd)/out${SQ} | git-receive-pack" &&
+
+	# Replay captured git-send-pack(1) output on new empty repository.
+	git init --bare remote.git &&
+	git receive-pack --skip-connectivity-check remote.git <out >actual 2>err &&
+
+	test_grep ! "missing necessary objects" actual &&
+	test_must_be_empty err &&
+	git -C remote.git cat-file -e $(git -C repo rev-parse HEAD) &&
+	test_must_fail git -C remote.git rev-list $(git -C repo rev-parse HEAD)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5410-receive-pack/repo/.git/
+[main (root-commit) 1b4481a] 1
+ Author: A U Thor <author@example.com>
+Cloning into bare repository 'setup.git'...
+done.
+[main 9fcdc75] 2
+ Author: A U Thor <author@example.com>
+To ../setup.git
+   1b4481a..9fcdc75  main -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5410-receive-pack/remote.git/
+error: Could not read 1b4481a25944db8431d3ec6fdd5075e3686a35bb
+fatal: Failed to traverse parents of commit 9fcdc75c81914e0285868fdaa06669e3dcdde4cf
+ok 5 - receive-pack missing objects bypasses connectivity check
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5502-quickfetch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5502-quickfetch/.git/
 expecting success of 5502.1 'setup': 
@@ -321990,6 +322924,659 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5407-post-rewrite-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5407-post-rewrite-hook/.git/
+expecting success of 5407.1 'setup': 
+	test_commit A foo A &&
+	test_commit B foo B &&
+	test_commit C foo C &&
+	test_commit D foo D &&
+	git checkout A^0 &&
+	test_commit E bar E &&
+	test_commit F foo F &&
+	git checkout B &&
+	git merge E &&
+	git tag merge-E &&
+	test_commit G G &&
+	test_commit H H &&
+	test_commit I I &&
+	git checkout main &&
+
+	test_hook --setup post-rewrite <<-EOF
+	echo \$@ > "$TRASH_DIRECTORY"/post-rewrite.args
+	cat > "$TRASH_DIRECTORY"/post-rewrite.data
+	EOF
+
+[main (root-commit) be6e19b] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[main df02547] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 2362ae8] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main babc8a4] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+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 be6e19b A
+[detached HEAD 5baa167] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[detached HEAD 38c24e8] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Previous HEAD position was 38c24e8 F
+HEAD is now at df02547 B
+Merge made by the 'ort' strategy.
+ bar | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[detached HEAD 8b1f855] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[detached HEAD 33a20ae] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H
+[detached HEAD dda16b5] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I
+Previous HEAD position was dda16b5 I
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 5407.2 'git commit --amend': 
+	clear_hook_input &&
+	echo "D new message" > newmsg &&
+	oldsha=$(git rev-parse HEAD^0) &&
+	git commit -Fnewmsg --amend &&
+	echo amend > expected.args &&
+	echo $oldsha $(git rev-parse HEAD^0) > expected.data &&
+	verify_hook_input
+
+[main ebd82eb] D new message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 2 - git commit --amend
+
+expecting success of 5407.3 'git commit --amend --no-post-rewrite': 
+	clear_hook_input &&
+	echo "D new message again" > newmsg &&
+	git commit --no-post-rewrite -Fnewmsg --amend &&
+	test ! -f post-rewrite.args &&
+	test ! -f post-rewrite.data
+
+[main 5e7f7a8] D new message again
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - git commit --amend --no-post-rewrite
+
+expecting success of 5407.4 'git rebase --apply': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_must_fail git rebase --apply --onto A B &&
+	echo C > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+First, rewinding head to replay your work on top of it...
+Applying: C
+Using index info to reconstruct a base tree...
+M	foo
+Falling back to patching base and 3-way merge...
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+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 C
+Applying: C
+Applying: D
+ok 4 - git rebase --apply
+
+expecting success of 5407.5 'git rebase --apply --skip': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_must_fail git rebase --apply --onto A B &&
+	test_must_fail git rebase --skip &&
+	echo D > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+First, rewinding head to replay your work on top of it...
+Applying: C
+Using index info to reconstruct a base tree...
+M	foo
+Falling back to patching base and 3-way merge...
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+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 C
+Applying: D
+Using index info to reconstruct a base tree...
+M	foo
+Falling back to patching base and 3-way merge...
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+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 D
+Applying: D
+ok 5 - git rebase --apply --skip
+
+expecting success of 5407.6 'git rebase --apply --skip the last one': 
+	git reset --hard F &&
+	clear_hook_input &&
+	test_must_fail git rebase --apply --onto D A &&
+	git rebase --skip &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse E) $(git rev-parse HEAD)
+	$(git rev-parse F) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at 38c24e8 F
+First, rewinding head to replay your work on top of it...
+Applying: E
+Applying: F
+Using index info to reconstruct a base tree...
+M	foo
+Falling back to patching base and 3-way merge...
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+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 F
+ok 6 - git rebase --apply --skip the last one
+
+expecting success of 5407.7 'git rebase -m': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_must_fail git rebase -m --onto A B &&
+	echo C > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+Rebasing (1/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 2362ae8... C
+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 2362ae8... # C
+[detached HEAD 67a07b9] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
+ok 7 - git rebase -m
+
+expecting success of 5407.8 'git rebase -m --skip': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_must_fail git rebase -m --onto A B &&
+	test_must_fail git rebase --skip &&
+	echo D > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+Rebasing (1/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 2362ae8... C
+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 2362ae8... # C
+Rebasing (2/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply babc8a4... D
+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 babc8a4... # D
+[detached HEAD 9aefc10] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/main.
+ok 8 - git rebase -m --skip
+
+expecting success of 5407.9 'git rebase with implicit use of merge backend': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_must_fail git rebase --keep-empty --onto A B &&
+	echo C > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+Rebasing (1/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 2362ae8... C
+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 2362ae8... # C
+[detached HEAD 67a07b9] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
+ok 9 - git rebase with implicit use of merge backend
+
+expecting success of 5407.10 'git rebase --skip with implicit use of merge backend': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_must_fail git rebase --keep-empty --onto A B &&
+	test_must_fail git rebase --skip &&
+	echo D > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+Rebasing (1/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 2362ae8... C
+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 2362ae8... # C
+Rebasing (2/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply babc8a4... D
+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 babc8a4... # D
+[detached HEAD 9aefc10] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/main.
+ok 10 - git rebase --skip with implicit use of merge backend
+
+expecting success of 5407.11 'git rebase with failed pick': 
+	clear_hook_input &&
+	cat >todo <<-\EOF &&
+	exec >bar
+	merge -C merge-E E
+	exec >G
+	pick G
+	exec >H 2>I
+	pick H
+	fixup I
+	EOF
+
+	(
+		set_replace_editor todo &&
+		test_must_fail git rebase -i D D 2>err
+	) &&
+	grep "would be overwritten" err &&
+	rm bar &&
+
+	test_must_fail git rebase --continue 2>err &&
+	grep "would be overwritten" err &&
+	rm G &&
+
+	test_must_fail git rebase --continue 2>err &&
+	grep "would be overwritten" err &&
+	rm H &&
+
+	test_must_fail git rebase --continue 2>err &&
+	grep "would be overwritten" err &&
+	rm I &&
+
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse merge-E) $(git rev-parse HEAD~2)
+	$(git rev-parse G) $(git rev-parse HEAD~1)
+	$(git rev-parse H) $(git rev-parse HEAD)
+	$(git rev-parse I) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+rebase -i script after editing:
+exec >bar
+merge -C merge-E E
+exec >G
+pick G
+exec >H 2>I
+pick H
+fixup I
+Rebasing (2/7)
error: The following untracked working tree files would be overwritten by merge:
+Rebasing (5/8)
error: The following untracked working tree files would be overwritten by merge:
+Rebasing (8/9)
error: The following untracked working tree files would be overwritten by merge:
+Rebasing (9/10)
Rebasing (10/10)
error: The following untracked working tree files would be overwritten by merge:
+Rebasing (11/11)
Successfully rebased and updated detached HEAD.
+ok 11 - git rebase with failed pick
+
+expecting success of 5407.12 'git rebase -i (unchanged)': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_fail_interactive_rebase "1 2" --onto A B &&
+	echo C > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+rebase -i script before editing:
+pick 2362ae8 # C
+pick babc8a4 # D
+
+rebase -i script after editing:
+pick 2362ae8 # C
+pick babc8a4 # D
+Rebasing (1/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 2362ae8... C
+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 2362ae8... # C
+[detached HEAD 67a07b9] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 12 - git rebase -i (unchanged)
+
+expecting success of 5407.13 'git rebase -i (skip)': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_fail_interactive_rebase "2" --onto A B &&
+	echo D > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+rebase -i script before editing:
+pick 2362ae8 # C
+pick babc8a4 # D
+
+rebase -i script after editing:
+pick babc8a4 # D
+Rebasing (1/1)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply babc8a4... D
+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 babc8a4... # D
+[detached HEAD 9aefc10] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated detached HEAD.
+ok 13 - git rebase -i (skip)
+
+expecting success of 5407.14 'git rebase -i (squash)': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_fail_interactive_rebase "1 squash 2" --onto A B &&
+	echo C > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+rebase -i script before editing:
+pick 2362ae8 # C
+pick babc8a4 # D
+
+rebase -i script after editing:
+pick 2362ae8 # C
+squash babc8a4 # D
+Rebasing (1/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 2362ae8... C
+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 2362ae8... # C
+[detached HEAD 67a07b9] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
[detached HEAD 1018f76] C
+ 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.
+ok 14 - git rebase -i (squash)
+
+expecting success of 5407.15 'git rebase -i (fixup without conflict)': 
+	git reset --hard D &&
+	clear_hook_input &&
+	FAKE_LINES="1 fixup 2" git rebase -i B &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+rebase -i script before editing:
+pick 2362ae8 # C
+pick babc8a4 # D
+
+rebase -i script after editing:
+pick 2362ae8 # C
+fixup babc8a4 # D
+Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 15 - git rebase -i (fixup without conflict)
+
+expecting success of 5407.16 'git rebase -i (double edit)': 
+	git reset --hard D &&
+	clear_hook_input &&
+	FAKE_LINES="edit 1 edit 2" git rebase -i B &&
+	git rebase --continue &&
+	echo something > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+rebase -i script before editing:
+pick 2362ae8 # C
+pick babc8a4 # D
+
+rebase -i script after editing:
+edit 2362ae8 # C
+edit babc8a4 # D
+Rebasing (1/2)
Stopped at 2362ae8...  # C
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+Rebasing (2/2)
Stopped at babc8a4...  # D
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+[detached HEAD 52eb20e] D
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated detached HEAD.
+ok 16 - git rebase -i (double edit)
+
+expecting success of 5407.17 'git rebase -i (exec)': 
+	git reset --hard D &&
+	clear_hook_input &&
+	FAKE_LINES="edit 1 exec_false 2" git rebase -i B &&
+	echo something >bar &&
+	git add bar &&
+	# Fails because of exec false
+	test_must_fail git rebase --continue &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+rebase -i script before editing:
+pick 2362ae8 # C
+pick babc8a4 # D
+
+rebase -i script after editing:
+edit 2362ae8 # C
+exec false
+pick babc8a4 # D
+Rebasing (1/3)
Stopped at 2362ae8...  # C
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+[detached HEAD b4a6059] C
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 bar
+Rebasing (2/3)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 17 - git rebase -i (exec)
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5333-pseudo-merge-bitmaps.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5333-pseudo-merge-bitmaps/.git/
 expecting success of 5333.1 'setup': 
@@ -322037,8 +323624,8 @@
 	test_must_be_empty merges &&
 	test_cmp expect actual
 
-{"event":"data","sid":"20250827T082134.571091Z-Hcf858c9d-P000994de","thread":"main","time":"2025-08-27T08:21:34.598084Z","file":"pack-bitmap.c","line":2218,"repo":1,"t_abs":0.027185,"t_rel":0.027185,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"0"}
-{"event":"data","sid":"20250827T082134.571091Z-Hcf858c9d-P000994de","thread":"main","time":"2025-08-27T08:21:34.598093Z","file":"pack-bitmap.c","line":2220,"repo":1,"t_abs":0.027195,"t_rel":0.027195,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"0"}
+{"event":"data","sid":"20260929T145247.009336Z-H5c947e1c-P0022d434","thread":"main","time":"2026-09-29T14:52:47.015941Z","file":"pack-bitmap.c","line":2218,"repo":1,"t_abs":0.006815,"t_rel":0.006815,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"0"}
+{"event":"data","sid":"20260929T145247.009336Z-H5c947e1c-P0022d434","thread":"main","time":"2026-09-29T14:52:47.015951Z","file":"pack-bitmap.c","line":2220,"repo":1,"t_abs":0.006825,"t_rel":0.006825,"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': 
@@ -322076,8 +323663,8 @@
 	test_pseudo_merges_cascades 1 <trace2.txt &&
 	test_cmp expect actual
 
-{"event":"data","sid":"20250827T082135.171153Z-Hcf858c9d-P00099a59","thread":"main","time":"2025-08-27T08:21:35.182488Z","file":"pack-bitmap.c","line":2218,"repo":1,"t_abs":0.011503,"t_rel":0.011503,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
-{"event":"data","sid":"20250827T082135.171153Z-Hcf858c9d-P00099a59","thread":"main","time":"2025-08-27T08:21:35.182494Z","file":"pack-bitmap.c","line":2220,"repo":1,"t_abs":0.011510,"t_rel":0.011510,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
+{"event":"data","sid":"20260929T145247.409055Z-H5c947e1c-P0022d97b","thread":"main","time":"2026-09-29T14:52:47.415925Z","file":"pack-bitmap.c","line":2218,"repo":1,"t_abs":0.007094,"t_rel":0.007094,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
+{"event":"data","sid":"20260929T145247.409055Z-H5c947e1c-P0022d97b","thread":"main","time":"2026-09-29T14:52:47.415935Z","file":"pack-bitmap.c","line":2220,"repo":1,"t_abs":0.007104,"t_rel":0.007104,"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': 
@@ -322096,8 +323683,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-{"event":"data","sid":"20250827T082135.290787Z-Hcf858c9d-P00099b63","thread":"main","time":"2025-08-27T08:21:35.302826Z","file":"pack-bitmap.c","line":2218,"repo":1,"t_abs":0.012234,"t_rel":0.012234,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
-{"event":"data","sid":"20250827T082135.290787Z-Hcf858c9d-P00099b63","thread":"main","time":"2025-08-27T08:21:35.302837Z","file":"pack-bitmap.c","line":2220,"repo":1,"t_abs":0.012246,"t_rel":0.012246,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
+{"event":"data","sid":"20260929T145247.485846Z-H5c947e1c-P0022da77","thread":"main","time":"2026-09-29T14:52:47.493015Z","file":"pack-bitmap.c","line":2218,"repo":1,"t_abs":0.007376,"t_rel":0.007376,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
+{"event":"data","sid":"20260929T145247.485846Z-H5c947e1c-P0022da77","thread":"main","time":"2026-09-29T14:52:47.493028Z","file":"pack-bitmap.c","line":2220,"repo":1,"t_abs":0.007390,"t_rel":0.007390,"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': 
@@ -322641,8 +324228,8 @@
 		test_cmp expect actual
 	)
 
-{"event":"data","sid":"20250827T082138.239696Z-Hcf858c9d-P0009b790","thread":"main","time":"2025-08-27T08:21:38.243566Z","file":"pack-bitmap.c","line":2218,"repo":1,"t_abs":0.004016,"t_rel":0.004016,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
-{"event":"data","sid":"20250827T082138.239696Z-Hcf858c9d-P0009b790","thread":"main","time":"2025-08-27T08:21:38.243573Z","file":"pack-bitmap.c","line":2220,"repo":1,"t_abs":0.004023,"t_rel":0.004023,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
+{"event":"data","sid":"20260929T145249.430172Z-H5c947e1c-P0022f588","thread":"main","time":"2026-09-29T14:52:49.434125Z","file":"pack-bitmap.c","line":2218,"repo":1,"t_abs":0.004145,"t_rel":0.004145,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
+{"event":"data","sid":"20260929T145249.430172Z-H5c947e1c-P0022f588","thread":"main","time":"2026-09-29T14:52:49.434132Z","file":"pack-bitmap.c","line":2220,"repo":1,"t_abs":0.004153,"t_rel":0.004153,"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': 
@@ -322665,8 +324252,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-{"event":"data","sid":"20250827T082138.330606Z-Hcf858c9d-P0009b85e","thread":"main","time":"2025-08-27T08:21:38.335858Z","file":"pack-bitmap.c","line":2218,"repo":1,"t_abs":0.005448,"t_rel":0.005448,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
-{"event":"data","sid":"20250827T082138.330606Z-Hcf858c9d-P0009b85e","thread":"main","time":"2025-08-27T08:21:38.335866Z","file":"pack-bitmap.c","line":2220,"repo":1,"t_abs":0.005457,"t_rel":0.005457,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
+{"event":"data","sid":"20260929T145249.509297Z-H5c947e1c-P0022f69a","thread":"main","time":"2026-09-29T14:52:49.514877Z","file":"pack-bitmap.c","line":2218,"repo":1,"t_abs":0.005775,"t_rel":0.005775,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
+{"event":"data","sid":"20260929T145249.509297Z-H5c947e1c-P0022f69a","thread":"main","time":"2026-09-29T14:52:49.514887Z","file":"pack-bitmap.c","line":2220,"repo":1,"t_abs":0.005787,"t_rel":0.005787,"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': 
@@ -322779,7 +324366,7 @@
 pack_report: pack_mapped              =      55372 /      55372
 ---------------------------------------------------------------------
 
-{"event":"data","sid":"20250827T082138.699384Z-Hcf858c9d-P0009bb8c/20250827T082138.705718Z-Hcf858c9d-P0009bb92","thread":"main","time":"2025-08-27T08:21:38.738479Z","file":"pack-bitmap-write.c","line":678,"repo":1,"t_abs":0.032948,"t_rel":0.004905,"nesting":2,"category":"pack-bitmap-write","key":"building_bitmaps_pseudo_merge_reused","value":"1"}
+{"event":"data","sid":"20260929T145249.744178Z-H5c947e1c-P0022f9d3/20260929T145249.746628Z-H5c947e1c-P0022f9e3","thread":"main","time":"2026-09-29T14:52:49.763296Z","file":"pack-bitmap-write.c","line":678,"repo":1,"t_abs":0.016863,"t_rel":0.003148,"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': 
@@ -322885,659 +324472,6 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5407-post-rewrite-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5407-post-rewrite-hook/.git/
-expecting success of 5407.1 'setup': 
-	test_commit A foo A &&
-	test_commit B foo B &&
-	test_commit C foo C &&
-	test_commit D foo D &&
-	git checkout A^0 &&
-	test_commit E bar E &&
-	test_commit F foo F &&
-	git checkout B &&
-	git merge E &&
-	git tag merge-E &&
-	test_commit G G &&
-	test_commit H H &&
-	test_commit I I &&
-	git checkout main &&
-
-	test_hook --setup post-rewrite <<-EOF
-	echo \$@ > "$TRASH_DIRECTORY"/post-rewrite.args
-	cat > "$TRASH_DIRECTORY"/post-rewrite.data
-	EOF
-
-[main (root-commit) be6e19b] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main df02547] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 2362ae8] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main babc8a4] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-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 be6e19b A
-[detached HEAD 5baa167] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[detached HEAD 38c24e8] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Previous HEAD position was 38c24e8 F
-HEAD is now at df02547 B
-Merge made by the 'ort' strategy.
- bar | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[detached HEAD 8b1f855] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[detached HEAD 33a20ae] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H
-[detached HEAD dda16b5] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I
-Previous HEAD position was dda16b5 I
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 5407.2 'git commit --amend': 
-	clear_hook_input &&
-	echo "D new message" > newmsg &&
-	oldsha=$(git rev-parse HEAD^0) &&
-	git commit -Fnewmsg --amend &&
-	echo amend > expected.args &&
-	echo $oldsha $(git rev-parse HEAD^0) > expected.data &&
-	verify_hook_input
-
-[main ebd82eb] D new message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - git commit --amend
-
-expecting success of 5407.3 'git commit --amend --no-post-rewrite': 
-	clear_hook_input &&
-	echo "D new message again" > newmsg &&
-	git commit --no-post-rewrite -Fnewmsg --amend &&
-	test ! -f post-rewrite.args &&
-	test ! -f post-rewrite.data
-
-[main 5e7f7a8] D new message again
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - git commit --amend --no-post-rewrite
-
-expecting success of 5407.4 'git rebase --apply': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_must_fail git rebase --apply --onto A B &&
-	echo C > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-First, rewinding head to replay your work on top of it...
-Applying: C
-Using index info to reconstruct a base tree...
-M	foo
-Falling back to patching base and 3-way merge...
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-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 C
-Applying: C
-Applying: D
-ok 4 - git rebase --apply
-
-expecting success of 5407.5 'git rebase --apply --skip': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_must_fail git rebase --apply --onto A B &&
-	test_must_fail git rebase --skip &&
-	echo D > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-First, rewinding head to replay your work on top of it...
-Applying: C
-Using index info to reconstruct a base tree...
-M	foo
-Falling back to patching base and 3-way merge...
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-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 C
-Applying: D
-Using index info to reconstruct a base tree...
-M	foo
-Falling back to patching base and 3-way merge...
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-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 D
-Applying: D
-ok 5 - git rebase --apply --skip
-
-expecting success of 5407.6 'git rebase --apply --skip the last one': 
-	git reset --hard F &&
-	clear_hook_input &&
-	test_must_fail git rebase --apply --onto D A &&
-	git rebase --skip &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse E) $(git rev-parse HEAD)
-	$(git rev-parse F) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at 38c24e8 F
-First, rewinding head to replay your work on top of it...
-Applying: E
-Applying: F
-Using index info to reconstruct a base tree...
-M	foo
-Falling back to patching base and 3-way merge...
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-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 F
-ok 6 - git rebase --apply --skip the last one
-
-expecting success of 5407.7 'git rebase -m': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_must_fail git rebase -m --onto A B &&
-	echo C > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-Rebasing (1/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 2362ae8... C
-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 2362ae8... # C
-[detached HEAD 67a07b9] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
-ok 7 - git rebase -m
-
-expecting success of 5407.8 'git rebase -m --skip': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_must_fail git rebase -m --onto A B &&
-	test_must_fail git rebase --skip &&
-	echo D > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-Rebasing (1/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 2362ae8... C
-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 2362ae8... # C
-Rebasing (2/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply babc8a4... D
-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 babc8a4... # D
-[detached HEAD 9aefc10] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/main.
-ok 8 - git rebase -m --skip
-
-expecting success of 5407.9 'git rebase with implicit use of merge backend': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_must_fail git rebase --keep-empty --onto A B &&
-	echo C > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-Rebasing (1/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 2362ae8... C
-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 2362ae8... # C
-[detached HEAD 67a07b9] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
-ok 9 - git rebase with implicit use of merge backend
-
-expecting success of 5407.10 'git rebase --skip with implicit use of merge backend': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_must_fail git rebase --keep-empty --onto A B &&
-	test_must_fail git rebase --skip &&
-	echo D > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-Rebasing (1/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 2362ae8... C
-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 2362ae8... # C
-Rebasing (2/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply babc8a4... D
-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 babc8a4... # D
-[detached HEAD 9aefc10] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/main.
-ok 10 - git rebase --skip with implicit use of merge backend
-
-expecting success of 5407.11 'git rebase with failed pick': 
-	clear_hook_input &&
-	cat >todo <<-\EOF &&
-	exec >bar
-	merge -C merge-E E
-	exec >G
-	pick G
-	exec >H 2>I
-	pick H
-	fixup I
-	EOF
-
-	(
-		set_replace_editor todo &&
-		test_must_fail git rebase -i D D 2>err
-	) &&
-	grep "would be overwritten" err &&
-	rm bar &&
-
-	test_must_fail git rebase --continue 2>err &&
-	grep "would be overwritten" err &&
-	rm G &&
-
-	test_must_fail git rebase --continue 2>err &&
-	grep "would be overwritten" err &&
-	rm H &&
-
-	test_must_fail git rebase --continue 2>err &&
-	grep "would be overwritten" err &&
-	rm I &&
-
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse merge-E) $(git rev-parse HEAD~2)
-	$(git rev-parse G) $(git rev-parse HEAD~1)
-	$(git rev-parse H) $(git rev-parse HEAD)
-	$(git rev-parse I) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-rebase -i script after editing:
-exec >bar
-merge -C merge-E E
-exec >G
-pick G
-exec >H 2>I
-pick H
-fixup I
-Rebasing (2/7)
error: The following untracked working tree files would be overwritten by merge:
-Rebasing (5/8)
error: The following untracked working tree files would be overwritten by merge:
-Rebasing (8/9)
error: The following untracked working tree files would be overwritten by merge:
-Rebasing (9/10)
Rebasing (10/10)
error: The following untracked working tree files would be overwritten by merge:
-Rebasing (11/11)
Successfully rebased and updated detached HEAD.
-ok 11 - git rebase with failed pick
-
-expecting success of 5407.12 'git rebase -i (unchanged)': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_fail_interactive_rebase "1 2" --onto A B &&
-	echo C > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-rebase -i script before editing:
-pick 2362ae8 # C
-pick babc8a4 # D
-
-rebase -i script after editing:
-pick 2362ae8 # C
-pick babc8a4 # D
-Rebasing (1/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 2362ae8... C
-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 2362ae8... # C
-[detached HEAD 67a07b9] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 12 - git rebase -i (unchanged)
-
-expecting success of 5407.13 'git rebase -i (skip)': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_fail_interactive_rebase "2" --onto A B &&
-	echo D > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-rebase -i script before editing:
-pick 2362ae8 # C
-pick babc8a4 # D
-
-rebase -i script after editing:
-pick babc8a4 # D
-Rebasing (1/1)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply babc8a4... D
-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 babc8a4... # D
-[detached HEAD 9aefc10] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated detached HEAD.
-ok 13 - git rebase -i (skip)
-
-expecting success of 5407.14 'git rebase -i (squash)': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_fail_interactive_rebase "1 squash 2" --onto A B &&
-	echo C > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-rebase -i script before editing:
-pick 2362ae8 # C
-pick babc8a4 # D
-
-rebase -i script after editing:
-pick 2362ae8 # C
-squash babc8a4 # D
-Rebasing (1/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 2362ae8... C
-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 2362ae8... # C
-[detached HEAD 67a07b9] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
[detached HEAD 1018f76] C
- 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.
-ok 14 - git rebase -i (squash)
-
-expecting success of 5407.15 'git rebase -i (fixup without conflict)': 
-	git reset --hard D &&
-	clear_hook_input &&
-	FAKE_LINES="1 fixup 2" git rebase -i B &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-rebase -i script before editing:
-pick 2362ae8 # C
-pick babc8a4 # D
-
-rebase -i script after editing:
-pick 2362ae8 # C
-fixup babc8a4 # D
-Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 15 - git rebase -i (fixup without conflict)
-
-expecting success of 5407.16 'git rebase -i (double edit)': 
-	git reset --hard D &&
-	clear_hook_input &&
-	FAKE_LINES="edit 1 edit 2" git rebase -i B &&
-	git rebase --continue &&
-	echo something > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-rebase -i script before editing:
-pick 2362ae8 # C
-pick babc8a4 # D
-
-rebase -i script after editing:
-edit 2362ae8 # C
-edit babc8a4 # D
-Rebasing (1/2)
Stopped at 2362ae8...  # C
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-Rebasing (2/2)
Stopped at babc8a4...  # D
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-[detached HEAD 52eb20e] D
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated detached HEAD.
-ok 16 - git rebase -i (double edit)
-
-expecting success of 5407.17 'git rebase -i (exec)': 
-	git reset --hard D &&
-	clear_hook_input &&
-	FAKE_LINES="edit 1 exec_false 2" git rebase -i B &&
-	echo something >bar &&
-	git add bar &&
-	# Fails because of exec false
-	test_must_fail git rebase --continue &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-rebase -i script before editing:
-pick 2362ae8 # C
-pick babc8a4 # D
-
-rebase -i script after editing:
-edit 2362ae8 # C
-exec false
-pick babc8a4 # D
-Rebasing (1/3)
Stopped at 2362ae8...  # C
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-[detached HEAD b4a6059] C
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 bar
-Rebasing (2/3)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
-
-  git rebase --continue
-
-
-Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 17 - git rebase -i (exec)
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5507-remote-environment.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5507-remote-environment/.git/
 expecting success of 5507.1 'set up "remote" push situation': 
@@ -323632,192 +324566,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5506-remote-groups.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5506-remote-groups/.git/
-expecting success of 5506.1 'setup': 
-	mkdir one && (cd one && git init) &&
-	mkdir two && (cd two && git init) &&
-	git remote add -m main one one &&
-	git remote add -m main two two
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5506-remote-groups/one/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5506-remote-groups/two/.git/
-ok 1 - setup
-
-expecting success of 5506.2 'no group updates all': 
-	mark update-all &&
-	update_repos &&
-	git remote update &&
-	repo_fetched one &&
-	repo_fetched two
-
-[main (root-commit) e3d2b21] update-all
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main (root-commit) e3d2b21] update-all
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Fetching one
-From one
- * [new branch]      main       -> one/main
-Fetching two
-From two
- * [new branch]      main       -> two/main
-repo was fetched: one
-repo was fetched: two
-ok 2 - no group updates all
-
-expecting success of 5506.3 'nonexistent group produces error': 
-	mark nonexistent &&
-	update_repos &&
-	test_must_fail git remote update nonexistent &&
-	! repo_fetched one &&
-	! repo_fetched two
-
-[main 5183ee7] nonexistent
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 5183ee7] nonexistent
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-fatal: no such remote or remote group: nonexistent
-repo was not fetched: one
-repo was not fetched: two
-ok 3 - nonexistent group produces error
-
-expecting success of 5506.4 'updating group updates all members (remote update)': 
-	mark group-all &&
-	update_repos &&
-	git config --add remotes.all one &&
-	git config --add remotes.all two &&
-	git remote update all &&
-	repo_fetched one &&
-	repo_fetched two
-
-[main 76ca780] group-all
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 76ca780] group-all
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Fetching one
-From one
-   e3d2b21..76ca780  main       -> one/main
-Fetching two
-From two
-   e3d2b21..76ca780  main       -> two/main
-repo was fetched: one
-repo was fetched: two
-ok 4 - updating group updates all members (remote update)
-
-expecting success of 5506.5 'updating group updates all members (fetch)': 
-	mark fetch-group-all &&
-	update_repos &&
-	git fetch all &&
-	repo_fetched one &&
-	repo_fetched two
-
-[main 72c2514] fetch-group-all
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 72c2514] fetch-group-all
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Fetching one
-From one
-   76ca780..72c2514  main       -> one/main
-Fetching two
-From two
-   76ca780..72c2514  main       -> two/main
-repo was fetched: one
-repo was fetched: two
-ok 5 - updating group updates all members (fetch)
-
-expecting success of 5506.6 'updating group does not update non-members (remote update)': 
-	mark group-some &&
-	update_repos &&
-	git config --add remotes.some one &&
-	git remote update some &&
-	repo_fetched one &&
-	! repo_fetched two
-
-[main a4a07c1] group-some
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main a4a07c1] group-some
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Fetching one
-From one
-   72c2514..a4a07c1  main       -> one/main
-repo was fetched: one
-repo was not fetched: two
-ok 6 - updating group does not update non-members (remote update)
-
-expecting success of 5506.7 'updating group does not update non-members (fetch)': 
-	mark fetch-group-some &&
-	update_repos &&
-	git config --add remotes.some one &&
-	git remote update some &&
-	repo_fetched one &&
-	! repo_fetched two
-
-[main 09f8b0e] fetch-group-some
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 09f8b0e] fetch-group-some
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Fetching one
-From one
-   a4a07c1..09f8b0e  main       -> one/main
-repo was fetched: one
-repo was not fetched: two
-ok 7 - updating group does not update non-members (fetch)
-
-expecting success of 5506.8 'updating remote name updates that remote': 
-	mark remote-name &&
-	update_repos &&
-	git remote update one &&
-	repo_fetched one &&
-	! repo_fetched two
-
-[main 1609587] remote-name
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 1609587] remote-name
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Fetching one
-From one
-   09f8b0e..1609587  main       -> one/main
-repo was fetched: one
-repo was not fetched: two
-ok 8 - updating remote name updates that remote
-
-expecting success of 5506.9 'updating group in parallel with a duplicate remote does not fail (fetch)': 
-	mark fetch-group-duplicate &&
-	update_repo one &&
-	git config --add remotes.duplicate one &&
-	git config --add remotes.duplicate one &&
-	git -c fetch.parallel=2 remote update duplicate &&
-	repo_fetched one
-
-[main d1132c8] fetch-group-duplicate
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Fetching one
-From one
-   1609587..d1132c8  main       -> one/main
-repo was fetched: one
-ok 9 - updating group in parallel with a duplicate remote does not fail (fetch)
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5501-fetch-push-alternates.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5501-fetch-push-alternates/.git/
 expecting success of 5501.1 'setup': 
@@ -324191,6 +324939,192 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5506-remote-groups.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5506-remote-groups/.git/
+expecting success of 5506.1 'setup': 
+	mkdir one && (cd one && git init) &&
+	mkdir two && (cd two && git init) &&
+	git remote add -m main one one &&
+	git remote add -m main two two
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5506-remote-groups/one/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5506-remote-groups/two/.git/
+ok 1 - setup
+
+expecting success of 5506.2 'no group updates all': 
+	mark update-all &&
+	update_repos &&
+	git remote update &&
+	repo_fetched one &&
+	repo_fetched two
+
+[main (root-commit) e3d2b21] update-all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main (root-commit) e3d2b21] update-all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Fetching one
+From one
+ * [new branch]      main       -> one/main
+Fetching two
+From two
+ * [new branch]      main       -> two/main
+repo was fetched: one
+repo was fetched: two
+ok 2 - no group updates all
+
+expecting success of 5506.3 'nonexistent group produces error': 
+	mark nonexistent &&
+	update_repos &&
+	test_must_fail git remote update nonexistent &&
+	! repo_fetched one &&
+	! repo_fetched two
+
+[main 5183ee7] nonexistent
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 5183ee7] nonexistent
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+fatal: no such remote or remote group: nonexistent
+repo was not fetched: one
+repo was not fetched: two
+ok 3 - nonexistent group produces error
+
+expecting success of 5506.4 'updating group updates all members (remote update)': 
+	mark group-all &&
+	update_repos &&
+	git config --add remotes.all one &&
+	git config --add remotes.all two &&
+	git remote update all &&
+	repo_fetched one &&
+	repo_fetched two
+
+[main 76ca780] group-all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 76ca780] group-all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Fetching one
+From one
+   e3d2b21..76ca780  main       -> one/main
+Fetching two
+From two
+   e3d2b21..76ca780  main       -> two/main
+repo was fetched: one
+repo was fetched: two
+ok 4 - updating group updates all members (remote update)
+
+expecting success of 5506.5 'updating group updates all members (fetch)': 
+	mark fetch-group-all &&
+	update_repos &&
+	git fetch all &&
+	repo_fetched one &&
+	repo_fetched two
+
+[main 72c2514] fetch-group-all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 72c2514] fetch-group-all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Fetching one
+From one
+   76ca780..72c2514  main       -> one/main
+Fetching two
+From two
+   76ca780..72c2514  main       -> two/main
+repo was fetched: one
+repo was fetched: two
+ok 5 - updating group updates all members (fetch)
+
+expecting success of 5506.6 'updating group does not update non-members (remote update)': 
+	mark group-some &&
+	update_repos &&
+	git config --add remotes.some one &&
+	git remote update some &&
+	repo_fetched one &&
+	! repo_fetched two
+
+[main a4a07c1] group-some
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main a4a07c1] group-some
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Fetching one
+From one
+   72c2514..a4a07c1  main       -> one/main
+repo was fetched: one
+repo was not fetched: two
+ok 6 - updating group does not update non-members (remote update)
+
+expecting success of 5506.7 'updating group does not update non-members (fetch)': 
+	mark fetch-group-some &&
+	update_repos &&
+	git config --add remotes.some one &&
+	git remote update some &&
+	repo_fetched one &&
+	! repo_fetched two
+
+[main 09f8b0e] fetch-group-some
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 09f8b0e] fetch-group-some
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Fetching one
+From one
+   a4a07c1..09f8b0e  main       -> one/main
+repo was fetched: one
+repo was not fetched: two
+ok 7 - updating group does not update non-members (fetch)
+
+expecting success of 5506.8 'updating remote name updates that remote': 
+	mark remote-name &&
+	update_repos &&
+	git remote update one &&
+	repo_fetched one &&
+	! repo_fetched two
+
+[main 1609587] remote-name
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 1609587] remote-name
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Fetching one
+From one
+   09f8b0e..1609587  main       -> one/main
+repo was fetched: one
+repo was not fetched: two
+ok 8 - updating remote name updates that remote
+
+expecting success of 5506.9 'updating group in parallel with a duplicate remote does not fail (fetch)': 
+	mark fetch-group-duplicate &&
+	update_repo one &&
+	git config --add remotes.duplicate one &&
+	git config --add remotes.duplicate one &&
+	git -c fetch.parallel=2 remote update duplicate &&
+	repo_fetched one
+
+[main d1132c8] fetch-group-duplicate
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Fetching one
+From one
+   1609587..d1132c8  main       -> one/main
+repo was fetched: one
+ok 9 - updating group in parallel with a duplicate remote does not fail (fetch)
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5504-fetch-receive-strict.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5504-fetch-receive-strict/.git/
 expecting success of 5504.1 'setup and inject "corrupt or missing" object': 
@@ -325125,7 +326059,7 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 3.364e-05 s, 29.7 kB/s
+1 byte copied, 3.656e-05 s, 27.4 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ok 17 - verify hashes along chain, even in shallow
 
@@ -325180,7 +326114,7 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 3.508e-05 s, 28.5 kB/s
+1 byte copied, 3.296e-05 s, 30.3 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ok 20 - verify --shallow does not check base contents
 
@@ -325200,7 +326134,7 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 3.416e-05 s, 29.3 kB/s
+1 byte copied, 3.2e-05 s, 31 kB/s
 warning: commit-graph chain does not match
 ok 21 - warn on base graph chunk incorrect
 
@@ -325222,11 +326156,11 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 3.5961e-05 s, 27.8 kB/s
+1 byte copied, 3.48e-05 s, 28.7 kB/s
 warning: invalid commit-graph chain: line 'a849e3566469ef6eec0d724b211560Ga5617cb1c' not a hash
 1+0 records in
 1+0 records out
-1 byte copied, 3.288e-05 s, 30.4 kB/s
+1 byte copied, 3.128e-05 s, 32.0 kB/s
 warning: unable to find all commit-graph files
 ok 22 - verify after commit-graph-chain corruption (base)
 
@@ -325248,11 +326182,11 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 3.328e-05 s, 30.0 kB/s
+1 byte copied, 3.504e-05 s, 28.5 kB/s
 warning: invalid commit-graph chain: line '944c3272bbe885450ef5fcad419a8Gcf35d1c284' not a hash
 1+0 records in
 1+0 records out
-1 byte copied, 3.5281e-05 s, 28.3 kB/s
+1 byte copied, 3.62e-05 s, 27.6 kB/s
 warning: unable to find all commit-graph files
 ok 23 - verify after commit-graph-chain corruption (tip)
 
@@ -325297,7 +326231,7 @@
  create mode 100644 extra.t
 1+0 records in
 1+0 records out
-1 byte copied, 3.548e-05 s, 28.2 kB/s
+1 byte copied, 3.844e-05 s, 26.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ok 25 - verify across alternates
 
@@ -328193,8 +329127,8 @@
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.1
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.10
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.2
---- exp_err	2025-08-27 08:21:41.999942447 +0000
-+++ actual_err	2025-08-27 08:21:42.031942658 +0000
+--- exp_err	2026-09-29 14:52:51.530548970 +0000
++++ actual_err	2026-09-29 14:52:51.550548970 +0000
 @@ -1 +0,0 @@
 -From /build/reproducible-path/git-2.51.0/t/trash directory.t5512-ls-remote/.git
 ok 17 - suppress "From <url>" with -q
@@ -328831,8 +329765,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20250827T082126.973036Z-Hcf858c9d-P00094e3e/20250827T082126.976759Z-Hcf858c9d-P00094e43","thread":"main","time":"2025-08-27T08:21:27.015912Z","file":"pack-bitmap-write.c","line":445,"repo":1,"t_abs":0.039334,"t_rel":0.000582,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20250827T082126.973036Z-Hcf858c9d-P00094e3e/20250827T082126.976759Z-Hcf858c9d-P00094e43","thread":"main","time":"2025-08-27T08:21:27.015926Z","file":"pack-bitmap-write.c","line":447,"repo":1,"t_abs":0.039350,"t_rel":0.000598,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20260929T145241.770491Z-H5c947e1c-P00228d6e/20260929T145241.774168Z-H5c947e1c-P00228d85","thread":"main","time":"2026-09-29T14:52:41.790049Z","file":"pack-bitmap-write.c","line":445,"repo":1,"t_abs":0.016084,"t_rel":0.000610,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20260929T145241.770491Z-H5c947e1c-P00228d6e/20260929T145241.774168Z-H5c947e1c-P00228d85","thread":"main","time":"2026-09-29T14:52:41.790065Z","file":"pack-bitmap-write.c","line":447,"repo":1,"t_abs":0.016101,"t_rel":0.000627,"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': 
@@ -329371,7 +330305,7 @@
 	jgit --version
 
 )
-t5310-pack-bitmaps.sh: 7: eval: jgit: not found
+./test-lib.sh: line 1006: jgit: command not found
 prerequisite JGIT not satisfied
 checking prerequisite: SHA1
 
@@ -329648,8 +330582,8 @@
 pack_report: pack_mapped              =      26915 /      26915
 ---------------------------------------------------------------------
 
---- before	2025-08-27 08:21:31.007869941 +0000
-+++ after	2025-08-27 08:21:31.091870495 +0000
+--- before	2026-09-29 14:52:44.386548970 +0000
++++ after	2026-09-29 14:52:44.422548970 +0000
 @@ -1 +1 @@
 -5856eb049fa881263aa3ba7ed2e5edbf7e1fbcac
 +6a6543fc00ae3e5f9847cf9ca452037bed353779
@@ -329744,8 +330678,8 @@
  create mode 100644 other.t
 5925c4e1ec8bac94f428d0e74df0e946acb72c2f
 e7044c3d0754f94d7cb91400d11711b5667d7a56
-{"event":"data","sid":"20250827T082131.406182Z-Hcf858c9d-P000977ed","thread":"main","time":"2025-08-27T08:21:31.407241Z","file":"pack-bitmap.c","line":573,"repo":1,"t_abs":0.001253,"t_rel":0.001253,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-90860c48cd6b78bb32a9b104cd5b49799ab8c8ac.pack"}
-{"event":"data","sid":"20250827T082131.406182Z-Hcf858c9d-P000977ed","thread":"main","time":"2025-08-27T08:21:31.407261Z","file":"pack-bitmap.c","line":545,"repo":1,"t_abs":0.001274,"t_rel":0.001274,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-43cc18f2eec2f5958d1bddd67d64d18c30f4850b.pack"}
+{"event":"data","sid":"20260929T145244.672913Z-H5c947e1c-P0022b5fa","thread":"main","time":"2026-09-29T14:52:44.673959Z","file":"pack-bitmap.c","line":573,"repo":1,"t_abs":0.001262,"t_rel":0.001262,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-90860c48cd6b78bb32a9b104cd5b49799ab8c8ac.pack"}
+{"event":"data","sid":"20260929T145244.672913Z-H5c947e1c-P0022b5fa","thread":"main","time":"2026-09-29T14:52:44.673983Z","file":"pack-bitmap.c","line":545,"repo":1,"t_abs":0.001287,"t_rel":0.001287,"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 'load corrupt bitmap': 
@@ -329784,7 +330718,7 @@
  create mode 100644 base.t
 1+0 records in
 1+0 records out
-1 byte copied, 3.5921e-05 s, 27.8 kB/s
+1 byte copied, 2.4e-05 s, 41.7 kB/s
 error: corrupted bitmap pack index
 ok 76 - load corrupt bitmap
 
@@ -330062,8 +330996,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20250827T082132.478642Z-Hcf858c9d-P00098192/20250827T082132.486296Z-Hcf858c9d-P000981aa","thread":"main","time":"2025-08-27T08:21:32.508021Z","file":"pack-bitmap-write.c","line":445,"repo":1,"t_abs":0.021937,"t_rel":0.000566,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20250827T082132.478642Z-Hcf858c9d-P00098192/20250827T082132.486296Z-Hcf858c9d-P000981aa","thread":"main","time":"2025-08-27T08:21:32.508037Z","file":"pack-bitmap-write.c","line":447,"repo":1,"t_abs":0.021954,"t_rel":0.000583,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20260929T145245.414634Z-H5c947e1c-P0022bf0c/20260929T145245.416521Z-H5c947e1c-P0022bf18","thread":"main","time":"2026-09-29T14:52:45.430016Z","file":"pack-bitmap-write.c","line":445,"repo":1,"t_abs":0.013682,"t_rel":0.000595,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20260929T145245.414634Z-H5c947e1c-P0022bf0c/20260929T145245.416521Z-H5c947e1c-P0022bf18","thread":"main","time":"2026-09-29T14:52:45.430033Z","file":"pack-bitmap-write.c","line":447,"repo":1,"t_abs":0.013700,"t_rel":0.000613,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
 ok 80 - full repack creates bitmaps
 
 expecting success of 5310.81 'rev-list --test-bitmap verifies bitmaps': 
@@ -330856,8 +331790,8 @@
 pack_report: pack_mapped              =      26911 /      26911
 ---------------------------------------------------------------------
 
---- before	2025-08-27 08:21:36.603906853 +0000
-+++ after	2025-08-27 08:21:36.679907355 +0000
+--- before	2026-09-29 14:52:48.118548970 +0000
++++ after	2026-09-29 14:52:48.158548970 +0000
 @@ -1 +1 @@
 -a3caed54c4e80e89b950a3dc3137850a7de9e11a
 +6d88075ba6ae7fa70257e63b62d2182dc9825ed1
@@ -330952,8 +331886,8 @@
  create mode 100644 other.t
 3cd8c16e652034892da5481183a4d7aa2f7803dc
 d9be34f11dab75a3315b4361ae577329c4c5c312
-{"event":"data","sid":"20250827T082137.009271Z-Hcf858c9d-P0009aae1","thread":"main","time":"2025-08-27T08:21:37.010367Z","file":"pack-bitmap.c","line":573,"repo":1,"t_abs":0.001330,"t_rel":0.001330,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-63dbdd2da806a70649399187a2e9986677c885e5.pack"}
-{"event":"data","sid":"20250827T082137.009271Z-Hcf858c9d-P0009aae1","thread":"main","time":"2025-08-27T08:21:37.010387Z","file":"pack-bitmap.c","line":545,"repo":1,"t_abs":0.001352,"t_rel":0.001352,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-19bdd1ccc6f741f53b9197695f9f145e7fcd9377.pack"}
+{"event":"data","sid":"20260929T145248.366809Z-H5c947e1c-P0022e6fb","thread":"main","time":"2026-09-29T14:52:48.367889Z","file":"pack-bitmap.c","line":573,"repo":1,"t_abs":0.001269,"t_rel":0.001269,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-63dbdd2da806a70649399187a2e9986677c885e5.pack"}
+{"event":"data","sid":"20260929T145248.366809Z-H5c947e1c-P0022e6fb","thread":"main","time":"2026-09-29T14:52:48.367910Z","file":"pack-bitmap.c","line":545,"repo":1,"t_abs":0.001293,"t_rel":0.001293,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-19bdd1ccc6f741f53b9197695f9f145e7fcd9377.pack"}
 ok 150 - complains about multiple pack bitmaps
 
 expecting success of 5310.151 'load corrupt bitmap': 
@@ -330992,7 +331926,7 @@
  create mode 100644 base.t
 1+0 records in
 1+0 records out
-1 byte copied, 3.468e-05 s, 28.8 kB/s
+1 byte copied, 3.572e-05 s, 28.0 kB/s
 error: corrupted bitmap pack index
 ok 151 - load corrupt bitmap
 
@@ -331329,7 +332263,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250827T082137.326576Z-Hcf858c9d-P0009ae18","thread":"main","time":"2025-08-27T08:21:37.327831Z","file":"pack-bitmap.c","line":2175,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20260929T145248.607395Z-H5c947e1c-P0022ea7f","thread":"main","time":"2026-09-29T14:52:48.609221Z","file":"pack-bitmap.c","line":2175,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -331615,7 +332549,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250827T082137.335306Z-Hcf858c9d-P0009ae35","thread":"main","time":"2025-08-27T08:21:37.340614Z","file":"pack-bitmap.c","line":2175,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20260929T145248.615796Z-H5c947e1c-P0022eaae","thread":"main","time":"2026-09-29T14:52:48.617086Z","file":"pack-bitmap.c","line":2175,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -331901,7 +332835,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250827T082137.346653Z-Hcf858c9d-P0009ae4c","thread":"main","time":"2025-08-27T08:21:37.347875Z","file":"pack-bitmap.c","line":2175,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20260929T145248.623391Z-H5c947e1c-P0022eac1","thread":"main","time":"2026-09-29T14:52:48.624680Z","file":"pack-bitmap.c","line":2175,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -332187,7 +333121,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250827T082137.374665Z-Hcf858c9d-P0009ae90","thread":"main","time":"2025-08-27T08:21:37.375894Z","file":"pack-bitmap.c","line":2179,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20260929T145248.631027Z-H5c947e1c-P0022ead7","thread":"main","time":"2026-09-29T14:52:48.632344Z","file":"pack-bitmap.c","line":2179,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -332473,7 +333407,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250827T082137.384911Z-Hcf858c9d-P0009aea8","thread":"main","time":"2025-08-27T08:21:37.386171Z","file":"pack-bitmap.c","line":2179,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20260929T145248.640740Z-H5c947e1c-P0022eafe","thread":"main","time":"2026-09-29T14:52:48.642037Z","file":"pack-bitmap.c","line":2179,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -332759,7 +333693,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250827T082137.391277Z-Hcf858c9d-P0009aebe","thread":"main","time":"2025-08-27T08:21:37.395554Z","file":"pack-bitmap.c","line":2179,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20260929T145248.653466Z-H5c947e1c-P0022eb17","thread":"main","time":"2026-09-29T14:52:48.654710Z","file":"pack-bitmap.c","line":2179,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -333045,7 +333979,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250827T082137.410291Z-Hcf858c9d-P0009aee8","thread":"main","time":"2025-08-27T08:21:37.411536Z","file":"pack-bitmap.c","line":2179,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20260929T145248.664049Z-H5c947e1c-P0022eb49","thread":"main","time":"2026-09-29T14:52:48.666963Z","file":"pack-bitmap.c","line":2179,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 ok 154 - boundary-based traversal is used when requested
 
 expecting success of 5310.155 'left-right not confused by bitmap index': 
@@ -333336,8 +334270,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20250827T082138.436323Z-Hcf858c9d-P0009b924/20250827T082138.447290Z-Hcf858c9d-P0009b942","thread":"main","time":"2025-08-27T08:21:38.472827Z","file":"pack-bitmap-write.c","line":445,"repo":1,"t_abs":0.025733,"t_rel":0.004702,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20250827T082138.436323Z-Hcf858c9d-P0009b924/20250827T082138.447290Z-Hcf858c9d-P0009b942","thread":"main","time":"2025-08-27T08:21:38.472920Z","file":"pack-bitmap-write.c","line":447,"repo":1,"t_abs":0.025829,"t_rel":0.004798,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20260929T145249.342457Z-H5c947e1c-P0022f44f/20260929T145249.344888Z-H5c947e1c-P0022f45d","thread":"main","time":"2026-09-29T14:52:49.368343Z","file":"pack-bitmap-write.c","line":445,"repo":1,"t_abs":0.023667,"t_rel":0.000630,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20260929T145249.342457Z-H5c947e1c-P0022f44f/20260929T145249.344888Z-H5c947e1c-P0022f45d","thread":"main","time":"2026-09-29T14:52:49.368360Z","file":"pack-bitmap-write.c","line":447,"repo":1,"t_abs":0.023685,"t_rel":0.000648,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
 ok 160 - full repack creates bitmaps
 
 expecting success of 5310.161 'rev-list --test-bitmap verifies bitmaps': 
@@ -334130,8 +335064,8 @@
 pack_report: pack_mapped              =      26918 /      26918
 ---------------------------------------------------------------------
 
---- before	2025-08-27 08:21:42.451945429 +0000
-+++ after	2025-08-27 08:21:42.507945798 +0000
+--- before	2026-09-29 14:52:51.954548970 +0000
++++ after	2026-09-29 14:52:51.986548970 +0000
 @@ -1 +1 @@
 -37419f6d136228aef65f8c0814262f05f954d62a
 +ed73bac8391ee3dfb2a90e3cd7df9bd765ce5b5f
@@ -334226,8 +335160,8 @@
  create mode 100644 other.t
 92f77f689e270db411603dd57dea5c4d12ac65b6
 1a76757cab55a0d45b9ba975eda6eb7dca4f716d
-{"event":"data","sid":"20250827T082142.805118Z-Hcf858c9d-P0009ea1b","thread":"main","time":"2025-08-27T08:21:42.806205Z","file":"pack-bitmap.c","line":573,"repo":1,"t_abs":0.001292,"t_rel":0.001292,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-f42a38f98066647f8c129c7f6755eceddb5c21ab.pack"}
-{"event":"data","sid":"20250827T082142.805118Z-Hcf858c9d-P0009ea1b","thread":"main","time":"2025-08-27T08:21:42.806226Z","file":"pack-bitmap.c","line":545,"repo":1,"t_abs":0.001316,"t_rel":0.001316,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-85a84125b8486451c50fe5eac71ae4078db4a9c8.pack"}
+{"event":"data","sid":"20260929T145252.211368Z-H5c947e1c-P00231dad","thread":"main","time":"2026-09-29T14:52:52.212498Z","file":"pack-bitmap.c","line":573,"repo":1,"t_abs":0.001345,"t_rel":0.001345,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-f42a38f98066647f8c129c7f6755eceddb5c21ab.pack"}
+{"event":"data","sid":"20260929T145252.211368Z-H5c947e1c-P00231dad","thread":"main","time":"2026-09-29T14:52:52.212524Z","file":"pack-bitmap.c","line":545,"repo":1,"t_abs":0.001373,"t_rel":0.001373,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-85a84125b8486451c50fe5eac71ae4078db4a9c8.pack"}
 ok 230 - complains about multiple pack bitmaps
 
 expecting success of 5310.231 'load corrupt bitmap': 
@@ -334266,7 +335200,7 @@
  create mode 100644 base.t
 1+0 records in
 1+0 records out
-1 byte copied, 2.844e-05 s, 35.2 kB/s
+1 byte copied, 3.156e-05 s, 31.7 kB/s
 ok 231 - load corrupt bitmap
 
 expecting success of 5310.232 'verify writing bitmap lookup table when enabled': 
@@ -334274,8 +335208,8 @@
 		git repack -ad &&
 	grep "\"label\":\"writing_lookup_table\"" trace2
 
-{"event":"region_enter","sid":"20250827T082142.923410Z-Hcf858c9d-P0009eb8b/20250827T082142.927916Z-Hcf858c9d-P0009eb92","thread":"main","time":"2025-08-27T08:21:42.951018Z","file":"pack-bitmap-write.c","line":990,"repo":1,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
-{"event":"region_leave","sid":"20250827T082142.923410Z-Hcf858c9d-P0009eb8b/20250827T082142.927916Z-Hcf858c9d-P0009eb92","thread":"main","time":"2025-08-27T08:21:42.951027Z","file":"pack-bitmap-write.c","line":1017,"repo":1,"t_rel":0.000010,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_enter","sid":"20260929T145252.320105Z-H5c947e1c-P00231f3f/20260929T145252.325905Z-H5c947e1c-P00231f58","thread":"main","time":"2026-09-29T14:52:52.349098Z","file":"pack-bitmap-write.c","line":990,"repo":1,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_leave","sid":"20260929T145252.320105Z-H5c947e1c-P00231f3f/20260929T145252.325905Z-H5c947e1c-P00231f58","thread":"main","time":"2026-09-29T14:52:52.349110Z","file":"pack-bitmap-write.c","line":1017,"repo":1,"t_rel":0.000012,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
 ok 232 - verify writing bitmap lookup table when enabled
 
 expecting success of 5310.233 'truncated bitmap fails gracefully (lookup table)': 
@@ -335956,7 +336890,7 @@
 Located via MIDX '30492e1960672ac6d418da5127744b784dac89b7'.
 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":"20250827T082130.266172Z-Hcf858c9d-P00096d5f","thread":"main","time":"2025-08-27T08:21:30.267221Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001260,"t_rel":0.001260,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260929T145243.798665Z-H5c947e1c-P0022a9a7","thread":"main","time":"2026-09-29T14:52:43.799720Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001251,"t_rel":0.001251,"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': 
@@ -336453,11 +337387,11 @@
 	
 Bitmap v1 test (107 entries loaded, 107 total)
 Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 0f0d6be4 checksum
-Located via MIDX 'd9f0e2c67579381401f29140885f7f3ad5ce4b58'.
+Located via MIDX 'afec02494482cc40598d06b8b7b146cec46ea9cd'.
 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":"20250827T082130.266172Z-Hcf858c9d-P00096d5f","thread":"main","time":"2025-08-27T08:21:30.267221Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001260,"t_rel":0.001260,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20250827T082133.184113Z-Hcf858c9d-P000988a7","thread":"main","time":"2025-08-27T08:21:33.185214Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001299,"t_rel":0.001299,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260929T145243.798665Z-H5c947e1c-P0022a9a7","thread":"main","time":"2026-09-29T14:52:43.799720Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001251,"t_rel":0.001251,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260929T145245.716332Z-H5c947e1c-P0022c289","thread":"main","time":"2026-09-29T14:52:45.718214Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.002082,"t_rel":0.002082,"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': 
@@ -336465,7 +337399,7 @@
 	
 Bitmap v1 test (107 entries loaded, 107 total)
 Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 0f0d6be4 checksum
-Located via MIDX 'd9f0e2c67579381401f29140885f7f3ad5ce4b58'.
+Located via MIDX 'afec02494482cc40598d06b8b7b146cec46ea9cd'.
 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
@@ -337113,9 +338047,9 @@
 Located via MIDX 'd700bff0339f3380fd20334a295c48cea6f7acf6'.
 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":"20250827T082130.266172Z-Hcf858c9d-P00096d5f","thread":"main","time":"2025-08-27T08:21:30.267221Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001260,"t_rel":0.001260,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20250827T082133.184113Z-Hcf858c9d-P000988a7","thread":"main","time":"2025-08-27T08:21:33.185214Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001299,"t_rel":0.001299,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20250827T082136.131551Z-Hcf858c9d-P0009a23a","thread":"main","time":"2025-08-27T08:21:36.132989Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001622,"t_rel":0.001622,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260929T145243.798665Z-H5c947e1c-P0022a9a7","thread":"main","time":"2026-09-29T14:52:43.799720Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001251,"t_rel":0.001251,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260929T145245.716332Z-H5c947e1c-P0022c289","thread":"main","time":"2026-09-29T14:52:45.718214Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.002082,"t_rel":0.002082,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260929T145247.531559Z-H5c947e1c-P0022dafd","thread":"main","time":"2026-09-29T14:52:47.532708Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001338,"t_rel":0.001338,"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': 
@@ -337766,7 +338700,7 @@
 Located via MIDX '1daca52df6227ee36af5441dcfa5b269b5d7cafd'.
 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":"20250827T082138.554856Z-Hcf858c9d-P0009ba46","thread":"main","time":"2025-08-27T08:21:38.555929Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001273,"t_rel":0.001273,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260929T145249.234329Z-H5c947e1c-P0022f325","thread":"main","time":"2026-09-29T14:52:49.235365Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001241,"t_rel":0.001241,"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': 
@@ -338262,20 +339196,20 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries, 107 total)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 236971ab checksum
-Located via MIDX '00709af7834579d036c6c6eb8203c718690d5579'.
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 8e11996b checksum
+Located via MIDX 'eaa83a62b4008bd056e39d083a320c330ff4fe31'.
 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":"20250827T082138.554856Z-Hcf858c9d-P0009ba46","thread":"main","time":"2025-08-27T08:21:38.555929Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001273,"t_rel":0.001273,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20250827T082141.611409Z-Hcf858c9d-P0009dc84","thread":"main","time":"2025-08-27T08:21:41.612468Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001243,"t_rel":0.001243,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260929T145249.234329Z-H5c947e1c-P0022f325","thread":"main","time":"2026-09-29T14:52:49.235365Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001241,"t_rel":0.001241,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260929T145251.234276Z-H5c947e1c-P00230f4f","thread":"main","time":"2026-09-29T14:52:51.235364Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001278,"t_rel":0.001278,"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, 107 total)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 236971ab checksum
-Located via MIDX '00709af7834579d036c6c6eb8203c718690d5579'.
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 8e11996b checksum
+Located via MIDX 'eaa83a62b4008bd056e39d083a320c330ff4fe31'.
 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
@@ -338919,21 +339853,21 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries, 107 total)
-Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / e99a0c7c checksum
-Located via MIDX '2d33103827dc8272a579cbba6974eb62aabfa6b1'.
+Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 13802fc1 checksum
+Located via MIDX 'b9b28e78001011e19af2f3881d241ce40745ce2f'.
 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":"20250827T082138.554856Z-Hcf858c9d-P0009ba46","thread":"main","time":"2025-08-27T08:21:38.555929Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001273,"t_rel":0.001273,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20250827T082141.611409Z-Hcf858c9d-P0009dc84","thread":"main","time":"2025-08-27T08:21:41.612468Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001243,"t_rel":0.001243,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20250827T082144.216089Z-Hcf858c9d-P0009fa2a","thread":"main","time":"2025-08-27T08:21:44.217303Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001403,"t_rel":0.001403,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260929T145249.234329Z-H5c947e1c-P0022f325","thread":"main","time":"2026-09-29T14:52:49.235365Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001241,"t_rel":0.001241,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260929T145251.234276Z-H5c947e1c-P00230f4f","thread":"main","time":"2026-09-29T14:52:51.235364Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001278,"t_rel":0.001278,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260929T145253.087334Z-H5c947e1c-P002329e4","thread":"main","time":"2026-09-29T14:52:53.088555Z","file":"pack-revindex.c","line":388,"repo":1,"t_abs":0.001433,"t_rel":0.001433,"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': 
 		git rev-list --test-bitmap HEAD~
 	
 Bitmap v1 test (107 entries, 107 total)
-Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / e99a0c7c checksum
-Located via MIDX '2d33103827dc8272a579cbba6974eb62aabfa6b1'.
+Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 13802fc1 checksum
+Located via MIDX 'b9b28e78001011e19af2f3881d241ce40745ce2f'.
 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 273 - rev-list --test-bitmap verifies bitmaps
@@ -339296,6 +340230,87 @@
 1..314
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5525-fetch-tagopt.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5525-fetch-tagopt/.git/
+expecting success of 5525.1 'setup': 
+	test_commit test &&
+	setup_clone one &&
+	git config remote.remote_one.tagopt --no-tags &&
+	setup_clone two &&
+	git config remote.remote_two.tagopt --tags
+	
+[master (root-commit) 14f901a] test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.t
+Cloning into bare repository 'one'...
+done.
+branch 'branch_one' set up to track 'origin/master'.
+Cloning into bare repository 'two'...
+done.
+branch 'branch_two' set up to track 'origin/master'.
+ok 1 - setup
+
+expecting success of 5525.2 'fetch with tagopt=--no-tags does not get tag': 
+	git fetch remote_one &&
+	test_must_fail git show-ref tag_one &&
+	git show-ref remote_one/branch_one
+	
+From one
+ * [new branch]      branch_one -> remote_one/branch_one
+ * [new branch]      master     -> remote_one/master
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_one/branch_one
+ok 2 - fetch with tagopt=--no-tags does not get tag
+
+expecting success of 5525.3 'fetch --tags with tagopt=--no-tags gets tag': 
+	(
+		cd one &&
+		git branch second_branch_one
+	) &&
+	git fetch --tags remote_one &&
+	git show-ref tag_one &&
+	git show-ref remote_one/second_branch_one
+	
+branch 'second_branch_one' set up to track 'origin/master'.
+From one
+ * [new branch]      second_branch_one -> remote_one/second_branch_one
+ * [new tag]         tag_one           -> tag_one
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/tags/tag_one
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_one/second_branch_one
+ok 3 - fetch --tags with tagopt=--no-tags gets tag
+
+expecting success of 5525.4 'fetch --no-tags with tagopt=--tags does not get tag': 
+	git fetch --no-tags remote_two &&
+	test_must_fail git show-ref tag_two &&
+	git show-ref remote_two/branch_two
+	
+From two
+ * [new branch]      branch_two -> remote_two/branch_two
+ * [new branch]      master     -> remote_two/master
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_two/branch_two
+ok 4 - fetch --no-tags with tagopt=--tags does not get tag
+
+expecting success of 5525.5 'fetch with tagopt=--tags gets tag': 
+	(
+		cd two &&
+		git branch second_branch_two
+	) &&
+	git fetch remote_two &&
+	git show-ref tag_two &&
+	git show-ref remote_two/second_branch_two
+	
+branch 'second_branch_two' set up to track 'origin/master'.
+From two
+ * [new branch]      second_branch_two -> remote_two/second_branch_two
+ * [new tag]         tag_two           -> tag_two
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/tags/tag_two
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_two/second_branch_two
+ok 5 - fetch with tagopt=--tags gets tag
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5524-pull-msg.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5524-pull-msg/.git/
 expecting success of 5524.1 'setup': 
@@ -339413,87 +340428,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5525-fetch-tagopt.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5525-fetch-tagopt/.git/
-expecting success of 5525.1 'setup': 
-	test_commit test &&
-	setup_clone one &&
-	git config remote.remote_one.tagopt --no-tags &&
-	setup_clone two &&
-	git config remote.remote_two.tagopt --tags
-	
-[master (root-commit) 14f901a] test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.t
-Cloning into bare repository 'one'...
-done.
-branch 'branch_one' set up to track 'origin/master'.
-Cloning into bare repository 'two'...
-done.
-branch 'branch_two' set up to track 'origin/master'.
-ok 1 - setup
-
-expecting success of 5525.2 'fetch with tagopt=--no-tags does not get tag': 
-	git fetch remote_one &&
-	test_must_fail git show-ref tag_one &&
-	git show-ref remote_one/branch_one
-	
-From one
- * [new branch]      branch_one -> remote_one/branch_one
- * [new branch]      master     -> remote_one/master
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_one/branch_one
-ok 2 - fetch with tagopt=--no-tags does not get tag
-
-expecting success of 5525.3 'fetch --tags with tagopt=--no-tags gets tag': 
-	(
-		cd one &&
-		git branch second_branch_one
-	) &&
-	git fetch --tags remote_one &&
-	git show-ref tag_one &&
-	git show-ref remote_one/second_branch_one
-	
-branch 'second_branch_one' set up to track 'origin/master'.
-From one
- * [new branch]      second_branch_one -> remote_one/second_branch_one
- * [new tag]         tag_one           -> tag_one
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/tags/tag_one
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_one/second_branch_one
-ok 3 - fetch --tags with tagopt=--no-tags gets tag
-
-expecting success of 5525.4 'fetch --no-tags with tagopt=--tags does not get tag': 
-	git fetch --no-tags remote_two &&
-	test_must_fail git show-ref tag_two &&
-	git show-ref remote_two/branch_two
-	
-From two
- * [new branch]      branch_two -> remote_two/branch_two
- * [new branch]      master     -> remote_two/master
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_two/branch_two
-ok 4 - fetch --no-tags with tagopt=--tags does not get tag
-
-expecting success of 5525.5 'fetch with tagopt=--tags gets tag': 
-	(
-		cd two &&
-		git branch second_branch_two
-	) &&
-	git fetch remote_two &&
-	git show-ref tag_two &&
-	git show-ref remote_two/second_branch_two
-	
-branch 'second_branch_two' set up to track 'origin/master'.
-From two
- * [new branch]      second_branch_two -> remote_two/second_branch_two
- * [new tag]         tag_two           -> tag_two
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/tags/tag_two
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_two/second_branch_two
-ok 5 - fetch with tagopt=--tags gets tag
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5505-remote.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5505-remote/.git/
 expecting success of 5505.1 'setup': 
@@ -339859,8 +340793,8 @@
 	test_cmp expect output
 
 error: src refspec refs/tags/lastbackup does not match any
---- expect	2025-08-27 08:21:40.927935376 +0000
-+++ output	2025-08-27 08:21:40.955935561 +0000
+--- expect	2026-09-29 14:52:50.690548970 +0000
++++ output	2026-09-29 14:52:50.710548970 +0000
 @@ -4,7 +4,7 @@
    HEAD branch: main
    Remote branches:
@@ -340696,8 +341630,8 @@
 warning: The global configuration remote.pushDefault in:
 	file:2
 now names the non-existent remote 'origin'
-{"event":"region_enter","sid":"20250827T082144.031939Z-Hcf858c9d-P0009f81c","thread":"main","time":"2025-08-27T08:21:44.034023Z","file":"progress.c","line":275,"repo":1,"nesting":1,"category":"progress","label":"Renaming remote references"}
-{"event":"region_leave","sid":"20250827T082144.031939Z-Hcf858c9d-P0009f81c","thread":"main","time":"2025-08-27T08:21:44.035112Z","file":"progress.c","line":357,"repo":1,"t_rel":0.001091,"nesting":1,"category":"progress","label":"Renaming remote references"}
+{"event":"region_enter","sid":"20260929T145252.713362Z-H5c947e1c-P002324d9","thread":"main","time":"2026-09-29T14:52:52.714353Z","file":"progress.c","line":275,"repo":1,"nesting":1,"category":"progress","label":"Renaming remote references"}
+{"event":"region_leave","sid":"20260929T145252.713362Z-H5c947e1c-P002324d9","thread":"main","time":"2026-09-29T14:52:52.715458Z","file":"progress.c","line":357,"repo":1,"t_rel":0.001106,"nesting":1,"category":"progress","label":"Renaming remote references"}
 	pushRemote = upstream
 ok 68 - rename a remote
 
@@ -341584,6 +342518,330 @@
 1..125
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5523-push-upstream.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/.git/
+expecting success of 5523.1 'setup bare parent': 
+	ensure_fresh_upstream &&
+	git remote add upstream parent
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
+ok 1 - setup bare parent
+
+expecting success of 5523.2 'setup local commit': 
+	echo content >file &&
+	git add file &&
+	git commit -m one
+
+[main (root-commit) f39a923] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 2 - setup local commit
+
+expecting success of 5523.3 'push -u main:main': 
+	git push -u upstream main:main &&
+	check_config main upstream refs/heads/main
+
+To parent
+ * [new branch]      main -> main
+branch 'main' set up to track 'upstream/main'.
+ok 3 - push -u main:main
+
+expecting success of 5523.4 'push -u main:other': 
+	git push -u upstream main:other &&
+	check_config main upstream refs/heads/other
+
+To parent
+ * [new branch]      main -> other
+branch 'main' set up to track 'upstream/other'.
+ok 4 - push -u main:other
+
+expecting success of 5523.5 'push -u --dry-run main:otherX': 
+	git push -u --dry-run upstream main:otherX &&
+	check_config main upstream refs/heads/other
+
+To parent
+ * [new branch]      main -> otherX
+Would set upstream of 'main' to 'otherX' of 'upstream'
+ok 5 - push -u --dry-run main:otherX
+
+expecting success of 5523.6 'push -u topic_2:topic_2': 
+	git branch topic_2 &&
+	git push -u upstream topic_2:topic_2 &&
+	check_config topic_2 upstream refs/heads/topic_2
+
+To parent
+ * [new branch]      topic_2 -> topic_2
+branch 'topic_2' set up to track 'upstream/topic_2'.
+ok 6 - push -u topic_2:topic_2
+
+expecting success of 5523.7 'push -u topic_2:other2': 
+	git push -u upstream topic_2:other2 &&
+	check_config topic_2 upstream refs/heads/other2
+
+To parent
+ * [new branch]      topic_2 -> other2
+branch 'topic_2' set up to track 'upstream/other2'.
+ok 7 - push -u topic_2:other2
+
+expecting success of 5523.8 'push -u :topic_2': 
+	git push -u upstream :topic_2 &&
+	check_config topic_2 upstream refs/heads/other2
+
+To parent
+ - [deleted]         topic_2
+ok 8 - push -u :topic_2
+
+expecting success of 5523.9 'push -u --all(the same behavior with--branches)': 
+	git branch all1 &&
+	git branch all2 &&
+	git push -u --all &&
+	check_config all1 upstream refs/heads/all1 &&
+	check_config all2 upstream refs/heads/all2 &&
+	git config --get-regexp branch.all* > expect &&
+	git config --remove-section branch.all1 &&
+	git config --remove-section branch.all2 &&
+	git push -u --branches &&
+	check_config all1 upstream refs/heads/all1 &&
+	check_config all2 upstream refs/heads/all2 &&
+	git config --get-regexp branch.all* > actual &&
+	test_cmp expect actual
+
+To parent
+ * [new branch]      all1 -> all1
+ * [new branch]      all2 -> all2
+ * [new branch]      topic_2 -> topic_2
+branch 'main' set up to track 'upstream/main'.
+branch 'all1' set up to track 'upstream/all1'.
+branch 'all2' set up to track 'upstream/all2'.
+branch 'topic_2' set up to track 'upstream/topic_2'.
+Everything up-to-date
+branch 'all1' set up to track 'upstream/all1'.
+branch 'all2' set up to track 'upstream/all2'.
+branch 'main' set up to track 'upstream/main'.
+branch 'topic_2' set up to track 'upstream/topic_2'.
+ok 9 - push -u --all(the same behavior with--branches)
+
+expecting success of 5523.10 'push -u HEAD': 
+	git checkout -b headbranch &&
+	git push -u upstream HEAD &&
+	check_config headbranch upstream refs/heads/headbranch
+
+Switched to a new branch 'headbranch'
+To parent
+ * [new branch]      HEAD -> headbranch
+branch 'headbranch' set up to track 'upstream/headbranch'.
+ok 10 - push -u HEAD
+
+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 5523.11 'progress messages go to tty': 
+	ensure_fresh_upstream &&
+
+	test_terminal git push -u upstream main >out 2>err &&
+	test_grep "Writing objects" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
+Writing objects:  33% (1/3)
Writing objects:  66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 220 bytes | 220.00 KiB/s, done.
+ok 11 - progress messages go to tty
+
+expecting success of 5523.12 'progress messages do not go to non-tty': 
+	ensure_fresh_upstream &&
+
+	# skip progress messages, since stderr is non-tty
+	git push -u upstream main >out 2>err &&
+	test_grep ! "Writing objects" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
+ok 12 - progress messages do not go to non-tty
+
+expecting success of 5523.13 'progress messages go to non-tty (forced)': 
+	ensure_fresh_upstream &&
+
+	# force progress messages to stderr, even though it is non-tty
+	git push -u --progress upstream main >out 2>err &&
+	test_grep "Writing objects" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
+Writing objects:  33% (1/3)
Writing objects:  66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 220 bytes | 220.00 KiB/s, done.
+ok 13 - progress messages go to non-tty (forced)
+
+expecting success of 5523.14 'push -q suppresses progress': 
+	ensure_fresh_upstream &&
+
+	test_terminal git push -u -q upstream main >out 2>err &&
+	test_grep ! "Writing objects" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
+ok 14 - push -q suppresses progress
+
+expecting success of 5523.15 'push --no-progress suppresses progress': 
+	ensure_fresh_upstream &&
+
+	test_terminal git push -u --no-progress upstream main >out 2>err &&
+	test_grep ! "Unpacking objects" err &&
+	test_grep ! "Writing objects" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
+ok 15 - push --no-progress suppresses progress
+
+expecting success of 5523.16 'quiet push': 
+	ensure_fresh_upstream &&
+
+	test_terminal git push --quiet --no-progress upstream main >output 2>&1 &&
+	test_must_be_empty output
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
+ok 16 - quiet push
+
+expecting success of 5523.17 'quiet push -u': 
+	ensure_fresh_upstream &&
+
+	test_terminal git push --quiet -u --no-progress upstream main >output 2>&1 &&
+	test_must_be_empty output
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
+ok 17 - quiet push -u
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5527-fetch-odd-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5527-fetch-odd-refs/.git/
+expecting success of 5527.1 'setup repo with odd suffix ref': 
+	echo content >file &&
+	git add . &&
+	git commit -m one &&
+	git update-ref refs/for/refs/heads/main HEAD &&
+	echo content >>file &&
+	git commit -a -m two &&
+	echo content >>file &&
+	git commit -a -m three &&
+	git checkout HEAD^
+
+[main (root-commit) f39a923] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 5647d5f] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main f883ace] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+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 5647d5f two
+ok 1 - setup repo with odd suffix ref
+
+expecting success of 5527.2 'suffix ref is ignored during fetch': 
+	git clone --bare file://"$PWD" suffix &&
+	echo three >expect &&
+	git --git-dir=suffix log -1 --format=%s refs/heads/main >actual &&
+	test_cmp expect actual
+
+Cloning into bare repository 'suffix'...
+ok 2 - suffix ref is ignored during fetch
+
+expecting success of 5527.3 'try to create repo with absurdly long refname': 
+	ref240=$ZERO_OID/$ZERO_OID/$ZERO_OID/$ZERO_OID/$ZERO_OID/$ZERO_OID &&
+	ref1440=$ref240/$ref240/$ref240/$ref240/$ref240/$ref240 &&
+	git init long &&
+	(
+		cd long &&
+		test_commit long &&
+		test_commit main
+	) &&
+	if git -C long update-ref refs/heads/$ref1440 long; then
+		test_set_prereq LONG_REF
+	else
+		echo >&2 "long refs not supported"
+	fi
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5527-fetch-odd-refs/long/.git/
+[main (root-commit) 92be28b] long
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 long.t
+[main c47af98] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main.t
+ok 3 - try to create repo with absurdly long refname
+
+expecting success of 5527.4 'fetch handles extremely long refname': 
+	git fetch long refs/heads/*:refs/remotes/long/* &&
+	cat >expect <<-\EOF &&
+	long
+	main
+	EOF
+	git for-each-ref --format="%(subject)" refs/remotes/long \
+		--exclude=refs/remotes/long/HEAD >actual &&
+	test_cmp expect actual
+
+From long
+ * [new branch]      0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000 -> long/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000
+ * [new branch]      main       -> long/main
+ * [new tag]         long       -> long
+ * [new tag]         main       -> main
+ok 4 - fetch handles extremely long refname
+
+expecting success of 5527.5 'push handles extremely long refname': 
+	git push long :refs/heads/$ref1440 &&
+	git -C long for-each-ref --format="%(subject)" refs/heads >actual &&
+	echo main >expect &&
+	test_cmp expect actual
+
+To long
+ - [deleted]         0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000
+ok 5 - push handles extremely long refname
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5521-pull-options.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5521-pull-options/.git/
 expecting success of 5521.1 'setup': 
@@ -342016,358 +343274,34 @@
 
 expecting success of 5521.22 'git pull --no-verify --verify passed to merge': 
 	test_when_finished "rm -fr src dst actual" &&
-	git init src &&
-	test_commit -C src one &&
-	git clone src dst &&
-	test_hook -C dst commit-msg <<-\EOF &&
-	false
-	EOF
-	test_commit -C src two &&
-	test_must_fail git -C dst pull --no-ff --no-verify --verify
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5521-pull-options/src/.git/
-[main (root-commit) ac97c8d] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into 'dst'...
-done.
-[main 4ae1176] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5521-pull-options/src
-   ac97c8d..4ae1176  main       -> origin/main
- * [new tag]         two        -> two
-Not committing merge; use 'git commit' to complete the merge.
-ok 22 - git pull --no-verify --verify passed to merge
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5527-fetch-odd-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5527-fetch-odd-refs/.git/
-expecting success of 5527.1 'setup repo with odd suffix ref': 
-	echo content >file &&
-	git add . &&
-	git commit -m one &&
-	git update-ref refs/for/refs/heads/main HEAD &&
-	echo content >>file &&
-	git commit -a -m two &&
-	echo content >>file &&
-	git commit -a -m three &&
-	git checkout HEAD^
-
-[main (root-commit) f39a923] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 5647d5f] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main f883ace] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-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 5647d5f two
-ok 1 - setup repo with odd suffix ref
-
-expecting success of 5527.2 'suffix ref is ignored during fetch': 
-	git clone --bare file://"$PWD" suffix &&
-	echo three >expect &&
-	git --git-dir=suffix log -1 --format=%s refs/heads/main >actual &&
-	test_cmp expect actual
-
-Cloning into bare repository 'suffix'...
-ok 2 - suffix ref is ignored during fetch
-
-expecting success of 5527.3 'try to create repo with absurdly long refname': 
-	ref240=$ZERO_OID/$ZERO_OID/$ZERO_OID/$ZERO_OID/$ZERO_OID/$ZERO_OID &&
-	ref1440=$ref240/$ref240/$ref240/$ref240/$ref240/$ref240 &&
-	git init long &&
-	(
-		cd long &&
-		test_commit long &&
-		test_commit main
-	) &&
-	if git -C long update-ref refs/heads/$ref1440 long; then
-		test_set_prereq LONG_REF
-	else
-		echo >&2 "long refs not supported"
-	fi
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5527-fetch-odd-refs/long/.git/
-[main (root-commit) 92be28b] long
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 long.t
-[main c47af98] main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main.t
-ok 3 - try to create repo with absurdly long refname
-
-expecting success of 5527.4 'fetch handles extremely long refname': 
-	git fetch long refs/heads/*:refs/remotes/long/* &&
-	cat >expect <<-\EOF &&
-	long
-	main
-	EOF
-	git for-each-ref --format="%(subject)" refs/remotes/long \
-		--exclude=refs/remotes/long/HEAD >actual &&
-	test_cmp expect actual
-
-From long
- * [new branch]      0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000 -> long/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000
- * [new branch]      main       -> long/main
- * [new tag]         long       -> long
- * [new tag]         main       -> main
-ok 4 - fetch handles extremely long refname
-
-expecting success of 5527.5 'push handles extremely long refname': 
-	git push long :refs/heads/$ref1440 &&
-	git -C long for-each-ref --format="%(subject)" refs/heads >actual &&
-	echo main >expect &&
-	test_cmp expect actual
-
-To long
- - [deleted]         0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000
-ok 5 - push handles extremely long refname
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5523-push-upstream.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/.git/
-expecting success of 5523.1 'setup bare parent': 
-	ensure_fresh_upstream &&
-	git remote add upstream parent
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
-ok 1 - setup bare parent
-
-expecting success of 5523.2 'setup local commit': 
-	echo content >file &&
-	git add file &&
-	git commit -m one
-
-[main (root-commit) f39a923] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 2 - setup local commit
-
-expecting success of 5523.3 'push -u main:main': 
-	git push -u upstream main:main &&
-	check_config main upstream refs/heads/main
-
-To parent
- * [new branch]      main -> main
-branch 'main' set up to track 'upstream/main'.
-ok 3 - push -u main:main
-
-expecting success of 5523.4 'push -u main:other': 
-	git push -u upstream main:other &&
-	check_config main upstream refs/heads/other
-
-To parent
- * [new branch]      main -> other
-branch 'main' set up to track 'upstream/other'.
-ok 4 - push -u main:other
-
-expecting success of 5523.5 'push -u --dry-run main:otherX': 
-	git push -u --dry-run upstream main:otherX &&
-	check_config main upstream refs/heads/other
-
-To parent
- * [new branch]      main -> otherX
-Would set upstream of 'main' to 'otherX' of 'upstream'
-ok 5 - push -u --dry-run main:otherX
-
-expecting success of 5523.6 'push -u topic_2:topic_2': 
-	git branch topic_2 &&
-	git push -u upstream topic_2:topic_2 &&
-	check_config topic_2 upstream refs/heads/topic_2
-
-To parent
- * [new branch]      topic_2 -> topic_2
-branch 'topic_2' set up to track 'upstream/topic_2'.
-ok 6 - push -u topic_2:topic_2
-
-expecting success of 5523.7 'push -u topic_2:other2': 
-	git push -u upstream topic_2:other2 &&
-	check_config topic_2 upstream refs/heads/other2
-
-To parent
- * [new branch]      topic_2 -> other2
-branch 'topic_2' set up to track 'upstream/other2'.
-ok 7 - push -u topic_2:other2
-
-expecting success of 5523.8 'push -u :topic_2': 
-	git push -u upstream :topic_2 &&
-	check_config topic_2 upstream refs/heads/other2
-
-To parent
- - [deleted]         topic_2
-ok 8 - push -u :topic_2
-
-expecting success of 5523.9 'push -u --all(the same behavior with--branches)': 
-	git branch all1 &&
-	git branch all2 &&
-	git push -u --all &&
-	check_config all1 upstream refs/heads/all1 &&
-	check_config all2 upstream refs/heads/all2 &&
-	git config --get-regexp branch.all* > expect &&
-	git config --remove-section branch.all1 &&
-	git config --remove-section branch.all2 &&
-	git push -u --branches &&
-	check_config all1 upstream refs/heads/all1 &&
-	check_config all2 upstream refs/heads/all2 &&
-	git config --get-regexp branch.all* > actual &&
-	test_cmp expect actual
-
-To parent
- * [new branch]      all1 -> all1
- * [new branch]      all2 -> all2
- * [new branch]      topic_2 -> topic_2
-branch 'main' set up to track 'upstream/main'.
-branch 'all1' set up to track 'upstream/all1'.
-branch 'all2' set up to track 'upstream/all2'.
-branch 'topic_2' set up to track 'upstream/topic_2'.
-Everything up-to-date
-branch 'all1' set up to track 'upstream/all1'.
-branch 'all2' set up to track 'upstream/all2'.
-branch 'main' set up to track 'upstream/main'.
-branch 'topic_2' set up to track 'upstream/topic_2'.
-ok 9 - push -u --all(the same behavior with--branches)
-
-expecting success of 5523.10 'push -u HEAD': 
-	git checkout -b headbranch &&
-	git push -u upstream HEAD &&
-	check_config headbranch upstream refs/heads/headbranch
-
-Switched to a new branch 'headbranch'
-To parent
- * [new branch]      HEAD -> headbranch
-branch 'headbranch' set up to track 'upstream/headbranch'.
-ok 10 - push -u HEAD
-
-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 5523.11 'progress messages go to tty': 
-	ensure_fresh_upstream &&
-
-	test_terminal git push -u upstream main >out 2>err &&
-	test_grep "Writing objects" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
-Writing objects:  33% (1/3)
Writing objects:  66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 220 bytes | 220.00 KiB/s, done.
-ok 11 - progress messages go to tty
-
-expecting success of 5523.12 'progress messages do not go to non-tty': 
-	ensure_fresh_upstream &&
-
-	# skip progress messages, since stderr is non-tty
-	git push -u upstream main >out 2>err &&
-	test_grep ! "Writing objects" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
-ok 12 - progress messages do not go to non-tty
-
-expecting success of 5523.13 'progress messages go to non-tty (forced)': 
-	ensure_fresh_upstream &&
-
-	# force progress messages to stderr, even though it is non-tty
-	git push -u --progress upstream main >out 2>err &&
-	test_grep "Writing objects" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
-Writing objects:  33% (1/3)
Writing objects:  66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 220 bytes | 220.00 KiB/s, done.
-ok 13 - progress messages go to non-tty (forced)
-
-expecting success of 5523.14 'push -q suppresses progress': 
-	ensure_fresh_upstream &&
-
-	test_terminal git push -u -q upstream main >out 2>err &&
-	test_grep ! "Writing objects" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
-ok 14 - push -q suppresses progress
-
-expecting success of 5523.15 'push --no-progress suppresses progress': 
-	ensure_fresh_upstream &&
-
-	test_terminal git push -u --no-progress upstream main >out 2>err &&
-	test_grep ! "Unpacking objects" err &&
-	test_grep ! "Writing objects" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
-ok 15 - push --no-progress suppresses progress
-
-expecting success of 5523.16 'quiet push': 
-	ensure_fresh_upstream &&
-
-	test_terminal git push --quiet --no-progress upstream main >output 2>&1 &&
-	test_must_be_empty output
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
-ok 16 - quiet push
-
-expecting success of 5523.17 'quiet push -u': 
-	ensure_fresh_upstream &&
-
-	test_terminal git push --quiet -u --no-progress upstream main >output 2>&1 &&
-	test_must_be_empty output
+	git init src &&
+	test_commit -C src one &&
+	git clone src dst &&
+	test_hook -C dst commit-msg <<-\EOF &&
+	false
+	EOF
+	test_commit -C src two &&
+	test_must_fail git -C dst pull --no-ff --no-verify --verify
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5523-push-upstream/parent/
-ok 17 - quiet push -u
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5521-pull-options/src/.git/
+[main (root-commit) ac97c8d] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Cloning into 'dst'...
+done.
+[main 4ae1176] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5521-pull-options/src
+   ac97c8d..4ae1176  main       -> origin/main
+ * [new tag]         two        -> two
+Not committing merge; use 'git commit' to complete the merge.
+ok 22 - git pull --no-verify --verify passed to merge
 
-# passed all 17 test(s)
-1..17
+# passed all 22 test(s)
+1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5529-push-errors.sh ***
@@ -342449,225 +343383,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5530-upload-pack-error.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5530-upload-pack-error/.git/
-expecting success of 5530.1 'setup and corrupt repository': 
-	echo file >file &&
-	git add file &&
-	git rev-parse :file &&
-	git commit -a -m original &&
-	test_tick &&
-	echo changed >file &&
-	git commit -a -m changed &&
-	corrupt_repo HEAD:file
-
-
-f73f3093ff865c514c6c51f867e35f693487d0d3
-[master (root-commit) 2cbe290] original
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 28c3702] changed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup and corrupt repository
-
-expecting success of 5530.2 'fsck fails': 
-	test_must_fail git fsck
-
-missing blob 5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
-ok 2 - fsck fails
-
-expecting success of 5530.3 'upload-pack fails due to error in pack-objects packing': 
-	head=$(git rev-parse HEAD) &&
-	hexsz=$(test_oid hexsz) &&
-	printf "%04xwant %s\n00000009done\n0000" \
-		$(($hexsz + 10)) $head >input &&
-	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
-	test_grep "unable to read" output.err &&
-	test_grep "pack-objects died" output.err
-
-fatal: unable to read 5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
-error: git upload-pack: git-pack-objects died with error.
-ok 3 - upload-pack fails due to error in pack-objects packing
-
-expecting success of 5530.4 'corrupt repo differently': 
-
-	git hash-object -w file &&
-	corrupt_repo HEAD^^{tree}
-
-
-5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
-ok 4 - corrupt repo differently
-
-expecting success of 5530.5 'fsck fails': 
-	test_must_fail git fsck
-
-broken link from  commit 2cbe290f6e7f12b1021e10cbe824d1208f5edc19
-              to    tree bec63e37d08c454ad3a60cde90b70f3f7d077852
-dangling blob f73f3093ff865c514c6c51f867e35f693487d0d3
-missing tree bec63e37d08c454ad3a60cde90b70f3f7d077852
-ok 5 - fsck fails
-
-expecting success of 5530.6 'upload-pack fails due to error in rev-list': 
-
-	printf "%04xwant %s\n%04xshallow %s00000009done\n0000" \
-		$(($hexsz + 10)) $(git rev-parse HEAD) \
-		$(($hexsz + 12)) $(git rev-parse HEAD^) >input &&
-	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
-	grep "bad tree object" output.err
-
-fatal: bad tree object bec63e37d08c454ad3a60cde90b70f3f7d077852
-ok 6 - upload-pack fails due to error in rev-list
-
-expecting success of 5530.7 'upload-pack fails due to bad want (no object)': 
-
-	printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
-		$(($hexsz + 29)) $(test_oid deadbeef) >input &&
-	test_must_fail git upload-pack . <input >output 2>output.err &&
-	grep "not our ref" output.err &&
-	grep "ERR" output &&
-	! grep multi_ack_detailed output.err
-
-fatal: git upload-pack: not our ref deadbeefdeadbeefdeadbeefdeadbeefdeadbeef
-grep: output: binary file matches
-ok 7 - upload-pack fails due to bad want (no object)
-
-expecting success of 5530.8 'upload-pack fails due to bad want (not tip)': 
-
-	oid=$(echo an object we have | git hash-object -w --stdin) &&
-	printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
-		$(($hexsz + 29)) "$oid" >input &&
-	test_must_fail git upload-pack . <input >output 2>output.err &&
-	grep "not our ref" output.err &&
-	grep "ERR" output &&
-	! grep multi_ack_detailed output.err
-
-error: git upload-pack: not our ref 023832c7c4fbc3a6d75879d18bbbef0b476b78b5
-grep: output: binary file matches
-ok 8 - upload-pack fails due to bad want (not tip)
-
-expecting success of 5530.9 'upload-pack fails due to error in pack-objects enumeration': 
-
-	printf "%04xwant %s\n00000009done\n0000" \
-		$((hexsz + 10)) $(git rev-parse HEAD) >input &&
-	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
-	grep "bad tree object" output.err &&
-	grep "pack-objects died" output.err
-
-fatal: bad tree object bec63e37d08c454ad3a60cde90b70f3f7d077852
-error: git upload-pack: git-pack-objects died with error.
-ok 9 - upload-pack fails due to error in pack-objects enumeration
-
-expecting success of 5530.10 'upload-pack tolerates EOF just after stateless client wants': 
-	test_commit initial &&
-	head=$(git rev-parse HEAD) &&
-
-	{
-		packetize "want $head" &&
-		packetize "shallow $head" &&
-		packetize "deepen 1" &&
-		printf "0000"
-	} >request &&
-
-	printf "0000" >expect &&
-
-	git upload-pack --stateless-rpc . <request >actual &&
-	test_cmp expect actual
-
-[master 61923d4] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 10 - upload-pack tolerates EOF just after stateless client wants
-
-expecting success of 5530.11 'create empty repository': 
-
-	mkdir foo &&
-	cd foo &&
-	git init
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5530-upload-pack-error/foo/.git/
-ok 11 - create empty repository
-
-expecting success of 5530.12 'fetch fails': 
-
-	test_must_fail git fetch .. main
-
-
-fatal: couldn't find remote ref main
-ok 12 - fetch fails
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5532-fetch-proxy.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5532-fetch-proxy/.git/
-expecting success of 5532.1 'setup remote repo': 
-	git init remote &&
-	(cd remote &&
-	 echo content >file &&
-	 git add file &&
-	 git commit -m one
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5532-fetch-proxy/remote/.git/
-[master (root-commit) f39a923] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup remote repo
-
-expecting success of 5532.2 'setup proxy script': 
-	write_script proxy-get-cmd "$PERL_PATH" <<-\EOF &&
-	read(STDIN, $buf, 4);
-	my $n = hex($buf) - 4;
-	read(STDIN, $buf, $n);
-	my ($cmd, $other) = split /\0/, $buf;
-	# drop absolute-path on repo name
-	$cmd =~ s{ /}{ };
-	print $cmd;
-	EOF
-
-	write_script proxy <<-\EOF
-	echo >&2 "proxying for $*"
-	cmd=$(./proxy-get-cmd)
-	echo >&2 "Running $cmd"
-	exec $cmd
-	EOF
-
-ok 2 - setup proxy script
-
-expecting success of 5532.3 'setup local repo': 
-	git remote add fake git://example.com/remote &&
-	git config core.gitproxy ./proxy
-
-ok 3 - setup local repo
-
-expecting success of 5532.4 'fetch through proxy works': 
-	git fetch fake &&
-	echo one >expect &&
-	git log -1 --format=%s FETCH_HEAD >actual &&
-	test_cmp expect actual
-
-proxying for example.com 9418
-Running git-upload-pack remote
-From git://example.com/remote
- * [new branch]      master     -> fake/master
-ok 4 - fetch through proxy works
-
-expecting success of 5532.5 'funny hostnames are rejected before running proxy': 
-	test_must_fail git fetch git://-remote/repo.git 2>stderr &&
-	! grep "proxying for" stderr
-
-ok 5 - funny hostnames are rejected before running proxy
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5411-proc-receive-hook.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5411-proc-receive-hook/.git/
 expecting success of 5411.1 'setup upstream and workbench': 
@@ -346042,6 +346757,297 @@
 1..178
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5530-upload-pack-error.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5530-upload-pack-error/.git/
+expecting success of 5530.1 'setup and corrupt repository': 
+	echo file >file &&
+	git add file &&
+	git rev-parse :file &&
+	git commit -a -m original &&
+	test_tick &&
+	echo changed >file &&
+	git commit -a -m changed &&
+	corrupt_repo HEAD:file
+
+
+f73f3093ff865c514c6c51f867e35f693487d0d3
+[master (root-commit) 2cbe290] original
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 28c3702] changed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup and corrupt repository
+
+expecting success of 5530.2 'fsck fails': 
+	test_must_fail git fsck
+
+missing blob 5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
+ok 2 - fsck fails
+
+expecting success of 5530.3 'upload-pack fails due to error in pack-objects packing': 
+	head=$(git rev-parse HEAD) &&
+	hexsz=$(test_oid hexsz) &&
+	printf "%04xwant %s\n00000009done\n0000" \
+		$(($hexsz + 10)) $head >input &&
+	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
+	test_grep "unable to read" output.err &&
+	test_grep "pack-objects died" output.err
+
+fatal: unable to read 5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
+error: git upload-pack: git-pack-objects died with error.
+ok 3 - upload-pack fails due to error in pack-objects packing
+
+expecting success of 5530.4 'corrupt repo differently': 
+
+	git hash-object -w file &&
+	corrupt_repo HEAD^^{tree}
+
+
+5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
+ok 4 - corrupt repo differently
+
+expecting success of 5530.5 'fsck fails': 
+	test_must_fail git fsck
+
+broken link from  commit 2cbe290f6e7f12b1021e10cbe824d1208f5edc19
+              to    tree bec63e37d08c454ad3a60cde90b70f3f7d077852
+dangling blob f73f3093ff865c514c6c51f867e35f693487d0d3
+missing tree bec63e37d08c454ad3a60cde90b70f3f7d077852
+ok 5 - fsck fails
+
+expecting success of 5530.6 'upload-pack fails due to error in rev-list': 
+
+	printf "%04xwant %s\n%04xshallow %s00000009done\n0000" \
+		$(($hexsz + 10)) $(git rev-parse HEAD) \
+		$(($hexsz + 12)) $(git rev-parse HEAD^) >input &&
+	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
+	grep "bad tree object" output.err
+
+fatal: bad tree object bec63e37d08c454ad3a60cde90b70f3f7d077852
+ok 6 - upload-pack fails due to error in rev-list
+
+expecting success of 5530.7 'upload-pack fails due to bad want (no object)': 
+
+	printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
+		$(($hexsz + 29)) $(test_oid deadbeef) >input &&
+	test_must_fail git upload-pack . <input >output 2>output.err &&
+	grep "not our ref" output.err &&
+	grep "ERR" output &&
+	! grep multi_ack_detailed output.err
+
+fatal: git upload-pack: not our ref deadbeefdeadbeefdeadbeefdeadbeefdeadbeef
+grep: output: binary file matches
+ok 7 - upload-pack fails due to bad want (no object)
+
+expecting success of 5530.8 'upload-pack fails due to bad want (not tip)': 
+
+	oid=$(echo an object we have | git hash-object -w --stdin) &&
+	printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
+		$(($hexsz + 29)) "$oid" >input &&
+	test_must_fail git upload-pack . <input >output 2>output.err &&
+	grep "not our ref" output.err &&
+	grep "ERR" output &&
+	! grep multi_ack_detailed output.err
+
+error: git upload-pack: not our ref 023832c7c4fbc3a6d75879d18bbbef0b476b78b5
+grep: output: binary file matches
+ok 8 - upload-pack fails due to bad want (not tip)
+
+expecting success of 5530.9 'upload-pack fails due to error in pack-objects enumeration': 
+
+	printf "%04xwant %s\n00000009done\n0000" \
+		$((hexsz + 10)) $(git rev-parse HEAD) >input &&
+	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
+	grep "bad tree object" output.err &&
+	grep "pack-objects died" output.err
+
+fatal: bad tree object bec63e37d08c454ad3a60cde90b70f3f7d077852
+error: git upload-pack: git-pack-objects died with error.
+ok 9 - upload-pack fails due to error in pack-objects enumeration
+
+expecting success of 5530.10 'upload-pack tolerates EOF just after stateless client wants': 
+	test_commit initial &&
+	head=$(git rev-parse HEAD) &&
+
+	{
+		packetize "want $head" &&
+		packetize "shallow $head" &&
+		packetize "deepen 1" &&
+		printf "0000"
+	} >request &&
+
+	printf "0000" >expect &&
+
+	git upload-pack --stateless-rpc . <request >actual &&
+	test_cmp expect actual
+
+[master 61923d4] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 10 - upload-pack tolerates EOF just after stateless client wants
+
+expecting success of 5530.11 'create empty repository': 
+
+	mkdir foo &&
+	cd foo &&
+	git init
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5530-upload-pack-error/foo/.git/
+ok 11 - create empty repository
+
+expecting success of 5530.12 'fetch fails': 
+
+	test_must_fail git fetch .. main
+
+
+fatal: couldn't find remote ref main
+ok 12 - fetch fails
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5532-fetch-proxy.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5532-fetch-proxy/.git/
+expecting success of 5532.1 'setup remote repo': 
+	git init remote &&
+	(cd remote &&
+	 echo content >file &&
+	 git add file &&
+	 git commit -m one
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5532-fetch-proxy/remote/.git/
+[master (root-commit) f39a923] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup remote repo
+
+expecting success of 5532.2 'setup proxy script': 
+	write_script proxy-get-cmd "$PERL_PATH" <<-\EOF &&
+	read(STDIN, $buf, 4);
+	my $n = hex($buf) - 4;
+	read(STDIN, $buf, $n);
+	my ($cmd, $other) = split /\0/, $buf;
+	# drop absolute-path on repo name
+	$cmd =~ s{ /}{ };
+	print $cmd;
+	EOF
+
+	write_script proxy <<-\EOF
+	echo >&2 "proxying for $*"
+	cmd=$(./proxy-get-cmd)
+	echo >&2 "Running $cmd"
+	exec $cmd
+	EOF
+
+ok 2 - setup proxy script
+
+expecting success of 5532.3 'setup local repo': 
+	git remote add fake git://example.com/remote &&
+	git config core.gitproxy ./proxy
+
+ok 3 - setup local repo
+
+expecting success of 5532.4 'fetch through proxy works': 
+	git fetch fake &&
+	echo one >expect &&
+	git log -1 --format=%s FETCH_HEAD >actual &&
+	test_cmp expect actual
+
+proxying for example.com 9418
+Running git-upload-pack remote
+From git://example.com/remote
+ * [new branch]      master     -> fake/master
+ok 4 - fetch through proxy works
+
+expecting success of 5532.5 'funny hostnames are rejected before running proxy': 
+	test_must_fail git fetch git://-remote/repo.git 2>stderr &&
+	! grep "proxying for" stderr
+
+ok 5 - funny hostnames are rejected before running proxy
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5535-fetch-push-symref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5534-push-signed.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5534-push-signed/.git/
 expecting success of 5534.1 'setup': 
@@ -346289,78 +347295,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5535-fetch-push-symref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5536-fetch-conflicts.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5536-fetch-conflicts/.git/
 expecting success of 5536.1 'setup': 
@@ -346712,8 +347646,8 @@
  Date: Thu Apr 7 15:15:13 2005 -0700
  1 file changed, 1 insertion(+)
 Enumerating objects: 1, done.
-{"event":"region_enter","sid":"20250827T082150.754433Z-Hcf858c9d-P000a3dc8/20250827T082150.765292Z-Hcf858c9d-P000a3de2","thread":"main","time":"2025-08-27T08:21:50.766249Z","file":"builtin/pack-objects.c","line":4645,"repo":1,"nesting":3,"category":"pack-objects","label":"path-walk"}
-{"event":"region_leave","sid":"20250827T082150.754433Z-Hcf858c9d-P000a3dc8/20250827T082150.765292Z-Hcf858c9d-P000a3de2","thread":"main","time":"2025-08-27T08:21:50.766471Z","file":"builtin/pack-objects.c","line":4647,"repo":1,"t_rel":0.000225,"nesting":3,"category":"pack-objects","label":"path-walk"}
+{"event":"region_enter","sid":"20260929T145257.507857Z-H5c947e1c-P00236a41/20260929T145257.519091Z-H5c947e1c-P00236a7a","thread":"main","time":"2026-09-29T14:52:57.520041Z","file":"builtin/pack-objects.c","line":4645,"repo":1,"nesting":3,"category":"pack-objects","label":"path-walk"}
+{"event":"region_leave","sid":"20260929T145257.507857Z-H5c947e1c-P00236a41/20260929T145257.519091Z-H5c947e1c-P00236a7a","thread":"main","time":"2026-09-29T14:52:57.520270Z","file":"builtin/pack-objects.c","line":4647,"repo":1,"t_rel":0.000230,"nesting":3,"category":"pack-objects","label":"path-walk"}
 ok 8 - push new commit from shallow clone has good deltas
 
 # passed all 8 test(s)
@@ -347765,6 +348699,51 @@
 1..32
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5540-http-push-webdav.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5540-http-push-webdav/.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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5541-http-push-smart.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5541-http-push-smart/.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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5542-push-http-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5542-push-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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5326-multi-pack-bitmaps.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5326-multi-pack-bitmaps/.git/
 expecting success of 5326.1 'setup test_repository': 
@@ -348051,7 +349030,7 @@
 Located via MIDX '30492e1960672ac6d418da5127744b784dac89b7'.
 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":"20250827T082129.831841Z-Hcf858c9d-P000969e0","thread":"main","time":"2025-08-27T08:21:29.839150Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.007500,"t_rel":0.007500,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260929T145243.699600Z-H5c947e1c-P0022a871","thread":"main","time":"2026-09-29T14:52:43.700769Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001387,"t_rel":0.001387,"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': 
@@ -348548,11 +349527,11 @@
 	
 Bitmap v1 test (107 entries loaded, 107 total)
 Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / b399ece2 checksum
-Located via MIDX '2c02612f7cf097e421ee98bfff7f40e3ab05d2f5'.
+Located via MIDX '292b2753030e4a962d8fbcfea1d62bc7bcab6ff0'.
 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":"20250827T082129.831841Z-Hcf858c9d-P000969e0","thread":"main","time":"2025-08-27T08:21:29.839150Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.007500,"t_rel":0.007500,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20250827T082132.919439Z-Hcf858c9d-P0009863e","thread":"main","time":"2025-08-27T08:21:32.924924Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001257,"t_rel":0.001257,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260929T145243.699600Z-H5c947e1c-P0022a871","thread":"main","time":"2026-09-29T14:52:43.700769Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001387,"t_rel":0.001387,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260929T145245.775756Z-H5c947e1c-P0022c349","thread":"main","time":"2026-09-29T14:52:45.776858Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001291,"t_rel":0.001291,"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': 
@@ -348560,7 +349539,7 @@
 	
 Bitmap v1 test (107 entries loaded, 107 total)
 Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / b399ece2 checksum
-Located via MIDX '2c02612f7cf097e421ee98bfff7f40e3ab05d2f5'.
+Located via MIDX '292b2753030e4a962d8fbcfea1d62bc7bcab6ff0'.
 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
@@ -349584,9 +350563,9 @@
 Located via MIDX 'd700bff0339f3380fd20334a295c48cea6f7acf6'.
 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":"20250827T082129.831841Z-Hcf858c9d-P000969e0","thread":"main","time":"2025-08-27T08:21:29.839150Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.007500,"t_rel":0.007500,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20250827T082132.919439Z-Hcf858c9d-P0009863e","thread":"main","time":"2025-08-27T08:21:32.924924Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001257,"t_rel":0.001257,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20250827T082136.566304Z-Hcf858c9d-P0009a618","thread":"main","time":"2025-08-27T08:21:36.567440Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001340,"t_rel":0.001340,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260929T145243.699600Z-H5c947e1c-P0022a871","thread":"main","time":"2026-09-29T14:52:43.700769Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001387,"t_rel":0.001387,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260929T145245.775756Z-H5c947e1c-P0022c349","thread":"main","time":"2026-09-29T14:52:45.776858Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001291,"t_rel":0.001291,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260929T145248.201200Z-H5c947e1c-P0022e4a5","thread":"main","time":"2026-09-29T14:52:48.202325Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001327,"t_rel":0.001327,"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': 
@@ -350051,8 +351030,8 @@
 pack_report: pack_mapped              =      26910 /      26910
 ---------------------------------------------------------------------
 
---- before	2025-08-27 08:21:38.495919334 +0000
-+++ after	2025-08-27 08:21:38.539919624 +0000
+--- before	2026-09-29 14:52:49.450548970 +0000
++++ after	2026-09-29 14:52:49.486548970 +0000
 @@ -1 +1 @@
 -fa4fd5b5dc98cbc7b40febbcdae7093e095b854e
 +ddf14642c6faca04471beee86e605bcbfd21396e
@@ -350177,8 +351156,8 @@
 pack_report: pack_mapped              =      26910 /      26910
 ---------------------------------------------------------------------
 
---- before	2025-08-27 08:21:38.999922658 +0000
-+++ after	2025-08-27 08:21:39.035922896 +0000
+--- before	2026-09-29 14:52:49.766548970 +0000
++++ after	2026-09-29 14:52:49.814548970 +0000
 @@ -1 +1 @@
 -fa4fd5b5dc98cbc7b40febbcdae7093e095b854e
 +ddf14642c6faca04471beee86e605bcbfd21396e
@@ -350566,7 +351545,7 @@
 Located via MIDX '1daca52df6227ee36af5441dcfa5b269b5d7cafd'.
 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":"20250827T082140.306020Z-Hcf858c9d-P0009cd6c","thread":"main","time":"2025-08-27T08:21:40.307064Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001217,"t_rel":0.001217,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260929T145250.703159Z-H5c947e1c-P00230794","thread":"main","time":"2026-09-29T14:52:50.704290Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001342,"t_rel":0.001342,"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': 
@@ -351062,20 +352041,20 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries, 107 total)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / da6c1e68 checksum
-Located via MIDX 'dcd600ea5cde21e6d004b6f516db1e47c04a2caf'.
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / b16764fa checksum
+Located via MIDX 'a8bf9c4549698540135097d4e75bad5f9dd1e2df'.
 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":"20250827T082140.306020Z-Hcf858c9d-P0009cd6c","thread":"main","time":"2025-08-27T08:21:40.307064Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001217,"t_rel":0.001217,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20250827T082143.377689Z-Hcf858c9d-P0009f0e5","thread":"main","time":"2025-08-27T08:21:43.378813Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.007230,"t_rel":0.007230,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260929T145250.703159Z-H5c947e1c-P00230794","thread":"main","time":"2026-09-29T14:52:50.704290Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001342,"t_rel":0.001342,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260929T145252.743899Z-H5c947e1c-P0023253e","thread":"main","time":"2026-09-29T14:52:52.745294Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001619,"t_rel":0.001619,"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': 
 		git rev-list --test-bitmap HEAD
 	
 Bitmap v1 test (107 entries, 107 total)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / da6c1e68 checksum
-Located via MIDX 'dcd600ea5cde21e6d004b6f516db1e47c04a2caf'.
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / b16764fa checksum
+Located via MIDX 'a8bf9c4549698540135097d4e75bad5f9dd1e2df'.
 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 224 - rev-list --test-bitmap verifies bitmaps
@@ -352095,21 +353074,21 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries, 107 total)
-Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 24365dde checksum
-Located via MIDX '881534c7979a014d1b5d89b928300aaffa1ba792'.
+Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 13802fc1 checksum
+Located via MIDX 'b9b28e78001011e19af2f3881d241ce40745ce2f'.
 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":"20250827T082140.306020Z-Hcf858c9d-P0009cd6c","thread":"main","time":"2025-08-27T08:21:40.307064Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001217,"t_rel":0.001217,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20250827T082143.377689Z-Hcf858c9d-P0009f0e5","thread":"main","time":"2025-08-27T08:21:43.378813Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.007230,"t_rel":0.007230,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20250827T082146.899173Z-Hcf858c9d-P000a1569","thread":"main","time":"2025-08-27T08:21:46.900263Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001293,"t_rel":0.001293,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260929T145250.703159Z-H5c947e1c-P00230794","thread":"main","time":"2026-09-29T14:52:50.704290Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001342,"t_rel":0.001342,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260929T145252.743899Z-H5c947e1c-P0023253e","thread":"main","time":"2026-09-29T14:52:52.745294Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001619,"t_rel":0.001619,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260929T145255.106075Z-H5c947e1c-P00234716","thread":"main","time":"2026-09-29T14:52:55.107289Z","file":"pack-revindex.c","line":382,"repo":1,"t_abs":0.001434,"t_rel":0.001434,"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, 107 total)
-Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 24365dde checksum
-Located via MIDX '881534c7979a014d1b5d89b928300aaffa1ba792'.
+Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 13802fc1 checksum
+Located via MIDX 'b9b28e78001011e19af2f3881d241ce40745ce2f'.
 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
@@ -352566,8 +353545,8 @@
 pack_report: pack_mapped              =      26907 /      26907
 ---------------------------------------------------------------------
 
---- before	2025-08-27 08:21:48.575985825 +0000
-+++ after	2025-08-27 08:21:48.635986221 +0000
+--- before	2026-09-29 14:52:56.382548970 +0000
++++ after	2026-09-29 14:52:56.414548970 +0000
 @@ -1 +1 @@
 -a09427aadc45553b705d3a726a24ceeaa43874f0
 +e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
@@ -352692,8 +353671,8 @@
 pack_report: pack_mapped              =      26907 /      26907
 ---------------------------------------------------------------------
 
---- before	2025-08-27 08:21:49.143989572 +0000
-+++ after	2025-08-27 08:21:49.199989941 +0000
+--- before	2026-09-29 14:52:56.698548970 +0000
++++ after	2026-09-29 14:52:56.734548970 +0000
 @@ -1 +1 @@
 -a09427aadc45553b705d3a726a24ceeaa43874f0
 +e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
@@ -352816,8 +353795,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-{"event":"region_enter","sid":"20250827T082149.630059Z-Hcf858c9d-P000a329d","thread":"main","time":"2025-08-27T08:21:49.632219Z","file":"pack-bitmap-write.c","line":990,"repo":1,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
-{"event":"region_leave","sid":"20250827T082149.630059Z-Hcf858c9d-P000a329d","thread":"main","time":"2025-08-27T08:21:49.632225Z","file":"pack-bitmap-write.c","line":1017,"repo":1,"t_rel":0.000006,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_enter","sid":"20260929T145257.078973Z-H5c947e1c-P00236476","thread":"main","time":"2026-09-29T14:52:57.086235Z","file":"pack-bitmap-write.c","line":990,"repo":1,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_leave","sid":"20260929T145257.078973Z-H5c947e1c-P00236476","thread":"main","time":"2026-09-29T14:52:57.086241Z","file":"pack-bitmap-write.c","line":1017,"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': 
@@ -353030,7 +354009,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
@@ -353055,7 +354034,7 @@
 pack_report: pack_used_ctr            =         16
 pack_report: pack_mmap_calls          =          2
 pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      88446 /      88446
+pack_report: pack_mapped              =      84560 /      84560
 ---------------------------------------------------------------------
 
 Nothing new to pack.
@@ -353063,23 +354042,23 @@
 dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
 5+0 records in
 5+0 records out
-5 bytes copied, 0.00256862 s, 1.9 kB/s
+5 bytes copied, 3.948e-05 s, 127 kB/s
 dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
 dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/pack-116eba5d38d447f8881bc987d45901692ed7fe21.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/pack-d5db95adcfc05d64707d32c48744a1b7354f6447.bitmap' has invalid checksum
 5+0 records in
 5+0 records out
-5 bytes copied, 3.8561e-05 s, 130 kB/s
+5 bytes copied, 3.952e-05 s, 127 kB/s
 dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
 dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/multi-pack-index-786582fc1a7e6001f1cdb29795603f4811615d39.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/multi-pack-index-23ba8c2c2f06afa1c7b781004c2ca2932cc46216.bitmap' has invalid checksum
 5+0 records in
 5+0 records out
-5 bytes copied, 3.732e-05 s, 134 kB/s
+5 bytes copied, 3.804e-05 s, 131 kB/s
 dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
 dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/multi-pack-index-786582fc1a7e6001f1cdb29795603f4811615d39.bitmap' has invalid checksum
-error: bitmap file '.git/objects/pack/pack-116eba5d38d447f8881bc987d45901692ed7fe21.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/multi-pack-index-23ba8c2c2f06afa1c7b781004c2ca2932cc46216.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/pack-d5db95adcfc05d64707d32c48744a1b7354f6447.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': 
@@ -353220,51 +354199,6 @@
 1..357
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5540-http-push-webdav.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5540-http-push-webdav/.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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5541-http-push-smart.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5541-http-push-smart/.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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5542-push-http-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5542-push-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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5544-pack-objects-hook.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5544-pack-objects-hook/.git/
 expecting success of 5544.1 'create some history to fetch': 
@@ -353506,6 +354440,137 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5547-push-quarantine.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5547-push-quarantine/.git/
+expecting success of 5547.1 'create picky dest repo': 
+	git init --bare dest.git &&
+	test_hook --setup -C dest.git pre-receive <<-\EOF
+	while read old new ref; do
+		test "$(git log -1 --format=%s $new)" = reject && exit 1
+	done
+	exit 0
+	EOF
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5547-push-quarantine/dest.git/
+ok 1 - create picky dest repo
+
+expecting success of 5547.2 'accepted objects work': 
+	test_commit ok &&
+	git push dest.git HEAD &&
+	commit=$(git rev-parse HEAD) &&
+	git --git-dir=dest.git cat-file commit $commit
+
+[master (root-commit) c6ea792] ok
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ok.t
+To dest.git
+ * [new branch]      HEAD -> master
+tree b75e7563b6e3ea344e3d7eff513fde4da0914ed6
+author A U Thor <author@example.com> 1112911993 -0700
+committer C O Mitter <committer@example.com> 1112911993 -0700
+
+ok
+ok 2 - accepted objects work
+
+expecting success of 5547.3 'rejected objects are not installed': 
+	test_commit reject &&
+	commit=$(git rev-parse HEAD) &&
+	test_must_fail git push dest.git reject &&
+	test_must_fail git --git-dir=dest.git cat-file commit $commit
+
+[master d08c8eb] reject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reject.t
+To dest.git
+ ! [remote rejected] reject -> reject (pre-receive hook declined)
+error: failed to push some refs to 'dest.git'
+fatal: git cat-file d08c8eba97f4e683ece08654c7c8d2ba0c03b129: bad file
+ok 3 - rejected objects are not installed
+
+expecting success of 5547.4 'rejected objects are removed': 
+	echo "incoming-*" >expect &&
+	(cd dest.git/objects && echo incoming-*) >actual &&
+	test_cmp expect actual
+
+ok 4 - rejected objects are removed
+
+expecting success of 5547.5 'push to repo path with path separator (colon)': 
+	# The interesting failure case here is when the
+	# receiving end cannot access its original object directory,
+	# so make it likely for us to generate a delta by having
+	# a non-trivial file with multiple versions.
+
+	test-tool genrandom foo 4096 >file.bin &&
+	git add file.bin &&
+	git commit -m bin &&
+
+	if test_have_prereq MINGW
+	then
+		pathsep=";"
+	else
+		pathsep=":"
+	fi &&
+	git clone --bare . "xxx${pathsep}yyy.git" &&
+
+	echo change >>file.bin &&
+	git commit -am change &&
+	# Note that we have to use the full path here, or it gets confused
+	# with the ssh host:path syntax.
+	git push "$(pwd)/xxx${pathsep}yyy.git" HEAD
+
+[master f56dd63] bin
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file.bin
+Cloning into bare repository 'xxx:yyy.git'...
+done.
+[master 0343f66] change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5547-push-quarantine/xxx:yyy.git
+   f56dd63..0343f66  HEAD -> master
+ok 5 - push to repo path with path separator (colon)
+
+expecting success of 5547.6 'updating a ref from quarantine is forbidden': 
+	git init --bare update.git &&
+	test_hook -C update.git pre-receive <<-\EOF &&
+	read old new refname
+	git update-ref refs/heads/unrelated $new
+	exit 1
+	EOF
+	test_must_fail git push update.git HEAD &&
+	git -C update.git fsck
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5547-push-quarantine/update.git/
+remote: fatal: update_ref failed for ref 'refs/heads/unrelated': ref updates forbidden inside quarantine environment        
+To update.git
+ ! [remote rejected] HEAD -> master (pre-receive hook declined)
+error: failed to push some refs to 'update.git'
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+ok 6 - updating a ref from quarantine is forbidden
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5549-fetch-push-http.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5515-fetch-merge-logic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5515-fetch-merge-logic/.git/
 expecting success of 5515.1 'setup': 
@@ -357138,8 +358203,8 @@
 1..65
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5549-fetch-push-http.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5549-fetch-push-http/.git/
+*** t5550-http-fetch-dumb.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5550-http-fetch-dumb/.git/
 checking prerequisite: NOT_ROOT
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
@@ -357153,150 +358218,1271 @@
 1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5547-push-quarantine.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5547-push-quarantine/.git/
-expecting success of 5547.1 'create picky dest repo': 
-	git init --bare dest.git &&
-	test_hook --setup -C dest.git pre-receive <<-\EOF
-	while read old new ref; do
-		test "$(git log -1 --format=%s $new)" = reject && exit 1
-	done
-	exit 0
-	EOF
+*** t5551-http-fetch-smart.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5551-http-fetch-smart/.git/
+checking prerequisite: NOT_ROOT
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5547-push-quarantine/dest.git/
-ok 1 - create picky dest repo
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
-expecting success of 5547.2 'accepted objects work': 
-	test_commit ok &&
-	git push dest.git HEAD &&
-	commit=$(git rev-parse HEAD) &&
-	git --git-dir=dest.git cat-file commit $commit
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5531-deep-submodule-push.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/.git/
+expecting success of 5531.1 'setup': 
+	mkdir pub.git &&
+	GIT_DIR=pub.git git init --bare &&
+	GIT_DIR=pub.git git config receive.fsckobjects true &&
+	mkdir work &&
+	(
+		cd work &&
+		git init &&
+		git config push.default matching &&
+		mkdir -p gar/bage &&
+		(
+			cd gar/bage &&
+			git init &&
+			git config push.default matching &&
+			>junk &&
+			git add junk &&
+			git commit -m "Initial junk"
+		) &&
+		git add gar/bage &&
+		git commit -m "Initial superproject"
+	)
 
-[master (root-commit) c6ea792] ok
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/pub.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/work/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/work/gar/bage/.git/
+[main (root-commit) 6fbe593] Initial junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk
+warning: adding embedded git repository: gar/bage
+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> gar/bage
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached gar/bage
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[main (root-commit) 38ca8a3] Initial superproject
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 ok.t
-To dest.git
- * [new branch]      HEAD -> master
-tree b75e7563b6e3ea344e3d7eff513fde4da0914ed6
-author A U Thor <author@example.com> 1112911993 -0700
-committer C O Mitter <committer@example.com> 1112911993 -0700
+ create mode 160000 gar/bage
+ok 1 - setup
 
-ok
-ok 2 - accepted objects work
+expecting success of 5531.2 'push works with recorded gitlink': 
+	(
+		cd work &&
+		git push ../pub.git main
+	)
 
-expecting success of 5547.3 'rejected objects are not installed': 
-	test_commit reject &&
-	commit=$(git rev-parse HEAD) &&
-	test_must_fail git push dest.git reject &&
-	test_must_fail git --git-dir=dest.git cat-file commit $commit
+To ../pub.git
+ * [new branch]      main -> main
+ok 2 - push works with recorded gitlink
 
-[master d08c8eb] reject
+expecting success of 5531.3 'push if submodule has no remote': 
+	(
+		cd work/gar/bage &&
+		>junk2 &&
+		git add junk2 &&
+		git commit -m "Second junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Second commit for gar/bage" &&
+		git push --recurse-submodules=check ../pub.git main
+	)
+
+[main def33d6] Second junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk2
+[main 61d752a] Second commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   38ca8a3..61d752a  main -> main
+ok 3 - push if submodule has no remote
+
+expecting success of 5531.4 'push fails if submodule commit not on remote': 
+	(
+		cd work/gar &&
+		git clone --bare bage ../../submodule.git &&
+		cd bage &&
+		git remote add origin ../../../submodule.git &&
+		git fetch &&
+		>junk3 &&
+		git add junk3 &&
+		git commit -m "Third junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Third commit for gar/bage" &&
+		# the push should fail with --recurse-submodules=check
+		# on the command line...
+		test_must_fail git push --recurse-submodules=check ../pub.git main &&
+
+		# ...or if specified in the configuration..
+		test_must_fail git -c push.recurseSubmodules=check push ../pub.git main
+	)
+
+Cloning into bare repository '../../submodule.git'...
+done.
+From ../../../submodule
+ * [new branch]      main       -> origin/main
+[main 18a8afc] Third junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk3
+[main 7484e0a] Third commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+ok 4 - push fails if submodule commit not on remote
+
+expecting success of 5531.5 'push succeeds after commit was pushed to remote': 
+	(
+		cd work/gar/bage &&
+		git push origin main
+	) &&
+	(
+		cd work &&
+		git push --recurse-submodules=check ../pub.git main
+	)
+
+To ../../../submodule.git
+   def33d6..18a8afc  main -> main
+To ../pub.git
+   61d752a..7484e0a  main -> main
+ok 5 - push succeeds after commit was pushed to remote
+
+expecting success of 5531.6 'push succeeds if submodule commit not on remote but using on-demand on command line': 
+	(
+		cd work/gar/bage &&
+		>recurse-on-demand-on-command-line &&
+		git add recurse-on-demand-on-command-line &&
+		git commit -m "Recurse on-demand on command line junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse on-demand on command line for gar/bage" &&
+		git push --recurse-submodules=on-demand ../pub.git main &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# Check that the submodule commit got there too
+		cd gar/bage &&
+		git diff --quiet origin/main main
+	)
+
+[main 04ec359] Recurse on-demand on command line junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-on-demand-on-command-line
+[main 034803e] Recurse on-demand on command line for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   18a8afc..04ec359  main -> main
+To ../pub.git
+   7484e0a..034803e  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 6 - push succeeds if submodule commit not on remote but using on-demand on command line
+
+expecting success of 5531.7 'push succeeds if submodule commit not on remote but using on-demand from config': 
+	(
+		cd work/gar/bage &&
+		>recurse-on-demand-from-config &&
+		git add recurse-on-demand-from-config &&
+		git commit -m "Recurse on-demand from config junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse on-demand from config for gar/bage" &&
+		git -c push.recurseSubmodules=on-demand push ../pub.git main &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# Check that the submodule commit got there too
+		cd gar/bage &&
+		git diff --quiet origin/main main
+	)
+
+[main cc28292] Recurse on-demand from config junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-on-demand-from-config
+[main 85a50af] Recurse on-demand from config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   04ec359..cc28292  main -> main
+To ../pub.git
+   034803e..85a50af  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 7 - push succeeds if submodule commit not on remote but using on-demand from config
+
+expecting success of 5531.8 'push succeeds if submodule commit not on remote but using auto-on-demand via submodule.recurse config': 
+	(
+		cd work/gar/bage &&
+		>recurse-on-demand-from-submodule-recurse-config &&
+		git add recurse-on-demand-from-submodule-recurse-config &&
+		git commit -m "Recurse submodule.recurse from config junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse submodule.recurse from config for gar/bage" &&
+		git -c submodule.recurse push ../pub.git main &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# Check that the submodule commit got there too
+		cd gar/bage &&
+		git diff --quiet origin/main main
+	)
+
+[main f05bcc4] Recurse submodule.recurse from config junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-on-demand-from-submodule-recurse-config
+[main 937e43c] Recurse submodule.recurse from config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   cc28292..f05bcc4  main -> main
+To ../pub.git
+   85a50af..937e43c  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 8 - push succeeds if submodule commit not on remote but using auto-on-demand via submodule.recurse config
+
+expecting success of 5531.9 'push recurse-submodules on command line overrides config': 
+	(
+		cd work/gar/bage &&
+		>recurse-check-on-command-line-overriding-config &&
+		git add recurse-check-on-command-line-overriding-config &&
+		git commit -m "Recurse on command-line overriding config junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse on command-line overriding config for gar/bage" &&
+
+		# Ensure that we can override on-demand in the config
+		# to just check submodules
+		test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git main &&
+		# Check that the supermodule commit did not get there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main^ &&
+		# Check that the submodule commit did not get there
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+
+		# Ensure that we can override check in the config to
+		# disable submodule recursion entirely
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+		git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git main &&
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+
+		# Ensure that we can override check in the config to
+		# disable submodule recursion entirely (alternative form)
+		git -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git main &&
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+
+		# Ensure that we can override check in the config to
+		# push the submodule too
+		git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		(cd gar/bage && git diff --quiet origin/main main)
+	)
+
+[main b5bd2c4] Recurse on command-line overriding config junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-check-on-command-line-overriding-config
+[main 97693ab] Recurse on command-line overriding config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+To ../pub.git
+   937e43c..97693ab  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Everything up-to-date
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   f05bcc4..b5bd2c4  main -> main
+Everything up-to-date
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 9 - push recurse-submodules on command line overrides config
+
+expecting success of 5531.10 'push recurse-submodules last one wins on command line': 
+	(
+		cd work/gar/bage &&
+		>recurse-check-on-command-line-overriding-earlier-command-line &&
+		git add recurse-check-on-command-line-overriding-earlier-command-line &&
+		git commit -m "Recurse on command-line overriding earlier command-line junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse on command-line overriding earlier command-line for gar/bage" &&
+
+		# should result in "check"
+		test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git main &&
+		# Check that the supermodule commit did not get there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main^ &&
+		# Check that the submodule commit did not get there
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+
+		# should result in "no"
+		git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git main &&
+		# Check that the supermodule commit did get there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# Check that the submodule commit did not get there
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+
+		# should result in "no"
+		git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git main &&
+		# Check that the submodule commit did not get there
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+
+		# But the options in the other order should push the submodule
+		git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git main &&
+		# Check that the submodule commit did get there
+		git fetch ../pub.git &&
+		(cd gar/bage && git diff --quiet origin/main main)
+	)
+
+[main 2dd0c02] Recurse on command-line overriding earlier command-line junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-check-on-command-line-overriding-earlier-command-line
+[main abee46f] Recurse on command-line overriding earlier command-line for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+To ../pub.git
+   97693ab..abee46f  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Everything up-to-date
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   b5bd2c4..2dd0c02  main -> main
+Everything up-to-date
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 10 - push recurse-submodules last one wins on command line
+
+expecting success of 5531.11 'push succeeds if submodule commit not on remote using on-demand from cmdline overriding config': 
+	(
+		cd work/gar/bage &&
+		>recurse-on-demand-on-command-line-overriding-config &&
+		git add recurse-on-demand-on-command-line-overriding-config &&
+		git commit -m "Recurse on-demand on command-line overriding config junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse on-demand on command-line overriding config for gar/bage" &&
+		git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# Check that the submodule commit got there
+		cd gar/bage &&
+		git diff --quiet origin/main main
+	)
+
+[main c30f1ef] Recurse on-demand on command-line overriding config junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-on-demand-on-command-line-overriding-config
+[main c41dba3] Recurse on-demand on command-line overriding config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   2dd0c02..c30f1ef  main -> main
+To ../pub.git
+   abee46f..c41dba3  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 11 - push succeeds if submodule commit not on remote using on-demand from cmdline overriding config
+
+expecting success of 5531.12 'push succeeds if submodule commit disabling recursion from cmdline overriding config': 
+	(
+		cd work/gar/bage &&
+		>recurse-disable-on-command-line-overriding-config &&
+		git add recurse-disable-on-command-line-overriding-config &&
+		git commit -m "Recurse disable on command-line overriding config junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse disable on command-line overriding config for gar/bage" &&
+		git -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git main &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# But that the submodule commit did not
+		( cd gar/bage && git diff --quiet origin/main main^ ) &&
+		# Now push it to avoid confusing future tests
+		git push --recurse-submodules=on-demand ../pub.git main
+	)
+
+[main 6738ef7] Recurse disable on command-line overriding config junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-disable-on-command-line-overriding-config
+[main b2ab521] Recurse disable on command-line overriding config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   c41dba3..b2ab521  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   c30f1ef..6738ef7  main -> main
+Everything up-to-date
+ok 12 - push succeeds if submodule commit disabling recursion from cmdline overriding config
+
+expecting success of 5531.13 'push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config': 
+	(
+		cd work/gar/bage &&
+		>recurse-disable-on-command-line-alt-overriding-config &&
+		git add recurse-disable-on-command-line-alt-overriding-config &&
+		git commit -m "Recurse disable on command-line alternative overriding config junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse disable on command-line alternative overriding config for gar/bage" &&
+		git -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git main &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# But that the submodule commit did not
+		( cd gar/bage && git diff --quiet origin/main main^ ) &&
+		# Now push it to avoid confusing future tests
+		git push --recurse-submodules=on-demand ../pub.git main
+	)
+
+[main b13707b] Recurse disable on command-line alternative overriding config junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-disable-on-command-line-alt-overriding-config
+[main bdb7e27] Recurse disable on command-line alternative overriding config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   b2ab521..bdb7e27  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   6738ef7..b13707b  main -> main
+Everything up-to-date
+ok 13 - push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config
+
+expecting success of 5531.14 'submodule entry pointing at a tag is error': 
+	git -C work/gar/bage tag -a test1 -m "tag" &&
+	tag=$(git -C work/gar/bage rev-parse test1^{tag}) &&
+	git -C work update-index --cacheinfo 160000 "$tag" gar/bage &&
+	git -C work commit -m "bad commit" &&
+	test_when_finished "git -C work reset --hard HEAD^" &&
+	test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git main 2>err &&
+	test_grep "is a tag, not a commit" err
+
+[main 209375b] bad commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: submodule entry 'gar/bage' (eca83b4b9ad7cb2fa6583ec07cdfa5a8d4f6ebe2) is a tag, not a commit
+HEAD is now at bdb7e27 Recurse disable on command-line alternative overriding config for gar/bage
+ok 14 - submodule entry pointing at a tag is error
+
+expecting success of 5531.15 'push fails if recurse submodules option passed as yes': 
+	(
+		cd work/gar/bage &&
+		>recurse-push-fails-if-recurse-submodules-passed-as-yes &&
+		git add recurse-push-fails-if-recurse-submodules-passed-as-yes &&
+		git commit -m "Recurse push fails if recurse submodules option passed as yes"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse push fails if recurse submodules option passed as yes for gar/bage" &&
+		test_must_fail git push --recurse-submodules=yes ../pub.git main &&
+		test_must_fail git -c push.recurseSubmodules=yes push ../pub.git main &&
+		git push --recurse-submodules=on-demand ../pub.git main
+	)
+
+[main 41a3ccc] Recurse push fails if recurse submodules option passed as yes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-push-fails-if-recurse-submodules-passed-as-yes
+[main 222fffb] Recurse push fails if recurse submodules option passed as yes for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: bad recurse-submodules argument: yes
+fatal: bad push.recursesubmodules argument: yes
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   b13707b..41a3ccc  main -> main
+To ../pub.git
+   bdb7e27..222fffb  main -> main
+ok 15 - push fails if recurse submodules option passed as yes
+
+expecting success of 5531.16 'push fails when commit on multiple branches if one branch has no remote': 
+	(
+		cd work/gar/bage &&
+		>junk4 &&
+		git add junk4 &&
+		git commit -m "Fourth junk"
+	) &&
+	(
+		cd work &&
+		git branch branch2 &&
+		git add gar/bage &&
+		git commit -m "Fourth commit for gar/bage" &&
+		git checkout branch2 &&
+		(
+			cd gar/bage &&
+			git checkout HEAD~1
+		) &&
+		>junk1 &&
+		git add junk1 &&
+		git commit -m "First junk" &&
+		test_must_fail git push --recurse-submodules=check ../pub.git
+	)
+
+[main 8e0d58c] Fourth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk4
+[main 1a1015f] Fourth commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'branch2'
+M	gar/bage
+Note: switching to 'HEAD~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.
+
+If you want to 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 41a3ccc Recurse push fails if recurse submodules option passed as yes
+[branch2 0b7464f] First junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk1
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+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
+
+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 &&
+	(
+		cd a1 &&
+		git init b &&
+		(
+			cd b &&
+			>junk &&
+			git add junk &&
+			git commit -m "initial"
+		) &&
+		git add b &&
+		git commit -m "added submodule" &&
+		git push --recurse-submodules=check origin main
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/a/
+Cloning into 'a1'...
+warning: You appear to have cloned an empty repository.
+done.
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/a1/b/.git/
+[main (root-commit) f055ed5] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk
+warning: adding embedded git repository: b
+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> b
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached b
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[main (root-commit) c2121a0] added submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 reject.t
-To dest.git
- ! [remote rejected] reject -> reject (pre-receive hook declined)
-error: failed to push some refs to 'dest.git'
-fatal: git cat-file d08c8eba97f4e683ece08654c7c8d2ba0c03b129: bad file
-ok 3 - rejected objects are not installed
+ create mode 160000 b
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/a
+ * [new branch]      main -> main
+ok 17 - push succeeds if submodule has no remote and is on the first superproject commit
 
-expecting success of 5547.4 'rejected objects are removed': 
-	echo "incoming-*" >expect &&
-	(cd dest.git/objects && echo incoming-*) >actual &&
-	test_cmp expect actual
+expecting success of 5531.18 'push unpushed submodules when not needed': 
+	(
+		cd work &&
+		(
+			cd gar/bage &&
+			git checkout main &&
+			>junk5 &&
+			git add junk5 &&
+			git commit -m "Fifth junk" &&
+			git push &&
+			git rev-parse origin/main >../../../expected
+		) &&
+		git checkout main &&
+		git add gar/bage &&
+		git commit -m "Fifth commit for gar/bage" &&
+		git push --recurse-submodules=on-demand ../pub.git main
+	) &&
+	(
+		cd submodule.git &&
+		git rev-parse main >../actual
+	) &&
+	test_cmp expected actual
 
-ok 4 - rejected objects are removed
+Previous HEAD position was 41a3ccc Recurse push fails if recurse submodules option passed as yes
+Switched to branch 'main'
+[main 7f851d1] Fifth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk5
+To ../../../submodule.git
+   41a3ccc..7f851d1  main -> main
+Switched to branch 'main'
+M	gar/bage
+[main fbdd783] Fifth commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   222fffb..fbdd783  main -> main
+ok 18 - push unpushed submodules when not needed
 
-expecting success of 5547.5 'push to repo path with path separator (colon)': 
-	# The interesting failure case here is when the
-	# receiving end cannot access its original object directory,
-	# so make it likely for us to generate a delta by having
-	# a non-trivial file with multiple versions.
+expecting success of 5531.19 'push unpushed submodules when not needed 2': 
+	(
+		cd submodule.git &&
+		git rev-parse main >../expected
+	) &&
+	(
+		cd work &&
+		(
+			cd gar/bage &&
+			>junk6 &&
+			git add junk6 &&
+			git commit -m "Sixth junk"
+		) &&
+		>junk2 &&
+		git add junk2 &&
+		git commit -m "Second junk for work" &&
+		git push --recurse-submodules=on-demand ../pub.git main
+	) &&
+	(
+		cd submodule.git &&
+		git rev-parse main >../actual
+	) &&
+	test_cmp expected actual
 
-	test-tool genrandom foo 4096 >file.bin &&
-	git add file.bin &&
-	git commit -m bin &&
+[main 1aa6921] Sixth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk6
+[main 8ea0267] Second junk for work
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk2
+To ../pub.git
+   fbdd783..8ea0267  main -> main
+ok 19 - push unpushed submodules when not needed 2
 
-	if test_have_prereq MINGW
-	then
-		pathsep=";"
-	else
-		pathsep=":"
-	fi &&
-	git clone --bare . "xxx${pathsep}yyy.git" &&
+expecting success of 5531.20 'push unpushed submodules recursively': 
+	(
+		cd work &&
+		(
+			cd gar/bage &&
+			git checkout main &&
+			> junk7 &&
+			git add junk7 &&
+			git commit -m "Seventh junk" &&
+			git rev-parse main >../../../expected
+		) &&
+		git checkout main &&
+		git add gar/bage &&
+		git commit -m "Seventh commit for gar/bage" &&
+		git push --recurse-submodules=on-demand ../pub.git main
+	) &&
+	(
+		cd submodule.git &&
+		git rev-parse main >../actual
+	) &&
+	test_cmp expected actual
 
-	echo change >>file.bin &&
-	git commit -am change &&
-	# Note that we have to use the full path here, or it gets confused
-	# with the ssh host:path syntax.
-	git push "$(pwd)/xxx${pathsep}yyy.git" HEAD
+Already on 'main'
+[main a888053] Seventh junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk7
+Already on 'main'
+M	gar/bage
+[main 962ec87] Seventh commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   7f851d1..a888053  main -> main
+To ../pub.git
+   8ea0267..962ec87  main -> main
+ok 20 - push unpushed submodules recursively
 
-[master f56dd63] bin
+expecting success of 5531.21 'push unpushable submodule recursively fails': 
+	(
+		cd work &&
+		(
+			cd gar/bage &&
+			git rev-parse origin/main >../../../expected &&
+			git checkout main~0 &&
+			> junk8 &&
+			git add junk8 &&
+			git commit -m "Eighth junk"
+		) &&
+		git add gar/bage &&
+		git commit -m "Eighth commit for gar/bage" &&
+		test_must_fail git push --recurse-submodules=on-demand ../pub.git main
+	) &&
+	(
+		cd submodule.git &&
+		git rev-parse main >../actual
+	) &&
+	test_when_finished git -C work reset --hard main^ &&
+	test_cmp expected actual
+
+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 a888053 Seventh junk
+[detached HEAD ae657ca] Eighth junk
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file.bin
-Cloning into bare repository 'xxx:yyy.git'...
+ create mode 100644 junk8
+[main 084f954] Eighth commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+Everything up-to-date
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+HEAD is now at 962ec87 Seventh commit for gar/bage
+ok 21 - push unpushable submodule recursively fails
+
+expecting success of 5531.22 'push --dry-run does not recursively update submodules': 
+	(
+		cd work/gar/bage &&
+		git checkout main &&
+		git rev-parse main >../../../expected_submodule &&
+		> junk9 &&
+		git add junk9 &&
+		git commit -m "Ninth junk" &&
+
+		# Go up to work directory
+		cd ../.. &&
+		git checkout main &&
+		git rev-parse main >../expected_pub &&
+		git add gar/bage &&
+		git commit -m "Ninth commit for gar/bage" &&
+		git push --dry-run --recurse-submodules=on-demand ../pub.git main
+	) &&
+	git -C submodule.git rev-parse main >actual_submodule &&
+	git -C pub.git rev-parse main >actual_pub &&
+	test_cmp expected_pub actual_pub &&
+	test_cmp expected_submodule actual_submodule
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  ae657ca Eighth junk
+
+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> ae657ca
+
+Switched to branch 'main'
+[main b4de299] Ninth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk9
+Already on 'main'
+M	gar/bage
+[main 506f118] Ninth commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   a888053..b4de299  main -> main
+To ../pub.git
+   962ec87..506f118  main -> main
+ok 22 - push --dry-run does not recursively update submodules
+
+expecting success of 5531.23 'push --dry-run does not recursively update submodules': 
+	git -C work push --dry-run --recurse-submodules=only ../pub.git main &&
+
+	git -C submodule.git rev-parse main >actual_submodule &&
+	git -C pub.git rev-parse main >actual_pub &&
+	test_cmp expected_pub actual_pub &&
+	test_cmp expected_submodule actual_submodule
+
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   a888053..b4de299  main -> main
+Everything up-to-date
+ok 23 - push --dry-run does not recursively update submodules
+
+expecting success of 5531.24 'push only unpushed submodules recursively': 
+	git -C work/gar/bage rev-parse main >expected_submodule &&
+	git -C pub.git rev-parse main >expected_pub &&
+
+	git -C work push --recurse-submodules=only ../pub.git main &&
+
+	git -C submodule.git rev-parse main >actual_submodule &&
+	git -C pub.git rev-parse main >actual_pub &&
+	test_cmp expected_submodule actual_submodule &&
+	test_cmp expected_pub actual_pub
+
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   a888053..b4de299  main -> main
+Everything up-to-date
+ok 24 - push only unpushed submodules recursively
+
+expecting success of 5531.25 'push with push.recurseSubmodules=only on superproject': 
+	test_when_finished rm -rf upstream downstream &&
+	setup_subsub &&
+	new_downstream_commits &&
+	git -C downstream config push.recurseSubmodules only &&
+	git -C downstream push origin downstream-branch &&
+
+	test_must_fail git -C upstream rev-parse refs/heads/downstream-branch &&
+	git -C upstream/sub rev-parse refs/heads/downstream-branch &&
+	test_must_fail git -C upstream/sub/deepsub rev-parse refs/heads/downstream-branch
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub/.git/
+[main (root-commit) 474120f] innermost
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 innermost.t
+Adding existing repo at 'deepsub' to the index
+[main (root-commit) 368641e] middle
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 deepsub
+Adding existing repo at 'sub' to the index
+[main (root-commit) 2115e6c] outermost
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Cloning into 'downstream'...
 done.
-[master 0343f66] change
+Submodule 'sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/downstream/sub'...
+done.
+Submodule path 'sub': checked out '368641e94e5de2829cfae22976de19274d54c11a'
+Submodule 'deepsub' (/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub) registered for path 'sub/deepsub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/downstream/sub/deepsub'...
+done.
+Submodule path 'sub/deepsub': checked out '474120f894f05445b107cd92961d883bc2877e80'
+Switched to a new branch 'downstream-branch'
+Switched to a new branch 'downstream-branch'
+Switched to a new branch 'downstream-branch'
+[downstream-branch 0d0452a] new-innermost
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new-innermost.t
+[downstream-branch b40b258] new-middle
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[downstream-branch 84df116] new-outermost
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'sub'
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub
+ * [new branch]      downstream-branch -> downstream-branch
+Everything up-to-date
+fatal: ambiguous argument 'refs/heads/downstream-branch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/downstream-branch
+b40b2588b54182e5d2c2979598807b69c2e9ca4f
+fatal: ambiguous argument 'refs/heads/downstream-branch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/downstream-branch
+ok 25 - push with push.recurseSubmodules=only on superproject
+
+expecting success of 5531.26 'push with push.recurseSubmodules=only on superproject and top-level submodule': 
+	test_when_finished rm -rf upstream downstream &&
+	setup_subsub &&
+	new_downstream_commits &&
+	git -C downstream config push.recurseSubmodules only &&
+	git -C downstream/sub config push.recurseSubmodules only &&
+	git -C downstream push origin downstream-branch 2> err &&
+
+	test_must_fail git -C upstream rev-parse refs/heads/downstream-branch &&
+	git -C upstream/sub rev-parse refs/heads/downstream-branch &&
+	git -C upstream/sub/deepsub rev-parse refs/heads/downstream-branch &&
+	grep "recursing into submodule with push.recurseSubmodules=only; using on-demand instead" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub/.git/
+[main (root-commit) ff9df1c] innermost
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 innermost.t
+Adding existing repo at 'deepsub' to the index
+[main (root-commit) 1491354] middle
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 deepsub
+Adding existing repo at 'sub' to the index
+[main (root-commit) fc64eab] outermost
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Cloning into 'downstream'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/downstream/sub'...
+done.
+Submodule path 'sub': checked out '14913541b28e52bad23119683708fc45d9376bed'
+Submodule 'deepsub' (/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub) registered for path 'sub/deepsub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/downstream/sub/deepsub'...
+done.
+Submodule path 'sub/deepsub': checked out 'ff9df1cde3a7559405c3c1eeb7ea710d906115a8'
+Switched to a new branch 'downstream-branch'
+Switched to a new branch 'downstream-branch'
+Switched to a new branch 'downstream-branch'
+[downstream-branch 8f905ff] new-innermost
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new-innermost.t
+[downstream-branch 6cfd390] new-middle
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[downstream-branch bc3808e] new-outermost
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: ambiguous argument 'refs/heads/downstream-branch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/downstream-branch
+6cfd3906f0122ec7421e24d2d05931a113c1bb83
+8f905ff36854342cf7f1871351b72bfe2022e9d6
+warning: recursing into submodule with push.recurseSubmodules=only; using on-demand instead
+ok 26 - push with push.recurseSubmodules=only on superproject and top-level submodule
+
+expecting success of 5531.27 'push propagating the remotes name to a submodule': 
+	git -C work remote add origin ../pub.git &&
+	git -C work remote add pub ../pub.git &&
+
+	> work/gar/bage/junk10 &&
+	git -C work/gar/bage add junk10 &&
+	git -C work/gar/bage commit -m "Tenth junk" &&
+	git -C work add gar/bage &&
+	git -C work commit -m "Tenth junk added to gar/bage" &&
+
+	# Fails when submodule does not have a matching remote
+	test_must_fail git -C work push --recurse-submodules=on-demand pub main &&
+	# Succeeds when submodules has matching remote and refspec
+	git -C work push --recurse-submodules=on-demand origin main &&
+
+	git -C submodule.git rev-parse main >actual_submodule &&
+	git -C pub.git rev-parse main >actual_pub &&
+	git -C work/gar/bage rev-parse main >expected_submodule &&
+	git -C work rev-parse main >expected_pub &&
+	test_cmp expected_submodule actual_submodule &&
+	test_cmp expected_pub actual_pub
+
+[main 598d32e] Tenth junk
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5547-push-quarantine/xxx:yyy.git
-   f56dd63..0343f66  HEAD -> master
-ok 5 - push to repo path with path separator (colon)
+ create mode 100644 junk10
+[main f4a8571] Tenth junk added to gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: remote 'pub' not configured
+fatal: process for submodule 'gar/bage' failed
+fatal: the remote end hung up unexpectedly
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   b4de299..598d32e  main -> main
+To ../pub.git
+   962ec87..f4a8571  main -> main
+ok 27 - push propagating the remotes name to a submodule
 
-expecting success of 5547.6 'updating a ref from quarantine is forbidden': 
-	git init --bare update.git &&
-	test_hook -C update.git pre-receive <<-\EOF &&
-	read old new refname
-	git update-ref refs/heads/unrelated $new
-	exit 1
-	EOF
-	test_must_fail git push update.git HEAD &&
-	git -C update.git fsck
+expecting success of 5531.28 'push propagating refspec to a submodule': 
+	> work/gar/bage/junk11 &&
+	git -C work/gar/bage add junk11 &&
+	git -C work/gar/bage commit -m "Eleventh junk" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5547-push-quarantine/update.git/
-remote: fatal: update_ref failed for ref 'refs/heads/unrelated': ref updates forbidden inside quarantine environment        
-To update.git
- ! [remote rejected] HEAD -> master (pre-receive hook declined)
-error: failed to push some refs to 'update.git'
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-ok 6 - updating a ref from quarantine is forbidden
+	git -C work checkout branch2 &&
+	git -C work add gar/bage &&
+	git -C work commit -m "updating gar/bage in branch2" &&
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5550-http-fetch-dumb.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5550-http-fetch-dumb/.git/
-checking prerequisite: NOT_ROOT
+	# Fails when submodule does not have a matching branch
+	test_must_fail git -C work push --recurse-submodules=on-demand origin branch2 &&
+	# Fails when refspec includes an object id
+	test_must_fail git -C work push --recurse-submodules=on-demand origin \
+		"$(git -C work rev-parse branch2):refs/heads/branch2" &&
+	# Fails when refspec includes HEAD and parent and submodule do not
+	# have the same named branch checked out
+	test_must_fail git -C work push --recurse-submodules=on-demand origin \
+		HEAD:refs/heads/branch2 &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+	git -C work/gar/bage branch branch2 main &&
+	git -C work push --recurse-submodules=on-demand origin branch2 &&
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5551-http-fetch-smart.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5551-http-fetch-smart/.git/
-checking prerequisite: NOT_ROOT
+	git -C submodule.git rev-parse branch2 >actual_submodule &&
+	git -C pub.git rev-parse branch2 >actual_pub &&
+	git -C work/gar/bage rev-parse branch2 >expected_submodule &&
+	git -C work rev-parse branch2 >expected_pub &&
+	test_cmp expected_submodule actual_submodule &&
+	test_cmp expected_pub actual_pub
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+[main 0a0cd0a] Eleventh junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk11
+Switched to branch 'branch2'
+M	gar/bage
+[branch2 ec50cd3] updating gar/bage in branch2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: src refspec 'branch2' must name a ref
+fatal: process for submodule 'gar/bage' failed
+fatal: the remote end hung up unexpectedly
+fatal: src refspec 'ec50cd3dd859532aceefbd03eacca6540c93d099' must name a ref
+fatal: process for submodule 'gar/bage' failed
+fatal: the remote end hung up unexpectedly
+fatal: HEAD does not match the named branch in the superproject
+fatal: process for submodule 'gar/bage' failed
+fatal: the remote end hung up unexpectedly
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+ * [new branch]      branch2 -> branch2
+To ../pub.git
+ * [new branch]      branch2 -> branch2
+ok 28 - push propagating refspec to a submodule
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
+expecting success of 5531.29 'push propagating HEAD refspec to a submodule': 
+	git -C work/gar/bage checkout branch2 &&
+	> work/gar/bage/junk12 &&
+	git -C work/gar/bage add junk12 &&
+	git -C work/gar/bage commit -m "Twelfth junk" &&
+
+	git -C work checkout branch2 &&
+	git -C work add gar/bage &&
+	git -C work commit -m "updating gar/bage in branch2" &&
+
+	# Passes since the superproject and submodules HEAD are both on branch2
+	git -C work push --recurse-submodules=on-demand origin \
+		HEAD:refs/heads/branch2 &&
+
+	git -C submodule.git rev-parse branch2 >actual_submodule &&
+	git -C pub.git rev-parse branch2 >actual_pub &&
+	git -C work/gar/bage rev-parse branch2 >expected_submodule &&
+	git -C work rev-parse branch2 >expected_pub &&
+	test_cmp expected_submodule actual_submodule &&
+	test_cmp expected_pub actual_pub
+
+Switched to branch 'branch2'
+[branch2 073878c] Twelfth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk12
+Already on 'branch2'
+M	gar/bage
+[branch2 2a64ff7] updating gar/bage in branch2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   0a0cd0a..073878c  HEAD -> branch2
+To ../pub.git
+   ec50cd3..2a64ff7  HEAD -> branch2
+ok 29 - push propagating HEAD refspec to a submodule
+
+# passed all 29 test(s)
+1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5548-push-porcelain.sh ***
@@ -357722,949 +359908,6 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5554-noop-fetch-negotiator.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5545-push-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/.git/
-expecting success of 5545.1 'one push option works for a single branch': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git push --push-option=asdf up main
-	) &&
-	test_refs main main &&
-	echo "asdf" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   d79ce16..139b20d  main -> main
-ok 1 - one push option works for a single branch
-
-expecting success of 5545.2 'push option denied by remote': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions false &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		test_must_fail git push --push-option=asdf up main
-	) &&
-	test_refs main HEAD@{1}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-fatal: the receiving end does not support push options
-fatal: the remote end hung up unexpectedly
-ok 2 - push option denied by remote
-
-expecting success of 5545.3 'two push options work': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git push --push-option=asdf --push-option="more structured text" up main
-	) &&
-	test_refs main main &&
-	printf "asdf\nmore structured text\n" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   d79ce16..139b20d  main -> main
-ok 3 - two push options work
-
-expecting success of 5545.4 'push options and submodules': 
-	test_when_finished "rm -rf parent" &&
-	test_when_finished "rm -rf parent_upstream" &&
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	cp -r upstream parent_upstream &&
-	test_commit -C upstream one &&
-
-	test_create_repo parent &&
-	git -C parent remote add up ../parent_upstream &&
-	test_commit -C parent one &&
-	git -C parent push --mirror up &&
-
-	test_config_global protocol.file.allow always &&
-	git -C parent submodule add ../upstream workbench &&
-	git -C parent/workbench remote add up ../../upstream &&
-	git -C parent commit -m "add submodule" &&
-
-	test_commit -C parent/workbench two &&
-	git -C parent add workbench &&
-	git -C parent commit -m "update workbench" &&
-
-	git -C parent push \
-		--push-option=asdf --push-option="more structured text" \
-		--recurse-submodules=on-demand up main &&
-
-	git -C upstream rev-parse --verify main >expect &&
-	git -C parent/workbench rev-parse --verify main >actual &&
-	test_cmp expect actual &&
-
-	git -C parent_upstream rev-parse --verify main >expect &&
-	git -C parent rev-parse --verify main >actual &&
-	test_cmp expect actual &&
-
-	printf "asdf\nmore structured text\n" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options &&
-	test_cmp expect parent_upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect parent_upstream/.git/hooks/post-receive.push_options
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
-[main (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.51.0/t/trash directory.t5545-push-options/parent/.git/
-[main (root-commit) b838542] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../parent_upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/parent/workbench'...
-done.
-[main 8b5c571] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 workbench
-[main 8f1d4ef] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main 2417cbb] update workbench
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'workbench'
-remote: warning: updating the current branch        
-To ../../upstream
-   d79ce16..8f1d4ef  main -> main
-remote: warning: updating the current branch        
-To ../parent_upstream
-   b838542..2417cbb  main -> main
-ok 4 - push options and submodules
-
-expecting success of 5545.5 'default push option': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git -c push.pushOption=default push up main
-	) &&
-	test_refs main main &&
-	echo "default" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) af0b45c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 1dd7f79] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   af0b45c..1dd7f79  main -> main
-ok 5 - default push option
-
-expecting success of 5545.6 'two default push options': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git -c push.pushOption=default1 -c push.pushOption=default2 push up main
-	) &&
-	test_refs main main &&
-	printf "default1\ndefault2\n" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) af0b45c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 1dd7f79] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   af0b45c..1dd7f79  main -> main
-ok 6 - two default push options
-
-expecting success of 5545.7 'push option from command line overrides from-config push option': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git -c push.pushOption=default push --push-option=manual up main
-	) &&
-	test_refs main main &&
-	echo "manual" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) af0b45c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 1dd7f79] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   af0b45c..1dd7f79  main -> main
-ok 7 - push option from command line overrides from-config push option
-
-expecting success of 5545.8 'empty value of push.pushOption in config clears the list': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git -c push.pushOption=default1 -c push.pushOption= -c push.pushOption=default2 push up main
-	) &&
-	test_refs main main &&
-	echo "default2" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) af0b45c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 1dd7f79] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   af0b45c..1dd7f79  main -> main
-ok 8 - empty value of push.pushOption in config clears the list
-
-expecting success of 5545.9 'invalid push option in config': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		test_must_fail git -c push.pushOption push up main
-	) &&
-	test_refs main HEAD@{1}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) af0b45c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 1dd7f79] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-error: missing value for 'push.pushoption'
-fatal: unable to parse 'push.pushoption' from command-line config
-ok 9 - invalid push option in config
-
-expecting success of 5545.10 'push options keep quoted characters intact (direct)': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	test_commit -C workbench one &&
-	git -C workbench push --push-option="\"embedded quotes\"" up main &&
-	echo "\"embedded quotes\"" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) af0b45c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
-ok 10 - push options keep quoted characters intact (direct)
-
-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 10 test(s)
-# SKIP no web server found at ''
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5543-atomic-push.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/.git/
-expecting success of 5543.1 'atomic push works for a single branch': 
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git push --atomic up main
-	) &&
-	test_refs main main
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   d79ce16..139b20d  main -> main
-ok 1 - atomic push works for a single branch
-
-expecting success of 5543.2 'atomic push works for two branches': 
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git branch second &&
-		git push --mirror up &&
-		test_commit two &&
-		git checkout second &&
-		test_commit three &&
-		git push --atomic up main second
-	) &&
-	test_refs main main &&
-	test_refs second second
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new branch]      second -> second
- * [new tag]         one -> one
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Switched to branch 'second'
-[second 897c206] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-remote: warning: updating the current branch        
-To ../upstream
-   d79ce16..139b20d  main -> main
-   d79ce16..897c206  second -> second
-ok 2 - atomic push works for two branches
-
-expecting success of 5543.3 'atomic push works in combination with --mirror': 
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git checkout -b second &&
-		test_commit two &&
-		git push --atomic --mirror up
-	) &&
-	test_refs main main &&
-	test_refs second second
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Switched to a new branch 'second'
-[second 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new branch]      second -> second
- * [new tag]         one -> one
- * [new tag]         two -> two
-ok 3 - atomic push works in combination with --mirror
-
-expecting success of 5543.4 'atomic push works in combination with --force': 
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git branch second main &&
-		test_commit two_a &&
-		git checkout second &&
-		test_commit two_b &&
-		test_commit three_b &&
-		test_commit four &&
-		git push --mirror up &&
-		# The actual test is below
-		git checkout main &&
-		test_commit three_a &&
-		git checkout second &&
-		git reset --hard HEAD^ &&
-		git push --force --atomic up main second
-	) &&
-	test_refs main main &&
-	test_refs second second
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 0fd3f08] two_a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two_a.t
-Switched to branch 'second'
-[second 476acd6] two_b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two_b.t
-[second 04c72ee] three_b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three_b.t
-[second f7b7ae4] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new branch]      second -> second
- * [new tag]         four -> four
- * [new tag]         one -> one
- * [new tag]         three_b -> three_b
- * [new tag]         two_a -> two_a
- * [new tag]         two_b -> two_b
-Switched to branch 'main'
-[main 6413866] three_a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three_a.t
-Switched to branch 'second'
-HEAD is now at 04c72ee three_b
-remote: warning: updating the current branch        
-To ../upstream
-   0fd3f08..6413866  main -> main
- + f7b7ae4...04c72ee second -> second (forced update)
-ok 4 - atomic push works in combination with --force
-
-expecting success of 5543.5 'atomic push fails if one branch fails': 
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git checkout -b second main &&
-		test_commit two &&
-		test_commit three &&
-		test_commit four &&
-		git push --mirror up &&
-		git reset --hard HEAD~2 &&
-		test_commit five &&
-		git checkout main &&
-		test_commit six &&
-		test_must_fail git push --atomic --all up >output-all 2>&1 &&
-		# --all and --branches have the same behavior when be combined with --atomic
-		test_must_fail git push --atomic --branches up >output-branches 2>&1 &&
-		test_cmp output-all output-branches
-	) &&
-	test_refs main HEAD@{7} &&
-	test_refs second HEAD@{4}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Switched to a new branch 'second'
-[second 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[second 7c7cd71] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[second fd8d77e] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new branch]      second -> second
- * [new tag]         four -> four
- * [new tag]         one -> one
- * [new tag]         three -> three
- * [new tag]         two -> two
-HEAD is now at 139b20d two
-[second a9f66f4] five
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-Switched to branch 'main'
-[main 29c9ea2] six
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 six.t
-ok 5 - atomic push fails if one branch fails
-
-expecting success of 5543.6 'atomic push fails if one tag fails remotely': 
-	# prepare the repo
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git checkout -b second main &&
-		test_commit two &&
-		git push --mirror up
-	) &&
-	# a third party modifies the server side:
-	(
-		cd upstream &&
-		git checkout second &&
-		git tag test_tag second
-	) &&
-	# see if we can now push both branches.
-	(
-		cd workbench &&
-		git checkout main &&
-		test_commit three &&
-		git checkout second &&
-		test_commit four &&
-		git tag test_tag &&
-		test_must_fail git push --tags --atomic up main second
-	) &&
-	test_refs main HEAD@{3} &&
-	test_refs second HEAD@{1}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Switched to a new branch 'second'
-[second 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new branch]      second -> second
- * [new tag]         one -> one
- * [new tag]         two -> two
-Switched to branch 'second'
-Switched to branch 'main'
-[main 846d065] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Switched to branch 'second'
-[second b6d6c1f] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-error: atomic push failed for ref refs/tags/test_tag. status: 3
-To ../upstream
- ! [rejected]        main -> main (atomic push failed)
- ! [rejected]        second -> second (atomic push failed)
- ! [rejected]        test_tag -> test_tag (already exists)
- ! [rejected]        four -> four (atomic push failed)
- ! [rejected]        three -> three (atomic push failed)
-error: failed to push some refs to '../upstream'
-hint: Updates were rejected because the tag already exists in the remote.
-ok 6 - atomic push fails if one tag fails remotely
-
-expecting success of 5543.7 'atomic push obeys update hook preventing a branch to be pushed': 
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git checkout -b second main &&
-		test_commit two &&
-		git push --mirror up
-	) &&
-	test_hook -C upstream update <<-\EOF &&
-	# only allow update to main from now on
-	test "$1" = "refs/heads/main"
-	EOF
-	(
-		cd workbench &&
-		git checkout main &&
-		test_commit three &&
-		git checkout second &&
-		test_commit four &&
-		test_must_fail git push --atomic up main second
-	) &&
-	test_refs main HEAD@{3} &&
-	test_refs second HEAD@{1}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Switched to a new branch 'second'
-[second 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new branch]      second -> second
- * [new tag]         one -> one
- * [new tag]         two -> two
-Switched to branch 'main'
-[main 846d065] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Switched to branch 'second'
-[second b6d6c1f] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-remote: warning: updating the current branch        
-remote: error: hook declined to update refs/heads/second        
-To ../upstream
- ! [remote rejected] main -> main (atomic push failure)
- ! [remote rejected] second -> second (hook declined)
-error: failed to push some refs to '../upstream'
-ok 7 - atomic push obeys update hook preventing a branch to be pushed
-
-expecting success of 5543.8 'atomic push is not advertised if configured': 
-	mk_repo_pair &&
-	(
-		cd upstream &&
-		git config receive.advertiseatomic 0
-	) &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		test_must_fail git push --atomic up main
-	) &&
-	test_refs main HEAD@{1}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-fatal: the receiving end does not support --atomic push
-fatal: the remote end hung up unexpectedly
-ok 8 - atomic push is not advertised if configured
-
-expecting success of 5543.9 'atomic push reports (reject by update hook)': 
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git branch foo &&
-		git push up main one foo &&
-		git tag -d one
-	) &&
-	(
-		mkdir -p upstream/.git/hooks &&
-		cat >upstream/.git/hooks/update <<-EOF &&
-		#!/bin/sh
-
-		if test "\$1" = "refs/heads/bar"
-		then
-			echo >&2 "Pusing to branch bar is prohibited"
-			exit 1
-		fi
-		EOF
-		chmod a+x upstream/.git/hooks/update
-	) &&
-	(
-		cd workbench &&
-		test_commit two &&
-		git branch bar
-	) &&
-	test_must_fail git -C workbench \
-		push --atomic up main two bar >out 2>&1 &&
-	fmt_status_report <out >actual &&
-	cat >expect <<-EOF &&
-	To ../upstream
-	 ! [remote rejected] main -> main (atomic push failure)
-	 ! [remote rejected] two -> two (atomic push failure)
-	 ! [remote rejected] bar -> bar (hook declined)
-	EOF
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
- * [new branch]      foo -> foo
-Deleted tag 'one' (was d79ce16)
-[main 51ba0d2] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 9 - atomic push reports (reject by update hook)
-
-expecting success of 5543.10 'atomic push reports (mirror, but reject by update hook)': 
-	(
-		cd workbench &&
-		git remote remove up &&
-		git remote add up ../upstream
-	) &&
-	test_must_fail git -C workbench \
-		push --atomic --mirror up >out 2>&1 &&
-	fmt_status_report <out >actual &&
-	cat >expect <<-EOF &&
-	To ../upstream
-	 ! [remote rejected] main -> main (atomic push failure)
-	 ! [remote rejected] one (atomic push failure)
-	 ! [remote rejected] bar -> bar (hook declined)
-	 ! [remote rejected] two -> two (atomic push failure)
-	EOF
-	test_cmp expect actual
-
-ok 10 - atomic push reports (mirror, but reject by update hook)
-
-expecting success of 5543.11 'atomic push reports (reject by non-ff)': 
-	rm upstream/.git/hooks/update &&
-	(
-		cd workbench &&
-		git push up main &&
-		git reset --hard HEAD^
-	) &&
-	test_must_fail git -C workbench \
-		push --atomic up main foo bar >out 2>&1 &&
-	fmt_status_report <out >actual &&
-	cat >expect <<-EOF &&
-	To ../upstream
-	 ! [rejected] main -> main (non-fast-forward)
-	 ! [rejected] bar -> bar (atomic push failed)
-	EOF
-	test_cmp expect actual
-
-remote: warning: updating the current branch        
-To ../upstream
-   d79ce16..51ba0d2  main -> main
-HEAD is now at d79ce16 one
-ok 11 - atomic push reports (reject by non-ff)
-
-expecting success of 5543.12 'atomic push reports exit code failure': 
-	write_script receive-pack-wrapper <<-\EOF &&
-	git-receive-pack "$@"
-	exit 1
-	EOF
-	test_must_fail git -C workbench push --atomic \
-		--receive-pack="${SQ}$(pwd)${SQ}/receive-pack-wrapper" \
-		up HEAD:refs/heads/no-conflict 2>err &&
-	cat >expect <<-EOF &&
-	To ../upstream
-	 * [new branch]      HEAD -> no-conflict
-	error: failed to push some refs to ${SQ}../upstream${SQ}
-	EOF
-	test_cmp expect err
-
-ok 12 - atomic push reports exit code failure
-
-expecting success of 5543.13 'atomic push reports exit code failure with porcelain': 
-	write_script receive-pack-wrapper <<-\EOF &&
-	git-receive-pack "$@"
-	exit 1
-	EOF
-	test_must_fail git -C workbench push --atomic --porcelain \
-		--receive-pack="${SQ}$(pwd)${SQ}/receive-pack-wrapper" \
-		up HEAD:refs/heads/no-conflict-porcelain 2>err &&
-	cat >expect <<-EOF &&
-	error: failed to push some refs to ${SQ}../upstream${SQ}
-	EOF
-	test_cmp expect err
-
-To ../upstream
-*	HEAD:refs/heads/no-conflict-porcelain	[new branch]
-ok 13 - atomic push reports exit code failure with porcelain
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5520-pull.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5520-pull/.git/
 expecting success of 5520.1 'setup': 
@@ -360184,22 +361427,995 @@
 Could not apply dc87852... # Modified Change 4
 ok 79 - git pull --rebase does not reapply old patches
 
-expecting success of 5520.80 'git pull --rebase against local branch': 
-	git checkout -b copy2 to-rebase-orig &&
-	git pull --rebase . to-rebase &&
-	echo "conflicting modification" >expect &&
-	test_cmp expect file &&
-	echo file >expect &&
-	test_cmp expect file2
+expecting success of 5520.80 'git pull --rebase against local branch': 
+	git checkout -b copy2 to-rebase-orig &&
+	git pull --rebase . to-rebase &&
+	echo "conflicting modification" >expect &&
+	test_cmp expect file &&
+	echo file >expect &&
+	test_cmp expect file2
+
+Switched to a new branch 'copy2'
+From .
+ * branch            to-rebase  -> FETCH_HEAD
+Successfully rebased and updated refs/heads/copy2.
+ok 80 - git pull --rebase against local branch
+
+# passed all 80 test(s)
+1..80
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5545-push-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/.git/
+expecting success of 5545.1 'one push option works for a single branch': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git push --push-option=asdf up main
+	) &&
+	test_refs main main &&
+	echo "asdf" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   d79ce16..139b20d  main -> main
+ok 1 - one push option works for a single branch
+
+expecting success of 5545.2 'push option denied by remote': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions false &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		test_must_fail git push --push-option=asdf up main
+	) &&
+	test_refs main HEAD@{1}
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+fatal: the receiving end does not support push options
+fatal: the remote end hung up unexpectedly
+ok 2 - push option denied by remote
+
+expecting success of 5545.3 'two push options work': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git push --push-option=asdf --push-option="more structured text" up main
+	) &&
+	test_refs main main &&
+	printf "asdf\nmore structured text\n" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   d79ce16..139b20d  main -> main
+ok 3 - two push options work
+
+expecting success of 5545.4 'push options and submodules': 
+	test_when_finished "rm -rf parent" &&
+	test_when_finished "rm -rf parent_upstream" &&
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	cp -r upstream parent_upstream &&
+	test_commit -C upstream one &&
+
+	test_create_repo parent &&
+	git -C parent remote add up ../parent_upstream &&
+	test_commit -C parent one &&
+	git -C parent push --mirror up &&
+
+	test_config_global protocol.file.allow always &&
+	git -C parent submodule add ../upstream workbench &&
+	git -C parent/workbench remote add up ../../upstream &&
+	git -C parent commit -m "add submodule" &&
+
+	test_commit -C parent/workbench two &&
+	git -C parent add workbench &&
+	git -C parent commit -m "update workbench" &&
+
+	git -C parent push \
+		--push-option=asdf --push-option="more structured text" \
+		--recurse-submodules=on-demand up main &&
+
+	git -C upstream rev-parse --verify main >expect &&
+	git -C parent/workbench rev-parse --verify main >actual &&
+	test_cmp expect actual &&
+
+	git -C parent_upstream rev-parse --verify main >expect &&
+	git -C parent rev-parse --verify main >actual &&
+	test_cmp expect actual &&
+
+	printf "asdf\nmore structured text\n" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options &&
+	test_cmp expect parent_upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect parent_upstream/.git/hooks/post-receive.push_options
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
+[main (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.51.0/t/trash directory.t5545-push-options/parent/.git/
+[main (root-commit) b838542] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../parent_upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/parent/workbench'...
+done.
+[main 8b5c571] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 workbench
+[main 8f1d4ef] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[main 2417cbb] update workbench
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'workbench'
+remote: warning: updating the current branch        
+To ../../upstream
+   d79ce16..8f1d4ef  main -> main
+remote: warning: updating the current branch        
+To ../parent_upstream
+   b838542..2417cbb  main -> main
+ok 4 - push options and submodules
+
+expecting success of 5545.5 'default push option': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git -c push.pushOption=default push up main
+	) &&
+	test_refs main main &&
+	echo "default" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 1dd7f79] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   af0b45c..1dd7f79  main -> main
+ok 5 - default push option
+
+expecting success of 5545.6 'two default push options': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git -c push.pushOption=default1 -c push.pushOption=default2 push up main
+	) &&
+	test_refs main main &&
+	printf "default1\ndefault2\n" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 1dd7f79] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   af0b45c..1dd7f79  main -> main
+ok 6 - two default push options
+
+expecting success of 5545.7 'push option from command line overrides from-config push option': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git -c push.pushOption=default push --push-option=manual up main
+	) &&
+	test_refs main main &&
+	echo "manual" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 1dd7f79] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   af0b45c..1dd7f79  main -> main
+ok 7 - push option from command line overrides from-config push option
+
+expecting success of 5545.8 'empty value of push.pushOption in config clears the list': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git -c push.pushOption=default1 -c push.pushOption= -c push.pushOption=default2 push up main
+	) &&
+	test_refs main main &&
+	echo "default2" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 1dd7f79] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   af0b45c..1dd7f79  main -> main
+ok 8 - empty value of push.pushOption in config clears the list
+
+expecting success of 5545.9 'invalid push option in config': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		test_must_fail git -c push.pushOption push up main
+	) &&
+	test_refs main HEAD@{1}
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 1dd7f79] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+error: missing value for 'push.pushoption'
+fatal: unable to parse 'push.pushoption' from command-line config
+ok 9 - invalid push option in config
+
+expecting success of 5545.10 'push options keep quoted characters intact (direct)': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	test_commit -C workbench one &&
+	git -C workbench push --push-option="\"embedded quotes\"" up main &&
+	echo "\"embedded quotes\"" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ok 10 - push options keep quoted characters intact (direct)
+
+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 10 test(s)
+# SKIP no web server found at ''
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5554-noop-fetch-negotiator.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5557-http-get.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5543-atomic-push.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/.git/
+expecting success of 5543.1 'atomic push works for a single branch': 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git push --atomic up main
+	) &&
+	test_refs main main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   d79ce16..139b20d  main -> main
+ok 1 - atomic push works for a single branch
+
+expecting success of 5543.2 'atomic push works for two branches': 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git branch second &&
+		git push --mirror up &&
+		test_commit two &&
+		git checkout second &&
+		test_commit three &&
+		git push --atomic up main second
+	) &&
+	test_refs main main &&
+	test_refs second second
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new branch]      second -> second
+ * [new tag]         one -> one
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Switched to branch 'second'
+[second 897c206] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+remote: warning: updating the current branch        
+To ../upstream
+   d79ce16..139b20d  main -> main
+   d79ce16..897c206  second -> second
+ok 2 - atomic push works for two branches
+
+expecting success of 5543.3 'atomic push works in combination with --mirror': 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git checkout -b second &&
+		test_commit two &&
+		git push --atomic --mirror up
+	) &&
+	test_refs main main &&
+	test_refs second second
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Switched to a new branch 'second'
+[second 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new branch]      second -> second
+ * [new tag]         one -> one
+ * [new tag]         two -> two
+ok 3 - atomic push works in combination with --mirror
+
+expecting success of 5543.4 'atomic push works in combination with --force': 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git branch second main &&
+		test_commit two_a &&
+		git checkout second &&
+		test_commit two_b &&
+		test_commit three_b &&
+		test_commit four &&
+		git push --mirror up &&
+		# The actual test is below
+		git checkout main &&
+		test_commit three_a &&
+		git checkout second &&
+		git reset --hard HEAD^ &&
+		git push --force --atomic up main second
+	) &&
+	test_refs main main &&
+	test_refs second second
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 0fd3f08] two_a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two_a.t
+Switched to branch 'second'
+[second 476acd6] two_b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two_b.t
+[second 04c72ee] three_b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three_b.t
+[second f7b7ae4] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new branch]      second -> second
+ * [new tag]         four -> four
+ * [new tag]         one -> one
+ * [new tag]         three_b -> three_b
+ * [new tag]         two_a -> two_a
+ * [new tag]         two_b -> two_b
+Switched to branch 'main'
+[main 6413866] three_a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three_a.t
+Switched to branch 'second'
+HEAD is now at 04c72ee three_b
+remote: warning: updating the current branch        
+To ../upstream
+   0fd3f08..6413866  main -> main
+ + f7b7ae4...04c72ee second -> second (forced update)
+ok 4 - atomic push works in combination with --force
+
+expecting success of 5543.5 'atomic push fails if one branch fails': 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git checkout -b second main &&
+		test_commit two &&
+		test_commit three &&
+		test_commit four &&
+		git push --mirror up &&
+		git reset --hard HEAD~2 &&
+		test_commit five &&
+		git checkout main &&
+		test_commit six &&
+		test_must_fail git push --atomic --all up >output-all 2>&1 &&
+		# --all and --branches have the same behavior when be combined with --atomic
+		test_must_fail git push --atomic --branches up >output-branches 2>&1 &&
+		test_cmp output-all output-branches
+	) &&
+	test_refs main HEAD@{7} &&
+	test_refs second HEAD@{4}
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Switched to a new branch 'second'
+[second 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[second 7c7cd71] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[second fd8d77e] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new branch]      second -> second
+ * [new tag]         four -> four
+ * [new tag]         one -> one
+ * [new tag]         three -> three
+ * [new tag]         two -> two
+HEAD is now at 139b20d two
+[second a9f66f4] five
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+Switched to branch 'main'
+[main 29c9ea2] six
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 six.t
+ok 5 - atomic push fails if one branch fails
+
+expecting success of 5543.6 'atomic push fails if one tag fails remotely': 
+	# prepare the repo
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git checkout -b second main &&
+		test_commit two &&
+		git push --mirror up
+	) &&
+	# a third party modifies the server side:
+	(
+		cd upstream &&
+		git checkout second &&
+		git tag test_tag second
+	) &&
+	# see if we can now push both branches.
+	(
+		cd workbench &&
+		git checkout main &&
+		test_commit three &&
+		git checkout second &&
+		test_commit four &&
+		git tag test_tag &&
+		test_must_fail git push --tags --atomic up main second
+	) &&
+	test_refs main HEAD@{3} &&
+	test_refs second HEAD@{1}
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Switched to a new branch 'second'
+[second 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new branch]      second -> second
+ * [new tag]         one -> one
+ * [new tag]         two -> two
+Switched to branch 'second'
+Switched to branch 'main'
+[main 846d065] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+Switched to branch 'second'
+[second b6d6c1f] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+error: atomic push failed for ref refs/tags/test_tag. status: 3
+To ../upstream
+ ! [rejected]        main -> main (atomic push failed)
+ ! [rejected]        second -> second (atomic push failed)
+ ! [rejected]        test_tag -> test_tag (already exists)
+ ! [rejected]        four -> four (atomic push failed)
+ ! [rejected]        three -> three (atomic push failed)
+error: failed to push some refs to '../upstream'
+hint: Updates were rejected because the tag already exists in the remote.
+ok 6 - atomic push fails if one tag fails remotely
+
+expecting success of 5543.7 'atomic push obeys update hook preventing a branch to be pushed': 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git checkout -b second main &&
+		test_commit two &&
+		git push --mirror up
+	) &&
+	test_hook -C upstream update <<-\EOF &&
+	# only allow update to main from now on
+	test "$1" = "refs/heads/main"
+	EOF
+	(
+		cd workbench &&
+		git checkout main &&
+		test_commit three &&
+		git checkout second &&
+		test_commit four &&
+		test_must_fail git push --atomic up main second
+	) &&
+	test_refs main HEAD@{3} &&
+	test_refs second HEAD@{1}
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Switched to a new branch 'second'
+[second 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new branch]      second -> second
+ * [new tag]         one -> one
+ * [new tag]         two -> two
+Switched to branch 'main'
+[main 846d065] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+Switched to branch 'second'
+[second b6d6c1f] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+remote: warning: updating the current branch        
+remote: error: hook declined to update refs/heads/second        
+To ../upstream
+ ! [remote rejected] main -> main (atomic push failure)
+ ! [remote rejected] second -> second (hook declined)
+error: failed to push some refs to '../upstream'
+ok 7 - atomic push obeys update hook preventing a branch to be pushed
+
+expecting success of 5543.8 'atomic push is not advertised if configured': 
+	mk_repo_pair &&
+	(
+		cd upstream &&
+		git config receive.advertiseatomic 0
+	) &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		test_must_fail git push --atomic up main
+	) &&
+	test_refs main HEAD@{1}
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+fatal: the receiving end does not support --atomic push
+fatal: the remote end hung up unexpectedly
+ok 8 - atomic push is not advertised if configured
+
+expecting success of 5543.9 'atomic push reports (reject by update hook)': 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git branch foo &&
+		git push up main one foo &&
+		git tag -d one
+	) &&
+	(
+		mkdir -p upstream/.git/hooks &&
+		cat >upstream/.git/hooks/update <<-EOF &&
+		#!/bin/sh
+
+		if test "\$1" = "refs/heads/bar"
+		then
+			echo >&2 "Pusing to branch bar is prohibited"
+			exit 1
+		fi
+		EOF
+		chmod a+x upstream/.git/hooks/update
+	) &&
+	(
+		cd workbench &&
+		test_commit two &&
+		git branch bar
+	) &&
+	test_must_fail git -C workbench \
+		push --atomic up main two bar >out 2>&1 &&
+	fmt_status_report <out >actual &&
+	cat >expect <<-EOF &&
+	To ../upstream
+	 ! [remote rejected] main -> main (atomic push failure)
+	 ! [remote rejected] two -> two (atomic push failure)
+	 ! [remote rejected] bar -> bar (hook declined)
+	EOF
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+ * [new branch]      foo -> foo
+Deleted tag 'one' (was d79ce16)
+[main 51ba0d2] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 9 - atomic push reports (reject by update hook)
+
+expecting success of 5543.10 'atomic push reports (mirror, but reject by update hook)': 
+	(
+		cd workbench &&
+		git remote remove up &&
+		git remote add up ../upstream
+	) &&
+	test_must_fail git -C workbench \
+		push --atomic --mirror up >out 2>&1 &&
+	fmt_status_report <out >actual &&
+	cat >expect <<-EOF &&
+	To ../upstream
+	 ! [remote rejected] main -> main (atomic push failure)
+	 ! [remote rejected] one (atomic push failure)
+	 ! [remote rejected] bar -> bar (hook declined)
+	 ! [remote rejected] two -> two (atomic push failure)
+	EOF
+	test_cmp expect actual
+
+ok 10 - atomic push reports (mirror, but reject by update hook)
+
+expecting success of 5543.11 'atomic push reports (reject by non-ff)': 
+	rm upstream/.git/hooks/update &&
+	(
+		cd workbench &&
+		git push up main &&
+		git reset --hard HEAD^
+	) &&
+	test_must_fail git -C workbench \
+		push --atomic up main foo bar >out 2>&1 &&
+	fmt_status_report <out >actual &&
+	cat >expect <<-EOF &&
+	To ../upstream
+	 ! [rejected] main -> main (non-fast-forward)
+	 ! [rejected] bar -> bar (atomic push failed)
+	EOF
+	test_cmp expect actual
+
+remote: warning: updating the current branch        
+To ../upstream
+   d79ce16..51ba0d2  main -> main
+HEAD is now at d79ce16 one
+ok 11 - atomic push reports (reject by non-ff)
+
+expecting success of 5543.12 'atomic push reports exit code failure': 
+	write_script receive-pack-wrapper <<-\EOF &&
+	git-receive-pack "$@"
+	exit 1
+	EOF
+	test_must_fail git -C workbench push --atomic \
+		--receive-pack="${SQ}$(pwd)${SQ}/receive-pack-wrapper" \
+		up HEAD:refs/heads/no-conflict 2>err &&
+	cat >expect <<-EOF &&
+	To ../upstream
+	 * [new branch]      HEAD -> no-conflict
+	error: failed to push some refs to ${SQ}../upstream${SQ}
+	EOF
+	test_cmp expect err
+
+ok 12 - atomic push reports exit code failure
+
+expecting success of 5543.13 'atomic push reports exit code failure with porcelain': 
+	write_script receive-pack-wrapper <<-\EOF &&
+	git-receive-pack "$@"
+	exit 1
+	EOF
+	test_must_fail git -C workbench push --atomic --porcelain \
+		--receive-pack="${SQ}$(pwd)${SQ}/receive-pack-wrapper" \
+		up HEAD:refs/heads/no-conflict-porcelain 2>err &&
+	cat >expect <<-EOF &&
+	error: failed to push some refs to ${SQ}../upstream${SQ}
+	EOF
+	test_cmp expect err
+
+To ../upstream
+*	HEAD:refs/heads/no-conflict-porcelain	[new branch]
+ok 13 - atomic push reports exit code failure with porcelain
 
-Switched to a new branch 'copy2'
-From .
- * branch            to-rebase  -> FETCH_HEAD
-Successfully rebased and updated refs/heads/copy2.
-ok 80 - git pull --rebase against local branch
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5559-http-fetch-smart-http2.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5559-http-fetch-smart-http2/.git/
+checking prerequisite: NOT_ROOT
 
-# passed all 80 test(s)
-1..80
+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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5555-http-smart-common.sh ***
@@ -360375,8 +362591,8 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5557-http-get.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5557-http-get/.git/
+*** t5561-http-backend.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5561-http-backend/.git/
 checking prerequisite: NOT_ROOT
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
@@ -360390,640 +362606,993 @@
 1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5531-deep-submodule-push.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/.git/
-expecting success of 5531.1 'setup': 
-	mkdir pub.git &&
-	GIT_DIR=pub.git git init --bare &&
-	GIT_DIR=pub.git git config receive.fsckobjects true &&
-	mkdir work &&
-	(
-		cd work &&
-		git init &&
-		git config push.default matching &&
-		mkdir -p gar/bage &&
-		(
-			cd gar/bage &&
-			git init &&
-			git config push.default matching &&
-			>junk &&
-			git add junk &&
-			git commit -m "Initial junk"
-		) &&
-		git add gar/bage &&
-		git commit -m "Initial superproject"
-	)
+*** t5563-simple-http-auth.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5563-simple-http-auth/.git/
+checking prerequisite: NOT_ROOT
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/pub.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/work/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/work/gar/bage/.git/
-[main (root-commit) 6fbe593] Initial junk
+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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5564-http-proxy.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5564-http-proxy/.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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5562-http-backend-content-length.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5562-http-backend-content-length/.git/
+expecting success of 5562.1 'setup': 
+	HTTP_CONTENT_ENCODING="identity" &&
+	export HTTP_CONTENT_ENCODING &&
+	git config http.receivepack true &&
+	test_commit c0 &&
+	test_commit c1 &&
+	hash_head=$(git rev-parse HEAD) &&
+	hash_prev=$(git rev-parse HEAD~1) &&
+	{
+		packetize "want $hash_head" &&
+		printf 0000 &&
+		packetize "have $hash_prev" &&
+		packetize "done"
+	} >fetch_body &&
+	test_copy_bytes 10 <fetch_body >fetch_body.trunc &&
+	hash_next=$(git commit-tree -p HEAD -m next HEAD^{tree}) &&
+	{
+		printf "%s %s refs/heads/newbranch\\0report-status object-format=%s\\n" \
+			"$ZERO_OID" "$hash_next" "$(test_oid algo)" | packetize_raw &&
+		printf 0000 &&
+		echo "$hash_next" | git pack-objects --stdout
+	} >push_body &&
+	test_copy_bytes 10 <push_body >push_body.trunc &&
+	: >empty_body
+
+[master (root-commit) a44f171] c0
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk
-warning: adding embedded git repository: gar/bage
-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> gar/bage
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached gar/bage
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[main (root-commit) 38ca8a3] Initial superproject
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.t
+[master 989de5e] c1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 160000 gar/bage
+ create mode 100644 c1.t
 ok 1 - setup
 
-expecting success of 5531.2 'push works with recorded gitlink': 
-	(
-		cd work &&
-		git push ../pub.git main
-	)
+checking prerequisite: GZIP
 
-To ../pub.git
- * [new branch]      main -> main
-ok 2 - push works with recorded gitlink
+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.
 
-expecting success of 5531.3 'push if submodule has no remote': 
-	(
-		cd work/gar/bage &&
-		>junk2 &&
-		git add junk2 &&
-		git commit -m "Second junk"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Second commit for gar/bage" &&
-		git push --recurse-submodules=check ../pub.git main
-	)
+Written by Jean-loup Gailly.
+prerequisite GZIP ok
+expecting success of 5562.2 'setup, compression related': 
+	gzip -c fetch_body >fetch_body.gz &&
+	test_copy_bytes 10 <fetch_body.gz >fetch_body.gz.trunc &&
+	gzip -c push_body >push_body.gz &&
+	test_copy_bytes 10 <push_body.gz >push_body.gz.trunc
 
-[main def33d6] Second junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk2
-[main 61d752a] Second commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   38ca8a3..61d752a  main -> main
-ok 3 - push if submodule has no remote
+ok 2 - setup, compression related
 
-expecting success of 5531.4 'push fails if submodule commit not on remote': 
-	(
-		cd work/gar &&
-		git clone --bare bage ../../submodule.git &&
-		cd bage &&
-		git remote add origin ../../../submodule.git &&
-		git fetch &&
-		>junk3 &&
-		git add junk3 &&
-		git commit -m "Third junk"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Third commit for gar/bage" &&
-		# the push should fail with --recurse-submodules=check
-		# on the command line...
-		test_must_fail git push --recurse-submodules=check ../pub.git main &&
+expecting success of 5562.3 'fetch plain': 
+	test_http_env upload fetch_body &&
+	verify_http_result "200 OK"
 
-		# ...or if specified in the configuration..
-		test_must_fail git -c push.recurseSubmodules=check push ../pub.git main
-	)
+ok 3 - fetch plain
 
-Cloning into bare repository '../../submodule.git'...
-done.
-From ../../../submodule
- * [new branch]      main       -> origin/main
-[main 18a8afc] Third junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk3
-[main 7484e0a] Third commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
+expecting success of 5562.4 'fetch plain truncated': 
+	test_http_env upload fetch_body.trunc &&
+	! verify_http_result "200 OK"
 
-Please try
+fatal: the remote end hung up unexpectedly
+ok 4 - fetch plain truncated
 
-	git push --recurse-submodules=on-demand
+expecting success of 5562.5 'fetch plain empty': 
+	test_http_env upload empty_body &&
+	! verify_http_result "200 OK"
 
-or cd to the path and use
+fatal: the remote end hung up unexpectedly
+ok 5 - fetch plain empty
 
-	git push
+expecting success of 5562.6 'fetch gzipped': 
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload fetch_body.gz &&
+	verify_http_result "200 OK"
 
-to push them to a remote.
+ok 6 - fetch gzipped
 
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
+expecting success of 5562.7 'fetch gzipped truncated': 
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload fetch_body.gz.trunc &&
+	! verify_http_result "200 OK"
 
-Please try
+fatal: request ended in the middle of the gzip stream
+ok 7 - fetch gzipped truncated
 
-	git push --recurse-submodules=on-demand
+expecting success of 5562.8 'fetch gzipped empty': 
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload empty_body &&
+	! verify_http_result "200 OK"
 
-or cd to the path and use
+fatal: request ended in the middle of the gzip stream
+ok 8 - fetch gzipped empty
 
-	git push
+expecting success of 5562.9 'push plain': 
+	test_when_finished "git branch -D newbranch" &&
+	test_http_env receive push_body &&
+	verify_http_result "200 OK" &&
+	git rev-parse newbranch >act.head &&
+	echo "$hash_next" >exp.head &&
+	test_cmp act.head exp.head
 
-to push them to a remote.
+Deleted branch newbranch (was d8aa3fa).
+ok 9 - push plain
 
-fatal: Aborting.
-ok 4 - push fails if submodule commit not on remote
+expecting success of 5562.10 'push plain truncated': 
+	test_http_env receive push_body.trunc &&
+	! verify_http_result "200 OK"
 
 fatal: the remote end hung up unexpectedly
-expecting success of 5531.5 'push succeeds after commit was pushed to remote': 
-	(
-		cd work/gar/bage &&
-		git push origin main
-	) &&
-	(
-		cd work &&
-		git push --recurse-submodules=check ../pub.git main
-	)
+ok 10 - push plain truncated
 
-To ../../../submodule.git
-   def33d6..18a8afc  main -> main
-To ../pub.git
-   61d752a..7484e0a  main -> main
-ok 5 - push succeeds after commit was pushed to remote
+expecting success of 5562.11 'push plain empty': 
+	test_http_env receive empty_body &&
+	! verify_http_result "200 OK"
 
-expecting success of 5531.6 'push succeeds if submodule commit not on remote but using on-demand on command line': 
-	(
-		cd work/gar/bage &&
-		>recurse-on-demand-on-command-line &&
-		git add recurse-on-demand-on-command-line &&
-		git commit -m "Recurse on-demand on command line junk"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse on-demand on command line for gar/bage" &&
-		git push --recurse-submodules=on-demand ../pub.git main &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# Check that the submodule commit got there too
-		cd gar/bage &&
-		git diff --quiet origin/main main
-	)
+fatal: the remote end hung up unexpectedly
+ok 11 - push plain empty
 
-[main 04ec359] Recurse on-demand on command line junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-on-demand-on-command-line
-[main 034803e] Recurse on-demand on command line for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   18a8afc..04ec359  main -> main
-To ../pub.git
-   7484e0a..034803e  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 6 - push succeeds if submodule commit not on remote but using on-demand on command line
+expecting success of 5562.12 'push gzipped': 
+	test_when_finished "git branch -D newbranch" &&
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env receive push_body.gz &&
+	verify_http_result "200 OK" &&
+	git rev-parse newbranch >act.head &&
+	echo "$hash_next" >exp.head &&
+	test_cmp act.head exp.head
 
-expecting success of 5531.7 'push succeeds if submodule commit not on remote but using on-demand from config': 
-	(
-		cd work/gar/bage &&
-		>recurse-on-demand-from-config &&
-		git add recurse-on-demand-from-config &&
-		git commit -m "Recurse on-demand from config junk"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse on-demand from config for gar/bage" &&
-		git -c push.recurseSubmodules=on-demand push ../pub.git main &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# Check that the submodule commit got there too
-		cd gar/bage &&
-		git diff --quiet origin/main main
-	)
+Deleted branch newbranch (was d8aa3fa).
+ok 12 - push gzipped
 
-[main cc28292] Recurse on-demand from config junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-on-demand-from-config
-[main 85a50af] Recurse on-demand from config for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   04ec359..cc28292  main -> main
-To ../pub.git
-   034803e..85a50af  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 7 - push succeeds if submodule commit not on remote but using on-demand from config
+expecting success of 5562.13 'push gzipped truncated': 
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env receive push_body.gz.trunc &&
+	! verify_http_result "200 OK"
 
-expecting success of 5531.8 'push succeeds if submodule commit not on remote but using auto-on-demand via submodule.recurse config': 
-	(
-		cd work/gar/bage &&
-		>recurse-on-demand-from-submodule-recurse-config &&
-		git add recurse-on-demand-from-submodule-recurse-config &&
-		git commit -m "Recurse submodule.recurse from config junk"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse submodule.recurse from config for gar/bage" &&
-		git -c submodule.recurse push ../pub.git main &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# Check that the submodule commit got there too
-		cd gar/bage &&
-		git diff --quiet origin/main main
-	)
+fatal: request ended in the middle of the gzip stream
+ok 13 - push gzipped truncated
 
-[main f05bcc4] Recurse submodule.recurse from config junk
+expecting success of 5562.14 'push gzipped empty': 
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env receive empty_body &&
+	! verify_http_result "200 OK"
+
+fatal: request ended in the middle of the gzip stream
+ok 14 - push gzipped empty
+
+expecting success of 5562.15 'CONTENT_LENGTH overflow ssite_t': 
+	NOT_FIT_IN_SSIZE=$(ssize_b100dots) &&
+	env \
+		CONTENT_TYPE=application/x-git-upload-pack-request \
+		QUERY_STRING=/repo.git/git-upload-pack \
+		PATH_TRANSLATED="$PWD"/.git/git-upload-pack \
+		GIT_HTTP_EXPORT_ALL=TRUE \
+		REQUEST_METHOD=POST \
+		CONTENT_LENGTH="$NOT_FIT_IN_SSIZE" \
+		git http-backend </dev/null >/dev/null 2>err &&
+	grep "fatal:.*CONTENT_LENGTH" err
+
+fatal: failed to parse CONTENT_LENGTH: 9223372036854775808
+ok 15 - CONTENT_LENGTH overflow ssite_t
+
+expecting success of 5562.16 'empty CONTENT_LENGTH': 
+	env \
+		QUERY_STRING="service=git-receive-pack" \
+		PATH_TRANSLATED="$PWD"/.git/info/refs \
+		GIT_HTTP_EXPORT_ALL=TRUE \
+		REQUEST_METHOD=GET \
+		CONTENT_LENGTH="" \
+		git http-backend <empty_body >act.out.$test_count 2>act.err.$test_count &&
+	verify_http_result "200 OK"
+
+ok 16 - empty CONTENT_LENGTH
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5553-set-upstream.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5553-set-upstream/.git/
+expecting success of 5553.1 'setup bare parent fetch': 
+	ensure_fresh_upstream &&
+	git remote add upstream parent
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5553-set-upstream/parent/
+ok 1 - setup bare parent fetch
+
+expecting success of 5553.2 'setup commit on main and other fetch': 
+	test_commit one &&
+	git push upstream main &&
+	git checkout -b other &&
+	test_commit two &&
+	git push upstream other
+
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-on-demand-from-submodule-recurse-config
-[main 937e43c] Recurse submodule.recurse from config for gar/bage
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+To parent
+ * [new branch]      main -> main
+Switched to a new branch 'other'
+[other 139b20d] two
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   cc28292..f05bcc4  main -> main
-To ../pub.git
-   85a50af..937e43c  main -> main
-From ../pub
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+To parent
+ * [new branch]      other -> other
+ok 2 - setup commit on main and other fetch
+
+expecting success of 5553.3 'fetch --set-upstream does not set upstream w/o branch': 
+	clear_config main other &&
+	git checkout main &&
+	git fetch --set-upstream upstream &&
+	check_config_missing main &&
+	check_config_missing other
+
+Switched to branch 'main'
+warning: no source branch found;
+you need to specify exactly one branch with the --set-upstream option
+ok 3 - fetch --set-upstream does not set upstream w/o branch
+
+expecting success of 5553.4 'fetch --set-upstream upstream main sets branch main but not other': 
+	clear_config main other &&
+	git fetch --set-upstream upstream main &&
+	check_config main upstream refs/heads/main &&
+	check_config_missing other
+
+From parent
+ * branch            main       -> FETCH_HEAD
+ok 4 - fetch --set-upstream upstream main sets branch main but not other
+
+expecting success of 5553.5 'fetch --set-upstream upstream other sets branch other': 
+	clear_config main other &&
+	git fetch --set-upstream upstream other &&
+	check_config main upstream refs/heads/other &&
+	check_config_missing other
+
+From parent
+ * branch            other      -> FETCH_HEAD
+ok 5 - fetch --set-upstream upstream other sets branch other
+
+expecting success of 5553.6 'fetch --set-upstream main:other does not set the branch other2': 
+	clear_config other2 &&
+	git fetch --set-upstream upstream main:other2 &&
+	check_config_missing other2
+
+From parent
+ * [new branch]      main       -> other2
+warning: no source branch found;
+you need to specify exactly one branch with the --set-upstream option
+ok 6 - fetch --set-upstream main:other does not set the branch other2
+
+expecting success of 5553.7 'fetch --set-upstream ./does-not-exist fails with invalid url': 
+	# main explicitly not cleared, we check that it is not touched from previous value
+	clear_config other other2 &&
+	test_must_fail git fetch --set-upstream ./does-not-exist &&
+	check_config main upstream refs/heads/other &&
+	check_config_missing other &&
+	check_config_missing other2
+
+fatal: './does-not-exist' 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.
+ok 7 - fetch --set-upstream ./does-not-exist fails with invalid url
+
+expecting success of 5553.8 'fetch --set-upstream with valid URL sets upstream to URL': 
+	clear_config other other2 &&
+	url="file://$PWD" &&
+	git fetch --set-upstream "$url" &&
+	check_config main "$url" HEAD &&
+	check_config_missing other &&
+	check_config_missing other2
+
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5553-set-upstream
  * branch            HEAD       -> FETCH_HEAD
-ok 8 - push succeeds if submodule commit not on remote but using auto-on-demand via submodule.recurse config
+ok 8 - fetch --set-upstream with valid URL sets upstream to URL
 
-expecting success of 5531.9 'push recurse-submodules on command line overrides config': 
-	(
-		cd work/gar/bage &&
-		>recurse-check-on-command-line-overriding-config &&
-		git add recurse-check-on-command-line-overriding-config &&
-		git commit -m "Recurse on command-line overriding config junk"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse on command-line overriding config for gar/bage" &&
+expecting success of 5553.9 'fetch --set-upstream with a detached HEAD': 
+	git checkout HEAD^0 &&
+	test_when_finished "git checkout -" &&
+	cat >expect <<-\EOF &&
+	warning: could not set upstream of HEAD to 'main' from 'upstream' when it does not point to any branch.
+	EOF
+	git fetch --set-upstream upstream main 2>actual.raw &&
+	grep ^warning: actual.raw >actual &&
+	test_cmp expect actual
 
-		# Ensure that we can override on-demand in the config
-		# to just check submodules
-		test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git main &&
-		# Check that the supermodule commit did not get there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main^ &&
-		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/main main^) &&
+Note: switching to 'HEAD^0'.
 
-		# Ensure that we can override check in the config to
-		# disable submodule recursion entirely
-		(cd gar/bage && git diff --quiet origin/main main^) &&
-		git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git main &&
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		(cd gar/bage && git diff --quiet origin/main 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.
 
-		# Ensure that we can override check in the config to
-		# disable submodule recursion entirely (alternative form)
-		git -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git main &&
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		(cd gar/bage && git diff --quiet origin/main 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:
 
-		# Ensure that we can override check in the config to
-		# push the submodule too
-		git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		(cd gar/bage && git diff --quiet origin/main main)
-	)
+  git switch -c <new-branch-name>
 
-[main b5bd2c4] Recurse on command-line overriding config junk
+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
+Switched to branch 'main'
+ok 9 - fetch --set-upstream with a detached HEAD
+
+expecting success of 5553.10 'setup bare parent pull': 
+	git remote rm upstream &&
+	ensure_fresh_upstream &&
+	git remote add upstream parent
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5553-set-upstream/parent/
+ok 10 - setup bare parent pull
+
+expecting success of 5553.11 'setup commit on main and other pull': 
+	test_commit three &&
+	git push --tags upstream main &&
+	test_commit four &&
+	git push upstream other
+
+[main 897c206] three
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-check-on-command-line-overriding-config
-[main 97693ab] Recurse on command-line overriding config for gar/bage
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+To parent
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+ * [new tag]         three -> three
+ * [new tag]         two -> two
+[main 6f2ec4d] four
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+To parent
+ * [new branch]      other -> other
+ok 11 - setup commit on main and other pull
 
-Please try
+expecting success of 5553.12 'pull --set-upstream upstream main sets branch main but not other': 
+	clear_config main other &&
+	git pull --no-rebase --set-upstream upstream main &&
+	check_config main upstream refs/heads/main &&
+	check_config_missing other
 
-	git push --recurse-submodules=on-demand
+From parent
+ * branch            main       -> FETCH_HEAD
+Already up to date.
+ok 12 - pull --set-upstream upstream main sets branch main but not other
 
-or cd to the path and use
+expecting success of 5553.13 'pull --set-upstream main:other2 does not set the branch other2': 
+	clear_config other2 &&
+	git pull --no-rebase --set-upstream upstream main:other2 &&
+	check_config_missing other2
 
-	git push
+From parent
+   d79ce16..897c206  main       -> other2
+warning: no source branch found;
+you need to specify exactly one branch with the --set-upstream option
+Already up to date.
+ok 13 - pull --set-upstream main:other2 does not set the branch other2
 
-to push them to a remote.
+expecting success of 5553.14 'pull --set-upstream upstream other sets branch main': 
+	clear_config main other &&
+	git pull --no-rebase --set-upstream upstream other &&
+	check_config main upstream refs/heads/other &&
+	check_config_missing other
 
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-To ../pub.git
-   937e43c..97693ab  main -> main
-From ../pub
+From parent
+ * branch            other      -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 14 - pull --set-upstream upstream other sets branch main
+
+expecting success of 5553.15 'pull --set-upstream upstream tag does not set the tag': 
+	clear_config three &&
+	git pull --no-rebase --tags --set-upstream upstream three &&
+	check_config_missing three
+
+From parent
+ * tag               three      -> FETCH_HEAD
+warning: not setting upstream for a remote tag
+Already up to date.
+ok 15 - pull --set-upstream upstream tag does not set the tag
+
+expecting success of 5553.16 'pull --set-upstream ./does-not-exist fails with invalid url': 
+	# main explicitly not cleared, we check that it is not touched from previous value
+	clear_config other other2 three &&
+	test_must_fail git pull --set-upstream ./does-not-exist &&
+	check_config main upstream refs/heads/other &&
+	check_config_missing other &&
+	check_config_missing other2 &&
+	check_config_missing three
+
+fatal: './does-not-exist' 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.
+ok 16 - pull --set-upstream ./does-not-exist fails with invalid url
+
+expecting success of 5553.17 'pull --set-upstream upstream HEAD sets branch HEAD': 
+	clear_config main other &&
+	git pull --no-rebase --set-upstream upstream HEAD &&
+	check_config main upstream HEAD &&
+	git checkout other &&
+	git pull --no-rebase --set-upstream upstream HEAD &&
+	check_config other upstream HEAD
+
+From parent
  * branch            HEAD       -> FETCH_HEAD
-Everything up-to-date
-From ../pub
+Already up to date.
+Switched to branch 'other'
+From parent
  * branch            HEAD       -> FETCH_HEAD
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   f05bcc4..b5bd2c4  main -> main
-Everything up-to-date
-From ../pub
+Merge made by the 'ort' strategy.
+ three.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+ok 17 - pull --set-upstream upstream HEAD sets branch HEAD
+
+expecting success of 5553.18 'pull --set-upstream upstream with more than one branch does nothing': 
+	clear_config main three &&
+	git pull --no-rebase --set-upstream upstream main three &&
+	check_config_missing main &&
+	check_config_missing three
+
+From parent
+ * branch            main       -> FETCH_HEAD
+ * tag               three      -> FETCH_HEAD
+warning: multiple branches detected, incompatible with --set-upstream
+Already up to date.
+ok 18 - pull --set-upstream upstream with more than one branch does nothing
+
+expecting success of 5553.19 'pull --set-upstream with valid URL sets upstream to URL': 
+	clear_config main other other2 &&
+	git checkout main &&
+	url="file://$PWD" &&
+	git pull --set-upstream "$url" &&
+	check_config main "$url" HEAD &&
+	check_config_missing other &&
+	check_config_missing other2
+
+Switched to branch 'main'
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5553-set-upstream
  * branch            HEAD       -> FETCH_HEAD
-ok 9 - push recurse-submodules on command line overrides config
+Already up to date.
+ok 19 - pull --set-upstream with valid URL sets upstream to URL
 
-expecting success of 5531.10 'push recurse-submodules last one wins on command line': 
-	(
-		cd work/gar/bage &&
-		>recurse-check-on-command-line-overriding-earlier-command-line &&
-		git add recurse-check-on-command-line-overriding-earlier-command-line &&
-		git commit -m "Recurse on command-line overriding earlier command-line junk"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse on command-line overriding earlier command-line for gar/bage" &&
+expecting success of 5553.20 'pull --set-upstream with valid URL and branch sets branch': 
+	clear_config main other other2 &&
+	git checkout main &&
+	url="file://$PWD" &&
+	git pull --set-upstream "$url" main &&
+	check_config main "$url" refs/heads/main &&
+	check_config_missing other &&
+	check_config_missing other2
 
-		# should result in "check"
-		test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git main &&
-		# Check that the supermodule commit did not get there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main^ &&
-		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/main main^) &&
+Already on 'main'
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5553-set-upstream
+ * branch            main       -> FETCH_HEAD
+Already up to date.
+ok 20 - pull --set-upstream with valid URL and branch sets branch
 
-		# should result in "no"
-		git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git main &&
-		# Check that the supermodule commit did get there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/main main^) &&
+expecting success of 5553.21 'pull --set-upstream with a detached HEAD': 
+	git checkout HEAD^0 &&
+	test_when_finished "git checkout -" &&
+	cat >expect <<-\EOF &&
+	warning: could not set upstream of HEAD to 'main' from 'upstream' when it does not point to any branch.
+	EOF
+	git pull --no-rebase --set-upstream upstream main 2>actual.raw &&
+	grep ^warning: actual.raw >actual &&
+	test_cmp expect actual
 
-		# should result in "no"
-		git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git main &&
-		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/main main^) &&
+Note: switching to 'HEAD^0'.
 
-		# But the options in the other order should push the submodule
-		git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git main &&
-		# Check that the submodule commit did get there
-		git fetch ../pub.git &&
-		(cd gar/bage && git diff --quiet origin/main 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.
 
-[main 2dd0c02] Recurse on command-line overriding earlier command-line junk
+If you want to 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 066b1d4 Merge branch 'other' of parent
+Already up to date.
+Switched to branch 'main'
+ok 21 - pull --set-upstream with a detached HEAD
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5560-http-backend-noserver.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-check-on-command-line-overriding-earlier-command-line
-[main abee46f] Recurse on command-line overriding earlier command-line for gar/bage
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5560-http-backend-noserver/repo.git/
+To /build/reproducible-path/git-2.51.0/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(-)
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5560-http-backend-noserver/repo.git
+   f39a923..0149442  main -> main
+ok 1 - setup repository
 
-Please try
+expecting success of 5560.2 'direct refs/heads/main not found': 
+	GET refs/heads/main "404 Not Found"
 
-	git push --recurse-submodules=on-demand
+ok 2 - direct refs/heads/main not found
 
-or cd to the path and use
+expecting success of 5560.3 'static file is ok': 
+	get_static_files "200 OK"
 
-	git push
+ok 3 - static file is ok
 
-to push them to a remote.
+expecting success of 5560.4 'no export by default': 
+	get_static_files "404 Not Found"
 
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-To ../pub.git
-   97693ab..abee46f  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Everything up-to-date
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   b5bd2c4..2dd0c02  main -> main
-Everything up-to-date
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 10 - push recurse-submodules last one wins on command line
+ok 4 - no export by default
 
-expecting success of 5531.11 'push succeeds if submodule commit not on remote using on-demand from cmdline overriding config': 
-	(
-		cd work/gar/bage &&
-		>recurse-on-demand-on-command-line-overriding-config &&
-		git add recurse-on-demand-on-command-line-overriding-config &&
-		git commit -m "Recurse on-demand on command-line overriding config junk"
+expecting success of 5560.5 'export if git-daemon-export-ok': 
+        (cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+	 touch git-daemon-export-ok
 	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse on-demand on command-line overriding config for gar/bage" &&
-		git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# Check that the submodule commit got there
-		cd gar/bage &&
-		git diff --quiet origin/main main
-	)
+        get_static_files "200 OK"
 
-[main c30f1ef] Recurse on-demand on command-line overriding config junk
+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-09-29 14:53:01.358548970 +0000
++++ act.err	2026-09-29 14:53:01.350548970 +0000
+@@ -1 +0,0 @@
+-fatal: '/repo.git/../HEAD': aliased
+--- exp.err	2026-09-29 14:53:01.366548970 +0000
++++ act.err	2026-09-29 14:53:01.366548970 +0000
+@@ -1 +1 @@
+-fatal: '/../etc/passwd': aliased
++Request not supported: '/build/reproducible-path/git-2.51.0/t/trash directory.t5560-http-backend-noserver//../etc/passwd'
+\ No newline at end of file
+--- exp.err	2026-09-29 14:53:01.382548970 +0000
++++ act.err	2026-09-29 14:53:01.382548970 +0000
+@@ -1 +1 @@
+-fatal: '../etc/passwd': aliased
++Request not supported: '/build/reproducible-path/git-2.51.0/t/trash directory.t5560-http-backend-noserver/../etc/passwd'
+\ No newline at end of file
+--- exp.err	2026-09-29 14:53:01.394548970 +0000
++++ act.err	2026-09-29 14:53:01.394548970 +0000
+@@ -1 +1 @@
+-fatal: '/etc//passwd': aliased
++Request not supported: '/build/reproducible-path/git-2.51.0/t/trash directory.t5560-http-backend-noserver//etc//passwd'
+\ No newline at end of file
+--- exp.err	2026-09-29 14:53:01.406548970 +0000
++++ act.err	2026-09-29 14:53:01.402548970 +0000
+@@ -1 +1 @@
+-fatal: '/etc/./passwd': aliased
++Request not supported: '/build/reproducible-path/git-2.51.0/t/trash directory.t5560-http-backend-noserver//etc/./passwd'
+\ No newline at end of file
+--- exp.err	2026-09-29 14:53:01.414548970 +0000
++++ act.err	2026-09-29 14:53:01.414548970 +0000
+@@ -1 +1 @@
+-fatal: '//domain/data.txt': aliased
++Request not supported: '/build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5573-pull-verify-signatures.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5573-pull-verify-signatures/.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
+ok 1 # skip create repositories with signed commits (missing GPG)
+
+ok 2 # skip pull unsigned commit with --verify-signatures (missing GPG)
+
+ok 3 # skip pull commit with bad signature with --verify-signatures (missing GPG)
+
+ok 4 # skip pull commit with untrusted signature with --verify-signatures (missing GPG)
+
+ok 5 # skip pull commit with untrusted signature with --verify-signatures and minTrustLevel=ultimate (missing GPG)
+
+ok 6 # skip pull commit with untrusted signature with --verify-signatures and minTrustLevel=marginal (missing GPG)
+
+ok 7 # skip pull commit with untrusted signature with --verify-signatures and minTrustLevel=undefined (missing GPG)
+
+ok 8 # skip pull signed commit with --verify-signatures (missing GPG)
+
+ok 9 # skip pull commit with bad signature without verification (missing GPG)
+
+ok 10 # skip pull commit with bad signature with --no-verify-signatures (missing GPG)
+
+ok 11 # skip pull unsigned commit into unborn branch (missing GPG)
+
+ok 12 # skip pull commit into unborn branch with bad signature and --verify-signatures (missing GPG)
+
+ok 13 # skip pull commit into unborn branch with untrusted signature and --verify-signatures (missing GPG)
+
+ok 14 # skip pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=ultimate (missing GPG)
+
+ok 15 # skip pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=marginal (missing GPG)
+
+ok 16 # skip pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=undefined (missing GPG)
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5533-push-cas.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/.git/
+expecting success of 5533.1 'setup': 
+	# create template repository
+	test_commit A &&
+	test_commit B &&
+	test_commit C
+
+[main (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-on-demand-on-command-line-overriding-config
-[main c41dba3] Recurse on-demand on command-line overriding config for gar/bage
+ 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(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   2dd0c02..c30f1ef  main -> main
-To ../pub.git
-   abee46f..c41dba3  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 11 - push succeeds if submodule commit not on remote using on-demand from cmdline overriding config
+ 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
+ok 1 - setup
 
-expecting success of 5531.12 'push succeeds if submodule commit disabling recursion from cmdline overriding config': 
+expecting success of 5533.2 'push to update (protected)': 
+	setup_srcdst_basic &&
 	(
-		cd work/gar/bage &&
-		>recurse-disable-on-command-line-overriding-config &&
-		git add recurse-disable-on-command-line-overriding-config &&
-		git commit -m "Recurse disable on command-line overriding config junk"
+		cd dst &&
+		test_commit D &&
+		test_must_fail git push --force-with-lease=main:main origin main 2>err &&
+		grep "stale info" err
 	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse disable on command-line overriding config for gar/bage" &&
-		git -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git main &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# But that the submodule commit did not
-		( cd gar/bage && git diff --quiet origin/main main^ ) &&
-		# Now push it to avoid confusing future tests
-		git push --recurse-submodules=on-demand ../pub.git main
-	)
+	git ls-remote . refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-[main 6738ef7] Recurse disable on command-line overriding config junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-disable-on-command-line-overriding-config
-[main b2ab521] Recurse disable on command-line overriding config for gar/bage
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^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 35a8500 C
+[main be8f64f] D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   c41dba3..b2ab521  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   c30f1ef..6738ef7  main -> main
-Everything up-to-date
-ok 12 - push succeeds if submodule commit disabling recursion from cmdline overriding config
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ ! [rejected]        main -> main (stale info)
+ok 2 - push to update (protected)
 
-expecting success of 5531.13 'push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config': 
+expecting success of 5533.3 'push to update (protected, forced)': 
+	setup_srcdst_basic &&
 	(
-		cd work/gar/bage &&
-		>recurse-disable-on-command-line-alt-overriding-config &&
-		git add recurse-disable-on-command-line-alt-overriding-config &&
-		git commit -m "Recurse disable on command-line alternative overriding config junk"
+		cd dst &&
+		test_commit D &&
+		git push --force --force-with-lease=main:main origin main 2>err &&
+		grep "forced update" err
 	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse disable on command-line alternative overriding config for gar/bage" &&
-		git -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git main &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# But that the submodule commit did not
-		( cd gar/bage && git diff --quiet origin/main main^ ) &&
-		# Now push it to avoid confusing future tests
-		git push --recurse-submodules=on-demand ../pub.git main
-	)
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-[main b13707b] Recurse disable on command-line alternative overriding config junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-disable-on-command-line-alt-overriding-config
-[main bdb7e27] Recurse disable on command-line alternative overriding config for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   b2ab521..bdb7e27  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   6738ef7..b13707b  main -> main
-Everything up-to-date
-ok 13 - push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-expecting success of 5531.14 'submodule entry pointing at a tag is error': 
-	git -C work/gar/bage tag -a test1 -m "tag" &&
-	tag=$(git -C work/gar/bage rev-parse test1^{tag}) &&
-	git -C work update-index --cacheinfo 160000 "$tag" gar/bage &&
-	git -C work commit -m "bad commit" &&
-	test_when_finished "git -C work reset --hard HEAD^" &&
-	test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git main 2>err &&
-	test_grep "is a tag, not a commit" 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.
 
-[main 209375b] bad 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:
+
+  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 35a8500 C
+[main be8f64f] D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: submodule entry 'gar/bage' (eca83b4b9ad7cb2fa6583ec07cdfa5a8d4f6ebe2) is a tag, not a commit
-HEAD is now at bdb7e27 Recurse disable on command-line alternative overriding config for gar/bage
-ok 14 - submodule entry pointing at a tag is error
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ + 35a8500...be8f64f main -> main (forced update)
+ok 3 - push to update (protected, forced)
 
-expecting success of 5531.15 'push fails if recurse submodules option passed as yes': 
+expecting success of 5533.4 'push to update (protected, tracking)': 
+	setup_srcdst_basic &&
 	(
-		cd work/gar/bage &&
-		>recurse-push-fails-if-recurse-submodules-passed-as-yes &&
-		git add recurse-push-fails-if-recurse-submodules-passed-as-yes &&
-		git commit -m "Recurse push fails if recurse submodules option passed as yes"
+		cd src &&
+		git checkout main &&
+		test_commit D &&
+		git checkout HEAD^0
 	) &&
+	git ls-remote src refs/heads/main >expect &&
 	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse push fails if recurse submodules option passed as yes for gar/bage" &&
-		test_must_fail git push --recurse-submodules=yes ../pub.git main &&
-		test_must_fail git -c push.recurseSubmodules=yes push ../pub.git main &&
-		git push --recurse-submodules=on-demand ../pub.git main
-	)
+		cd dst &&
+		test_commit E &&
+		git ls-remote . refs/remotes/origin/main >expect &&
+		test_must_fail git push --force-with-lease=main origin main &&
+		git ls-remote . refs/remotes/origin/main >actual &&
+		test_cmp expect actual
+	) &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-[main 41a3ccc] Recurse push fails if recurse submodules option passed as yes
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^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 35a8500 C
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be8f64f] D
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-push-fails-if-recurse-submodules-passed-as-yes
-[main 222fffb] Recurse push fails if recurse submodules option passed as yes for gar/bage
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Note: switching to 'HEAD^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 be8f64f D
+[main 3e7056f] E
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: bad recurse-submodules argument: yes
-fatal: bad push.recursesubmodules argument: yes
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   b13707b..41a3ccc  main -> main
-To ../pub.git
-   bdb7e27..222fffb  main -> main
-ok 15 - push fails if recurse submodules option passed as yes
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
+ ! [rejected]        main -> main (stale info)
+error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src'
+ok 4 - push to update (protected, tracking)
 
-expecting success of 5531.16 'push fails when commit on multiple branches if one branch has no remote': 
+expecting success of 5533.5 'push to update (protected, tracking, forced)': 
+	setup_srcdst_basic &&
 	(
-		cd work/gar/bage &&
-		>junk4 &&
-		git add junk4 &&
-		git commit -m "Fourth junk"
+		cd src &&
+		git checkout main &&
+		test_commit D &&
+		git checkout HEAD^0
 	) &&
 	(
-		cd work &&
-		git branch branch2 &&
-		git add gar/bage &&
-		git commit -m "Fourth commit for gar/bage" &&
-		git checkout branch2 &&
-		(
-			cd gar/bage &&
-			git checkout HEAD~1
-		) &&
-		>junk1 &&
-		git add junk1 &&
-		git commit -m "First junk" &&
-		test_must_fail git push --recurse-submodules=check ../pub.git
-	)
+		cd dst &&
+		test_commit E &&
+		git ls-remote . refs/remotes/origin/main >expect &&
+		git push --force --force-with-lease=main origin main
+	) &&
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-[main 8e0d58c] Fourth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk4
-[main 1a1015f] Fourth commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'branch2'
-M	gar/bage
-Note: switching to 'HEAD~1'.
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^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
@@ -361040,216 +363609,316 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 41a3ccc Recurse push fails if recurse submodules option passed as yes
-[branch2 0b7464f] First junk
+HEAD is now at 35a8500 C
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be8f64f] D
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk1
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Note: switching to 'HEAD^0'.
 
-Please try
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 push --recurse-submodules=on-demand
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-or cd to the path and use
+  git switch -c <new-branch-name>
 
-	git push
+Or undo this operation with:
 
-to push them to a remote.
+  git switch -
 
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-ok 16 - push fails when commit on multiple branches if one branch has no remote
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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 &&
+HEAD is now at be8f64f D
+[main 3e7056f] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
+ + be8f64f...3e7056f main -> main (forced update)
+ok 5 - push to update (protected, tracking, forced)
+
+expecting success of 5533.6 'push to update (allowed)': 
+	setup_srcdst_basic &&
 	(
-		cd a1 &&
-		git init b &&
-		(
-			cd b &&
-			>junk &&
-			git add junk &&
-			git commit -m "initial"
-		) &&
-		git add b &&
-		git commit -m "added submodule" &&
-		git push --recurse-submodules=check origin main
-	)
+		cd dst &&
+		test_commit D &&
+		git push --force-with-lease=main:main^ origin main
+	) &&
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/a/
-Cloning into 'a1'...
-warning: You appear to have cloned an empty repository.
-done.
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/a1/b/.git/
-[main (root-commit) f055ed5] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk
-warning: adding embedded git repository: b
-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> b
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached b
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[main (root-commit) c2121a0] added submodule
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^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 35a8500 C
+[main be8f64f] D
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 160000 b
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/a
- * [new branch]      main -> main
-ok 17 - push succeeds if submodule has no remote and is on the first superproject commit
+ create mode 100644 D.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
+   35a8500..be8f64f  main -> main
+ok 6 - push to update (allowed)
 
-expecting success of 5531.18 'push unpushed submodules when not needed': 
+expecting success of 5533.7 'push to update (allowed, tracking)': 
+	setup_srcdst_basic &&
 	(
-		cd work &&
-		(
-			cd gar/bage &&
-			git checkout main &&
-			>junk5 &&
-			git add junk5 &&
-			git commit -m "Fifth junk" &&
-			git push &&
-			git rev-parse origin/main >../../../expected
-		) &&
-		git checkout main &&
-		git add gar/bage &&
-		git commit -m "Fifth commit for gar/bage" &&
-		git push --recurse-submodules=on-demand ../pub.git main
+		cd dst &&
+		test_commit D &&
+		git push --force-with-lease=main origin main 2>err &&
+		! grep "forced update" err
 	) &&
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
+
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^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 35a8500 C
+[main be8f64f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ok 7 - push to update (allowed, tracking)
+
+expecting success of 5533.8 'push to update (allowed even though no-ff)': 
+	setup_srcdst_basic &&
 	(
-		cd submodule.git &&
-		git rev-parse main >../actual
+		cd dst &&
+		git reset --hard HEAD^ &&
+		test_commit D &&
+		git push --force-with-lease=main origin main 2>err &&
+		grep "forced update" err
 	) &&
-	test_cmp expected actual
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-Previous HEAD position was 41a3ccc Recurse push fails if recurse submodules option passed as yes
-Switched to branch 'main'
-[main 7f851d1] Fifth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk5
-To ../../../submodule.git
-   41a3ccc..7f851d1  main -> main
-Switched to branch 'main'
-M	gar/bage
-[main fbdd783] Fifth commit for gar/bage
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^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 35a8500 C
+HEAD is now at d9df450 B
+[main 3e6e33e] D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   222fffb..fbdd783  main -> main
-ok 18 - push unpushed submodules when not needed
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ + 35a8500...3e6e33e main -> main (forced update)
+ok 8 - push to update (allowed even though no-ff)
 
-expecting success of 5531.19 'push unpushed submodules when not needed 2': 
+expecting success of 5533.9 'push to delete (protected)': 
+	setup_srcdst_basic &&
+	git ls-remote src refs/heads/main >expect &&
 	(
-		cd submodule.git &&
-		git rev-parse main >../expected
+		cd dst &&
+		test_must_fail git push --force-with-lease=main:main^ origin :main
 	) &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
+
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^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 35a8500 C
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
+ ! [rejected]        (delete) -> main (stale info)
+error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src'
+ok 9 - push to delete (protected)
+
+expecting success of 5533.10 'push to delete (protected, forced)': 
+	setup_srcdst_basic &&
 	(
-		cd work &&
-		(
-			cd gar/bage &&
-			>junk6 &&
-			git add junk6 &&
-			git commit -m "Sixth junk"
-		) &&
-		>junk2 &&
-		git add junk2 &&
-		git commit -m "Second junk for work" &&
-		git push --recurse-submodules=on-demand ../pub.git main
+		cd dst &&
+		git push --force --force-with-lease=main:main^ origin :main
 	) &&
+	git ls-remote src refs/heads/main >actual &&
+	test_must_be_empty actual
+
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^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 35a8500 C
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
+ - [deleted]         main
+ok 10 - push to delete (protected, forced)
+
+expecting success of 5533.11 'push to delete (allowed)': 
+	setup_srcdst_basic &&
 	(
-		cd submodule.git &&
-		git rev-parse main >../actual
+		cd dst &&
+		git push --force-with-lease=main origin :main 2>err &&
+		grep deleted err
 	) &&
-	test_cmp expected actual
+	git ls-remote src refs/heads/main >actual &&
+	test_must_be_empty actual
 
-[main 1aa6921] Sixth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk6
-[main 8ea0267] Second junk for work
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk2
-To ../pub.git
-   fbdd783..8ea0267  main -> main
-ok 19 - push unpushed submodules when not needed 2
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-expecting success of 5531.20 'push unpushed submodules recursively': 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 35a8500 C
+ - [deleted]         main
+ok 11 - push to delete (allowed)
+
+expecting success of 5533.12 'cover everything with default force-with-lease (protected)': 
+	setup_srcdst_basic &&
 	(
-		cd work &&
-		(
-			cd gar/bage &&
-			git checkout main &&
-			> junk7 &&
-			git add junk7 &&
-			git commit -m "Seventh junk" &&
-			git rev-parse main >../../../expected
-		) &&
-		git checkout main &&
-		git add gar/bage &&
-		git commit -m "Seventh commit for gar/bage" &&
-		git push --recurse-submodules=on-demand ../pub.git main
+		cd src &&
+		git branch nain main^
 	) &&
+	git ls-remote src refs/heads/\* >expect &&
 	(
-		cd submodule.git &&
-		git rev-parse main >../actual
+		cd dst &&
+		test_must_fail git push --force-with-lease origin main main:nain
 	) &&
-	test_cmp expected actual
+	git ls-remote src refs/heads/\* >actual &&
+	test_cmp expect actual
 
-Already on 'main'
-[main a888053] Seventh junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk7
-Already on 'main'
-M	gar/bage
-[main 962ec87] Seventh commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   7f851d1..a888053  main -> main
-To ../pub.git
-   8ea0267..962ec87  main -> main
-ok 20 - push unpushed submodules recursively
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-expecting success of 5531.21 'push unpushable submodule recursively fails': 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 35a8500 C
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
+ ! [rejected]        main -> nain (stale info)
+error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src'
+ok 12 - cover everything with default force-with-lease (protected)
+
+expecting success of 5533.13 'cover everything with default force-with-lease (allowed)': 
+	setup_srcdst_basic &&
 	(
-		cd work &&
-		(
-			cd gar/bage &&
-			git rev-parse origin/main >../../../expected &&
-			git checkout main~0 &&
-			> junk8 &&
-			git add junk8 &&
-			git commit -m "Eighth junk"
-		) &&
-		git add gar/bage &&
-		git commit -m "Eighth commit for gar/bage" &&
-		test_must_fail git push --recurse-submodules=on-demand ../pub.git main
+		cd src &&
+		git branch nain main^
 	) &&
 	(
-		cd submodule.git &&
-		git rev-parse main >../actual
+		cd dst &&
+		git fetch &&
+		git push --force-with-lease origin main main:nain
 	) &&
-	test_when_finished git -C work reset --hard main^ &&
-	test_cmp expected actual
+	git ls-remote dst refs/heads/main |
+	sed -e "s/main/nain/" >expect &&
+	git ls-remote src refs/heads/nain >actual &&
+	test_cmp expect actual
 
-Note: switching to 'main~0'.
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^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
@@ -361266,1203 +363935,2541 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at a888053 Seventh junk
-[detached HEAD ae657ca] Eighth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk8
-[main 084f954] Eighth commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-Everything up-to-date
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
+HEAD is now at 35a8500 C
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
+ * [new branch]      nain       -> origin/nain
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
+   d9df450..35a8500  main -> nain
+ok 13 - cover everything with default force-with-lease (allowed)
 
-Please try
+expecting success of 5533.14 'new branch covered by force-with-lease': 
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		git branch branch main &&
+		git push --force-with-lease=branch origin branch
+	) &&
+	git ls-remote dst refs/heads/branch >expect &&
+	git ls-remote src refs/heads/branch >actual &&
+	test_cmp expect actual
 
-	git push --recurse-submodules=on-demand
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-or cd to the path and use
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 push
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-to push them to a remote.
+  git switch -c <new-branch-name>
 
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-HEAD is now at 962ec87 Seventh commit for gar/bage
-ok 21 - push unpushable submodule recursively fails
+Or undo this operation with:
 
-expecting success of 5531.22 'push --dry-run does not recursively update submodules': 
-	(
-		cd work/gar/bage &&
-		git checkout main &&
-		git rev-parse main >../../../expected_submodule &&
-		> junk9 &&
-		git add junk9 &&
-		git commit -m "Ninth junk" &&
+  git switch -
 
-		# Go up to work directory
-		cd ../.. &&
-		git checkout main &&
-		git rev-parse main >../expected_pub &&
-		git add gar/bage &&
-		git commit -m "Ninth commit for gar/bage" &&
-		git push --dry-run --recurse-submodules=on-demand ../pub.git main
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 35a8500 C
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
+ * [new branch]      branch -> branch
+ok 14 - new branch covered by force-with-lease
+
+expecting success of 5533.15 'new branch covered by force-with-lease (explicit)': 
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		git branch branch main &&
+		git push --force-with-lease=branch: origin branch
 	) &&
-	git -C submodule.git rev-parse main >actual_submodule &&
-	git -C pub.git rev-parse main >actual_pub &&
-	test_cmp expected_pub actual_pub &&
-	test_cmp expected_submodule actual_submodule
+	git ls-remote dst refs/heads/branch >expect &&
+	git ls-remote src refs/heads/branch >actual &&
+	test_cmp expect actual
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-  ae657ca Eighth junk
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 keep it by creating a new branch, this may be a good time
-to do so with:
+If you want to 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 branch <new-branch-name> ae657ca
+  git switch -c <new-branch-name>
 
-Switched to branch 'main'
-[main b4de299] Ninth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk9
-Already on 'main'
-M	gar/bage
-[main 506f118] Ninth commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   a888053..b4de299  main -> main
-To ../pub.git
-   962ec87..506f118  main -> main
-ok 22 - push --dry-run does not recursively update submodules
+Or undo this operation with:
 
-expecting success of 5531.23 'push --dry-run does not recursively update submodules': 
-	git -C work push --dry-run --recurse-submodules=only ../pub.git main &&
+  git switch -
 
-	git -C submodule.git rev-parse main >actual_submodule &&
-	git -C pub.git rev-parse main >actual_pub &&
-	test_cmp expected_pub actual_pub &&
-	test_cmp expected_submodule actual_submodule
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   a888053..b4de299  main -> main
-Everything up-to-date
-ok 23 - push --dry-run does not recursively update submodules
+HEAD is now at 35a8500 C
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
+ * [new branch]      branch -> branch
+ok 15 - new branch covered by force-with-lease (explicit)
 
-expecting success of 5531.24 'push only unpushed submodules recursively': 
-	git -C work/gar/bage rev-parse main >expected_submodule &&
-	git -C pub.git rev-parse main >expected_pub &&
+expecting success of 5533.16 'new branch already exists': 
+	setup_srcdst_basic &&
+	(
+		cd src &&
+		git checkout -b branch main &&
+		test_commit F
+	) &&
+	(
+		cd dst &&
+		git branch branch main &&
+		test_must_fail git push --force-with-lease=branch: origin branch
+	)
 
-	git -C work push --recurse-submodules=only ../pub.git main &&
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-	git -C submodule.git rev-parse main >actual_submodule &&
-	git -C pub.git rev-parse main >actual_pub &&
-	test_cmp expected_submodule actual_submodule &&
-	test_cmp expected_pub actual_pub
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   a888053..b4de299  main -> main
-Everything up-to-date
-ok 24 - push only unpushed submodules recursively
+If you want to 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 5531.25 'push with push.recurseSubmodules=only on superproject': 
-	test_when_finished rm -rf upstream downstream &&
-	setup_subsub &&
-	new_downstream_commits &&
-	git -C downstream config push.recurseSubmodules only &&
-	git -C downstream push origin downstream-branch &&
+  git switch -c <new-branch-name>
 
-	test_must_fail git -C upstream rev-parse refs/heads/downstream-branch &&
-	git -C upstream/sub rev-parse refs/heads/downstream-branch &&
-	test_must_fail git -C upstream/sub/deepsub rev-parse refs/heads/downstream-branch
+Or undo this operation with:
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub/.git/
-[main (root-commit) 474120f] innermost
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 35a8500 C
+Switched to a new branch 'branch'
+[branch b6ba73d] F
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 innermost.t
-Adding existing repo at 'deepsub' to the index
-[main (root-commit) 368641e] middle
+ create mode 100644 F.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
+ ! [rejected]        branch -> branch (stale info)
+error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src'
+ok 16 - new branch already exists
+
+expecting success of 5533.17 'background updates of REMOTE can be mitigated with a non-updated REMOTE-push': 
+	rm -rf src dst &&
+	git init --bare src.bare &&
+	test_when_finished "rm -rf src.bare" &&
+	git clone --no-local src.bare dst &&
+	test_when_finished "rm -rf dst" &&
+	(
+		cd dst &&
+		test_commit G &&
+		git remote add origin-push ../src.bare &&
+		git push origin-push main:main
+	) &&
+	git clone --no-local src.bare dst2 &&
+	test_when_finished "rm -rf dst2" &&
+	(
+		cd dst2 &&
+		test_commit H &&
+		git push
+	) &&
+	(
+		cd dst &&
+		test_commit I &&
+		git fetch origin &&
+		test_must_fail git push --force-with-lease origin-push &&
+		git fetch origin-push &&
+		git push --force-with-lease origin-push
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src.bare/
+Cloning into 'dst'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) c0a8953] G
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 deepsub
-Adding existing repo at 'sub' to the index
-[main (root-commit) 2115e6c] outermost
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+To ../src.bare
+ * [new branch]      main -> main
+Cloning into 'dst2'...
+[main d19f4d4] H
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-Cloning into 'downstream'...
-done.
-Submodule 'sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/downstream/sub'...
-done.
-Submodule path 'sub': checked out '368641e94e5de2829cfae22976de19274d54c11a'
-Submodule 'deepsub' (/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub) registered for path 'sub/deepsub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/downstream/sub/deepsub'...
-done.
-Submodule path 'sub/deepsub': checked out '474120f894f05445b107cd92961d883bc2877e80'
-Switched to a new branch 'downstream-branch'
-Switched to a new branch 'downstream-branch'
-Switched to a new branch 'downstream-branch'
-[downstream-branch 0d0452a] new-innermost
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src.bare
+   c0a8953..d19f4d4  main -> main
+[main 91bb270] I
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 new-innermost.t
-[downstream-branch b40b258] new-middle
+ create mode 100644 I.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src.bare
+ * [new branch]      main       -> origin/main
+To ../src.bare
+ ! [rejected]        main -> main (stale info)
+error: failed to push some refs to '../src.bare'
+From ../src.bare
+   c0a8953..d19f4d4  main       -> origin-push/main
+To ../src.bare
+ + d19f4d4...91bb270 main -> main (forced update)
+ok 17 - background updates of REMOTE can be mitigated with a non-updated REMOTE-push
+
+expecting success of 5533.18 'background updates to remote can be mitigated with "--force-if-includes"': 
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	git ls-remote dst refs/heads/main >expect.main &&
+	git ls-remote dst refs/heads/branch >expect.branch &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		git fetch --all &&
+		test_must_fail git push --force-with-lease --force-if-includes --all
+	) &&
+	git ls-remote dst refs/heads/main >actual.main &&
+	git ls-remote dst refs/heads/branch >actual.branch &&
+	test_cmp expect.main actual.main &&
+	test_cmp expect.branch actual.branch
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst/
+Cloning into 'src'...
+warning: You appear to have cloned an empty repository.
+Cloning into 'dup'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) 112d1ac] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[downstream-branch 84df116] new-outermost
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main f9a2dac] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'sub'
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub
- * [new branch]      downstream-branch -> downstream-branch
-Everything up-to-date
-fatal: ambiguous argument 'refs/heads/downstream-branch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/downstream-branch
-b40b2588b54182e5d2c2979598807b69c2e9ca4f
-fatal: ambiguous argument 'refs/heads/downstream-branch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/downstream-branch
-ok 25 - push with push.recurseSubmodules=only on superproject
-
-expecting success of 5531.26 'push with push.recurseSubmodules=only on superproject and top-level submodule': 
-	test_when_finished rm -rf upstream downstream &&
-	setup_subsub &&
-	new_downstream_commits &&
-	git -C downstream config push.recurseSubmodules only &&
-	git -C downstream/sub config push.recurseSubmodules only &&
-	git -C downstream push origin downstream-branch 2> err &&
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 157d38b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main -> main
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main       -> origin/main
+Switched to a new branch 'branch'
+[branch ded492b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch b63fbb1] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch -> branch
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch     -> origin/branch
+branch 'branch' set up to track 'origin/branch'.
+Current branch main is up to date.
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main 00b6961] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[main b995a30] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'branch'
+[branch 9cdccac] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+   b63fbb1..9cdccac  branch -> branch
+   157d38b..b995a30  main -> main
+Switched to branch 'branch'
+Your branch is up to date with 'origin/branch'.
+[branch da1510b] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be2465f] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+   157d38b..b995a30  main       -> origin/main
+   b63fbb1..9cdccac  branch     -> origin/branch
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ ! [rejected]        branch -> branch (remote ref updated since checkout)
+ ! [rejected]        main -> main (remote ref updated since checkout)
+error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst'
+hint: Updates were rejected because the tip of the remote-tracking branch has
+hint: been updated since the last checkout. If you want to integrate the
+hint: remote changes, use 'git pull' before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+ok 18 - background updates to remote can be mitigated with "--force-if-includes"
 
-	test_must_fail git -C upstream rev-parse refs/heads/downstream-branch &&
-	git -C upstream/sub rev-parse refs/heads/downstream-branch &&
-	git -C upstream/sub/deepsub rev-parse refs/heads/downstream-branch &&
-	grep "recursing into submodule with push.recurseSubmodules=only; using on-demand instead" err
+expecting success of 5533.19 'background updates to remote can be mitigated with "push.useForceIfIncludes"': 
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	git ls-remote dst refs/heads/main >expect.main &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		git fetch --all &&
+		git config --local push.useForceIfIncludes true &&
+		test_must_fail git push --force-with-lease=main origin main
+	) &&
+	git ls-remote dst refs/heads/main >actual.main &&
+	test_cmp expect.main actual.main
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub/.git/
-[main (root-commit) ff9df1c] innermost
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst/
+Cloning into 'src'...
+warning: You appear to have cloned an empty repository.
+Cloning into 'dup'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) 112d1ac] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 innermost.t
-Adding existing repo at 'deepsub' to the index
-[main (root-commit) 1491354] middle
+ create mode 100644 A.t
+[main f9a2dac] B
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 deepsub
-Adding existing repo at 'sub' to the index
-[main (root-commit) fc64eab] outermost
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 157d38b] C
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-Cloning into 'downstream'...
-done.
-Submodule 'sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/downstream/sub'...
-done.
-Submodule path 'sub': checked out '14913541b28e52bad23119683708fc45d9376bed'
-Submodule 'deepsub' (/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub) registered for path 'sub/deepsub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5531-deep-submodule-push/downstream/sub/deepsub'...
-done.
-Submodule path 'sub/deepsub': checked out 'ff9df1cde3a7559405c3c1eeb7ea710d906115a8'
-Switched to a new branch 'downstream-branch'
-Switched to a new branch 'downstream-branch'
-Switched to a new branch 'downstream-branch'
-[downstream-branch 8f905ff] new-innermost
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main -> main
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main       -> origin/main
+Switched to a new branch 'branch'
+[branch ded492b] D
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 new-innermost.t
-[downstream-branch 6cfd390] new-middle
+ create mode 100644 D.t
+[branch b63fbb1] E
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[downstream-branch bc3808e] new-outermost
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch -> branch
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch     -> origin/branch
+branch 'branch' set up to track 'origin/branch'.
+Current branch main is up to date.
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main 00b6961] F
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: ambiguous argument 'refs/heads/downstream-branch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/downstream-branch
-6cfd3906f0122ec7421e24d2d05931a113c1bb83
-8f905ff36854342cf7f1871351b72bfe2022e9d6
-warning: recursing into submodule with push.recurseSubmodules=only; using on-demand instead
-ok 26 - push with push.recurseSubmodules=only on superproject and top-level submodule
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[main b995a30] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'branch'
+[branch 9cdccac] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+   b63fbb1..9cdccac  branch -> branch
+   157d38b..b995a30  main -> main
+Switched to branch 'branch'
+Your branch is up to date with 'origin/branch'.
+[branch da1510b] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be2465f] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+   157d38b..b995a30  main       -> origin/main
+   b63fbb1..9cdccac  branch     -> origin/branch
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ ! [rejected]        main -> main (remote ref updated since checkout)
+error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst'
+hint: Updates were rejected because the tip of the remote-tracking branch has
+hint: been updated since the last checkout. If you want to integrate the
+hint: remote changes, use 'git pull' before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+ok 19 - background updates to remote can be mitigated with "push.useForceIfIncludes"
 
-expecting success of 5531.27 'push propagating the remotes name to a submodule': 
-	git -C work remote add origin ../pub.git &&
-	git -C work remote add pub ../pub.git &&
+expecting success of 5533.20 '"--force-if-includes" should be disabled for --force-with-lease="<refname>:<expect>"': 
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	git ls-remote dst refs/heads/main >expect.main &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		remote_head="$(git rev-parse refs/remotes/origin/main)" &&
+		git fetch --all &&
+		test_must_fail git push --force-if-includes --force-with-lease="main:$remote_head" 2>err &&
+		grep "stale info" err
+	) &&
+	git ls-remote dst refs/heads/main >actual.main &&
+	test_cmp expect.main actual.main
 
-	> work/gar/bage/junk10 &&
-	git -C work/gar/bage add junk10 &&
-	git -C work/gar/bage commit -m "Tenth junk" &&
-	git -C work add gar/bage &&
-	git -C work commit -m "Tenth junk added to gar/bage" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst/
+Cloning into 'src'...
+warning: You appear to have cloned an empty repository.
+Cloning into 'dup'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main f9a2dac] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 157d38b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main -> main
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main       -> origin/main
+Switched to a new branch 'branch'
+[branch ded492b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch b63fbb1] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch -> branch
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch     -> origin/branch
+branch 'branch' set up to track 'origin/branch'.
+Current branch main is up to date.
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main 00b6961] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[main b995a30] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'branch'
+[branch 9cdccac] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+   b63fbb1..9cdccac  branch -> branch
+   157d38b..b995a30  main -> main
+Switched to branch 'branch'
+Your branch is up to date with 'origin/branch'.
+[branch da1510b] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be2465f] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+   157d38b..b995a30  main       -> origin/main
+   b63fbb1..9cdccac  branch     -> origin/branch
+ ! [rejected]        main -> main (stale info)
+ok 20 - "--force-if-includes" should be disabled for --force-with-lease="<refname>:<expect>"
 
-	# Fails when submodule does not have a matching remote
-	test_must_fail git -C work push --recurse-submodules=on-demand pub main &&
-	# Succeeds when submodules has matching remote and refspec
-	git -C work push --recurse-submodules=on-demand origin main &&
+expecting success of 5533.21 '"--force-if-includes" should allow forced update after a rebase ("pull --rebase")': 
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		git pull --rebase origin main &&
+		git push --force-if-includes --force-with-lease="main"
+	)
 
-	git -C submodule.git rev-parse main >actual_submodule &&
-	git -C pub.git rev-parse main >actual_pub &&
-	git -C work/gar/bage rev-parse main >expected_submodule &&
-	git -C work rev-parse main >expected_pub &&
-	test_cmp expected_submodule actual_submodule &&
-	test_cmp expected_pub actual_pub
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst/
+Cloning into 'src'...
+warning: You appear to have cloned an empty repository.
+Cloning into 'dup'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main f9a2dac] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 157d38b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main -> main
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main       -> origin/main
+Switched to a new branch 'branch'
+[branch ded492b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch b63fbb1] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch -> branch
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch     -> origin/branch
+branch 'branch' set up to track 'origin/branch'.
+Current branch main is up to date.
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main 00b6961] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[main b995a30] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'branch'
+[branch 9cdccac] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+   b63fbb1..9cdccac  branch -> branch
+   157d38b..b995a30  main -> main
+Switched to branch 'branch'
+Your branch is up to date with 'origin/branch'.
+[branch da1510b] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be2465f] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * branch            main       -> FETCH_HEAD
+   157d38b..b995a30  main       -> origin/main
+Rebasing (1/1)
Successfully rebased and updated refs/heads/main.
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+   b995a30..7c16010  main -> main
+ok 21 - "--force-if-includes" should allow forced update after a rebase ("pull --rebase")
 
-[main 598d32e] Tenth junk
+expecting success of 5533.22 '"--force-if-includes" should allow forced update after a rebase ("pull --rebase", local rebase)': 
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		git pull --rebase origin main &&
+		git rebase --onto HEAD~4 HEAD~1 &&
+		git push --force-if-includes --force-with-lease="main"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst/
+Cloning into 'src'...
+warning: You appear to have cloned an empty repository.
+Cloning into 'dup'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) 112d1ac] A
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk10
-[main f4a8571] Tenth junk added to gar/bage
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main f9a2dac] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: remote 'pub' not configured
-fatal: process for submodule 'gar/bage' failed
-fatal: the remote end hung up unexpectedly
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   b4de299..598d32e  main -> main
-To ../pub.git
-   962ec87..f4a8571  main -> main
-ok 27 - push propagating the remotes name to a submodule
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 157d38b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main -> main
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main       -> origin/main
+Switched to a new branch 'branch'
+[branch ded492b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch b63fbb1] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch -> branch
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch     -> origin/branch
+branch 'branch' set up to track 'origin/branch'.
+Current branch main is up to date.
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main 00b6961] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[main b995a30] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'branch'
+[branch 9cdccac] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+   b63fbb1..9cdccac  branch -> branch
+   157d38b..b995a30  main -> main
+Switched to branch 'branch'
+Your branch is up to date with 'origin/branch'.
+[branch da1510b] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be2465f] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * branch            main       -> FETCH_HEAD
+   157d38b..b995a30  main       -> origin/main
+Rebasing (1/1)
Successfully rebased and updated refs/heads/main.
+Rebasing (1/1)
Successfully rebased and updated refs/heads/main.
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ + b995a30...e9c7db1 main -> main (forced update)
+ok 22 - "--force-if-includes" should allow forced update after a rebase ("pull --rebase", local rebase)
 
-expecting success of 5531.28 'push propagating refspec to a submodule': 
-	> work/gar/bage/junk11 &&
-	git -C work/gar/bage add junk11 &&
-	git -C work/gar/bage commit -m "Eleventh junk" &&
+expecting success of 5533.23 '"--force-if-includes" should allow deletes': 
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	(
+		cd src &&
+		git switch branch &&
+		git pull --rebase origin branch &&
+		git push --force-if-includes --force-with-lease="branch" origin :branch
+	)
 
-	git -C work checkout branch2 &&
-	git -C work add gar/bage &&
-	git -C work commit -m "updating gar/bage in branch2" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst/
+Cloning into 'src'...
+warning: You appear to have cloned an empty repository.
+Cloning into 'dup'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main f9a2dac] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 157d38b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main -> main
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main       -> origin/main
+Switched to a new branch 'branch'
+[branch ded492b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch b63fbb1] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch -> branch
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch     -> origin/branch
+branch 'branch' set up to track 'origin/branch'.
+Current branch main is up to date.
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main 00b6961] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[main b995a30] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'branch'
+[branch 9cdccac] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+   b63fbb1..9cdccac  branch -> branch
+   157d38b..b995a30  main -> main
+Switched to branch 'branch'
+Your branch is up to date with 'origin/branch'.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ * branch            branch     -> FETCH_HEAD
+   b63fbb1..9cdccac  branch     -> origin/branch
+Updating b63fbb1..9cdccac
+Fast-forward
+ H.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
+ - [deleted]         branch
+ok 23 - "--force-if-includes" should allow deletes
 
-	# Fails when submodule does not have a matching branch
-	test_must_fail git -C work push --recurse-submodules=on-demand origin branch2 &&
-	# Fails when refspec includes an object id
-	test_must_fail git -C work push --recurse-submodules=on-demand origin \
-		"$(git -C work rev-parse branch2):refs/heads/branch2" &&
-	# Fails when refspec includes HEAD and parent and submodule do not
-	# have the same named branch checked out
-	test_must_fail git -C work push --recurse-submodules=on-demand origin \
-		HEAD:refs/heads/branch2 &&
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5571-pre-push-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5571-pre-push-hook/.git/
+expecting success of 5571.1 'setup': 
+	test_hook pre-push <<-\EOF &&
+	cat >actual
+	EOF
 
-	git -C work/gar/bage branch branch2 main &&
-	git -C work push --recurse-submodules=on-demand origin branch2 &&
+	git config push.default upstream &&
+	git init --bare repo1 &&
+	git remote add parent1 repo1 &&
+	test_commit one &&
+	cat >expect <<-EOF &&
+	HEAD $(git rev-parse HEAD) refs/heads/foreign $(test_oid zero)
+	EOF
 
-	git -C submodule.git rev-parse branch2 >actual_submodule &&
-	git -C pub.git rev-parse branch2 >actual_pub &&
-	git -C work/gar/bage rev-parse branch2 >expected_submodule &&
-	git -C work rev-parse branch2 >expected_pub &&
-	test_cmp expected_submodule actual_submodule &&
-	test_cmp expected_pub actual_pub
+	test_when_finished "rm actual" &&
+	git push parent1 HEAD:foreign &&
+	test_cmp expect actual
 
-[main 0a0cd0a] Eleventh junk
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5571-pre-push-hook/repo1/
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk11
-Switched to branch 'branch2'
-M	gar/bage
-[branch2 ec50cd3] updating gar/bage in branch2
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+To repo1
+ * [new branch]      HEAD -> foreign
+ok 1 - setup
+
+expecting success of 5571.2 'push with failing hook': 
+	test_hook pre-push <<-\EOF &&
+	cat >actual &&
+	exit 1
+	EOF
+
+	test_commit two &&
+	cat >expect <<-EOF &&
+	HEAD $(git rev-parse HEAD) refs/heads/main $(test_oid zero)
+	EOF
+
+	test_when_finished "rm actual" &&
+	test_must_fail git push parent1 HEAD &&
+	test_cmp expect actual
+
+[main 139b20d] two
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: src refspec 'branch2' must name a ref
-fatal: process for submodule 'gar/bage' failed
-fatal: the remote end hung up unexpectedly
-fatal: src refspec 'ec50cd3dd859532aceefbd03eacca6540c93d099' must name a ref
-fatal: process for submodule 'gar/bage' failed
-fatal: the remote end hung up unexpectedly
-fatal: HEAD does not match the named branch in the superproject
-fatal: process for submodule 'gar/bage' failed
-fatal: the remote end hung up unexpectedly
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
- * [new branch]      branch2 -> branch2
-To ../pub.git
- * [new branch]      branch2 -> branch2
-ok 28 - push propagating refspec to a submodule
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+error: failed to push some refs to 'repo1'
+ok 2 - push with failing hook
 
-expecting success of 5531.29 'push propagating HEAD refspec to a submodule': 
-	git -C work/gar/bage checkout branch2 &&
-	> work/gar/bage/junk12 &&
-	git -C work/gar/bage add junk12 &&
-	git -C work/gar/bage commit -m "Twelfth junk" &&
+expecting success of 5571.3 '--no-verify bypasses hook': 
+	git push --no-verify parent1 HEAD &&
+	test_path_is_missing actual
 
-	git -C work checkout branch2 &&
-	git -C work add gar/bage &&
-	git -C work commit -m "updating gar/bage in branch2" &&
+To repo1
+ * [new branch]      HEAD -> main
+ok 3 - --no-verify bypasses hook
 
-	# Passes since the superproject and submodules HEAD are both on branch2
-	git -C work push --recurse-submodules=on-demand origin \
-		HEAD:refs/heads/branch2 &&
+expecting success of 5571.4 'push with hook': 
+	test_hook --setup pre-push <<-\EOF &&
+	echo "$1" >actual
+	echo "$2" >>actual
+	cat >>actual
+	EOF
 
-	git -C submodule.git rev-parse branch2 >actual_submodule &&
-	git -C pub.git rev-parse branch2 >actual_pub &&
-	git -C work/gar/bage rev-parse branch2 >expected_submodule &&
-	git -C work rev-parse branch2 >expected_pub &&
-	test_cmp expected_submodule actual_submodule &&
-	test_cmp expected_pub actual_pub
+	cat >expect <<-EOF &&
+	parent1
+	repo1
+	refs/heads/main $COMMIT2 refs/heads/foreign $COMMIT1
+	EOF
 
-Switched to branch 'branch2'
-[branch2 073878c] Twelfth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk12
-Already on 'branch2'
-M	gar/bage
-[branch2 2a64ff7] updating gar/bage in branch2
+	git push parent1 main:foreign &&
+	test_cmp expect actual
+
+To repo1
+   d79ce16..139b20d  main -> foreign
+ok 4 - push with hook
+
+expecting success of 5571.5 'add a branch': 
+	git checkout -b other parent1/foreign &&
+	test_commit three
+
+Switched to a new branch 'other'
+branch 'other' set up to track 'parent1/foreign'.
+[other 7c7cd71] three
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   0a0cd0a..073878c  HEAD -> branch2
-To ../pub.git
-   ec50cd3..2a64ff7  HEAD -> branch2
-ok 29 - push propagating HEAD refspec to a submodule
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+ok 5 - add a branch
 
-# passed all 29 test(s)
-1..29
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5559-http-fetch-smart-http2.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5559-http-fetch-smart-http2/.git/
-checking prerequisite: NOT_ROOT
+expecting success of 5571.6 'push to default': 
+	cat >expect <<-EOF &&
+	parent1
+	repo1
+	refs/heads/other $COMMIT3 refs/heads/foreign $COMMIT2
+	EOF
+	git push &&
+	test_cmp expect actual
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+To repo1
+   139b20d..7c7cd71  other -> foreign
+ok 6 - push to default
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5561-http-backend.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5561-http-backend/.git/
-checking prerequisite: NOT_ROOT
+expecting success of 5571.7 'push non-branches': 
+	cat >expect <<-EOF &&
+	parent1
+	repo1
+	refs/tags/one $COMMIT1 refs/tags/tag1 $ZERO_OID
+	HEAD~ $COMMIT2 refs/heads/prev $ZERO_OID
+	EOF
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+	git push parent1 one:tag1 HEAD~:refs/heads/prev &&
+	test_cmp expect actual
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5563-simple-http-auth.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5563-simple-http-auth/.git/
-checking prerequisite: NOT_ROOT
+To repo1
+ * [new tag]         one -> tag1
+ * [new branch]      HEAD~ -> prev
+ok 7 - push non-branches
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+expecting success of 5571.8 'push delete': 
+	cat >expect <<-EOF &&
+	parent1
+	repo1
+	(delete) $ZERO_OID refs/heads/prev $COMMIT2
+	EOF
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5564-http-proxy.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5564-http-proxy/.git/
-checking prerequisite: NOT_ROOT
+	git push parent1 :prev &&
+	test_cmp expect actual
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+To repo1
+ - [deleted]         prev
+ok 8 - push delete
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5553-set-upstream.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5553-set-upstream/.git/
-expecting success of 5553.1 'setup bare parent fetch': 
-	ensure_fresh_upstream &&
-	git remote add upstream parent
+expecting success of 5571.9 'push to URL': 
+	cat >expect <<-EOF &&
+	repo1
+	repo1
+	HEAD $COMMIT3 refs/heads/other $ZERO_OID
+	EOF
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5553-set-upstream/parent/
-ok 1 - setup bare parent fetch
+	git push repo1 HEAD &&
+	test_cmp expect actual
 
-expecting success of 5553.2 'setup commit on main and other fetch': 
-	test_commit one &&
-	git push upstream main &&
-	git checkout -b other &&
-	test_commit two &&
-	git push upstream other
+To repo1
+ * [new branch]      HEAD -> other
+ok 9 - push to URL
+
+expecting success of 5571.10 'set up many-ref tests': 
+	{
+		nr=1000 &&
+		while test $nr -lt 2000
+		do
+			nr=$(( $nr + 1 )) &&
+			echo "create refs/heads/b/$nr $COMMIT3" || return 1
+		done
+	} | git update-ref --stdin
+
+ok 10 - set up many-ref tests
+
+expecting success of 5571.11 'sigpipe does not cause pre-push hook failure': 
+	test_hook --clobber pre-push <<-\EOF &&
+	exit 0
+	EOF
+	git push parent1 "refs/heads/b/*:refs/heads/b/*"
+
+To repo1
+ * [new branch]      b/1001 -> b/1001
+ * [new branch]      b/1002 -> b/1002
+ * [new branch]      b/1003 -> b/1003
+ * [new branch]      b/1004 -> b/1004
+ * [new branch]      b/1005 -> b/1005
+ * [new branch]      b/1006 -> b/1006
+ * [new branch]      b/1007 -> b/1007
+ * [new branch]      b/1008 -> b/1008
+ * [new branch]      b/1009 -> b/1009
+ * [new branch]      b/1010 -> b/1010
+ * [new branch]      b/1011 -> b/1011
+ * [new branch]      b/1012 -> b/1012
+ * [new branch]      b/1013 -> b/1013
+ * [new branch]      b/1014 -> b/1014
+ * [new branch]      b/1015 -> b/1015
+ * [new branch]      b/1016 -> b/1016
+ * [new branch]      b/1017 -> b/1017
+ * [new branch]      b/1018 -> b/1018
+ * [new branch]      b/1019 -> b/1019
+ * [new branch]      b/1020 -> b/1020
+ * [new branch]      b/1021 -> b/1021
+ * [new branch]      b/1022 -> b/1022
+ * [new branch]      b/1023 -> b/1023
+ * [new branch]      b/1024 -> b/1024
+ * [new branch]      b/1025 -> b/1025
+ * [new branch]      b/1026 -> b/1026
+ * [new branch]      b/1027 -> b/1027
+ * [new branch]      b/1028 -> b/1028
+ * [new branch]      b/1029 -> b/1029
+ * [new branch]      b/1030 -> b/1030
+ * [new branch]      b/1031 -> b/1031
+ * [new branch]      b/1032 -> b/1032
+ * [new branch]      b/1033 -> b/1033
+ * [new branch]      b/1034 -> b/1034
+ * [new branch]      b/1035 -> b/1035
+ * [new branch]      b/1036 -> b/1036
+ * [new branch]      b/1037 -> b/1037
+ * [new branch]      b/1038 -> b/1038
+ * [new branch]      b/1039 -> b/1039
+ * [new branch]      b/1040 -> b/1040
+ * [new branch]      b/1041 -> b/1041
+ * [new branch]      b/1042 -> b/1042
+ * [new branch]      b/1043 -> b/1043
+ * [new branch]      b/1044 -> b/1044
+ * [new branch]      b/1045 -> b/1045
+ * [new branch]      b/1046 -> b/1046
+ * [new branch]      b/1047 -> b/1047
+ * [new branch]      b/1048 -> b/1048
+ * [new branch]      b/1049 -> b/1049
+ * [new branch]      b/1050 -> b/1050
+ * [new branch]      b/1051 -> b/1051
+ * [new branch]      b/1052 -> b/1052
+ * [new branch]      b/1053 -> b/1053
+ * [new branch]      b/1054 -> b/1054
+ * [new branch]      b/1055 -> b/1055
+ * [new branch]      b/1056 -> b/1056
+ * [new branch]      b/1057 -> b/1057
+ * [new branch]      b/1058 -> b/1058
+ * [new branch]      b/1059 -> b/1059
+ * [new branch]      b/1060 -> b/1060
+ * [new branch]      b/1061 -> b/1061
+ * [new branch]      b/1062 -> b/1062
+ * [new branch]      b/1063 -> b/1063
+ * [new branch]      b/1064 -> b/1064
+ * [new branch]      b/1065 -> b/1065
+ * [new branch]      b/1066 -> b/1066
+ * [new branch]      b/1067 -> b/1067
+ * [new branch]      b/1068 -> b/1068
+ * [new branch]      b/1069 -> b/1069
+ * [new branch]      b/1070 -> b/1070
+ * [new branch]      b/1071 -> b/1071
+ * [new branch]      b/1072 -> b/1072
+ * [new branch]      b/1073 -> b/1073
+ * [new branch]      b/1074 -> b/1074
+ * [new branch]      b/1075 -> b/1075
+ * [new branch]      b/1076 -> b/1076
+ * [new branch]      b/1077 -> b/1077
+ * [new branch]      b/1078 -> b/1078
+ * [new branch]      b/1079 -> b/1079
+ * [new branch]      b/1080 -> b/1080
+ * [new branch]      b/1081 -> b/1081
+ * [new branch]      b/1082 -> b/1082
+ * [new branch]      b/1083 -> b/1083
+ * [new branch]      b/1084 -> b/1084
+ * [new branch]      b/1085 -> b/1085
+ * [new branch]      b/1086 -> b/1086
+ * [new branch]      b/1087 -> b/1087
+ * [new branch]      b/1088 -> b/1088
+ * [new branch]      b/1089 -> b/1089
+ * [new branch]      b/1090 -> b/1090
+ * [new branch]      b/1091 -> b/1091
+ * [new branch]      b/1092 -> b/1092
+ * [new branch]      b/1093 -> b/1093
+ * [new branch]      b/1094 -> b/1094
+ * [new branch]      b/1095 -> b/1095
+ * [new branch]      b/1096 -> b/1096
+ * [new branch]      b/1097 -> b/1097
+ * [new branch]      b/1098 -> b/1098
+ * [new branch]      b/1099 -> b/1099
+ * [new branch]      b/1100 -> b/1100
+ * [new branch]      b/1101 -> b/1101
+ * [new branch]      b/1102 -> b/1102
+ * [new branch]      b/1103 -> b/1103
+ * [new branch]      b/1104 -> b/1104
+ * [new branch]      b/1105 -> b/1105
+ * [new branch]      b/1106 -> b/1106
+ * [new branch]      b/1107 -> b/1107
+ * [new branch]      b/1108 -> b/1108
+ * [new branch]      b/1109 -> b/1109
+ * [new branch]      b/1110 -> b/1110
+ * [new branch]      b/1111 -> b/1111
+ * [new branch]      b/1112 -> b/1112
+ * [new branch]      b/1113 -> b/1113
+ * [new branch]      b/1114 -> b/1114
+ * [new branch]      b/1115 -> b/1115
+ * [new branch]      b/1116 -> b/1116
+ * [new branch]      b/1117 -> b/1117
+ * [new branch]      b/1118 -> b/1118
+ * [new branch]      b/1119 -> b/1119
+ * [new branch]      b/1120 -> b/1120
+ * [new branch]      b/1121 -> b/1121
+ * [new branch]      b/1122 -> b/1122
+ * [new branch]      b/1123 -> b/1123
+ * [new branch]      b/1124 -> b/1124
+ * [new branch]      b/1125 -> b/1125
+ * [new branch]      b/1126 -> b/1126
+ * [new branch]      b/1127 -> b/1127
+ * [new branch]      b/1128 -> b/1128
+ * [new branch]      b/1129 -> b/1129
+ * [new branch]      b/1130 -> b/1130
+ * [new branch]      b/1131 -> b/1131
+ * [new branch]      b/1132 -> b/1132
+ * [new branch]      b/1133 -> b/1133
+ * [new branch]      b/1134 -> b/1134
+ * [new branch]      b/1135 -> b/1135
+ * [new branch]      b/1136 -> b/1136
+ * [new branch]      b/1137 -> b/1137
+ * [new branch]      b/1138 -> b/1138
+ * [new branch]      b/1139 -> b/1139
+ * [new branch]      b/1140 -> b/1140
+ * [new branch]      b/1141 -> b/1141
+ * [new branch]      b/1142 -> b/1142
+ * [new branch]      b/1143 -> b/1143
+ * [new branch]      b/1144 -> b/1144
+ * [new branch]      b/1145 -> b/1145
+ * [new branch]      b/1146 -> b/1146
+ * [new branch]      b/1147 -> b/1147
+ * [new branch]      b/1148 -> b/1148
+ * [new branch]      b/1149 -> b/1149
+ * [new branch]      b/1150 -> b/1150
+ * [new branch]      b/1151 -> b/1151
+ * [new branch]      b/1152 -> b/1152
+ * [new branch]      b/1153 -> b/1153
+ * [new branch]      b/1154 -> b/1154
+ * [new branch]      b/1155 -> b/1155
+ * [new branch]      b/1156 -> b/1156
+ * [new branch]      b/1157 -> b/1157
+ * [new branch]      b/1158 -> b/1158
+ * [new branch]      b/1159 -> b/1159
+ * [new branch]      b/1160 -> b/1160
+ * [new branch]      b/1161 -> b/1161
+ * [new branch]      b/1162 -> b/1162
+ * [new branch]      b/1163 -> b/1163
+ * [new branch]      b/1164 -> b/1164
+ * [new branch]      b/1165 -> b/1165
+ * [new branch]      b/1166 -> b/1166
+ * [new branch]      b/1167 -> b/1167
+ * [new branch]      b/1168 -> b/1168
+ * [new branch]      b/1169 -> b/1169
+ * [new branch]      b/1170 -> b/1170
+ * [new branch]      b/1171 -> b/1171
+ * [new branch]      b/1172 -> b/1172
+ * [new branch]      b/1173 -> b/1173
+ * [new branch]      b/1174 -> b/1174
+ * [new branch]      b/1175 -> b/1175
+ * [new branch]      b/1176 -> b/1176
+ * [new branch]      b/1177 -> b/1177
+ * [new branch]      b/1178 -> b/1178
+ * [new branch]      b/1179 -> b/1179
+ * [new branch]      b/1180 -> b/1180
+ * [new branch]      b/1181 -> b/1181
+ * [new branch]      b/1182 -> b/1182
+ * [new branch]      b/1183 -> b/1183
+ * [new branch]      b/1184 -> b/1184
+ * [new branch]      b/1185 -> b/1185
+ * [new branch]      b/1186 -> b/1186
+ * [new branch]      b/1187 -> b/1187
+ * [new branch]      b/1188 -> b/1188
+ * [new branch]      b/1189 -> b/1189
+ * [new branch]      b/1190 -> b/1190
+ * [new branch]      b/1191 -> b/1191
+ * [new branch]      b/1192 -> b/1192
+ * [new branch]      b/1193 -> b/1193
+ * [new branch]      b/1194 -> b/1194
+ * [new branch]      b/1195 -> b/1195
+ * [new branch]      b/1196 -> b/1196
+ * [new branch]      b/1197 -> b/1197
+ * [new branch]      b/1198 -> b/1198
+ * [new branch]      b/1199 -> b/1199
+ * [new branch]      b/1200 -> b/1200
+ * [new branch]      b/1201 -> b/1201
+ * [new branch]      b/1202 -> b/1202
+ * [new branch]      b/1203 -> b/1203
+ * [new branch]      b/1204 -> b/1204
+ * [new branch]      b/1205 -> b/1205
+ * [new branch]      b/1206 -> b/1206
+ * [new branch]      b/1207 -> b/1207
+ * [new branch]      b/1208 -> b/1208
+ * [new branch]      b/1209 -> b/1209
+ * [new branch]      b/1210 -> b/1210
+ * [new branch]      b/1211 -> b/1211
+ * [new branch]      b/1212 -> b/1212
+ * [new branch]      b/1213 -> b/1213
+ * [new branch]      b/1214 -> b/1214
+ * [new branch]      b/1215 -> b/1215
+ * [new branch]      b/1216 -> b/1216
+ * [new branch]      b/1217 -> b/1217
+ * [new branch]      b/1218 -> b/1218
+ * [new branch]      b/1219 -> b/1219
+ * [new branch]      b/1220 -> b/1220
+ * [new branch]      b/1221 -> b/1221
+ * [new branch]      b/1222 -> b/1222
+ * [new branch]      b/1223 -> b/1223
+ * [new branch]      b/1224 -> b/1224
+ * [new branch]      b/1225 -> b/1225
+ * [new branch]      b/1226 -> b/1226
+ * [new branch]      b/1227 -> b/1227
+ * [new branch]      b/1228 -> b/1228
+ * [new branch]      b/1229 -> b/1229
+ * [new branch]      b/1230 -> b/1230
+ * [new branch]      b/1231 -> b/1231
+ * [new branch]      b/1232 -> b/1232
+ * [new branch]      b/1233 -> b/1233
+ * [new branch]      b/1234 -> b/1234
+ * [new branch]      b/1235 -> b/1235
+ * [new branch]      b/1236 -> b/1236
+ * [new branch]      b/1237 -> b/1237
+ * [new branch]      b/1238 -> b/1238
+ * [new branch]      b/1239 -> b/1239
+ * [new branch]      b/1240 -> b/1240
+ * [new branch]      b/1241 -> b/1241
+ * [new branch]      b/1242 -> b/1242
+ * [new branch]      b/1243 -> b/1243
+ * [new branch]      b/1244 -> b/1244
+ * [new branch]      b/1245 -> b/1245
+ * [new branch]      b/1246 -> b/1246
+ * [new branch]      b/1247 -> b/1247
+ * [new branch]      b/1248 -> b/1248
+ * [new branch]      b/1249 -> b/1249
+ * [new branch]      b/1250 -> b/1250
+ * [new branch]      b/1251 -> b/1251
+ * [new branch]      b/1252 -> b/1252
+ * [new branch]      b/1253 -> b/1253
+ * [new branch]      b/1254 -> b/1254
+ * [new branch]      b/1255 -> b/1255
+ * [new branch]      b/1256 -> b/1256
+ * [new branch]      b/1257 -> b/1257
+ * [new branch]      b/1258 -> b/1258
+ * [new branch]      b/1259 -> b/1259
+ * [new branch]      b/1260 -> b/1260
+ * [new branch]      b/1261 -> b/1261
+ * [new branch]      b/1262 -> b/1262
+ * [new branch]      b/1263 -> b/1263
+ * [new branch]      b/1264 -> b/1264
+ * [new branch]      b/1265 -> b/1265
+ * [new branch]      b/1266 -> b/1266
+ * [new branch]      b/1267 -> b/1267
+ * [new branch]      b/1268 -> b/1268
+ * [new branch]      b/1269 -> b/1269
+ * [new branch]      b/1270 -> b/1270
+ * [new branch]      b/1271 -> b/1271
+ * [new branch]      b/1272 -> b/1272
+ * [new branch]      b/1273 -> b/1273
+ * [new branch]      b/1274 -> b/1274
+ * [new branch]      b/1275 -> b/1275
+ * [new branch]      b/1276 -> b/1276
+ * [new branch]      b/1277 -> b/1277
+ * [new branch]      b/1278 -> b/1278
+ * [new branch]      b/1279 -> b/1279
+ * [new branch]      b/1280 -> b/1280
+ * [new branch]      b/1281 -> b/1281
+ * [new branch]      b/1282 -> b/1282
+ * [new branch]      b/1283 -> b/1283
+ * [new branch]      b/1284 -> b/1284
+ * [new branch]      b/1285 -> b/1285
+ * [new branch]      b/1286 -> b/1286
+ * [new branch]      b/1287 -> b/1287
+ * [new branch]      b/1288 -> b/1288
+ * [new branch]      b/1289 -> b/1289
+ * [new branch]      b/1290 -> b/1290
+ * [new branch]      b/1291 -> b/1291
+ * [new branch]      b/1292 -> b/1292
+ * [new branch]      b/1293 -> b/1293
+ * [new branch]      b/1294 -> b/1294
+ * [new branch]      b/1295 -> b/1295
+ * [new branch]      b/1296 -> b/1296
+ * [new branch]      b/1297 -> b/1297
+ * [new branch]      b/1298 -> b/1298
+ * [new branch]      b/1299 -> b/1299
+ * [new branch]      b/1300 -> b/1300
+ * [new branch]      b/1301 -> b/1301
+ * [new branch]      b/1302 -> b/1302
+ * [new branch]      b/1303 -> b/1303
+ * [new branch]      b/1304 -> b/1304
+ * [new branch]      b/1305 -> b/1305
+ * [new branch]      b/1306 -> b/1306
+ * [new branch]      b/1307 -> b/1307
+ * [new branch]      b/1308 -> b/1308
+ * [new branch]      b/1309 -> b/1309
+ * [new branch]      b/1310 -> b/1310
+ * [new branch]      b/1311 -> b/1311
+ * [new branch]      b/1312 -> b/1312
+ * [new branch]      b/1313 -> b/1313
+ * [new branch]      b/1314 -> b/1314
+ * [new branch]      b/1315 -> b/1315
+ * [new branch]      b/1316 -> b/1316
+ * [new branch]      b/1317 -> b/1317
+ * [new branch]      b/1318 -> b/1318
+ * [new branch]      b/1319 -> b/1319
+ * [new branch]      b/1320 -> b/1320
+ * [new branch]      b/1321 -> b/1321
+ * [new branch]      b/1322 -> b/1322
+ * [new branch]      b/1323 -> b/1323
+ * [new branch]      b/1324 -> b/1324
+ * [new branch]      b/1325 -> b/1325
+ * [new branch]      b/1326 -> b/1326
+ * [new branch]      b/1327 -> b/1327
+ * [new branch]      b/1328 -> b/1328
+ * [new branch]      b/1329 -> b/1329
+ * [new branch]      b/1330 -> b/1330
+ * [new branch]      b/1331 -> b/1331
+ * [new branch]      b/1332 -> b/1332
+ * [new branch]      b/1333 -> b/1333
+ * [new branch]      b/1334 -> b/1334
+ * [new branch]      b/1335 -> b/1335
+ * [new branch]      b/1336 -> b/1336
+ * [new branch]      b/1337 -> b/1337
+ * [new branch]      b/1338 -> b/1338
+ * [new branch]      b/1339 -> b/1339
+ * [new branch]      b/1340 -> b/1340
+ * [new branch]      b/1341 -> b/1341
+ * [new branch]      b/1342 -> b/1342
+ * [new branch]      b/1343 -> b/1343
+ * [new branch]      b/1344 -> b/1344
+ * [new branch]      b/1345 -> b/1345
+ * [new branch]      b/1346 -> b/1346
+ * [new branch]      b/1347 -> b/1347
+ * [new branch]      b/1348 -> b/1348
+ * [new branch]      b/1349 -> b/1349
+ * [new branch]      b/1350 -> b/1350
+ * [new branch]      b/1351 -> b/1351
+ * [new branch]      b/1352 -> b/1352
+ * [new branch]      b/1353 -> b/1353
+ * [new branch]      b/1354 -> b/1354
+ * [new branch]      b/1355 -> b/1355
+ * [new branch]      b/1356 -> b/1356
+ * [new branch]      b/1357 -> b/1357
+ * [new branch]      b/1358 -> b/1358
+ * [new branch]      b/1359 -> b/1359
+ * [new branch]      b/1360 -> b/1360
+ * [new branch]      b/1361 -> b/1361
+ * [new branch]      b/1362 -> b/1362
+ * [new branch]      b/1363 -> b/1363
+ * [new branch]      b/1364 -> b/1364
+ * [new branch]      b/1365 -> b/1365
+ * [new branch]      b/1366 -> b/1366
+ * [new branch]      b/1367 -> b/1367
+ * [new branch]      b/1368 -> b/1368
+ * [new branch]      b/1369 -> b/1369
+ * [new branch]      b/1370 -> b/1370
+ * [new branch]      b/1371 -> b/1371
+ * [new branch]      b/1372 -> b/1372
+ * [new branch]      b/1373 -> b/1373
+ * [new branch]      b/1374 -> b/1374
+ * [new branch]      b/1375 -> b/1375
+ * [new branch]      b/1376 -> b/1376
+ * [new branch]      b/1377 -> b/1377
+ * [new branch]      b/1378 -> b/1378
+ * [new branch]      b/1379 -> b/1379
+ * [new branch]      b/1380 -> b/1380
+ * [new branch]      b/1381 -> b/1381
+ * [new branch]      b/1382 -> b/1382
+ * [new branch]      b/1383 -> b/1383
+ * [new branch]      b/1384 -> b/1384
+ * [new branch]      b/1385 -> b/1385
+ * [new branch]      b/1386 -> b/1386
+ * [new branch]      b/1387 -> b/1387
+ * [new branch]      b/1388 -> b/1388
+ * [new branch]      b/1389 -> b/1389
+ * [new branch]      b/1390 -> b/1390
+ * [new branch]      b/1391 -> b/1391
+ * [new branch]      b/1392 -> b/1392
+ * [new branch]      b/1393 -> b/1393
+ * [new branch]      b/1394 -> b/1394
+ * [new branch]      b/1395 -> b/1395
+ * [new branch]      b/1396 -> b/1396
+ * [new branch]      b/1397 -> b/1397
+ * [new branch]      b/1398 -> b/1398
+ * [new branch]      b/1399 -> b/1399
+ * [new branch]      b/1400 -> b/1400
+ * [new branch]      b/1401 -> b/1401
+ * [new branch]      b/1402 -> b/1402
+ * [new branch]      b/1403 -> b/1403
+ * [new branch]      b/1404 -> b/1404
+ * [new branch]      b/1405 -> b/1405
+ * [new branch]      b/1406 -> b/1406
+ * [new branch]      b/1407 -> b/1407
+ * [new branch]      b/1408 -> b/1408
+ * [new branch]      b/1409 -> b/1409
+ * [new branch]      b/1410 -> b/1410
+ * [new branch]      b/1411 -> b/1411
+ * [new branch]      b/1412 -> b/1412
+ * [new branch]      b/1413 -> b/1413
+ * [new branch]      b/1414 -> b/1414
+ * [new branch]      b/1415 -> b/1415
+ * [new branch]      b/1416 -> b/1416
+ * [new branch]      b/1417 -> b/1417
+ * [new branch]      b/1418 -> b/1418
+ * [new branch]      b/1419 -> b/1419
+ * [new branch]      b/1420 -> b/1420
+ * [new branch]      b/1421 -> b/1421
+ * [new branch]      b/1422 -> b/1422
+ * [new branch]      b/1423 -> b/1423
+ * [new branch]      b/1424 -> b/1424
+ * [new branch]      b/1425 -> b/1425
+ * [new branch]      b/1426 -> b/1426
+ * [new branch]      b/1427 -> b/1427
+ * [new branch]      b/1428 -> b/1428
+ * [new branch]      b/1429 -> b/1429
+ * [new branch]      b/1430 -> b/1430
+ * [new branch]      b/1431 -> b/1431
+ * [new branch]      b/1432 -> b/1432
+ * [new branch]      b/1433 -> b/1433
+ * [new branch]      b/1434 -> b/1434
+ * [new branch]      b/1435 -> b/1435
+ * [new branch]      b/1436 -> b/1436
+ * [new branch]      b/1437 -> b/1437
+ * [new branch]      b/1438 -> b/1438
+ * [new branch]      b/1439 -> b/1439
+ * [new branch]      b/1440 -> b/1440
+ * [new branch]      b/1441 -> b/1441
+ * [new branch]      b/1442 -> b/1442
+ * [new branch]      b/1443 -> b/1443
+ * [new branch]      b/1444 -> b/1444
+ * [new branch]      b/1445 -> b/1445
+ * [new branch]      b/1446 -> b/1446
+ * [new branch]      b/1447 -> b/1447
+ * [new branch]      b/1448 -> b/1448
+ * [new branch]      b/1449 -> b/1449
+ * [new branch]      b/1450 -> b/1450
+ * [new branch]      b/1451 -> b/1451
+ * [new branch]      b/1452 -> b/1452
+ * [new branch]      b/1453 -> b/1453
+ * [new branch]      b/1454 -> b/1454
+ * [new branch]      b/1455 -> b/1455
+ * [new branch]      b/1456 -> b/1456
+ * [new branch]      b/1457 -> b/1457
+ * [new branch]      b/1458 -> b/1458
+ * [new branch]      b/1459 -> b/1459
+ * [new branch]      b/1460 -> b/1460
+ * [new branch]      b/1461 -> b/1461
+ * [new branch]      b/1462 -> b/1462
+ * [new branch]      b/1463 -> b/1463
+ * [new branch]      b/1464 -> b/1464
+ * [new branch]      b/1465 -> b/1465
+ * [new branch]      b/1466 -> b/1466
+ * [new branch]      b/1467 -> b/1467
+ * [new branch]      b/1468 -> b/1468
+ * [new branch]      b/1469 -> b/1469
+ * [new branch]      b/1470 -> b/1470
+ * [new branch]      b/1471 -> b/1471
+ * [new branch]      b/1472 -> b/1472
+ * [new branch]      b/1473 -> b/1473
+ * [new branch]      b/1474 -> b/1474
+ * [new branch]      b/1475 -> b/1475
+ * [new branch]      b/1476 -> b/1476
+ * [new branch]      b/1477 -> b/1477
+ * [new branch]      b/1478 -> b/1478
+ * [new branch]      b/1479 -> b/1479
+ * [new branch]      b/1480 -> b/1480
+ * [new branch]      b/1481 -> b/1481
+ * [new branch]      b/1482 -> b/1482
+ * [new branch]      b/1483 -> b/1483
+ * [new branch]      b/1484 -> b/1484
+ * [new branch]      b/1485 -> b/1485
+ * [new branch]      b/1486 -> b/1486
+ * [new branch]      b/1487 -> b/1487
+ * [new branch]      b/1488 -> b/1488
+ * [new branch]      b/1489 -> b/1489
+ * [new branch]      b/1490 -> b/1490
+ * [new branch]      b/1491 -> b/1491
+ * [new branch]      b/1492 -> b/1492
+ * [new branch]      b/1493 -> b/1493
+ * [new branch]      b/1494 -> b/1494
+ * [new branch]      b/1495 -> b/1495
+ * [new branch]      b/1496 -> b/1496
+ * [new branch]      b/1497 -> b/1497
+ * [new branch]      b/1498 -> b/1498
+ * [new branch]      b/1499 -> b/1499
+ * [new branch]      b/1500 -> b/1500
+ * [new branch]      b/1501 -> b/1501
+ * [new branch]      b/1502 -> b/1502
+ * [new branch]      b/1503 -> b/1503
+ * [new branch]      b/1504 -> b/1504
+ * [new branch]      b/1505 -> b/1505
+ * [new branch]      b/1506 -> b/1506
+ * [new branch]      b/1507 -> b/1507
+ * [new branch]      b/1508 -> b/1508
+ * [new branch]      b/1509 -> b/1509
+ * [new branch]      b/1510 -> b/1510
+ * [new branch]      b/1511 -> b/1511
+ * [new branch]      b/1512 -> b/1512
+ * [new branch]      b/1513 -> b/1513
+ * [new branch]      b/1514 -> b/1514
+ * [new branch]      b/1515 -> b/1515
+ * [new branch]      b/1516 -> b/1516
+ * [new branch]      b/1517 -> b/1517
+ * [new branch]      b/1518 -> b/1518
+ * [new branch]      b/1519 -> b/1519
+ * [new branch]      b/1520 -> b/1520
+ * [new branch]      b/1521 -> b/1521
+ * [new branch]      b/1522 -> b/1522
+ * [new branch]      b/1523 -> b/1523
+ * [new branch]      b/1524 -> b/1524
+ * [new branch]      b/1525 -> b/1525
+ * [new branch]      b/1526 -> b/1526
+ * [new branch]      b/1527 -> b/1527
+ * [new branch]      b/1528 -> b/1528
+ * [new branch]      b/1529 -> b/1529
+ * [new branch]      b/1530 -> b/1530
+ * [new branch]      b/1531 -> b/1531
+ * [new branch]      b/1532 -> b/1532
+ * [new branch]      b/1533 -> b/1533
+ * [new branch]      b/1534 -> b/1534
+ * [new branch]      b/1535 -> b/1535
+ * [new branch]      b/1536 -> b/1536
+ * [new branch]      b/1537 -> b/1537
+ * [new branch]      b/1538 -> b/1538
+ * [new branch]      b/1539 -> b/1539
+ * [new branch]      b/1540 -> b/1540
+ * [new branch]      b/1541 -> b/1541
+ * [new branch]      b/1542 -> b/1542
+ * [new branch]      b/1543 -> b/1543
+ * [new branch]      b/1544 -> b/1544
+ * [new branch]      b/1545 -> b/1545
+ * [new branch]      b/1546 -> b/1546
+ * [new branch]      b/1547 -> b/1547
+ * [new branch]      b/1548 -> b/1548
+ * [new branch]      b/1549 -> b/1549
+ * [new branch]      b/1550 -> b/1550
+ * [new branch]      b/1551 -> b/1551
+ * [new branch]      b/1552 -> b/1552
+ * [new branch]      b/1553 -> b/1553
+ * [new branch]      b/1554 -> b/1554
+ * [new branch]      b/1555 -> b/1555
+ * [new branch]      b/1556 -> b/1556
+ * [new branch]      b/1557 -> b/1557
+ * [new branch]      b/1558 -> b/1558
+ * [new branch]      b/1559 -> b/1559
+ * [new branch]      b/1560 -> b/1560
+ * [new branch]      b/1561 -> b/1561
+ * [new branch]      b/1562 -> b/1562
+ * [new branch]      b/1563 -> b/1563
+ * [new branch]      b/1564 -> b/1564
+ * [new branch]      b/1565 -> b/1565
+ * [new branch]      b/1566 -> b/1566
+ * [new branch]      b/1567 -> b/1567
+ * [new branch]      b/1568 -> b/1568
+ * [new branch]      b/1569 -> b/1569
+ * [new branch]      b/1570 -> b/1570
+ * [new branch]      b/1571 -> b/1571
+ * [new branch]      b/1572 -> b/1572
+ * [new branch]      b/1573 -> b/1573
+ * [new branch]      b/1574 -> b/1574
+ * [new branch]      b/1575 -> b/1575
+ * [new branch]      b/1576 -> b/1576
+ * [new branch]      b/1577 -> b/1577
+ * [new branch]      b/1578 -> b/1578
+ * [new branch]      b/1579 -> b/1579
+ * [new branch]      b/1580 -> b/1580
+ * [new branch]      b/1581 -> b/1581
+ * [new branch]      b/1582 -> b/1582
+ * [new branch]      b/1583 -> b/1583
+ * [new branch]      b/1584 -> b/1584
+ * [new branch]      b/1585 -> b/1585
+ * [new branch]      b/1586 -> b/1586
+ * [new branch]      b/1587 -> b/1587
+ * [new branch]      b/1588 -> b/1588
+ * [new branch]      b/1589 -> b/1589
+ * [new branch]      b/1590 -> b/1590
+ * [new branch]      b/1591 -> b/1591
+ * [new branch]      b/1592 -> b/1592
+ * [new branch]      b/1593 -> b/1593
+ * [new branch]      b/1594 -> b/1594
+ * [new branch]      b/1595 -> b/1595
+ * [new branch]      b/1596 -> b/1596
+ * [new branch]      b/1597 -> b/1597
+ * [new branch]      b/1598 -> b/1598
+ * [new branch]      b/1599 -> b/1599
+ * [new branch]      b/1600 -> b/1600
+ * [new branch]      b/1601 -> b/1601
+ * [new branch]      b/1602 -> b/1602
+ * [new branch]      b/1603 -> b/1603
+ * [new branch]      b/1604 -> b/1604
+ * [new branch]      b/1605 -> b/1605
+ * [new branch]      b/1606 -> b/1606
+ * [new branch]      b/1607 -> b/1607
+ * [new branch]      b/1608 -> b/1608
+ * [new branch]      b/1609 -> b/1609
+ * [new branch]      b/1610 -> b/1610
+ * [new branch]      b/1611 -> b/1611
+ * [new branch]      b/1612 -> b/1612
+ * [new branch]      b/1613 -> b/1613
+ * [new branch]      b/1614 -> b/1614
+ * [new branch]      b/1615 -> b/1615
+ * [new branch]      b/1616 -> b/1616
+ * [new branch]      b/1617 -> b/1617
+ * [new branch]      b/1618 -> b/1618
+ * [new branch]      b/1619 -> b/1619
+ * [new branch]      b/1620 -> b/1620
+ * [new branch]      b/1621 -> b/1621
+ * [new branch]      b/1622 -> b/1622
+ * [new branch]      b/1623 -> b/1623
+ * [new branch]      b/1624 -> b/1624
+ * [new branch]      b/1625 -> b/1625
+ * [new branch]      b/1626 -> b/1626
+ * [new branch]      b/1627 -> b/1627
+ * [new branch]      b/1628 -> b/1628
+ * [new branch]      b/1629 -> b/1629
+ * [new branch]      b/1630 -> b/1630
+ * [new branch]      b/1631 -> b/1631
+ * [new branch]      b/1632 -> b/1632
+ * [new branch]      b/1633 -> b/1633
+ * [new branch]      b/1634 -> b/1634
+ * [new branch]      b/1635 -> b/1635
+ * [new branch]      b/1636 -> b/1636
+ * [new branch]      b/1637 -> b/1637
+ * [new branch]      b/1638 -> b/1638
+ * [new branch]      b/1639 -> b/1639
+ * [new branch]      b/1640 -> b/1640
+ * [new branch]      b/1641 -> b/1641
+ * [new branch]      b/1642 -> b/1642
+ * [new branch]      b/1643 -> b/1643
+ * [new branch]      b/1644 -> b/1644
+ * [new branch]      b/1645 -> b/1645
+ * [new branch]      b/1646 -> b/1646
+ * [new branch]      b/1647 -> b/1647
+ * [new branch]      b/1648 -> b/1648
+ * [new branch]      b/1649 -> b/1649
+ * [new branch]      b/1650 -> b/1650
+ * [new branch]      b/1651 -> b/1651
+ * [new branch]      b/1652 -> b/1652
+ * [new branch]      b/1653 -> b/1653
+ * [new branch]      b/1654 -> b/1654
+ * [new branch]      b/1655 -> b/1655
+ * [new branch]      b/1656 -> b/1656
+ * [new branch]      b/1657 -> b/1657
+ * [new branch]      b/1658 -> b/1658
+ * [new branch]      b/1659 -> b/1659
+ * [new branch]      b/1660 -> b/1660
+ * [new branch]      b/1661 -> b/1661
+ * [new branch]      b/1662 -> b/1662
+ * [new branch]      b/1663 -> b/1663
+ * [new branch]      b/1664 -> b/1664
+ * [new branch]      b/1665 -> b/1665
+ * [new branch]      b/1666 -> b/1666
+ * [new branch]      b/1667 -> b/1667
+ * [new branch]      b/1668 -> b/1668
+ * [new branch]      b/1669 -> b/1669
+ * [new branch]      b/1670 -> b/1670
+ * [new branch]      b/1671 -> b/1671
+ * [new branch]      b/1672 -> b/1672
+ * [new branch]      b/1673 -> b/1673
+ * [new branch]      b/1674 -> b/1674
+ * [new branch]      b/1675 -> b/1675
+ * [new branch]      b/1676 -> b/1676
+ * [new branch]      b/1677 -> b/1677
+ * [new branch]      b/1678 -> b/1678
+ * [new branch]      b/1679 -> b/1679
+ * [new branch]      b/1680 -> b/1680
+ * [new branch]      b/1681 -> b/1681
+ * [new branch]      b/1682 -> b/1682
+ * [new branch]      b/1683 -> b/1683
+ * [new branch]      b/1684 -> b/1684
+ * [new branch]      b/1685 -> b/1685
+ * [new branch]      b/1686 -> b/1686
+ * [new branch]      b/1687 -> b/1687
+ * [new branch]      b/1688 -> b/1688
+ * [new branch]      b/1689 -> b/1689
+ * [new branch]      b/1690 -> b/1690
+ * [new branch]      b/1691 -> b/1691
+ * [new branch]      b/1692 -> b/1692
+ * [new branch]      b/1693 -> b/1693
+ * [new branch]      b/1694 -> b/1694
+ * [new branch]      b/1695 -> b/1695
+ * [new branch]      b/1696 -> b/1696
+ * [new branch]      b/1697 -> b/1697
+ * [new branch]      b/1698 -> b/1698
+ * [new branch]      b/1699 -> b/1699
+ * [new branch]      b/1700 -> b/1700
+ * [new branch]      b/1701 -> b/1701
+ * [new branch]      b/1702 -> b/1702
+ * [new branch]      b/1703 -> b/1703
+ * [new branch]      b/1704 -> b/1704
+ * [new branch]      b/1705 -> b/1705
+ * [new branch]      b/1706 -> b/1706
+ * [new branch]      b/1707 -> b/1707
+ * [new branch]      b/1708 -> b/1708
+ * [new branch]      b/1709 -> b/1709
+ * [new branch]      b/1710 -> b/1710
+ * [new branch]      b/1711 -> b/1711
+ * [new branch]      b/1712 -> b/1712
+ * [new branch]      b/1713 -> b/1713
+ * [new branch]      b/1714 -> b/1714
+ * [new branch]      b/1715 -> b/1715
+ * [new branch]      b/1716 -> b/1716
+ * [new branch]      b/1717 -> b/1717
+ * [new branch]      b/1718 -> b/1718
+ * [new branch]      b/1719 -> b/1719
+ * [new branch]      b/1720 -> b/1720
+ * [new branch]      b/1721 -> b/1721
+ * [new branch]      b/1722 -> b/1722
+ * [new branch]      b/1723 -> b/1723
+ * [new branch]      b/1724 -> b/1724
+ * [new branch]      b/1725 -> b/1725
+ * [new branch]      b/1726 -> b/1726
+ * [new branch]      b/1727 -> b/1727
+ * [new branch]      b/1728 -> b/1728
+ * [new branch]      b/1729 -> b/1729
+ * [new branch]      b/1730 -> b/1730
+ * [new branch]      b/1731 -> b/1731
+ * [new branch]      b/1732 -> b/1732
+ * [new branch]      b/1733 -> b/1733
+ * [new branch]      b/1734 -> b/1734
+ * [new branch]      b/1735 -> b/1735
+ * [new branch]      b/1736 -> b/1736
+ * [new branch]      b/1737 -> b/1737
+ * [new branch]      b/1738 -> b/1738
+ * [new branch]      b/1739 -> b/1739
+ * [new branch]      b/1740 -> b/1740
+ * [new branch]      b/1741 -> b/1741
+ * [new branch]      b/1742 -> b/1742
+ * [new branch]      b/1743 -> b/1743
+ * [new branch]      b/1744 -> b/1744
+ * [new branch]      b/1745 -> b/1745
+ * [new branch]      b/1746 -> b/1746
+ * [new branch]      b/1747 -> b/1747
+ * [new branch]      b/1748 -> b/1748
+ * [new branch]      b/1749 -> b/1749
+ * [new branch]      b/1750 -> b/1750
+ * [new branch]      b/1751 -> b/1751
+ * [new branch]      b/1752 -> b/1752
+ * [new branch]      b/1753 -> b/1753
+ * [new branch]      b/1754 -> b/1754
+ * [new branch]      b/1755 -> b/1755
+ * [new branch]      b/1756 -> b/1756
+ * [new branch]      b/1757 -> b/1757
+ * [new branch]      b/1758 -> b/1758
+ * [new branch]      b/1759 -> b/1759
+ * [new branch]      b/1760 -> b/1760
+ * [new branch]      b/1761 -> b/1761
+ * [new branch]      b/1762 -> b/1762
+ * [new branch]      b/1763 -> b/1763
+ * [new branch]      b/1764 -> b/1764
+ * [new branch]      b/1765 -> b/1765
+ * [new branch]      b/1766 -> b/1766
+ * [new branch]      b/1767 -> b/1767
+ * [new branch]      b/1768 -> b/1768
+ * [new branch]      b/1769 -> b/1769
+ * [new branch]      b/1770 -> b/1770
+ * [new branch]      b/1771 -> b/1771
+ * [new branch]      b/1772 -> b/1772
+ * [new branch]      b/1773 -> b/1773
+ * [new branch]      b/1774 -> b/1774
+ * [new branch]      b/1775 -> b/1775
+ * [new branch]      b/1776 -> b/1776
+ * [new branch]      b/1777 -> b/1777
+ * [new branch]      b/1778 -> b/1778
+ * [new branch]      b/1779 -> b/1779
+ * [new branch]      b/1780 -> b/1780
+ * [new branch]      b/1781 -> b/1781
+ * [new branch]      b/1782 -> b/1782
+ * [new branch]      b/1783 -> b/1783
+ * [new branch]      b/1784 -> b/1784
+ * [new branch]      b/1785 -> b/1785
+ * [new branch]      b/1786 -> b/1786
+ * [new branch]      b/1787 -> b/1787
+ * [new branch]      b/1788 -> b/1788
+ * [new branch]      b/1789 -> b/1789
+ * [new branch]      b/1790 -> b/1790
+ * [new branch]      b/1791 -> b/1791
+ * [new branch]      b/1792 -> b/1792
+ * [new branch]      b/1793 -> b/1793
+ * [new branch]      b/1794 -> b/1794
+ * [new branch]      b/1795 -> b/1795
+ * [new branch]      b/1796 -> b/1796
+ * [new branch]      b/1797 -> b/1797
+ * [new branch]      b/1798 -> b/1798
+ * [new branch]      b/1799 -> b/1799
+ * [new branch]      b/1800 -> b/1800
+ * [new branch]      b/1801 -> b/1801
+ * [new branch]      b/1802 -> b/1802
+ * [new branch]      b/1803 -> b/1803
+ * [new branch]      b/1804 -> b/1804
+ * [new branch]      b/1805 -> b/1805
+ * [new branch]      b/1806 -> b/1806
+ * [new branch]      b/1807 -> b/1807
+ * [new branch]      b/1808 -> b/1808
+ * [new branch]      b/1809 -> b/1809
+ * [new branch]      b/1810 -> b/1810
+ * [new branch]      b/1811 -> b/1811
+ * [new branch]      b/1812 -> b/1812
+ * [new branch]      b/1813 -> b/1813
+ * [new branch]      b/1814 -> b/1814
+ * [new branch]      b/1815 -> b/1815
+ * [new branch]      b/1816 -> b/1816
+ * [new branch]      b/1817 -> b/1817
+ * [new branch]      b/1818 -> b/1818
+ * [new branch]      b/1819 -> b/1819
+ * [new branch]      b/1820 -> b/1820
+ * [new branch]      b/1821 -> b/1821
+ * [new branch]      b/1822 -> b/1822
+ * [new branch]      b/1823 -> b/1823
+ * [new branch]      b/1824 -> b/1824
+ * [new branch]      b/1825 -> b/1825
+ * [new branch]      b/1826 -> b/1826
+ * [new branch]      b/1827 -> b/1827
+ * [new branch]      b/1828 -> b/1828
+ * [new branch]      b/1829 -> b/1829
+ * [new branch]      b/1830 -> b/1830
+ * [new branch]      b/1831 -> b/1831
+ * [new branch]      b/1832 -> b/1832
+ * [new branch]      b/1833 -> b/1833
+ * [new branch]      b/1834 -> b/1834
+ * [new branch]      b/1835 -> b/1835
+ * [new branch]      b/1836 -> b/1836
+ * [new branch]      b/1837 -> b/1837
+ * [new branch]      b/1838 -> b/1838
+ * [new branch]      b/1839 -> b/1839
+ * [new branch]      b/1840 -> b/1840
+ * [new branch]      b/1841 -> b/1841
+ * [new branch]      b/1842 -> b/1842
+ * [new branch]      b/1843 -> b/1843
+ * [new branch]      b/1844 -> b/1844
+ * [new branch]      b/1845 -> b/1845
+ * [new branch]      b/1846 -> b/1846
+ * [new branch]      b/1847 -> b/1847
+ * [new branch]      b/1848 -> b/1848
+ * [new branch]      b/1849 -> b/1849
+ * [new branch]      b/1850 -> b/1850
+ * [new branch]      b/1851 -> b/1851
+ * [new branch]      b/1852 -> b/1852
+ * [new branch]      b/1853 -> b/1853
+ * [new branch]      b/1854 -> b/1854
+ * [new branch]      b/1855 -> b/1855
+ * [new branch]      b/1856 -> b/1856
+ * [new branch]      b/1857 -> b/1857
+ * [new branch]      b/1858 -> b/1858
+ * [new branch]      b/1859 -> b/1859
+ * [new branch]      b/1860 -> b/1860
+ * [new branch]      b/1861 -> b/1861
+ * [new branch]      b/1862 -> b/1862
+ * [new branch]      b/1863 -> b/1863
+ * [new branch]      b/1864 -> b/1864
+ * [new branch]      b/1865 -> b/1865
+ * [new branch]      b/1866 -> b/1866
+ * [new branch]      b/1867 -> b/1867
+ * [new branch]      b/1868 -> b/1868
+ * [new branch]      b/1869 -> b/1869
+ * [new branch]      b/1870 -> b/1870
+ * [new branch]      b/1871 -> b/1871
+ * [new branch]      b/1872 -> b/1872
+ * [new branch]      b/1873 -> b/1873
+ * [new branch]      b/1874 -> b/1874
+ * [new branch]      b/1875 -> b/1875
+ * [new branch]      b/1876 -> b/1876
+ * [new branch]      b/1877 -> b/1877
+ * [new branch]      b/1878 -> b/1878
+ * [new branch]      b/1879 -> b/1879
+ * [new branch]      b/1880 -> b/1880
+ * [new branch]      b/1881 -> b/1881
+ * [new branch]      b/1882 -> b/1882
+ * [new branch]      b/1883 -> b/1883
+ * [new branch]      b/1884 -> b/1884
+ * [new branch]      b/1885 -> b/1885
+ * [new branch]      b/1886 -> b/1886
+ * [new branch]      b/1887 -> b/1887
+ * [new branch]      b/1888 -> b/1888
+ * [new branch]      b/1889 -> b/1889
+ * [new branch]      b/1890 -> b/1890
+ * [new branch]      b/1891 -> b/1891
+ * [new branch]      b/1892 -> b/1892
+ * [new branch]      b/1893 -> b/1893
+ * [new branch]      b/1894 -> b/1894
+ * [new branch]      b/1895 -> b/1895
+ * [new branch]      b/1896 -> b/1896
+ * [new branch]      b/1897 -> b/1897
+ * [new branch]      b/1898 -> b/1898
+ * [new branch]      b/1899 -> b/1899
+ * [new branch]      b/1900 -> b/1900
+ * [new branch]      b/1901 -> b/1901
+ * [new branch]      b/1902 -> b/1902
+ * [new branch]      b/1903 -> b/1903
+ * [new branch]      b/1904 -> b/1904
+ * [new branch]      b/1905 -> b/1905
+ * [new branch]      b/1906 -> b/1906
+ * [new branch]      b/1907 -> b/1907
+ * [new branch]      b/1908 -> b/1908
+ * [new branch]      b/1909 -> b/1909
+ * [new branch]      b/1910 -> b/1910
+ * [new branch]      b/1911 -> b/1911
+ * [new branch]      b/1912 -> b/1912
+ * [new branch]      b/1913 -> b/1913
+ * [new branch]      b/1914 -> b/1914
+ * [new branch]      b/1915 -> b/1915
+ * [new branch]      b/1916 -> b/1916
+ * [new branch]      b/1917 -> b/1917
+ * [new branch]      b/1918 -> b/1918
+ * [new branch]      b/1919 -> b/1919
+ * [new branch]      b/1920 -> b/1920
+ * [new branch]      b/1921 -> b/1921
+ * [new branch]      b/1922 -> b/1922
+ * [new branch]      b/1923 -> b/1923
+ * [new branch]      b/1924 -> b/1924
+ * [new branch]      b/1925 -> b/1925
+ * [new branch]      b/1926 -> b/1926
+ * [new branch]      b/1927 -> b/1927
+ * [new branch]      b/1928 -> b/1928
+ * [new branch]      b/1929 -> b/1929
+ * [new branch]      b/1930 -> b/1930
+ * [new branch]      b/1931 -> b/1931
+ * [new branch]      b/1932 -> b/1932
+ * [new branch]      b/1933 -> b/1933
+ * [new branch]      b/1934 -> b/1934
+ * [new branch]      b/1935 -> b/1935
+ * [new branch]      b/1936 -> b/1936
+ * [new branch]      b/1937 -> b/1937
+ * [new branch]      b/1938 -> b/1938
+ * [new branch]      b/1939 -> b/1939
+ * [new branch]      b/1940 -> b/1940
+ * [new branch]      b/1941 -> b/1941
+ * [new branch]      b/1942 -> b/1942
+ * [new branch]      b/1943 -> b/1943
+ * [new branch]      b/1944 -> b/1944
+ * [new branch]      b/1945 -> b/1945
+ * [new branch]      b/1946 -> b/1946
+ * [new branch]      b/1947 -> b/1947
+ * [new branch]      b/1948 -> b/1948
+ * [new branch]      b/1949 -> b/1949
+ * [new branch]      b/1950 -> b/1950
+ * [new branch]      b/1951 -> b/1951
+ * [new branch]      b/1952 -> b/1952
+ * [new branch]      b/1953 -> b/1953
+ * [new branch]      b/1954 -> b/1954
+ * [new branch]      b/1955 -> b/1955
+ * [new branch]      b/1956 -> b/1956
+ * [new branch]      b/1957 -> b/1957
+ * [new branch]      b/1958 -> b/1958
+ * [new branch]      b/1959 -> b/1959
+ * [new branch]      b/1960 -> b/1960
+ * [new branch]      b/1961 -> b/1961
+ * [new branch]      b/1962 -> b/1962
+ * [new branch]      b/1963 -> b/1963
+ * [new branch]      b/1964 -> b/1964
+ * [new branch]      b/1965 -> b/1965
+ * [new branch]      b/1966 -> b/1966
+ * [new branch]      b/1967 -> b/1967
+ * [new branch]      b/1968 -> b/1968
+ * [new branch]      b/1969 -> b/1969
+ * [new branch]      b/1970 -> b/1970
+ * [new branch]      b/1971 -> b/1971
+ * [new branch]      b/1972 -> b/1972
+ * [new branch]      b/1973 -> b/1973
+ * [new branch]      b/1974 -> b/1974
+ * [new branch]      b/1975 -> b/1975
+ * [new branch]      b/1976 -> b/1976
+ * [new branch]      b/1977 -> b/1977
+ * [new branch]      b/1978 -> b/1978
+ * [new branch]      b/1979 -> b/1979
+ * [new branch]      b/1980 -> b/1980
+ * [new branch]      b/1981 -> b/1981
+ * [new branch]      b/1982 -> b/1982
+ * [new branch]      b/1983 -> b/1983
+ * [new branch]      b/1984 -> b/1984
+ * [new branch]      b/1985 -> b/1985
+ * [new branch]      b/1986 -> b/1986
+ * [new branch]      b/1987 -> b/1987
+ * [new branch]      b/1988 -> b/1988
+ * [new branch]      b/1989 -> b/1989
+ * [new branch]      b/1990 -> b/1990
+ * [new branch]      b/1991 -> b/1991
+ * [new branch]      b/1992 -> b/1992
+ * [new branch]      b/1993 -> b/1993
+ * [new branch]      b/1994 -> b/1994
+ * [new branch]      b/1995 -> b/1995
+ * [new branch]      b/1996 -> b/1996
+ * [new branch]      b/1997 -> b/1997
+ * [new branch]      b/1998 -> b/1998
+ * [new branch]      b/1999 -> b/1999
+ * [new branch]      b/2000 -> b/2000
+ok 11 - sigpipe does not cause pre-push hook failure
 
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-To parent
- * [new branch]      main -> main
-Switched to a new branch 'other'
-[other 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-To parent
- * [new branch]      other -> other
-ok 2 - setup commit on main and other fetch
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5580-unc-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5580-unc-paths/.git/
+1..0 # SKIP skipping Windows-only path tests
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5558-clone-bundle-uri.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-expecting success of 5553.3 'fetch --set-upstream does not set upstream w/o branch': 
-	clear_config main other &&
-	git checkout main &&
-	git fetch --set-upstream upstream &&
-	check_config_missing main &&
-	check_config_missing other
+warning: failed to download bundle from URI '/build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/does-not-exist'
+ok 1 - fail to clone from non-existent file
 
-Switched to branch 'main'
-warning: no source branch found;
-you need to specify exactly one branch with the --set-upstream option
-ok 3 - fetch --set-upstream does not set upstream w/o branch
+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
 
-expecting success of 5553.4 'fetch --set-upstream upstream main sets branch main but not other': 
-	clear_config main other &&
-	git fetch --set-upstream upstream main &&
-	check_config main upstream refs/heads/main &&
-	check_config_missing other
+warning: file at URI '/build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/bogus' is not a bundle or bundle list
+ok 2 - fail to clone from non-bundle file
 
-From parent
- * branch            main       -> FETCH_HEAD
-ok 4 - fetch --set-upstream upstream main sets branch main but not other
+expecting success of 5558.3 'create bundle': 
+	git init clone-from &&
+	(
+		cd clone-from &&
+		git checkout -b topic &&
 
-expecting success of 5553.5 'fetch --set-upstream upstream other sets branch other': 
-	clear_config main other &&
-	git fetch --set-upstream upstream other &&
-	check_config main upstream refs/heads/other &&
-	check_config_missing other
+		test_commit A &&
+		git bundle create A.bundle topic &&
 
-From parent
- * branch            other      -> FETCH_HEAD
-ok 5 - fetch --set-upstream upstream other sets branch other
+		test_commit B &&
+		git bundle create B.bundle topic &&
 
-expecting success of 5553.6 'fetch --set-upstream main:other does not set the branch other2': 
-	clear_config other2 &&
-	git fetch --set-upstream upstream main:other2 &&
-	check_config_missing other2
+		# 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 &&
 
-From parent
- * [new branch]      main       -> other2
-warning: no source branch found;
-you need to specify exactly one branch with the --set-upstream option
-ok 6 - fetch --set-upstream main:other does not set the branch other2
+		tree_b=$(git rev-parse B^{tree}) &&
+		cat >data <<-EOF &&
+		tree $tree_b
+		parent $commit_b
+		author A U Thor
+		committer A U Thor
 
-expecting success of 5553.7 'fetch --set-upstream ./does-not-exist fails with invalid url': 
-	# main explicitly not cleared, we check that it is not touched from previous value
-	clear_config other other2 &&
-	test_must_fail git fetch --set-upstream ./does-not-exist &&
-	check_config main upstream refs/heads/other &&
-	check_config_missing other &&
-	check_config_missing other2
+		commit: this is a commit with bad emails
 
-fatal: './does-not-exist' does not appear to be a git repository
-fatal: Could not read from remote repository.
+		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
+	)
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 7 - fetch --set-upstream ./does-not-exist fails with invalid url
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/clone-from/.git/
+Switched to a new branch 'topic'
+[topic (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[topic d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+ok 3 - create bundle
 
-expecting success of 5553.8 'fetch --set-upstream with valid URL sets upstream to URL': 
-	clear_config other other2 &&
-	url="file://$PWD" &&
-	git fetch --set-upstream "$url" &&
-	check_config main "$url" HEAD &&
-	check_config_missing other &&
-	check_config_missing other2
+expecting success of 5558.4 'clone with path bundle': 
+	git clone --bundle-uri="clone-from/B.bundle" \
+		clone-from clone-path &&
+	git -C clone-path rev-parse refs/bundles/heads/topic >actual &&
+	git -C clone-from rev-parse topic >expect &&
+	test_cmp expect actual
 
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5553-set-upstream
- * branch            HEAD       -> FETCH_HEAD
-ok 8 - fetch --set-upstream with valid URL sets upstream to URL
+Cloning into 'clone-path'...
+done.
+ok 4 - clone with path bundle
 
-expecting success of 5553.9 'fetch --set-upstream with a detached HEAD': 
-	git checkout HEAD^0 &&
-	test_when_finished "git checkout -" &&
-	cat >expect <<-\EOF &&
-	warning: could not set upstream of HEAD to 'main' from 'upstream' when it does not point to any branch.
-	EOF
-	git fetch --set-upstream upstream main 2>actual.raw &&
-	grep ^warning: actual.raw >actual &&
-	test_cmp expect actual
+expecting success of 5558.5 'clone with bundle that has bad header': 
+	# Write bundle ref fails, but clone can still proceed.
+	git clone --bundle-uri="clone-from/bad-header.bundle" \
+		clone-from clone-bad-header 2>err &&
+	commit_b=$(git -C clone-from rev-parse B) &&
+	test_grep "trying to write ref 'refs/bundles/heads/topic' with nonexistent object $commit_b" err &&
+	git -C clone-bad-header for-each-ref --format="%(refname)" >refs &&
+	test_grep ! "refs/bundles/heads/" refs
 
-Note: switching to 'HEAD^0'.
+error: update_ref failed for ref 'refs/bundles/heads/topic': cannot update ref 'refs/bundles/heads/topic': trying to write ref 'refs/bundles/heads/topic' with nonexistent object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 5 - clone with bundle that has bad 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 5558.6 'clone with bundle that has bad object': 
+	# Unbundle succeeds if no fsckObjects configured.
+	git clone --bundle-uri="clone-from/bad-object.bundle" \
+		clone-from clone-bad-object-no-fsck &&
+	git -C clone-bad-object-no-fsck for-each-ref --format="%(refname)" >refs &&
+	grep "refs/bundles/heads/" refs >actual &&
+	test_write_lines refs/bundles/heads/bad >expect &&
+	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:
+	# Unbundle fails with fsckObjects set true, but clone can still proceed.
+	git -c fetch.fsckObjects=true clone --bundle-uri="clone-from/bad-object.bundle" \
+		clone-from clone-bad-object-fsck 2>err &&
+	test_grep "missingEmail" err &&
+	git -C clone-bad-object-fsck for-each-ref --format="%(refname)" >refs &&
+	test_grep ! "refs/bundles/heads/" refs
 
-  git switch -c <new-branch-name>
+Cloning into 'clone-bad-object-no-fsck'...
+done.
+error: object b1e96ad58da3bdf44c62b36b85d7a16ba0a5a20c: missingEmail: invalid author/committer line - missing email
+ok 6 - clone with bundle that has bad object
 
-Or undo this operation with:
+expecting success of 5558.7 'clone with path bundle and non-default hash': 
+	test_when_finished "rm -rf clone-path-non-default-hash" &&
+	GIT_DEFAULT_HASH=sha256 git clone --bundle-uri="clone-from/B.bundle" \
+		clone-from clone-path-non-default-hash &&
+	git -C clone-path-non-default-hash rev-parse refs/bundles/heads/topic >actual &&
+	git -C clone-from rev-parse topic >expect &&
+	test_cmp expect actual
 
-  git switch -
+Cloning into 'clone-path-non-default-hash'...
+done.
+ok 7 - clone with path bundle and non-default hash
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5558.8 'clone with file:// bundle': 
+	git clone --bundle-uri="file://$(pwd)/clone-from/B.bundle" \
+		clone-from clone-file &&
+	git -C clone-file rev-parse refs/bundles/heads/topic >actual &&
+	git -C clone-from rev-parse topic >expect &&
+	test_cmp expect actual
 
-HEAD is now at d79ce16 one
-Switched to branch 'main'
-ok 9 - fetch --set-upstream with a detached HEAD
+Cloning into 'clone-file'...
+done.
+ok 8 - clone with file:// bundle
 
-expecting success of 5553.10 'setup bare parent pull': 
-	git remote rm upstream &&
-	ensure_fresh_upstream &&
-	git remote add upstream parent
+expecting success of 5558.9 'create bundle with tags': 
+	git init clone-from-tags &&
+	(
+		cd clone-from-tags &&
+		git checkout -b base &&
+		git checkout -b topic &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5553-set-upstream/parent/
-ok 10 - setup bare parent pull
+		test_commit A &&
+		git tag tag-A &&
+		git checkout -b base &&
+		git branch -d topic &&
+		test_commit B &&
 
-expecting success of 5553.11 'setup commit on main and other pull': 
-	test_commit three &&
-	git push --tags upstream main &&
-	test_commit four &&
-	git push upstream other
+		git bundle create ALL.bundle --all &&
+		git bundle verify ALL.bundle
+	)
 
-[main 897c206] three
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/clone-from-tags/.git/
+Switched to a new branch 'base'
+Switched to a new branch 'topic'
+[topic (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 three.t
-To parent
- * [new branch]      main -> main
- * [new tag]         one -> one
- * [new tag]         three -> three
- * [new tag]         two -> two
-[main 6f2ec4d] four
+ create mode 100644 A.t
+Switched to a new branch 'base'
+Deleted branch topic (was 0ddfaf1).
+[base d9df450] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 four.t
-To parent
- * [new branch]      other -> other
-ok 11 - setup commit on main and other pull
-
-expecting success of 5553.12 'pull --set-upstream upstream main sets branch main but not other': 
-	clear_config main other &&
-	git pull --no-rebase --set-upstream upstream main &&
-	check_config main upstream refs/heads/main &&
-	check_config_missing other
-
-From parent
- * branch            main       -> FETCH_HEAD
-Already up to date.
-ok 12 - pull --set-upstream upstream main sets branch main but not other
-
-expecting success of 5553.13 'pull --set-upstream main:other2 does not set the branch other2': 
-	clear_config other2 &&
-	git pull --no-rebase --set-upstream upstream main:other2 &&
-	check_config_missing other2
-
-From parent
-   d79ce16..897c206  main       -> other2
-warning: no source branch found;
-you need to specify exactly one branch with the --set-upstream option
-Already up to date.
-ok 13 - pull --set-upstream main:other2 does not set the branch other2
-
-expecting success of 5553.14 'pull --set-upstream upstream other sets branch main': 
-	clear_config main other &&
-	git pull --no-rebase --set-upstream upstream other &&
-	check_config main upstream refs/heads/other &&
-	check_config_missing other
-
-From parent
- * branch            other      -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 14 - pull --set-upstream upstream other sets branch main
+ create mode 100644 B.t
+ALL.bundle is okay
+The bundle contains these 5 refs:
+d9df4505cb3522088b9e29d6051ac16f1564154a refs/heads/base
+0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 refs/tags/A
+d9df4505cb3522088b9e29d6051ac16f1564154a refs/tags/B
+0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 refs/tags/tag-A
+d9df4505cb3522088b9e29d6051ac16f1564154a HEAD
+The bundle records a complete history.
+The bundle uses this hash algorithm: sha1
+ok 9 - create bundle with tags
 
-expecting success of 5553.15 'pull --set-upstream upstream tag does not set the tag': 
-	clear_config three &&
-	git pull --no-rebase --tags --set-upstream upstream three &&
-	check_config_missing three
+expecting success of 5558.10 'clone with tags bundle': 
+	git clone --bundle-uri="clone-from-tags/ALL.bundle" \
+		clone-from-tags clone-tags-path &&
 
-From parent
- * tag               three      -> FETCH_HEAD
-warning: not setting upstream for a remote tag
-Already up to date.
-ok 15 - pull --set-upstream upstream tag does not set the tag
+	git -C clone-from-tags for-each-ref --format="%(refname:lstrip=1)" \
+		>expect &&
+	git -C clone-tags-path for-each-ref --format="%(refname:lstrip=2)" \
+		refs/bundles >actual &&
 
-expecting success of 5553.16 'pull --set-upstream ./does-not-exist fails with invalid url': 
-	# main explicitly not cleared, we check that it is not touched from previous value
-	clear_config other other2 three &&
-	test_must_fail git pull --set-upstream ./does-not-exist &&
-	check_config main upstream refs/heads/other &&
-	check_config_missing other &&
-	check_config_missing other2 &&
-	check_config_missing three
+	test_cmp expect actual
 
-fatal: './does-not-exist' does not appear to be a git repository
-fatal: Could not read from remote repository.
+Cloning into 'clone-tags-path'...
+done.
+ok 10 - clone with tags bundle
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 16 - pull --set-upstream ./does-not-exist fails with invalid url
+expecting success of 5558.11 'construct incremental bundle list': 
+	(
+		cd clone-from &&
+		git checkout -b base &&
+		test_commit 1 &&
+		git checkout -b left &&
+		test_commit 2 &&
+		git checkout -b right base &&
+		test_commit 3 &&
+		git checkout -b merge left &&
+		git merge right -m "4" &&
 
-expecting success of 5553.17 'pull --set-upstream upstream HEAD sets branch HEAD': 
-	clear_config main other &&
-	git pull --no-rebase --set-upstream upstream HEAD &&
-	check_config main upstream HEAD &&
-	git checkout other &&
-	git pull --no-rebase --set-upstream upstream HEAD &&
-	check_config other upstream HEAD
+		git bundle create bundle-1.bundle base &&
+		git bundle create bundle-2.bundle base..left &&
+		git bundle create bundle-3.bundle base..right &&
+		git bundle create bundle-4.bundle merge --not left right
+	)
 
-From parent
- * branch            HEAD       -> FETCH_HEAD
-Already up to date.
-Switched to branch 'other'
-From parent
- * branch            HEAD       -> FETCH_HEAD
+Switched to a new branch 'base'
+[base 4fcc740] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+Switched to a new branch 'left'
+[left 6b9ff9e] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+Switched to a new branch 'right'
+[right 45c64d6] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+Switched to a new branch 'merge'
 Merge made by the 'ort' strategy.
- three.t | 1 +
+ 3.t | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 17 - pull --set-upstream upstream HEAD sets branch HEAD
+ create mode 100644 3.t
+ok 11 - construct incremental bundle list
 
-expecting success of 5553.18 'pull --set-upstream upstream with more than one branch does nothing': 
-	clear_config main three &&
-	git pull --no-rebase --set-upstream upstream main three &&
-	check_config_missing main &&
-	check_config_missing three
+expecting success of 5558.12 'clone bundle list (file, no heuristic)': 
+	cat >bundle-list <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
 
-From parent
- * branch            main       -> FETCH_HEAD
- * tag               three      -> FETCH_HEAD
-warning: multiple branches detected, incompatible with --set-upstream
-Already up to date.
-ok 18 - pull --set-upstream upstream with more than one branch does nothing
+	[bundle "bundle-1"]
+		uri = file://$(pwd)/clone-from/bundle-1.bundle
 
-expecting success of 5553.19 'pull --set-upstream with valid URL sets upstream to URL': 
-	clear_config main other other2 &&
-	git checkout main &&
-	url="file://$PWD" &&
-	git pull --set-upstream "$url" &&
-	check_config main "$url" HEAD &&
-	check_config_missing other &&
-	check_config_missing other2
+	[bundle "bundle-2"]
+		uri = file://$(pwd)/clone-from/bundle-2.bundle
 
-Switched to branch 'main'
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5553-set-upstream
- * branch            HEAD       -> FETCH_HEAD
-Already up to date.
-ok 19 - pull --set-upstream with valid URL sets upstream to URL
+	[bundle "bundle-3"]
+		uri = file://$(pwd)/clone-from/bundle-3.bundle
 
-expecting success of 5553.20 'pull --set-upstream with valid URL and branch sets branch': 
-	clear_config main other other2 &&
-	git checkout main &&
-	url="file://$PWD" &&
-	git pull --set-upstream "$url" main &&
-	check_config main "$url" refs/heads/main &&
-	check_config_missing other &&
-	check_config_missing other2
+	[bundle "bundle-4"]
+		uri = file://$(pwd)/clone-from/bundle-4.bundle
+	EOF
 
-Already on 'main'
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5553-set-upstream
- * branch            main       -> FETCH_HEAD
-Already up to date.
-ok 20 - pull --set-upstream with valid URL and branch sets branch
+	git clone --bundle-uri="file://$(pwd)/bundle-list" \
+		clone-from clone-list-file 2>err &&
+	! grep "Repository lacks these prerequisite commits" err &&
 
-expecting success of 5553.21 'pull --set-upstream with a detached HEAD': 
-	git checkout HEAD^0 &&
-	test_when_finished "git checkout -" &&
+	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
+	git -C clone-list-file cat-file --batch-check <oids &&
+
+	git -C clone-list-file for-each-ref --format="%(refname)" >refs &&
+	grep "refs/bundles/heads/" refs >actual &&
 	cat >expect <<-\EOF &&
-	warning: could not set upstream of HEAD to 'main' from 'upstream' when it does not point to any branch.
+	refs/bundles/heads/base
+	refs/bundles/heads/left
+	refs/bundles/heads/merge
+	refs/bundles/heads/right
 	EOF
-	git pull --no-rebase --set-upstream upstream main 2>actual.raw &&
-	grep ^warning: actual.raw >actual &&
 	test_cmp expect actual
 
-Note: switching to 'HEAD^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>
+4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
+6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
+d09d684a6612e5155bd0961403c4cb77f90000cc commit 261
+45c64d67e8521343f79effee984fd1e910d8fead commit 213
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
+6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
+45c64d67e8521343f79effee984fd1e910d8fead commit 213
+0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+ok 12 - clone bundle list (file, no heuristic)
 
-Or undo this operation with:
+expecting success of 5558.13 'clone bundle list (file, all mode, some failures)': 
+	cat >bundle-list <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
 
-  git switch -
+	# Does not exist. Should be skipped.
+	[bundle "bundle-0"]
+		uri = file://$(pwd)/clone-from/bundle-0.bundle
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	[bundle "bundle-1"]
+		uri = file://$(pwd)/clone-from/bundle-1.bundle
 
-HEAD is now at 066b1d4 Merge branch 'other' of parent
-Already up to date.
-Switched to branch 'main'
-ok 21 - pull --set-upstream with a detached HEAD
+	[bundle "bundle-2"]
+		uri = file://$(pwd)/clone-from/bundle-2.bundle
 
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5562-http-backend-content-length.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5562-http-backend-content-length/.git/
-expecting success of 5562.1 'setup': 
-	HTTP_CONTENT_ENCODING="identity" &&
-	export HTTP_CONTENT_ENCODING &&
-	git config http.receivepack true &&
-	test_commit c0 &&
-	test_commit c1 &&
-	hash_head=$(git rev-parse HEAD) &&
-	hash_prev=$(git rev-parse HEAD~1) &&
-	{
-		packetize "want $hash_head" &&
-		printf 0000 &&
-		packetize "have $hash_prev" &&
-		packetize "done"
-	} >fetch_body &&
-	test_copy_bytes 10 <fetch_body >fetch_body.trunc &&
-	hash_next=$(git commit-tree -p HEAD -m next HEAD^{tree}) &&
-	{
-		printf "%s %s refs/heads/newbranch\\0report-status object-format=%s\\n" \
-			"$ZERO_OID" "$hash_next" "$(test_oid algo)" | packetize_raw &&
-		printf 0000 &&
-		echo "$hash_next" | git pack-objects --stdout
-	} >push_body &&
-	test_copy_bytes 10 <push_body >push_body.trunc &&
-	: >empty_body
+	# No bundle-3 means bundle-4 will not apply.
 
-[master (root-commit) a44f171] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.t
-[master 989de5e] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.t
-ok 1 - setup
+	[bundle "bundle-4"]
+		uri = file://$(pwd)/clone-from/bundle-4.bundle
 
-checking prerequisite: GZIP
+	# Does not exist. Should be skipped.
+	[bundle "bundle-5"]
+		uri = file://$(pwd)/clone-from/bundle-5.bundle
+	EOF
 
-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.
+	GIT_TRACE2_PERF=1 \
+	git clone --bundle-uri="file://$(pwd)/bundle-list" \
+		clone-from clone-all-some 2>err &&
+	! grep "Repository lacks these prerequisite commits" err &&
+	! grep "fatal" err &&
+	grep "warning: failed to download bundle from URI" err &&
 
-Written by Jean-loup Gailly.
-prerequisite GZIP ok
-expecting success of 5562.2 'setup, compression related': 
-	gzip -c fetch_body >fetch_body.gz &&
-	test_copy_bytes 10 <fetch_body.gz >fetch_body.gz.trunc &&
-	gzip -c push_body >push_body.gz &&
-	test_copy_bytes 10 <push_body.gz >push_body.gz.trunc
+	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
+	git -C clone-all-some cat-file --batch-check <oids &&
 
-ok 2 - setup, compression related
+	git -C clone-all-some for-each-ref --format="%(refname)" >refs &&
+	grep "refs/bundles/heads/" refs >actual &&
+	cat >expect <<-\EOF &&
+	refs/bundles/heads/base
+	refs/bundles/heads/left
+	EOF
+	test_cmp expect actual
 
-expecting success of 5562.3 'fetch plain': 
-	test_http_env upload fetch_body &&
-	verify_http_result "200 OK"
+warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-5.bundle'
+warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-0.bundle'
+4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
+6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
+d09d684a6612e5155bd0961403c4cb77f90000cc commit 261
+45c64d67e8521343f79effee984fd1e910d8fead commit 213
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
+6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
+45c64d67e8521343f79effee984fd1e910d8fead commit 213
+0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+ok 13 - clone bundle list (file, all mode, some failures)
 
-ok 3 - fetch plain
+expecting success of 5558.14 'clone bundle list (file, all mode, all failures)': 
+	cat >bundle-list <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
 
-expecting success of 5562.4 'fetch plain truncated': 
-	test_http_env upload fetch_body.trunc &&
-	! verify_http_result "200 OK"
+	# Does not exist. Should be skipped.
+	[bundle "bundle-0"]
+		uri = file://$(pwd)/clone-from/bundle-0.bundle
 
-fatal: the remote end hung up unexpectedly
-ok 4 - fetch plain truncated
+	# Does not exist. Should be skipped.
+	[bundle "bundle-5"]
+		uri = file://$(pwd)/clone-from/bundle-5.bundle
+	EOF
 
-expecting success of 5562.5 'fetch plain empty': 
-	test_http_env upload empty_body &&
-	! verify_http_result "200 OK"
+	git clone --bundle-uri="file://$(pwd)/bundle-list" \
+		clone-from clone-all-fail 2>err &&
+	! grep "Repository lacks these prerequisite commits" err &&
+	! grep "fatal" err &&
+	grep "warning: failed to download bundle from URI" err &&
 
-fatal: the remote end hung up unexpectedly
-ok 5 - fetch plain empty
+	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
+	git -C clone-all-fail cat-file --batch-check <oids &&
 
-expecting success of 5562.6 'fetch gzipped': 
-	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload fetch_body.gz &&
-	verify_http_result "200 OK"
+	git -C clone-all-fail for-each-ref --format="%(refname)" >refs &&
+	! grep "refs/bundles/heads/" refs
 
-ok 6 - fetch gzipped
+warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-5.bundle'
+warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-0.bundle'
+4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
+6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
+d09d684a6612e5155bd0961403c4cb77f90000cc commit 261
+45c64d67e8521343f79effee984fd1e910d8fead commit 213
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
+6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
+45c64d67e8521343f79effee984fd1e910d8fead commit 213
+0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+ok 14 - clone bundle list (file, all mode, all failures)
 
-expecting success of 5562.7 'fetch gzipped truncated': 
-	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload fetch_body.gz.trunc &&
-	! verify_http_result "200 OK"
+expecting success of 5558.15 'clone bundle list (file, any mode)': 
+	cat >bundle-list <<-EOF &&
+	[bundle]
+		version = 1
+		mode = any
 
-fatal: request ended in the middle of the gzip stream
-ok 7 - fetch gzipped truncated
+	# Does not exist. Should be skipped.
+	[bundle "bundle-0"]
+		uri = file://$(pwd)/clone-from/bundle-0.bundle
 
-expecting success of 5562.8 'fetch gzipped empty': 
-	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload empty_body &&
-	! verify_http_result "200 OK"
+	[bundle "bundle-1"]
+		uri = file://$(pwd)/clone-from/bundle-1.bundle
 
-fatal: request ended in the middle of the gzip stream
-ok 8 - fetch gzipped empty
+	# Does not exist. Should be skipped.
+	[bundle "bundle-5"]
+		uri = file://$(pwd)/clone-from/bundle-5.bundle
+	EOF
 
-expecting success of 5562.9 'push plain': 
-	test_when_finished "git branch -D newbranch" &&
-	test_http_env receive push_body &&
-	verify_http_result "200 OK" &&
-	git rev-parse newbranch >act.head &&
-	echo "$hash_next" >exp.head &&
-	test_cmp act.head exp.head
+	git clone --bundle-uri="file://$(pwd)/bundle-list" \
+		clone-from clone-any-file 2>err &&
+	! grep "Repository lacks these prerequisite commits" err &&
 
-Deleted branch newbranch (was d8aa3fa).
-ok 9 - push plain
+	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
+	git -C clone-any-file cat-file --batch-check <oids &&
 
-expecting success of 5562.10 'push plain truncated': 
-	test_http_env receive push_body.trunc &&
-	! verify_http_result "200 OK"
+	git -C clone-any-file for-each-ref --format="%(refname)" >refs &&
+	grep "refs/bundles/heads/" refs >actual &&
+	cat >expect <<-\EOF &&
+	refs/bundles/heads/base
+	EOF
+	test_cmp expect actual
 
-fatal: the remote end hung up unexpectedly
-ok 10 - push plain truncated
+4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
+6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
+d09d684a6612e5155bd0961403c4cb77f90000cc commit 261
+45c64d67e8521343f79effee984fd1e910d8fead commit 213
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
+6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
+45c64d67e8521343f79effee984fd1e910d8fead commit 213
+0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+ok 15 - clone bundle list (file, any mode)
 
-expecting success of 5562.11 'push plain empty': 
-	test_http_env receive empty_body &&
-	! verify_http_result "200 OK"
+expecting success of 5558.16 'clone bundle list (file, any mode, all failures)': 
+	cat >bundle-list <<-EOF &&
+	[bundle]
+		version = 1
+		mode = any
 
-fatal: the remote end hung up unexpectedly
-ok 11 - push plain empty
+	# Does not exist. Should be skipped.
+	[bundle "bundle-0"]
+		uri = $HTTPD_URL/bundle-0.bundle
 
-expecting success of 5562.12 'push gzipped': 
-	test_when_finished "git branch -D newbranch" &&
-	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env receive push_body.gz &&
-	verify_http_result "200 OK" &&
-	git rev-parse newbranch >act.head &&
-	echo "$hash_next" >exp.head &&
-	test_cmp act.head exp.head
+	# Does not exist. Should be skipped.
+	[bundle "bundle-5"]
+		uri = $HTTPD_URL/bundle-5.bundle
+	EOF
 
-Deleted branch newbranch (was d8aa3fa).
-ok 12 - push gzipped
+	git clone --bundle-uri="file://$(pwd)/bundle-list" \
+		clone-from clone-any-fail 2>err &&
+	! grep "fatal" err &&
+	grep "warning: failed to download bundle from URI" err &&
 
-expecting success of 5562.13 'push gzipped truncated': 
-	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env receive push_body.gz.trunc &&
-	! verify_http_result "200 OK"
+	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
+	git -C clone-any-fail cat-file --batch-check <oids &&
 
-fatal: request ended in the middle of the gzip stream
-ok 13 - push gzipped truncated
+	git -C clone-any-fail for-each-ref --format="%(refname)" >refs &&
+	! grep "refs/bundles/heads/" refs
 
-expecting success of 5562.14 'push gzipped empty': 
-	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env receive empty_body &&
-	! verify_http_result "200 OK"
+warning: failed to download bundle from URI '/bundle-5.bundle'
+warning: failed to download bundle from URI '/bundle-0.bundle'
+4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
+6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
+d09d684a6612e5155bd0961403c4cb77f90000cc commit 261
+45c64d67e8521343f79effee984fd1e910d8fead commit 213
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
+6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
+45c64d67e8521343f79effee984fd1e910d8fead commit 213
+0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+ok 16 - clone bundle list (file, any mode, all failures)
 
-fatal: request ended in the middle of the gzip stream
-ok 14 - push gzipped empty
+expecting success of 5558.17 'negotiation: bundle with part of wanted commits': 
+	test_when_finished "rm -f trace*.txt" &&
+	GIT_TRACE_PACKET="$(pwd)/trace-packet.txt" \
+	git clone --no-local --bundle-uri="clone-from/A.bundle" \
+		clone-from nego-bundle-part &&
+	git -C nego-bundle-part for-each-ref --format="%(refname)" >refs &&
+	grep "refs/bundles/heads/" refs >actual &&
+	test_write_lines refs/bundles/heads/topic >expect &&
+	test_cmp expect actual &&
+	# Ensure that refs/bundles/heads/topic are sent as "have".
+	tip=$(git -C clone-from rev-parse A) &&
+	test_grep "clone> have $tip" trace-packet.txt
 
-expecting success of 5562.15 'CONTENT_LENGTH overflow ssite_t': 
-	NOT_FIT_IN_SSIZE=$(ssize_b100dots) &&
-	env \
-		CONTENT_TYPE=application/x-git-upload-pack-request \
-		QUERY_STRING=/repo.git/git-upload-pack \
-		PATH_TRANSLATED="$PWD"/.git/git-upload-pack \
-		GIT_HTTP_EXPORT_ALL=TRUE \
-		REQUEST_METHOD=POST \
-		CONTENT_LENGTH="$NOT_FIT_IN_SSIZE" \
-		git http-backend </dev/null >/dev/null 2>err &&
-	grep "fatal:.*CONTENT_LENGTH" err
+Cloning into 'nego-bundle-part'...
+packet:        clone> have 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050
+ok 17 - negotiation: bundle with part of wanted commits
 
-fatal: failed to parse CONTENT_LENGTH: 9223372036854775808
-ok 15 - CONTENT_LENGTH overflow ssite_t
+expecting success of 5558.18 'negotiation: bundle with all wanted commits': 
+	test_when_finished "rm -f trace*.txt" &&
+	GIT_TRACE_PACKET="$(pwd)/trace-packet.txt" \
+	git clone --no-local --single-branch --branch=topic --no-tags \
+		--bundle-uri="clone-from/B.bundle" \
+		clone-from nego-bundle-all &&
+	git -C nego-bundle-all for-each-ref --format="%(refname)" >refs &&
+	grep "refs/bundles/heads/" refs >actual &&
+	test_write_lines refs/bundles/heads/topic >expect &&
+	test_cmp expect actual &&
+	# We already have all needed commits so no "want" needed.
+	test_grep ! "clone> want " trace-packet.txt
 
-expecting success of 5562.16 'empty CONTENT_LENGTH': 
-	env \
-		QUERY_STRING="service=git-receive-pack" \
-		PATH_TRANSLATED="$PWD"/.git/info/refs \
-		GIT_HTTP_EXPORT_ALL=TRUE \
-		REQUEST_METHOD=GET \
-		CONTENT_LENGTH="" \
-		git http-backend <empty_body >act.out.$test_count 2>act.err.$test_count &&
-	verify_http_result "200 OK"
+Cloning into 'nego-bundle-all'...
+ok 18 - negotiation: bundle with all wanted commits
 
-ok 16 - empty CONTENT_LENGTH
+expecting success of 5558.19 'negotiation: bundle list (no heuristic)': 
+	test_when_finished "rm -f trace*.txt" &&
+	cat >bundle-list <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5573-pull-verify-signatures.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5573-pull-verify-signatures/.git/
-checking prerequisite: GPG
+	[bundle "bundle-1"]
+		uri = file://$(pwd)/clone-from/bundle-1.bundle
 
-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
+	[bundle "bundle-2"]
+		uri = file://$(pwd)/clone-from/bundle-2.bundle
+	EOF
 
-	# 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
+	GIT_TRACE_PACKET="$(pwd)/trace-packet.txt" \
+	git clone --no-local --bundle-uri="file://$(pwd)/bundle-list" \
+		clone-from nego-bundle-list-no-heuristic &&
 
-)
-prerequisite GPG not satisfied
-ok 1 # skip create repositories with signed commits (missing GPG)
+	git -C nego-bundle-list-no-heuristic for-each-ref --format="%(refname)" >refs &&
+	grep "refs/bundles/heads/" refs >actual &&
+	cat >expect <<-\EOF &&
+	refs/bundles/heads/base
+	refs/bundles/heads/left
+	EOF
+	test_cmp expect actual &&
+	tip=$(git -C nego-bundle-list-no-heuristic rev-parse refs/bundles/heads/left) &&
+	test_grep "clone> have $tip" trace-packet.txt
 
-ok 2 # skip pull unsigned commit with --verify-signatures (missing GPG)
+Cloning into 'nego-bundle-list-no-heuristic'...
+packet:        clone> have 6b9ff9e0ddeff610fa62631ee48249700c5d5715
+packet:        clone> have 6b9ff9e0ddeff610fa62631ee48249700c5d5715
+ok 19 - negotiation: bundle list (no heuristic)
 
-ok 3 # skip pull commit with bad signature with --verify-signatures (missing GPG)
+expecting success of 5558.20 'negotiation: bundle list (creationToken)': 
+	test_when_finished "rm -f trace*.txt" &&
+	cat >bundle-list <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+		heuristic = creationToken
 
-ok 4 # skip pull commit with untrusted signature with --verify-signatures (missing GPG)
+	[bundle "bundle-1"]
+		uri = file://$(pwd)/clone-from/bundle-1.bundle
+		creationToken = 1
 
-ok 5 # skip pull commit with untrusted signature with --verify-signatures and minTrustLevel=ultimate (missing GPG)
+	[bundle "bundle-2"]
+		uri = file://$(pwd)/clone-from/bundle-2.bundle
+		creationToken = 2
+	EOF
 
-ok 6 # skip pull commit with untrusted signature with --verify-signatures and minTrustLevel=marginal (missing GPG)
+	GIT_TRACE_PACKET="$(pwd)/trace-packet.txt" \
+	git clone --no-local --bundle-uri="file://$(pwd)/bundle-list" \
+		clone-from nego-bundle-list-heuristic &&
 
-ok 7 # skip pull commit with untrusted signature with --verify-signatures and minTrustLevel=undefined (missing GPG)
+	git -C nego-bundle-list-heuristic for-each-ref --format="%(refname)" >refs &&
+	grep "refs/bundles/heads/" refs >actual &&
+	cat >expect <<-\EOF &&
+	refs/bundles/heads/base
+	refs/bundles/heads/left
+	EOF
+	test_cmp expect actual &&
+	tip=$(git -C nego-bundle-list-heuristic rev-parse refs/bundles/heads/left) &&
+	test_grep "clone> have $tip" trace-packet.txt
 
-ok 8 # skip pull signed commit with --verify-signatures (missing GPG)
+Cloning into 'nego-bundle-list-heuristic'...
+packet:        clone> have 6b9ff9e0ddeff610fa62631ee48249700c5d5715
+packet:        clone> have 6b9ff9e0ddeff610fa62631ee48249700c5d5715
+ok 20 - negotiation: bundle list (creationToken)
 
-ok 9 # skip pull commit with bad signature without verification (missing GPG)
+expecting success of 5558.21 'negotiation: bundle list with all wanted commits': 
+	test_when_finished "rm -f trace*.txt" &&
+	cat >bundle-list <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+		heuristic = creationToken
 
-ok 10 # skip pull commit with bad signature with --no-verify-signatures (missing GPG)
+	[bundle "bundle-1"]
+		uri = file://$(pwd)/clone-from/bundle-1.bundle
+		creationToken = 1
 
-ok 11 # skip pull unsigned commit into unborn branch (missing GPG)
+	[bundle "bundle-2"]
+		uri = file://$(pwd)/clone-from/bundle-2.bundle
+		creationToken = 2
+	EOF
 
-ok 12 # skip pull commit into unborn branch with bad signature and --verify-signatures (missing GPG)
+	GIT_TRACE_PACKET="$(pwd)/trace-packet.txt" \
+	git clone --no-local --single-branch --branch=left --no-tags \
+		--bundle-uri="file://$(pwd)/bundle-list" \
+		clone-from nego-bundle-list-all &&
 
-ok 13 # skip pull commit into unborn branch with untrusted signature and --verify-signatures (missing GPG)
+	git -C nego-bundle-list-all for-each-ref --format="%(refname)" >refs &&
+	grep "refs/bundles/heads/" refs >actual &&
+	cat >expect <<-\EOF &&
+	refs/bundles/heads/base
+	refs/bundles/heads/left
+	EOF
+	test_cmp expect actual &&
+	# We already have all needed commits so no "want" needed.
+	test_grep ! "clone> want " trace-packet.txt
 
-ok 14 # skip pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=ultimate (missing GPG)
+Cloning into 'nego-bundle-list-all'...
+ok 21 - negotiation: bundle list with all wanted commits
 
-ok 15 # skip pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=marginal (missing GPG)
+checking prerequisite: NOT_ROOT
 
-ok 16 # skip pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=undefined (missing GPG)
+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 16 test(s)
-1..16
+)
+prerequisite NOT_ROOT ok
+# passed all 21 test(s)
+# SKIP no web server found at ''
+1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5560-http-backend-noserver.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t5560-http-backend-noserver/repo.git/
-To /build/reproducible-path/git-2.51.0/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.51.0/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
+*** t5581-http-curl-verbose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5581-http-curl-verbose/.git/
+checking prerequisite: NOT_ROOT
 
---- exp.err	2025-08-27 08:21:56.208036169 +0000
-+++ act.err	2025-08-27 08:21:56.204036143 +0000
-@@ -1 +0,0 @@
--fatal: '/repo.git/../HEAD': aliased
---- exp.err	2025-08-27 08:21:56.228036301 +0000
-+++ act.err	2025-08-27 08:21:56.224036275 +0000
-@@ -1 +1 @@
--fatal: '/../etc/passwd': aliased
-+Request not supported: '/build/reproducible-path/git-2.51.0/t/trash directory.t5560-http-backend-noserver//../etc/passwd'
-\ No newline at end of file
---- exp.err	2025-08-27 08:21:56.252036460 +0000
-+++ act.err	2025-08-27 08:21:56.244036407 +0000
-@@ -1 +1 @@
--fatal: '../etc/passwd': aliased
-+Request not supported: '/build/reproducible-path/git-2.51.0/t/trash directory.t5560-http-backend-noserver/../etc/passwd'
-\ No newline at end of file
---- exp.err	2025-08-27 08:21:56.264036539 +0000
-+++ act.err	2025-08-27 08:21:56.260036513 +0000
-@@ -1 +1 @@
--fatal: '/etc//passwd': aliased
-+Request not supported: '/build/reproducible-path/git-2.51.0/t/trash directory.t5560-http-backend-noserver//etc//passwd'
-\ No newline at end of file
---- exp.err	2025-08-27 08:21:56.280036644 +0000
-+++ act.err	2025-08-27 08:21:56.272036592 +0000
-@@ -1 +1 @@
--fatal: '/etc/./passwd': aliased
-+Request not supported: '/build/reproducible-path/git-2.51.0/t/trash directory.t5560-http-backend-noserver//etc/./passwd'
-\ No newline at end of file
---- exp.err	2025-08-27 08:21:56.300036776 +0000
-+++ act.err	2025-08-27 08:21:56.292036724 +0000
-@@ -1 +1 @@
--fatal: '//domain/data.txt': aliased
-+Request not supported: '/build/reproducible-path/git-2.51.0/t/trash directory.t5560-http-backend-noserver///domain/data.txt'
-\ No newline at end of file
-ok 14 - http-backend blocks bad PATH_INFO
+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 14 test(s)
-1..14
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5500-fetch-pack.sh ***
@@ -362527,7 +366534,7 @@
 remote: Counting objects:   3% (1/33)        
remote: Counting objects:   6% (2/33)        
remote: Counting objects:   9% (3/33)        
remote: Counting objects:  12% (4/33)        
remote: Counting objects:  15% (5/33)        
remote: Counting objects:  18% (6/33)        
remote: Counting objects:  21% (7/33)        
remote: Counting objects:  24% (8/33)        
remote: Counting objects:  27% (9/33)        
remote: Counting objects:  30% (10/33)        
remote: Counting objects:  33% (11/33)        
remote: Counting objects:  36% (12/33)        
remote: Counting objects:  39% (13/33)        
remote: Counting objects:  42% (14/33)        
remote: Counting objects:  45% (15/33)        
remote: Counting objects:  48% (16/33)        
remote: Counting objects:  51% (17/33)        
remote: Counting objects:  54% (18/33)        
remote: Counting objects:  57% (19/33)        
remote: Counting objects:  60% (20/33)        
remote: Counting objects:  63% (21/33)        
remote: Counting objects:  66% (22/33)        
remote: Counting objects:  69% (23/33)        
remote: Counting objects:  72% (24/33)        
remote: Counting objects:  75% (25/33)        
remote: Counting objects:  78% (26/33)        
remote: Counting objects:  81% (27/33)        
remote: Counting objects:  84% (28/33)        
remote: Counting objects:  87% (29/33)        
remote: Counting objects:  90% (30/33)        
remote: Counting objects:  93% (31/33)        
remote: Counting objects:  96% (32/33)        
remote: Counting objects: 100% (33/33)        
remote: Counting objects: 100% (33/33), done.        
 remote: Compressing objects:   9% (1/11)        
remote: Compressing objects:  18% (2/11)        
remote: Compressing objects:  27% (3/11)        
remote: Compressing objects:  36% (4/11)        
remote: Compressing objects:  45% (5/11)        
remote: Compressing objects:  54% (6/11)        
remote: Compressing objects:  63% (7/11)        
remote: Compressing objects:  72% (8/11)        
remote: Compressing objects:  81% (9/11)        
remote: Compressing objects:  90% (10/11)        
remote: Compressing objects: 100% (11/11)        
remote: Compressing objects: 100% (11/11), done.        
 remote: Total 33 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0)        
-Receiving objects:   3% (1/33)
Receiving objects:   6% (2/33)
Receiving objects:   9% (3/33)
Receiving objects:  12% (4/33)
Receiving objects:  15% (5/33)
Receiving objects:  18% (6/33)
Receiving objects:  21% (7/33)
Receiving objects:  24% (8/33)
Receiving objects:  27% (9/33)
Receiving objects:  30% (10/33)
Receiving objects:  33% (11/33)
Receiving objects:  36% (12/33)
Receiving objects:  39% (13/33)
Receiving objects:  42% (14/33)
Receiving objects:  45% (15/33)
Receiving objects:  48% (16/33)
Receiving objects:  51% (17/33)
Receiving objects:  54% (18/33)
Receiving objects:  57% (19/33)
Receiving objects:  60% (20/33)
Receiving objects:  63% (21/33)
Receiving objects:  66% (22/33)
Receiving objects:  69% (23/33)
Receiving objects:  72% (24/33)
Receiving objects:  75% (25/33)
Receiving objects:  78% (26/33)
Receiving objects:  81% (27/33)
Receiving objects:  84% (28/33)
Receiving objects:  87% (29/33)
Receiving objects:  90% (30/33)
Receiving objects:  93% (31/33)
Receiving objects:  96% (32/33)
Receiving objects: 100% (33/33)
Receiving objects: 100% (33/33), 2.67 KiB | 2.67 MiB/s, done.
+Receiving objects:   3% (1/33)
Receiving objects:   6% (2/33)
Receiving objects:   9% (3/33)
Receiving objects:  12% (4/33)
Receiving objects:  15% (5/33)
Receiving objects:  18% (6/33)
Receiving objects:  21% (7/33)
Receiving objects:  24% (8/33)
Receiving objects:  27% (9/33)
Receiving objects:  30% (10/33)
Receiving objects:  33% (11/33)
Receiving objects:  36% (12/33)
Receiving objects:  39% (13/33)
Receiving objects:  42% (14/33)
Receiving objects:  45% (15/33)
Receiving objects:  48% (16/33)
Receiving objects:  51% (17/33)
Receiving objects:  54% (18/33)
Receiving objects:  57% (19/33)
Receiving objects:  60% (20/33)
Receiving objects:  63% (21/33)
Receiving objects:  66% (22/33)
Receiving objects:  69% (23/33)
Receiving objects:  72% (24/33)
Receiving objects:  75% (25/33)
Receiving objects:  78% (26/33)
Receiving objects:  81% (27/33)
Receiving objects:  84% (28/33)
Receiving objects:  87% (29/33)
Receiving objects:  90% (30/33)
Receiving objects:  93% (31/33)
Receiving objects:  96% (32/33)
Receiving objects: 100% (33/33)
Receiving objects: 100% (33/33), done.
 Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), done.
 pack	3791170b8839b1bcb89a066d52633bc8b213dcdf
 9980fc7e97f06bbd7341f45d570f0c5eb2a954f1 refs/heads/A
@@ -362584,7 +366591,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 | 725.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 | 981.00 KiB/s, done.
 pack	d6698cfcaf6e075007fcb2123d8a138210d6d911
 27f494dfb7e67d2f9cd2282404adf1d97581aa34 refs/heads/B
 notice: HEAD points to an unborn branch (r)
@@ -362660,8 +366667,8 @@
 Use '--' to separate paths from revisions, like this:
 'git <command> [<revision>...] -- [<file>...]'
 origin/B
-{"event":"data_json","sid":"20250827T082141.566229Z-Hcf858c9d-P0009dc12","thread":"main","time":"2025-08-27T08:21:41.571381Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.005354,"t_rel":0.005354,"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":"20250827T082141.566229Z-Hcf858c9d-P0009dc12","thread":"main","time":"2025-08-27T08:21:41.571381Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.005354,"t_rel":0.005354,"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":"20260929T145251.282342Z-H5c947e1c-P00230ffb","thread":"main","time":"2026-09-29T14:52:51.283920Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.001750,"t_rel":0.001750,"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":"20260929T145251.282342Z-H5c947e1c-P00230ffb","thread":"main","time":"2026-09-29T14:52:51.283920Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.001750,"t_rel":0.001750,"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': 
@@ -362671,7 +366678,7 @@
 	grep \"fetch-info\".*\"depth\":1 shallow0/trace2_event
 
 Cloning into 'shallow0'...
-{"event":"data_json","sid":"20250827T082141.631402Z-Hcf858c9d-P0009dcce","thread":"main","time":"2025-08-27T08:21:41.638100Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.006913,"t_rel":0.006913,"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":"20260929T145251.329794Z-H5c947e1c-P002310b7","thread":"main","time":"2026-09-29T14:52:51.331467Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.001880,"t_rel":0.001880,"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': 
@@ -362804,8 +366811,8 @@
 Fast-forward
  test.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
-{"event":"data_json","sid":"20250827T082142.227178Z-Hcf858c9d-P0009e3d9/20250827T082142.230082Z-Hcf858c9d-P0009e3e2/20250827T082142.237804Z-Hcf858c9d-P0009e3fa","thread":"main","time":"2025-08-27T08:21:42.240310Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.002718,"t_rel":0.002718,"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":"20250827T082142.227178Z-Hcf858c9d-P0009e3d9/20250827T082142.230082Z-Hcf858c9d-P0009e3e2/20250827T082142.237804Z-Hcf858c9d-P0009e3fa","thread":"main","time":"2025-08-27T08:21:42.240310Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.002718,"t_rel":0.002718,"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":"20260929T145251.735637Z-H5c947e1c-P00231706/20260929T145251.737651Z-H5c947e1c-P00231713/20260929T145251.741358Z-H5c947e1c-P0023171a","thread":"main","time":"2026-09-29T14:52:51.743745Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.002601,"t_rel":0.002601,"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":"20260929T145251.735637Z-H5c947e1c-P00231706/20260929T145251.737651Z-H5c947e1c-P00231713/20260929T145251.741358Z-H5c947e1c-P0023171a","thread":"main","time":"2026-09-29T14:52:51.743745Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.002601,"t_rel":0.002601,"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': 
@@ -363022,9 +367029,9 @@
 		grep \"fetch-info\".*\"depth\":2147483647 trace2_event
 	)
 
-{"event":"data_json","sid":"20250827T082142.227178Z-Hcf858c9d-P0009e3d9/20250827T082142.230082Z-Hcf858c9d-P0009e3e2/20250827T082142.237804Z-Hcf858c9d-P0009e3fa","thread":"main","time":"2025-08-27T08:21:42.240310Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.002718,"t_rel":0.002718,"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":"20250827T082142.777863Z-Hcf858c9d-P0009e9b2/20250827T082142.787042Z-Hcf858c9d-P0009e9dc","thread":"main","time":"2025-08-27T08:21:42.801889Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.015054,"t_rel":0.015054,"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":"20250827T082142.777863Z-Hcf858c9d-P0009e9b2/20250827T082142.787042Z-Hcf858c9d-P0009e9dc","thread":"main","time":"2025-08-27T08:21:42.801889Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.015054,"t_rel":0.015054,"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":"20260929T145251.735637Z-H5c947e1c-P00231706/20260929T145251.737651Z-H5c947e1c-P00231713/20260929T145251.741358Z-H5c947e1c-P0023171a","thread":"main","time":"2026-09-29T14:52:51.743745Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.002601,"t_rel":0.002601,"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":"20260929T145252.042802Z-H5c947e1c-P00231b35/20260929T145252.047113Z-H5c947e1c-P00231b44","thread":"main","time":"2026-09-29T14:52:52.050837Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.003954,"t_rel":0.003954,"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":"20260929T145252.042802Z-H5c947e1c-P00231b35/20260929T145252.047113Z-H5c947e1c-P00231b44","thread":"main","time":"2026-09-29T14:52:52.050837Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.003954,"t_rel":0.003954,"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': 
@@ -363335,7 +367342,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 to_fetch.t
-{"event":"data","sid":"20250827T082144.750672Z-Hcf858c9d-P0009ffe4","thread":"main","time":"2025-08-27T08:21:44.779834Z","file":"fetch-pack.c","line":1762,"repo":1,"t_abs":0.029390,"t_rel":0.010378,"nesting":3,"category":"negotiation_v2","key":"total_rounds","value":"6"}
+{"event":"data","sid":"20260929T145253.223152Z-H5c947e1c-P00232bc1","thread":"main","time":"2026-09-29T14:52:53.236711Z","file":"fetch-pack.c","line":1762,"repo":1,"t_abs":0.013816,"t_rel":0.006004,"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
 
@@ -363623,9 +367630,9 @@
 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)
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)
remote: Total 267 (delta 3), reused 0 (delta 0), pack-reused 0 (from 0)        
-Receiving objects: 100% (267/267)
Receiving objects: 100% (267/267), 22.41 KiB | 997.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.
+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)
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 | 1.49 MiB/s, done.
+Resolving deltas:   0% (0/3)
Resolving deltas:  33% (1/3)
Resolving deltas:  66% (2/3)
Resolving deltas: 100% (3/3)
remote: Total 267 (delta 3), reused 0 (delta 0), pack-reused 0 (from 0)        
+Resolving deltas: 100% (3/3), done.
 keep	af36a4e38ad65488701370467da12a1dc50c78d3
 70125409534829fdfcb67d82de93f86282574cb4 HEAD
 f85e353c1b377970afbb804118d9135948598eea refs/heads/A
@@ -364560,4560 +368567,1109 @@
 
 expecting success of 5500.224 'fetch-pack --diag-url ssh://host/~re:po': 
 					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 224 - fetch-pack --diag-url ssh://host/~re:po
-
-expecting success of 5500.225 'fetch-pack --diag-url ssh://host:/re:po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 225 - fetch-pack --diag-url ssh://host:/re:po
-
-expecting success of 5500.226 'fetch-pack --diag-url ssh://host:/~re:po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 226 - fetch-pack --diag-url ssh://host:/~re:po
-
-expecting success of 5500.227 'fetch-pack --diag-url ssh://user@host/re:po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 227 - fetch-pack --diag-url ssh://user@host/re:po
-
-expecting success of 5500.228 'fetch-pack --diag-url ssh://user@host/~re:po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 228 - fetch-pack --diag-url ssh://user@host/~re:po
-
-expecting success of 5500.229 'fetch-pack --diag-url ssh://user@host:/re:po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 229 - fetch-pack --diag-url ssh://user@host:/re:po
-
-expecting success of 5500.230 'fetch-pack --diag-url ssh://user@host:/~re:po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 230 - fetch-pack --diag-url ssh://user@host:/~re:po
-
-expecting success of 5500.231 'fetch-pack --diag-url ssh://user@[::1]/re:po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 231 - fetch-pack --diag-url ssh://user@[::1]/re:po
-
-expecting success of 5500.232 'fetch-pack --diag-url ssh://user@[::1]/~re:po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 232 - fetch-pack --diag-url ssh://user@[::1]/~re:po
-
-expecting success of 5500.233 'fetch-pack --diag-url ssh://user@[::1]:/re:po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 233 - fetch-pack --diag-url ssh://user@[::1]:/re:po
-
-expecting success of 5500.234 'fetch-pack --diag-url ssh://user@[::1]:/~re:po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 234 - fetch-pack --diag-url ssh://user@[::1]:/~re:po
-
-expecting success of 5500.235 'fetch-pack --diag-url ssh://user@::1/re:po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 235 - fetch-pack --diag-url ssh://user@::1/re:po
-
-expecting success of 5500.236 'fetch-pack --diag-url ssh://user@::1/~re:po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 236 - fetch-pack --diag-url ssh://user@::1/~re:po
-
-expecting success of 5500.237 'fetch-pack --diag-url ssh://user@::1:/re:po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 237 - fetch-pack --diag-url ssh://user@::1:/re:po
-
-expecting success of 5500.238 'fetch-pack --diag-url ssh://user@::1:/~re:po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 238 - fetch-pack --diag-url ssh://user@::1:/~re:po
-
-expecting success of 5500.239 'fetch-pack --diag-url ssh://host:22/re:po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 239 - fetch-pack --diag-url ssh://host:22/re:po
-
-expecting success of 5500.240 'fetch-pack --diag-url ssh://User@host:22/re:po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 240 - fetch-pack --diag-url ssh://User@host:22/re:po
-
-expecting success of 5500.241 'fetch-pack --diag-url ssh://User@[::1]:22/re:po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 241 - fetch-pack --diag-url ssh://User@[::1]:22/re:po
-
-expecting success of 5500.242 'fetch-pack --diag-url file://User@[::1]/re:po': 
-			check_prot_path $p://$h/$r $p "/$r"
-		
-ok 242 - fetch-pack --diag-url file://User@[::1]/re:po
-
-ok 243 # skip fetch-pack --diag-url file://User@[::1]/re:po (missing MINGW)
-
-ok 244 # skip fetch-pack --diag-url file:///re:po (missing MINGW)
-
-expecting success of 5500.245 'fetch-pack --diag-url file://User@[::1]/~re:po': 
-			check_prot_path $p://$h/~$r $p "/~$r"
-		
-ok 245 - fetch-pack --diag-url file://User@[::1]/~re:po
-
-ok 246 # skip fetch-pack --diag-url file://User@[::1]/~re:po (missing MINGW)
-
-expecting success of 5500.247 'fetch-pack --diag-url ./nohost:re:po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 247 - fetch-pack --diag-url ./nohost:re:po
-
-expecting success of 5500.248 'fetch-pack --diag-url ./file:nohost/~re:po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 248 - fetch-pack --diag-url ./file:nohost/~re:po
-
-expecting success of 5500.249 'fetch-pack --diag-url ./nohost:12:re:po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 249 - fetch-pack --diag-url ./nohost:12:re:po
-
-expecting success of 5500.250 'fetch-pack --diag-url ./file:nohost:12/~re:po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 250 - fetch-pack --diag-url ./file:nohost:12/~re:po
-
-expecting success of 5500.251 'fetch-pack --diag-url ./[::1]:re:po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 251 - fetch-pack --diag-url ./[::1]:re:po
-
-expecting success of 5500.252 'fetch-pack --diag-url ./file:[::1]/~re:po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 252 - fetch-pack --diag-url ./file:[::1]/~re:po
-
-expecting success of 5500.253 'fetch-pack --diag-url ./[::1]:23:re:po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 253 - fetch-pack --diag-url ./[::1]:23:re:po
-
-expecting success of 5500.254 'fetch-pack --diag-url ./file:[::1]:23/~re:po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 254 - fetch-pack --diag-url ./file:[::1]:23/~re:po
-
-expecting success of 5500.255 'fetch-pack --diag-url ./[:re:po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 255 - fetch-pack --diag-url ./[:re:po
-
-expecting success of 5500.256 'fetch-pack --diag-url ./file:[/~re:po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 256 - fetch-pack --diag-url ./file:[/~re:po
-
-expecting success of 5500.257 'fetch-pack --diag-url ./[:aa:re:po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 257 - fetch-pack --diag-url ./[:aa:re:po
-
-expecting success of 5500.258 'fetch-pack --diag-url ./file:[:aa/~re:po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 258 - fetch-pack --diag-url ./file:[:aa/~re:po
-
-expecting success of 5500.259 'fetch-pack --diag-url host:re:po': 
-			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
-		
-ok 259 - fetch-pack --diag-url host:re:po
-
-expecting success of 5500.260 'fetch-pack --diag-url host:/~re:po': 
-			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
-		
-ok 260 - fetch-pack --diag-url host:/~re:po
-
-expecting success of 5500.261 'fetch-pack --diag-url [::1]:re:po': 
-			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
-		
-ok 261 - fetch-pack --diag-url [::1]:re:po
-
-expecting success of 5500.262 'fetch-pack --diag-url [::1]:/~re:po': 
-			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
-		
-ok 262 - fetch-pack --diag-url [::1]:/~re:po
-
-expecting success of 5500.263 'fetch-pack --diag-url ssh+git://host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 263 - fetch-pack --diag-url ssh+git://host/re/po
-
-expecting success of 5500.264 'fetch-pack --diag-url ssh+git://host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 264 - fetch-pack --diag-url ssh+git://host/~re/po
-
-expecting success of 5500.265 'fetch-pack --diag-url ssh+git://host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 265 - fetch-pack --diag-url ssh+git://host:/re/po
-
-expecting success of 5500.266 'fetch-pack --diag-url ssh+git://host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 266 - fetch-pack --diag-url ssh+git://host:/~re/po
-
-expecting success of 5500.267 'fetch-pack --diag-url ssh+git://user@host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 267 - fetch-pack --diag-url ssh+git://user@host/re/po
-
-expecting success of 5500.268 'fetch-pack --diag-url ssh+git://user@host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 268 - fetch-pack --diag-url ssh+git://user@host/~re/po
-
-expecting success of 5500.269 'fetch-pack --diag-url ssh+git://user@host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 269 - fetch-pack --diag-url ssh+git://user@host:/re/po
-
-expecting success of 5500.270 'fetch-pack --diag-url ssh+git://user@host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 270 - fetch-pack --diag-url ssh+git://user@host:/~re/po
-
-expecting success of 5500.271 'fetch-pack --diag-url ssh+git://user@[::1]/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 271 - fetch-pack --diag-url ssh+git://user@[::1]/re/po
-
-expecting success of 5500.272 'fetch-pack --diag-url ssh+git://user@[::1]/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 272 - fetch-pack --diag-url ssh+git://user@[::1]/~re/po
-
-expecting success of 5500.273 'fetch-pack --diag-url ssh+git://user@[::1]:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 273 - fetch-pack --diag-url ssh+git://user@[::1]:/re/po
-
-expecting success of 5500.274 'fetch-pack --diag-url ssh+git://user@[::1]:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 274 - fetch-pack --diag-url ssh+git://user@[::1]:/~re/po
-
-expecting success of 5500.275 'fetch-pack --diag-url ssh+git://user@::1/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 275 - fetch-pack --diag-url ssh+git://user@::1/re/po
-
-expecting success of 5500.276 'fetch-pack --diag-url ssh+git://user@::1/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 276 - fetch-pack --diag-url ssh+git://user@::1/~re/po
-
-expecting success of 5500.277 'fetch-pack --diag-url ssh+git://user@::1:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 277 - fetch-pack --diag-url ssh+git://user@::1:/re/po
-
-expecting success of 5500.278 'fetch-pack --diag-url ssh+git://user@::1:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 278 - fetch-pack --diag-url ssh+git://user@::1:/~re/po
-
-expecting success of 5500.279 'fetch-pack --diag-url ssh+git://host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 279 - fetch-pack --diag-url ssh+git://host:22/re/po
-
-expecting success of 5500.280 'fetch-pack --diag-url ssh+git://User@host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 280 - fetch-pack --diag-url ssh+git://User@host:22/re/po
-
-expecting success of 5500.281 'fetch-pack --diag-url ssh+git://User@[::1]:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 281 - fetch-pack --diag-url ssh+git://User@[::1]:22/re/po
-
-expecting success of 5500.282 'fetch-pack --diag-url git+ssh://host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 282 - fetch-pack --diag-url git+ssh://host/re/po
-
-expecting success of 5500.283 'fetch-pack --diag-url git+ssh://host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 283 - fetch-pack --diag-url git+ssh://host/~re/po
-
-expecting success of 5500.284 'fetch-pack --diag-url git+ssh://host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 284 - fetch-pack --diag-url git+ssh://host:/re/po
-
-expecting success of 5500.285 'fetch-pack --diag-url git+ssh://host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 285 - fetch-pack --diag-url git+ssh://host:/~re/po
-
-expecting success of 5500.286 'fetch-pack --diag-url git+ssh://user@host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 286 - fetch-pack --diag-url git+ssh://user@host/re/po
-
-expecting success of 5500.287 'fetch-pack --diag-url git+ssh://user@host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 287 - fetch-pack --diag-url git+ssh://user@host/~re/po
-
-expecting success of 5500.288 'fetch-pack --diag-url git+ssh://user@host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 288 - fetch-pack --diag-url git+ssh://user@host:/re/po
-
-expecting success of 5500.289 'fetch-pack --diag-url git+ssh://user@host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 289 - fetch-pack --diag-url git+ssh://user@host:/~re/po
-
-expecting success of 5500.290 'fetch-pack --diag-url git+ssh://user@[::1]/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 290 - fetch-pack --diag-url git+ssh://user@[::1]/re/po
-
-expecting success of 5500.291 'fetch-pack --diag-url git+ssh://user@[::1]/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 291 - fetch-pack --diag-url git+ssh://user@[::1]/~re/po
-
-expecting success of 5500.292 'fetch-pack --diag-url git+ssh://user@[::1]:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 292 - fetch-pack --diag-url git+ssh://user@[::1]:/re/po
-
-expecting success of 5500.293 'fetch-pack --diag-url git+ssh://user@[::1]:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 293 - fetch-pack --diag-url git+ssh://user@[::1]:/~re/po
-
-expecting success of 5500.294 'fetch-pack --diag-url git+ssh://user@::1/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 294 - fetch-pack --diag-url git+ssh://user@::1/re/po
-
-expecting success of 5500.295 'fetch-pack --diag-url git+ssh://user@::1/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 295 - fetch-pack --diag-url git+ssh://user@::1/~re/po
-
-expecting success of 5500.296 'fetch-pack --diag-url git+ssh://user@::1:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 296 - fetch-pack --diag-url git+ssh://user@::1:/re/po
-
-expecting success of 5500.297 'fetch-pack --diag-url git+ssh://user@::1:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 297 - fetch-pack --diag-url git+ssh://user@::1:/~re/po
-
-expecting success of 5500.298 'fetch-pack --diag-url git+ssh://host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 298 - fetch-pack --diag-url git+ssh://host:22/re/po
-
-expecting success of 5500.299 'fetch-pack --diag-url git+ssh://User@host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 299 - fetch-pack --diag-url git+ssh://User@host:22/re/po
-
-expecting success of 5500.300 'fetch-pack --diag-url git+ssh://User@[::1]:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 300 - fetch-pack --diag-url git+ssh://User@[::1]:22/re/po
-
-expecting success of 5500.301 'fetch-pack --diag-url git://host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 301 - fetch-pack --diag-url git://host/re/po
-
-expecting success of 5500.302 'fetch-pack --diag-url git://host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 302 - fetch-pack --diag-url git://host/~re/po
-
-expecting success of 5500.303 'fetch-pack --diag-url git://host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 303 - fetch-pack --diag-url git://host:/re/po
-
-expecting success of 5500.304 'fetch-pack --diag-url git://host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 304 - fetch-pack --diag-url git://host:/~re/po
-
-expecting success of 5500.305 'fetch-pack --diag-url git://user@host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 305 - fetch-pack --diag-url git://user@host/re/po
-
-expecting success of 5500.306 'fetch-pack --diag-url git://user@host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 306 - fetch-pack --diag-url git://user@host/~re/po
-
-expecting success of 5500.307 'fetch-pack --diag-url git://user@host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 307 - fetch-pack --diag-url git://user@host:/re/po
-
-expecting success of 5500.308 'fetch-pack --diag-url git://user@host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 308 - fetch-pack --diag-url git://user@host:/~re/po
-
-expecting success of 5500.309 'fetch-pack --diag-url git://user@[::1]/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 309 - fetch-pack --diag-url git://user@[::1]/re/po
-
-expecting success of 5500.310 'fetch-pack --diag-url git://user@[::1]/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 310 - fetch-pack --diag-url git://user@[::1]/~re/po
-
-expecting success of 5500.311 'fetch-pack --diag-url git://user@[::1]:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 311 - fetch-pack --diag-url git://user@[::1]:/re/po
-
-expecting success of 5500.312 'fetch-pack --diag-url git://user@[::1]:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 312 - fetch-pack --diag-url git://user@[::1]:/~re/po
-
-expecting success of 5500.313 'fetch-pack --diag-url git://user@::1/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 313 - fetch-pack --diag-url git://user@::1/re/po
-
-expecting success of 5500.314 'fetch-pack --diag-url git://user@::1/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 314 - fetch-pack --diag-url git://user@::1/~re/po
-
-expecting success of 5500.315 'fetch-pack --diag-url git://user@::1:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 315 - fetch-pack --diag-url git://user@::1:/re/po
-
-expecting success of 5500.316 'fetch-pack --diag-url git://user@::1:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 316 - fetch-pack --diag-url git://user@::1:/~re/po
-
-expecting success of 5500.317 'fetch-pack --diag-url git://host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 317 - fetch-pack --diag-url git://host:22/re/po
-
-expecting success of 5500.318 'fetch-pack --diag-url git://User@host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 318 - fetch-pack --diag-url git://User@host:22/re/po
-
-expecting success of 5500.319 'fetch-pack --diag-url git://User@[::1]:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 319 - fetch-pack --diag-url git://User@[::1]:22/re/po
-
-expecting success of 5500.320 'fetch-pack --diag-url ssh://host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 320 - fetch-pack --diag-url ssh://host/re/po
-
-expecting success of 5500.321 'fetch-pack --diag-url ssh://host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 321 - fetch-pack --diag-url ssh://host/~re/po
-
-expecting success of 5500.322 'fetch-pack --diag-url ssh://host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 322 - fetch-pack --diag-url ssh://host:/re/po
-
-expecting success of 5500.323 'fetch-pack --diag-url ssh://host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 323 - fetch-pack --diag-url ssh://host:/~re/po
-
-expecting success of 5500.324 'fetch-pack --diag-url ssh://user@host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 324 - fetch-pack --diag-url ssh://user@host/re/po
-
-expecting success of 5500.325 'fetch-pack --diag-url ssh://user@host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 325 - fetch-pack --diag-url ssh://user@host/~re/po
-
-expecting success of 5500.326 'fetch-pack --diag-url ssh://user@host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 326 - fetch-pack --diag-url ssh://user@host:/re/po
-
-expecting success of 5500.327 'fetch-pack --diag-url ssh://user@host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 327 - fetch-pack --diag-url ssh://user@host:/~re/po
-
-expecting success of 5500.328 'fetch-pack --diag-url ssh://user@[::1]/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 328 - fetch-pack --diag-url ssh://user@[::1]/re/po
-
-expecting success of 5500.329 'fetch-pack --diag-url ssh://user@[::1]/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 329 - fetch-pack --diag-url ssh://user@[::1]/~re/po
-
-expecting success of 5500.330 'fetch-pack --diag-url ssh://user@[::1]:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 330 - fetch-pack --diag-url ssh://user@[::1]:/re/po
-
-expecting success of 5500.331 'fetch-pack --diag-url ssh://user@[::1]:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 331 - fetch-pack --diag-url ssh://user@[::1]:/~re/po
-
-expecting success of 5500.332 'fetch-pack --diag-url ssh://user@::1/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 332 - fetch-pack --diag-url ssh://user@::1/re/po
-
-expecting success of 5500.333 'fetch-pack --diag-url ssh://user@::1/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 333 - fetch-pack --diag-url ssh://user@::1/~re/po
-
-expecting success of 5500.334 'fetch-pack --diag-url ssh://user@::1:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 334 - fetch-pack --diag-url ssh://user@::1:/re/po
-
-expecting success of 5500.335 'fetch-pack --diag-url ssh://user@::1:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 335 - fetch-pack --diag-url ssh://user@::1:/~re/po
-
-expecting success of 5500.336 'fetch-pack --diag-url ssh://host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 336 - fetch-pack --diag-url ssh://host:22/re/po
-
-expecting success of 5500.337 'fetch-pack --diag-url ssh://User@host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 337 - fetch-pack --diag-url ssh://User@host:22/re/po
-
-expecting success of 5500.338 'fetch-pack --diag-url ssh://User@[::1]:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 338 - fetch-pack --diag-url ssh://User@[::1]:22/re/po
-
-expecting success of 5500.339 'fetch-pack --diag-url file://User@[::1]/re/po': 
-			check_prot_path $p://$h/$r $p "/$r"
-		
-ok 339 - fetch-pack --diag-url file://User@[::1]/re/po
-
-ok 340 # skip fetch-pack --diag-url file://User@[::1]/re/po (missing MINGW)
-
-ok 341 # skip fetch-pack --diag-url file:///re/po (missing MINGW)
-
-expecting success of 5500.342 'fetch-pack --diag-url file://User@[::1]/~re/po': 
-			check_prot_path $p://$h/~$r $p "/~$r"
-		
-ok 342 - fetch-pack --diag-url file://User@[::1]/~re/po
-
-ok 343 # skip fetch-pack --diag-url file://User@[::1]/~re/po (missing MINGW)
-
-expecting success of 5500.344 'fetch-pack --diag-url ./nohost:re/po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 344 - fetch-pack --diag-url ./nohost:re/po
-
-expecting success of 5500.345 'fetch-pack --diag-url ./file:nohost/~re/po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 345 - fetch-pack --diag-url ./file:nohost/~re/po
-
-expecting success of 5500.346 'fetch-pack --diag-url ./nohost:12:re/po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 346 - fetch-pack --diag-url ./nohost:12:re/po
-
-expecting success of 5500.347 'fetch-pack --diag-url ./file:nohost:12/~re/po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 347 - fetch-pack --diag-url ./file:nohost:12/~re/po
-
-expecting success of 5500.348 'fetch-pack --diag-url ./[::1]:re/po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 348 - fetch-pack --diag-url ./[::1]:re/po
-
-expecting success of 5500.349 'fetch-pack --diag-url ./file:[::1]/~re/po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 349 - fetch-pack --diag-url ./file:[::1]/~re/po
-
-expecting success of 5500.350 'fetch-pack --diag-url ./[::1]:23:re/po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 350 - fetch-pack --diag-url ./[::1]:23:re/po
-
-expecting success of 5500.351 'fetch-pack --diag-url ./file:[::1]:23/~re/po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 351 - fetch-pack --diag-url ./file:[::1]:23/~re/po
-
-expecting success of 5500.352 'fetch-pack --diag-url ./[:re/po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 352 - fetch-pack --diag-url ./[:re/po
-
-expecting success of 5500.353 'fetch-pack --diag-url ./file:[/~re/po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 353 - fetch-pack --diag-url ./file:[/~re/po
-
-expecting success of 5500.354 'fetch-pack --diag-url ./[:aa:re/po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 354 - fetch-pack --diag-url ./[:aa:re/po
-
-expecting success of 5500.355 'fetch-pack --diag-url ./file:[:aa/~re/po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 355 - fetch-pack --diag-url ./file:[:aa/~re/po
-
-expecting success of 5500.356 'fetch-pack --diag-url host:re/po': 
-			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
-		
-ok 356 - fetch-pack --diag-url host:re/po
-
-expecting success of 5500.357 'fetch-pack --diag-url host:/~re/po': 
-			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
-		
-ok 357 - fetch-pack --diag-url host:/~re/po
-
-expecting success of 5500.358 'fetch-pack --diag-url [::1]:re/po': 
-			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
-		
-ok 358 - fetch-pack --diag-url [::1]:re/po
-
-expecting success of 5500.359 'fetch-pack --diag-url [::1]:/~re/po': 
-			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
-		
-ok 359 - fetch-pack --diag-url [::1]:/~re/po
-
-ok 360 # skip fetch-pack --diag-url file://c:/repo (missing MINGW)
-
-ok 361 # skip fetch-pack --diag-url c:repo (missing MINGW)
-
-expecting success of 5500.362 'clone shallow since ...': 
-	test_create_repo shallow-since &&
-	(
-	cd shallow-since &&
-	GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
-	GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
-	GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
-	git clone --shallow-since "300000000 +0700" "file://$(pwd)/." ../shallow11 &&
-	git -C ../shallow11 log --pretty=tformat:%s HEAD >actual &&
-	echo three >expected &&
-	test_cmp expected actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/shallow-since/.git/
-[main (root-commit) 4c9b2a3] one
- Author: A U Thor <author@example.com>
-[main e491164] two
- Author: A U Thor <author@example.com>
-[main 88fb92d] three
- Author: A U Thor <author@example.com>
-Cloning into '../shallow11'...
-ok 362 - clone shallow since ...
-
-expecting success of 5500.363 'fetch shallow since ...': 
-	GIT_TRACE2_EVENT=$(pwd)/shallow11/trace2_event \
-		git -C shallow11 fetch --shallow-since "200000000 +0700" origin &&
-	git -C shallow11 log --pretty=tformat:%s origin/main >actual &&
-	cat >expected <<-\EOF &&
-	three
-	two
-	EOF
-	test_cmp expected actual &&
-	grep \"fetch-info\".*\"deepen-since\":true shallow11/trace2_event
-
-{"event":"data_json","sid":"20250827T082154.143723Z-Hcf858c9d-P000a6275/20250827T082154.149462Z-Hcf858c9d-P000a627d","thread":"main","time":"2025-08-27T08:21:54.153967Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.004728,"t_rel":0.004728,"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': 
-	test_create_repo shallow-since-the-future &&
-	(
-	cd shallow-since-the-future &&
-	GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
-	GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
-	GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
-	test_must_fail git clone --shallow-since "900000000 +0700" "file://$(pwd)/." ../shallow111
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/shallow-since-the-future/.git/
-[main (root-commit) 4c9b2a3] one
- Author: A U Thor <author@example.com>
-[main e491164] two
- Author: A U Thor <author@example.com>
-[main 88fb92d] three
- Author: A U Thor <author@example.com>
-Cloning into '../shallow111'...
-fatal: no commits selected for shallow requests
-fatal: the remote end hung up unexpectedly
-ok 364 - clone shallow since selects no commits
-
-expecting success of 5500.365 'shallow since with commit graph and already-seen commit': 
-	test_create_repo shallow-since-graph &&
-	(
-	cd shallow-since-graph &&
-	test_commit base &&
-	test_commit main &&
-	git checkout -b other HEAD^ &&
-	test_commit other &&
-	git commit-graph write --reachable &&
-	git config core.commitGraph true &&
-
-	GIT_PROTOCOL=version=2 git upload-pack . <<-EOF >/dev/null
-	0012command=fetch
-	$(echo "object-format=$(test_oid algo)" | packetize)
-	00010013deepen-since 1
-	$(echo "want $(git rev-parse other)" | packetize)
-	$(echo "have $(git rev-parse main)" | packetize)
-	0000
-	EOF
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/shallow-since-graph/.git/
-[main (root-commit) d3ae9fb] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[main a2ca354] main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main.t
-Switched to a new branch 'other'
-[other fb3d247] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-warning: refname 'other' is ambiguous.
-warning: refname 'main' is ambiguous.
-ok 365 - shallow since with commit graph and already-seen commit
-
-expecting success of 5500.366 'shallow clone exclude tag two': 
-	test_create_repo shallow-exclude &&
-	(
-	cd shallow-exclude &&
-	test_commit one &&
-	test_commit two &&
-	test_commit three &&
-	git clone --shallow-exclude two "file://$(pwd)/." ../shallow12 &&
-	git -C ../shallow12 log --pretty=tformat:%s HEAD >actual &&
-	echo three >expected &&
-	test_cmp expected actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/shallow-exclude/.git/
-[main (root-commit) 7d32f63] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main ea3a09e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main 28cfb97] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Cloning into '../shallow12'...
-ok 366 - shallow clone exclude tag two
-
-expecting success of 5500.367 'fetch exclude tag one': 
-	git -C shallow12 fetch --shallow-exclude one origin &&
-	git -C shallow12 log --pretty=tformat:%s origin/main >actual &&
-	test_write_lines three two >expected &&
-	test_cmp expected actual
-
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/shallow-exclude/.
- * [new tag]         two        -> two
-ok 367 - fetch exclude tag one
-
-expecting success of 5500.368 'fetch exclude tag one as revision': 
-	test_when_finished rm -f rev err &&
-	git -C shallow-exclude rev-parse one >rev &&
-	test_must_fail git -C shallow12 fetch --shallow-exclude $(cat rev) origin 2>err &&
-	grep "deepen-not is not a ref:" err
-
-fatal: git upload-pack: deepen-not is not a ref: deepen-not 7d32f632cd08248ef9383667ad19becddb14d93a
-ok 368 - fetch exclude tag one as revision
-
-expecting success of 5500.369 'fetching deepen': 
-	test_create_repo shallow-deepen &&
-	(
-	cd shallow-deepen &&
-	test_commit one &&
-	test_commit two &&
-	test_commit three &&
-	git clone --depth 1 "file://$(pwd)/." deepen &&
-	test_commit four &&
-	git -C deepen log --pretty=tformat:%s main >actual &&
-	echo three >expected &&
-	test_cmp expected actual &&
-	git -C deepen fetch --deepen=1 &&
-	git -C deepen 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.51.0/t/trash directory.t5500-fetch-pack/shallow-deepen/.git/
-[main (root-commit) 7d32f63] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main ea3a09e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main 28cfb97] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Cloning into 'deepen'...
-[main 8f42874] 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.51.0/t/trash directory.t5500-fetch-pack/shallow-deepen/.
-   28cfb97..8f42874  main       -> origin/main
- * [new tag]         four       -> four
- * [new tag]         two        -> two
-ok 369 - fetching deepen
-
-expecting success of 5500.370 'use ref advertisement to prune "have" lines sent': 
-	test_negotiation_algorithm_default
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) 4ec3e89] both_have_1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 both_have_1.t
-Deleted tag 'both_have_1' (was 4ec3e89)
-[main 0e648cf] both_have_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 both_have_2.t
-Cloning into 'client'...
-done.
-[main c107eb0] server_has
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 server_has.t
-[main d1fea1f] client_has
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 client_has.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server
- * tag               server_has -> FETCH_HEAD
- * tag               both_have_2 -> FETCH_HEAD
-packet:        fetch> have d1fea1f29cf9ed7dd3bad159c87b04602137107f
-packet:  upload-pack< have d1fea1f29cf9ed7dd3bad159c87b04602137107f
-packet:        fetch> have 0e648cf9d30d78592ceaaece245726ca9e279151
-packet:  upload-pack< have 0e648cf9d30d78592ceaaece245726ca9e279151
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server
- * tag               server_has -> FETCH_HEAD
- * tag               both_have_2 -> FETCH_HEAD
-packet:        fetch> have d1fea1f29cf9ed7dd3bad159c87b04602137107f
-packet:  upload-pack< have d1fea1f29cf9ed7dd3bad159c87b04602137107f
-packet:        fetch> have 0e648cf9d30d78592ceaaece245726ca9e279151
-packet:  upload-pack< have 0e648cf9d30d78592ceaaece245726ca9e279151
-ok 370 - use ref advertisement to prune "have" lines sent
-
-expecting success of 5500.371 'same as last but with config overrides': 
-	test_negotiation_algorithm_default \
-		-c feature.experimental=true \
-		-c fetch.negotiationAlgorithm=consecutive
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) 9df98d9] both_have_1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 both_have_1.t
-Deleted tag 'both_have_1' (was 9df98d9)
-[main 63eca65] both_have_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 both_have_2.t
-Cloning into 'client'...
-done.
-[main d7eee63] server_has
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 server_has.t
-[main 381c2f1] client_has
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 client_has.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server
- * tag               server_has -> FETCH_HEAD
- * tag               both_have_2 -> FETCH_HEAD
-packet:        fetch> have 381c2f1c977599145037b617815f85808fe86d6c
-packet:  upload-pack< have 381c2f1c977599145037b617815f85808fe86d6c
-packet:        fetch> have 63eca652c410121f112d645c8a8840ae82123b3e
-packet:  upload-pack< have 63eca652c410121f112d645c8a8840ae82123b3e
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server
- * tag               server_has -> FETCH_HEAD
- * tag               both_have_2 -> FETCH_HEAD
-packet:        fetch> have 381c2f1c977599145037b617815f85808fe86d6c
-packet:  upload-pack< have 381c2f1c977599145037b617815f85808fe86d6c
-packet:        fetch> have 63eca652c410121f112d645c8a8840ae82123b3e
-packet:  upload-pack< have 63eca652c410121f112d645c8a8840ae82123b3e
-ok 371 - same as last but with config overrides
-
-expecting success of 5500.372 'ensure bogus fetch.negotiationAlgorithm yields error': 
-	test_when_finished rm -rf clientv0 &&
-	cp -r client clientv0 &&
-	test_must_fail git -C clientv0 --fetch.negotiationAlgorithm=bogus \
-		       fetch origin server_has both_have_2
-
-unknown option: --fetch.negotiationAlgorithm=bogus
-usage: git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]
-           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
-           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch]
-           [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]
-           [--work-tree=<path>] [--namespace=<name>] [--config-env=<name>=<envvar>]
-           <command> [<args>]
-ok 372 - ensure bogus fetch.negotiationAlgorithm yields error
-
-expecting success of 5500.373 'fetch-pack with fsckObjects and keep-file does not segfault': 
-	rm -rf server client &&
-	test_create_repo server &&
-	test_commit -C server one &&
-
-	test_create_repo client &&
-	git -c fetch.fsckObjects=true \
-	    -C client fetch-pack -k -k ../server HEAD
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) b73245b] 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.51.0/t/trash directory.t5500-fetch-pack/client/.git/
-remote: Enumerating objects: 3, done.        
-remote: Counting objects:  33% (1/3)        
remote: Counting objects:  66% (2/3)        
remote: Counting objects: 100% (3/3)        
remote: Counting objects: 100% (3/3), done.        
-remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
-Receiving objects:  33% (1/3)
Receiving objects:  66% (2/3)
Receiving objects: 100% (3/3)
Receiving objects: 100% (3/3), done.
-b73245b187a878a9334892236f3e85ef70d56705 HEAD
-ok 373 - fetch-pack with fsckObjects and keep-file does not segfault
-
-expecting success of 5500.374 'filtering by size': 
-	rm -rf server client &&
-	test_create_repo server &&
-	test_commit -C server one &&
-	test_config -C server uploadpack.allowfilter 1 &&
-
-	test_create_repo client &&
-	GIT_TRACE2_EVENT=$(pwd)/client/trace2_event \
-		git -C client fetch-pack --filter=blob:limit=0 ../server HEAD &&
-
-	# Ensure that object is not inadvertently fetched
-	commit=$(git -C server rev-parse HEAD) &&
-	blob=$(git hash-object server/one.t) &&
-	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
-	! grep "$blob" oids &&
-
-	grep \"fetch-info\".*\"filter\":\"blob:limit\" client/trace2_event
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) 946f2fc] 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.51.0/t/trash directory.t5500-fetch-pack/client/.git/
-remote: Enumerating objects: 2, done.        
-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":"20250827T082156.083090Z-Hcf858c9d-P000a767b/20250827T082156.090362Z-Hcf858c9d-P000a7695","thread":"main","time":"2025-08-27T08:21:56.095658Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.005518,"t_rel":0.005518,"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': 
-	rm -rf server client &&
-	test_create_repo server &&
-	test_commit -C server one &&
-
-	test_create_repo client &&
-	git -C client fetch-pack --filter=blob:limit=0 ../server HEAD 2> err &&
-
-	# Ensure that object is fetched
-	commit=$(git -C server rev-parse HEAD) &&
-	blob=$(git hash-object server/one.t) &&
-	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
-	grep "$blob" oids &&
-
-	test_grep "filtering not recognized by server" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) 65824a5] 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.51.0/t/trash directory.t5500-fetch-pack/client/.git/
-65824a5afab3ce868d5dbea30006cffd06f7d620 HEAD
-5626abf0f72e58d7a153368ba57db4c673c0e171 one.t
-warning: filtering not recognized by server, ignoring
-ok 375 - filtering by size has no effect if support for it is not advertised
-
-expecting success of 5500.376 'fetch with --filter=blob:limit=0': 
-	fetch_filter_blob_limit_zero server server
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) 592fb96] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into 'client'...
-done.
-[main d0a5bc4] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server
- * [new ref]         HEAD       -> somewhere
- * [new tag]         two        -> two
-d0a5bc4f606380cade3e239ca5f3edd4dea821d9
-ok 376 - fetch with --filter=blob:limit=0
-
-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 376 test(s)
-# SKIP no web server found at ''
-1..376
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5580-unc-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5580-unc-paths/.git/
-1..0 # SKIP skipping Windows-only path tests
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5571-pre-push-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5571-pre-push-hook/.git/
-expecting success of 5571.1 'setup': 
-	test_hook pre-push <<-\EOF &&
-	cat >actual
-	EOF
-
-	git config push.default upstream &&
-	git init --bare repo1 &&
-	git remote add parent1 repo1 &&
-	test_commit one &&
-	cat >expect <<-EOF &&
-	HEAD $(git rev-parse HEAD) refs/heads/foreign $(test_oid zero)
-	EOF
-
-	test_when_finished "rm actual" &&
-	git push parent1 HEAD:foreign &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5571-pre-push-hook/repo1/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-To repo1
- * [new branch]      HEAD -> foreign
-ok 1 - setup
-
-expecting success of 5571.2 'push with failing hook': 
-	test_hook pre-push <<-\EOF &&
-	cat >actual &&
-	exit 1
-	EOF
-
-	test_commit two &&
-	cat >expect <<-EOF &&
-	HEAD $(git rev-parse HEAD) refs/heads/main $(test_oid zero)
-	EOF
-
-	test_when_finished "rm actual" &&
-	test_must_fail git push parent1 HEAD &&
-	test_cmp expect actual
-
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-error: failed to push some refs to 'repo1'
-ok 2 - push with failing hook
-
-expecting success of 5571.3 '--no-verify bypasses hook': 
-	git push --no-verify parent1 HEAD &&
-	test_path_is_missing actual
-
-To repo1
- * [new branch]      HEAD -> main
-ok 3 - --no-verify bypasses hook
-
-expecting success of 5571.4 'push with hook': 
-	test_hook --setup pre-push <<-\EOF &&
-	echo "$1" >actual
-	echo "$2" >>actual
-	cat >>actual
-	EOF
-
-	cat >expect <<-EOF &&
-	parent1
-	repo1
-	refs/heads/main $COMMIT2 refs/heads/foreign $COMMIT1
-	EOF
-
-	git push parent1 main:foreign &&
-	test_cmp expect actual
-
-To repo1
-   d79ce16..139b20d  main -> foreign
-ok 4 - push with hook
-
-expecting success of 5571.5 'add a branch': 
-	git checkout -b other parent1/foreign &&
-	test_commit three
-
-Switched to a new branch 'other'
-branch 'other' set up to track 'parent1/foreign'.
-[other 7c7cd71] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 5 - add a branch
-
-expecting success of 5571.6 'push to default': 
-	cat >expect <<-EOF &&
-	parent1
-	repo1
-	refs/heads/other $COMMIT3 refs/heads/foreign $COMMIT2
-	EOF
-	git push &&
-	test_cmp expect actual
-
-To repo1
-   139b20d..7c7cd71  other -> foreign
-ok 6 - push to default
-
-expecting success of 5571.7 'push non-branches': 
-	cat >expect <<-EOF &&
-	parent1
-	repo1
-	refs/tags/one $COMMIT1 refs/tags/tag1 $ZERO_OID
-	HEAD~ $COMMIT2 refs/heads/prev $ZERO_OID
-	EOF
-
-	git push parent1 one:tag1 HEAD~:refs/heads/prev &&
-	test_cmp expect actual
-
-To repo1
- * [new tag]         one -> tag1
- * [new branch]      HEAD~ -> prev
-ok 7 - push non-branches
-
-expecting success of 5571.8 'push delete': 
-	cat >expect <<-EOF &&
-	parent1
-	repo1
-	(delete) $ZERO_OID refs/heads/prev $COMMIT2
-	EOF
-
-	git push parent1 :prev &&
-	test_cmp expect actual
-
-To repo1
- - [deleted]         prev
-ok 8 - push delete
-
-expecting success of 5571.9 'push to URL': 
-	cat >expect <<-EOF &&
-	repo1
-	repo1
-	HEAD $COMMIT3 refs/heads/other $ZERO_OID
-	EOF
-
-	git push repo1 HEAD &&
-	test_cmp expect actual
-
-To repo1
- * [new branch]      HEAD -> other
-ok 9 - push to URL
-
-expecting success of 5571.10 'set up many-ref tests': 
-	{
-		nr=1000 &&
-		while test $nr -lt 2000
-		do
-			nr=$(( $nr + 1 )) &&
-			echo "create refs/heads/b/$nr $COMMIT3" || return 1
-		done
-	} | git update-ref --stdin
-
-ok 10 - set up many-ref tests
-
-expecting success of 5571.11 'sigpipe does not cause pre-push hook failure': 
-	test_hook --clobber pre-push <<-\EOF &&
-	exit 0
-	EOF
-	git push parent1 "refs/heads/b/*:refs/heads/b/*"
-
-To repo1
- * [new branch]      b/1001 -> b/1001
- * [new branch]      b/1002 -> b/1002
- * [new branch]      b/1003 -> b/1003
- * [new branch]      b/1004 -> b/1004
- * [new branch]      b/1005 -> b/1005
- * [new branch]      b/1006 -> b/1006
- * [new branch]      b/1007 -> b/1007
- * [new branch]      b/1008 -> b/1008
- * [new branch]      b/1009 -> b/1009
- * [new branch]      b/1010 -> b/1010
- * [new branch]      b/1011 -> b/1011
- * [new branch]      b/1012 -> b/1012
- * [new branch]      b/1013 -> b/1013
- * [new branch]      b/1014 -> b/1014
- * [new branch]      b/1015 -> b/1015
- * [new branch]      b/1016 -> b/1016
- * [new branch]      b/1017 -> b/1017
- * [new branch]      b/1018 -> b/1018
- * [new branch]      b/1019 -> b/1019
- * [new branch]      b/1020 -> b/1020
- * [new branch]      b/1021 -> b/1021
- * [new branch]      b/1022 -> b/1022
- * [new branch]      b/1023 -> b/1023
- * [new branch]      b/1024 -> b/1024
- * [new branch]      b/1025 -> b/1025
- * [new branch]      b/1026 -> b/1026
- * [new branch]      b/1027 -> b/1027
- * [new branch]      b/1028 -> b/1028
- * [new branch]      b/1029 -> b/1029
- * [new branch]      b/1030 -> b/1030
- * [new branch]      b/1031 -> b/1031
- * [new branch]      b/1032 -> b/1032
- * [new branch]      b/1033 -> b/1033
- * [new branch]      b/1034 -> b/1034
- * [new branch]      b/1035 -> b/1035
- * [new branch]      b/1036 -> b/1036
- * [new branch]      b/1037 -> b/1037
- * [new branch]      b/1038 -> b/1038
- * [new branch]      b/1039 -> b/1039
- * [new branch]      b/1040 -> b/1040
- * [new branch]      b/1041 -> b/1041
- * [new branch]      b/1042 -> b/1042
- * [new branch]      b/1043 -> b/1043
- * [new branch]      b/1044 -> b/1044
- * [new branch]      b/1045 -> b/1045
- * [new branch]      b/1046 -> b/1046
- * [new branch]      b/1047 -> b/1047
- * [new branch]      b/1048 -> b/1048
- * [new branch]      b/1049 -> b/1049
- * [new branch]      b/1050 -> b/1050
- * [new branch]      b/1051 -> b/1051
- * [new branch]      b/1052 -> b/1052
- * [new branch]      b/1053 -> b/1053
- * [new branch]      b/1054 -> b/1054
- * [new branch]      b/1055 -> b/1055
- * [new branch]      b/1056 -> b/1056
- * [new branch]      b/1057 -> b/1057
- * [new branch]      b/1058 -> b/1058
- * [new branch]      b/1059 -> b/1059
- * [new branch]      b/1060 -> b/1060
- * [new branch]      b/1061 -> b/1061
- * [new branch]      b/1062 -> b/1062
- * [new branch]      b/1063 -> b/1063
- * [new branch]      b/1064 -> b/1064
- * [new branch]      b/1065 -> b/1065
- * [new branch]      b/1066 -> b/1066
- * [new branch]      b/1067 -> b/1067
- * [new branch]      b/1068 -> b/1068
- * [new branch]      b/1069 -> b/1069
- * [new branch]      b/1070 -> b/1070
- * [new branch]      b/1071 -> b/1071
- * [new branch]      b/1072 -> b/1072
- * [new branch]      b/1073 -> b/1073
- * [new branch]      b/1074 -> b/1074
- * [new branch]      b/1075 -> b/1075
- * [new branch]      b/1076 -> b/1076
- * [new branch]      b/1077 -> b/1077
- * [new branch]      b/1078 -> b/1078
- * [new branch]      b/1079 -> b/1079
- * [new branch]      b/1080 -> b/1080
- * [new branch]      b/1081 -> b/1081
- * [new branch]      b/1082 -> b/1082
- * [new branch]      b/1083 -> b/1083
- * [new branch]      b/1084 -> b/1084
- * [new branch]      b/1085 -> b/1085
- * [new branch]      b/1086 -> b/1086
- * [new branch]      b/1087 -> b/1087
- * [new branch]      b/1088 -> b/1088
- * [new branch]      b/1089 -> b/1089
- * [new branch]      b/1090 -> b/1090
- * [new branch]      b/1091 -> b/1091
- * [new branch]      b/1092 -> b/1092
- * [new branch]      b/1093 -> b/1093
- * [new branch]      b/1094 -> b/1094
- * [new branch]      b/1095 -> b/1095
- * [new branch]      b/1096 -> b/1096
- * [new branch]      b/1097 -> b/1097
- * [new branch]      b/1098 -> b/1098
- * [new branch]      b/1099 -> b/1099
- * [new branch]      b/1100 -> b/1100
- * [new branch]      b/1101 -> b/1101
- * [new branch]      b/1102 -> b/1102
- * [new branch]      b/1103 -> b/1103
- * [new branch]      b/1104 -> b/1104
- * [new branch]      b/1105 -> b/1105
- * [new branch]      b/1106 -> b/1106
- * [new branch]      b/1107 -> b/1107
- * [new branch]      b/1108 -> b/1108
- * [new branch]      b/1109 -> b/1109
- * [new branch]      b/1110 -> b/1110
- * [new branch]      b/1111 -> b/1111
- * [new branch]      b/1112 -> b/1112
- * [new branch]      b/1113 -> b/1113
- * [new branch]      b/1114 -> b/1114
- * [new branch]      b/1115 -> b/1115
- * [new branch]      b/1116 -> b/1116
- * [new branch]      b/1117 -> b/1117
- * [new branch]      b/1118 -> b/1118
- * [new branch]      b/1119 -> b/1119
- * [new branch]      b/1120 -> b/1120
- * [new branch]      b/1121 -> b/1121
- * [new branch]      b/1122 -> b/1122
- * [new branch]      b/1123 -> b/1123
- * [new branch]      b/1124 -> b/1124
- * [new branch]      b/1125 -> b/1125
- * [new branch]      b/1126 -> b/1126
- * [new branch]      b/1127 -> b/1127
- * [new branch]      b/1128 -> b/1128
- * [new branch]      b/1129 -> b/1129
- * [new branch]      b/1130 -> b/1130
- * [new branch]      b/1131 -> b/1131
- * [new branch]      b/1132 -> b/1132
- * [new branch]      b/1133 -> b/1133
- * [new branch]      b/1134 -> b/1134
- * [new branch]      b/1135 -> b/1135
- * [new branch]      b/1136 -> b/1136
- * [new branch]      b/1137 -> b/1137
- * [new branch]      b/1138 -> b/1138
- * [new branch]      b/1139 -> b/1139
- * [new branch]      b/1140 -> b/1140
- * [new branch]      b/1141 -> b/1141
- * [new branch]      b/1142 -> b/1142
- * [new branch]      b/1143 -> b/1143
- * [new branch]      b/1144 -> b/1144
- * [new branch]      b/1145 -> b/1145
- * [new branch]      b/1146 -> b/1146
- * [new branch]      b/1147 -> b/1147
- * [new branch]      b/1148 -> b/1148
- * [new branch]      b/1149 -> b/1149
- * [new branch]      b/1150 -> b/1150
- * [new branch]      b/1151 -> b/1151
- * [new branch]      b/1152 -> b/1152
- * [new branch]      b/1153 -> b/1153
- * [new branch]      b/1154 -> b/1154
- * [new branch]      b/1155 -> b/1155
- * [new branch]      b/1156 -> b/1156
- * [new branch]      b/1157 -> b/1157
- * [new branch]      b/1158 -> b/1158
- * [new branch]      b/1159 -> b/1159
- * [new branch]      b/1160 -> b/1160
- * [new branch]      b/1161 -> b/1161
- * [new branch]      b/1162 -> b/1162
- * [new branch]      b/1163 -> b/1163
- * [new branch]      b/1164 -> b/1164
- * [new branch]      b/1165 -> b/1165
- * [new branch]      b/1166 -> b/1166
- * [new branch]      b/1167 -> b/1167
- * [new branch]      b/1168 -> b/1168
- * [new branch]      b/1169 -> b/1169
- * [new branch]      b/1170 -> b/1170
- * [new branch]      b/1171 -> b/1171
- * [new branch]      b/1172 -> b/1172
- * [new branch]      b/1173 -> b/1173
- * [new branch]      b/1174 -> b/1174
- * [new branch]      b/1175 -> b/1175
- * [new branch]      b/1176 -> b/1176
- * [new branch]      b/1177 -> b/1177
- * [new branch]      b/1178 -> b/1178
- * [new branch]      b/1179 -> b/1179
- * [new branch]      b/1180 -> b/1180
- * [new branch]      b/1181 -> b/1181
- * [new branch]      b/1182 -> b/1182
- * [new branch]      b/1183 -> b/1183
- * [new branch]      b/1184 -> b/1184
- * [new branch]      b/1185 -> b/1185
- * [new branch]      b/1186 -> b/1186
- * [new branch]      b/1187 -> b/1187
- * [new branch]      b/1188 -> b/1188
- * [new branch]      b/1189 -> b/1189
- * [new branch]      b/1190 -> b/1190
- * [new branch]      b/1191 -> b/1191
- * [new branch]      b/1192 -> b/1192
- * [new branch]      b/1193 -> b/1193
- * [new branch]      b/1194 -> b/1194
- * [new branch]      b/1195 -> b/1195
- * [new branch]      b/1196 -> b/1196
- * [new branch]      b/1197 -> b/1197
- * [new branch]      b/1198 -> b/1198
- * [new branch]      b/1199 -> b/1199
- * [new branch]      b/1200 -> b/1200
- * [new branch]      b/1201 -> b/1201
- * [new branch]      b/1202 -> b/1202
- * [new branch]      b/1203 -> b/1203
- * [new branch]      b/1204 -> b/1204
- * [new branch]      b/1205 -> b/1205
- * [new branch]      b/1206 -> b/1206
- * [new branch]      b/1207 -> b/1207
- * [new branch]      b/1208 -> b/1208
- * [new branch]      b/1209 -> b/1209
- * [new branch]      b/1210 -> b/1210
- * [new branch]      b/1211 -> b/1211
- * [new branch]      b/1212 -> b/1212
- * [new branch]      b/1213 -> b/1213
- * [new branch]      b/1214 -> b/1214
- * [new branch]      b/1215 -> b/1215
- * [new branch]      b/1216 -> b/1216
- * [new branch]      b/1217 -> b/1217
- * [new branch]      b/1218 -> b/1218
- * [new branch]      b/1219 -> b/1219
- * [new branch]      b/1220 -> b/1220
- * [new branch]      b/1221 -> b/1221
- * [new branch]      b/1222 -> b/1222
- * [new branch]      b/1223 -> b/1223
- * [new branch]      b/1224 -> b/1224
- * [new branch]      b/1225 -> b/1225
- * [new branch]      b/1226 -> b/1226
- * [new branch]      b/1227 -> b/1227
- * [new branch]      b/1228 -> b/1228
- * [new branch]      b/1229 -> b/1229
- * [new branch]      b/1230 -> b/1230
- * [new branch]      b/1231 -> b/1231
- * [new branch]      b/1232 -> b/1232
- * [new branch]      b/1233 -> b/1233
- * [new branch]      b/1234 -> b/1234
- * [new branch]      b/1235 -> b/1235
- * [new branch]      b/1236 -> b/1236
- * [new branch]      b/1237 -> b/1237
- * [new branch]      b/1238 -> b/1238
- * [new branch]      b/1239 -> b/1239
- * [new branch]      b/1240 -> b/1240
- * [new branch]      b/1241 -> b/1241
- * [new branch]      b/1242 -> b/1242
- * [new branch]      b/1243 -> b/1243
- * [new branch]      b/1244 -> b/1244
- * [new branch]      b/1245 -> b/1245
- * [new branch]      b/1246 -> b/1246
- * [new branch]      b/1247 -> b/1247
- * [new branch]      b/1248 -> b/1248
- * [new branch]      b/1249 -> b/1249
- * [new branch]      b/1250 -> b/1250
- * [new branch]      b/1251 -> b/1251
- * [new branch]      b/1252 -> b/1252
- * [new branch]      b/1253 -> b/1253
- * [new branch]      b/1254 -> b/1254
- * [new branch]      b/1255 -> b/1255
- * [new branch]      b/1256 -> b/1256
- * [new branch]      b/1257 -> b/1257
- * [new branch]      b/1258 -> b/1258
- * [new branch]      b/1259 -> b/1259
- * [new branch]      b/1260 -> b/1260
- * [new branch]      b/1261 -> b/1261
- * [new branch]      b/1262 -> b/1262
- * [new branch]      b/1263 -> b/1263
- * [new branch]      b/1264 -> b/1264
- * [new branch]      b/1265 -> b/1265
- * [new branch]      b/1266 -> b/1266
- * [new branch]      b/1267 -> b/1267
- * [new branch]      b/1268 -> b/1268
- * [new branch]      b/1269 -> b/1269
- * [new branch]      b/1270 -> b/1270
- * [new branch]      b/1271 -> b/1271
- * [new branch]      b/1272 -> b/1272
- * [new branch]      b/1273 -> b/1273
- * [new branch]      b/1274 -> b/1274
- * [new branch]      b/1275 -> b/1275
- * [new branch]      b/1276 -> b/1276
- * [new branch]      b/1277 -> b/1277
- * [new branch]      b/1278 -> b/1278
- * [new branch]      b/1279 -> b/1279
- * [new branch]      b/1280 -> b/1280
- * [new branch]      b/1281 -> b/1281
- * [new branch]      b/1282 -> b/1282
- * [new branch]      b/1283 -> b/1283
- * [new branch]      b/1284 -> b/1284
- * [new branch]      b/1285 -> b/1285
- * [new branch]      b/1286 -> b/1286
- * [new branch]      b/1287 -> b/1287
- * [new branch]      b/1288 -> b/1288
- * [new branch]      b/1289 -> b/1289
- * [new branch]      b/1290 -> b/1290
- * [new branch]      b/1291 -> b/1291
- * [new branch]      b/1292 -> b/1292
- * [new branch]      b/1293 -> b/1293
- * [new branch]      b/1294 -> b/1294
- * [new branch]      b/1295 -> b/1295
- * [new branch]      b/1296 -> b/1296
- * [new branch]      b/1297 -> b/1297
- * [new branch]      b/1298 -> b/1298
- * [new branch]      b/1299 -> b/1299
- * [new branch]      b/1300 -> b/1300
- * [new branch]      b/1301 -> b/1301
- * [new branch]      b/1302 -> b/1302
- * [new branch]      b/1303 -> b/1303
- * [new branch]      b/1304 -> b/1304
- * [new branch]      b/1305 -> b/1305
- * [new branch]      b/1306 -> b/1306
- * [new branch]      b/1307 -> b/1307
- * [new branch]      b/1308 -> b/1308
- * [new branch]      b/1309 -> b/1309
- * [new branch]      b/1310 -> b/1310
- * [new branch]      b/1311 -> b/1311
- * [new branch]      b/1312 -> b/1312
- * [new branch]      b/1313 -> b/1313
- * [new branch]      b/1314 -> b/1314
- * [new branch]      b/1315 -> b/1315
- * [new branch]      b/1316 -> b/1316
- * [new branch]      b/1317 -> b/1317
- * [new branch]      b/1318 -> b/1318
- * [new branch]      b/1319 -> b/1319
- * [new branch]      b/1320 -> b/1320
- * [new branch]      b/1321 -> b/1321
- * [new branch]      b/1322 -> b/1322
- * [new branch]      b/1323 -> b/1323
- * [new branch]      b/1324 -> b/1324
- * [new branch]      b/1325 -> b/1325
- * [new branch]      b/1326 -> b/1326
- * [new branch]      b/1327 -> b/1327
- * [new branch]      b/1328 -> b/1328
- * [new branch]      b/1329 -> b/1329
- * [new branch]      b/1330 -> b/1330
- * [new branch]      b/1331 -> b/1331
- * [new branch]      b/1332 -> b/1332
- * [new branch]      b/1333 -> b/1333
- * [new branch]      b/1334 -> b/1334
- * [new branch]      b/1335 -> b/1335
- * [new branch]      b/1336 -> b/1336
- * [new branch]      b/1337 -> b/1337
- * [new branch]      b/1338 -> b/1338
- * [new branch]      b/1339 -> b/1339
- * [new branch]      b/1340 -> b/1340
- * [new branch]      b/1341 -> b/1341
- * [new branch]      b/1342 -> b/1342
- * [new branch]      b/1343 -> b/1343
- * [new branch]      b/1344 -> b/1344
- * [new branch]      b/1345 -> b/1345
- * [new branch]      b/1346 -> b/1346
- * [new branch]      b/1347 -> b/1347
- * [new branch]      b/1348 -> b/1348
- * [new branch]      b/1349 -> b/1349
- * [new branch]      b/1350 -> b/1350
- * [new branch]      b/1351 -> b/1351
- * [new branch]      b/1352 -> b/1352
- * [new branch]      b/1353 -> b/1353
- * [new branch]      b/1354 -> b/1354
- * [new branch]      b/1355 -> b/1355
- * [new branch]      b/1356 -> b/1356
- * [new branch]      b/1357 -> b/1357
- * [new branch]      b/1358 -> b/1358
- * [new branch]      b/1359 -> b/1359
- * [new branch]      b/1360 -> b/1360
- * [new branch]      b/1361 -> b/1361
- * [new branch]      b/1362 -> b/1362
- * [new branch]      b/1363 -> b/1363
- * [new branch]      b/1364 -> b/1364
- * [new branch]      b/1365 -> b/1365
- * [new branch]      b/1366 -> b/1366
- * [new branch]      b/1367 -> b/1367
- * [new branch]      b/1368 -> b/1368
- * [new branch]      b/1369 -> b/1369
- * [new branch]      b/1370 -> b/1370
- * [new branch]      b/1371 -> b/1371
- * [new branch]      b/1372 -> b/1372
- * [new branch]      b/1373 -> b/1373
- * [new branch]      b/1374 -> b/1374
- * [new branch]      b/1375 -> b/1375
- * [new branch]      b/1376 -> b/1376
- * [new branch]      b/1377 -> b/1377
- * [new branch]      b/1378 -> b/1378
- * [new branch]      b/1379 -> b/1379
- * [new branch]      b/1380 -> b/1380
- * [new branch]      b/1381 -> b/1381
- * [new branch]      b/1382 -> b/1382
- * [new branch]      b/1383 -> b/1383
- * [new branch]      b/1384 -> b/1384
- * [new branch]      b/1385 -> b/1385
- * [new branch]      b/1386 -> b/1386
- * [new branch]      b/1387 -> b/1387
- * [new branch]      b/1388 -> b/1388
- * [new branch]      b/1389 -> b/1389
- * [new branch]      b/1390 -> b/1390
- * [new branch]      b/1391 -> b/1391
- * [new branch]      b/1392 -> b/1392
- * [new branch]      b/1393 -> b/1393
- * [new branch]      b/1394 -> b/1394
- * [new branch]      b/1395 -> b/1395
- * [new branch]      b/1396 -> b/1396
- * [new branch]      b/1397 -> b/1397
- * [new branch]      b/1398 -> b/1398
- * [new branch]      b/1399 -> b/1399
- * [new branch]      b/1400 -> b/1400
- * [new branch]      b/1401 -> b/1401
- * [new branch]      b/1402 -> b/1402
- * [new branch]      b/1403 -> b/1403
- * [new branch]      b/1404 -> b/1404
- * [new branch]      b/1405 -> b/1405
- * [new branch]      b/1406 -> b/1406
- * [new branch]      b/1407 -> b/1407
- * [new branch]      b/1408 -> b/1408
- * [new branch]      b/1409 -> b/1409
- * [new branch]      b/1410 -> b/1410
- * [new branch]      b/1411 -> b/1411
- * [new branch]      b/1412 -> b/1412
- * [new branch]      b/1413 -> b/1413
- * [new branch]      b/1414 -> b/1414
- * [new branch]      b/1415 -> b/1415
- * [new branch]      b/1416 -> b/1416
- * [new branch]      b/1417 -> b/1417
- * [new branch]      b/1418 -> b/1418
- * [new branch]      b/1419 -> b/1419
- * [new branch]      b/1420 -> b/1420
- * [new branch]      b/1421 -> b/1421
- * [new branch]      b/1422 -> b/1422
- * [new branch]      b/1423 -> b/1423
- * [new branch]      b/1424 -> b/1424
- * [new branch]      b/1425 -> b/1425
- * [new branch]      b/1426 -> b/1426
- * [new branch]      b/1427 -> b/1427
- * [new branch]      b/1428 -> b/1428
- * [new branch]      b/1429 -> b/1429
- * [new branch]      b/1430 -> b/1430
- * [new branch]      b/1431 -> b/1431
- * [new branch]      b/1432 -> b/1432
- * [new branch]      b/1433 -> b/1433
- * [new branch]      b/1434 -> b/1434
- * [new branch]      b/1435 -> b/1435
- * [new branch]      b/1436 -> b/1436
- * [new branch]      b/1437 -> b/1437
- * [new branch]      b/1438 -> b/1438
- * [new branch]      b/1439 -> b/1439
- * [new branch]      b/1440 -> b/1440
- * [new branch]      b/1441 -> b/1441
- * [new branch]      b/1442 -> b/1442
- * [new branch]      b/1443 -> b/1443
- * [new branch]      b/1444 -> b/1444
- * [new branch]      b/1445 -> b/1445
- * [new branch]      b/1446 -> b/1446
- * [new branch]      b/1447 -> b/1447
- * [new branch]      b/1448 -> b/1448
- * [new branch]      b/1449 -> b/1449
- * [new branch]      b/1450 -> b/1450
- * [new branch]      b/1451 -> b/1451
- * [new branch]      b/1452 -> b/1452
- * [new branch]      b/1453 -> b/1453
- * [new branch]      b/1454 -> b/1454
- * [new branch]      b/1455 -> b/1455
- * [new branch]      b/1456 -> b/1456
- * [new branch]      b/1457 -> b/1457
- * [new branch]      b/1458 -> b/1458
- * [new branch]      b/1459 -> b/1459
- * [new branch]      b/1460 -> b/1460
- * [new branch]      b/1461 -> b/1461
- * [new branch]      b/1462 -> b/1462
- * [new branch]      b/1463 -> b/1463
- * [new branch]      b/1464 -> b/1464
- * [new branch]      b/1465 -> b/1465
- * [new branch]      b/1466 -> b/1466
- * [new branch]      b/1467 -> b/1467
- * [new branch]      b/1468 -> b/1468
- * [new branch]      b/1469 -> b/1469
- * [new branch]      b/1470 -> b/1470
- * [new branch]      b/1471 -> b/1471
- * [new branch]      b/1472 -> b/1472
- * [new branch]      b/1473 -> b/1473
- * [new branch]      b/1474 -> b/1474
- * [new branch]      b/1475 -> b/1475
- * [new branch]      b/1476 -> b/1476
- * [new branch]      b/1477 -> b/1477
- * [new branch]      b/1478 -> b/1478
- * [new branch]      b/1479 -> b/1479
- * [new branch]      b/1480 -> b/1480
- * [new branch]      b/1481 -> b/1481
- * [new branch]      b/1482 -> b/1482
- * [new branch]      b/1483 -> b/1483
- * [new branch]      b/1484 -> b/1484
- * [new branch]      b/1485 -> b/1485
- * [new branch]      b/1486 -> b/1486
- * [new branch]      b/1487 -> b/1487
- * [new branch]      b/1488 -> b/1488
- * [new branch]      b/1489 -> b/1489
- * [new branch]      b/1490 -> b/1490
- * [new branch]      b/1491 -> b/1491
- * [new branch]      b/1492 -> b/1492
- * [new branch]      b/1493 -> b/1493
- * [new branch]      b/1494 -> b/1494
- * [new branch]      b/1495 -> b/1495
- * [new branch]      b/1496 -> b/1496
- * [new branch]      b/1497 -> b/1497
- * [new branch]      b/1498 -> b/1498
- * [new branch]      b/1499 -> b/1499
- * [new branch]      b/1500 -> b/1500
- * [new branch]      b/1501 -> b/1501
- * [new branch]      b/1502 -> b/1502
- * [new branch]      b/1503 -> b/1503
- * [new branch]      b/1504 -> b/1504
- * [new branch]      b/1505 -> b/1505
- * [new branch]      b/1506 -> b/1506
- * [new branch]      b/1507 -> b/1507
- * [new branch]      b/1508 -> b/1508
- * [new branch]      b/1509 -> b/1509
- * [new branch]      b/1510 -> b/1510
- * [new branch]      b/1511 -> b/1511
- * [new branch]      b/1512 -> b/1512
- * [new branch]      b/1513 -> b/1513
- * [new branch]      b/1514 -> b/1514
- * [new branch]      b/1515 -> b/1515
- * [new branch]      b/1516 -> b/1516
- * [new branch]      b/1517 -> b/1517
- * [new branch]      b/1518 -> b/1518
- * [new branch]      b/1519 -> b/1519
- * [new branch]      b/1520 -> b/1520
- * [new branch]      b/1521 -> b/1521
- * [new branch]      b/1522 -> b/1522
- * [new branch]      b/1523 -> b/1523
- * [new branch]      b/1524 -> b/1524
- * [new branch]      b/1525 -> b/1525
- * [new branch]      b/1526 -> b/1526
- * [new branch]      b/1527 -> b/1527
- * [new branch]      b/1528 -> b/1528
- * [new branch]      b/1529 -> b/1529
- * [new branch]      b/1530 -> b/1530
- * [new branch]      b/1531 -> b/1531
- * [new branch]      b/1532 -> b/1532
- * [new branch]      b/1533 -> b/1533
- * [new branch]      b/1534 -> b/1534
- * [new branch]      b/1535 -> b/1535
- * [new branch]      b/1536 -> b/1536
- * [new branch]      b/1537 -> b/1537
- * [new branch]      b/1538 -> b/1538
- * [new branch]      b/1539 -> b/1539
- * [new branch]      b/1540 -> b/1540
- * [new branch]      b/1541 -> b/1541
- * [new branch]      b/1542 -> b/1542
- * [new branch]      b/1543 -> b/1543
- * [new branch]      b/1544 -> b/1544
- * [new branch]      b/1545 -> b/1545
- * [new branch]      b/1546 -> b/1546
- * [new branch]      b/1547 -> b/1547
- * [new branch]      b/1548 -> b/1548
- * [new branch]      b/1549 -> b/1549
- * [new branch]      b/1550 -> b/1550
- * [new branch]      b/1551 -> b/1551
- * [new branch]      b/1552 -> b/1552
- * [new branch]      b/1553 -> b/1553
- * [new branch]      b/1554 -> b/1554
- * [new branch]      b/1555 -> b/1555
- * [new branch]      b/1556 -> b/1556
- * [new branch]      b/1557 -> b/1557
- * [new branch]      b/1558 -> b/1558
- * [new branch]      b/1559 -> b/1559
- * [new branch]      b/1560 -> b/1560
- * [new branch]      b/1561 -> b/1561
- * [new branch]      b/1562 -> b/1562
- * [new branch]      b/1563 -> b/1563
- * [new branch]      b/1564 -> b/1564
- * [new branch]      b/1565 -> b/1565
- * [new branch]      b/1566 -> b/1566
- * [new branch]      b/1567 -> b/1567
- * [new branch]      b/1568 -> b/1568
- * [new branch]      b/1569 -> b/1569
- * [new branch]      b/1570 -> b/1570
- * [new branch]      b/1571 -> b/1571
- * [new branch]      b/1572 -> b/1572
- * [new branch]      b/1573 -> b/1573
- * [new branch]      b/1574 -> b/1574
- * [new branch]      b/1575 -> b/1575
- * [new branch]      b/1576 -> b/1576
- * [new branch]      b/1577 -> b/1577
- * [new branch]      b/1578 -> b/1578
- * [new branch]      b/1579 -> b/1579
- * [new branch]      b/1580 -> b/1580
- * [new branch]      b/1581 -> b/1581
- * [new branch]      b/1582 -> b/1582
- * [new branch]      b/1583 -> b/1583
- * [new branch]      b/1584 -> b/1584
- * [new branch]      b/1585 -> b/1585
- * [new branch]      b/1586 -> b/1586
- * [new branch]      b/1587 -> b/1587
- * [new branch]      b/1588 -> b/1588
- * [new branch]      b/1589 -> b/1589
- * [new branch]      b/1590 -> b/1590
- * [new branch]      b/1591 -> b/1591
- * [new branch]      b/1592 -> b/1592
- * [new branch]      b/1593 -> b/1593
- * [new branch]      b/1594 -> b/1594
- * [new branch]      b/1595 -> b/1595
- * [new branch]      b/1596 -> b/1596
- * [new branch]      b/1597 -> b/1597
- * [new branch]      b/1598 -> b/1598
- * [new branch]      b/1599 -> b/1599
- * [new branch]      b/1600 -> b/1600
- * [new branch]      b/1601 -> b/1601
- * [new branch]      b/1602 -> b/1602
- * [new branch]      b/1603 -> b/1603
- * [new branch]      b/1604 -> b/1604
- * [new branch]      b/1605 -> b/1605
- * [new branch]      b/1606 -> b/1606
- * [new branch]      b/1607 -> b/1607
- * [new branch]      b/1608 -> b/1608
- * [new branch]      b/1609 -> b/1609
- * [new branch]      b/1610 -> b/1610
- * [new branch]      b/1611 -> b/1611
- * [new branch]      b/1612 -> b/1612
- * [new branch]      b/1613 -> b/1613
- * [new branch]      b/1614 -> b/1614
- * [new branch]      b/1615 -> b/1615
- * [new branch]      b/1616 -> b/1616
- * [new branch]      b/1617 -> b/1617
- * [new branch]      b/1618 -> b/1618
- * [new branch]      b/1619 -> b/1619
- * [new branch]      b/1620 -> b/1620
- * [new branch]      b/1621 -> b/1621
- * [new branch]      b/1622 -> b/1622
- * [new branch]      b/1623 -> b/1623
- * [new branch]      b/1624 -> b/1624
- * [new branch]      b/1625 -> b/1625
- * [new branch]      b/1626 -> b/1626
- * [new branch]      b/1627 -> b/1627
- * [new branch]      b/1628 -> b/1628
- * [new branch]      b/1629 -> b/1629
- * [new branch]      b/1630 -> b/1630
- * [new branch]      b/1631 -> b/1631
- * [new branch]      b/1632 -> b/1632
- * [new branch]      b/1633 -> b/1633
- * [new branch]      b/1634 -> b/1634
- * [new branch]      b/1635 -> b/1635
- * [new branch]      b/1636 -> b/1636
- * [new branch]      b/1637 -> b/1637
- * [new branch]      b/1638 -> b/1638
- * [new branch]      b/1639 -> b/1639
- * [new branch]      b/1640 -> b/1640
- * [new branch]      b/1641 -> b/1641
- * [new branch]      b/1642 -> b/1642
- * [new branch]      b/1643 -> b/1643
- * [new branch]      b/1644 -> b/1644
- * [new branch]      b/1645 -> b/1645
- * [new branch]      b/1646 -> b/1646
- * [new branch]      b/1647 -> b/1647
- * [new branch]      b/1648 -> b/1648
- * [new branch]      b/1649 -> b/1649
- * [new branch]      b/1650 -> b/1650
- * [new branch]      b/1651 -> b/1651
- * [new branch]      b/1652 -> b/1652
- * [new branch]      b/1653 -> b/1653
- * [new branch]      b/1654 -> b/1654
- * [new branch]      b/1655 -> b/1655
- * [new branch]      b/1656 -> b/1656
- * [new branch]      b/1657 -> b/1657
- * [new branch]      b/1658 -> b/1658
- * [new branch]      b/1659 -> b/1659
- * [new branch]      b/1660 -> b/1660
- * [new branch]      b/1661 -> b/1661
- * [new branch]      b/1662 -> b/1662
- * [new branch]      b/1663 -> b/1663
- * [new branch]      b/1664 -> b/1664
- * [new branch]      b/1665 -> b/1665
- * [new branch]      b/1666 -> b/1666
- * [new branch]      b/1667 -> b/1667
- * [new branch]      b/1668 -> b/1668
- * [new branch]      b/1669 -> b/1669
- * [new branch]      b/1670 -> b/1670
- * [new branch]      b/1671 -> b/1671
- * [new branch]      b/1672 -> b/1672
- * [new branch]      b/1673 -> b/1673
- * [new branch]      b/1674 -> b/1674
- * [new branch]      b/1675 -> b/1675
- * [new branch]      b/1676 -> b/1676
- * [new branch]      b/1677 -> b/1677
- * [new branch]      b/1678 -> b/1678
- * [new branch]      b/1679 -> b/1679
- * [new branch]      b/1680 -> b/1680
- * [new branch]      b/1681 -> b/1681
- * [new branch]      b/1682 -> b/1682
- * [new branch]      b/1683 -> b/1683
- * [new branch]      b/1684 -> b/1684
- * [new branch]      b/1685 -> b/1685
- * [new branch]      b/1686 -> b/1686
- * [new branch]      b/1687 -> b/1687
- * [new branch]      b/1688 -> b/1688
- * [new branch]      b/1689 -> b/1689
- * [new branch]      b/1690 -> b/1690
- * [new branch]      b/1691 -> b/1691
- * [new branch]      b/1692 -> b/1692
- * [new branch]      b/1693 -> b/1693
- * [new branch]      b/1694 -> b/1694
- * [new branch]      b/1695 -> b/1695
- * [new branch]      b/1696 -> b/1696
- * [new branch]      b/1697 -> b/1697
- * [new branch]      b/1698 -> b/1698
- * [new branch]      b/1699 -> b/1699
- * [new branch]      b/1700 -> b/1700
- * [new branch]      b/1701 -> b/1701
- * [new branch]      b/1702 -> b/1702
- * [new branch]      b/1703 -> b/1703
- * [new branch]      b/1704 -> b/1704
- * [new branch]      b/1705 -> b/1705
- * [new branch]      b/1706 -> b/1706
- * [new branch]      b/1707 -> b/1707
- * [new branch]      b/1708 -> b/1708
- * [new branch]      b/1709 -> b/1709
- * [new branch]      b/1710 -> b/1710
- * [new branch]      b/1711 -> b/1711
- * [new branch]      b/1712 -> b/1712
- * [new branch]      b/1713 -> b/1713
- * [new branch]      b/1714 -> b/1714
- * [new branch]      b/1715 -> b/1715
- * [new branch]      b/1716 -> b/1716
- * [new branch]      b/1717 -> b/1717
- * [new branch]      b/1718 -> b/1718
- * [new branch]      b/1719 -> b/1719
- * [new branch]      b/1720 -> b/1720
- * [new branch]      b/1721 -> b/1721
- * [new branch]      b/1722 -> b/1722
- * [new branch]      b/1723 -> b/1723
- * [new branch]      b/1724 -> b/1724
- * [new branch]      b/1725 -> b/1725
- * [new branch]      b/1726 -> b/1726
- * [new branch]      b/1727 -> b/1727
- * [new branch]      b/1728 -> b/1728
- * [new branch]      b/1729 -> b/1729
- * [new branch]      b/1730 -> b/1730
- * [new branch]      b/1731 -> b/1731
- * [new branch]      b/1732 -> b/1732
- * [new branch]      b/1733 -> b/1733
- * [new branch]      b/1734 -> b/1734
- * [new branch]      b/1735 -> b/1735
- * [new branch]      b/1736 -> b/1736
- * [new branch]      b/1737 -> b/1737
- * [new branch]      b/1738 -> b/1738
- * [new branch]      b/1739 -> b/1739
- * [new branch]      b/1740 -> b/1740
- * [new branch]      b/1741 -> b/1741
- * [new branch]      b/1742 -> b/1742
- * [new branch]      b/1743 -> b/1743
- * [new branch]      b/1744 -> b/1744
- * [new branch]      b/1745 -> b/1745
- * [new branch]      b/1746 -> b/1746
- * [new branch]      b/1747 -> b/1747
- * [new branch]      b/1748 -> b/1748
- * [new branch]      b/1749 -> b/1749
- * [new branch]      b/1750 -> b/1750
- * [new branch]      b/1751 -> b/1751
- * [new branch]      b/1752 -> b/1752
- * [new branch]      b/1753 -> b/1753
- * [new branch]      b/1754 -> b/1754
- * [new branch]      b/1755 -> b/1755
- * [new branch]      b/1756 -> b/1756
- * [new branch]      b/1757 -> b/1757
- * [new branch]      b/1758 -> b/1758
- * [new branch]      b/1759 -> b/1759
- * [new branch]      b/1760 -> b/1760
- * [new branch]      b/1761 -> b/1761
- * [new branch]      b/1762 -> b/1762
- * [new branch]      b/1763 -> b/1763
- * [new branch]      b/1764 -> b/1764
- * [new branch]      b/1765 -> b/1765
- * [new branch]      b/1766 -> b/1766
- * [new branch]      b/1767 -> b/1767
- * [new branch]      b/1768 -> b/1768
- * [new branch]      b/1769 -> b/1769
- * [new branch]      b/1770 -> b/1770
- * [new branch]      b/1771 -> b/1771
- * [new branch]      b/1772 -> b/1772
- * [new branch]      b/1773 -> b/1773
- * [new branch]      b/1774 -> b/1774
- * [new branch]      b/1775 -> b/1775
- * [new branch]      b/1776 -> b/1776
- * [new branch]      b/1777 -> b/1777
- * [new branch]      b/1778 -> b/1778
- * [new branch]      b/1779 -> b/1779
- * [new branch]      b/1780 -> b/1780
- * [new branch]      b/1781 -> b/1781
- * [new branch]      b/1782 -> b/1782
- * [new branch]      b/1783 -> b/1783
- * [new branch]      b/1784 -> b/1784
- * [new branch]      b/1785 -> b/1785
- * [new branch]      b/1786 -> b/1786
- * [new branch]      b/1787 -> b/1787
- * [new branch]      b/1788 -> b/1788
- * [new branch]      b/1789 -> b/1789
- * [new branch]      b/1790 -> b/1790
- * [new branch]      b/1791 -> b/1791
- * [new branch]      b/1792 -> b/1792
- * [new branch]      b/1793 -> b/1793
- * [new branch]      b/1794 -> b/1794
- * [new branch]      b/1795 -> b/1795
- * [new branch]      b/1796 -> b/1796
- * [new branch]      b/1797 -> b/1797
- * [new branch]      b/1798 -> b/1798
- * [new branch]      b/1799 -> b/1799
- * [new branch]      b/1800 -> b/1800
- * [new branch]      b/1801 -> b/1801
- * [new branch]      b/1802 -> b/1802
- * [new branch]      b/1803 -> b/1803
- * [new branch]      b/1804 -> b/1804
- * [new branch]      b/1805 -> b/1805
- * [new branch]      b/1806 -> b/1806
- * [new branch]      b/1807 -> b/1807
- * [new branch]      b/1808 -> b/1808
- * [new branch]      b/1809 -> b/1809
- * [new branch]      b/1810 -> b/1810
- * [new branch]      b/1811 -> b/1811
- * [new branch]      b/1812 -> b/1812
- * [new branch]      b/1813 -> b/1813
- * [new branch]      b/1814 -> b/1814
- * [new branch]      b/1815 -> b/1815
- * [new branch]      b/1816 -> b/1816
- * [new branch]      b/1817 -> b/1817
- * [new branch]      b/1818 -> b/1818
- * [new branch]      b/1819 -> b/1819
- * [new branch]      b/1820 -> b/1820
- * [new branch]      b/1821 -> b/1821
- * [new branch]      b/1822 -> b/1822
- * [new branch]      b/1823 -> b/1823
- * [new branch]      b/1824 -> b/1824
- * [new branch]      b/1825 -> b/1825
- * [new branch]      b/1826 -> b/1826
- * [new branch]      b/1827 -> b/1827
- * [new branch]      b/1828 -> b/1828
- * [new branch]      b/1829 -> b/1829
- * [new branch]      b/1830 -> b/1830
- * [new branch]      b/1831 -> b/1831
- * [new branch]      b/1832 -> b/1832
- * [new branch]      b/1833 -> b/1833
- * [new branch]      b/1834 -> b/1834
- * [new branch]      b/1835 -> b/1835
- * [new branch]      b/1836 -> b/1836
- * [new branch]      b/1837 -> b/1837
- * [new branch]      b/1838 -> b/1838
- * [new branch]      b/1839 -> b/1839
- * [new branch]      b/1840 -> b/1840
- * [new branch]      b/1841 -> b/1841
- * [new branch]      b/1842 -> b/1842
- * [new branch]      b/1843 -> b/1843
- * [new branch]      b/1844 -> b/1844
- * [new branch]      b/1845 -> b/1845
- * [new branch]      b/1846 -> b/1846
- * [new branch]      b/1847 -> b/1847
- * [new branch]      b/1848 -> b/1848
- * [new branch]      b/1849 -> b/1849
- * [new branch]      b/1850 -> b/1850
- * [new branch]      b/1851 -> b/1851
- * [new branch]      b/1852 -> b/1852
- * [new branch]      b/1853 -> b/1853
- * [new branch]      b/1854 -> b/1854
- * [new branch]      b/1855 -> b/1855
- * [new branch]      b/1856 -> b/1856
- * [new branch]      b/1857 -> b/1857
- * [new branch]      b/1858 -> b/1858
- * [new branch]      b/1859 -> b/1859
- * [new branch]      b/1860 -> b/1860
- * [new branch]      b/1861 -> b/1861
- * [new branch]      b/1862 -> b/1862
- * [new branch]      b/1863 -> b/1863
- * [new branch]      b/1864 -> b/1864
- * [new branch]      b/1865 -> b/1865
- * [new branch]      b/1866 -> b/1866
- * [new branch]      b/1867 -> b/1867
- * [new branch]      b/1868 -> b/1868
- * [new branch]      b/1869 -> b/1869
- * [new branch]      b/1870 -> b/1870
- * [new branch]      b/1871 -> b/1871
- * [new branch]      b/1872 -> b/1872
- * [new branch]      b/1873 -> b/1873
- * [new branch]      b/1874 -> b/1874
- * [new branch]      b/1875 -> b/1875
- * [new branch]      b/1876 -> b/1876
- * [new branch]      b/1877 -> b/1877
- * [new branch]      b/1878 -> b/1878
- * [new branch]      b/1879 -> b/1879
- * [new branch]      b/1880 -> b/1880
- * [new branch]      b/1881 -> b/1881
- * [new branch]      b/1882 -> b/1882
- * [new branch]      b/1883 -> b/1883
- * [new branch]      b/1884 -> b/1884
- * [new branch]      b/1885 -> b/1885
- * [new branch]      b/1886 -> b/1886
- * [new branch]      b/1887 -> b/1887
- * [new branch]      b/1888 -> b/1888
- * [new branch]      b/1889 -> b/1889
- * [new branch]      b/1890 -> b/1890
- * [new branch]      b/1891 -> b/1891
- * [new branch]      b/1892 -> b/1892
- * [new branch]      b/1893 -> b/1893
- * [new branch]      b/1894 -> b/1894
- * [new branch]      b/1895 -> b/1895
- * [new branch]      b/1896 -> b/1896
- * [new branch]      b/1897 -> b/1897
- * [new branch]      b/1898 -> b/1898
- * [new branch]      b/1899 -> b/1899
- * [new branch]      b/1900 -> b/1900
- * [new branch]      b/1901 -> b/1901
- * [new branch]      b/1902 -> b/1902
- * [new branch]      b/1903 -> b/1903
- * [new branch]      b/1904 -> b/1904
- * [new branch]      b/1905 -> b/1905
- * [new branch]      b/1906 -> b/1906
- * [new branch]      b/1907 -> b/1907
- * [new branch]      b/1908 -> b/1908
- * [new branch]      b/1909 -> b/1909
- * [new branch]      b/1910 -> b/1910
- * [new branch]      b/1911 -> b/1911
- * [new branch]      b/1912 -> b/1912
- * [new branch]      b/1913 -> b/1913
- * [new branch]      b/1914 -> b/1914
- * [new branch]      b/1915 -> b/1915
- * [new branch]      b/1916 -> b/1916
- * [new branch]      b/1917 -> b/1917
- * [new branch]      b/1918 -> b/1918
- * [new branch]      b/1919 -> b/1919
- * [new branch]      b/1920 -> b/1920
- * [new branch]      b/1921 -> b/1921
- * [new branch]      b/1922 -> b/1922
- * [new branch]      b/1923 -> b/1923
- * [new branch]      b/1924 -> b/1924
- * [new branch]      b/1925 -> b/1925
- * [new branch]      b/1926 -> b/1926
- * [new branch]      b/1927 -> b/1927
- * [new branch]      b/1928 -> b/1928
- * [new branch]      b/1929 -> b/1929
- * [new branch]      b/1930 -> b/1930
- * [new branch]      b/1931 -> b/1931
- * [new branch]      b/1932 -> b/1932
- * [new branch]      b/1933 -> b/1933
- * [new branch]      b/1934 -> b/1934
- * [new branch]      b/1935 -> b/1935
- * [new branch]      b/1936 -> b/1936
- * [new branch]      b/1937 -> b/1937
- * [new branch]      b/1938 -> b/1938
- * [new branch]      b/1939 -> b/1939
- * [new branch]      b/1940 -> b/1940
- * [new branch]      b/1941 -> b/1941
- * [new branch]      b/1942 -> b/1942
- * [new branch]      b/1943 -> b/1943
- * [new branch]      b/1944 -> b/1944
- * [new branch]      b/1945 -> b/1945
- * [new branch]      b/1946 -> b/1946
- * [new branch]      b/1947 -> b/1947
- * [new branch]      b/1948 -> b/1948
- * [new branch]      b/1949 -> b/1949
- * [new branch]      b/1950 -> b/1950
- * [new branch]      b/1951 -> b/1951
- * [new branch]      b/1952 -> b/1952
- * [new branch]      b/1953 -> b/1953
- * [new branch]      b/1954 -> b/1954
- * [new branch]      b/1955 -> b/1955
- * [new branch]      b/1956 -> b/1956
- * [new branch]      b/1957 -> b/1957
- * [new branch]      b/1958 -> b/1958
- * [new branch]      b/1959 -> b/1959
- * [new branch]      b/1960 -> b/1960
- * [new branch]      b/1961 -> b/1961
- * [new branch]      b/1962 -> b/1962
- * [new branch]      b/1963 -> b/1963
- * [new branch]      b/1964 -> b/1964
- * [new branch]      b/1965 -> b/1965
- * [new branch]      b/1966 -> b/1966
- * [new branch]      b/1967 -> b/1967
- * [new branch]      b/1968 -> b/1968
- * [new branch]      b/1969 -> b/1969
- * [new branch]      b/1970 -> b/1970
- * [new branch]      b/1971 -> b/1971
- * [new branch]      b/1972 -> b/1972
- * [new branch]      b/1973 -> b/1973
- * [new branch]      b/1974 -> b/1974
- * [new branch]      b/1975 -> b/1975
- * [new branch]      b/1976 -> b/1976
- * [new branch]      b/1977 -> b/1977
- * [new branch]      b/1978 -> b/1978
- * [new branch]      b/1979 -> b/1979
- * [new branch]      b/1980 -> b/1980
- * [new branch]      b/1981 -> b/1981
- * [new branch]      b/1982 -> b/1982
- * [new branch]      b/1983 -> b/1983
- * [new branch]      b/1984 -> b/1984
- * [new branch]      b/1985 -> b/1985
- * [new branch]      b/1986 -> b/1986
- * [new branch]      b/1987 -> b/1987
- * [new branch]      b/1988 -> b/1988
- * [new branch]      b/1989 -> b/1989
- * [new branch]      b/1990 -> b/1990
- * [new branch]      b/1991 -> b/1991
- * [new branch]      b/1992 -> b/1992
- * [new branch]      b/1993 -> b/1993
- * [new branch]      b/1994 -> b/1994
- * [new branch]      b/1995 -> b/1995
- * [new branch]      b/1996 -> b/1996
- * [new branch]      b/1997 -> b/1997
- * [new branch]      b/1998 -> b/1998
- * [new branch]      b/1999 -> b/1999
- * [new branch]      b/2000 -> b/2000
-ok 11 - sigpipe does not cause pre-push hook failure
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5558-clone-bundle-uri.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/clone-from/.git/
-Switched to a new branch 'topic'
-[topic (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[topic d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-ok 3 - create bundle
-
-expecting success of 5558.4 'clone with path bundle': 
-	git clone --bundle-uri="clone-from/B.bundle" \
-		clone-from clone-path &&
-	git -C clone-path rev-parse refs/bundles/heads/topic >actual &&
-	git -C clone-from rev-parse topic >expect &&
-	test_cmp expect actual
-
-Cloning into 'clone-path'...
-done.
-ok 4 - clone with path bundle
-
-expecting success of 5558.5 'clone with bundle that has bad header': 
-	# Write bundle ref fails, but clone can still proceed.
-	git clone --bundle-uri="clone-from/bad-header.bundle" \
-		clone-from clone-bad-header 2>err &&
-	commit_b=$(git -C clone-from rev-parse B) &&
-	test_grep "trying to write ref 'refs/bundles/heads/topic' with nonexistent object $commit_b" err &&
-	git -C clone-bad-header for-each-ref --format="%(refname)" >refs &&
-	test_grep ! "refs/bundles/heads/" refs
-
-error: update_ref failed for ref 'refs/bundles/heads/topic': cannot update ref 'refs/bundles/heads/topic': trying to write ref 'refs/bundles/heads/topic' with nonexistent object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 5 - clone with bundle that has bad header
-
-expecting success of 5558.6 'clone with bundle that has bad object': 
-	# Unbundle succeeds if no fsckObjects configured.
-	git clone --bundle-uri="clone-from/bad-object.bundle" \
-		clone-from clone-bad-object-no-fsck &&
-	git -C clone-bad-object-no-fsck for-each-ref --format="%(refname)" >refs &&
-	grep "refs/bundles/heads/" refs >actual &&
-	test_write_lines refs/bundles/heads/bad >expect &&
-	test_cmp expect actual &&
-
-	# Unbundle fails with fsckObjects set true, but clone can still proceed.
-	git -c fetch.fsckObjects=true clone --bundle-uri="clone-from/bad-object.bundle" \
-		clone-from clone-bad-object-fsck 2>err &&
-	test_grep "missingEmail" err &&
-	git -C clone-bad-object-fsck for-each-ref --format="%(refname)" >refs &&
-	test_grep ! "refs/bundles/heads/" refs
-
-Cloning into 'clone-bad-object-no-fsck'...
-done.
-error: object b1e96ad58da3bdf44c62b36b85d7a16ba0a5a20c: missingEmail: invalid author/committer line - missing email
-ok 6 - clone with bundle that has bad object
-
-expecting success of 5558.7 'clone with path bundle and non-default hash': 
-	test_when_finished "rm -rf clone-path-non-default-hash" &&
-	GIT_DEFAULT_HASH=sha256 git clone --bundle-uri="clone-from/B.bundle" \
-		clone-from clone-path-non-default-hash &&
-	git -C clone-path-non-default-hash rev-parse refs/bundles/heads/topic >actual &&
-	git -C clone-from rev-parse topic >expect &&
-	test_cmp expect actual
-
-Cloning into 'clone-path-non-default-hash'...
-done.
-ok 7 - clone with path bundle and non-default hash
-
-expecting success of 5558.8 'clone with file:// bundle': 
-	git clone --bundle-uri="file://$(pwd)/clone-from/B.bundle" \
-		clone-from clone-file &&
-	git -C clone-file rev-parse refs/bundles/heads/topic >actual &&
-	git -C clone-from rev-parse topic >expect &&
-	test_cmp expect actual
-
-Cloning into 'clone-file'...
-done.
-ok 8 - clone with file:// bundle
-
-expecting success of 5558.9 'create bundle with tags': 
-	git init clone-from-tags &&
-	(
-		cd clone-from-tags &&
-		git checkout -b base &&
-		git checkout -b topic &&
-
-		test_commit A &&
-		git tag tag-A &&
-		git checkout -b base &&
-		git branch -d topic &&
-		test_commit B &&
-
-		git bundle create ALL.bundle --all &&
-		git bundle verify ALL.bundle
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/clone-from-tags/.git/
-Switched to a new branch 'base'
-Switched to a new branch 'topic'
-[topic (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 'base'
-Deleted branch topic (was 0ddfaf1).
-[base d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-ALL.bundle is okay
-The bundle contains these 5 refs:
-d9df4505cb3522088b9e29d6051ac16f1564154a refs/heads/base
-0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 refs/tags/A
-d9df4505cb3522088b9e29d6051ac16f1564154a refs/tags/B
-0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 refs/tags/tag-A
-d9df4505cb3522088b9e29d6051ac16f1564154a HEAD
-The bundle records a complete history.
-The bundle uses this hash algorithm: sha1
-ok 9 - create bundle with tags
-
-expecting success of 5558.10 'clone with tags bundle': 
-	git clone --bundle-uri="clone-from-tags/ALL.bundle" \
-		clone-from-tags clone-tags-path &&
-
-	git -C clone-from-tags for-each-ref --format="%(refname:lstrip=1)" \
-		>expect &&
-	git -C clone-tags-path for-each-ref --format="%(refname:lstrip=2)" \
-		refs/bundles >actual &&
-
-	test_cmp expect actual
-
-Cloning into 'clone-tags-path'...
-done.
-ok 10 - clone with tags bundle
-
-expecting success of 5558.11 'construct incremental bundle list': 
-	(
-		cd clone-from &&
-		git checkout -b base &&
-		test_commit 1 &&
-		git checkout -b left &&
-		test_commit 2 &&
-		git checkout -b right base &&
-		test_commit 3 &&
-		git checkout -b merge left &&
-		git merge right -m "4" &&
-
-		git bundle create bundle-1.bundle base &&
-		git bundle create bundle-2.bundle base..left &&
-		git bundle create bundle-3.bundle base..right &&
-		git bundle create bundle-4.bundle merge --not left right
-	)
-
-Switched to a new branch 'base'
-[base 4fcc740] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Switched to a new branch 'left'
-[left 6b9ff9e] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-Switched to a new branch 'right'
-[right 45c64d6] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-Switched to a new branch 'merge'
-Merge made by the 'ort' strategy.
- 3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-ok 11 - construct incremental bundle list
-
-expecting success of 5558.12 'clone bundle list (file, no heuristic)': 
-	cat >bundle-list <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-
-	[bundle "bundle-1"]
-		uri = file://$(pwd)/clone-from/bundle-1.bundle
-
-	[bundle "bundle-2"]
-		uri = file://$(pwd)/clone-from/bundle-2.bundle
-
-	[bundle "bundle-3"]
-		uri = file://$(pwd)/clone-from/bundle-3.bundle
-
-	[bundle "bundle-4"]
-		uri = file://$(pwd)/clone-from/bundle-4.bundle
-	EOF
-
-	git clone --bundle-uri="file://$(pwd)/bundle-list" \
-		clone-from clone-list-file 2>err &&
-	! grep "Repository lacks these prerequisite commits" err &&
-
-	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
-	git -C clone-list-file cat-file --batch-check <oids &&
-
-	git -C clone-list-file for-each-ref --format="%(refname)" >refs &&
-	grep "refs/bundles/heads/" refs >actual &&
-	cat >expect <<-\EOF &&
-	refs/bundles/heads/base
-	refs/bundles/heads/left
-	refs/bundles/heads/merge
-	refs/bundles/heads/right
-	EOF
-	test_cmp expect actual
-
-4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
-6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
-d09d684a6612e5155bd0961403c4cb77f90000cc commit 261
-45c64d67e8521343f79effee984fd1e910d8fead commit 213
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
-6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
-45c64d67e8521343f79effee984fd1e910d8fead commit 213
-0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-ok 12 - clone bundle list (file, no heuristic)
-
-expecting success of 5558.13 'clone bundle list (file, all mode, some failures)': 
-	cat >bundle-list <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-
-	# Does not exist. Should be skipped.
-	[bundle "bundle-0"]
-		uri = file://$(pwd)/clone-from/bundle-0.bundle
-
-	[bundle "bundle-1"]
-		uri = file://$(pwd)/clone-from/bundle-1.bundle
-
-	[bundle "bundle-2"]
-		uri = file://$(pwd)/clone-from/bundle-2.bundle
-
-	# No bundle-3 means bundle-4 will not apply.
-
-	[bundle "bundle-4"]
-		uri = file://$(pwd)/clone-from/bundle-4.bundle
-
-	# Does not exist. Should be skipped.
-	[bundle "bundle-5"]
-		uri = file://$(pwd)/clone-from/bundle-5.bundle
-	EOF
-
-	GIT_TRACE2_PERF=1 \
-	git clone --bundle-uri="file://$(pwd)/bundle-list" \
-		clone-from clone-all-some 2>err &&
-	! grep "Repository lacks these prerequisite commits" err &&
-	! grep "fatal" err &&
-	grep "warning: failed to download bundle from URI" err &&
-
-	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
-	git -C clone-all-some cat-file --batch-check <oids &&
-
-	git -C clone-all-some for-each-ref --format="%(refname)" >refs &&
-	grep "refs/bundles/heads/" refs >actual &&
-	cat >expect <<-\EOF &&
-	refs/bundles/heads/base
-	refs/bundles/heads/left
-	EOF
-	test_cmp expect actual
-
-warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-5.bundle'
-warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-0.bundle'
-4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
-6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
-d09d684a6612e5155bd0961403c4cb77f90000cc commit 261
-45c64d67e8521343f79effee984fd1e910d8fead commit 213
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
-6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
-45c64d67e8521343f79effee984fd1e910d8fead commit 213
-0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-ok 13 - clone bundle list (file, all mode, some failures)
-
-expecting success of 5558.14 'clone bundle list (file, all mode, all failures)': 
-	cat >bundle-list <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-
-	# Does not exist. Should be skipped.
-	[bundle "bundle-0"]
-		uri = file://$(pwd)/clone-from/bundle-0.bundle
-
-	# Does not exist. Should be skipped.
-	[bundle "bundle-5"]
-		uri = file://$(pwd)/clone-from/bundle-5.bundle
-	EOF
-
-	git clone --bundle-uri="file://$(pwd)/bundle-list" \
-		clone-from clone-all-fail 2>err &&
-	! grep "Repository lacks these prerequisite commits" err &&
-	! grep "fatal" err &&
-	grep "warning: failed to download bundle from URI" err &&
-
-	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
-	git -C clone-all-fail cat-file --batch-check <oids &&
-
-	git -C clone-all-fail for-each-ref --format="%(refname)" >refs &&
-	! grep "refs/bundles/heads/" refs
-
-warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-5.bundle'
-warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.51.0/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-0.bundle'
-4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
-6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
-d09d684a6612e5155bd0961403c4cb77f90000cc commit 261
-45c64d67e8521343f79effee984fd1e910d8fead commit 213
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
-6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
-45c64d67e8521343f79effee984fd1e910d8fead commit 213
-0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-ok 14 - clone bundle list (file, all mode, all failures)
-
-expecting success of 5558.15 'clone bundle list (file, any mode)': 
-	cat >bundle-list <<-EOF &&
-	[bundle]
-		version = 1
-		mode = any
-
-	# Does not exist. Should be skipped.
-	[bundle "bundle-0"]
-		uri = file://$(pwd)/clone-from/bundle-0.bundle
-
-	[bundle "bundle-1"]
-		uri = file://$(pwd)/clone-from/bundle-1.bundle
-
-	# Does not exist. Should be skipped.
-	[bundle "bundle-5"]
-		uri = file://$(pwd)/clone-from/bundle-5.bundle
-	EOF
-
-	git clone --bundle-uri="file://$(pwd)/bundle-list" \
-		clone-from clone-any-file 2>err &&
-	! grep "Repository lacks these prerequisite commits" err &&
-
-	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
-	git -C clone-any-file cat-file --batch-check <oids &&
-
-	git -C clone-any-file for-each-ref --format="%(refname)" >refs &&
-	grep "refs/bundles/heads/" refs >actual &&
-	cat >expect <<-\EOF &&
-	refs/bundles/heads/base
-	EOF
-	test_cmp expect actual
-
-4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
-6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
-d09d684a6612e5155bd0961403c4cb77f90000cc commit 261
-45c64d67e8521343f79effee984fd1e910d8fead commit 213
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
-6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
-45c64d67e8521343f79effee984fd1e910d8fead commit 213
-0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-ok 15 - clone bundle list (file, any mode)
-
-expecting success of 5558.16 'clone bundle list (file, any mode, all failures)': 
-	cat >bundle-list <<-EOF &&
-	[bundle]
-		version = 1
-		mode = any
-
-	# Does not exist. Should be skipped.
-	[bundle "bundle-0"]
-		uri = $HTTPD_URL/bundle-0.bundle
-
-	# Does not exist. Should be skipped.
-	[bundle "bundle-5"]
-		uri = $HTTPD_URL/bundle-5.bundle
-	EOF
-
-	git clone --bundle-uri="file://$(pwd)/bundle-list" \
-		clone-from clone-any-fail 2>err &&
-	! grep "fatal" err &&
-	grep "warning: failed to download bundle from URI" err &&
-
-	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
-	git -C clone-any-fail cat-file --batch-check <oids &&
-
-	git -C clone-any-fail for-each-ref --format="%(refname)" >refs &&
-	! grep "refs/bundles/heads/" refs
-
-warning: failed to download bundle from URI '/bundle-5.bundle'
-warning: failed to download bundle from URI '/bundle-0.bundle'
-4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
-6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
-d09d684a6612e5155bd0961403c4cb77f90000cc commit 261
-45c64d67e8521343f79effee984fd1e910d8fead commit 213
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-4fcc7403be76d41e6d9d012cb99d553b7c3c30eb commit 213
-6b9ff9e0ddeff610fa62631ee48249700c5d5715 commit 213
-45c64d67e8521343f79effee984fd1e910d8fead commit 213
-0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-ok 16 - clone bundle list (file, any mode, all failures)
-
-expecting success of 5558.17 'negotiation: bundle with part of wanted commits': 
-	test_when_finished "rm -f trace*.txt" &&
-	GIT_TRACE_PACKET="$(pwd)/trace-packet.txt" \
-	git clone --no-local --bundle-uri="clone-from/A.bundle" \
-		clone-from nego-bundle-part &&
-	git -C nego-bundle-part for-each-ref --format="%(refname)" >refs &&
-	grep "refs/bundles/heads/" refs >actual &&
-	test_write_lines refs/bundles/heads/topic >expect &&
-	test_cmp expect actual &&
-	# Ensure that refs/bundles/heads/topic are sent as "have".
-	tip=$(git -C clone-from rev-parse A) &&
-	test_grep "clone> have $tip" trace-packet.txt
-
-Cloning into 'nego-bundle-part'...
-packet:        clone> have 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050
-ok 17 - negotiation: bundle with part of wanted commits
-
-expecting success of 5558.18 'negotiation: bundle with all wanted commits': 
-	test_when_finished "rm -f trace*.txt" &&
-	GIT_TRACE_PACKET="$(pwd)/trace-packet.txt" \
-	git clone --no-local --single-branch --branch=topic --no-tags \
-		--bundle-uri="clone-from/B.bundle" \
-		clone-from nego-bundle-all &&
-	git -C nego-bundle-all for-each-ref --format="%(refname)" >refs &&
-	grep "refs/bundles/heads/" refs >actual &&
-	test_write_lines refs/bundles/heads/topic >expect &&
-	test_cmp expect actual &&
-	# We already have all needed commits so no "want" needed.
-	test_grep ! "clone> want " trace-packet.txt
-
-Cloning into 'nego-bundle-all'...
-ok 18 - negotiation: bundle with all wanted commits
-
-expecting success of 5558.19 'negotiation: bundle list (no heuristic)': 
-	test_when_finished "rm -f trace*.txt" &&
-	cat >bundle-list <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-
-	[bundle "bundle-1"]
-		uri = file://$(pwd)/clone-from/bundle-1.bundle
-
-	[bundle "bundle-2"]
-		uri = file://$(pwd)/clone-from/bundle-2.bundle
-	EOF
-
-	GIT_TRACE_PACKET="$(pwd)/trace-packet.txt" \
-	git clone --no-local --bundle-uri="file://$(pwd)/bundle-list" \
-		clone-from nego-bundle-list-no-heuristic &&
-
-	git -C nego-bundle-list-no-heuristic for-each-ref --format="%(refname)" >refs &&
-	grep "refs/bundles/heads/" refs >actual &&
-	cat >expect <<-\EOF &&
-	refs/bundles/heads/base
-	refs/bundles/heads/left
-	EOF
-	test_cmp expect actual &&
-	tip=$(git -C nego-bundle-list-no-heuristic rev-parse refs/bundles/heads/left) &&
-	test_grep "clone> have $tip" trace-packet.txt
-
-Cloning into 'nego-bundle-list-no-heuristic'...
-packet:        clone> have 6b9ff9e0ddeff610fa62631ee48249700c5d5715
-packet:        clone> have 6b9ff9e0ddeff610fa62631ee48249700c5d5715
-ok 19 - negotiation: bundle list (no heuristic)
-
-expecting success of 5558.20 'negotiation: bundle list (creationToken)': 
-	test_when_finished "rm -f trace*.txt" &&
-	cat >bundle-list <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-		heuristic = creationToken
-
-	[bundle "bundle-1"]
-		uri = file://$(pwd)/clone-from/bundle-1.bundle
-		creationToken = 1
-
-	[bundle "bundle-2"]
-		uri = file://$(pwd)/clone-from/bundle-2.bundle
-		creationToken = 2
-	EOF
-
-	GIT_TRACE_PACKET="$(pwd)/trace-packet.txt" \
-	git clone --no-local --bundle-uri="file://$(pwd)/bundle-list" \
-		clone-from nego-bundle-list-heuristic &&
-
-	git -C nego-bundle-list-heuristic for-each-ref --format="%(refname)" >refs &&
-	grep "refs/bundles/heads/" refs >actual &&
-	cat >expect <<-\EOF &&
-	refs/bundles/heads/base
-	refs/bundles/heads/left
-	EOF
-	test_cmp expect actual &&
-	tip=$(git -C nego-bundle-list-heuristic rev-parse refs/bundles/heads/left) &&
-	test_grep "clone> have $tip" trace-packet.txt
-
-Cloning into 'nego-bundle-list-heuristic'...
-packet:        clone> have 6b9ff9e0ddeff610fa62631ee48249700c5d5715
-packet:        clone> have 6b9ff9e0ddeff610fa62631ee48249700c5d5715
-ok 20 - negotiation: bundle list (creationToken)
-
-expecting success of 5558.21 'negotiation: bundle list with all wanted commits': 
-	test_when_finished "rm -f trace*.txt" &&
-	cat >bundle-list <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-		heuristic = creationToken
-
-	[bundle "bundle-1"]
-		uri = file://$(pwd)/clone-from/bundle-1.bundle
-		creationToken = 1
-
-	[bundle "bundle-2"]
-		uri = file://$(pwd)/clone-from/bundle-2.bundle
-		creationToken = 2
-	EOF
-
-	GIT_TRACE_PACKET="$(pwd)/trace-packet.txt" \
-	git clone --no-local --single-branch --branch=left --no-tags \
-		--bundle-uri="file://$(pwd)/bundle-list" \
-		clone-from nego-bundle-list-all &&
-
-	git -C nego-bundle-list-all for-each-ref --format="%(refname)" >refs &&
-	grep "refs/bundles/heads/" refs >actual &&
-	cat >expect <<-\EOF &&
-	refs/bundles/heads/base
-	refs/bundles/heads/left
-	EOF
-	test_cmp expect actual &&
-	# We already have all needed commits so no "want" needed.
-	test_grep ! "clone> want " trace-packet.txt
-
-Cloning into 'nego-bundle-list-all'...
-ok 21 - negotiation: bundle list with all wanted commits
-
-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 21 test(s)
-# SKIP no web server found at ''
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5581-http-curl-verbose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5581-http-curl-verbose/.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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5533-push-cas.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/.git/
-expecting success of 5533.1 'setup': 
-	# create template repository
-	test_commit A &&
-	test_commit B &&
-	test_commit C
-
-[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
-ok 1 - setup
-
-expecting success of 5533.2 'push to update (protected)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		test_commit D &&
-		test_must_fail git push --force-with-lease=main:main origin main 2>err &&
-		grep "stale info" err
-	) &&
-	git ls-remote . refs/heads/main >expect &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^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 35a8500 C
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
- ! [rejected]        main -> main (stale info)
-ok 2 - push to update (protected)
-
-expecting success of 5533.3 'push to update (protected, forced)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		test_commit D &&
-		git push --force --force-with-lease=main:main origin main 2>err &&
-		grep "forced update" err
-	) &&
-	git ls-remote dst refs/heads/main >expect &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^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 224 - fetch-pack --diag-url ssh://host/~re:po
 
-If you want to 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 5500.225 'fetch-pack --diag-url ssh://host:/re:po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 225 - fetch-pack --diag-url ssh://host:/re:po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.226 'fetch-pack --diag-url ssh://host:/~re:po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 226 - fetch-pack --diag-url ssh://host:/~re:po
 
-Or undo this operation with:
+expecting success of 5500.227 'fetch-pack --diag-url ssh://user@host/re:po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 227 - fetch-pack --diag-url ssh://user@host/re:po
 
-  git switch -
+expecting success of 5500.228 'fetch-pack --diag-url ssh://user@host/~re:po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 228 - fetch-pack --diag-url ssh://user@host/~re:po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.229 'fetch-pack --diag-url ssh://user@host:/re:po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 229 - fetch-pack --diag-url ssh://user@host:/re:po
 
-HEAD is now at 35a8500 C
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
- + 35a8500...be8f64f main -> main (forced update)
-ok 3 - push to update (protected, forced)
+expecting success of 5500.230 'fetch-pack --diag-url ssh://user@host:/~re:po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 230 - fetch-pack --diag-url ssh://user@host:/~re:po
 
-expecting success of 5533.4 'push to update (protected, tracking)': 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git checkout main &&
-		test_commit D &&
-		git checkout HEAD^0
-	) &&
-	git ls-remote src refs/heads/main >expect &&
-	(
-		cd dst &&
-		test_commit E &&
-		git ls-remote . refs/remotes/origin/main >expect &&
-		test_must_fail git push --force-with-lease=main origin main &&
-		git ls-remote . refs/remotes/origin/main >actual &&
-		test_cmp expect actual
-	) &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
+expecting success of 5500.231 'fetch-pack --diag-url ssh://user@[::1]/re:po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 231 - fetch-pack --diag-url ssh://user@[::1]/re:po
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
+expecting success of 5500.232 'fetch-pack --diag-url ssh://user@[::1]/~re:po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 232 - fetch-pack --diag-url ssh://user@[::1]/~re:po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.233 'fetch-pack --diag-url ssh://user@[::1]:/re:po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 233 - fetch-pack --diag-url ssh://user@[::1]:/re:po
 
-If you want to 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 5500.234 'fetch-pack --diag-url ssh://user@[::1]:/~re:po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 234 - fetch-pack --diag-url ssh://user@[::1]:/~re:po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.235 'fetch-pack --diag-url ssh://user@::1/re:po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 235 - fetch-pack --diag-url ssh://user@::1/re:po
 
-Or undo this operation with:
+expecting success of 5500.236 'fetch-pack --diag-url ssh://user@::1/~re:po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 236 - fetch-pack --diag-url ssh://user@::1/~re:po
 
-  git switch -
+expecting success of 5500.237 'fetch-pack --diag-url ssh://user@::1:/re:po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 237 - fetch-pack --diag-url ssh://user@::1:/re:po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.238 'fetch-pack --diag-url ssh://user@::1:/~re:po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 238 - fetch-pack --diag-url ssh://user@::1:/~re:po
 
-HEAD is now at 35a8500 C
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Note: switching to 'HEAD^0'.
+expecting success of 5500.239 'fetch-pack --diag-url ssh://host:22/re:po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 239 - fetch-pack --diag-url ssh://host:22/re:po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.240 'fetch-pack --diag-url ssh://User@host:22/re:po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 240 - fetch-pack --diag-url ssh://User@host:22/re:po
 
-If you want to 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 5500.241 'fetch-pack --diag-url ssh://User@[::1]:22/re:po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 241 - fetch-pack --diag-url ssh://User@[::1]:22/re:po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.242 'fetch-pack --diag-url file://User@[::1]/re:po': 
+			check_prot_path $p://$h/$r $p "/$r"
+		
+ok 242 - fetch-pack --diag-url file://User@[::1]/re:po
 
-Or undo this operation with:
+ok 243 # skip fetch-pack --diag-url file://User@[::1]/re:po (missing MINGW)
 
-  git switch -
+ok 244 # skip fetch-pack --diag-url file:///re:po (missing MINGW)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.245 'fetch-pack --diag-url file://User@[::1]/~re:po': 
+			check_prot_path $p://$h/~$r $p "/~$r"
+		
+ok 245 - fetch-pack --diag-url file://User@[::1]/~re:po
 
-HEAD is now at be8f64f D
-[main 3e7056f] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
- ! [rejected]        main -> main (stale info)
-error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src'
-ok 4 - push to update (protected, tracking)
+ok 246 # skip fetch-pack --diag-url file://User@[::1]/~re:po (missing MINGW)
 
-expecting success of 5533.5 'push to update (protected, tracking, forced)': 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git checkout main &&
-		test_commit D &&
-		git checkout HEAD^0
-	) &&
-	(
-		cd dst &&
-		test_commit E &&
-		git ls-remote . refs/remotes/origin/main >expect &&
-		git push --force --force-with-lease=main origin main
-	) &&
-	git ls-remote dst refs/heads/main >expect &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
+expecting success of 5500.247 'fetch-pack --diag-url ./nohost:re:po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 247 - fetch-pack --diag-url ./nohost:re:po
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
+expecting success of 5500.248 'fetch-pack --diag-url ./file:nohost/~re:po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 248 - fetch-pack --diag-url ./file:nohost/~re:po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.249 'fetch-pack --diag-url ./nohost:12:re:po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 249 - fetch-pack --diag-url ./nohost:12:re:po
 
-If you want to 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 5500.250 'fetch-pack --diag-url ./file:nohost:12/~re:po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 250 - fetch-pack --diag-url ./file:nohost:12/~re:po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.251 'fetch-pack --diag-url ./[::1]:re:po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 251 - fetch-pack --diag-url ./[::1]:re:po
 
-Or undo this operation with:
+expecting success of 5500.252 'fetch-pack --diag-url ./file:[::1]/~re:po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 252 - fetch-pack --diag-url ./file:[::1]/~re:po
 
-  git switch -
+expecting success of 5500.253 'fetch-pack --diag-url ./[::1]:23:re:po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 253 - fetch-pack --diag-url ./[::1]:23:re:po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.254 'fetch-pack --diag-url ./file:[::1]:23/~re:po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 254 - fetch-pack --diag-url ./file:[::1]:23/~re:po
 
-HEAD is now at 35a8500 C
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Note: switching to 'HEAD^0'.
+expecting success of 5500.255 'fetch-pack --diag-url ./[:re:po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 255 - fetch-pack --diag-url ./[:re:po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.256 'fetch-pack --diag-url ./file:[/~re:po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 256 - fetch-pack --diag-url ./file:[/~re:po
 
-If you want to 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 5500.257 'fetch-pack --diag-url ./[:aa:re:po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 257 - fetch-pack --diag-url ./[:aa:re:po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.258 'fetch-pack --diag-url ./file:[:aa/~re:po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 258 - fetch-pack --diag-url ./file:[:aa/~re:po
 
-Or undo this operation with:
+expecting success of 5500.259 'fetch-pack --diag-url host:re:po': 
+			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
+		
+ok 259 - fetch-pack --diag-url host:re:po
 
-  git switch -
+expecting success of 5500.260 'fetch-pack --diag-url host:/~re:po': 
+			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
+		
+ok 260 - fetch-pack --diag-url host:/~re:po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.261 'fetch-pack --diag-url [::1]:re:po': 
+			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
+		
+ok 261 - fetch-pack --diag-url [::1]:re:po
 
-HEAD is now at be8f64f D
-[main 3e7056f] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
- + be8f64f...3e7056f main -> main (forced update)
-ok 5 - push to update (protected, tracking, forced)
+expecting success of 5500.262 'fetch-pack --diag-url [::1]:/~re:po': 
+			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
+		
+ok 262 - fetch-pack --diag-url [::1]:/~re:po
 
-expecting success of 5533.6 'push to update (allowed)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		test_commit D &&
-		git push --force-with-lease=main:main^ origin main
-	) &&
-	git ls-remote dst refs/heads/main >expect &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
+expecting success of 5500.263 'fetch-pack --diag-url ssh+git://host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 263 - fetch-pack --diag-url ssh+git://host/re/po
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
+expecting success of 5500.264 'fetch-pack --diag-url ssh+git://host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 264 - fetch-pack --diag-url ssh+git://host/~re/po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.265 'fetch-pack --diag-url ssh+git://host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 265 - fetch-pack --diag-url ssh+git://host:/re/po
 
-If you want to 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 5500.266 'fetch-pack --diag-url ssh+git://host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 266 - fetch-pack --diag-url ssh+git://host:/~re/po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.267 'fetch-pack --diag-url ssh+git://user@host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 267 - fetch-pack --diag-url ssh+git://user@host/re/po
 
-Or undo this operation with:
+expecting success of 5500.268 'fetch-pack --diag-url ssh+git://user@host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 268 - fetch-pack --diag-url ssh+git://user@host/~re/po
 
-  git switch -
+expecting success of 5500.269 'fetch-pack --diag-url ssh+git://user@host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 269 - fetch-pack --diag-url ssh+git://user@host:/re/po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.270 'fetch-pack --diag-url ssh+git://user@host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 270 - fetch-pack --diag-url ssh+git://user@host:/~re/po
 
-HEAD is now at 35a8500 C
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
-   35a8500..be8f64f  main -> main
-ok 6 - push to update (allowed)
+expecting success of 5500.271 'fetch-pack --diag-url ssh+git://user@[::1]/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 271 - fetch-pack --diag-url ssh+git://user@[::1]/re/po
 
-expecting success of 5533.7 'push to update (allowed, tracking)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		test_commit D &&
-		git push --force-with-lease=main origin main 2>err &&
-		! grep "forced update" err
-	) &&
-	git ls-remote dst refs/heads/main >expect &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
+expecting success of 5500.272 'fetch-pack --diag-url ssh+git://user@[::1]/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 272 - fetch-pack --diag-url ssh+git://user@[::1]/~re/po
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
+expecting success of 5500.273 'fetch-pack --diag-url ssh+git://user@[::1]:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 273 - fetch-pack --diag-url ssh+git://user@[::1]:/re/po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.274 'fetch-pack --diag-url ssh+git://user@[::1]:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 274 - fetch-pack --diag-url ssh+git://user@[::1]:/~re/po
 
-If you want to 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 5500.275 'fetch-pack --diag-url ssh+git://user@::1/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 275 - fetch-pack --diag-url ssh+git://user@::1/re/po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.276 'fetch-pack --diag-url ssh+git://user@::1/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 276 - fetch-pack --diag-url ssh+git://user@::1/~re/po
 
-Or undo this operation with:
+expecting success of 5500.277 'fetch-pack --diag-url ssh+git://user@::1:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 277 - fetch-pack --diag-url ssh+git://user@::1:/re/po
 
-  git switch -
+expecting success of 5500.278 'fetch-pack --diag-url ssh+git://user@::1:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 278 - fetch-pack --diag-url ssh+git://user@::1:/~re/po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.279 'fetch-pack --diag-url ssh+git://host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 279 - fetch-pack --diag-url ssh+git://host:22/re/po
 
-HEAD is now at 35a8500 C
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-ok 7 - push to update (allowed, tracking)
+expecting success of 5500.280 'fetch-pack --diag-url ssh+git://User@host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 280 - fetch-pack --diag-url ssh+git://User@host:22/re/po
 
-expecting success of 5533.8 'push to update (allowed even though no-ff)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git reset --hard HEAD^ &&
-		test_commit D &&
-		git push --force-with-lease=main origin main 2>err &&
-		grep "forced update" err
-	) &&
-	git ls-remote dst refs/heads/main >expect &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
+expecting success of 5500.281 'fetch-pack --diag-url ssh+git://User@[::1]:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 281 - fetch-pack --diag-url ssh+git://User@[::1]:22/re/po
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
+expecting success of 5500.282 'fetch-pack --diag-url git+ssh://host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 282 - fetch-pack --diag-url git+ssh://host/re/po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.283 'fetch-pack --diag-url git+ssh://host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 283 - fetch-pack --diag-url git+ssh://host/~re/po
 
-If you want to 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 5500.284 'fetch-pack --diag-url git+ssh://host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 284 - fetch-pack --diag-url git+ssh://host:/re/po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.285 'fetch-pack --diag-url git+ssh://host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 285 - fetch-pack --diag-url git+ssh://host:/~re/po
 
-Or undo this operation with:
+expecting success of 5500.286 'fetch-pack --diag-url git+ssh://user@host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 286 - fetch-pack --diag-url git+ssh://user@host/re/po
 
-  git switch -
+expecting success of 5500.287 'fetch-pack --diag-url git+ssh://user@host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 287 - fetch-pack --diag-url git+ssh://user@host/~re/po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.288 'fetch-pack --diag-url git+ssh://user@host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 288 - fetch-pack --diag-url git+ssh://user@host:/re/po
 
-HEAD is now at 35a8500 C
-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
- + 35a8500...3e6e33e main -> main (forced update)
-ok 8 - push to update (allowed even though no-ff)
+expecting success of 5500.289 'fetch-pack --diag-url git+ssh://user@host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 289 - fetch-pack --diag-url git+ssh://user@host:/~re/po
 
-expecting success of 5533.9 'push to delete (protected)': 
-	setup_srcdst_basic &&
-	git ls-remote src refs/heads/main >expect &&
-	(
-		cd dst &&
-		test_must_fail git push --force-with-lease=main:main^ origin :main
-	) &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
+expecting success of 5500.290 'fetch-pack --diag-url git+ssh://user@[::1]/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 290 - fetch-pack --diag-url git+ssh://user@[::1]/re/po
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
+expecting success of 5500.291 'fetch-pack --diag-url git+ssh://user@[::1]/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 291 - fetch-pack --diag-url git+ssh://user@[::1]/~re/po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.292 'fetch-pack --diag-url git+ssh://user@[::1]:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 292 - fetch-pack --diag-url git+ssh://user@[::1]:/re/po
 
-If you want to 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 5500.293 'fetch-pack --diag-url git+ssh://user@[::1]:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 293 - fetch-pack --diag-url git+ssh://user@[::1]:/~re/po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.294 'fetch-pack --diag-url git+ssh://user@::1/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 294 - fetch-pack --diag-url git+ssh://user@::1/re/po
 
-Or undo this operation with:
+expecting success of 5500.295 'fetch-pack --diag-url git+ssh://user@::1/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 295 - fetch-pack --diag-url git+ssh://user@::1/~re/po
 
-  git switch -
+expecting success of 5500.296 'fetch-pack --diag-url git+ssh://user@::1:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 296 - fetch-pack --diag-url git+ssh://user@::1:/re/po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.297 'fetch-pack --diag-url git+ssh://user@::1:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 297 - fetch-pack --diag-url git+ssh://user@::1:/~re/po
 
-HEAD is now at 35a8500 C
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
- ! [rejected]        (delete) -> main (stale info)
-error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src'
-ok 9 - push to delete (protected)
+expecting success of 5500.298 'fetch-pack --diag-url git+ssh://host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 298 - fetch-pack --diag-url git+ssh://host:22/re/po
 
-expecting success of 5533.10 'push to delete (protected, forced)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git push --force --force-with-lease=main:main^ origin :main
-	) &&
-	git ls-remote src refs/heads/main >actual &&
-	test_must_be_empty actual
+expecting success of 5500.299 'fetch-pack --diag-url git+ssh://User@host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 299 - fetch-pack --diag-url git+ssh://User@host:22/re/po
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
+expecting success of 5500.300 'fetch-pack --diag-url git+ssh://User@[::1]:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 300 - fetch-pack --diag-url git+ssh://User@[::1]:22/re/po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.301 'fetch-pack --diag-url git://host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 301 - fetch-pack --diag-url git://host/re/po
 
-If you want to 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 5500.302 'fetch-pack --diag-url git://host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 302 - fetch-pack --diag-url git://host/~re/po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.303 'fetch-pack --diag-url git://host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 303 - fetch-pack --diag-url git://host:/re/po
 
-Or undo this operation with:
+expecting success of 5500.304 'fetch-pack --diag-url git://host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 304 - fetch-pack --diag-url git://host:/~re/po
 
-  git switch -
+expecting success of 5500.305 'fetch-pack --diag-url git://user@host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 305 - fetch-pack --diag-url git://user@host/re/po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.306 'fetch-pack --diag-url git://user@host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 306 - fetch-pack --diag-url git://user@host/~re/po
 
-HEAD is now at 35a8500 C
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
- - [deleted]         main
-ok 10 - push to delete (protected, forced)
+expecting success of 5500.307 'fetch-pack --diag-url git://user@host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 307 - fetch-pack --diag-url git://user@host:/re/po
 
-expecting success of 5533.11 'push to delete (allowed)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git push --force-with-lease=main origin :main 2>err &&
-		grep deleted err
-	) &&
-	git ls-remote src refs/heads/main >actual &&
-	test_must_be_empty actual
+expecting success of 5500.308 'fetch-pack --diag-url git://user@host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 308 - fetch-pack --diag-url git://user@host:/~re/po
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
+expecting success of 5500.309 'fetch-pack --diag-url git://user@[::1]/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 309 - fetch-pack --diag-url git://user@[::1]/re/po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.310 'fetch-pack --diag-url git://user@[::1]/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 310 - fetch-pack --diag-url git://user@[::1]/~re/po
 
-If you want to 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 5500.311 'fetch-pack --diag-url git://user@[::1]:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 311 - fetch-pack --diag-url git://user@[::1]:/re/po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.312 'fetch-pack --diag-url git://user@[::1]:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 312 - fetch-pack --diag-url git://user@[::1]:/~re/po
 
-Or undo this operation with:
+expecting success of 5500.313 'fetch-pack --diag-url git://user@::1/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 313 - fetch-pack --diag-url git://user@::1/re/po
 
-  git switch -
+expecting success of 5500.314 'fetch-pack --diag-url git://user@::1/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 314 - fetch-pack --diag-url git://user@::1/~re/po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.315 'fetch-pack --diag-url git://user@::1:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 315 - fetch-pack --diag-url git://user@::1:/re/po
 
-HEAD is now at 35a8500 C
- - [deleted]         main
-ok 11 - push to delete (allowed)
+expecting success of 5500.316 'fetch-pack --diag-url git://user@::1:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 316 - fetch-pack --diag-url git://user@::1:/~re/po
 
-expecting success of 5533.12 'cover everything with default force-with-lease (protected)': 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git branch nain main^
-	) &&
-	git ls-remote src refs/heads/\* >expect &&
-	(
-		cd dst &&
-		test_must_fail git push --force-with-lease origin main main:nain
-	) &&
-	git ls-remote src refs/heads/\* >actual &&
-	test_cmp expect actual
+expecting success of 5500.317 'fetch-pack --diag-url git://host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 317 - fetch-pack --diag-url git://host:22/re/po
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
+expecting success of 5500.318 'fetch-pack --diag-url git://User@host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 318 - fetch-pack --diag-url git://User@host:22/re/po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.319 'fetch-pack --diag-url git://User@[::1]:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 319 - fetch-pack --diag-url git://User@[::1]:22/re/po
 
-If you want to 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 5500.320 'fetch-pack --diag-url ssh://host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 320 - fetch-pack --diag-url ssh://host/re/po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.321 'fetch-pack --diag-url ssh://host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 321 - fetch-pack --diag-url ssh://host/~re/po
 
-Or undo this operation with:
+expecting success of 5500.322 'fetch-pack --diag-url ssh://host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 322 - fetch-pack --diag-url ssh://host:/re/po
 
-  git switch -
+expecting success of 5500.323 'fetch-pack --diag-url ssh://host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 323 - fetch-pack --diag-url ssh://host:/~re/po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.324 'fetch-pack --diag-url ssh://user@host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 324 - fetch-pack --diag-url ssh://user@host/re/po
 
-HEAD is now at 35a8500 C
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
- ! [rejected]        main -> nain (stale info)
-error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src'
-ok 12 - cover everything with default force-with-lease (protected)
+expecting success of 5500.325 'fetch-pack --diag-url ssh://user@host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 325 - fetch-pack --diag-url ssh://user@host/~re/po
 
-expecting success of 5533.13 'cover everything with default force-with-lease (allowed)': 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git branch nain main^
-	) &&
-	(
-		cd dst &&
-		git fetch &&
-		git push --force-with-lease origin main main:nain
-	) &&
-	git ls-remote dst refs/heads/main |
-	sed -e "s/main/nain/" >expect &&
-	git ls-remote src refs/heads/nain >actual &&
-	test_cmp expect actual
+expecting success of 5500.326 'fetch-pack --diag-url ssh://user@host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 326 - fetch-pack --diag-url ssh://user@host:/re/po
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
+expecting success of 5500.327 'fetch-pack --diag-url ssh://user@host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 327 - fetch-pack --diag-url ssh://user@host:/~re/po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.328 'fetch-pack --diag-url ssh://user@[::1]/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 328 - fetch-pack --diag-url ssh://user@[::1]/re/po
 
-If you want to 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 5500.329 'fetch-pack --diag-url ssh://user@[::1]/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 329 - fetch-pack --diag-url ssh://user@[::1]/~re/po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.330 'fetch-pack --diag-url ssh://user@[::1]:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 330 - fetch-pack --diag-url ssh://user@[::1]:/re/po
 
-Or undo this operation with:
+expecting success of 5500.331 'fetch-pack --diag-url ssh://user@[::1]:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 331 - fetch-pack --diag-url ssh://user@[::1]:/~re/po
 
-  git switch -
+expecting success of 5500.332 'fetch-pack --diag-url ssh://user@::1/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 332 - fetch-pack --diag-url ssh://user@::1/re/po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.333 'fetch-pack --diag-url ssh://user@::1/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 333 - fetch-pack --diag-url ssh://user@::1/~re/po
 
-HEAD is now at 35a8500 C
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
- * [new branch]      nain       -> origin/nain
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
-   d9df450..35a8500  main -> nain
-ok 13 - cover everything with default force-with-lease (allowed)
+expecting success of 5500.334 'fetch-pack --diag-url ssh://user@::1:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 334 - fetch-pack --diag-url ssh://user@::1:/re/po
 
-expecting success of 5533.14 'new branch covered by force-with-lease': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git branch branch main &&
-		git push --force-with-lease=branch origin branch
-	) &&
-	git ls-remote dst refs/heads/branch >expect &&
-	git ls-remote src refs/heads/branch >actual &&
-	test_cmp expect actual
+expecting success of 5500.335 'fetch-pack --diag-url ssh://user@::1:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 335 - fetch-pack --diag-url ssh://user@::1:/~re/po
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
+expecting success of 5500.336 'fetch-pack --diag-url ssh://host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 336 - fetch-pack --diag-url ssh://host:22/re/po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.337 'fetch-pack --diag-url ssh://User@host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 337 - fetch-pack --diag-url ssh://User@host:22/re/po
 
-If you want to 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 5500.338 'fetch-pack --diag-url ssh://User@[::1]:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 338 - fetch-pack --diag-url ssh://User@[::1]:22/re/po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.339 'fetch-pack --diag-url file://User@[::1]/re/po': 
+			check_prot_path $p://$h/$r $p "/$r"
+		
+ok 339 - fetch-pack --diag-url file://User@[::1]/re/po
 
-Or undo this operation with:
+ok 340 # skip fetch-pack --diag-url file://User@[::1]/re/po (missing MINGW)
 
-  git switch -
+ok 341 # skip fetch-pack --diag-url file:///re/po (missing MINGW)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.342 'fetch-pack --diag-url file://User@[::1]/~re/po': 
+			check_prot_path $p://$h/~$r $p "/~$r"
+		
+ok 342 - fetch-pack --diag-url file://User@[::1]/~re/po
 
-HEAD is now at 35a8500 C
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
- * [new branch]      branch -> branch
-ok 14 - new branch covered by force-with-lease
+ok 343 # skip fetch-pack --diag-url file://User@[::1]/~re/po (missing MINGW)
 
-expecting success of 5533.15 'new branch covered by force-with-lease (explicit)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git branch branch main &&
-		git push --force-with-lease=branch: origin branch
-	) &&
-	git ls-remote dst refs/heads/branch >expect &&
-	git ls-remote src refs/heads/branch >actual &&
-	test_cmp expect actual
+expecting success of 5500.344 'fetch-pack --diag-url ./nohost:re/po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 344 - fetch-pack --diag-url ./nohost:re/po
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
+expecting success of 5500.345 'fetch-pack --diag-url ./file:nohost/~re/po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 345 - fetch-pack --diag-url ./file:nohost/~re/po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.346 'fetch-pack --diag-url ./nohost:12:re/po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 346 - fetch-pack --diag-url ./nohost:12:re/po
 
-If you want to 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 5500.347 'fetch-pack --diag-url ./file:nohost:12/~re/po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 347 - fetch-pack --diag-url ./file:nohost:12/~re/po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.348 'fetch-pack --diag-url ./[::1]:re/po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 348 - fetch-pack --diag-url ./[::1]:re/po
 
-Or undo this operation with:
+expecting success of 5500.349 'fetch-pack --diag-url ./file:[::1]/~re/po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 349 - fetch-pack --diag-url ./file:[::1]/~re/po
 
-  git switch -
+expecting success of 5500.350 'fetch-pack --diag-url ./[::1]:23:re/po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 350 - fetch-pack --diag-url ./[::1]:23:re/po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5500.351 'fetch-pack --diag-url ./file:[::1]:23/~re/po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 351 - fetch-pack --diag-url ./file:[::1]:23/~re/po
 
-HEAD is now at 35a8500 C
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
- * [new branch]      branch -> branch
-ok 15 - new branch covered by force-with-lease (explicit)
+expecting success of 5500.352 'fetch-pack --diag-url ./[:re/po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 352 - fetch-pack --diag-url ./[:re/po
 
-expecting success of 5533.16 'new branch already exists': 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git checkout -b branch main &&
-		test_commit F
-	) &&
-	(
-		cd dst &&
-		git branch branch main &&
-		test_must_fail git push --force-with-lease=branch: origin branch
-	)
+expecting success of 5500.353 'fetch-pack --diag-url ./file:[/~re/po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 353 - fetch-pack --diag-url ./file:[/~re/po
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
+expecting success of 5500.354 'fetch-pack --diag-url ./[:aa:re/po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 354 - fetch-pack --diag-url ./[:aa:re/po
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5500.355 'fetch-pack --diag-url ./file:[:aa/~re/po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 355 - fetch-pack --diag-url ./file:[:aa/~re/po
 
-If you want to 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 5500.356 'fetch-pack --diag-url host:re/po': 
+			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
+		
+ok 356 - fetch-pack --diag-url host:re/po
 
-  git switch -c <new-branch-name>
+expecting success of 5500.357 'fetch-pack --diag-url host:/~re/po': 
+			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
+		
+ok 357 - fetch-pack --diag-url host:/~re/po
 
-Or undo this operation with:
+expecting success of 5500.358 'fetch-pack --diag-url [::1]:re/po': 
+			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
+		
+ok 358 - fetch-pack --diag-url [::1]:re/po
 
-  git switch -
+expecting success of 5500.359 'fetch-pack --diag-url [::1]:/~re/po': 
+			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
+		
+ok 359 - fetch-pack --diag-url [::1]:/~re/po
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 360 # skip fetch-pack --diag-url file://c:/repo (missing MINGW)
 
-HEAD is now at 35a8500 C
-Switched to a new branch 'branch'
-[branch b6ba73d] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src
- ! [rejected]        branch -> branch (stale info)
-error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src'
-ok 16 - new branch already exists
+ok 361 # skip fetch-pack --diag-url c:repo (missing MINGW)
 
-expecting success of 5533.17 'background updates of REMOTE can be mitigated with a non-updated REMOTE-push': 
-	rm -rf src dst &&
-	git init --bare src.bare &&
-	test_when_finished "rm -rf src.bare" &&
-	git clone --no-local src.bare dst &&
-	test_when_finished "rm -rf dst" &&
-	(
-		cd dst &&
-		test_commit G &&
-		git remote add origin-push ../src.bare &&
-		git push origin-push main:main
-	) &&
-	git clone --no-local src.bare dst2 &&
-	test_when_finished "rm -rf dst2" &&
-	(
-		cd dst2 &&
-		test_commit H &&
-		git push
-	) &&
+expecting success of 5500.362 'clone shallow since ...': 
+	test_create_repo shallow-since &&
 	(
-		cd dst &&
-		test_commit I &&
-		git fetch origin &&
-		test_must_fail git push --force-with-lease origin-push &&
-		git fetch origin-push &&
-		git push --force-with-lease origin-push
+	cd shallow-since &&
+	GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
+	GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
+	GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
+	git clone --shallow-since "300000000 +0700" "file://$(pwd)/." ../shallow11 &&
+	git -C ../shallow11 log --pretty=tformat:%s HEAD >actual &&
+	echo three >expected &&
+	test_cmp expected actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src.bare/
-Cloning into 'dst'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) c0a8953] G
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/shallow-since/.git/
+[main (root-commit) 4c9b2a3] one
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-To ../src.bare
- * [new branch]      main -> main
-Cloning into 'dst2'...
-[main d19f4d4] H
+[main e491164] two
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src.bare
-   c0a8953..d19f4d4  main -> main
-[main 91bb270] I
+[main 88fb92d] three
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/src.bare
- * [new branch]      main       -> origin/main
-To ../src.bare
- ! [rejected]        main -> main (stale info)
-error: failed to push some refs to '../src.bare'
-From ../src.bare
-   c0a8953..d19f4d4  main       -> origin-push/main
-To ../src.bare
- + d19f4d4...91bb270 main -> main (forced update)
-ok 17 - background updates of REMOTE can be mitigated with a non-updated REMOTE-push
+Cloning into '../shallow11'...
+ok 362 - clone shallow since ...
 
-expecting success of 5533.18 'background updates to remote can be mitigated with "--force-if-includes"': 
-	setup_src_dup_dst &&
-	test_when_finished "rm -fr dst src dup" &&
-	git ls-remote dst refs/heads/main >expect.main &&
-	git ls-remote dst refs/heads/branch >expect.branch &&
-	(
-		cd src &&
-		git switch branch &&
-		test_commit I &&
-		git switch main &&
-		test_commit J &&
-		git fetch --all &&
-		test_must_fail git push --force-with-lease --force-if-includes --all
-	) &&
-	git ls-remote dst refs/heads/main >actual.main &&
-	git ls-remote dst refs/heads/branch >actual.branch &&
-	test_cmp expect.main actual.main &&
-	test_cmp expect.branch actual.branch
+expecting success of 5500.363 'fetch shallow since ...': 
+	GIT_TRACE2_EVENT=$(pwd)/shallow11/trace2_event \
+		git -C shallow11 fetch --shallow-since "200000000 +0700" origin &&
+	git -C shallow11 log --pretty=tformat:%s origin/main >actual &&
+	cat >expected <<-\EOF &&
+	three
+	two
+	EOF
+	test_cmp expected actual &&
+	grep \"fetch-info\".*\"deepen-since\":true shallow11/trace2_event
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst/
-Cloning into 'src'...
-warning: You appear to have cloned an empty repository.
-Cloning into 'dup'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main f9a2dac] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 157d38b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      main -> main
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      main       -> origin/main
-Switched to a new branch 'branch'
-[branch ded492b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch b63fbb1] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch -> branch
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch     -> origin/branch
-branch 'branch' set up to track 'origin/branch'.
-Current branch main is up to date.
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 00b6961] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[main b995a30] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'branch'
-[branch 9cdccac] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
-   b63fbb1..9cdccac  branch -> branch
-   157d38b..b995a30  main -> main
-Switched to branch 'branch'
-Your branch is up to date with 'origin/branch'.
-[branch da1510b] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be2465f] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 J.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
-   157d38b..b995a30  main       -> origin/main
-   b63fbb1..9cdccac  branch     -> origin/branch
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- ! [rejected]        branch -> branch (remote ref updated since checkout)
- ! [rejected]        main -> main (remote ref updated since checkout)
-error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst'
-hint: Updates were rejected because the tip of the remote-tracking branch has
-hint: been updated since the last checkout. If you want to integrate the
-hint: remote changes, use 'git pull' before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-ok 18 - background updates to remote can be mitigated with "--force-if-includes"
+{"event":"data_json","sid":"20260929T145300.240135Z-H5c947e1c-P002391cd/20260929T145300.245544Z-H5c947e1c-P002391f2","thread":"main","time":"2026-09-29T14:53:00.247542Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.002220,"t_rel":0.002220,"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 5533.19 'background updates to remote can be mitigated with "push.useForceIfIncludes"': 
-	setup_src_dup_dst &&
-	test_when_finished "rm -fr dst src dup" &&
-	git ls-remote dst refs/heads/main >expect.main &&
+expecting success of 5500.364 'clone shallow since selects no commits': 
+	test_create_repo shallow-since-the-future &&
 	(
-		cd src &&
-		git switch branch &&
-		test_commit I &&
-		git switch main &&
-		test_commit J &&
-		git fetch --all &&
-		git config --local push.useForceIfIncludes true &&
-		test_must_fail git push --force-with-lease=main origin main
-	) &&
-	git ls-remote dst refs/heads/main >actual.main &&
-	test_cmp expect.main actual.main
+	cd shallow-since-the-future &&
+	GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
+	GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
+	GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
+	test_must_fail git clone --shallow-since "900000000 +0700" "file://$(pwd)/." ../shallow111
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst/
-Cloning into 'src'...
-warning: You appear to have cloned an empty repository.
-Cloning into 'dup'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main f9a2dac] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 157d38b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      main -> main
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      main       -> origin/main
-Switched to a new branch 'branch'
-[branch ded492b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch b63fbb1] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch -> branch
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch     -> origin/branch
-branch 'branch' set up to track 'origin/branch'.
-Current branch main is up to date.
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 00b6961] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[main b995a30] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'branch'
-[branch 9cdccac] H
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/shallow-since-the-future/.git/
+[main (root-commit) 4c9b2a3] one
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
-   b63fbb1..9cdccac  branch -> branch
-   157d38b..b995a30  main -> main
-Switched to branch 'branch'
-Your branch is up to date with 'origin/branch'.
-[branch da1510b] I
+[main e491164] two
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be2465f] J
+[main 88fb92d] three
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 J.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
-   157d38b..b995a30  main       -> origin/main
-   b63fbb1..9cdccac  branch     -> origin/branch
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- ! [rejected]        main -> main (remote ref updated since checkout)
-error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst'
-hint: Updates were rejected because the tip of the remote-tracking branch has
-hint: been updated since the last checkout. If you want to integrate the
-hint: remote changes, use 'git pull' before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-ok 19 - background updates to remote can be mitigated with "push.useForceIfIncludes"
+Cloning into '../shallow111'...
+fatal: no commits selected for shallow requests
+fatal: the remote end hung up unexpectedly
+ok 364 - clone shallow since selects no commits
 
-expecting success of 5533.20 '"--force-if-includes" should be disabled for --force-with-lease="<refname>:<expect>"': 
-	setup_src_dup_dst &&
-	test_when_finished "rm -fr dst src dup" &&
-	git ls-remote dst refs/heads/main >expect.main &&
+expecting success of 5500.365 'shallow since with commit graph and already-seen commit': 
+	test_create_repo shallow-since-graph &&
 	(
-		cd src &&
-		git switch branch &&
-		test_commit I &&
-		git switch main &&
-		test_commit J &&
-		remote_head="$(git rev-parse refs/remotes/origin/main)" &&
-		git fetch --all &&
-		test_must_fail git push --force-if-includes --force-with-lease="main:$remote_head" 2>err &&
-		grep "stale info" err
-	) &&
-	git ls-remote dst refs/heads/main >actual.main &&
-	test_cmp expect.main actual.main
+	cd shallow-since-graph &&
+	test_commit base &&
+	test_commit main &&
+	git checkout -b other HEAD^ &&
+	test_commit other &&
+	git commit-graph write --reachable &&
+	git config core.commitGraph true &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst/
-Cloning into 'src'...
-warning: You appear to have cloned an empty repository.
-Cloning into 'dup'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main f9a2dac] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 157d38b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      main -> main
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      main       -> origin/main
-Switched to a new branch 'branch'
-[branch ded492b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch b63fbb1] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch -> branch
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch     -> origin/branch
-branch 'branch' set up to track 'origin/branch'.
-Current branch main is up to date.
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 00b6961] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[main b995a30] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'branch'
-[branch 9cdccac] H
+	GIT_PROTOCOL=version=2 git upload-pack . <<-EOF >/dev/null
+	0012command=fetch
+	$(echo "object-format=$(test_oid algo)" | packetize)
+	00010013deepen-since 1
+	$(echo "want $(git rev-parse other)" | packetize)
+	$(echo "have $(git rev-parse main)" | packetize)
+	0000
+	EOF
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/shallow-since-graph/.git/
+[main (root-commit) d3ae9fb] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
-   b63fbb1..9cdccac  branch -> branch
-   157d38b..b995a30  main -> main
-Switched to branch 'branch'
-Your branch is up to date with 'origin/branch'.
-[branch da1510b] I
+ create mode 100644 base.t
+[main a2ca354] main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be2465f] J
+ create mode 100644 main.t
+Switched to a new branch 'other'
+[other fb3d247] other
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 J.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
-   157d38b..b995a30  main       -> origin/main
-   b63fbb1..9cdccac  branch     -> origin/branch
- ! [rejected]        main -> main (stale info)
-ok 20 - "--force-if-includes" should be disabled for --force-with-lease="<refname>:<expect>"
+ create mode 100644 other.t
+warning: refname 'other' is ambiguous.
+warning: refname 'main' is ambiguous.
+ok 365 - shallow since with commit graph and already-seen commit
 
-expecting success of 5533.21 '"--force-if-includes" should allow forced update after a rebase ("pull --rebase")': 
-	setup_src_dup_dst &&
-	test_when_finished "rm -fr dst src dup" &&
+expecting success of 5500.366 'shallow clone exclude tag two': 
+	test_create_repo shallow-exclude &&
 	(
-		cd src &&
-		git switch branch &&
-		test_commit I &&
-		git switch main &&
-		test_commit J &&
-		git pull --rebase origin main &&
-		git push --force-if-includes --force-with-lease="main"
+	cd shallow-exclude &&
+	test_commit one &&
+	test_commit two &&
+	test_commit three &&
+	git clone --shallow-exclude two "file://$(pwd)/." ../shallow12 &&
+	git -C ../shallow12 log --pretty=tformat:%s HEAD >actual &&
+	echo three >expected &&
+	test_cmp expected actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst/
-Cloning into 'src'...
-warning: You appear to have cloned an empty repository.
-Cloning into 'dup'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main f9a2dac] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 157d38b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      main -> main
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      main       -> origin/main
-Switched to a new branch 'branch'
-[branch ded492b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch b63fbb1] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch -> branch
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch     -> origin/branch
-branch 'branch' set up to track 'origin/branch'.
-Current branch main is up to date.
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 00b6961] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[main b995a30] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'branch'
-[branch 9cdccac] H
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/shallow-exclude/.git/
+[main (root-commit) 7d32f63] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
-   b63fbb1..9cdccac  branch -> branch
-   157d38b..b995a30  main -> main
-Switched to branch 'branch'
-Your branch is up to date with 'origin/branch'.
-[branch da1510b] I
+ create mode 100644 one.t
+[main ea3a09e] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be2465f] J
+ create mode 100644 two.t
+[main 28cfb97] three
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 J.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * branch            main       -> FETCH_HEAD
-   157d38b..b995a30  main       -> origin/main
-Rebasing (1/1)
Successfully rebased and updated refs/heads/main.
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
-   b995a30..7c16010  main -> main
-ok 21 - "--force-if-includes" should allow forced update after a rebase ("pull --rebase")
+ create mode 100644 three.t
+Cloning into '../shallow12'...
+ok 366 - shallow clone exclude tag two
 
-expecting success of 5533.22 '"--force-if-includes" should allow forced update after a rebase ("pull --rebase", local rebase)': 
-	setup_src_dup_dst &&
-	test_when_finished "rm -fr dst src dup" &&
+expecting success of 5500.367 'fetch exclude tag one': 
+	git -C shallow12 fetch --shallow-exclude one origin &&
+	git -C shallow12 log --pretty=tformat:%s origin/main >actual &&
+	test_write_lines three two >expected &&
+	test_cmp expected actual
+
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/shallow-exclude/.
+ * [new tag]         two        -> two
+ok 367 - fetch exclude tag one
+
+expecting success of 5500.368 'fetch exclude tag one as revision': 
+	test_when_finished rm -f rev err &&
+	git -C shallow-exclude rev-parse one >rev &&
+	test_must_fail git -C shallow12 fetch --shallow-exclude $(cat rev) origin 2>err &&
+	grep "deepen-not is not a ref:" err
+
+fatal: git upload-pack: deepen-not is not a ref: deepen-not 7d32f632cd08248ef9383667ad19becddb14d93a
+ok 368 - fetch exclude tag one as revision
+
+expecting success of 5500.369 'fetching deepen': 
+	test_create_repo shallow-deepen &&
 	(
-		cd src &&
-		git switch branch &&
-		test_commit I &&
-		git switch main &&
-		test_commit J &&
-		git pull --rebase origin main &&
-		git rebase --onto HEAD~4 HEAD~1 &&
-		git push --force-if-includes --force-with-lease="main"
+	cd shallow-deepen &&
+	test_commit one &&
+	test_commit two &&
+	test_commit three &&
+	git clone --depth 1 "file://$(pwd)/." deepen &&
+	test_commit four &&
+	git -C deepen log --pretty=tformat:%s main >actual &&
+	echo three >expected &&
+	test_cmp expected actual &&
+	git -C deepen fetch --deepen=1 &&
+	git -C deepen 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.51.0/t/trash directory.t5533-push-cas/dst/
-Cloning into 'src'...
-warning: You appear to have cloned an empty repository.
-Cloning into 'dup'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main f9a2dac] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 157d38b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      main -> main
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      main       -> origin/main
-Switched to a new branch 'branch'
-[branch ded492b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch b63fbb1] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch -> branch
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch     -> origin/branch
-branch 'branch' set up to track 'origin/branch'.
-Current branch main is up to date.
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 00b6961] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[main b995a30] G
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/shallow-deepen/.git/
+[main (root-commit) 7d32f63] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'branch'
-[branch 9cdccac] H
+ create mode 100644 one.t
+[main ea3a09e] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
-   b63fbb1..9cdccac  branch -> branch
-   157d38b..b995a30  main -> main
-Switched to branch 'branch'
-Your branch is up to date with 'origin/branch'.
-[branch da1510b] I
+ create mode 100644 two.t
+[main 28cfb97] three
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be2465f] J
+ create mode 100644 three.t
+Cloning into 'deepen'...
+[main 8f42874] four
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 J.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * branch            main       -> FETCH_HEAD
-   157d38b..b995a30  main       -> origin/main
-Rebasing (1/1)
Successfully rebased and updated refs/heads/main.
-Rebasing (1/1)
Successfully rebased and updated refs/heads/main.
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- + b995a30...e9c7db1 main -> main (forced update)
-ok 22 - "--force-if-includes" should allow forced update after a rebase ("pull --rebase", local rebase)
+ create mode 100644 four.t
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/shallow-deepen/.
+   28cfb97..8f42874  main       -> origin/main
+ * [new tag]         four       -> four
+ * [new tag]         two        -> two
+ok 369 - fetching deepen
 
-expecting success of 5533.23 '"--force-if-includes" should allow deletes': 
-	setup_src_dup_dst &&
-	test_when_finished "rm -fr dst src dup" &&
-	(
-		cd src &&
-		git switch branch &&
-		git pull --rebase origin branch &&
-		git push --force-if-includes --force-with-lease="branch" origin :branch
-	)
+expecting success of 5500.370 'use ref advertisement to prune "have" lines sent': 
+	test_negotiation_algorithm_default
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst/
-Cloning into 'src'...
-warning: You appear to have cloned an empty repository.
-Cloning into 'dup'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) 112d1ac] A
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server/.git/
+[main (root-commit) 4ec3e89] both_have_1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main f9a2dac] B
+ create mode 100644 both_have_1.t
+Deleted tag 'both_have_1' (was 4ec3e89)
+[main 0e648cf] both_have_2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 157d38b] C
+ create mode 100644 both_have_2.t
+Cloning into 'client'...
+done.
+[main c107eb0] server_has
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 C.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      main -> main
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      main       -> origin/main
-Switched to a new branch 'branch'
-[branch ded492b] D
+ create mode 100644 server_has.t
+[main d1fea1f] client_has
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch b63fbb1] E
+ create mode 100644 client_has.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server
+ * tag               server_has -> FETCH_HEAD
+ * tag               both_have_2 -> FETCH_HEAD
+packet:        fetch> have d1fea1f29cf9ed7dd3bad159c87b04602137107f
+packet:  upload-pack< have d1fea1f29cf9ed7dd3bad159c87b04602137107f
+packet:        fetch> have 0e648cf9d30d78592ceaaece245726ca9e279151
+packet:  upload-pack< have 0e648cf9d30d78592ceaaece245726ca9e279151
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server
+ * tag               server_has -> FETCH_HEAD
+ * tag               both_have_2 -> FETCH_HEAD
+packet:        fetch> have d1fea1f29cf9ed7dd3bad159c87b04602137107f
+packet:  upload-pack< have d1fea1f29cf9ed7dd3bad159c87b04602137107f
+packet:        fetch> have 0e648cf9d30d78592ceaaece245726ca9e279151
+packet:  upload-pack< have 0e648cf9d30d78592ceaaece245726ca9e279151
+ok 370 - use ref advertisement to prune "have" lines sent
+
+expecting success of 5500.371 'same as last but with config overrides': 
+	test_negotiation_algorithm_default \
+		-c feature.experimental=true \
+		-c fetch.negotiationAlgorithm=consecutive
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server/.git/
+[main (root-commit) 9df98d9] both_have_1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch -> branch
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch     -> origin/branch
-branch 'branch' set up to track 'origin/branch'.
-Current branch main is up to date.
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 00b6961] F
+ create mode 100644 both_have_1.t
+Deleted tag 'both_have_1' (was 9df98d9)
+[main 63eca65] both_have_2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[main b995a30] G
+ create mode 100644 both_have_2.t
+Cloning into 'client'...
+done.
+[main d7eee63] server_has
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'branch'
-[branch 9cdccac] H
+ create mode 100644 server_has.t
+[main 381c2f1] client_has
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
-   b63fbb1..9cdccac  branch -> branch
-   157d38b..b995a30  main -> main
-Switched to branch 'branch'
-Your branch is up to date with 'origin/branch'.
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- * branch            branch     -> FETCH_HEAD
-   b63fbb1..9cdccac  branch     -> origin/branch
-Updating b63fbb1..9cdccac
-Fast-forward
- H.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5533-push-cas/dst
- - [deleted]         branch
-ok 23 - "--force-if-includes" should allow deletes
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5570-git-daemon.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/.git/
-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 5570.1 'daemon rejects invalid --init-timeout values': 
-	for arg in "3a" "-3"
-	do
-		test_must_fail git daemon --init-timeout="$arg" 2>err &&
-		test_grep "fatal: invalid init-timeout ${SQ}$arg${SQ}, expecting a non-negative integer" err ||
-		return 1
-	done
-
-fatal: invalid init-timeout '3a', expecting a non-negative integer
-fatal: invalid init-timeout '-3', expecting a non-negative integer
-ok 1 - daemon rejects invalid --init-timeout values
-
-expecting success of 5570.2 'daemon rejects invalid --timeout values': 
-	for arg in "3a" "-3"
-	do
-		test_must_fail git daemon --timeout="$arg" 2>err &&
-		test_grep "fatal: invalid timeout ${SQ}$arg${SQ}, expecting a non-negative integer" err ||
-		return 1
-	done
+ create mode 100644 client_has.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server
+ * tag               server_has -> FETCH_HEAD
+ * tag               both_have_2 -> FETCH_HEAD
+packet:        fetch> have 381c2f1c977599145037b617815f85808fe86d6c
+packet:  upload-pack< have 381c2f1c977599145037b617815f85808fe86d6c
+packet:        fetch> have 63eca652c410121f112d645c8a8840ae82123b3e
+packet:  upload-pack< have 63eca652c410121f112d645c8a8840ae82123b3e
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server
+ * tag               server_has -> FETCH_HEAD
+ * tag               both_have_2 -> FETCH_HEAD
+packet:        fetch> have 381c2f1c977599145037b617815f85808fe86d6c
+packet:  upload-pack< have 381c2f1c977599145037b617815f85808fe86d6c
+packet:        fetch> have 63eca652c410121f112d645c8a8840ae82123b3e
+packet:  upload-pack< have 63eca652c410121f112d645c8a8840ae82123b3e
+ok 371 - same as last but with config overrides
 
-fatal: invalid timeout '3a', expecting a non-negative integer
-fatal: invalid timeout '-3', expecting a non-negative integer
-ok 2 - daemon rejects invalid --timeout values
+expecting success of 5500.372 'ensure bogus fetch.negotiationAlgorithm yields error': 
+	test_when_finished rm -rf clientv0 &&
+	cp -r client clientv0 &&
+	test_must_fail git -C clientv0 --fetch.negotiationAlgorithm=bogus \
+		       fetch origin server_has both_have_2
 
-expecting success of 5570.3 'daemon rejects invalid --max-connections values': 
-	arg=3a &&
-	test_must_fail git daemon --max-connections=3a 2>err &&
-	test_grep "fatal: invalid max-connections ${SQ}$arg${SQ}, expecting an integer" err
+unknown option: --fetch.negotiationAlgorithm=bogus
+usage: git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]
+           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
+           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch]
+           [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]
+           [--work-tree=<path>] [--namespace=<name>] [--config-env=<name>=<envvar>]
+           <command> [<args>]
+ok 372 - ensure bogus fetch.negotiationAlgorithm yields error
 
-fatal: invalid max-connections '3a', expecting an integer
-ok 3 - daemon rejects invalid --max-connections values
+expecting success of 5500.373 'fetch-pack with fsckObjects and keep-file does not segfault': 
+	rm -rf server client &&
+	test_create_repo server &&
+	test_commit -C server one &&
 
-Starting git daemon ...
-[684352] Ready to rumble
-expecting success of 5570.4 'setup repository': 
-	git config push.default matching &&
-	echo content >file &&
-	git add file &&
-	git commit -m one
+	test_create_repo client &&
+	git -c fetch.fsckObjects=true \
+	    -C client fetch-pack -k -k ../server HEAD
 
-[main (root-commit) f39a923] one
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server/.git/
+[main (root-commit) b73245b] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 4 - setup repository
-
-expecting success of 5570.5 'create git-accessible bare repository': 
-	mkdir "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
-	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
-	 git --bare init &&
-	 : >git-daemon-export-ok
-	) &&
-	git remote add public "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
-	git push public main:main
+ create mode 100644 one.t
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/client/.git/
+remote: Enumerating objects: 3, done.        
+remote: Counting objects:  33% (1/3)        
remote: Counting objects:  66% (2/3)        
remote: Counting objects: 100% (3/3)        
remote: Counting objects: 100% (3/3), done.        
+Receiving objects:  33% (1/3)
Receiving objects:  66% (2/3)
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
+Receiving objects: 100% (3/3)
Receiving objects: 100% (3/3), 215 bytes | 215.00 KiB/s, done.
+b73245b187a878a9334892236f3e85ef70d56705 HEAD
+ok 373 - fetch-pack with fsckObjects and keep-file does not segfault
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git/
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git
- * [new branch]      main -> main
-ok 5 - create git-accessible bare repository
+expecting success of 5500.374 'filtering by size': 
+	rm -rf server client &&
+	test_create_repo server &&
+	test_commit -C server one &&
+	test_config -C server uploadpack.allowfilter 1 &&
 
-expecting success of 5570.6 'clone git repository': 
-	git clone -v "$GIT_DAEMON_URL/repo.git" clone 2>stderr &&
-	check_verbose_connect &&
-	test_cmp file clone/file
+	test_create_repo client &&
+	GIT_TRACE2_EVENT=$(pwd)/client/trace2_event \
+		git -C client fetch-pack --filter=blob:limit=0 ../server HEAD &&
 
-[684649] Connection from 127.0.0.1:51840
-[684649] Extended attribute "host": 127.0.0.1:5570
-[684649] Extended attribute "protocol": version=2
-[684649] Request upload-pack for '/repo.git'
-[684352] [684649] 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.
-Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
-ok 6 - clone git repository
+	# Ensure that object is not inadvertently fetched
+	commit=$(git -C server rev-parse HEAD) &&
+	blob=$(git hash-object server/one.t) &&
+	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
+	! grep "$blob" oids &&
 
-expecting success of 5570.7 'fetch changes via git protocol': 
-	echo content >>file &&
-	git commit -a -m two &&
-	git push public &&
-	(cd clone && git pull -v) 2>stderr &&
-	check_verbose_connect &&
-	test_cmp file clone/file
+	grep \"fetch-info\".*\"filter\":\"blob:limit\" client/trace2_event
 
-[main 5647d5f] two
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server/.git/
+[main (root-commit) 946f2fc] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git
-   f39a923..5647d5f  main -> main
-[685133] Connection from 127.0.0.1:51850
-[685133] Extended attribute "host": 127.0.0.1:5570
-[685133] Extended attribute "protocol": version=2
-[685133] Request upload-pack for '/repo.git'
-[684352] [685133] Disconnected
-Updating f39a923..5647d5f
-Fast-forward
- file | 1 +
- 1 file changed, 1 insertion(+)
-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.
-Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
-ok 7 - fetch changes via git protocol
-
-expecting success of 5570.8 'no-op fetch -v stderr is as expected': 
-	(cd clone && git fetch -v) 2>stderr &&
-	check_verbose_connect
-
-[685564] Connection from 127.0.0.1:51866
-[685564] Extended attribute "host": 127.0.0.1:5570
-[685564] Extended attribute "protocol": version=2
-[685564] Request upload-pack for '/repo.git'
-[684352] [685564] 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.
-Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
-ok 8 - no-op fetch -v stderr is as expected
-
-expecting success of 5570.9 'no-op fetch without "-v" is quiet': 
-	(cd clone && git fetch 2>../stderr) &&
-	test_must_be_empty stderr
-
-[685813] Connection from 127.0.0.1:51878
-[685813] Extended attribute "host": 127.0.0.1:5570
-[685813] Extended attribute "protocol": version=2
-[685813] Request upload-pack for '/repo.git'
-[684352] [685813] Disconnected
-ok 9 - no-op fetch without "-v" is quiet
-
-expecting success of 5570.10 'remote detects correct HEAD': 
-	git push public main:other &&
-	(cd clone &&
-	 git remote set-head -d origin &&
-	 git remote set-head -a origin &&
-	 git symbolic-ref refs/remotes/origin/HEAD > output &&
-	 echo refs/remotes/origin/main > expect &&
-	 test_cmp expect output
-	)
-
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git
- * [new branch]      main -> other
-[686146] Connection from 127.0.0.1:51882
-[686146] Extended attribute "host": 127.0.0.1:5570
-[686146] Extended attribute "protocol": version=2
-[686146] Request upload-pack for '/repo.git'
-'origin/HEAD' is now created and points to 'main'
-[684352] [686146] Disconnected
-ok 10 - remote detects correct HEAD
-
-expecting success of 5570.11 'prepare pack objects': 
-	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git &&
-	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git &&
-	 git --bare repack -a -d
-	)
-
-ok 11 - prepare pack objects
-
-expecting success of 5570.12 'fetch notices corrupt pack': 
-	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
-	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
-	 p=$(ls objects/pack/pack-*.pack) &&
-	 chmod u+w $p &&
-	 printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
-	) &&
-	mkdir repo_bad1.git &&
-	(cd repo_bad1.git &&
-	 git --bare init &&
-	 test_must_fail git --bare fetch "$GIT_DAEMON_URL/repo_bad1.git" &&
-	 test 0 = $(ls objects/pack/pack-*.pack | wc -l)
-	)
-
-1+0 records in
-1+0 records out
-256 bytes copied, 3.288e-05 s, 7.8 MB/s
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo_bad1.git/
-[686466] Connection from 127.0.0.1:51894
-[686466] Extended attribute "host": 127.0.0.1:5570
-[686466] Extended attribute "protocol": version=2
-[686466] Request upload-pack for '/repo_bad1.git'
-[686466] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[686466] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[686466] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[686466] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[686466] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[684352] [686466] Disconnected (with error)
-fatal: remote error: upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-ls: cannot access 'objects/pack/pack-*.pack': No such file or directory
-ok 12 - fetch notices corrupt pack
-
-expecting success of 5570.13 'fetch notices corrupt idx': 
-	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
-	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
-	 rm -f objects/pack/multi-pack-index &&
-	 p=$(ls objects/pack/pack-*.idx) &&
-	 chmod u+w $p &&
-	 printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
-	) &&
-	mkdir repo_bad2.git &&
-	(cd repo_bad2.git &&
-	 git --bare init &&
-	 test_must_fail git --bare fetch "$GIT_DAEMON_URL/repo_bad2.git" &&
-	 test 0 = $(ls objects/pack | wc -l)
-	)
-
-1+0 records in
-1+0 records out
-256 bytes copied, 3.32e-05 s, 7.7 MB/s
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo_bad2.git/
-[686741] Connection from 127.0.0.1:51910
-[686741] Extended attribute "host": 127.0.0.1:5570
-[686741] Extended attribute "protocol": version=2
-[686741] Request upload-pack for '/repo_bad2.git'
-[686741] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[686741] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[686741] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[686741] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[686741] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[684352] [686741] Disconnected (with error)
-fatal: remote error: upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-ok 13 - fetch notices corrupt idx
-
-expecting success of 5570.14 'client refuses to ask for repo with newline': 
-	test_must_fail git clone "$GIT_DAEMON_URL/repo$LF.git" dst 2>stderr &&
-	test_grep newline.is.forbidden stderr
-
-fatal: newline is forbidden in git:// hosts and repo paths
-ok 14 - client refuses to ask for repo with newline
+ create mode 100644 one.t
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/client/.git/
+remote: Enumerating objects: 2, done.        
+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":"20260929T145301.579878Z-H5c947e1c-P0023a54e/20260929T145301.583673Z-H5c947e1c-P0023a55a","thread":"main","time":"2026-09-29T14:53:01.585086Z","file":"upload-pack.c","line":1605,"repo":0,"t_abs":0.001639,"t_rel":0.001639,"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 5570.15 'clone non-existent': test_remote_error    'access denied or repository not exported' clone nowhere.git
-[686984] Connection from 127.0.0.1:51916
-[686984] Extended attribute "host": 127.0.0.1:5570
-[686984] Extended attribute "protocol": version=2
-[686984] Request upload-pack for '/nowhere.git'
-[686984] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
-[684352] [686984] Disconnected (with error)
-fatal: remote error: access denied or repository not exported: /nowhere.git
-ok 15 - clone non-existent
+expecting success of 5500.375 'filtering by size has no effect if support for it is not advertised': 
+	rm -rf server client &&
+	test_create_repo server &&
+	test_commit -C server one &&
 
-expecting success of 5570.16 'push disabled': test_remote_error    'access denied or repository not exported' push  repo.git main
-[687076] Connection from 127.0.0.1:51930
-[687076] Extended attribute "host": 127.0.0.1:5570
-[687076] Request receive-pack for '/repo.git'
-[687076] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git'
-[684352] [687076] Disconnected (with error)
-fatal: remote error: access denied or repository not exported: /repo.git
-ok 16 - push disabled
+	test_create_repo client &&
+	git -C client fetch-pack --filter=blob:limit=0 ../server HEAD 2> err &&
 
-expecting success of 5570.17 'read access denied': test_remote_error -x 'access denied or repository not exported' fetch repo.git
-[687120] Connection from 127.0.0.1:51936
-[687120] Extended attribute "host": 127.0.0.1:5570
-[687120] Extended attribute "protocol": version=2
-[687120] Request upload-pack for '/repo.git'
-[687120] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
-[684352] [687120] Disconnected (with error)
-fatal: remote error: access denied or repository not exported: /repo.git
-ok 17 - read access denied
+	# Ensure that object is fetched
+	commit=$(git -C server rev-parse HEAD) &&
+	blob=$(git hash-object server/one.t) &&
+	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
+	grep "$blob" oids &&
 
-expecting success of 5570.18 'not exported': test_remote_error -n 'access denied or repository not exported' fetch repo.git
-[687178] Connection from 127.0.0.1:51946
-[687178] Extended attribute "host": 127.0.0.1:5570
-[687178] Extended attribute "protocol": version=2
-[687178] Request upload-pack for '/repo.git'
-[687178] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
-[684352] [687178] Disconnected (with error)
-fatal: remote error: access denied or repository not exported: /repo.git
-ok 18 - not exported
+	test_grep "filtering not recognized by server" err
 
-Stopping git daemon ...
-Terminated
-Starting git daemon ...
-[687291] Ready to rumble
-expecting success of 5570.19 'clone non-existent': test_remote_error    'no such repository'      clone nowhere.git
-[687327] Connection from 127.0.0.1:51950
-[687327] Extended attribute "host": 127.0.0.1:5570
-[687327] Extended attribute "protocol": version=2
-[687327] Request upload-pack for '/nowhere.git'
-[687327] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
-[687291] [687327] Disconnected (with error)
-fatal: remote error: no such repository: /nowhere.git
-ok 19 - clone non-existent
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server/.git/
+[main (root-commit) 65824a5] 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.51.0/t/trash directory.t5500-fetch-pack/client/.git/
+65824a5afab3ce868d5dbea30006cffd06f7d620 HEAD
+5626abf0f72e58d7a153368ba57db4c673c0e171 one.t
+warning: filtering not recognized by server, ignoring
+ok 375 - filtering by size has no effect if support for it is not advertised
 
-expecting success of 5570.20 'push disabled': test_remote_error    'service not enabled'     push  repo.git main
-[687403] Connection from 127.0.0.1:51960
-[687403] Extended attribute "host": 127.0.0.1:5570
-[687403] Request receive-pack for '/repo.git'
-[687403] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git'
-fatal: remote error: service not enabled: /repo.git
-[687291] [687403] Disconnected (with error)
-ok 20 - push disabled
+expecting success of 5500.376 'fetch with --filter=blob:limit=0': 
+	fetch_filter_blob_limit_zero server server
 
-expecting success of 5570.21 'read access denied': test_remote_error -x 'no such repository'      fetch repo.git
-[687472] Connection from 127.0.0.1:51964
-[687472] Extended attribute "host": 127.0.0.1:5570
-[687472] Extended attribute "protocol": version=2
-[687472] Request upload-pack for '/repo.git'
-[687472] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
-[687291] [687472] Disconnected (with error)
-fatal: remote error: no such repository: /repo.git
-ok 21 - read access denied
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server/.git/
+[main (root-commit) 592fb96] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Cloning into 'client'...
+done.
+[main d0a5bc4] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5500-fetch-pack/server
+ * [new ref]         HEAD       -> somewhere
+ * [new tag]         two        -> two
+d0a5bc4f606380cade3e239ca5f3edd4dea821d9
+ok 376 - fetch with --filter=blob:limit=0
 
-expecting success of 5570.22 'not exported': test_remote_error -n 'repository not exported' fetch repo.git
-[687536] Connection from 127.0.0.1:51972
-[687536] Extended attribute "host": 127.0.0.1:5570
-[687536] Extended attribute "protocol": version=2
-[687536] Request upload-pack for '/repo.git'
-[687536] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
-[687291] [687536] Disconnected (with error)
-fatal: remote error: repository not exported: /repo.git
-ok 22 - not exported
+checking prerequisite: NOT_ROOT
 
-Stopping git daemon ...
-Terminated
-Starting git daemon ...
-[687692] 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" &&
-	git push "$repo" HEAD &&
-	>"$repo"/git-daemon-export-ok &&
-	GIT_OVERRIDE_VIRTUAL_HOST=localhost \
-		git ls-remote "$GIT_DAEMON_URL/interp.git" &&
-	GIT_OVERRIDE_VIRTUAL_HOST=LOCALHOST \
-		git ls-remote "$GIT_DAEMON_URL/interp.git"
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/localhost/interp.git/
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/localhost/interp.git
- * [new branch]      HEAD -> main
-[687906] Connection from 127.0.0.1:51982
-[687906] Extended attribute "host": localhost
-[687906] Extended attribute "protocol": version=2
-[687906] Request upload-pack for '/interp.git'
-[687906] Interpolated dir '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
-5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
-5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
-[687692] [687906] Disconnected
-[688029] Connection from 127.0.0.1:51996
-[688029] Extended attribute "host": LOCALHOST
-[688029] Extended attribute "protocol": version=2
-[688029] Request upload-pack for '/interp.git'
-[688029] Interpolated dir '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
-5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
-5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
-ok 23 - access repo via interpolated hostname
+)
+prerequisite NOT_ROOT ok
+# passed all 376 test(s)
+# SKIP no web server found at ''
+1..376
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5602-clone-remote-exec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5602-clone-remote-exec/.git/
+expecting success of 5602.1 'setup': 
+	echo "#!/bin/sh" > not_ssh &&
+	echo "echo \"\$*\" > not_ssh_output" >> not_ssh &&
+	echo "exit 1" >> not_ssh &&
+	chmod +x not_ssh
 
-expecting success of 5570.24 'hostname cannot break out of directory': 
-	repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/../escape.git" &&
-	git init --bare "$repo" &&
-	git push "$repo" HEAD &&
-	>"$repo"/git-daemon-export-ok &&
-	test_must_fail \
-		env GIT_OVERRIDE_VIRTUAL_HOST=.. \
-		git ls-remote "$GIT_DAEMON_URL/escape.git"
+ok 1 - setup
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/escape.git/
-[687692] [688029] Disconnected
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/../escape.git
- * [new branch]      HEAD -> main
-[688331] Connection from 127.0.0.1:52012
-[688331] Extended attribute "host": ..
-[688331] Extended attribute "protocol": version=2
-[688331] Request upload-pack for '/escape.git'
-[688331] Interpolated dir '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo//escape.git'
-[688331] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo//escape.git' does not appear to be a git repository
-[687692] [688331] Disconnected (with error)
-fatal: remote error: access denied or repository not exported: /escape.git
-ok 24 - hostname cannot break out of directory
+expecting success of 5602.2 'clone calls git upload-pack unqualified with no -u option': 
+	test_must_fail env GIT_SSH=./not_ssh git clone localhost:/path/to/repo junk &&
+	echo "localhost git-upload-pack '/path/to/repo'" >expected &&
+	test_cmp expected not_ssh_output
 
-checking prerequisite: FAKENC
+Cloning into 'junk'...
+fatal: Could not read from remote repository.
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAKENC" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FAKENC" &&
-	perl -MIO::Socket::INET -e "exit 0"
+Please make sure you have the correct access rights
+and the repository exists.
+ok 2 - clone calls git upload-pack unqualified with no -u option
 
-)
-prerequisite FAKENC ok
-expecting success of 5570.25 'hostname interpolation works after LF-stripping': 
-	{
-		printf "git-upload-pack /interp.git\n\0host=localhost" | packetize_raw &&
-		printf "0000"
-	} >input &&
-	fake_nc "$GIT_DAEMON_HOST_PORT" <input >output &&
-	depacketize <output >output.raw &&
+expecting success of 5602.3 'clone calls specified git upload-pack with -u option': 
+	test_must_fail env GIT_SSH=./not_ssh \
+		git clone -u ./something/bin/git-upload-pack localhost:/path/to/repo junk &&
+	echo "localhost ./something/bin/git-upload-pack '/path/to/repo'" >expected &&
+	test_cmp expected not_ssh_output
 
-	# just pick out the value of main, which avoids any protocol
-	# particulars
-	perl -lne "print \$1 if m{^(\\S+) refs/heads/main}" <output.raw >actual &&
-	git -C "$repo" rev-parse main >expect &&
-	test_cmp expect actual
+Cloning into 'junk'...
+fatal: Could not read from remote repository.
 
-[688637] Connection from 127.0.0.1:52018
-[688637] Extended attribute "host": localhost
-[688637] Request upload-pack for '/interp.git'
-[688637] Interpolated dir '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
-[687692] [688637] Disconnected
-ok 25 - hostname interpolation works after LF-stripping
+Please make sure you have the correct access rights
+and the repository exists.
+ok 3 - clone calls specified git upload-pack with -u option
 
-Stopping git daemon ...
-Terminated
-# passed all 25 test(s)
-1..25
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5583-push-branches.sh ***
@@ -369401,43 +369957,418 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5602-clone-remote-exec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5602-clone-remote-exec/.git/
-expecting success of 5602.1 'setup': 
-	echo "#!/bin/sh" > not_ssh &&
-	echo "echo \"\$*\" > not_ssh_output" >> not_ssh &&
-	echo "exit 1" >> not_ssh &&
-	chmod +x not_ssh
+*** t5570-git-daemon.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/.git/
+checking prerequisite: PIPE
 
-ok 1 - setup
+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
 
-expecting success of 5602.2 'clone calls git upload-pack unqualified with no -u option': 
-	test_must_fail env GIT_SSH=./not_ssh git clone localhost:/path/to/repo junk &&
-	echo "localhost git-upload-pack '/path/to/repo'" >expected &&
-	test_cmp expected not_ssh_output
+)
+prerequisite PIPE ok
+expecting success of 5570.1 'daemon rejects invalid --init-timeout values': 
+	for arg in "3a" "-3"
+	do
+		test_must_fail git daemon --init-timeout="$arg" 2>err &&
+		test_grep "fatal: invalid init-timeout ${SQ}$arg${SQ}, expecting a non-negative integer" err ||
+		return 1
+	done
 
-Cloning into 'junk'...
-fatal: Could not read from remote repository.
+fatal: invalid init-timeout '3a', expecting a non-negative integer
+fatal: invalid init-timeout '-3', expecting a non-negative integer
+ok 1 - daemon rejects invalid --init-timeout values
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 2 - clone calls git upload-pack unqualified with no -u option
+expecting success of 5570.2 'daemon rejects invalid --timeout values': 
+	for arg in "3a" "-3"
+	do
+		test_must_fail git daemon --timeout="$arg" 2>err &&
+		test_grep "fatal: invalid timeout ${SQ}$arg${SQ}, expecting a non-negative integer" err ||
+		return 1
+	done
 
-expecting success of 5602.3 'clone calls specified git upload-pack with -u option': 
-	test_must_fail env GIT_SSH=./not_ssh \
-		git clone -u ./something/bin/git-upload-pack localhost:/path/to/repo junk &&
-	echo "localhost ./something/bin/git-upload-pack '/path/to/repo'" >expected &&
-	test_cmp expected not_ssh_output
+fatal: invalid timeout '3a', expecting a non-negative integer
+fatal: invalid timeout '-3', expecting a non-negative integer
+ok 2 - daemon rejects invalid --timeout values
 
-Cloning into 'junk'...
-fatal: Could not read from remote repository.
+expecting success of 5570.3 'daemon rejects invalid --max-connections values': 
+	arg=3a &&
+	test_must_fail git daemon --max-connections=3a 2>err &&
+	test_grep "fatal: invalid max-connections ${SQ}$arg${SQ}, expecting an integer" err
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 3 - clone calls specified git upload-pack with -u option
+fatal: invalid max-connections '3a', expecting an integer
+ok 3 - daemon rejects invalid --max-connections values
 
-# passed all 3 test(s)
-1..3
+Starting git daemon ...
+[2333618] Ready to rumble
+expecting success of 5570.4 'setup repository': 
+	git config push.default matching &&
+	echo content >file &&
+	git add file &&
+	git commit -m one
+
+[main (root-commit) f39a923] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 4 - setup repository
+
+expecting success of 5570.5 'create git-accessible bare repository': 
+	mkdir "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
+	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
+	 git --bare init &&
+	 : >git-daemon-export-ok
+	) &&
+	git remote add public "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
+	git push public main:main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git/
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git
+ * [new branch]      main -> main
+ok 5 - create git-accessible bare repository
+
+expecting success of 5570.6 'clone git repository': 
+	git clone -v "$GIT_DAEMON_URL/repo.git" clone 2>stderr &&
+	check_verbose_connect &&
+	test_cmp file clone/file
+
+[2333922] Connection from 127.0.0.1:60206
+[2333922] Extended attribute "host": 127.0.0.1:5570
+[2333922] Extended attribute "protocol": version=2
+[2333922] Request upload-pack for '/repo.git'
+[2333618] [2333922] 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.
+Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
+ok 6 - clone git repository
+
+expecting success of 5570.7 'fetch changes via git protocol': 
+	echo content >>file &&
+	git commit -a -m two &&
+	git push public &&
+	(cd clone && git pull -v) 2>stderr &&
+	check_verbose_connect &&
+	test_cmp file clone/file
+
+[main 5647d5f] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git
+   f39a923..5647d5f  main -> main
+[2334595] Connection from 127.0.0.1:60210
+[2334595] Extended attribute "host": 127.0.0.1:5570
+[2334595] Extended attribute "protocol": version=2
+[2334595] Request upload-pack for '/repo.git'
+[2333618] [2334595] Disconnected
+Updating f39a923..5647d5f
+Fast-forward
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+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.
+Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
+ok 7 - fetch changes via git protocol
+
+expecting success of 5570.8 'no-op fetch -v stderr is as expected': 
+	(cd clone && git fetch -v) 2>stderr &&
+	check_verbose_connect
+
+[2335095] Connection from 127.0.0.1:60216
+[2335095] Extended attribute "host": 127.0.0.1:5570
+[2335095] Extended attribute "protocol": version=2
+[2335095] Request upload-pack for '/repo.git'
+[2333618] [2335095] 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.
+Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
+ok 8 - no-op fetch -v stderr is as expected
+
+expecting success of 5570.9 'no-op fetch without "-v" is quiet': 
+	(cd clone && git fetch 2>../stderr) &&
+	test_must_be_empty stderr
+
+[2335360] Connection from 127.0.0.1:60226
+[2335360] Extended attribute "host": 127.0.0.1:5570
+[2335360] Extended attribute "protocol": version=2
+[2335360] Request upload-pack for '/repo.git'
+[2333618] [2335360] Disconnected
+ok 9 - no-op fetch without "-v" is quiet
+
+expecting success of 5570.10 'remote detects correct HEAD': 
+	git push public main:other &&
+	(cd clone &&
+	 git remote set-head -d origin &&
+	 git remote set-head -a origin &&
+	 git symbolic-ref refs/remotes/origin/HEAD > output &&
+	 echo refs/remotes/origin/main > expect &&
+	 test_cmp expect output
+	)
+
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git
+ * [new branch]      main -> other
+[2335773] Connection from 127.0.0.1:60228
+[2335773] Extended attribute "host": 127.0.0.1:5570
+[2335773] Extended attribute "protocol": version=2
+[2335773] Request upload-pack for '/repo.git'
+'origin/HEAD' is now created and points to 'main'
+[2333618] [2335773] Disconnected
+ok 10 - remote detects correct HEAD
+
+expecting success of 5570.11 'prepare pack objects': 
+	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git &&
+	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git &&
+	 git --bare repack -a -d
+	)
+
+ok 11 - prepare pack objects
+
+expecting success of 5570.12 'fetch notices corrupt pack': 
+	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
+	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
+	 p=$(ls objects/pack/pack-*.pack) &&
+	 chmod u+w $p &&
+	 printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
+	) &&
+	mkdir repo_bad1.git &&
+	(cd repo_bad1.git &&
+	 git --bare init &&
+	 test_must_fail git --bare fetch "$GIT_DAEMON_URL/repo_bad1.git" &&
+	 test 0 = $(ls objects/pack/pack-*.pack | wc -l)
+	)
+
+1+0 records in
+1+0 records out
+256 bytes copied, 3.396e-05 s, 7.5 MB/s
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo_bad1.git/
+[2336236] Connection from 127.0.0.1:60236
+[2336236] Extended attribute "host": 127.0.0.1:5570
+[2336236] Extended attribute "protocol": version=2
+[2336236] Request upload-pack for '/repo_bad1.git'
+[2336236] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[2336236] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+fatal: remote error: upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+[2336236] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[2336236] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[2336236] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+[2333618] [2336236] Disconnected (with error)
+ls: cannot access 'objects/pack/pack-*.pack': No such file or directory
+ok 12 - fetch notices corrupt pack
+
+expecting success of 5570.13 'fetch notices corrupt idx': 
+	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
+	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
+	 rm -f objects/pack/multi-pack-index &&
+	 p=$(ls objects/pack/pack-*.idx) &&
+	 chmod u+w $p &&
+	 printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
+	) &&
+	mkdir repo_bad2.git &&
+	(cd repo_bad2.git &&
+	 git --bare init &&
+	 test_must_fail git --bare fetch "$GIT_DAEMON_URL/repo_bad2.git" &&
+	 test 0 = $(ls objects/pack | wc -l)
+	)
+
+1+0 records in
+1+0 records out
+256 bytes copied, 3.092e-05 s, 8.3 MB/s
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo_bad2.git/
+[2336635] Connection from 127.0.0.1:60238
+[2336635] Extended attribute "host": 127.0.0.1:5570
+[2336635] Extended attribute "protocol": version=2
+[2336635] Request upload-pack for '/repo_bad2.git'
+[2336635] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+fatal: remote error: upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+[2336635] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[2336635] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[2336635] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[2336635] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+[2333618] [2336635] Disconnected (with error)
+ok 13 - fetch notices corrupt idx
+
+expecting success of 5570.14 'client refuses to ask for repo with newline': 
+	test_must_fail git clone "$GIT_DAEMON_URL/repo$LF.git" dst 2>stderr &&
+	test_grep newline.is.forbidden stderr
+
+fatal: newline is forbidden in git:// hosts and repo paths
+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
+[2336965] Connection from 127.0.0.1:60242
+[2336965] Extended attribute "host": 127.0.0.1:5570
+[2336965] Extended attribute "protocol": version=2
+[2336965] Request upload-pack for '/nowhere.git'
+[2336965] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
+[2333618] [2336965] 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
+[2337033] Connection from 127.0.0.1:60244
+[2337033] Extended attribute "host": 127.0.0.1:5570
+[2337033] Request receive-pack for '/repo.git'
+[2337033] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git'
+[2333618] [2337033] 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
+[2337131] Connection from 127.0.0.1:60260
+[2337131] Extended attribute "host": 127.0.0.1:5570
+[2337131] Extended attribute "protocol": version=2
+[2337131] Request upload-pack for '/repo.git'
+[2337131] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
+[2333618] [2337131] 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
+[2337213] Connection from 127.0.0.1:60276
+[2337213] Extended attribute "host": 127.0.0.1:5570
+[2337213] Extended attribute "protocol": version=2
+[2337213] Request upload-pack for '/repo.git'
+[2337213] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
+[2333618] [2337213] Disconnected (with error)
+fatal: remote error: access denied or repository not exported: /repo.git
+ok 18 - not exported
+
+Stopping git daemon ...
+Starting git daemon ...
+[2337298] Ready to rumble
+expecting success of 5570.19 'clone non-existent': test_remote_error    'no such repository'      clone nowhere.git
+[2337381] Connection from 127.0.0.1:60280
+[2337381] Extended attribute "host": 127.0.0.1:5570
+[2337381] Extended attribute "protocol": version=2
+[2337381] Request upload-pack for '/nowhere.git'
+[2337381] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
+[2337298] [2337381] 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
+[2337476] Connection from 127.0.0.1:60290
+[2337476] Extended attribute "host": 127.0.0.1:5570
+[2337476] Request receive-pack for '/repo.git'
+[2337476] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git'
+[2337298] [2337476] 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
+[2337551] Connection from 127.0.0.1:60294
+[2337551] Extended attribute "host": 127.0.0.1:5570
+[2337551] Extended attribute "protocol": version=2
+[2337551] Request upload-pack for '/repo.git'
+[2337551] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
+[2337298] [2337551] 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
+[2337604] Connection from 127.0.0.1:60300
+[2337604] Extended attribute "host": 127.0.0.1:5570
+[2337604] Extended attribute "protocol": version=2
+[2337604] Request upload-pack for '/repo.git'
+[2337604] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
+fatal: remote error: repository not exported: /repo.git
+[2337298] [2337604] Disconnected (with error)
+ok 22 - not exported
+
+Stopping git daemon ...
+Starting git daemon ...
+[2337682] 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" &&
+	git push "$repo" HEAD &&
+	>"$repo"/git-daemon-export-ok &&
+	GIT_OVERRIDE_VIRTUAL_HOST=localhost \
+		git ls-remote "$GIT_DAEMON_URL/interp.git" &&
+	GIT_OVERRIDE_VIRTUAL_HOST=LOCALHOST \
+		git ls-remote "$GIT_DAEMON_URL/interp.git"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/localhost/interp.git/
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/localhost/interp.git
+ * [new branch]      HEAD -> main
+[2337899] Connection from 127.0.0.1:60312
+[2337899] Extended attribute "host": localhost
+[2337899] Extended attribute "protocol": version=2
+[2337899] Request upload-pack for '/interp.git'
+[2337899] Interpolated dir '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
+5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
+[2337682] [2337899] Disconnected
+[2338116] Connection from 127.0.0.1:60324
+[2338116] Extended attribute "host": LOCALHOST
+[2338116] Extended attribute "protocol": version=2
+[2338116] Request upload-pack for '/interp.git'
+[2338116] Interpolated dir '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
+5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
+[2337682] [2338116] Disconnected
+ok 23 - access repo via interpolated hostname
+
+expecting success of 5570.24 'hostname cannot break out of directory': 
+	repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/../escape.git" &&
+	git init --bare "$repo" &&
+	git push "$repo" HEAD &&
+	>"$repo"/git-daemon-export-ok &&
+	test_must_fail \
+		env GIT_OVERRIDE_VIRTUAL_HOST=.. \
+		git ls-remote "$GIT_DAEMON_URL/escape.git"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/escape.git/
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/../escape.git
+ * [new branch]      HEAD -> main
+[2338511] Connection from 127.0.0.1:60338
+[2338511] Extended attribute "host": ..
+[2338511] Extended attribute "protocol": version=2
+[2338511] Request upload-pack for '/escape.git'
+[2338511] Interpolated dir '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo//escape.git'
+[2338511] '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo//escape.git' does not appear to be a git repository
+fatal: remote error: access denied or repository not exported: /escape.git
+ok 24 - hostname cannot break out of directory
+
+[2337682] [2338511] Disconnected (with error)
+checking prerequisite: FAKENC
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAKENC" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FAKENC" &&
+	perl -MIO::Socket::INET -e "exit 0"
+
+)
+prerequisite FAKENC ok
+expecting success of 5570.25 'hostname interpolation works after LF-stripping': 
+	{
+		printf "git-upload-pack /interp.git\n\0host=localhost" | packetize_raw &&
+		printf "0000"
+	} >input &&
+	fake_nc "$GIT_DAEMON_HOST_PORT" <input >output &&
+	depacketize <output >output.raw &&
+
+	# just pick out the value of main, which avoids any protocol
+	# particulars
+	perl -lne "print \$1 if m{^(\\S+) refs/heads/main}" <output.raw >actual &&
+	git -C "$repo" rev-parse main >expect &&
+	test_cmp expect actual
+
+[2338803] Connection from 127.0.0.1:60352
+[2338803] Extended attribute "host": localhost
+[2338803] Request upload-pack for '/interp.git'
+[2338803] Interpolated dir '/build/reproducible-path/git-2.51.0/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+[2337682] [2338803] Disconnected
+ok 25 - hostname interpolation works after LF-stripping
+
+Stopping git daemon ...
+# passed all 25 test(s)
+1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5582-fetch-negative-refspec.sh ***
@@ -369868,6 +370799,438 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5603-clone-dirname.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5603-clone-dirname/.git/
+expecting success of 5603.1 'setup ssh wrapper': 
+	write_script "$TRASH_DIRECTORY/ssh-wrapper" <<-\EOF &&
+	git upload-pack "$TRASH_DIRECTORY"
+	EOF
+	GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper" &&
+	GIT_SSH_VARIANT=ssh &&
+	export GIT_SSH &&
+	export GIT_SSH_VARIANT &&
+	export TRASH_DIRECTORY
+
+ok 1 - setup ssh wrapper
+
+expecting success of 5603.2 'clone of host:foo goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 2 - clone of host:foo goes to foo (non-bare)
+
+expecting success of 5603.3 'clone of host:foo goes to foo.git (bare)': 
+		rm -rf foo.git &&
+		git clone --bare host:foo &&
+		test_path_is_dir foo.git
+	
+Cloning into bare repository 'foo.git'...
+warning: You appear to have cloned an empty repository.
+ok 3 - clone of host:foo goes to foo.git (bare)
+
+expecting success of 5603.4 'clone of host:foo.git goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo.git &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 4 - clone of host:foo.git goes to foo (non-bare)
+
+expecting success of 5603.5 'clone of host:foo.git goes to foo.git (bare)': 
+		rm -rf foo.git &&
+		git clone --bare host:foo.git &&
+		test_path_is_dir foo.git
+	
+Cloning into bare repository 'foo.git'...
+warning: You appear to have cloned an empty repository.
+ok 5 - clone of host:foo.git goes to foo.git (bare)
+
+expecting success of 5603.6 'clone of host:foo/.git goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo/.git &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 6 - clone of host:foo/.git goes to foo (non-bare)
+
+expecting success of 5603.7 'clone of host:foo/.git goes to foo.git (bare)': 
+		rm -rf foo.git &&
+		git clone --bare host:foo/.git &&
+		test_path_is_dir foo.git
+	
+Cloning into bare repository 'foo.git'...
+warning: You appear to have cloned an empty repository.
+ok 7 - clone of host:foo/.git goes to foo.git (bare)
+
+expecting success of 5603.8 'clone of ssh://host/foo goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 8 - clone of ssh://host/foo goes to foo (non-bare)
+
+expecting success of 5603.9 'clone of ssh://host/foo goes to foo.git (bare)': 
+		rm -rf foo.git &&
+		git clone --bare ssh://host/foo &&
+		test_path_is_dir foo.git
+	
+Cloning into bare repository 'foo.git'...
+warning: You appear to have cloned an empty repository.
+ok 9 - clone of ssh://host/foo goes to foo.git (bare)
+
+expecting success of 5603.10 'clone of ssh://host/foo.git goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo.git &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 10 - clone of ssh://host/foo.git goes to foo (non-bare)
+
+expecting success of 5603.11 'clone of ssh://host/foo.git goes to foo.git (bare)': 
+		rm -rf foo.git &&
+		git clone --bare ssh://host/foo.git &&
+		test_path_is_dir foo.git
+	
+Cloning into bare repository 'foo.git'...
+warning: You appear to have cloned an empty repository.
+ok 11 - clone of ssh://host/foo.git goes to foo.git (bare)
+
+expecting success of 5603.12 'clone of ssh://host/foo/.git goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo/.git &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 12 - clone of ssh://host/foo/.git goes to foo (non-bare)
+
+expecting success of 5603.13 'clone of ssh://host/foo/.git goes to foo.git (bare)': 
+		rm -rf foo.git &&
+		git clone --bare ssh://host/foo/.git &&
+		test_path_is_dir foo.git
+	
+Cloning into bare repository 'foo.git'...
+warning: You appear to have cloned an empty repository.
+ok 13 - clone of ssh://host/foo/.git goes to foo.git (bare)
+
+expecting success of 5603.14 'clone of ssh://host/foo/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 14 - clone of ssh://host/foo/ goes to foo (non-bare)
+
+expecting success of 5603.15 'clone of ssh://host/foo/// goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo/// &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 15 - clone of ssh://host/foo/// goes to foo (non-bare)
+
+expecting success of 5603.16 'clone of ssh://host/foo/.git/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo/.git/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 16 - clone of ssh://host/foo/.git/ goes to foo (non-bare)
+
+expecting success of 5603.17 'clone of ssh://host/foo.git/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo.git/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 17 - clone of ssh://host/foo.git/ goes to foo (non-bare)
+
+expecting success of 5603.18 'clone of ssh://host/foo.git/// goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo.git/// &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 18 - clone of ssh://host/foo.git/// goes to foo (non-bare)
+
+expecting success of 5603.19 'clone of ssh://host/foo///.git/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo///.git/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 19 - clone of ssh://host/foo///.git/ goes to foo (non-bare)
+
+expecting success of 5603.20 'clone of ssh://host/foo/.git/// goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo/.git/// &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 20 - clone of ssh://host/foo/.git/// goes to foo (non-bare)
+
+expecting success of 5603.21 'clone of host:foo/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 21 - clone of host:foo/ goes to foo (non-bare)
+
+expecting success of 5603.22 'clone of host:foo/// goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo/// &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 22 - clone of host:foo/// goes to foo (non-bare)
+
+expecting success of 5603.23 'clone of host:foo.git/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo.git/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 23 - clone of host:foo.git/ goes to foo (non-bare)
+
+expecting success of 5603.24 'clone of host:foo/.git/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo/.git/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 24 - clone of host:foo/.git/ goes to foo (non-bare)
+
+expecting success of 5603.25 'clone of host:foo.git/// goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo.git/// &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 25 - clone of host:foo.git/// goes to foo (non-bare)
+
+expecting success of 5603.26 'clone of host:foo///.git/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo///.git/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 26 - clone of host:foo///.git/ goes to foo (non-bare)
+
+expecting success of 5603.27 'clone of host:foo/.git/// goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo/.git/// &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 27 - clone of host:foo/.git/// goes to foo (non-bare)
+
+expecting success of 5603.28 'clone of ssh://host/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  ssh://host/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 28 - clone of ssh://host/ goes to host (non-bare)
+
+expecting success of 5603.29 'clone of ssh://host:1234/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  ssh://host:1234/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 29 - clone of ssh://host:1234/ goes to host (non-bare)
+
+expecting success of 5603.30 'clone of ssh://user@host/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  ssh://user@host/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 30 - clone of ssh://user@host/ goes to host (non-bare)
+
+expecting success of 5603.31 'clone of host:/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  host:/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 31 - clone of host:/ goes to host (non-bare)
+
+expecting success of 5603.32 'clone of ssh://user:password@host/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  ssh://user:password@host/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 32 - clone of ssh://user:password@host/ goes to host (non-bare)
+
+expecting success of 5603.33 'clone of ssh://user:password@host:1234/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  ssh://user:password@host:1234/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 33 - clone of ssh://user:password@host:1234/ goes to host (non-bare)
+
+expecting success of 5603.34 'clone of ssh://user:passw@rd@host:1234/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  ssh://user:passw@rd@host:1234/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 34 - clone of ssh://user:passw@rd@host:1234/ goes to host (non-bare)
+
+expecting success of 5603.35 'clone of user@host:/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  user@host:/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 35 - clone of user@host:/ goes to host (non-bare)
+
+expecting success of 5603.36 'clone of user:password@host:/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  user:password@host:/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 36 - clone of user:password@host:/ goes to host (non-bare)
+
+expecting success of 5603.37 'clone of user:passw@rd@host:/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  user:passw@rd@host:/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 37 - clone of user:passw@rd@host:/ goes to host (non-bare)
+
+expecting success of 5603.38 'clone of ssh://host/foo@bar goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  ssh://host/foo@bar &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 38 - clone of ssh://host/foo@bar goes to foo@bar (non-bare)
+
+expecting success of 5603.39 'clone of ssh://host/foo@bar.git goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  ssh://host/foo@bar.git &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 39 - clone of ssh://host/foo@bar.git goes to foo@bar (non-bare)
+
+expecting success of 5603.40 'clone of ssh://user:password@host/foo@bar goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  ssh://user:password@host/foo@bar &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 40 - clone of ssh://user:password@host/foo@bar goes to foo@bar (non-bare)
+
+expecting success of 5603.41 'clone of ssh://user:passw@rd@host/foo@bar.git goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  ssh://user:passw@rd@host/foo@bar.git &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 41 - clone of ssh://user:passw@rd@host/foo@bar.git goes to foo@bar (non-bare)
+
+expecting success of 5603.42 'clone of host:/foo@bar goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  host:/foo@bar &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 42 - clone of host:/foo@bar goes to foo@bar (non-bare)
+
+expecting success of 5603.43 'clone of host:/foo@bar.git goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  host:/foo@bar.git &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 43 - clone of host:/foo@bar.git goes to foo@bar (non-bare)
+
+expecting success of 5603.44 'clone of user:password@host:/foo@bar goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  user:password@host:/foo@bar &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 44 - clone of user:password@host:/foo@bar goes to foo@bar (non-bare)
+
+expecting success of 5603.45 'clone of user:passw@rd@host:/foo@bar.git goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  user:passw@rd@host:/foo@bar.git &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 45 - clone of user:passw@rd@host:/foo@bar.git goes to foo@bar (non-bare)
+
+expecting success of 5603.46 'clone of ssh://user:password@host/test:1234 goes to 1234 (non-bare)': 
+		rm -rf 1234 &&
+		git clone  ssh://user:password@host/test:1234 &&
+		test_path_is_dir 1234
+	
+Cloning into '1234'...
+warning: You appear to have cloned an empty repository.
+ok 46 - clone of ssh://user:password@host/test:1234 goes to 1234 (non-bare)
+
+expecting success of 5603.47 'clone of ssh://user:password@host/test:1234.git goes to 1234 (non-bare)': 
+		rm -rf 1234 &&
+		git clone  ssh://user:password@host/test:1234.git &&
+		test_path_is_dir 1234
+	
+Cloning into '1234'...
+warning: You appear to have cloned an empty repository.
+ok 47 - clone of ssh://user:password@host/test:1234.git goes to 1234 (non-bare)
+
+# passed all 47 test(s)
+1..47
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5574-fetch-output.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5574-fetch-output/.git/
 expecting success of 5574.1 'fetch with invalid output format configuration': 
@@ -370606,441 +371969,94 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5603-clone-dirname.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5603-clone-dirname/.git/
-expecting success of 5603.1 'setup ssh wrapper': 
-	write_script "$TRASH_DIRECTORY/ssh-wrapper" <<-\EOF &&
-	git upload-pack "$TRASH_DIRECTORY"
-	EOF
-	GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper" &&
-	GIT_SSH_VARIANT=ssh &&
-	export GIT_SSH &&
-	export GIT_SSH_VARIANT &&
-	export TRASH_DIRECTORY
-
-ok 1 - setup ssh wrapper
-
-expecting success of 5603.2 'clone of host:foo goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 2 - clone of host:foo goes to foo (non-bare)
-
-expecting success of 5603.3 'clone of host:foo goes to foo.git (bare)': 
-		rm -rf foo.git &&
-		git clone --bare host:foo &&
-		test_path_is_dir foo.git
-	
-Cloning into bare repository 'foo.git'...
-warning: You appear to have cloned an empty repository.
-ok 3 - clone of host:foo goes to foo.git (bare)
-
-expecting success of 5603.4 'clone of host:foo.git goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo.git &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 4 - clone of host:foo.git goes to foo (non-bare)
-
-expecting success of 5603.5 'clone of host:foo.git goes to foo.git (bare)': 
-		rm -rf foo.git &&
-		git clone --bare host:foo.git &&
-		test_path_is_dir foo.git
-	
-Cloning into bare repository 'foo.git'...
-warning: You appear to have cloned an empty repository.
-ok 5 - clone of host:foo.git goes to foo.git (bare)
-
-expecting success of 5603.6 'clone of host:foo/.git goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo/.git &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 6 - clone of host:foo/.git goes to foo (non-bare)
-
-expecting success of 5603.7 'clone of host:foo/.git goes to foo.git (bare)': 
-		rm -rf foo.git &&
-		git clone --bare host:foo/.git &&
-		test_path_is_dir foo.git
-	
-Cloning into bare repository 'foo.git'...
-warning: You appear to have cloned an empty repository.
-ok 7 - clone of host:foo/.git goes to foo.git (bare)
-
-expecting success of 5603.8 'clone of ssh://host/foo goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 8 - clone of ssh://host/foo goes to foo (non-bare)
-
-expecting success of 5603.9 'clone of ssh://host/foo goes to foo.git (bare)': 
-		rm -rf foo.git &&
-		git clone --bare ssh://host/foo &&
-		test_path_is_dir foo.git
-	
-Cloning into bare repository 'foo.git'...
-warning: You appear to have cloned an empty repository.
-ok 9 - clone of ssh://host/foo goes to foo.git (bare)
-
-expecting success of 5603.10 'clone of ssh://host/foo.git goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo.git &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 10 - clone of ssh://host/foo.git goes to foo (non-bare)
-
-expecting success of 5603.11 'clone of ssh://host/foo.git goes to foo.git (bare)': 
-		rm -rf foo.git &&
-		git clone --bare ssh://host/foo.git &&
-		test_path_is_dir foo.git
-	
-Cloning into bare repository 'foo.git'...
-warning: You appear to have cloned an empty repository.
-ok 11 - clone of ssh://host/foo.git goes to foo.git (bare)
-
-expecting success of 5603.12 'clone of ssh://host/foo/.git goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo/.git &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 12 - clone of ssh://host/foo/.git goes to foo (non-bare)
-
-expecting success of 5603.13 'clone of ssh://host/foo/.git goes to foo.git (bare)': 
-		rm -rf foo.git &&
-		git clone --bare ssh://host/foo/.git &&
-		test_path_is_dir foo.git
-	
-Cloning into bare repository 'foo.git'...
-warning: You appear to have cloned an empty repository.
-ok 13 - clone of ssh://host/foo/.git goes to foo.git (bare)
-
-expecting success of 5603.14 'clone of ssh://host/foo/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 14 - clone of ssh://host/foo/ goes to foo (non-bare)
-
-expecting success of 5603.15 'clone of ssh://host/foo/// goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo/// &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 15 - clone of ssh://host/foo/// goes to foo (non-bare)
-
-expecting success of 5603.16 'clone of ssh://host/foo/.git/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo/.git/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 16 - clone of ssh://host/foo/.git/ goes to foo (non-bare)
-
-expecting success of 5603.17 'clone of ssh://host/foo.git/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo.git/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 17 - clone of ssh://host/foo.git/ goes to foo (non-bare)
-
-expecting success of 5603.18 'clone of ssh://host/foo.git/// goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo.git/// &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 18 - clone of ssh://host/foo.git/// goes to foo (non-bare)
-
-expecting success of 5603.19 'clone of ssh://host/foo///.git/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo///.git/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 19 - clone of ssh://host/foo///.git/ goes to foo (non-bare)
-
-expecting success of 5603.20 'clone of ssh://host/foo/.git/// goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo/.git/// &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 20 - clone of ssh://host/foo/.git/// goes to foo (non-bare)
-
-expecting success of 5603.21 'clone of host:foo/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 21 - clone of host:foo/ goes to foo (non-bare)
-
-expecting success of 5603.22 'clone of host:foo/// goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo/// &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 22 - clone of host:foo/// goes to foo (non-bare)
-
-expecting success of 5603.23 'clone of host:foo.git/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo.git/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 23 - clone of host:foo.git/ goes to foo (non-bare)
-
-expecting success of 5603.24 'clone of host:foo/.git/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo/.git/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 24 - clone of host:foo/.git/ goes to foo (non-bare)
-
-expecting success of 5603.25 'clone of host:foo.git/// goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo.git/// &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 25 - clone of host:foo.git/// goes to foo (non-bare)
-
-expecting success of 5603.26 'clone of host:foo///.git/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo///.git/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 26 - clone of host:foo///.git/ goes to foo (non-bare)
-
-expecting success of 5603.27 'clone of host:foo/.git/// goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo/.git/// &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 27 - clone of host:foo/.git/// goes to foo (non-bare)
-
-expecting success of 5603.28 'clone of ssh://host/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  ssh://host/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 28 - clone of ssh://host/ goes to host (non-bare)
-
-expecting success of 5603.29 'clone of ssh://host:1234/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  ssh://host:1234/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 29 - clone of ssh://host:1234/ goes to host (non-bare)
-
-expecting success of 5603.30 'clone of ssh://user@host/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  ssh://user@host/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 30 - clone of ssh://user@host/ goes to host (non-bare)
-
-expecting success of 5603.31 'clone of host:/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  host:/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 31 - clone of host:/ goes to host (non-bare)
-
-expecting success of 5603.32 'clone of ssh://user:password@host/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  ssh://user:password@host/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 32 - clone of ssh://user:password@host/ goes to host (non-bare)
-
-expecting success of 5603.33 'clone of ssh://user:password@host:1234/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  ssh://user:password@host:1234/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 33 - clone of ssh://user:password@host:1234/ goes to host (non-bare)
-
-expecting success of 5603.34 'clone of ssh://user:passw@rd@host:1234/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  ssh://user:passw@rd@host:1234/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 34 - clone of ssh://user:passw@rd@host:1234/ goes to host (non-bare)
+*** t5608-clone-2gb.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5609-clone-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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)
 
-expecting success of 5603.35 'clone of user@host:/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  user@host:/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 35 - clone of user@host:/ goes to host (non-bare)
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t5609-clone-branch/empty/.git/
+ok 1 - setup
 
-expecting success of 5603.36 'clone of user:password@host:/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  user:password@host:/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 36 - clone of user:password@host:/ goes to host (non-bare)
+expecting success of 5609.2 'vanilla clone chooses HEAD': 
+	git clone parent clone &&
+	(cd clone &&
+	 check_HEAD main &&
+	 check_file one
+	)
 
-expecting success of 5603.37 'clone of user:passw@rd@host:/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  user:passw@rd@host:/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 37 - clone of user:passw@rd@host:/ goes to host (non-bare)
+Cloning into 'clone'...
+done.
+ok 2 - vanilla clone chooses HEAD
 
-expecting success of 5603.38 'clone of ssh://host/foo@bar goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  ssh://host/foo@bar &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 38 - clone of ssh://host/foo@bar goes to foo@bar (non-bare)
+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
+	)
 
-expecting success of 5603.39 'clone of ssh://host/foo@bar.git goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  ssh://host/foo@bar.git &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 39 - clone of ssh://host/foo@bar.git goes to foo@bar (non-bare)
+Cloning into 'clone-two'...
+done.
+ok 3 - clone -b chooses specified branch
 
-expecting success of 5603.40 'clone of ssh://user:password@host/foo@bar goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  ssh://user:password@host/foo@bar &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 40 - clone of ssh://user:password@host/foo@bar goes to foo@bar (non-bare)
+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
+	)
 
-expecting success of 5603.41 'clone of ssh://user:passw@rd@host/foo@bar.git goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  ssh://user:passw@rd@host/foo@bar.git &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 41 - clone of ssh://user:passw@rd@host/foo@bar.git goes to foo@bar (non-bare)
+ok 4 - clone -b sets up tracking
 
-expecting success of 5603.42 'clone of host:/foo@bar goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  host:/foo@bar &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 42 - clone of host:/foo@bar goes to foo@bar (non-bare)
+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
+	)
 
-expecting success of 5603.43 'clone of host:/foo@bar.git goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  host:/foo@bar.git &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 43 - clone of host:/foo@bar.git goes to foo@bar (non-bare)
+ok 5 - clone -b does not munge remotes/origin/HEAD
 
-expecting success of 5603.44 'clone of user:password@host:/foo@bar goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  user:password@host:/foo@bar &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 44 - clone of user:password@host:/foo@bar goes to foo@bar (non-bare)
+expecting success of 5609.6 'clone -b with bogus branch': 
+	test_must_fail git clone -b bogus parent clone-bogus
 
-expecting success of 5603.45 'clone of user:passw@rd@host:/foo@bar.git goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  user:passw@rd@host:/foo@bar.git &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 45 - clone of user:passw@rd@host:/foo@bar.git goes to foo@bar (non-bare)
+Cloning into 'clone-bogus'...
+fatal: Remote branch bogus not found in upstream origin
+ok 6 - clone -b with bogus branch
 
-expecting success of 5603.46 'clone of ssh://user:password@host/test:1234 goes to 1234 (non-bare)': 
-		rm -rf 1234 &&
-		git clone  ssh://user:password@host/test:1234 &&
-		test_path_is_dir 1234
-	
-Cloning into '1234'...
-warning: You appear to have cloned an empty repository.
-ok 46 - clone of ssh://user:password@host/test:1234 goes to 1234 (non-bare)
+expecting success of 5609.7 'clone -b not allowed with empty repos': 
+	test_must_fail git clone -b branch empty clone-branch-empty
 
-expecting success of 5603.47 'clone of ssh://user:password@host/test:1234.git goes to 1234 (non-bare)': 
-		rm -rf 1234 &&
-		git clone  ssh://user:password@host/test:1234.git &&
-		test_path_is_dir 1234
-	
-Cloning into '1234'...
-warning: You appear to have cloned an empty repository.
-ok 47 - clone of ssh://user:password@host/test:1234.git goes to 1234 (non-bare)
+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 47 test(s)
-1..47
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5608-clone-2gb.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5608-clone-2gb/.git/
-1..0 # SKIP expensive 2GB clone test; enable with GIT_TEST_CLONE_2GB=true
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5606-clone-options.sh ***
@@ -371261,7 +372277,7 @@
 
 
 remote: Counting objects:  33% (1/3)        
remote: Counting objects:  66% (2/3)        
remote: Counting objects: 100% (3/3)        
remote: Counting objects: 100% (3/3), done.        
-Receiving objects:  33% (1/3)
Receiving objects:  66% (2/3)
Receiving objects: 100% (3/3)
Receiving objects: 100% (3/3), 214 bytes | 214.00 KiB/s, done.
+Receiving objects:  33% (1/3)
Receiving objects:  66% (2/3)
Receiving objects: 100% (3/3)
Receiving objects: 100% (3/3), done.
 ok 18 - redirected clone -v does show progress
 
 expecting success of 5606.19 'clone does not segfault with --bare and core.bare=false': 
@@ -371331,91 +372347,6 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5609-clone-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5610-clone-detached.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5610-clone-detached/.git/
 expecting success of 5610.1 'setup': 
@@ -371610,6 +372541,170 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5611-clone-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5607-clone-bundle.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5607-clone-bundle/.git/
 expecting success of 5607.1 'setup': 
@@ -371925,252 +373020,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5611-clone-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5615-alternate-env.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5615-alternate-env/.git/
-expecting success of 5615.1 'create alternate repositories': 
-	git init --bare one.git &&
-	one=$(echo one | git -C one.git hash-object -w --stdin) &&
-	git init --bare two.git &&
-	two=$(echo two | git -C two.git hash-object -w --stdin)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5615-alternate-env/one.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5615-alternate-env/two.git/
-ok 1 - create alternate repositories
-
-expecting success of 5615.2 'objects inaccessible without alternates': 
-	check_obj "" <<-EOF
-	$one missing
-	$two missing
-	EOF
-
-ok 2 - objects inaccessible without alternates
-
-expecting success of 5615.3 'access alternate via absolute path': 
-	check_obj "$PWD/one.git/objects" <<-EOF
-	$one blob
-	$two missing
-	EOF
-
-ok 3 - access alternate via absolute path
-
-expecting success of 5615.4 'access multiple alternates': 
-	check_obj "$PWD/one.git/objects:$PWD/two.git/objects" <<-EOF
-	$one blob
-	$two blob
-	EOF
-
-ok 4 - access multiple alternates
-
-expecting success of 5615.5 'access alternate via relative path (bare)': 
-	git init --bare bare.git &&
-	check_obj "../one.git/objects" -C bare.git <<-EOF
-	$one blob
-	EOF
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5615-alternate-env/bare.git/
-ok 5 - access alternate via relative path (bare)
-
-expecting success of 5615.6 'access alternate via relative path (worktree)': 
-	git init worktree &&
-	check_obj "../one.git/objects" -C worktree <<-EOF
-	$one blob
-	EOF
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5615-alternate-env/worktree/.git/
-ok 6 - access alternate via relative path (worktree)
-
-expecting success of 5615.7 'access alternate via relative path (subdir)': 
-	mkdir subdir &&
-	check_obj "one.git/objects" -C subdir <<-EOF
-	$one blob
-	EOF
-
-ok 7 - access alternate via relative path (subdir)
-
-expecting success of 5615.8 'mix of quoted and unquoted alternates': 
-	check_obj "$quoted:$unquoted" <<-EOF
-	$one blob
-	$two blob
-	EOF
-
-ok 8 - mix of quoted and unquoted alternates
-
-expecting success of 5615.9 'broken quoting falls back to interpreting raw': 
-	mv one.git \"one.git &&
-	check_obj \"one.git/objects <<-EOF
-	$one blob
-	EOF
-
-ok 9 - broken quoting falls back to interpreting raw
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5604-clone-reference.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5604-clone-reference/.git/
 expecting success of 5604.1 'preparing first repository': 
@@ -372708,6 +373557,88 @@
 1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5615-alternate-env.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5615-alternate-env/.git/
+expecting success of 5615.1 'create alternate repositories': 
+	git init --bare one.git &&
+	one=$(echo one | git -C one.git hash-object -w --stdin) &&
+	git init --bare two.git &&
+	two=$(echo two | git -C two.git hash-object -w --stdin)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5615-alternate-env/one.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5615-alternate-env/two.git/
+ok 1 - create alternate repositories
+
+expecting success of 5615.2 'objects inaccessible without alternates': 
+	check_obj "" <<-EOF
+	$one missing
+	$two missing
+	EOF
+
+ok 2 - objects inaccessible without alternates
+
+expecting success of 5615.3 'access alternate via absolute path': 
+	check_obj "$PWD/one.git/objects" <<-EOF
+	$one blob
+	$two missing
+	EOF
+
+ok 3 - access alternate via absolute path
+
+expecting success of 5615.4 'access multiple alternates': 
+	check_obj "$PWD/one.git/objects:$PWD/two.git/objects" <<-EOF
+	$one blob
+	$two blob
+	EOF
+
+ok 4 - access multiple alternates
+
+expecting success of 5615.5 'access alternate via relative path (bare)': 
+	git init --bare bare.git &&
+	check_obj "../one.git/objects" -C bare.git <<-EOF
+	$one blob
+	EOF
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5615-alternate-env/bare.git/
+ok 5 - access alternate via relative path (bare)
+
+expecting success of 5615.6 'access alternate via relative path (worktree)': 
+	git init worktree &&
+	check_obj "../one.git/objects" -C worktree <<-EOF
+	$one blob
+	EOF
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5615-alternate-env/worktree/.git/
+ok 6 - access alternate via relative path (worktree)
+
+expecting success of 5615.7 'access alternate via relative path (subdir)': 
+	mkdir subdir &&
+	check_obj "one.git/objects" -C subdir <<-EOF
+	$one blob
+	EOF
+
+ok 7 - access alternate via relative path (subdir)
+
+expecting success of 5615.8 'mix of quoted and unquoted alternates': 
+	check_obj "$quoted:$unquoted" <<-EOF
+	$one blob
+	$two blob
+	EOF
+
+ok 8 - mix of quoted and unquoted alternates
+
+expecting success of 5615.9 'broken quoting falls back to interpreting raw': 
+	mv one.git \"one.git &&
+	check_obj \"one.git/objects <<-EOF
+	$one blob
+	EOF
+
+ok 9 - broken quoting falls back to interpreting raw
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5613-info-alternate.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5613-info-alternate/.git/
 expecting success of 5613.1 'preparing first repository': 
@@ -373184,8 +374115,8 @@
 	! test_cmp expect actual &&
 	test_line_count = 2 actual
 
---- expect	2025-08-27 08:21:59.888060445 +0000
-+++ actual	2025-08-27 08:21:59.884060418 +0000
+--- expect	2026-09-29 14:53:04.158548970 +0000
++++ actual	2026-09-29 14:53:04.138548970 +0000
 @@ -1,2 +1,2 @@
  0c9f2ac7142a96473515181c5d9c2ce77c5ea4ed commit	refs/tags/five
 -5efd04f7018dafa5c97b7431a71f14902ebbdf7e commit	refs/tags/two
@@ -373607,28 +374538,230 @@
 	test_when_finished "rm -rf dst" &&
 	test_must_fail git clone --revision=refs/heads/main^ . dst
 
-Cloning into 'dst'...
-fatal: invalid refspec 'refs/heads/main^'
-ok 10 - clone with --revision being the parent of a ref fails
+Cloning into 'dst'...
+fatal: invalid refspec 'refs/heads/main^'
+ok 10 - clone with --revision being the parent of a ref fails
+
+expecting success of 5621.11 'clone with --revision and --branch fails': 
+	test_when_finished "rm -rf dst" &&
+	test_must_fail git clone --revision=refs/heads/main --branch=main . dst
+
+Cloning into 'dst'...
+fatal: options '--revision' and '--branch' cannot be used together
+ok 11 - clone with --revision and --branch fails
+
+expecting success of 5621.12 'clone with --revision and --mirror fails': 
+	test_when_finished "rm -rf dst" &&
+	test_must_fail git clone --revision=refs/heads/main --mirror . dst
+
+Cloning into bare repository 'dst'...
+fatal: options '--revision' and '--mirror' cannot be used together
+ok 12 - clone with --revision and --mirror fails
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5614-clone-submodules-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/.git/
+expecting success of 5614.1 'setup': 
+	git checkout -b main &&
+	test_commit commit1 &&
+	test_commit commit2 &&
+	mkdir sub &&
+	(
+		cd sub &&
+		git init &&
+		test_commit subcommit1 &&
+		test_commit subcommit2 &&
+		test_commit subcommit3
+	) &&
+	git submodule add "file://$pwd/sub" sub &&
+	git commit -m "add submodule"
+
+Switched to a new branch 'main'
+[main (root-commit) ef004cf] commit1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit1.t
+[main 94955c5] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit2.t
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub/.git/
+[master (root-commit) 6a80c79] subcommit1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subcommit1.t
+[master f6b6be8] subcommit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subcommit2.t
+[master 5334747] subcommit3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subcommit3.t
+Adding existing repo at 'sub' to the index
+[main 709781b] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 1 - setup
+
+expecting success of 5614.2 'nonshallow clone implies nonshallow submodule': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git clone --recurse-submodules "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 3 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 3 lines
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 2 - nonshallow clone implies nonshallow submodule
+
+expecting success of 5614.3 'shallow clone with shallow submodule': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git clone --recurse-submodules --depth 2 --shallow-submodules "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 2 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 1 lines
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 3 - shallow clone with shallow submodule
+
+expecting success of 5614.4 'shallow clone does not imply shallow submodule': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git clone --recurse-submodules --depth 2 "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 2 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 3 lines
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 4 - shallow clone does not imply shallow submodule
+
+expecting success of 5614.5 'shallow clone with non shallow submodule': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git clone --recurse-submodules --depth 2 --no-shallow-submodules "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 2 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 3 lines
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 5 - shallow clone with non shallow submodule
+
+expecting success of 5614.6 'non shallow clone with shallow submodule': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git clone --recurse-submodules --no-local --shallow-submodules "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 3 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 1 lines
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 6 - non shallow clone with shallow submodule
+
+expecting success of 5614.7 'clone follows shallow recommendation': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git config -f .gitmodules submodule.sub.shallow true &&
+	git add .gitmodules &&
+	git commit -m "recommend shallow for sub" &&
+	git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
+	(
+		cd super_clone &&
+		git log --oneline >lines &&
+		test_line_count = 4 lines
+	) &&
+	(
+		cd super_clone/sub &&
+		git log --oneline >lines &&
+		test_line_count = 1 lines
+	)
+
+[main 9fded00] recommend shallow for sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 7 - clone follows shallow recommendation
 
-expecting success of 5621.11 'clone with --revision and --branch fails': 
-	test_when_finished "rm -rf dst" &&
-	test_must_fail git clone --revision=refs/heads/main --branch=main . dst
+expecting success of 5614.8 'get unshallow recommended shallow submodule': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git clone --no-local "file://$pwd/." super_clone &&
+	(
+		cd super_clone &&
+		git submodule update --init --no-recommend-shallow &&
+		git log --oneline >lines &&
+		test_line_count = 4 lines
+	) &&
+	(
+		cd super_clone/sub &&
+		git log --oneline >lines &&
+		test_line_count = 3 lines
+	)
 
-Cloning into 'dst'...
-fatal: options '--revision' and '--branch' cannot be used together
-ok 11 - clone with --revision and --branch fails
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 8 - get unshallow recommended shallow submodule
 
-expecting success of 5621.12 'clone with --revision and --mirror fails': 
-	test_when_finished "rm -rf dst" &&
-	test_must_fail git clone --revision=refs/heads/main --mirror . dst
+expecting success of 5614.9 'clone follows non shallow recommendation': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git config -f .gitmodules submodule.sub.shallow false &&
+	git add .gitmodules &&
+	git commit -m "recommend non shallow for sub" &&
+	git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
+	(
+		cd super_clone &&
+		git log --oneline >lines &&
+		test_line_count = 5 lines
+	) &&
+	(
+		cd super_clone/sub &&
+		git log --oneline >lines &&
+		test_line_count = 3 lines
+	)
 
-Cloning into bare repository 'dst'...
-fatal: options '--revision' and '--mirror' cannot be used together
-ok 12 - clone with --revision and --mirror fails
+[main bad94bd] recommend non shallow for sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 9 - clone follows non shallow recommendation
 
-# passed all 12 test(s)
-1..12
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5620-backfill.sh ***
@@ -373733,7 +374866,7 @@
 	test_line_count = 0 revs2
 
 Cloning into 'backfill1'...
-{"event":"data","sid":"20250827T082201.054449Z-Hcf858c9d-P000aa948","thread":"main","time":"2025-08-27T08:22:01.060861Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.006621,"t_rel":0.006621,"nesting":1,"category":"promisor","key":"fetch_count","value":"48"}
+{"event":"data","sid":"20260929T145304.895905Z-H5c947e1c-P0023d44a","thread":"main","time":"2026-09-29T14:53:04.898812Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.003116,"t_rel":0.003116,"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': 
@@ -373754,7 +374887,7 @@
 	test_line_count = 0 revs2
 
 Cloning into 'backfill2'...
-{"event":"data","sid":"20250827T082201.169852Z-Hcf858c9d-P000aaa72","thread":"main","time":"2025-08-27T08:22:01.245267Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.075607,"t_rel":0.075607,"nesting":1,"category":"promisor","key":"fetch_count","value":"8"}
+{"event":"data","sid":"20260929T145304.969468Z-H5c947e1c-P0023d5ac","thread":"main","time":"2026-09-29T14:53:05.014584Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.045328,"t_rel":0.045328,"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': 
@@ -373802,10 +374935,10 @@
 	test_line_count = 0 missing
 
 Cloning into 'backfill3'...
-{"event":"data","sid":"20250827T082201.430894Z-Hcf858c9d-P000aad2f","thread":"main","time":"2025-08-27T08:22:01.438783Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.008068,"t_rel":0.008068,"nesting":1,"category":"promisor","key":"fetch_count","value":"4"}
-{"event":"data","sid":"20250827T082201.430894Z-Hcf858c9d-P000aad2f","thread":"main","time":"2025-08-27T08:22:01.432254Z","file":"path-walk.c","line":592,"repo":1,"t_abs":0.001543,"t_rel":0.000105,"nesting":2,"category":"path-walk","key":"paths","value":"5"}
-{"event":"data","sid":"20250827T082201.555595Z-Hcf858c9d-P000aae84","thread":"main","time":"2025-08-27T08:22:01.561795Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.009309,"t_rel":0.009309,"nesting":1,"category":"promisor","key":"fetch_count","value":"8"}
-{"event":"data","sid":"20250827T082201.555595Z-Hcf858c9d-P000aae84","thread":"main","time":"2025-08-27T08:22:01.560945Z","file":"path-walk.c","line":592,"repo":1,"t_abs":0.008461,"t_rel":0.000228,"nesting":2,"category":"path-walk","key":"paths","value":"15"}
+{"event":"data","sid":"20260929T145305.152022Z-H5c947e1c-P0023d847","thread":"main","time":"2026-09-29T14:53:05.154079Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.002258,"t_rel":0.002258,"nesting":1,"category":"promisor","key":"fetch_count","value":"4"}
+{"event":"data","sid":"20260929T145305.152022Z-H5c947e1c-P0023d847","thread":"main","time":"2026-09-29T14:53:05.153352Z","file":"path-walk.c","line":592,"repo":1,"t_abs":0.001533,"t_rel":0.000111,"nesting":2,"category":"path-walk","key":"paths","value":"5"}
+{"event":"data","sid":"20260929T145305.221508Z-H5c947e1c-P0023d93d","thread":"main","time":"2026-09-29T14:53:05.225236Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.003969,"t_rel":0.003969,"nesting":1,"category":"promisor","key":"fetch_count","value":"8"}
+{"event":"data","sid":"20260929T145305.221508Z-H5c947e1c-P0023d93d","thread":"main","time":"2026-09-29T14:53:05.222947Z","file":"path-walk.c","line":592,"repo":1,"t_abs":0.001683,"t_rel":0.000211,"nesting":2,"category":"path-walk","key":"paths","value":"15"}
 ok 6 - backfill --sparse
 
 expecting success of 5620.7 'backfill --sparse without cone mode (positive)': 
@@ -373838,8 +374971,8 @@
 Cloning into 'backfill4'...
 Already on 'main'
 Your branch is up to date with 'origin/main'.
-{"event":"data","sid":"20250827T082201.786762Z-Hcf858c9d-P000ab0f9","thread":"main","time":"2025-08-27T08:22:01.794802Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.008235,"t_rel":0.008235,"nesting":1,"category":"promisor","key":"fetch_count","value":"6"}
-{"event":"data","sid":"20250827T082201.786762Z-Hcf858c9d-P000ab0f9","thread":"main","time":"2025-08-27T08:22:01.788105Z","file":"path-walk.c","line":592,"repo":1,"t_abs":0.001539,"t_rel":0.000221,"nesting":2,"category":"path-walk","key":"paths","value":"12"}
+{"event":"data","sid":"20260929T145305.399518Z-H5c947e1c-P0023dbe2","thread":"main","time":"2026-09-29T14:53:05.403272Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.003972,"t_rel":0.003972,"nesting":1,"category":"promisor","key":"fetch_count","value":"6"}
+{"event":"data","sid":"20260929T145305.399518Z-H5c947e1c-P0023dbe2","thread":"main","time":"2026-09-29T14:53:05.400974Z","file":"path-walk.c","line":592,"repo":1,"t_abs":0.001676,"t_rel":0.000259,"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)': 
@@ -373873,8 +375006,8 @@
 Cloning into 'backfill5'...
 Already on 'main'
 Your branch is up to date with 'origin/main'.
-{"event":"data","sid":"20250827T082202.001055Z-Hcf858c9d-P000ab31c","thread":"main","time":"2025-08-27T08:22:02.003846Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.003008,"t_rel":0.003008,"nesting":1,"category":"promisor","key":"fetch_count","value":"18"}
-{"event":"data","sid":"20250827T082202.001055Z-Hcf858c9d-P000ab31c","thread":"main","time":"2025-08-27T08:22:02.002477Z","file":"path-walk.c","line":592,"repo":1,"t_abs":0.001642,"t_rel":0.000266,"nesting":2,"category":"path-walk","key":"paths","value":"24"}
+{"event":"data","sid":"20260929T145305.540358Z-H5c947e1c-P0023dddc","thread":"main","time":"2026-09-29T14:53:05.542564Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.002410,"t_rel":0.002410,"nesting":1,"category":"promisor","key":"fetch_count","value":"18"}
+{"event":"data","sid":"20260929T145305.540358Z-H5c947e1c-P0023dddc","thread":"main","time":"2026-09-29T14:53:05.541805Z","file":"path-walk.c","line":592,"repo":1,"t_abs":0.001652,"t_rel":0.000271,"nesting":2,"category":"path-walk","key":"paths","value":"24"}
 ok 8 - backfill --sparse without cone mode (negative)
 
 checking prerequisite: NOT_ROOT
@@ -373892,208 +375025,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5614-clone-submodules-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/.git/
-expecting success of 5614.1 'setup': 
-	git checkout -b main &&
-	test_commit commit1 &&
-	test_commit commit2 &&
-	mkdir sub &&
-	(
-		cd sub &&
-		git init &&
-		test_commit subcommit1 &&
-		test_commit subcommit2 &&
-		test_commit subcommit3
-	) &&
-	git submodule add "file://$pwd/sub" sub &&
-	git commit -m "add submodule"
-
-Switched to a new branch 'main'
-[main (root-commit) ef004cf] commit1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit1.t
-[main 94955c5] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit2.t
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub/.git/
-[master (root-commit) 6a80c79] subcommit1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subcommit1.t
-[master f6b6be8] subcommit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subcommit2.t
-[master 5334747] subcommit3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subcommit3.t
-Adding existing repo at 'sub' to the index
-[main 709781b] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 1 - setup
-
-expecting success of 5614.2 'nonshallow clone implies nonshallow submodule': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git clone --recurse-submodules "file://$pwd/." super_clone &&
-	git -C super_clone log --oneline >lines &&
-	test_line_count = 3 lines &&
-	git -C super_clone/sub log --oneline >lines &&
-	test_line_count = 3 lines
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 2 - nonshallow clone implies nonshallow submodule
-
-expecting success of 5614.3 'shallow clone with shallow submodule': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git clone --recurse-submodules --depth 2 --shallow-submodules "file://$pwd/." super_clone &&
-	git -C super_clone log --oneline >lines &&
-	test_line_count = 2 lines &&
-	git -C super_clone/sub log --oneline >lines &&
-	test_line_count = 1 lines
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 3 - shallow clone with shallow submodule
-
-expecting success of 5614.4 'shallow clone does not imply shallow submodule': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git clone --recurse-submodules --depth 2 "file://$pwd/." super_clone &&
-	git -C super_clone log --oneline >lines &&
-	test_line_count = 2 lines &&
-	git -C super_clone/sub log --oneline >lines &&
-	test_line_count = 3 lines
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 4 - shallow clone does not imply shallow submodule
-
-expecting success of 5614.5 'shallow clone with non shallow submodule': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git clone --recurse-submodules --depth 2 --no-shallow-submodules "file://$pwd/." super_clone &&
-	git -C super_clone log --oneline >lines &&
-	test_line_count = 2 lines &&
-	git -C super_clone/sub log --oneline >lines &&
-	test_line_count = 3 lines
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 5 - shallow clone with non shallow submodule
-
-expecting success of 5614.6 'non shallow clone with shallow submodule': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git clone --recurse-submodules --no-local --shallow-submodules "file://$pwd/." super_clone &&
-	git -C super_clone log --oneline >lines &&
-	test_line_count = 3 lines &&
-	git -C super_clone/sub log --oneline >lines &&
-	test_line_count = 1 lines
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 6 - non shallow clone with shallow submodule
-
-expecting success of 5614.7 'clone follows shallow recommendation': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git config -f .gitmodules submodule.sub.shallow true &&
-	git add .gitmodules &&
-	git commit -m "recommend shallow for sub" &&
-	git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
-	(
-		cd super_clone &&
-		git log --oneline >lines &&
-		test_line_count = 4 lines
-	) &&
-	(
-		cd super_clone/sub &&
-		git log --oneline >lines &&
-		test_line_count = 1 lines
-	)
-
-[main 9fded00] recommend shallow for sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 7 - clone follows shallow recommendation
-
-expecting success of 5614.8 'get unshallow recommended shallow submodule': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git clone --no-local "file://$pwd/." super_clone &&
-	(
-		cd super_clone &&
-		git submodule update --init --no-recommend-shallow &&
-		git log --oneline >lines &&
-		test_line_count = 4 lines
-	) &&
-	(
-		cd super_clone/sub &&
-		git log --oneline >lines &&
-		test_line_count = 3 lines
-	)
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 8 - get unshallow recommended shallow submodule
-
-expecting success of 5614.9 'clone follows non shallow recommendation': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git config -f .gitmodules submodule.sub.shallow false &&
-	git add .gitmodules &&
-	git commit -m "recommend non shallow for sub" &&
-	git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
-	(
-		cd super_clone &&
-		git log --oneline >lines &&
-		test_line_count = 5 lines
-	) &&
-	(
-		cd super_clone/sub &&
-		git log --oneline >lines &&
-		test_line_count = 3 lines
-	)
-
-[main bad94bd] recommend non shallow for sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 9 - clone follows non shallow recommendation
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5617-clone-submodules-remote.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5617-clone-submodules-remote/.git/
 expecting success of 5617.1 'setup': 
@@ -374799,7 +375730,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[698628] Ready to rumble
+[2348571] 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
@@ -374824,11 +375755,11 @@
 	# Server responded using protocol v1
 	grep "clone< version 1" log
 
-[698736] Connection from 127.0.0.1:45864
-[698736] Extended attribute "host": 127.0.0.1:5700
-[698736] Extended attribute "protocol": version=1
-[698736] Request upload-pack for '/parent'
-[698628] [698736] Disconnected
+[2348722] Connection from 127.0.0.1:54218
+[2348722] Extended attribute "host": 127.0.0.1:5700
+[2348722] Extended attribute "protocol": version=1
+[2348722] Request upload-pack for '/parent'
+[2348571] [2348722] 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
@@ -374852,11 +375783,11 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-[699073] Connection from 127.0.0.1:45868
-[699073] Extended attribute "host": 127.0.0.1:5700
-[699073] Extended attribute "protocol": version=1
-[699073] Request upload-pack for '/parent'
-[698628] [699073] Disconnected
+[2349118] Connection from 127.0.0.1:54226
+[2349118] Extended attribute "host": 127.0.0.1:5700
+[2349118] Extended attribute "protocol": version=1
+[2349118] Request upload-pack for '/parent'
+[2348571] [2349118] 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
@@ -374874,11 +375805,11 @@
 	# Server responded using protocol v1
 	grep "fetch< version 1" log
 
-[699429] Connection from 127.0.0.1:45876
-[699429] Extended attribute "host": 127.0.0.1:5700
-[699429] Extended attribute "protocol": version=1
-[699429] Request upload-pack for '/parent'
-[698628] [699429] Disconnected
+[2349533] Connection from 127.0.0.1:54232
+[2349533] Extended attribute "host": 127.0.0.1:5700
+[2349533] Extended attribute "protocol": version=1
+[2349533] Request upload-pack for '/parent'
+[2348571] [2349533] Disconnected
 Updating d79ce16..139b20d
 Fast-forward
  two.t | 1 +
@@ -374909,17 +375840,16 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 three.t
-[699739] Connection from 127.0.0.1:45880
-[699739] Extended attribute "host": 127.0.0.1:5700
-[699739] Extended attribute "protocol": version=1
-[699739] Request receive-pack for '/parent'
-[698628] [699739] Disconnected
+[2349812] Connection from 127.0.0.1:54244
+[2349812] Extended attribute "host": 127.0.0.1:5700
+[2349812] Extended attribute "protocol": version=1
+[2349812] Request receive-pack for '/parent'
+[2348571] [2349812] 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 ...
-Terminated
 expecting success of 5700.6 'create repo to be served by file:// transport': 
 	git init file_parent &&
 	test_commit -C file_parent one
@@ -375161,203 +376091,6 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5601-clone.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5601-clone/.git/
 expecting success of 5601.1 'setup': 
@@ -376895,6 +377628,217 @@
 1..109
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5552-skipping-fetch-negotiator.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5552-skipping-fetch-negotiator/.git/
 expecting success of 5552.1 'fetch.negotiationalgorithm config': 
@@ -378239,885 +379183,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5703-upload-pack-ref-in-want.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/.git/
-expecting success of 5703.1 'setup repository': 
-	test_commit a &&
-	git branch -M main &&
-	git checkout -b o/foo &&
-	test_commit b &&
-	test_commit c &&
-	git checkout -b o/bar b &&
-	test_commit d &&
-	git checkout -b baz a &&
-	test_commit e &&
-	git checkout main &&
-	test_commit f
-
-[master (root-commit) ce450c7] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-Switched to a new branch 'o/foo'
-[o/foo 020ea9b] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-[o/foo d9ea348] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Switched to a new branch 'o/bar'
-[o/bar 1bd0260] d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-Switched to a new branch 'baz'
-[baz 10e5ce2] e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 e.t
-Switched to branch 'main'
-[main 0e847a7] f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f.t
-ok 1 - setup repository
-
-expecting success of 5703.2 'config controls ref-in-want advertisement': 
-	test-tool serve-v2 --advertise-capabilities >out &&
-	test_grep ! "ref-in-want" out &&
-
-	git config uploadpack.allowRefInWant false &&
-	test-tool serve-v2 --advertise-capabilities >out &&
-	test_grep ! "ref-in-want" out &&
-
-	git config uploadpack.allowRefInWant true &&
-	test-tool serve-v2 --advertise-capabilities >out &&
-	test_grep "ref-in-want" out
-
-002cfetch=shallow wait-for-done ref-in-want
-ok 2 - config controls ref-in-want advertisement
-
-expecting success of 5703.3 'invalid want-ref line': 
-	write_fetch_command >pkt <<-EOF &&
-	want-ref refs/heads/non-existent
-	EOF
-
-	test-tool pkt-line pack <pkt >in &&
-	test_must_fail test-tool serve-v2 --stateless-rpc 2>out <in &&
-	grep "unknown ref" out
-
-002bERR unknown ref refs/heads/non-existentfatal: unknown ref refs/heads/non-existent
-ok 3 - invalid want-ref line
-
-expecting success of 5703.4 'basic want-ref': 
-	oid=$(git rev-parse f) &&
-	cat >expected_refs <<-EOF &&
-	$oid refs/heads/main
-	EOF
-	git rev-parse f >expected_commits &&
-
-	write_fetch_command >pkt <<-EOF &&
-	want-ref refs/heads/main
-	have $(git rev-parse a)
-	EOF
-	test-tool pkt-line pack <pkt >in &&
-
-	test-tool serve-v2 --stateless-rpc >out <in &&
-	check_output
-
-2cd455c37d1f88f1dd99c20a05dc00950e0b98e4
-ok 4 - basic want-ref
-
-expecting success of 5703.5 'multiple want-ref lines': 
-	oid_c=$(git rev-parse c) &&
-	oid_d=$(git rev-parse d) &&
-	cat >expected_refs <<-EOF &&
-	$oid_c refs/heads/o/foo
-	$oid_d refs/heads/o/bar
-	EOF
-	git rev-parse c d >expected_commits &&
-
-	write_fetch_command >pkt <<-EOF &&
-	want-ref refs/heads/o/foo
-	want-ref refs/heads/o/bar
-	have $(git rev-parse b)
-	EOF
-	test-tool pkt-line pack <pkt >in &&
-
-	test-tool serve-v2 --stateless-rpc >out <in &&
-	check_output
-
-ef76e7a7b2817dc4a77b2e06e9b82a4f147b87d7
-ok 5 - multiple want-ref lines
-
-expecting success of 5703.6 'mix want and want-ref': 
-	oid=$(git rev-parse f) &&
-	cat >expected_refs <<-EOF &&
-	$oid refs/heads/main
-	EOF
-	git rev-parse e f >expected_commits &&
-
-	write_fetch_command >pkt <<-EOF &&
-	want-ref refs/heads/main
-	want $(git rev-parse e)
-	have $(git rev-parse a)
-	EOF
-	test-tool pkt-line pack <pkt >in &&
-
-	test-tool serve-v2 --stateless-rpc >out <in &&
-	check_output
-
-a3b2910e2bc93b88442ed713e2d9bfba846dfb4a
-ok 6 - mix want and want-ref
-
-expecting success of 5703.7 'want-ref with ref we already have commit for': 
-	oid=$(git rev-parse c) &&
-	cat >expected_refs <<-EOF &&
-	$oid refs/heads/o/foo
-	EOF
-	>expected_commits &&
-
-	write_fetch_command >pkt <<-EOF &&
-	want-ref refs/heads/o/foo
-	have $(git rev-parse c)
-	EOF
-	test-tool pkt-line pack <pkt >in &&
-
-	test-tool serve-v2 --stateless-rpc >out <in &&
-	check_output
-
-029d08823bd8a8eab510ad6ac75c823cfd3ed31e
-ok 7 - want-ref with ref we already have commit for
-
-expecting success of 5703.8 'setup repos for fetching with ref-in-want tests': 
-	(
-		git init -b main "$REPO" &&
-		cd "$REPO" &&
-		test_commit a &&
-
-		# Local repo with many commits (so that negotiation will take
-		# more than 1 request/response pair)
-		rm -rf "$LOCAL_PRISTINE" &&
-		git clone "file://$REPO" "$LOCAL_PRISTINE" &&
-		cd "$LOCAL_PRISTINE" &&
-		git checkout -b side &&
-		test_commit_bulk --id=s 33 &&
-
-		# Add novel commits to upstream
-		git checkout main &&
-		cd "$REPO" &&
-		git checkout -b o/foo &&
-		test_commit b &&
-		test_commit c &&
-		git checkout -b o/bar b &&
-		test_commit d &&
-		git checkout -b baz a &&
-		test_commit e &&
-		git checkout main &&
-		test_commit f
-	) &&
-	git -C "$REPO" config uploadpack.allowRefInWant true &&
-	git -C "$LOCAL_PRISTINE" config protocol.version 2
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/repo/.git/
-[main (root-commit) 4f50377] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/local_pristine'...
-Switched to a new branch 'side'
-4f50377a42e4bea2b0e56d986e7fe2da43d41a69
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           99 (         0 duplicates                  )
-      blobs  :           33 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           33 (         0 duplicates         32 deltas of         32 attempts)
-      commits:           33 (         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            =         38
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       7553 /       7553
----------------------------------------------------------------------
-
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-Switched to a new branch 'o/foo'
-[o/foo f403802] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-[o/foo e460426] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Switched to a new branch 'o/bar'
-[o/bar 2aa4ae0] d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-Switched to a new branch 'baz'
-[baz 882e407] e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 e.t
-Switched to branch 'main'
-[main cb86d32] f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f.t
-ok 8 - setup repos for fetching with ref-in-want tests
-
-expecting success of 5703.9 'fetching with exact OID': 
-	test_when_finished "rm -f log trace2" &&
-
-	rm -rf local &&
-	cp -r "$LOCAL_PRISTINE" local &&
-	oid=$(git -C "$REPO" rev-parse d) &&
-	GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE2_EVENT="$(pwd)/trace2" \
-		git -C local fetch origin \
-		"$oid":refs/heads/actual &&
-
-	grep \"key\":\"total_rounds\",\"value\":\"2\" trace2 &&
-	git -C "$REPO" rev-parse "d" >expected &&
-	git -C local rev-parse refs/heads/actual >actual &&
-	test_cmp expected actual &&
-	grep "want $oid" log
-
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/repo
- * [new ref]         2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5 -> actual
- * [new tag]         d                                        -> d
- * [new tag]         b                                        -> b
-{"event":"data","sid":"20250827T082203.643732Z-Hcf858c9d-P000ac4d3","thread":"main","time":"2025-08-27T08:22:03.661944Z","file":"fetch-pack.c","line":1762,"repo":1,"t_abs":0.018417,"t_rel":0.007788,"nesting":3,"category":"negotiation_v2","key":"total_rounds","value":"2"}
-packet:        fetch> want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
-packet:  upload-pack< want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
-packet:        fetch> want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
-packet:  upload-pack< want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
-ok 9 - fetching with exact OID
-
-expecting success of 5703.10 'fetching multiple refs': 
-	test_when_finished "rm -f log" &&
-
-	rm -rf local &&
-	cp -r "$LOCAL_PRISTINE" local &&
-	GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin main baz &&
-
-	git -C "$REPO" rev-parse "main" "baz" >expected &&
-	git -C local rev-parse refs/remotes/origin/main refs/remotes/origin/baz >actual &&
-	test_cmp expected actual &&
-	grep "want-ref refs/heads/main" log &&
-	grep "want-ref refs/heads/baz" log
-
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/repo
- * branch            main       -> FETCH_HEAD
- * branch            baz        -> FETCH_HEAD
-   4f50377..cb86d32  main       -> origin/main
- * [new branch]      baz        -> origin/baz
-packet:        fetch> want-ref refs/heads/main
-packet:  upload-pack< want-ref refs/heads/main
-packet:        fetch> want-ref refs/heads/main
-packet:  upload-pack< want-ref refs/heads/main
-packet:        fetch> want-ref refs/heads/baz
-packet:  upload-pack< want-ref refs/heads/baz
-packet:        fetch> want-ref refs/heads/baz
-packet:  upload-pack< want-ref refs/heads/baz
-ok 10 - fetching multiple refs
-
-expecting success of 5703.11 'fetching ref and exact OID': 
-	test_when_finished "rm -f log" &&
-
-	rm -rf local &&
-	cp -r "$LOCAL_PRISTINE" local &&
-	oid=$(git -C "$REPO" rev-parse b) &&
-	GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
-		main "$oid":refs/heads/actual &&
-
-	git -C "$REPO" rev-parse "main" "b" >expected &&
-	git -C local rev-parse refs/remotes/origin/main refs/heads/actual >actual &&
-	test_cmp expected actual &&
-	grep "want $oid" log &&
-	grep "want-ref refs/heads/main" log
-
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/repo
- * branch            main                                     -> FETCH_HEAD
- * [new ref]         f403802d82ee291ad8692be584ed0f4e89e44b78 -> actual
- * [new tag]         b                                        -> b
- * [new tag]         f                                        -> f
-   4f50377..cb86d32  main                                     -> origin/main
-packet:        fetch> want f403802d82ee291ad8692be584ed0f4e89e44b78
-packet:  upload-pack< want f403802d82ee291ad8692be584ed0f4e89e44b78
-packet:        fetch> want f403802d82ee291ad8692be584ed0f4e89e44b78
-packet:  upload-pack< want f403802d82ee291ad8692be584ed0f4e89e44b78
-packet:        fetch> want-ref refs/heads/main
-packet:  upload-pack< want-ref refs/heads/main
-packet:        fetch> want-ref refs/heads/main
-packet:  upload-pack< want-ref refs/heads/main
-ok 11 - fetching ref and exact OID
-
-expecting success of 5703.12 'fetching with wildcard that does not match any refs': 
-	test_when_finished "rm -f log" &&
-
-	rm -rf local &&
-	cp -r "$LOCAL_PRISTINE" local &&
-	git -C local fetch origin refs/heads/none*:refs/heads/* >out &&
-	test_must_be_empty out
-
-ok 12 - fetching with wildcard that does not match any refs
-
-expecting success of 5703.13 'fetching with wildcard that matches multiple refs': 
-	test_when_finished "rm -f log" &&
-
-	rm -rf local &&
-	cp -r "$LOCAL_PRISTINE" local &&
-	GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin refs/heads/o*:refs/heads/o* &&
-
-	git -C "$REPO" rev-parse "o/foo" "o/bar" >expected &&
-	git -C local rev-parse "o/foo" "o/bar" >actual &&
-	test_cmp expected actual &&
-	grep "want-ref refs/heads/o/foo" log &&
-	grep "want-ref refs/heads/o/bar" log
-
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/repo
- * [new branch]      o/bar      -> o/bar
- * [new branch]      o/foo      -> o/foo
- * [new tag]         c          -> c
- * [new tag]         d          -> d
- * [new branch]      o/bar      -> origin/o/bar
- * [new branch]      o/foo      -> origin/o/foo
- * [new tag]         b          -> b
-packet:        fetch> want-ref refs/heads/o/foo
-packet:  upload-pack< want-ref refs/heads/o/foo
-packet:        fetch> want-ref refs/heads/o/foo
-packet:  upload-pack< want-ref refs/heads/o/foo
-packet:        fetch> want-ref refs/heads/o/bar
-packet:  upload-pack< want-ref refs/heads/o/bar
-packet:        fetch> want-ref refs/heads/o/bar
-packet:  upload-pack< want-ref refs/heads/o/bar
-ok 13 - fetching with wildcard that matches multiple refs
-
-expecting success of 5703.14 'setup namespaced repo': 
-	(
-		git init -b main "$REPO" &&
-		cd "$REPO" &&
-		test_commit a &&
-		test_commit b &&
-		git checkout a &&
-		test_commit c &&
-		git checkout a &&
-		test_commit d &&
-		git update-ref refs/heads/ns-no b &&
-		git update-ref refs/namespaces/ns/refs/heads/ns-yes c &&
-		git update-ref refs/namespaces/ns/refs/heads/hidden d
-	) &&
-	git -C "$REPO" config uploadpack.allowRefInWant true
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/repo-ns/.git/
-[main (root-commit) 4f50377] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-[main fd45aa7] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-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
-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 4f50377 a
-[detached HEAD 2bf1eff] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Previous HEAD position was 2bf1eff c
-HEAD is now at 4f50377 a
-[detached HEAD 203a6fb] d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-ok 14 - setup namespaced repo
-
-expecting success of 5703.15 'with namespace: want-ref is considered relative to namespace': 
-	wanted_ref=refs/heads/ns-yes &&
-
-	oid=$(git -C "$REPO" rev-parse "refs/namespaces/ns/$wanted_ref") &&
-	cat >expected_refs <<-EOF &&
-	$oid $wanted_ref
-	EOF
-	cat >expected_commits <<-EOF &&
-	$oid
-	$(git -C "$REPO" rev-parse a)
-	EOF
-
-	write_fetch_command >pkt <<-EOF &&
-	want-ref $wanted_ref
-	EOF
-	test-tool pkt-line pack <pkt >in &&
-
-	GIT_NAMESPACE=ns test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
-	check_output
-
-6540f670a9623805b0d3366c519a9aeabb2b2be9
-ok 15 - with namespace: want-ref is considered relative to namespace
-
-expecting success of 5703.16 'with namespace: want-ref outside namespace is unknown': 
-	wanted_ref=refs/heads/ns-no &&
-
-	write_fetch_command >pkt <<-EOF &&
-	want-ref $wanted_ref
-	EOF
-	test-tool pkt-line pack <pkt >in &&
-
-	test_must_fail env GIT_NAMESPACE=ns \
-		test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
-	grep "unknown ref" out
-
-fatal: unknown ref refs/heads/ns-no
-0024ERR unknown ref refs/heads/ns-no
-ok 16 - with namespace: want-ref outside namespace is unknown
-
-expecting success of 5703.17 'without namespace: want-ref outside namespace succeeds': 
-	wanted_ref=refs/heads/ns-no &&
-
-	oid=$(git -C "$REPO" rev-parse $wanted_ref) &&
-	cat >expected_refs <<-EOF &&
-	$oid $wanted_ref
-	EOF
-	cat >expected_commits <<-EOF &&
-	$oid
-	$(git -C "$REPO" rev-parse a)
-	EOF
-
-	write_fetch_command >pkt <<-EOF &&
-	want-ref $wanted_ref
-	EOF
-	test-tool pkt-line pack <pkt >in &&
-
-	test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
-	check_output
-
-ff3210800e3d84fda6f96ffff1bf38b093f6f076
-ok 17 - without namespace: want-ref outside namespace succeeds
-
-expecting success of 5703.18 'with namespace: hideRefs is matched, relative to namespace': 
-	wanted_ref=refs/heads/hidden &&
-	git -C "$REPO" config transfer.hideRefs $wanted_ref &&
-
-	write_fetch_command >pkt <<-EOF &&
-	want-ref $wanted_ref
-	EOF
-	test-tool pkt-line pack <pkt >in &&
-
-	test_must_fail env GIT_NAMESPACE=ns \
-		test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
-	grep "unknown ref" out
-
-fatal: unknown ref refs/heads/hidden
-0025ERR unknown ref refs/heads/hidden
-ok 18 - with namespace: hideRefs is matched, relative to namespace
-
-expecting success of 5703.19 'with namespace: want-ref succeeds if hideRefs is removed': 
-	wanted_ref=refs/heads/hidden &&
-	git -C "$REPO" config --unset transfer.hideRefs $wanted_ref &&
-
-	oid=$(git -C "$REPO" rev-parse "refs/namespaces/ns/$wanted_ref") &&
-	cat >expected_refs <<-EOF &&
-	$oid $wanted_ref
-	EOF
-	cat >expected_commits <<-EOF &&
-	$oid
-	$(git -C "$REPO" rev-parse a)
-	EOF
-
-	write_fetch_command >pkt <<-EOF &&
-	want-ref $wanted_ref
-	EOF
-	test-tool pkt-line pack <pkt >in &&
-
-	GIT_NAMESPACE=ns test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
-	check_output
-
-035d4af45181cc76e0274465756506c19c3b4534
-ok 19 - with namespace: want-ref succeeds if hideRefs is removed
-
-expecting success of 5703.20 'without namespace: relative hideRefs does not match': 
-	wanted_ref=refs/namespaces/ns/refs/heads/hidden &&
-	git -C "$REPO" config transfer.hideRefs refs/heads/hidden &&
-
-	oid=$(git -C "$REPO" rev-parse $wanted_ref) &&
-	cat >expected_refs <<-EOF &&
-	$oid $wanted_ref
-	EOF
-	cat >expected_commits <<-EOF &&
-	$oid
-	$(git -C "$REPO" rev-parse a)
-	EOF
-
-	write_fetch_command >pkt <<-EOF &&
-	want-ref $wanted_ref
-	EOF
-	test-tool pkt-line pack <pkt >in &&
-
-	test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
-	check_output
-
-035d4af45181cc76e0274465756506c19c3b4534
-ok 20 - without namespace: relative hideRefs does not match
-
-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 20 test(s)
-# SKIP no web server found at ''
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5705-session-id-in-capabilities.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5705-session-id-in-capabilities/.git/
 expecting success of 5705.1 'setup repos for session ID capability tests': 
@@ -379280,8 +379345,8 @@
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20250827T082203.738337Z-Hcf858c9d-P000ac5c4","thread":"main","time":"2025-08-27T08:22:03.744675Z","file":"transport.c","line":379,"t_abs":0.008314,"t_rel":0.005499,"nesting":3,"category":"transfer","key":"server-sid","value":"20250827T082203.738337Z-Hcf858c9d-P000ac5c4/20250827T082203.741728Z-Hcf858c9d-P000ac5d3"}
-{"event":"data","sid":"20250827T082203.738337Z-Hcf858c9d-P000ac5c4/20250827T082203.741728Z-Hcf858c9d-P000ac5d3","thread":"main","time":"2025-08-27T08:22:03.747413Z","file":"upload-pack.c","line":1172,"t_abs":0.005888,"t_rel":0.005888,"nesting":1,"category":"transfer","key":"client-sid","value":"20250827T082203.738337Z-Hcf858c9d-P000ac5c4"}
+{"event":"data","sid":"20260929T145306.660525Z-H5c947e1c-P0023ed9d","thread":"main","time":"2026-09-29T14:53:06.664954Z","file":"transport.c","line":379,"t_abs":0.004641,"t_rel":0.003596,"nesting":3,"category":"transfer","key":"server-sid","value":"20260929T145306.660525Z-H5c947e1c-P0023ed9d/20260929T145306.663968Z-H5c947e1c-P0023eda9"}
+{"event":"data","sid":"20260929T145306.660525Z-H5c947e1c-P0023ed9d/20260929T145306.663968Z-H5c947e1c-P0023eda9","thread":"main","time":"2026-09-29T14:53:06.665372Z","file":"upload-pack.c","line":1172,"t_abs":0.001616,"t_rel":0.001616,"nesting":1,"category":"transfer","key":"client-sid","value":"20260929T145306.660525Z-H5c947e1c-P0023ed9d"}
 ok 9 - session IDs advertised (fetch v0)
 
 expecting success of 5705.10 'session IDs advertised (push v0)': 
@@ -379306,8 +379371,8 @@
  create mode 100644 b.t
 To file:///build/reproducible-path/git-2.51.0/t/trash directory.t5705-session-id-in-capabilities/repo
  * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20250827T082203.866396Z-Hcf858c9d-P000ac73b","thread":"main","time":"2025-08-27T08:22:03.874277Z","file":"transport.c","line":379,"t_abs":0.008089,"t_rel":0.004101,"nesting":3,"category":"transfer","key":"server-sid","value":"20250827T082203.866396Z-Hcf858c9d-P000ac73b/20250827T082203.872352Z-Hcf858c9d-P000ac750"}
-{"event":"data","sid":"20250827T082203.866396Z-Hcf858c9d-P000ac73b/20250827T082203.872352Z-Hcf858c9d-P000ac750","thread":"main","time":"2025-08-27T08:22:03.874772Z","file":"builtin/receive-pack.c","line":2214,"t_abs":0.002616,"t_rel":0.002616,"nesting":1,"category":"transfer","key":"client-sid","value":"20250827T082203.866396Z-Hcf858c9d-P000ac73b"}
+{"event":"data","sid":"20260929T145306.756931Z-H5c947e1c-P0023eee6","thread":"main","time":"2026-09-29T14:53:06.760897Z","file":"transport.c","line":379,"t_abs":0.008764,"t_rel":0.003200,"nesting":3,"category":"transfer","key":"server-sid","value":"20260929T145306.756931Z-H5c947e1c-P0023eee6/20260929T145306.760210Z-H5c947e1c-P0023ef04"}
+{"event":"data","sid":"20260929T145306.756931Z-H5c947e1c-P0023eee6/20260929T145306.760210Z-H5c947e1c-P0023ef04","thread":"main","time":"2026-09-29T14:53:06.761365Z","file":"builtin/receive-pack.c","line":2214,"t_abs":0.001331,"t_rel":0.001331,"nesting":1,"category":"transfer","key":"client-sid","value":"20260929T145306.756931Z-H5c947e1c-P0023eee6"}
 To file:///build/reproducible-path/git-2.51.0/t/trash directory.t5705-session-id-in-capabilities/repo
  - [deleted]         new-branch
 ok 10 - session IDs advertised (push v0)
@@ -379325,8 +379390,8 @@
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20250827T082203.994364Z-Hcf858c9d-P000ac883","thread":"main","time":"2025-08-27T08:22:04.001852Z","file":"connect.c","line":178,"t_abs":0.007665,"t_rel":0.006673,"nesting":3,"category":"transfer","key":"negotiated-version","value":"0"}
-{"event":"data","sid":"20250827T082203.994364Z-Hcf858c9d-P000ac883/20250827T082203.997359Z-Hcf858c9d-P000ac88d","thread":"main","time":"2025-08-27T08:22:03.997843Z","file":"protocol.c","line":80,"t_abs":0.000718,"t_rel":0.000718,"nesting":1,"category":"transfer","key":"negotiated-version","value":"0"}
+{"event":"data","sid":"20260929T145306.809050Z-H5c947e1c-P0023efb5","thread":"main","time":"2026-09-29T14:53:06.813638Z","file":"connect.c","line":178,"t_abs":0.004828,"t_rel":0.003757,"nesting":3,"category":"transfer","key":"negotiated-version","value":"0"}
+{"event":"data","sid":"20260929T145306.809050Z-H5c947e1c-P0023efb5/20260929T145306.812687Z-H5c947e1c-P0023efc8","thread":"main","time":"2026-09-29T14:53:06.813266Z","file":"protocol.c","line":80,"t_abs":0.000793,"t_rel":0.000793,"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)': 
@@ -379342,8 +379407,8 @@
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20250827T082204.097346Z-Hcf858c9d-P000ac958","thread":"main","time":"2025-08-27T08:22:04.108050Z","file":"transport.c","line":379,"t_abs":0.010928,"t_rel":0.004560,"nesting":3,"category":"transfer","key":"server-sid","value":"20250827T082204.097346Z-Hcf858c9d-P000ac958/20250827T082204.107135Z-Hcf858c9d-P000ac980"}
-{"event":"data","sid":"20250827T082204.097346Z-Hcf858c9d-P000ac958/20250827T082204.107135Z-Hcf858c9d-P000ac980","thread":"main","time":"2025-08-27T08:22:04.108455Z","file":"upload-pack.c","line":1172,"t_abs":0.001522,"t_rel":0.001522,"nesting":1,"category":"transfer","key":"client-sid","value":"20250827T082204.097346Z-Hcf858c9d-P000ac958"}
+{"event":"data","sid":"20260929T145306.847995Z-H5c947e1c-P0023f050","thread":"main","time":"2026-09-29T14:53:06.854641Z","file":"transport.c","line":379,"t_abs":0.006868,"t_rel":0.004564,"nesting":3,"category":"transfer","key":"server-sid","value":"20260929T145306.847995Z-H5c947e1c-P0023f050/20260929T145306.853741Z-H5c947e1c-P0023f068"}
+{"event":"data","sid":"20260929T145306.847995Z-H5c947e1c-P0023f050/20260929T145306.853741Z-H5c947e1c-P0023f068","thread":"main","time":"2026-09-29T14:53:06.855047Z","file":"upload-pack.c","line":1172,"t_abs":0.001527,"t_rel":0.001527,"nesting":1,"category":"transfer","key":"client-sid","value":"20260929T145306.847995Z-H5c947e1c-P0023f050"}
 ok 12 - session IDs advertised (fetch v1)
 
 expecting success of 5705.13 'session IDs advertised (push v1)': 
@@ -379368,8 +379433,8 @@
  create mode 100644 b.t
 To file:///build/reproducible-path/git-2.51.0/t/trash directory.t5705-session-id-in-capabilities/repo
  * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20250827T082204.262694Z-Hcf858c9d-P000acb00","thread":"main","time":"2025-08-27T08:22:04.272585Z","file":"transport.c","line":379,"t_abs":0.010100,"t_rel":0.009150,"nesting":3,"category":"transfer","key":"server-sid","value":"20250827T082204.262694Z-Hcf858c9d-P000acb00/20250827T082204.268904Z-Hcf858c9d-P000acb18"}
-{"event":"data","sid":"20250827T082204.262694Z-Hcf858c9d-P000acb00/20250827T082204.268904Z-Hcf858c9d-P000acb18","thread":"main","time":"2025-08-27T08:22:04.273134Z","file":"builtin/receive-pack.c","line":2214,"t_abs":0.004438,"t_rel":0.004438,"nesting":1,"category":"transfer","key":"client-sid","value":"20250827T082204.262694Z-Hcf858c9d-P000acb00"}
+{"event":"data","sid":"20260929T145306.937861Z-H5c947e1c-P0023f194","thread":"main","time":"2026-09-29T14:53:06.943821Z","file":"transport.c","line":379,"t_abs":0.006187,"t_rel":0.005223,"nesting":3,"category":"transfer","key":"server-sid","value":"20260929T145306.937861Z-H5c947e1c-P0023f194/20260929T145306.941565Z-H5c947e1c-P0023f1ab"}
+{"event":"data","sid":"20260929T145306.937861Z-H5c947e1c-P0023f194/20260929T145306.941565Z-H5c947e1c-P0023f1ab","thread":"main","time":"2026-09-29T14:53:06.944377Z","file":"builtin/receive-pack.c","line":2214,"t_abs":0.003035,"t_rel":0.003035,"nesting":1,"category":"transfer","key":"client-sid","value":"20260929T145306.937861Z-H5c947e1c-P0023f194"}
 To file:///build/reproducible-path/git-2.51.0/t/trash directory.t5705-session-id-in-capabilities/repo
  - [deleted]         new-branch
 ok 13 - session IDs advertised (push v1)
@@ -379387,8 +379452,8 @@
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20250827T082204.362735Z-Hcf858c9d-P000acc14","thread":"main","time":"2025-08-27T08:22:04.371904Z","file":"connect.c","line":178,"t_abs":0.009364,"t_rel":0.002787,"nesting":3,"category":"transfer","key":"negotiated-version","value":"1"}
-{"event":"data","sid":"20250827T082204.362735Z-Hcf858c9d-P000acc14/20250827T082204.371373Z-Hcf858c9d-P000acc32","thread":"main","time":"2025-08-27T08:22:04.371850Z","file":"protocol.c","line":80,"t_abs":0.000689,"t_rel":0.000689,"nesting":1,"category":"transfer","key":"negotiated-version","value":"1"}
+{"event":"data","sid":"20260929T145307.000298Z-H5c947e1c-P0023f27f","thread":"main","time":"2026-09-29T14:53:07.004271Z","file":"connect.c","line":178,"t_abs":0.004168,"t_rel":0.003151,"nesting":3,"category":"transfer","key":"negotiated-version","value":"1"}
+{"event":"data","sid":"20260929T145307.000298Z-H5c947e1c-P0023f27f/20260929T145307.003794Z-H5c947e1c-P0023f296","thread":"main","time":"2026-09-29T14:53:07.004219Z","file":"protocol.c","line":80,"t_abs":0.000645,"t_rel":0.000645,"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)': 
@@ -379404,8 +379469,8 @@
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20250827T082204.442372Z-Hcf858c9d-P000accd9","thread":"main","time":"2025-08-27T08:22:04.447319Z","file":"transport.c","line":362,"t_abs":0.005144,"t_rel":0.004123,"nesting":3,"category":"transfer","key":"server-sid","value":"20250827T082204.442372Z-Hcf858c9d-P000accd9/20250827T082204.445678Z-Hcf858c9d-P000acce7"}
-{"event":"data","sid":"20250827T082204.442372Z-Hcf858c9d-P000accd9/20250827T082204.445678Z-Hcf858c9d-P000acce7","thread":"main","time":"2025-08-27T08:22:04.453554Z","file":"serve.c","line":89,"t_abs":0.008082,"t_rel":0.008082,"nesting":1,"category":"transfer","key":"client-sid","value":"20250827T082204.442372Z-Hcf858c9d-P000accd9"}
+{"event":"data","sid":"20260929T145307.052406Z-H5c947e1c-P0023f346","thread":"main","time":"2026-09-29T14:53:07.057547Z","file":"transport.c","line":362,"t_abs":0.005346,"t_rel":0.003341,"nesting":3,"category":"transfer","key":"server-sid","value":"20260929T145307.052406Z-H5c947e1c-P0023f346/20260929T145307.056978Z-H5c947e1c-P0023f358"}
+{"event":"data","sid":"20260929T145307.052406Z-H5c947e1c-P0023f346/20260929T145307.056978Z-H5c947e1c-P0023f358","thread":"main","time":"2026-09-29T14:53:07.058355Z","file":"serve.c","line":89,"t_abs":0.001606,"t_rel":0.001606,"nesting":1,"category":"transfer","key":"client-sid","value":"20260929T145307.052406Z-H5c947e1c-P0023f346"}
 ok 15 - session IDs advertised (fetch v2)
 
 expecting success of 5705.16 'session IDs advertised (push v2)': 
@@ -379430,8 +379495,8 @@
  create mode 100644 b.t
 To file:///build/reproducible-path/git-2.51.0/t/trash directory.t5705-session-id-in-capabilities/repo
  * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20250827T082204.630951Z-Hcf858c9d-P000acec9","thread":"main","time":"2025-08-27T08:22:04.646273Z","file":"transport.c","line":379,"t_abs":0.015533,"t_rel":0.009588,"nesting":3,"category":"transfer","key":"server-sid","value":"20250827T082204.630951Z-Hcf858c9d-P000acec9/20250827T082204.642581Z-Hcf858c9d-P000aceec"}
-{"event":"data","sid":"20250827T082204.630951Z-Hcf858c9d-P000acec9/20250827T082204.642581Z-Hcf858c9d-P000aceec","thread":"main","time":"2025-08-27T08:22:04.647276Z","file":"builtin/receive-pack.c","line":2214,"t_abs":0.004891,"t_rel":0.004891,"nesting":1,"category":"transfer","key":"client-sid","value":"20250827T082204.630951Z-Hcf858c9d-P000acec9"}
+{"event":"data","sid":"20260929T145307.138591Z-H5c947e1c-P0023f497","thread":"main","time":"2026-09-29T14:53:07.143768Z","file":"transport.c","line":379,"t_abs":0.005352,"t_rel":0.004493,"nesting":3,"category":"transfer","key":"server-sid","value":"20260929T145307.138591Z-H5c947e1c-P0023f497/20260929T145307.142774Z-H5c947e1c-P0023f4a6"}
+{"event":"data","sid":"20260929T145307.138591Z-H5c947e1c-P0023f497/20260929T145307.142774Z-H5c947e1c-P0023f4a6","thread":"main","time":"2026-09-29T14:53:07.144221Z","file":"builtin/receive-pack.c","line":2214,"t_abs":0.001655,"t_rel":0.001655,"nesting":1,"category":"transfer","key":"client-sid","value":"20260929T145307.138591Z-H5c947e1c-P0023f497"}
 To file:///build/reproducible-path/git-2.51.0/t/trash directory.t5705-session-id-in-capabilities/repo
  - [deleted]         new-branch
 ok 16 - session IDs advertised (push v2)
@@ -379449,424 +379514,14 @@
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20250827T082204.737068Z-Hcf858c9d-P000acfd1","thread":"main","time":"2025-08-27T08:22:04.744629Z","file":"connect.c","line":178,"t_abs":0.007805,"t_rel":0.005243,"nesting":3,"category":"transfer","key":"negotiated-version","value":"2"}
-{"event":"data","sid":"20250827T082204.737068Z-Hcf858c9d-P000acfd1/20250827T082204.742612Z-Hcf858c9d-P000acfe5","thread":"main","time":"2025-08-27T08:22:04.743082Z","file":"protocol.c","line":80,"t_abs":0.000676,"t_rel":0.000676,"nesting":1,"category":"transfer","key":"negotiated-version","value":"2"}
+{"event":"data","sid":"20260929T145307.207425Z-H5c947e1c-P0023f59b","thread":"main","time":"2026-09-29T14:53:07.211832Z","file":"connect.c","line":178,"t_abs":0.004630,"t_rel":0.003500,"nesting":3,"category":"transfer","key":"negotiated-version","value":"2"}
+{"event":"data","sid":"20260929T145307.207425Z-H5c947e1c-P0023f59b/20260929T145307.211160Z-H5c947e1c-P0023f5aa","thread":"main","time":"2026-09-29T14:53:07.211626Z","file":"protocol.c","line":80,"t_abs":0.000683,"t_rel":0.000683,"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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5731-protocol-v2-bundle-uri-git.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 ...
-[705672] 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 &&
-	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs true
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5731-protocol-v2-bundle-uri-git/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 - setup protocol v2 git:// tests
-
-expecting success of 5731.2 'connect with git:// 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
-
-[705884] Connection from 127.0.0.1:39944
-[705884] Extended attribute "host": 127.0.0.1:5731
-[705884] Extended attribute "protocol": version=2
-[705884] Request upload-pack for '/parent'
-[705672] [705884] Disconnected
-packet:    ls-remote< version 2
-ok 2 - connect with git:// using protocol v2: no bundle-uri
-
-expecting success of 5731.3 'connect with git:// 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
-
-[706110] Connection from 127.0.0.1:39950
-[706110] Extended attribute "host": 127.0.0.1:5731
-[706110] Extended attribute "protocol": version=2
-[706110] Request upload-pack for '/parent'
-[705672] [706110] Disconnected
-packet:    ls-remote< version 2
-packet:    ls-remote< bundle-uri
-ok 3 - connect with git:// using protocol v2: have bundle-uri
-
-expecting success of 5731.4 'clone with git:// 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
-
-[706370] Connection from 127.0.0.1:39966
-[706370] Extended attribute "host": 127.0.0.1:5731
-[706370] Extended attribute "protocol": version=2
-[706370] Request upload-pack for '/parent'
-[705672] [706370] Disconnected
-packet:        clone< version 2
-packet:        clone< bundle-uri
-[706709] Connection from 127.0.0.1:39972
-[706709] Extended attribute "host": 127.0.0.1:5731
-[706709] Extended attribute "protocol": version=2
-[706709] Request upload-pack for '/parent'
-[705672] [706709] Disconnected
-packet:        clone< version 2
-packet:        clone< version 2
-packet:        clone< bundle-uri
-packet:        clone< bundle-uri
-packet:        clone> command=bundle-uri
-[707129] Connection from 127.0.0.1:39980
-[707129] Extended attribute "host": 127.0.0.1:5731
-[707129] Extended attribute "protocol": version=2
-[707129] Request upload-pack for '/parent'
-[705672] [707129] Disconnected
-packet:        clone< version 2
-packet:        clone< bundle-uri
-ok 4 - clone with git:// using protocol v2: request bundle-uris
-
-expecting success of 5731.5 'enable transfer.bundleURI for remaining tests': 
-	git config --global transfer.bundleURI true
-
-ok 5 - enable transfer.bundleURI for remaining tests
-
-expecting success of 5731.6 'test bundle-uri with git:// 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
-
-[707563] Connection from 127.0.0.1:39990
-[707563] Extended attribute "host": 127.0.0.1:5731
-[707563] Extended attribute "protocol": version=2
-[707563] Request upload-pack for '/parent'
-[705672] [707563] 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': 
-	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
-
-[707998] Connection from 127.0.0.1:39998
-[707998] Extended attribute "host": 127.0.0.1:5731
-[707998] Extended attribute "protocol": version=2
-[707998] Request upload-pack for '/parent'
-[705672] [707998] 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': 
-	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
-
-[708416] Connection from 127.0.0.1:40004
-[708416] Extended attribute "host": 127.0.0.1:5731
-[708416] Extended attribute "protocol": version=2
-[708416] Request upload-pack for '/parent'
-[705672] [708416] 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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5802-connect-helper.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t5802-connect-helper/remote/one.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5812-proto-disable-http.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5812-proto-disable-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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5526-fetch-submodules.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5526-fetch-submodules/.git/
 expecting success of 5526.1 'setup': 
@@ -381165,12 +380820,12 @@
 Fetching submodule sub1/subdir/deepsubmodule
 Fetching submodule submodule
 Fetching submodule submodule/subdir/deepsubmodule
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5526-fetch-submodules/./sub1
- * branch            c22241953c460cab6c7e0df7537d85769819962f -> FETCH_HEAD
-Fetching submodule sub1/subdir/deepsubmodule
 From /build/reproducible-path/git-2.51.0/t/trash directory.t5526-fetch-submodules/submodule
  * branch            ece684d212ae5c4bb50495d5b58c587f01efb92e -> FETCH_HEAD
 Fetching submodule submodule/subdir/deepsubmodule
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5526-fetch-submodules/./sub1
+ * branch            c22241953c460cab6c7e0df7537d85769819962f -> FETCH_HEAD
+Fetching submodule sub1/subdir/deepsubmodule
 commit
 commit
 Previous HEAD position was a2a8968 delete gitmodules file
@@ -381587,8 +381242,8 @@
 From ../same-name-2
    c1a6ab0..ba2e966  main       -> same-name-2/main
 Fetching submodule submodule
-fatal: git upload-pack: not our ref fa048cd49e61f07e0d3a0413cd12115bfd16d938
 fatal: remote error: upload-pack: not our ref fa048cd49e61f07e0d3a0413cd12115bfd16d938
+fatal: git upload-pack: not our ref fa048cd49e61f07e0d3a0413cd12115bfd16d938
 Errors during submodule fetch:
 	submodule
 Previous HEAD position was c1a6ab0 super-a2
@@ -381730,6 +381385,1280 @@
 1..54
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5703-upload-pack-ref-in-want.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/.git/
+expecting success of 5703.1 'setup repository': 
+	test_commit a &&
+	git branch -M main &&
+	git checkout -b o/foo &&
+	test_commit b &&
+	test_commit c &&
+	git checkout -b o/bar b &&
+	test_commit d &&
+	git checkout -b baz a &&
+	test_commit e &&
+	git checkout main &&
+	test_commit f
+
+[master (root-commit) ce450c7] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+Switched to a new branch 'o/foo'
+[o/foo 020ea9b] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+[o/foo d9ea348] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Switched to a new branch 'o/bar'
+[o/bar 1bd0260] d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+Switched to a new branch 'baz'
+[baz 10e5ce2] e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e.t
+Switched to branch 'main'
+[main 0e847a7] f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f.t
+ok 1 - setup repository
+
+expecting success of 5703.2 'config controls ref-in-want advertisement': 
+	test-tool serve-v2 --advertise-capabilities >out &&
+	test_grep ! "ref-in-want" out &&
+
+	git config uploadpack.allowRefInWant false &&
+	test-tool serve-v2 --advertise-capabilities >out &&
+	test_grep ! "ref-in-want" out &&
+
+	git config uploadpack.allowRefInWant true &&
+	test-tool serve-v2 --advertise-capabilities >out &&
+	test_grep "ref-in-want" out
+
+002cfetch=shallow wait-for-done ref-in-want
+ok 2 - config controls ref-in-want advertisement
+
+expecting success of 5703.3 'invalid want-ref line': 
+	write_fetch_command >pkt <<-EOF &&
+	want-ref refs/heads/non-existent
+	EOF
+
+	test-tool pkt-line pack <pkt >in &&
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>out <in &&
+	grep "unknown ref" out
+
+002bERR unknown ref refs/heads/non-existentfatal: unknown ref refs/heads/non-existent
+ok 3 - invalid want-ref line
+
+expecting success of 5703.4 'basic want-ref': 
+	oid=$(git rev-parse f) &&
+	cat >expected_refs <<-EOF &&
+	$oid refs/heads/main
+	EOF
+	git rev-parse f >expected_commits &&
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref refs/heads/main
+	have $(git rev-parse a)
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	test-tool serve-v2 --stateless-rpc >out <in &&
+	check_output
+
+2cd455c37d1f88f1dd99c20a05dc00950e0b98e4
+ok 4 - basic want-ref
+
+expecting success of 5703.5 'multiple want-ref lines': 
+	oid_c=$(git rev-parse c) &&
+	oid_d=$(git rev-parse d) &&
+	cat >expected_refs <<-EOF &&
+	$oid_c refs/heads/o/foo
+	$oid_d refs/heads/o/bar
+	EOF
+	git rev-parse c d >expected_commits &&
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref refs/heads/o/foo
+	want-ref refs/heads/o/bar
+	have $(git rev-parse b)
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	test-tool serve-v2 --stateless-rpc >out <in &&
+	check_output
+
+ef76e7a7b2817dc4a77b2e06e9b82a4f147b87d7
+ok 5 - multiple want-ref lines
+
+expecting success of 5703.6 'mix want and want-ref': 
+	oid=$(git rev-parse f) &&
+	cat >expected_refs <<-EOF &&
+	$oid refs/heads/main
+	EOF
+	git rev-parse e f >expected_commits &&
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref refs/heads/main
+	want $(git rev-parse e)
+	have $(git rev-parse a)
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	test-tool serve-v2 --stateless-rpc >out <in &&
+	check_output
+
+a3b2910e2bc93b88442ed713e2d9bfba846dfb4a
+ok 6 - mix want and want-ref
+
+expecting success of 5703.7 'want-ref with ref we already have commit for': 
+	oid=$(git rev-parse c) &&
+	cat >expected_refs <<-EOF &&
+	$oid refs/heads/o/foo
+	EOF
+	>expected_commits &&
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref refs/heads/o/foo
+	have $(git rev-parse c)
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	test-tool serve-v2 --stateless-rpc >out <in &&
+	check_output
+
+029d08823bd8a8eab510ad6ac75c823cfd3ed31e
+ok 7 - want-ref with ref we already have commit for
+
+expecting success of 5703.8 'setup repos for fetching with ref-in-want tests': 
+	(
+		git init -b main "$REPO" &&
+		cd "$REPO" &&
+		test_commit a &&
+
+		# Local repo with many commits (so that negotiation will take
+		# more than 1 request/response pair)
+		rm -rf "$LOCAL_PRISTINE" &&
+		git clone "file://$REPO" "$LOCAL_PRISTINE" &&
+		cd "$LOCAL_PRISTINE" &&
+		git checkout -b side &&
+		test_commit_bulk --id=s 33 &&
+
+		# Add novel commits to upstream
+		git checkout main &&
+		cd "$REPO" &&
+		git checkout -b o/foo &&
+		test_commit b &&
+		test_commit c &&
+		git checkout -b o/bar b &&
+		test_commit d &&
+		git checkout -b baz a &&
+		test_commit e &&
+		git checkout main &&
+		test_commit f
+	) &&
+	git -C "$REPO" config uploadpack.allowRefInWant true &&
+	git -C "$LOCAL_PRISTINE" config protocol.version 2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/repo/.git/
+[main (root-commit) 4f50377] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/local_pristine'...
+Switched to a new branch 'side'
+4f50377a42e4bea2b0e56d986e7fe2da43d41a69
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           99 (         0 duplicates                  )
+      blobs  :           33 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           33 (         0 duplicates         32 deltas of         32 attempts)
+      commits:           33 (         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            =         38
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       7553 /       7553
+---------------------------------------------------------------------
+
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+Switched to a new branch 'o/foo'
+[o/foo f403802] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+[o/foo e460426] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Switched to a new branch 'o/bar'
+[o/bar 2aa4ae0] d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+Switched to a new branch 'baz'
+[baz 882e407] e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e.t
+Switched to branch 'main'
+[main cb86d32] f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f.t
+ok 8 - setup repos for fetching with ref-in-want tests
+
+expecting success of 5703.9 'fetching with exact OID': 
+	test_when_finished "rm -f log trace2" &&
+
+	rm -rf local &&
+	cp -r "$LOCAL_PRISTINE" local &&
+	oid=$(git -C "$REPO" rev-parse d) &&
+	GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE2_EVENT="$(pwd)/trace2" \
+		git -C local fetch origin \
+		"$oid":refs/heads/actual &&
+
+	grep \"key\":\"total_rounds\",\"value\":\"2\" trace2 &&
+	git -C "$REPO" rev-parse "d" >expected &&
+	git -C local rev-parse refs/heads/actual >actual &&
+	test_cmp expected actual &&
+	grep "want $oid" log
+
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/repo
+ * [new ref]         2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5 -> actual
+ * [new tag]         d                                        -> d
+ * [new tag]         b                                        -> b
+{"event":"data","sid":"20260929T145306.613502Z-H5c947e1c-P0023ecf4","thread":"main","time":"2026-09-29T14:53:06.620784Z","file":"fetch-pack.c","line":1762,"repo":1,"t_abs":0.007461,"t_rel":0.001830,"nesting":3,"category":"negotiation_v2","key":"total_rounds","value":"2"}
+packet:        fetch> want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
+packet:  upload-pack< want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
+packet:        fetch> want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
+packet:  upload-pack< want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
+ok 9 - fetching with exact OID
+
+expecting success of 5703.10 'fetching multiple refs': 
+	test_when_finished "rm -f log" &&
+
+	rm -rf local &&
+	cp -r "$LOCAL_PRISTINE" local &&
+	GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin main baz &&
+
+	git -C "$REPO" rev-parse "main" "baz" >expected &&
+	git -C local rev-parse refs/remotes/origin/main refs/remotes/origin/baz >actual &&
+	test_cmp expected actual &&
+	grep "want-ref refs/heads/main" log &&
+	grep "want-ref refs/heads/baz" log
+
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/repo
+ * branch            main       -> FETCH_HEAD
+ * branch            baz        -> FETCH_HEAD
+   4f50377..cb86d32  main       -> origin/main
+ * [new branch]      baz        -> origin/baz
+packet:        fetch> want-ref refs/heads/main
+packet:  upload-pack< want-ref refs/heads/main
+packet:        fetch> want-ref refs/heads/main
+packet:  upload-pack< want-ref refs/heads/main
+packet:        fetch> want-ref refs/heads/baz
+packet:  upload-pack< want-ref refs/heads/baz
+packet:        fetch> want-ref refs/heads/baz
+packet:  upload-pack< want-ref refs/heads/baz
+ok 10 - fetching multiple refs
+
+expecting success of 5703.11 'fetching ref and exact OID': 
+	test_when_finished "rm -f log" &&
+
+	rm -rf local &&
+	cp -r "$LOCAL_PRISTINE" local &&
+	oid=$(git -C "$REPO" rev-parse b) &&
+	GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
+		main "$oid":refs/heads/actual &&
+
+	git -C "$REPO" rev-parse "main" "b" >expected &&
+	git -C local rev-parse refs/remotes/origin/main refs/heads/actual >actual &&
+	test_cmp expected actual &&
+	grep "want $oid" log &&
+	grep "want-ref refs/heads/main" log
+
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/repo
+ * branch            main                                     -> FETCH_HEAD
+ * [new ref]         f403802d82ee291ad8692be584ed0f4e89e44b78 -> actual
+ * [new tag]         b                                        -> b
+ * [new tag]         f                                        -> f
+   4f50377..cb86d32  main                                     -> origin/main
+packet:        fetch> want f403802d82ee291ad8692be584ed0f4e89e44b78
+packet:  upload-pack< want f403802d82ee291ad8692be584ed0f4e89e44b78
+packet:        fetch> want f403802d82ee291ad8692be584ed0f4e89e44b78
+packet:  upload-pack< want f403802d82ee291ad8692be584ed0f4e89e44b78
+packet:        fetch> want-ref refs/heads/main
+packet:  upload-pack< want-ref refs/heads/main
+packet:        fetch> want-ref refs/heads/main
+packet:  upload-pack< want-ref refs/heads/main
+ok 11 - fetching ref and exact OID
+
+expecting success of 5703.12 'fetching with wildcard that does not match any refs': 
+	test_when_finished "rm -f log" &&
+
+	rm -rf local &&
+	cp -r "$LOCAL_PRISTINE" local &&
+	git -C local fetch origin refs/heads/none*:refs/heads/* >out &&
+	test_must_be_empty out
+
+ok 12 - fetching with wildcard that does not match any refs
+
+expecting success of 5703.13 'fetching with wildcard that matches multiple refs': 
+	test_when_finished "rm -f log" &&
+
+	rm -rf local &&
+	cp -r "$LOCAL_PRISTINE" local &&
+	GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin refs/heads/o*:refs/heads/o* &&
+
+	git -C "$REPO" rev-parse "o/foo" "o/bar" >expected &&
+	git -C local rev-parse "o/foo" "o/bar" >actual &&
+	test_cmp expected actual &&
+	grep "want-ref refs/heads/o/foo" log &&
+	grep "want-ref refs/heads/o/bar" log
+
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/repo
+ * [new branch]      o/bar      -> o/bar
+ * [new branch]      o/foo      -> o/foo
+ * [new tag]         c          -> c
+ * [new tag]         d          -> d
+ * [new branch]      o/bar      -> origin/o/bar
+ * [new branch]      o/foo      -> origin/o/foo
+ * [new tag]         b          -> b
+packet:        fetch> want-ref refs/heads/o/foo
+packet:  upload-pack< want-ref refs/heads/o/foo
+packet:        fetch> want-ref refs/heads/o/foo
+packet:  upload-pack< want-ref refs/heads/o/foo
+packet:        fetch> want-ref refs/heads/o/bar
+packet:  upload-pack< want-ref refs/heads/o/bar
+packet:        fetch> want-ref refs/heads/o/bar
+packet:  upload-pack< want-ref refs/heads/o/bar
+ok 13 - fetching with wildcard that matches multiple refs
+
+expecting success of 5703.14 'setup namespaced repo': 
+	(
+		git init -b main "$REPO" &&
+		cd "$REPO" &&
+		test_commit a &&
+		test_commit b &&
+		git checkout a &&
+		test_commit c &&
+		git checkout a &&
+		test_commit d &&
+		git update-ref refs/heads/ns-no b &&
+		git update-ref refs/namespaces/ns/refs/heads/ns-yes c &&
+		git update-ref refs/namespaces/ns/refs/heads/hidden d
+	) &&
+	git -C "$REPO" config uploadpack.allowRefInWant true
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5703-upload-pack-ref-in-want/repo-ns/.git/
+[main (root-commit) 4f50377] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+[main fd45aa7] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+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
+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 4f50377 a
+[detached HEAD 2bf1eff] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Previous HEAD position was 2bf1eff c
+HEAD is now at 4f50377 a
+[detached HEAD 203a6fb] d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+ok 14 - setup namespaced repo
+
+expecting success of 5703.15 'with namespace: want-ref is considered relative to namespace': 
+	wanted_ref=refs/heads/ns-yes &&
+
+	oid=$(git -C "$REPO" rev-parse "refs/namespaces/ns/$wanted_ref") &&
+	cat >expected_refs <<-EOF &&
+	$oid $wanted_ref
+	EOF
+	cat >expected_commits <<-EOF &&
+	$oid
+	$(git -C "$REPO" rev-parse a)
+	EOF
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref $wanted_ref
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	GIT_NAMESPACE=ns test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
+	check_output
+
+6540f670a9623805b0d3366c519a9aeabb2b2be9
+ok 15 - with namespace: want-ref is considered relative to namespace
+
+expecting success of 5703.16 'with namespace: want-ref outside namespace is unknown': 
+	wanted_ref=refs/heads/ns-no &&
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref $wanted_ref
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	test_must_fail env GIT_NAMESPACE=ns \
+		test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
+	grep "unknown ref" out
+
+fatal: unknown ref refs/heads/ns-no
+0024ERR unknown ref refs/heads/ns-no
+ok 16 - with namespace: want-ref outside namespace is unknown
+
+expecting success of 5703.17 'without namespace: want-ref outside namespace succeeds': 
+	wanted_ref=refs/heads/ns-no &&
+
+	oid=$(git -C "$REPO" rev-parse $wanted_ref) &&
+	cat >expected_refs <<-EOF &&
+	$oid $wanted_ref
+	EOF
+	cat >expected_commits <<-EOF &&
+	$oid
+	$(git -C "$REPO" rev-parse a)
+	EOF
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref $wanted_ref
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
+	check_output
+
+ff3210800e3d84fda6f96ffff1bf38b093f6f076
+ok 17 - without namespace: want-ref outside namespace succeeds
+
+expecting success of 5703.18 'with namespace: hideRefs is matched, relative to namespace': 
+	wanted_ref=refs/heads/hidden &&
+	git -C "$REPO" config transfer.hideRefs $wanted_ref &&
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref $wanted_ref
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	test_must_fail env GIT_NAMESPACE=ns \
+		test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
+	grep "unknown ref" out
+
+fatal: unknown ref refs/heads/hidden
+0025ERR unknown ref refs/heads/hidden
+ok 18 - with namespace: hideRefs is matched, relative to namespace
+
+expecting success of 5703.19 'with namespace: want-ref succeeds if hideRefs is removed': 
+	wanted_ref=refs/heads/hidden &&
+	git -C "$REPO" config --unset transfer.hideRefs $wanted_ref &&
+
+	oid=$(git -C "$REPO" rev-parse "refs/namespaces/ns/$wanted_ref") &&
+	cat >expected_refs <<-EOF &&
+	$oid $wanted_ref
+	EOF
+	cat >expected_commits <<-EOF &&
+	$oid
+	$(git -C "$REPO" rev-parse a)
+	EOF
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref $wanted_ref
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	GIT_NAMESPACE=ns test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
+	check_output
+
+035d4af45181cc76e0274465756506c19c3b4534
+ok 19 - with namespace: want-ref succeeds if hideRefs is removed
+
+expecting success of 5703.20 'without namespace: relative hideRefs does not match': 
+	wanted_ref=refs/namespaces/ns/refs/heads/hidden &&
+	git -C "$REPO" config transfer.hideRefs refs/heads/hidden &&
+
+	oid=$(git -C "$REPO" rev-parse $wanted_ref) &&
+	cat >expected_refs <<-EOF &&
+	$oid $wanted_ref
+	EOF
+	cat >expected_commits <<-EOF &&
+	$oid
+	$(git -C "$REPO" rev-parse a)
+	EOF
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref $wanted_ref
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
+	check_output
+
+035d4af45181cc76e0274465756506c19c3b4534
+ok 20 - without namespace: relative hideRefs does not match
+
+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 20 test(s)
+# SKIP no web server found at ''
+1..20
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5812-proto-disable-http.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5812-proto-disable-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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5731-protocol-v2-bundle-uri-git.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 ...
+[2354411] 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 &&
+	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs true
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5731-protocol-v2-bundle-uri-git/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 - setup protocol v2 git:// tests
+
+expecting success of 5731.2 'connect with git:// 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
+
+[2354629] Connection from 127.0.0.1:52400
+[2354629] Extended attribute "host": 127.0.0.1:5731
+[2354629] Extended attribute "protocol": version=2
+[2354629] Request upload-pack for '/parent'
+packet:    ls-remote< version 2
+[2354411] [2354629] Disconnected
+ok 2 - connect with git:// using protocol v2: no bundle-uri
+
+expecting success of 5731.3 'connect with git:// 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
+
+[2354908] Connection from 127.0.0.1:52412
+[2354908] Extended attribute "host": 127.0.0.1:5731
+[2354908] Extended attribute "protocol": version=2
+[2354908] Request upload-pack for '/parent'
+packet:    ls-remote< version 2
+packet:    ls-remote< bundle-uri
+[2354411] [2354908] Disconnected
+ok 3 - connect with git:// using protocol v2: have bundle-uri
+
+expecting success of 5731.4 'clone with git:// 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
+
+[2355163] Connection from 127.0.0.1:52424
+[2355163] Extended attribute "host": 127.0.0.1:5731
+[2355163] Extended attribute "protocol": version=2
+[2355163] Request upload-pack for '/parent'
+[2354411] [2355163] Disconnected
+packet:        clone< version 2
+packet:        clone< bundle-uri
+[2355628] Connection from 127.0.0.1:52426
+[2355628] Extended attribute "host": 127.0.0.1:5731
+[2355628] Extended attribute "protocol": version=2
+[2355628] Request upload-pack for '/parent'
+[2354411] [2355628] Disconnected
+packet:        clone< version 2
+packet:        clone< version 2
+packet:        clone< bundle-uri
+packet:        clone< bundle-uri
+packet:        clone> command=bundle-uri
+[2356224] Connection from 127.0.0.1:52436
+[2356224] Extended attribute "host": 127.0.0.1:5731
+[2356224] Extended attribute "protocol": version=2
+[2356224] Request upload-pack for '/parent'
+[2354411] [2356224] Disconnected
+packet:        clone< version 2
+packet:        clone< bundle-uri
+ok 4 - clone with git:// using protocol v2: request bundle-uris
+
+expecting success of 5731.5 'enable transfer.bundleURI for remaining tests': 
+	git config --global transfer.bundleURI true
+
+ok 5 - enable transfer.bundleURI for remaining tests
+
+expecting success of 5731.6 'test bundle-uri with git:// 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
+
+[2356800] Connection from 127.0.0.1:52440
+[2356800] Extended attribute "host": 127.0.0.1:5731
+[2356800] Extended attribute "protocol": version=2
+[2356800] Request upload-pack for '/parent'
+[2354411] [2356800] 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': 
+	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
+
+[2357373] Connection from 127.0.0.1:52442
+[2357373] Extended attribute "host": 127.0.0.1:5731
+[2357373] Extended attribute "protocol": version=2
+[2357373] Request upload-pack for '/parent'
+[2354411] [2357373] 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': 
+	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
+
+[2357976] Connection from 127.0.0.1:52458
+[2357976] Extended attribute "host": 127.0.0.1:5731
+[2357976] Extended attribute "protocol": version=2
+[2357976] Request upload-pack for '/parent'
+[2354411] [2357976] Disconnected
+ok 8 - test bundle-uri with git:// using protocol v2 with list
+
+Stopping git daemon ...
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5802-connect-helper.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t5802-connect-helper/remote/one.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5710-promisor-remote-capability.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5710-promisor-remote-capability/.git/
 expecting success of 5710.1 'setup: create "template" repository': 
@@ -381999,13 +382928,13 @@
 
 Cloning into 'client'...
 remote: fatal: 'lop' does not appear to be a git repository        
-error: git upload-pack: git-pack-objects died with error.
-fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
 remote: fatal: Could not read from remote repository.        
 remote: 
 remote: Please make sure you have the correct access rights        
 remote: and the repository exists.        
 remote: fatal: could not fetch 10949700df7918e60f2f06fad3a769714e219742 from promisor remote        
+error: git upload-pack: git-pack-objects died with error.
+fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
 remote: aborting due to possible repository corruption on the remote side.
 fatal: early EOF
 fatal: fetch-pack: invalid index-pack output
@@ -382033,16 +382962,16 @@
 
 Cloning into 'client'...
 remote: fatal: 'lop' does not appear to be a git repository        
-error: git upload-pack: git-pack-objects died with error.
-fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
 remote: fatal: Could not read from remote repository.        
 remote: 
 remote: Please make sure you have the correct access rights        
 remote: and the repository exists.        
 remote: fatal: could not fetch 10949700df7918e60f2f06fad3a769714e219742 from promisor remote        
+error: git upload-pack: git-pack-objects died with error.
 remote: aborting due to possible repository corruption on the remote side.
 fatal: early EOF
 fatal: fetch-pack: invalid index-pack output
+fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
 ok 14 - clone with 'KnownUrl' and empty url, so not advertised
 
 expecting success of 5710.15 'clone with promisor.advertise set to 'true' but don't delete the client': 
@@ -382155,274 +383084,6 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5814-proto-disable-ext.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5810-proto-disable-local.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5810-proto-disable-local/.git/
 expecting success of 5810.1 'setup repository to clone': 
@@ -382914,39 +383575,35 @@
 1..54
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5811-proto-disable-git.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5811-proto-disable-git/.git/
-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
+*** t5814-proto-disable-ext.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-)
-prerequisite PIPE ok
-Starting git daemon ...
-[709608] Ready to rumble
-expecting success of 5811.1 'create git-accessible repo': 
-	bare="$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
+expecting success of 5814.2 'setup repository to clone': 
 	test_commit one &&
-	git --bare init "$bare" &&
-	git push "$bare" HEAD &&
-	>"$bare/git-daemon-export-ok" &&
-	git -C "$bare" config daemon.receivepack true
+	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.51.0/t/trash directory.t5811-proto-disable-git/repo/repo.git/
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5811-proto-disable-git/repo/repo.git
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5814-proto-disable-ext/remote/repo.git/
+To remote/repo.git
  * [new branch]      HEAD -> master
-ok 1 - create git-accessible repo
+ok 2 - setup repository to clone
 
-expecting success of 5811.2 'clone git:// (enabled)': 
+expecting success of 5814.3 'clone remote-helper (enabled)': 
 		rm -rf tmp.git &&
 		(
 			GIT_ALLOW_PROTOCOL=$proto &&
@@ -382955,14 +383612,10 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-[709945] Connection from 127.0.0.1:42752
-[709945] Extended attribute "host": 127.0.0.1:5811
-[709945] Extended attribute "protocol": version=2
-[709945] Request upload-pack for '/repo.git'
-[709608] [709945] Disconnected
-ok 2 - clone git:// (enabled)
+fake-remote: git-upload-pack repo.git
+ok 3 - clone remote-helper (enabled)
 
-expecting success of 5811.3 'fetch git:// (enabled)': 
+expecting success of 5814.4 'fetch remote-helper (enabled)': 
 		(
 			cd tmp.git &&
 			GIT_ALLOW_PROTOCOL=$proto &&
@@ -382970,16 +383623,12 @@
 			git fetch
 		)
 	
-[710282] Connection from 127.0.0.1:42756
-[710282] Extended attribute "host": 127.0.0.1:5811
-[710282] Extended attribute "protocol": version=2
-[710282] Request upload-pack for '/repo.git'
-From git://127.0.0.1:5811/repo
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
  * branch            HEAD       -> FETCH_HEAD
-[709608] [710282] Disconnected
-ok 3 - fetch git:// (enabled)
+ok 4 - fetch remote-helper (enabled)
 
-expecting success of 5811.4 'push git:// (enabled)': 
+expecting success of 5814.5 'push remote-helper (enabled)': 
 		(
 			cd tmp.git &&
 			GIT_ALLOW_PROTOCOL=$proto &&
@@ -382987,14 +383636,12 @@
 			git push origin HEAD:pushed
 		)
 	
-[710495] Connection from 127.0.0.1:42762
-[710495] Extended attribute "host": 127.0.0.1:5811
-[710495] Request receive-pack for '/repo.git'
-To git://127.0.0.1:5811/repo.git
+fake-remote: git-receive-pack repo.git
+To ext::fake-remote %S repo.git
  * [new branch]      HEAD -> pushed
-ok 4 - push git:// (enabled)
+ok 5 - push remote-helper (enabled)
 
-expecting success of 5811.5 'push git:// (disabled)': 
+expecting success of 5814.6 'push remote-helper (disabled)': 
 		(
 			cd tmp.git &&
 			GIT_ALLOW_PROTOCOL=none &&
@@ -383002,11 +383649,10 @@
 			test_must_fail git push origin HEAD:pushed
 		)
 	
-[709608] [710495] Disconnected
-fatal: transport 'git' not allowed
-ok 5 - push git:// (disabled)
+fatal: transport 'ext' not allowed
+ok 6 - push remote-helper (disabled)
 
-expecting success of 5811.6 'fetch git:// (disabled)': 
+expecting success of 5814.7 'fetch remote-helper (disabled)': 
 		(
 			cd tmp.git &&
 			GIT_ALLOW_PROTOCOL=none &&
@@ -383014,10 +383660,10 @@
 			test_must_fail git fetch
 		)
 	
-fatal: transport 'git' not allowed
-ok 6 - fetch git:// (disabled)
+fatal: transport 'ext' not allowed
+ok 7 - fetch remote-helper (disabled)
 
-expecting success of 5811.7 'clone git:// (disabled)': 
+expecting success of 5814.8 'clone remote-helper (disabled)': 
 		rm -rf tmp.git &&
 		(
 			GIT_ALLOW_PROTOCOL=none &&
@@ -383026,10 +383672,10 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'git' not allowed
-ok 7 - clone git:// (disabled)
+fatal: transport 'ext' not allowed
+ok 8 - clone remote-helper (disabled)
 
-expecting success of 5811.8 'clone git:// (env var has precedence)': 
+expecting success of 5814.9 'clone remote-helper (env var has precedence)': 
 		rm -rf tmp.git &&
 		(
 			GIT_ALLOW_PROTOCOL=none &&
@@ -383039,99 +383685,78 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'git' not allowed
+fatal: transport 'ext' not allowed
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'git' not allowed
-ok 8 - clone git:// (env var has precedence)
+fatal: transport 'ext' not allowed
+ok 9 - clone remote-helper (env var has precedence)
 
-expecting success of 5811.9 'clone git:// (enabled with config)': 
+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'...
-[710941] Connection from 127.0.0.1:42776
-[710941] Extended attribute "host": 127.0.0.1:5811
-[710941] Extended attribute "protocol": version=2
-[710941] Request upload-pack for '/repo.git'
-[709608] [710941] Disconnected
-ok 9 - clone git:// (enabled with config)
+fake-remote: git-upload-pack repo.git
+ok 10 - clone remote-helper (enabled with config)
 
-expecting success of 5811.10 'fetch git:// (enabled)': 
+expecting success of 5814.11 'fetch remote-helper (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=always fetch
 	
-[711262] Connection from 127.0.0.1:42782
-[711262] Extended attribute "host": 127.0.0.1:5811
-[711262] Extended attribute "protocol": version=2
-[711262] Request upload-pack for '/repo.git'
-From git://127.0.0.1:5811/repo
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
  * branch            HEAD       -> FETCH_HEAD
-[709608] [711262] Disconnected
-ok 10 - fetch git:// (enabled)
+ok 11 - fetch remote-helper (enabled)
 
-expecting success of 5811.11 'push git:// (enabled)': 
+expecting success of 5814.12 'push remote-helper (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
 	
-[711463] Connection from 127.0.0.1:42796
-[711463] Extended attribute "host": 127.0.0.1:5811
-[711463] Request receive-pack for '/repo.git'
+fake-remote: git-receive-pack repo.git
 Everything up-to-date
-ok 11 - push git:// (enabled)
+ok 12 - push remote-helper (enabled)
 
-expecting success of 5811.12 'push git:// (disabled)': 
+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
 	
-[709608] [711463] Disconnected
-fatal: transport 'git' not allowed
-ok 12 - push git:// (disabled)
+fatal: transport 'ext' not allowed
+ok 13 - push remote-helper (disabled)
 
-expecting success of 5811.13 'fetch git:// (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 'git' not allowed
-ok 13 - fetch git:// (disabled)
+fatal: transport 'ext' not allowed
+ok 14 - fetch remote-helper (disabled)
 
-expecting success of 5811.14 'clone git:// (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 'git' not allowed
-ok 14 - clone git:// (disabled)
+fatal: transport 'ext' not allowed
+ok 15 - clone remote-helper (disabled)
 
-expecting success of 5811.15 'clone git:// (enabled)': 
+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'...
-[711604] Connection from 127.0.0.1:42798
-[711604] Extended attribute "host": 127.0.0.1:5811
-[711604] Extended attribute "protocol": version=2
-[711604] Request upload-pack for '/repo.git'
-[709608] [711604] Disconnected
-ok 15 - clone git:// (enabled)
+fake-remote: git-upload-pack repo.git
+ok 16 - clone remote-helper (enabled)
 
-expecting success of 5811.16 'fetch git:// (enabled)': 
+expecting success of 5814.17 'fetch remote-helper (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=user fetch
 	
-[711901] Connection from 127.0.0.1:42806
-[711901] Extended attribute "host": 127.0.0.1:5811
-[711901] Extended attribute "protocol": version=2
-[711901] Request upload-pack for '/repo.git'
-From git://127.0.0.1:5811/repo
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
  * branch            HEAD       -> FETCH_HEAD
-[709608] [711901] Disconnected
-ok 16 - fetch git:// (enabled)
+ok 17 - fetch remote-helper (enabled)
 
-expecting success of 5811.17 'push git:// (enabled)': 
+expecting success of 5814.18 'push remote-helper (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
 	
-[712120] Connection from 127.0.0.1:42816
-[712120] Extended attribute "host": 127.0.0.1:5811
-[712120] Request receive-pack for '/repo.git'
+fake-remote: git-receive-pack repo.git
 Everything up-to-date
-ok 17 - push git:// (enabled)
+ok 18 - push remote-helper (enabled)
 
-expecting success of 5811.18 'push git:// (disabled)': 
+expecting success of 5814.19 'push remote-helper (disabled)': 
 		(
 			cd tmp.git &&
 			GIT_PROTOCOL_FROM_USER=0 &&
@@ -383139,11 +383764,10 @@
 			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
 		)
 	
-[709608] [712120] Disconnected
-fatal: transport 'git' not allowed
-ok 18 - push git:// (disabled)
+fatal: transport 'ext' not allowed
+ok 19 - push remote-helper (disabled)
 
-expecting success of 5811.19 'fetch git:// (disabled)': 
+expecting success of 5814.20 'fetch remote-helper (disabled)': 
 		(
 			cd tmp.git &&
 			GIT_PROTOCOL_FROM_USER=0 &&
@@ -383151,10 +383775,10 @@
 			test_must_fail git -c protocol.$proto.allow=user fetch
 		)
 	
-fatal: transport 'git' not allowed
-ok 19 - fetch git:// (disabled)
+fatal: transport 'ext' not allowed
+ok 20 - fetch remote-helper (disabled)
 
-expecting success of 5811.20 'clone git:// (disabled)': 
+expecting success of 5814.21 'clone remote-helper (disabled)': 
 		rm -rf tmp.git &&
 		(
 			GIT_PROTOCOL_FROM_USER=0 &&
@@ -383163,73 +383787,60 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'git' not allowed
-ok 20 - clone git:// (disabled)
+fatal: transport 'ext' not allowed
+ok 21 - clone remote-helper (disabled)
 
-expecting success of 5811.21 'clone git:// (enabled)': 
+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'...
-[712341] Connection from 127.0.0.1:42832
-[712341] Extended attribute "host": 127.0.0.1:5811
-[712341] Extended attribute "protocol": version=2
-[712341] Request upload-pack for '/repo.git'
-[709608] [712341] Disconnected
-ok 21 - clone git:// (enabled)
+fake-remote: git-upload-pack repo.git
+ok 22 - clone remote-helper (enabled)
 
-expecting success of 5811.22 'fetch git:// (enabled)': 
+expecting success of 5814.23 'fetch remote-helper (enabled)': 
 		test_config_global protocol.allow always &&
 		git -C tmp.git fetch
 	
-[712694] Connection from 127.0.0.1:42836
-[712694] Extended attribute "host": 127.0.0.1:5811
-[712694] Extended attribute "protocol": version=2
-[712694] Request upload-pack for '/repo.git'
-From git://127.0.0.1:5811/repo
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
  * branch            HEAD       -> FETCH_HEAD
-[709608] [712694] Disconnected
-ok 22 - fetch git:// (enabled)
+ok 23 - fetch remote-helper (enabled)
 
-expecting success of 5811.23 'push git:// (enabled)': 
+expecting success of 5814.24 'push remote-helper (enabled)': 
 		test_config_global protocol.allow always &&
 		git -C tmp.git push origin HEAD:pushed
 	
-[712913] Connection from 127.0.0.1:42844
-[712913] Extended attribute "host": 127.0.0.1:5811
-[712913] Request receive-pack for '/repo.git'
+fake-remote: git-receive-pack repo.git
 Everything up-to-date
-[709608] [712913] Disconnected
-ok 23 - push git:// (enabled)
+ok 24 - push remote-helper (enabled)
 
-expecting success of 5811.24 'push git:// (disabled)': 
+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 'git' not allowed
-ok 24 - push git:// (disabled)
+fatal: transport 'ext' not allowed
+ok 25 - push remote-helper (disabled)
 
-expecting success of 5811.25 'fetch git:// (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 'git' not allowed
-ok 25 - fetch git:// (disabled)
+fatal: transport 'ext' not allowed
+ok 26 - fetch remote-helper (disabled)
 
-expecting success of 5811.26 'clone git:// (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 'git' not allowed
-ok 26 - clone git:// (disabled)
+fatal: transport 'ext' not allowed
+ok 27 - clone remote-helper (disabled)
 
-Stopping git daemon ...
-Terminated
-# passed all 26 test(s)
-1..26
+# passed all 27 test(s)
+1..27
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5815-submodule-protos.sh ***
@@ -383348,6 +383959,323 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5811-proto-disable-git.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5811-proto-disable-git/.git/
+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 ...
+[2358400] Ready to rumble
+expecting success of 5811.1 'create git-accessible repo': 
+	bare="$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
+	test_commit one &&
+	git --bare init "$bare" &&
+	git push "$bare" HEAD &&
+	>"$bare/git-daemon-export-ok" &&
+	git -C "$bare" config daemon.receivepack true
+
+[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.51.0/t/trash directory.t5811-proto-disable-git/repo/repo.git/
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5811-proto-disable-git/repo/repo.git
+ * [new branch]      HEAD -> master
+ok 1 - create git-accessible repo
+
+expecting success of 5811.2 'clone git:// (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'...
+[2358761] Connection from 127.0.0.1:60964
+[2358761] Extended attribute "host": 127.0.0.1:5811
+[2358761] Extended attribute "protocol": version=2
+[2358761] Request upload-pack for '/repo.git'
+[2358400] [2358761] Disconnected
+ok 2 - clone git:// (enabled)
+
+expecting success of 5811.3 'fetch git:// (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git fetch
+		)
+	
+[2359221] Connection from 127.0.0.1:60968
+[2359221] Extended attribute "host": 127.0.0.1:5811
+[2359221] Extended attribute "protocol": version=2
+[2359221] Request upload-pack for '/repo.git'
+From git://127.0.0.1:5811/repo
+ * branch            HEAD       -> FETCH_HEAD
+[2358400] [2359221] Disconnected
+ok 3 - fetch git:// (enabled)
+
+expecting success of 5811.4 'push git:// (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git push origin HEAD:pushed
+		)
+	
+[2359472] Connection from 127.0.0.1:60984
+[2359472] Extended attribute "host": 127.0.0.1:5811
+[2359472] Request receive-pack for '/repo.git'
+[2358400] [2359472] Disconnected
+To git://127.0.0.1:5811/repo.git
+ * [new branch]      HEAD -> pushed
+ok 4 - push git:// (enabled)
+
+expecting success of 5811.5 'push git:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git push origin HEAD:pushed
+		)
+	
+fatal: transport 'git' not allowed
+ok 5 - push git:// (disabled)
+
+expecting success of 5811.6 'fetch git:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git fetch
+		)
+	
+fatal: transport 'git' not allowed
+ok 6 - fetch git:// (disabled)
+
+expecting success of 5811.7 'clone git:// (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 'git' not allowed
+ok 7 - clone git:// (disabled)
+
+expecting success of 5811.8 'clone git:// (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 'git' not allowed
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'git' not allowed
+ok 8 - clone git:// (env var has precedence)
+
+expecting success of 5811.9 'clone git:// (enabled with config)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+[2359947] Connection from 127.0.0.1:60996
+[2359947] Extended attribute "host": 127.0.0.1:5811
+[2359947] Extended attribute "protocol": version=2
+[2359947] Request upload-pack for '/repo.git'
+[2358400] [2359947] 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
+	
+[2360341] Connection from 127.0.0.1:32778
+[2360341] Extended attribute "host": 127.0.0.1:5811
+[2360341] Extended attribute "protocol": version=2
+[2360341] Request upload-pack for '/repo.git'
+From git://127.0.0.1:5811/repo
+ * branch            HEAD       -> FETCH_HEAD
+[2358400] [2360341] 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
+	
+[2360613] Connection from 127.0.0.1:32794
+[2360613] Extended attribute "host": 127.0.0.1:5811
+[2360613] Request receive-pack for '/repo.git'
+Everything up-to-date
+ok 11 - push git:// (enabled)
+
+[2358400] [2360613] 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
+	
+fatal: transport 'git' not allowed
+ok 12 - push git:// (disabled)
+
+expecting success of 5811.13 'fetch git:// (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
+	
+fatal: transport 'git' not allowed
+ok 13 - fetch git:// (disabled)
+
+expecting success of 5811.14 'clone git:// (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 'git' not allowed
+ok 14 - clone git:// (disabled)
+
+expecting success of 5811.15 'clone git:// (enabled)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+[2360744] Connection from 127.0.0.1:32800
+[2360744] Extended attribute "host": 127.0.0.1:5811
+[2360744] Extended attribute "protocol": version=2
+[2360744] Request upload-pack for '/repo.git'
+[2358400] [2360744] Disconnected
+ok 15 - clone git:// (enabled)
+
+expecting success of 5811.16 'fetch git:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user fetch
+	
+[2361197] Connection from 127.0.0.1:32812
+[2361197] Extended attribute "host": 127.0.0.1:5811
+[2361197] Extended attribute "protocol": version=2
+[2361197] Request upload-pack for '/repo.git'
+From git://127.0.0.1:5811/repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 16 - fetch git:// (enabled)
+
+[2358400] [2361197] Disconnected
+expecting success of 5811.17 'push git:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
+	
+[2361434] Connection from 127.0.0.1:32826
+[2361434] Extended attribute "host": 127.0.0.1:5811
+[2361434] Request receive-pack for '/repo.git'
+Everything up-to-date
+ok 17 - push git:// (enabled)
+
+[2358400] [2361434] Disconnected
+expecting success of 5811.18 'push git:// (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 'git' not allowed
+ok 18 - push git:// (disabled)
+
+expecting success of 5811.19 'fetch git:// (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 'git' not allowed
+ok 19 - fetch git:// (disabled)
+
+expecting success of 5811.20 'clone git:// (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 'git' not allowed
+ok 20 - clone git:// (disabled)
+
+expecting success of 5811.21 'clone git:// (enabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow always &&
+		git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+[2361650] Connection from 127.0.0.1:32830
+[2361650] Extended attribute "host": 127.0.0.1:5811
+[2361650] Extended attribute "protocol": version=2
+[2361650] Request upload-pack for '/repo.git'
+[2358400] [2361650] 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
+	
+[2362084] Connection from 127.0.0.1:32840
+[2362084] Extended attribute "host": 127.0.0.1:5811
+[2362084] Extended attribute "protocol": version=2
+[2362084] Request upload-pack for '/repo.git'
+From git://127.0.0.1:5811/repo
+ * branch            HEAD       -> FETCH_HEAD
+[2358400] [2362084] 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
+	
+[2362362] Connection from 127.0.0.1:32852
+[2362362] Extended attribute "host": 127.0.0.1:5811
+[2362362] Request receive-pack for '/repo.git'
+Everything up-to-date
+[2358400] [2362362] Disconnected
+ok 23 - push git:// (enabled)
+
+expecting success of 5811.24 'push git:// (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git push origin HEAD:pushed
+	
+fatal: transport 'git' not allowed
+ok 24 - push git:// (disabled)
+
+expecting success of 5811.25 'fetch git:// (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git fetch
+	
+fatal: transport 'git' not allowed
+ok 25 - fetch git:// (disabled)
+
+expecting success of 5811.26 'clone git:// (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 'git' not allowed
+ok 26 - clone git:// (disabled)
+
+Stopping git daemon ...
+# passed all 26 test(s)
+1..26
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6001-rev-list-graft.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6001-rev-list-graft/.git/
 expecting success of 6001.1 'setup': 
@@ -384046,6 +384974,132 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6004-rev-list-path-optim.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6004-rev-list-path-optim/.git/
+expecting success of 6004.1 'setup': 
+	echo Hello >a &&
+	mkdir d &&
+	echo World >d/f &&
+	echo World >d/z &&
+	git add a d &&
+	test_tick &&
+	git commit -m "Initial commit" &&
+	git rev-parse --verify HEAD &&
+	git tag initial
+
+[main (root-commit) 5c8df84] Initial commit
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 a
+ create mode 100644 d/f
+ create mode 100644 d/z
+5c8df8481b8e4f419cc2268f5e68a10e349bbe37
+ok 1 - setup
+
+expecting success of 6004.2 'path-optimization': 
+	test_tick &&
+	commit=$(echo "Unchanged tree" | git commit-tree "HEAD^{tree}" -p HEAD) &&
+	test $(git rev-list $commit | wc -l) = 2 &&
+	test $(git rev-list $commit -- . | wc -l) = 1
+
+ok 2 - path-optimization
+
+expecting success of 6004.3 'further setup': 
+	git checkout -b side &&
+	echo Irrelevant >c &&
+	echo Irrelevant >d/f &&
+	git add c d/f &&
+	test_tick &&
+	git commit -m "Side makes an irrelevant commit" &&
+	git tag side_c0 &&
+	echo "More Irrelevancy" >c &&
+	git add c &&
+	test_tick &&
+	git commit -m "Side makes another irrelevant commit" &&
+	echo Bye >a &&
+	git add a &&
+	test_tick &&
+	git commit -m "Side touches a" &&
+	git tag side_a1 &&
+	echo "Yet more Irrelevancy" >c &&
+	git add c &&
+	test_tick &&
+	git commit -m "Side makes yet another irrelevant commit" &&
+	git checkout main &&
+	echo Another >b &&
+	echo Munged >d/z &&
+	git add b d/z &&
+	test_tick &&
+	git commit -m "Main touches b" &&
+	git tag main_b0 &&
+	git merge side &&
+	echo Touched >b &&
+	git add b &&
+	test_tick &&
+	git commit -m "Main touches b again"
+
+Switched to a new branch 'side'
+[side d02d707] Side makes an irrelevant commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 c
+[side 381f63c] Side makes another irrelevant commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[side e8cf16f] Side touches a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[side edbc4dc] Side makes yet another irrelevant commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+[main d829b82] Main touches b
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 b
+Merge made by the 'ort' strategy.
+ a   | 2 +-
+ c   | 1 +
+ d/f | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 c
+[main 7bf8a87] Main touches b again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - further setup
+
+expecting success of 6004.4 'path optimization 2': 
+	git rev-parse side_a1 initial >expected &&
+	git rev-list HEAD -- a >actual &&
+	test_cmp expected actual
+
+ok 4 - path optimization 2
+
+expecting success of 6004.5 'pathspec with leading path': 
+	git rev-parse main^ main_b0 side_c0 initial >expected &&
+	git rev-list HEAD -- d >actual &&
+	test_cmp expected actual
+
+ok 5 - pathspec with leading path
+
+expecting success of 6004.6 'pathspec with glob (1)': 
+	git rev-parse main^ main_b0 side_c0 initial >expected &&
+	git rev-list HEAD -- "d/*" >actual &&
+	test_cmp expected actual
+
+ok 6 - pathspec with glob (1)
+
+expecting success of 6004.7 'pathspec with glob (2)': 
+	git rev-parse side_c0 initial >expected &&
+	git rev-list HEAD -- "d/[a-m]*" >actual &&
+	test_cmp expected actual
+
+ok 7 - pathspec with glob (2)
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5813-proto-disable-ssh.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5813-proto-disable-ssh/.git/
 expecting success of 5813.1 'setup ssh wrapper': 
@@ -384806,12 +385860,86 @@
 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.51.0/t/trash directory.t5813-proto-disable-ssh/remote/-repo.git'
-ok 81 - full paths still work
+Cloning into 'dash-path'...
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6008-rev-list-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
+
+	rm .git/index &&
+
+	: > 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
+
+[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.51.0/t/trash directory.t6008-rev-list-submodule/sub'...
+done.
+[super (root-commit) 9079b4c] 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 1b135bc] super-first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[super 0dc4c60] super-second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 6008.2 'Ilari's test': 
+	git rev-list --objects super main ^super^
+
+0dc4c6046424864c0fae52b624a3b2482d9f7e76
+17954123b4d2a45f7e0fec2fea14972db2b90a1f
+534ad2c6e7b5b68dcaa4f008327c6c2ab1fa47ff
+1bd44cb9d13204b0fe1958db0082f5028a16eb3a
+b31e69987ff7eee73afedb793a88cea5aaea1b72 
+0cfbf08886fca9a91cb753ec8734c84fcbe52c9f super-file
+d9cc608eedd5d2cc63c262272b7a0f6ab6aed5dd 
+f27c6ae26adb8396d3861976ba268f87ad8afa0b 
+df2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078 
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 file
+ok 2 - Ilari's test
 
-# passed all 81 test(s)
-1..81
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5801-remote-helpers.sh ***
@@ -385099,8 +386227,8 @@
  1 file changed, 1 insertion(+)
 warning: Not updating refs/heads/new (new tip a81a4147c0db7a0bc38d047c3205b7c3ac8fc9c5 does not contain 9a8e2abfa604731e07ce2fb257109eb918e2280b)
 Everything up-to-date
---- expect	2025-08-27 08:22:06.000100763 +0000
-+++ actual	2025-08-27 08:22:06.004100790 +0000
+--- expect	2026-09-29 14:53:08.910548970 +0000
++++ actual	2026-09-29 14:53:08.914548970 +0000
 @@ -1 +1 @@
 -899057158430267bac82448fb89f21aa89c35cb0
 +9a8e2abfa604731e07ce2fb257109eb918e2280b
@@ -385358,206 +386486,6 @@
 1..35
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6004-rev-list-path-optim.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6004-rev-list-path-optim/.git/
-expecting success of 6004.1 'setup': 
-	echo Hello >a &&
-	mkdir d &&
-	echo World >d/f &&
-	echo World >d/z &&
-	git add a d &&
-	test_tick &&
-	git commit -m "Initial commit" &&
-	git rev-parse --verify HEAD &&
-	git tag initial
-
-[main (root-commit) 5c8df84] Initial commit
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 a
- create mode 100644 d/f
- create mode 100644 d/z
-5c8df8481b8e4f419cc2268f5e68a10e349bbe37
-ok 1 - setup
-
-expecting success of 6004.2 'path-optimization': 
-	test_tick &&
-	commit=$(echo "Unchanged tree" | git commit-tree "HEAD^{tree}" -p HEAD) &&
-	test $(git rev-list $commit | wc -l) = 2 &&
-	test $(git rev-list $commit -- . | wc -l) = 1
-
-ok 2 - path-optimization
-
-expecting success of 6004.3 'further setup': 
-	git checkout -b side &&
-	echo Irrelevant >c &&
-	echo Irrelevant >d/f &&
-	git add c d/f &&
-	test_tick &&
-	git commit -m "Side makes an irrelevant commit" &&
-	git tag side_c0 &&
-	echo "More Irrelevancy" >c &&
-	git add c &&
-	test_tick &&
-	git commit -m "Side makes another irrelevant commit" &&
-	echo Bye >a &&
-	git add a &&
-	test_tick &&
-	git commit -m "Side touches a" &&
-	git tag side_a1 &&
-	echo "Yet more Irrelevancy" >c &&
-	git add c &&
-	test_tick &&
-	git commit -m "Side makes yet another irrelevant commit" &&
-	git checkout main &&
-	echo Another >b &&
-	echo Munged >d/z &&
-	git add b d/z &&
-	test_tick &&
-	git commit -m "Main touches b" &&
-	git tag main_b0 &&
-	git merge side &&
-	echo Touched >b &&
-	git add b &&
-	test_tick &&
-	git commit -m "Main touches b again"
-
-Switched to a new branch 'side'
-[side d02d707] Side makes an irrelevant commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 c
-[side 381f63c] Side makes another irrelevant commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[side e8cf16f] Side touches a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[side edbc4dc] Side makes yet another irrelevant commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-[main d829b82] Main touches b
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 b
-Merge made by the 'ort' strategy.
- a   | 2 +-
- c   | 1 +
- d/f | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 c
-[main 7bf8a87] Main touches b again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - further setup
-
-expecting success of 6004.4 'path optimization 2': 
-	git rev-parse side_a1 initial >expected &&
-	git rev-list HEAD -- a >actual &&
-	test_cmp expected actual
-
-ok 4 - path optimization 2
-
-expecting success of 6004.5 'pathspec with leading path': 
-	git rev-parse main^ main_b0 side_c0 initial >expected &&
-	git rev-list HEAD -- d >actual &&
-	test_cmp expected actual
-
-ok 5 - pathspec with leading path
-
-expecting success of 6004.6 'pathspec with glob (1)': 
-	git rev-parse main^ main_b0 side_c0 initial >expected &&
-	git rev-list HEAD -- "d/*" >actual &&
-	test_cmp expected actual
-
-ok 6 - pathspec with glob (1)
-
-expecting success of 6004.7 'pathspec with glob (2)': 
-	git rev-parse side_c0 initial >expected &&
-	git rev-list HEAD -- "d/[a-m]*" >actual &&
-	test_cmp expected actual
-
-ok 7 - pathspec with glob (2)
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6008-rev-list-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
-
-	rm .git/index &&
-
-	: > 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
-
-[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.51.0/t/trash directory.t6008-rev-list-submodule/sub'...
-done.
-[super (root-commit) 9079b4c] 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 1b135bc] super-first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[super 0dc4c60] super-second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 6008.2 'Ilari's test': 
-	git rev-list --objects super main ^super^
-
-0dc4c6046424864c0fae52b624a3b2482d9f7e76
-17954123b4d2a45f7e0fec2fea14972db2b90a1f
-534ad2c6e7b5b68dcaa4f008327c6c2ab1fa47ff
-1bd44cb9d13204b0fe1958db0082f5028a16eb3a
-b31e69987ff7eee73afedb793a88cea5aaea1b72 
-0cfbf08886fca9a91cb753ec8734c84fcbe52c9f super-file
-d9cc608eedd5d2cc63c262272b7a0f6ab6aed5dd 
-f27c6ae26adb8396d3861976ba268f87ad8afa0b 
-df2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078 
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 file
-ok 2 - Ilari's test
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6005-rev-list-count.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6005-rev-list-count/.git/
 expecting success of 6005.1 'setup': 
@@ -385689,307 +386617,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6007-rev-list-cherry-pick-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-
-[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
-
-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
-
-ok 2 - --left-right
-
-expecting success of 6007.3 '--count': 
-	git rev-list --count B...C > actual &&
-	test "$(cat actual)" = 2
-
-ok 3 - --count
-
-expecting success of 6007.4 '--cherry-pick foo comes up empty': 
-	test -z "$(git rev-list --left-right --cherry-pick B...C -- foo)"
-
-ok 4 - --cherry-pick foo comes up empty
-
-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
-
-ok 5 - --cherry-pick bar does not come up empty
-
-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 - bar does not come up empty
-
-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
-
-ok 7 - --cherry-pick bar does not come up empty (II)
-
-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
-
-ok 8 - name-rev multiple --refs combine inclusive
-
-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
-
-ok 9 - name-rev --refs excludes non-matched patterns
-
-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
-
-ok 10 - name-rev --exclude excludes matched patterns
-
-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
-
-ok 11 - name-rev --no-refs clears the refs list
-
-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
-
-ok 12 - --cherry-mark
-
-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 13 - --cherry-mark --left-right
-
-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
-
-ok 14 - --cherry-pick --right-only
-
-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
-
-ok 15 - --cherry-pick --left-only
-
-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
-
-ok 16 - --cherry
-
-expecting success of 6007.17 '--cherry --count': 
-	git rev-list --cherry --count F...E -- bar > actual &&
-	test_cmp expect actual
-
-ok 17 - --cherry --count
-
-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
-
-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
-
-ok 19 - --cherry-mark --left-right --count
-
-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 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 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
-
-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 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
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6011-rev-list-with-bad-commit.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6011-rev-list-with-bad-commit/.git/
 expecting success of 6011.1 'setup': 
@@ -386096,7 +386723,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[702231] Ready to rumble
+[2351138] 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
@@ -386122,20 +386749,20 @@
 	git ls-remote --symref "$GIT_DAEMON_URL/parent" >expect &&
 	test_cmp expect actual
 
-[702383] Connection from 127.0.0.1:40918
-[702383] Extended attribute "host": 127.0.0.1:5702
-[702383] Extended attribute "protocol": version=2
-[702383] Request upload-pack for '/parent'
-[702231] [702383] Disconnected
+[2351326] Connection from 127.0.0.1:39186
+[2351326] Extended attribute "host": 127.0.0.1:5702
+[2351326] Extended attribute "protocol": version=2
+[2351326] Request upload-pack for '/parent'
+[2351138] [2351326] Disconnected
 packet:    ls-remote> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
 packet:    ls-remote< version 2
-[702561] Connection from 127.0.0.1:40920
-[702561] Extended attribute "host": 127.0.0.1:5702
-[702561] Extended attribute "protocol": version=2
-[702561] Request upload-pack for '/parent'
+[2351551] Connection from 127.0.0.1:39192
+[2351551] Extended attribute "host": 127.0.0.1:5702
+[2351551] Extended attribute "protocol": version=2
+[2351551] Request upload-pack for '/parent'
+[2351138] [2351551] Disconnected
 ok 2 - list refs with git:// using protocol v2
 
-[702231] [702561] Disconnected
 expecting success of 5702.3 'ref advertisement is filtered with ls-remote using protocol v2': 
 	test_when_finished "rm -f log" &&
 
@@ -386148,11 +386775,11 @@
 
 	test_cmp expect actual
 
-[702758] Connection from 127.0.0.1:40928
-[702758] Extended attribute "host": 127.0.0.1:5702
-[702758] Extended attribute "protocol": version=2
-[702758] Request upload-pack for '/parent'
-[702231] [702758] Disconnected
+[2351779] Connection from 127.0.0.1:39194
+[2351779] Extended attribute "host": 127.0.0.1:5702
+[2351779] Extended attribute "protocol": version=2
+[2351779] Request upload-pack for '/parent'
+[2351138] [2351779] Disconnected
 ok 3 - ref advertisement is filtered with ls-remote using protocol v2
 
 expecting success of 5702.4 'clone with git:// using protocol v2': 
@@ -386171,11 +386798,11 @@
 	grep "clone< version 2" log
 
 Cloning into 'daemon_child'...
-[702974] Connection from 127.0.0.1:40930
-[702974] Extended attribute "host": 127.0.0.1:5702
-[702974] Extended attribute "protocol": version=2
-[702974] Request upload-pack for '/parent'
-[702231] [702974] Disconnected
+[2352048] Connection from 127.0.0.1:39196
+[2352048] Extended attribute "host": 127.0.0.1:5702
+[2352048] Extended attribute "protocol": version=2
+[2352048] Request upload-pack for '/parent'
+[2351138] [2352048] 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
@@ -386201,14 +386828,14 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-[703501] Connection from 127.0.0.1:40938
-[703501] Extended attribute "host": 127.0.0.1:5702
-[703501] Extended attribute "protocol": version=2
-[703501] Request upload-pack for '/parent'
-[702231] [703501] Disconnected
+[2352650] Connection from 127.0.0.1:39204
+[2352650] Extended attribute "host": 127.0.0.1:5702
+[2352650] Extended attribute "protocol": version=2
+[2352650] Request upload-pack for '/parent'
 From git://127.0.0.1:5702/parent
    d79ce16..139b20d  main       -> origin/main
  * [new tag]         two        -> two
+[2351138] [2352650] Disconnected
 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
@@ -386229,11 +386856,11 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two_a.t
-[704077] Connection from 127.0.0.1:40944
-[704077] Extended attribute "host": 127.0.0.1:5702
-[704077] Extended attribute "protocol": version=2
-[704077] Request upload-pack for '/parent'
-[702231] [704077] Disconnected
+[2353321] Connection from 127.0.0.1:39210
+[2353321] Extended attribute "host": 127.0.0.1:5702
+[2353321] Extended attribute "protocol": version=2
+[2353321] Request upload-pack for '/parent'
+[2351138] [2353321] Disconnected
 From git://127.0.0.1:5702/parent
  * branch            7e9f7d092ed45f242659c87db76fd08923e99801 -> FETCH_HEAD
 packet:        fetch< version 2
@@ -386254,14 +386881,14 @@
 	# Server responded using protocol v2
 	grep "fetch< version 2" log
 
-[704309] Connection from 127.0.0.1:40956
-[704309] Extended attribute "host": 127.0.0.1:5702
-[704309] Extended attribute "protocol": version=2
-[704309] Request upload-pack for '/parent'
+[2353644] Connection from 127.0.0.1:39220
+[2353644] Extended attribute "host": 127.0.0.1:5702
+[2353644] Extended attribute "protocol": version=2
+[2353644] Request upload-pack for '/parent'
 From git://127.0.0.1:5702/parent
    139b20d..7e9f7d0  main       -> origin/main
  * [new tag]         two_a      -> two_a
-[702231] [704309] Disconnected
+[2351138] [2353644] Disconnected
 Updating d79ce16..7e9f7d0
 Fast-forward
  two.t   | 1 +
@@ -386300,16 +386927,15 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 three.t
-[704764] Connection from 127.0.0.1:40960
-[704764] Extended attribute "host": 127.0.0.1:5702
-[704764] Request receive-pack for '/parent'
+[2354045] Connection from 127.0.0.1:39236
+[2354045] Extended attribute "host": 127.0.0.1:5702
+[2354045] Request receive-pack for '/parent'
 To git://127.0.0.1:5702/parent
  * [new branch]      HEAD -> client_branch
-[702231] [704764] Disconnected
+[2351138] [2354045] 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
@@ -387125,600 +387751,4471 @@
 	git init exact-oid-head &&
 	git -C exact-oid-head remote add origin ../prefix-parent &&
 
-	commit=$(git -C prefix-parent rev-parse --verify HEAD) &&
+	commit=$(git -C prefix-parent rev-parse --verify HEAD) &&
+
+	test_when_finished "rm -f log" &&
+	GIT_TRACE_PACKET="$(pwd)/log" \
+		git -C exact-oid-head fetch --no-tags origin \
+			$commit:refs/heads/exact &&
+	test_grep ! command=ls-refs log
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5702-protocol-v2/exact-oid-head/.git/
+From ../prefix-parent
+ * [new ref]         70654ada25b2d7f3366dc3dfeb714cdc906df73c -> exact
+ok 47 - exact oid fetch avoids pointless HEAD request
+
+expecting success of 5702.48 '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.51.0/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.51.0/t/trash directory.t5702-protocol-v2/client/.git/
+From file:///build/reproducible-path/git-2.51.0/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 48 - fetch supports various ways of have lines
+
+expecting success of 5702.49 '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.51.0/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.51.0/t/trash directory.t5702-protocol-v2/client/.git/
+From /build/reproducible-path/git-2.51.0/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 49 - fetch supports include-tag and tag following
+
+expecting success of 5702.50 '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.51.0/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.51.0/t/trash directory.t5702-protocol-v2/server
+ * branch            newbranch  -> FETCH_HEAD
+packet:        fetch< version 2
+ok 50 - upload-pack respects client shallows
+
+expecting success of 5702.51 '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.51.0/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.51.0/t/trash directory.t5702-protocol-v2/server
+ * [new tag]         two        -> two
+ * [new tag]         twotag     -> twotag
+packet:        fetch< version 2
+packet:        fetch< version 2
+ok 51 - ensure that multiple fetches in same process from a shallow repo works
+
+expecting success of 5702.52 '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.51.0/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.51.0/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 52 - deepen-relative
+
+expecting success of 5702.53 '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.51.0/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 53 - usage: --negotiate-only without --negotiation-tip
+
+expecting success of 5702.54 '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 54 - usage: --negotiate-only with --recurse-submodules
+
+expecting success of 5702.55 '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.51.0/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 55 - file:// --negotiate-only
+
+expecting success of 5702.56 '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.51.0/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 56 - file:// --negotiate-only with protocol v0
+
+expecting success of 5702.57 '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.51.0/t/trash directory.t5702-protocol-v2/server
+ * [new branch]      HEAD -> custom-push-test
+ok 57 - push with custom path does not request v2
+
+expecting success of 5702.58 '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.51.0/t/trash directory.t5702-protocol-v2/server
+ * branch            HEAD       -> FETCH_HEAD
+GIT_PROTOCOL=version=2
+ok 58 - fetch with custom path does request v2
+
+expecting success of 5702.59 '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 59 - archive with custom path does not request v2
+
+expecting success of 5702.60 '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
+001bagent=git/2.51.0-Linux
+0013ls-refs=unborn
+0020fetch=shallow wait-for-done
+0012server-option
+0017object-format=sha1
+0000fatal: unexpected line: 'packfile-uris https'
+000eversion 2
+001bagent=git/2.51.0-Linux
+0013ls-refs=unborn
+0020fetch=shallow wait-for-done
+0012server-option
+0017object-format=sha1
+0000fatal: unexpected line: 'packfile-uris https'
+000eversion 2
+001bagent=git/2.51.0-Linux
+0013ls-refs=unborn
+002efetch=shallow wait-for-done packfile-uris
+0012server-option
+0017object-format=sha1
+0000ok 60 - 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 60 test(s)
+# SKIP no web server found at ''
+1..60
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6007-rev-list-cherry-pick-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+
+[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
+
+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
+
+ok 2 - --left-right
+
+expecting success of 6007.3 '--count': 
+	git rev-list --count B...C > actual &&
+	test "$(cat actual)" = 2
+
+ok 3 - --count
+
+expecting success of 6007.4 '--cherry-pick foo comes up empty': 
+	test -z "$(git rev-list --left-right --cherry-pick B...C -- foo)"
+
+ok 4 - --cherry-pick foo comes up empty
+
+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
+
+ok 5 - --cherry-pick bar does not come up empty
+
+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 - bar does not come up empty
+
+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
+
+ok 7 - --cherry-pick bar does not come up empty (II)
+
+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
+
+ok 8 - name-rev multiple --refs combine inclusive
+
+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
+
+ok 9 - name-rev --refs excludes non-matched patterns
+
+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
+
+ok 10 - name-rev --exclude excludes matched patterns
+
+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
+
+ok 11 - name-rev --no-refs clears the refs list
+
+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
+
+ok 12 - --cherry-mark
+
+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 13 - --cherry-mark --left-right
+
+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
+
+ok 14 - --cherry-pick --right-only
+
+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
+
+ok 15 - --cherry-pick --left-only
+
+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
+
+ok 16 - --cherry
+
+expecting success of 6007.17 '--cherry --count': 
+	git rev-list --cherry --count F...E -- bar > actual &&
+	test_cmp expect actual
+
+ok 17 - --cherry --count
+
+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
+
+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
+
+ok 19 - --cherry-mark --left-right --count
+
+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 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 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
+
+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 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
+
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6013-rev-list-reverse-parents.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 6013.2 '--reverse --parents --full-history combines correctly': 
+	git rev-list --parents --full-history main -- foo | reverse >expected &&
+	git rev-list --reverse --parents --full-history main -- foo \
+		> actual &&
+	test_cmp expected actual
+	
+ok 2 - --reverse --parents --full-history combines correctly
+
+expecting success of 6013.3 '--boundary does too': 
+	git rev-list --boundary --parents --full-history main ^root -- foo | reverse >expected &&
+	git rev-list --boundary --reverse --parents --full-history \
+		main ^root -- foo > actual &&
+	test_cmp expected actual
+	
+ok 3 - --boundary does too
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6014-rev-list-all.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6014-rev-list-all/.git/
+expecting success of 6014.1 'setup': 
+
+	commit one &&
+	commit two &&
+	git checkout HEAD^ &&
+	commit detached
+
+
+[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^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 86412ff one
+[detached HEAD 13d8fe0] detached
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 6014.2 'rev-list --all lists detached HEAD': 
+
+	test 3 = $(git rev-list --all | wc -l)
+
+
+ok 2 - rev-list --all lists detached HEAD
+
+expecting success of 6014.3 'repack does not lose detached HEAD': 
+
+	git gc &&
+	git prune --expire=now &&
+	git show HEAD
+
+
+commit 13d8fe0bae4079d4dedb755a88319ddebda9a07b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    detached
+
+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 6014.4 'rev-list --graph --no-walk is forbidden': 
+	test_must_fail git rev-list --graph --no-walk HEAD
+
+fatal: options '--no-walk' and '--graph' cannot be used together
+ok 4 - rev-list --graph --no-walk is forbidden
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t5516-fetch-push.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+From /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+From /build/reproducible-path/git-2.51.0/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.51.0/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":"20260929T145252.116825Z-H5c947e1c-P00231c52/20260929T145252.123132Z-H5c947e1c-P00231c6f","thread":"main","time":"2026-09-29T14:52:52.125864Z","file":"builtin/pack-objects.c","line":1479,"repo":1,"t_abs":0.002927,"t_rel":0.000722,"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.51.0/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":"20260929T145252.242451Z-H5c947e1c-P00231e17/20260929T145252.248505Z-H5c947e1c-P00231e3a","thread":"main","time":"2026-09-29T14:52:52.258334Z","file":"fetch-pack.c","line":2246,"repo":1,"t_abs":0.010043,"t_rel":0.008885,"nesting":2,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
+{"event":"data","sid":"20260929T145252.242451Z-H5c947e1c-P00231e17/20260929T145252.262004Z-H5c947e1c-P00231e68","thread":"main","time":"2026-09-29T14:52:52.266463Z","file":"builtin/pack-objects.c","line":1479,"repo":1,"t_abs":0.004672,"t_rel":0.000429,"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.51.0/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":"20260929T145252.367192Z-H5c947e1c-P00232002/20260929T145252.384109Z-H5c947e1c-P00232049","thread":"main","time":"2026-09-29T14:52:52.386189Z","file":"builtin/pack-objects.c","line":1479,"repo":1,"t_abs":0.002306,"t_rel":0.000733,"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.51.0/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.51.0/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.51.0/t/trash directory.t5516-fetch-push/submodule'...
+done.
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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":"20260929T145252.716398Z-H5c947e1c-P002324e1/20260929T145252.723199Z-H5c947e1c-P002324fd","thread":"main","time":"2026-09-29T14:52:52.730856Z","file":"fetch-pack.c","line":2246,"repo":1,"t_abs":0.007890,"t_rel":0.007115,"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.51.0/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.51.0/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.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+To /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+To /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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-09-29 14:52:53.626548970 +0000
++++ actual	2026-09-29 14:52:53.626548970 +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.51.0/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-09-29 14:52:53.766548970 +0000
++++ actual	2026-09-29 14:52:53.770548970 +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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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 oid 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.51.0/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 oid 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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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:
+
+  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 b9c09d6 repo
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ok 50 - push to remote with no explicit refspec and config remote.*.push = src:dest
+
+expecting success of 5516.51 'push with remote.pushdefault': 
+	mk_test up_repo heads/main &&
+	mk_test down_repo heads/main &&
+	test_config remote.up.url up_repo &&
+	test_config remote.down.url down_repo &&
+	test_config branch.main.remote up &&
+	test_config remote.pushdefault down &&
+	test_config push.default matching &&
+	git push &&
+	check_push_result up_repo $the_first_commit heads/main &&
+	check_push_result down_repo $the_commit heads/main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/up_repo/.git/
+remote: warning: updating the current branch        
+To up_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/down_repo/.git/
+remote: warning: updating the current branch        
+To down_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: warning: updating the current branch        
+To down_repo
+   b9c09d6..9ad36e1  main -> main
+ok 51 - push with remote.pushdefault
+
+expecting success of 5516.52 'push with config remote.*.pushurl': 
+
+	mk_test testrepo heads/main &&
+	git checkout main &&
+	test_config remote.there.url test2repo &&
+	test_config remote.there.pushurl testrepo &&
+	git push there : &&
+	check_push_result testrepo $the_commit heads/main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Previous HEAD position was b9c09d6 repo
+Switched to branch 'main'
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ok 52 - push with config remote.*.pushurl
+
+expecting success of 5516.53 'push with config branch.*.pushremote': 
+	mk_test up_repo heads/main &&
+	mk_test side_repo heads/main &&
+	mk_test down_repo heads/main &&
+	test_config remote.up.url up_repo &&
+	test_config remote.pushdefault side_repo &&
+	test_config remote.down.url down_repo &&
+	test_config branch.main.remote up &&
+	test_config branch.main.pushremote down &&
+	test_config push.default matching &&
+	git push &&
+	check_push_result up_repo $the_first_commit heads/main &&
+	check_push_result side_repo $the_first_commit heads/main &&
+	check_push_result down_repo $the_commit heads/main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/up_repo/.git/
+remote: warning: updating the current branch        
+To up_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/side_repo/.git/
+remote: warning: updating the current branch        
+To side_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/down_repo/.git/
+remote: warning: updating the current branch        
+To down_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: warning: updating the current branch        
+To down_repo
+   b9c09d6..9ad36e1  main -> main
+ok 53 - push with config branch.*.pushremote
+
+expecting success of 5516.54 'branch.*.pushremote config order is irrelevant': 
+	mk_test one_repo heads/main &&
+	mk_test two_repo heads/main &&
+	test_config remote.one.url one_repo &&
+	test_config remote.two.url two_repo &&
+	test_config branch.main.pushremote two_repo &&
+	test_config remote.pushdefault one_repo &&
+	test_config push.default matching &&
+	git push &&
+	check_push_result one_repo $the_first_commit heads/main &&
+	check_push_result two_repo $the_commit heads/main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/one_repo/.git/
+remote: warning: updating the current branch        
+To one_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/two_repo/.git/
+remote: warning: updating the current branch        
+To two_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: warning: updating the current branch        
+To two_repo
+   b9c09d6..9ad36e1  main -> main
+ok 54 - branch.*.pushremote config order is irrelevant
+
+expecting success of 5516.55 'push rejects empty branch name entries': 
+	mk_test one_repo heads/main &&
+	test_config remote.one.url one_repo &&
+	test_config branch..remote one &&
+	test_config branch..merge refs/heads/ &&
+	test_config branch.main.remote one &&
+	test_config branch.main.merge refs/heads/main &&
+	test_must_fail git push 2>err &&
+	grep "bad config variable .branch\.\." err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/one_repo/.git/
+remote: warning: updating the current branch        
+To one_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+fatal: bad config variable 'branch..remote' in file '.git/config' at line 12
+ok 55 - push rejects empty branch name entries
+
+expecting success of 5516.56 'push ignores "branch." config without subsection': 
+	mk_test one_repo heads/main &&
+	test_config remote.one.url one_repo &&
+	test_config branch.autoSetupMerge true &&
+	test_config branch.main.remote one &&
+	test_config branch.main.merge refs/heads/main &&
+	git push
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/one_repo/.git/
+remote: warning: updating the current branch        
+To one_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: warning: updating the current branch        
+To one_repo
+   b9c09d6..9ad36e1  main -> main
+ok 56 - push ignores "branch." config without subsection
+
+expecting success of 5516.57 'push with dry-run': 
+
+	mk_test testrepo heads/main &&
+	old_commit=$(git -C testrepo show-ref -s --verify refs/heads/main) &&
+	git push --dry-run testrepo : &&
+	check_push_result testrepo $old_commit heads/main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ok 57 - push with dry-run
+
+expecting success of 5516.58 'push updates local refs': 
+
+	mk_test testrepo heads/main &&
+	mk_child testrepo child &&
+	(
+		cd child &&
+		git pull .. main &&
+		git push &&
+		test $(git rev-parse main) = \
+			$(git rev-parse remotes/origin/main)
+	)
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Cloning into 'child'...
+done.
+From ..
+ * branch            main       -> FETCH_HEAD
+Updating b9c09d6..9ad36e1
+Fast-forward
+ path2 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+remote: warning: updating the current branch        
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
+   b9c09d6..9ad36e1  main -> main
+ok 58 - push updates local refs
+
+expecting success of 5516.59 'push updates up-to-date local refs': 
+
+	mk_test testrepo heads/main &&
+	mk_child testrepo child1 &&
+	mk_child testrepo child2 &&
+	(cd child1 && git pull .. main && git push) &&
+	(
+		cd child2 &&
+		git pull ../child1 main &&
+		git push &&
+		test $(git rev-parse main) = \
+			$(git rev-parse remotes/origin/main)
+	)
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Cloning into 'child1'...
+done.
+Cloning into 'child2'...
+done.
+From ..
+ * branch            main       -> FETCH_HEAD
+Updating b9c09d6..9ad36e1
+Fast-forward
+ path2 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+remote: warning: updating the current branch        
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
+   b9c09d6..9ad36e1  main -> main
+From ../child1
+ * branch            main       -> FETCH_HEAD
+Updating b9c09d6..9ad36e1
+Fast-forward
+ path2 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+Everything up-to-date
+ok 59 - push updates up-to-date local refs
+
+expecting success of 5516.60 'push preserves up-to-date packed refs': 
+
+	mk_test testrepo heads/main &&
+	mk_child testrepo child &&
+	(
+		cd child &&
+		git push &&
+		! test -f .git/refs/remotes/origin/main
+	)
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Cloning into 'child'...
+done.
+Everything up-to-date
+ok 60 - push preserves up-to-date packed refs
+
+expecting success of 5516.61 'push does not update local refs on failure': 
+
+	mk_test testrepo heads/main &&
+	mk_child testrepo child &&
+	echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
+	chmod +x testrepo/.git/hooks/pre-receive &&
+	(
+		cd child &&
+		git pull .. main &&
+		test_must_fail git push &&
+		test $(git rev-parse main) != \
+			$(git rev-parse remotes/origin/main)
+	)
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Cloning into 'child'...
+done.
+From ..
+ * branch            main       -> FETCH_HEAD
+Updating b9c09d6..9ad36e1
+Fast-forward
+ path2 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+fatal: cannot exec 'hooks/pre-receive': No such file or directory
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
+ ! [remote rejected] main -> main (pre-receive hook declined)
+error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo'
+ok 61 - push does not update local refs on failure
+
+expecting success of 5516.62 'allow deleting an invalid remote ref': 
+
+	mk_test testrepo heads/branch &&
+	rm -f testrepo/.git/objects/??/* &&
+	git push testrepo :refs/heads/branch &&
+	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/branch)
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> branch
+notice: HEAD points to an unborn branch (main)
+remote: warning: allowing deletion of corrupt ref        
+To testrepo
+ - [deleted]         branch
+fatal: Needed a single revision
+ok 62 - allow deleting an invalid remote ref
+
+expecting success of 5516.63 'pushing valid refs triggers post-receive and post-update hooks': 
+	mk_test_with_hooks testrepo heads/main heads/next &&
+	orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
+	newmain=$(git show-ref -s --verify refs/heads/main) &&
+	orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
+	newnext=$ZERO_OID &&
+	git push testrepo refs/heads/main:refs/heads/main :refs/heads/next &&
+	(
+		cd testrepo/.git &&
+		cat >pre-receive.expect <<-EOF &&
+		$orgmain $newmain refs/heads/main
+		$orgnext $newnext refs/heads/next
+		EOF
+
+		cat >update.expect <<-EOF &&
+		refs/heads/next $orgnext $newnext
+		refs/heads/main $orgmain $newmain
+		EOF
+
+		cat >post-receive.expect <<-EOF &&
+		$orgmain $newmain refs/heads/main
+		$orgnext $newnext refs/heads/next
+		EOF
+
+		cat >post-update.expect <<-EOF &&
+		refs/heads/main
+		refs/heads/next
+		EOF
+
+		test_cmp pre-receive.expect pre-receive.actual &&
+		test_cmp update.expect update.actual &&
+		test_cmp post-receive.expect post-receive.actual &&
+		test_cmp post-update.expect post-update.actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> next
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ - [deleted]         next
+ok 63 - pushing valid refs triggers post-receive and post-update hooks
+
+expecting success of 5516.64 'deleting dangling ref triggers hooks with correct args': 
+	mk_test_with_hooks testrepo heads/branch &&
+	orig=$(git -C testrepo rev-parse refs/heads/branch) &&
+	rm -f testrepo/.git/objects/??/* &&
+	git push testrepo :refs/heads/branch &&
+	(
+		cd testrepo/.git &&
+		cat >pre-receive.expect <<-EOF &&
+		$orig $ZERO_OID refs/heads/branch
+		EOF
+
+		cat >update.expect <<-EOF &&
+		refs/heads/branch $orig $ZERO_OID
+		EOF
+
+		cat >post-receive.expect <<-EOF &&
+		$orig $ZERO_OID refs/heads/branch
+		EOF
+
+		cat >post-update.expect <<-EOF &&
+		refs/heads/branch
+		EOF
+
+		test_cmp pre-receive.expect pre-receive.actual &&
+		test_cmp update.expect update.actual &&
+		test_cmp post-receive.expect post-receive.actual &&
+		test_cmp post-update.expect post-update.actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> branch
+notice: HEAD points to an unborn branch (main)
+remote: warning: allowing deletion of corrupt ref        
+To testrepo
+ - [deleted]         branch
+ok 64 - deleting dangling ref triggers hooks with correct args
+
+expecting success of 5516.65 'deletion of a non-existent ref is not fed to post-receive and post-update hooks': 
+	mk_test_with_hooks testrepo heads/main &&
+	orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
+	newmain=$(git show-ref -s --verify refs/heads/main) &&
+	git push testrepo main :refs/heads/nonexistent &&
+	(
+		cd testrepo/.git &&
+		cat >pre-receive.expect <<-EOF &&
+		$orgmain $newmain refs/heads/main
+		$ZERO_OID $ZERO_OID refs/heads/nonexistent
+		EOF
+
+		cat >update.expect <<-EOF &&
+		refs/heads/nonexistent $ZERO_OID $ZERO_OID
+		refs/heads/main $orgmain $newmain
+		EOF
+
+		cat >post-receive.expect <<-EOF &&
+		$orgmain $newmain refs/heads/main
+		EOF
+
+		cat >post-update.expect <<-EOF &&
+		refs/heads/main
+		EOF
+
+		test_cmp pre-receive.expect pre-receive.actual &&
+		test_cmp update.expect update.actual &&
+		test_cmp post-receive.expect post-receive.actual &&
+		test_cmp post-update.expect post-update.actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: warning: deleting a non-existent ref        
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ - [deleted]         nonexistent
+ok 65 - deletion of a non-existent ref is not fed to post-receive and post-update hooks
+
+expecting success of 5516.66 'deletion of a non-existent ref alone does trigger post-receive and post-update hooks': 
+	mk_test_with_hooks testrepo heads/main &&
+	git push testrepo :refs/heads/nonexistent &&
+	(
+		cd testrepo/.git &&
+		cat >pre-receive.expect <<-EOF &&
+		$ZERO_OID $ZERO_OID refs/heads/nonexistent
+		EOF
+
+		cat >update.expect <<-EOF &&
+		refs/heads/nonexistent $ZERO_OID $ZERO_OID
+		EOF
+
+		test_cmp pre-receive.expect pre-receive.actual &&
+		test_cmp update.expect update.actual &&
+		test_path_is_missing post-receive.actual &&
+		test_path_is_missing post-update.actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: warning: deleting a non-existent ref        
+To testrepo
+ - [deleted]         nonexistent
+ok 66 - deletion of a non-existent ref alone does trigger post-receive and post-update hooks
+
+expecting success of 5516.67 'mixed ref updates, deletes, invalid deletes trigger hooks with correct input': 
+	mk_test_with_hooks testrepo heads/main heads/next heads/seen &&
+	orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
+	newmain=$(git show-ref -s --verify refs/heads/main) &&
+	orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
+	newnext=$ZERO_OID &&
+	orgseen=$(cd testrepo && git show-ref -s --verify refs/heads/seen) &&
+	newseen=$(git show-ref -s --verify refs/heads/main) &&
+	git push testrepo refs/heads/main:refs/heads/main \
+	    refs/heads/main:refs/heads/seen :refs/heads/next \
+	    :refs/heads/nonexistent &&
+	(
+		cd testrepo/.git &&
+		cat >pre-receive.expect <<-EOF &&
+		$orgmain $newmain refs/heads/main
+		$orgnext $newnext refs/heads/next
+		$orgseen $newseen refs/heads/seen
+		$ZERO_OID $ZERO_OID refs/heads/nonexistent
+		EOF
+
+		cat >update.expect <<-EOF &&
+		refs/heads/next $orgnext $newnext
+		refs/heads/nonexistent $ZERO_OID $ZERO_OID
+		refs/heads/main $orgmain $newmain
+		refs/heads/seen $orgseen $newseen
+		EOF
+
+		cat >post-receive.expect <<-EOF &&
+		$orgmain $newmain refs/heads/main
+		$orgnext $newnext refs/heads/next
+		$orgseen $newseen refs/heads/seen
+		EOF
+
+		cat >post-update.expect <<-EOF &&
+		refs/heads/main
+		refs/heads/next
+		refs/heads/seen
+		EOF
+
+		test_cmp pre-receive.expect pre-receive.actual &&
+		test_cmp update.expect update.actual &&
+		test_cmp post-receive.expect post-receive.actual &&
+		test_cmp post-update.expect post-update.actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> next
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> seen
+remote: warning: deleting a non-existent ref        
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ - [deleted]         next
+   b9c09d6..9ad36e1  main -> seen
+ - [deleted]         nonexistent
+ok 67 - mixed ref updates, deletes, invalid deletes trigger hooks with correct input
+
+expecting success of 5516.68 'allow deleting a ref using --delete': 
+	mk_test testrepo heads/main &&
+	(cd testrepo && git config receive.denyDeleteCurrent warn) &&
+	git push testrepo --delete main &&
+	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/main)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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        
+remote: warning: deleting the current branch        
+To testrepo
+ - [deleted]         main
+fatal: Needed a single revision
+ok 68 - allow deleting a ref using --delete
+
+expecting success of 5516.69 'allow deleting a tag using --delete': 
+	mk_test testrepo heads/main &&
+	git tag -a -m dummy_message deltag heads/main &&
+	git push testrepo --tags &&
+	(cd testrepo && git rev-parse --verify -q refs/tags/deltag) &&
+	git push testrepo --delete tag deltag &&
+	(cd testrepo && test_must_fail git rev-parse --verify refs/tags/deltag)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+To testrepo
+ * [new tag]         deltag -> deltag
+ * [new tag]         frotz -> frotz
+ * [new tag]         v1.0 -> v1.0
+7bbc2bd37a7570491d071ea0fdc2120c9eed7718
+To testrepo
+ - [deleted]         deltag
+fatal: Needed a single revision
+ok 69 - allow deleting a tag using --delete
+
+expecting success of 5516.70 'push --delete without args aborts': 
+	mk_test testrepo heads/main &&
+	test_must_fail git push testrepo --delete
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+fatal: --delete doesn't make sense without any refs
+ok 70 - push --delete without args aborts
+
+expecting success of 5516.71 'push --delete refuses src:dest refspecs': 
+	mk_test testrepo heads/main &&
+	test_must_fail git push testrepo --delete main:foo
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+fatal: --delete only accepts plain target ref names
+ok 71 - push --delete refuses src:dest refspecs
+
+expecting success of 5516.72 'push --delete refuses empty string': 
+	mk_test testrepo heads/master &&
+	test_must_fail git push testrepo --delete ""
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+notice: HEAD points to an unborn branch (main)
+fatal: --delete only accepts plain target ref names
+ok 72 - push --delete refuses empty string
+
+expecting success of 5516.73 'push --delete onelevel refspecs': 
+	mk_test testrepo heads/main &&
+	git -C testrepo update-ref refs/onelevel refs/heads/main &&
+	git push testrepo --delete refs/onelevel &&
+	test_must_fail git -C testrepo rev-parse --verify refs/onelevel
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+To testrepo
+ - [deleted]         refs/onelevel
+fatal: Needed a single revision
+ok 73 - push --delete onelevel refspecs
+
+expecting success of 5516.74 'warn on push to HEAD of non-bare repository': 
+	mk_test testrepo heads/main &&
+	(
+		cd testrepo &&
+		git checkout main &&
+		git config receive.denyCurrentBranch warn
+	) &&
+	git push testrepo main 2>stderr &&
+	grep "warning: updating the current branch" stderr
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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        
+ok 74 - warn on push to HEAD of non-bare repository
+
+expecting success of 5516.75 'deny push to HEAD of non-bare repository': 
+	mk_test testrepo heads/main &&
+	(
+		cd testrepo &&
+		git checkout main &&
+		git config receive.denyCurrentBranch true
+	) &&
+	test_must_fail git push testrepo main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Already on 'main'
+remote: error: refusing to update checked out branch: refs/heads/main        
+To testrepo
+ ! [remote rejected] main -> main (branch is currently checked out)
+error: failed to push some refs to 'testrepo'
+ok 75 - deny push to HEAD of non-bare repository
+
+expecting success of 5516.76 'allow push to HEAD of bare repository (bare)': 
+	mk_test testrepo heads/main &&
+	(
+		cd testrepo &&
+		git checkout main &&
+		git config receive.denyCurrentBranch true &&
+		git config core.bare true
+	) &&
+	git push testrepo main 2>stderr &&
+	! grep "warning: updating the current branch" stderr
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Already on 'main'
+ok 76 - allow push to HEAD of bare repository (bare)
+
+expecting success of 5516.77 'allow push to HEAD of non-bare repository (config)': 
+	mk_test testrepo heads/main &&
+	(
+		cd testrepo &&
+		git checkout main &&
+		git config receive.denyCurrentBranch false
+	) &&
+	git push testrepo main 2>stderr &&
+	! grep "warning: updating the current branch" stderr
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Already on 'main'
+ok 77 - allow push to HEAD of non-bare repository (config)
+
+checking prerequisite: WITH_BREAKING_CHANGES
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-WITH_BREAKING_CHANGES" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-WITH_BREAKING_CHANGES" &&
+	test -n "$WITH_BREAKING_CHANGES"
+
+)
+prerequisite WITH_BREAKING_CHANGES not satisfied
+expecting success of 5516.78 'fetch with branches': 
+	mk_empty testrepo &&
+	git branch second $the_first_commit &&
+	git checkout second &&
+	mkdir testrepo/.git/branches &&
+	echo ".." > testrepo/.git/branches/branch1 &&
+	(
+		cd testrepo &&
+		git fetch branch1 &&
+		echo "$the_commit commit	refs/heads/branch1" >expect &&
+		git for-each-ref refs/heads >actual &&
+		test_cmp expect actual
+	) &&
+	git checkout main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+Switched to branch 'second'
+warning: reading remote from "branches/branch1", which is nominated for removal.
+
+If you still use the "remotes/" directory it is recommended to
+migrate to config-based remotes:
+
+	git remote rename branch1 branch1
+
+If you cannot, please let us know why you still need to use it by
+sending an e-mail to <git@vger.kernel.org>.
+From ..
+ * [new branch]      main       -> branch1
+ * [new tag]         deltag     -> deltag
+ * [new tag]         frotz      -> frotz
+ * [new tag]         v1.0       -> v1.0
+Switched to branch 'main'
+ok 78 - fetch with branches
+
+expecting success of 5516.79 'fetch with branches containing #': 
+	mk_empty testrepo &&
+	mkdir testrepo/.git/branches &&
+	echo "..#second" > testrepo/.git/branches/branch2 &&
+	(
+		cd testrepo &&
+		git fetch branch2 &&
+		echo "$the_first_commit commit	refs/heads/branch2" >expect &&
+		git for-each-ref refs/heads >actual &&
+		test_cmp expect actual
+	) &&
+	git checkout main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+warning: reading remote from "branches/branch2", which is nominated for removal.
+
+If you still use the "remotes/" directory it is recommended to
+migrate to config-based remotes:
+
+	git remote rename branch2 branch2
+
+If you cannot, please let us know why you still need to use it by
+sending an e-mail to <git@vger.kernel.org>.
+From ..
+ * [new branch]      second     -> branch2
+Already on 'main'
+ok 79 - fetch with branches containing #
+
+expecting success of 5516.80 'push with branches': 
+	mk_empty testrepo &&
+	git checkout second &&
+
+	test_when_finished "rm -rf .git/branches" &&
+	mkdir .git/branches &&
+	echo "testrepo" > .git/branches/branch1 &&
+
+	git push branch1 &&
+	(
+		cd testrepo &&
+		echo "$the_first_commit commit	refs/heads/main" >expect &&
+		git for-each-ref refs/heads >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+Switched to branch 'second'
+warning: reading remote from "branches/branch1", which is nominated for removal.
+
+If you still use the "remotes/" directory it is recommended to
+migrate to config-based remotes:
+
+	git remote rename branch1 branch1
+
+If you cannot, please let us know why you still need to use it by
+sending an e-mail to <git@vger.kernel.org>.
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      HEAD -> main
+ok 80 - push with branches
+
+expecting success of 5516.81 'push with branches containing #': 
+	mk_empty testrepo &&
+
+	test_when_finished "rm -rf .git/branches" &&
+	mkdir .git/branches &&
+	echo "testrepo#branch3" > .git/branches/branch2 &&
+
+	git push branch2 &&
+	(
+		cd testrepo &&
+		echo "$the_first_commit commit	refs/heads/branch3" >expect &&
+		git for-each-ref refs/heads >actual &&
+		test_cmp expect actual
+	) &&
+	git checkout main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+warning: reading remote from "branches/branch2", which is nominated for removal.
+
+If you still use the "remotes/" directory it is recommended to
+migrate to config-based remotes:
+
+	git remote rename branch2 branch2
+
+If you cannot, please let us know why you still need to use it by
+sending an e-mail to <git@vger.kernel.org>.
+To testrepo
+ * [new branch]      HEAD -> branch3
+Switched to branch 'main'
+ok 81 - push with branches containing #
+
+expecting success of 5516.82 'push into aliased refs (consistent)': 
+	mk_test testrepo heads/main &&
+	mk_child testrepo child1 &&
+	mk_child testrepo child2 &&
+	(
+		cd child1 &&
+		git branch foo &&
+		git symbolic-ref refs/heads/bar refs/heads/foo &&
+		git config receive.denyCurrentBranch false
+	) &&
+	(
+		cd child2 &&
+		>path2 &&
+		git add path2 &&
+		test_tick &&
+		git commit -a -m child2 &&
+		git branch foo &&
+		git branch bar &&
+		git push ../child1 foo bar
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Cloning into 'child1'...
+done.
+Cloning into 'child2'...
+done.
+[main aee3f74] child2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+To ../child1
+   b9c09d6..aee3f74  bar -> bar
+   b9c09d6..aee3f74  foo -> foo
+ok 82 - push into aliased refs (consistent)
+
+expecting success of 5516.83 'push into aliased refs (inconsistent)': 
+	mk_test testrepo heads/main &&
+	mk_child testrepo child1 &&
+	mk_child testrepo child2 &&
+	(
+		cd child1 &&
+		git branch foo &&
+		git symbolic-ref refs/heads/bar refs/heads/foo &&
+		git config receive.denyCurrentBranch false
+	) &&
+	(
+		cd child2 &&
+		>path2 &&
+		git add path2 &&
+		test_tick &&
+		git commit -a -m child2 &&
+		git branch foo &&
+		>path3 &&
+		git add path3 &&
+		test_tick &&
+		git commit -a -m child2 &&
+		git branch bar &&
+		test_must_fail git push ../child1 foo bar 2>stderr &&
+		grep "refusing inconsistent update" stderr
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Cloning into 'child1'...
+done.
+Cloning into 'child2'...
+done.
+[main aee3f74] child2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+[main a725715] child2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path3
+remote: error: refusing inconsistent update between symref 'refs/heads/bar' (b9c09d6..a725715) and its target 'refs/heads/foo' (b9c09d6..aee3f74)        
+ok 83 - push into aliased refs (inconsistent)
+
+expecting success of 5516.84 'force pushing required to update lightweight tag': 
+		mk_test testrepo heads/main &&
+		mk_child testrepo child1 &&
+		mk_child testrepo child2 &&
+		(
+			cd child1 &&
+			git tag testTag &&
+			git push ../child2 testTag &&
+			>file1 &&
+			git add file1 &&
+			git commit -m 'file1' &&
+			git tag -f testTag &&
+			test_must_fail git push ../child2 testTag &&
+			git push --force ../child2 testTag &&
+			git tag -f testTag HEAD~ &&
+			test_must_fail git push ../child2 testTag &&
+			git push --force ../child2 testTag &&
+
+			# Clobbering without + in refspec needs --force
+			git tag -f testTag &&
+			test_must_fail git push ../child2 'refs/tags/*:refs/tags/*' &&
+			git push --force ../child2 'refs/tags/*:refs/tags/*' &&
+
+			# Clobbering with + in refspec does not need --force
+			git tag -f testTag HEAD~ &&
+			git push ../child2 '+refs/tags/*:refs/tags/*' &&
+
+			# Clobbering with --no-force still obeys + in refspec
+			git tag -f testTag &&
+			git push --no-force ../child2 '+refs/tags/*:refs/tags/*' &&
+
+			# Clobbering with/without --force and 'tag <name>' format
+			git tag -f testTag HEAD~ &&
+			test_must_fail git push ../child2 tag testTag &&
+			git push --force ../child2 tag testTag
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Cloning into 'child1'...
+done.
+Cloning into 'child2'...
+done.
+To ../child2
+ * [new tag]         testTag -> testTag
+[main 679dfc1] file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+Updated tag 'testTag' (was b9c09d6)
+To ../child2
+ ! [rejected]        testTag -> testTag (already exists)
+error: failed to push some refs to '../child2'
+hint: Updates were rejected because the tag already exists in the remote.
+To ../child2
+ + b9c09d6...679dfc1 testTag -> testTag (forced update)
+Updated tag 'testTag' (was 679dfc1)
+To ../child2
+ ! [rejected]        testTag -> testTag (already exists)
+error: failed to push some refs to '../child2'
+hint: Updates were rejected because the tag already exists in the remote.
+To ../child2
+ + 679dfc1...b9c09d6 testTag -> testTag (forced update)
+Updated tag 'testTag' (was b9c09d6)
+To ../child2
+ ! [rejected]        testTag -> testTag (already exists)
+error: failed to push some refs to '../child2'
+hint: Updates were rejected because the tag already exists in the remote.
+To ../child2
+ + b9c09d6...679dfc1 testTag -> testTag (forced update)
+Updated tag 'testTag' (was 679dfc1)
+To ../child2
+ + 679dfc1...b9c09d6 testTag -> testTag (forced update)
+Updated tag 'testTag' (was b9c09d6)
+To ../child2
+ + b9c09d6...679dfc1 testTag -> testTag (forced update)
+Updated tag 'testTag' (was 679dfc1)
+To ../child2
+ ! [rejected]        testTag -> testTag (already exists)
+error: failed to push some refs to '../child2'
+hint: Updates were rejected because the tag already exists in the remote.
+To ../child2
+ + 679dfc1...b9c09d6 testTag -> testTag (forced update)
+ok 84 - force pushing required to update lightweight tag
+
+expecting success of 5516.85 'force pushing required to update annotated tag': 
+		mk_test testrepo heads/main &&
+		mk_child testrepo child1 &&
+		mk_child testrepo child2 &&
+		(
+			cd child1 &&
+			git tag testTag &&
+			git push ../child2 testTag &&
+			>file1 &&
+			git add file1 &&
+			git commit -m 'file1' &&
+			git tag -f -a -m'tag message' testTag &&
+			test_must_fail git push ../child2 testTag &&
+			git push --force ../child2 testTag &&
+			git tag -f -a -m'tag message' testTag HEAD~ &&
+			test_must_fail git push ../child2 testTag &&
+			git push --force ../child2 testTag &&
+
+			# Clobbering without + in refspec needs --force
+			git tag -f testTag &&
+			test_must_fail git push ../child2 'refs/tags/*:refs/tags/*' &&
+			git push --force ../child2 'refs/tags/*:refs/tags/*' &&
+
+			# Clobbering with + in refspec does not need --force
+			git tag -f testTag HEAD~ &&
+			git push ../child2 '+refs/tags/*:refs/tags/*' &&
+
+			# Clobbering with --no-force still obeys + in refspec
+			git tag -f testTag &&
+			git push --no-force ../child2 '+refs/tags/*:refs/tags/*' &&
+
+			# Clobbering with/without --force and 'tag <name>' format
+			git tag -f testTag HEAD~ &&
+			test_must_fail git push ../child2 tag testTag &&
+			git push --force ../child2 tag testTag
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Cloning into 'child1'...
+done.
+Cloning into 'child2'...
+done.
+To ../child2
+ * [new tag]         testTag -> testTag
+[main 679dfc1] file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+Updated tag 'testTag' (was b9c09d6)
+To ../child2
+ ! [rejected]        testTag -> testTag (already exists)
+error: failed to push some refs to '../child2'
+hint: Updates were rejected because the tag already exists in the remote.
+To ../child2
+ + b9c09d6...18e054b testTag -> testTag (forced update)
+Updated tag 'testTag' (was 18e054b)
+To ../child2
+ ! [rejected]        testTag -> testTag (already exists)
+error: failed to push some refs to '../child2'
+hint: Updates were rejected because the tag already exists in the remote.
+To ../child2
+ + 18e054b...4655ebe testTag -> testTag (forced update)
+Updated tag 'testTag' (was 4655ebe)
+To ../child2
+ ! [rejected]        testTag -> testTag (already exists)
+error: failed to push some refs to '../child2'
+hint: Updates were rejected because the tag already exists in the remote.
+To ../child2
+ + 4655ebe...679dfc1 testTag -> testTag (forced update)
+Updated tag 'testTag' (was 679dfc1)
+To ../child2
+ + 679dfc1...b9c09d6 testTag -> testTag (forced update)
+Updated tag 'testTag' (was b9c09d6)
+To ../child2
+ + b9c09d6...679dfc1 testTag -> testTag (forced update)
+Updated tag 'testTag' (was 679dfc1)
+To ../child2
+ ! [rejected]        testTag -> testTag (already exists)
+error: failed to push some refs to '../child2'
+hint: Updates were rejected because the tag already exists in the remote.
+To ../child2
+ + 679dfc1...b9c09d6 testTag -> testTag (forced update)
+ok 85 - force pushing required to update annotated tag
+
+expecting success of 5516.86 'fetch will not clobber an existing lightweight tag without --force': 
+		mk_test testrepo heads/main &&
+		mk_child testrepo child1 &&
+		mk_child testrepo child2 &&
+		(
+			cd testrepo &&
+			git tag testTag &&
+			git -C ../child1 fetch origin tag testTag &&
+			>file1 &&
+			git add file1 &&
+			git commit -m 'file1' &&
+			git tag -f testTag &&
+			test_must_fail git -C ../child1 fetch origin tag testTag &&
+			git -C ../child1 fetch origin '+refs/tags/*:refs/tags/*'
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Cloning into 'child1'...
+done.
+Cloning into 'child2'...
+done.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
+ * [new tag]         testTag    -> testTag
+[main 9770895] file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename path1 => file1 (100%)
+Updated tag 'testTag' (was b9c09d6)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
+ ! [rejected]        testTag    -> testTag  (would clobber existing tag)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
+ t [tag update]      testTag    -> testTag
+ok 86 - fetch will not clobber an existing lightweight tag without --force
+
+expecting success of 5516.87 'fetch will not clobber an existing annotated tag without --force': 
+		mk_test testrepo heads/main &&
+		mk_child testrepo child1 &&
+		mk_child testrepo child2 &&
+		(
+			cd testrepo &&
+			git tag testTag &&
+			git -C ../child1 fetch origin tag testTag &&
+			>file1 &&
+			git add file1 &&
+			git commit -m 'file1' &&
+			git tag -f -a -m'tag message' testTag &&
+			test_must_fail git -C ../child1 fetch origin tag testTag &&
+			git -C ../child1 fetch origin '+refs/tags/*:refs/tags/*'
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Cloning into 'child1'...
+done.
+Cloning into 'child2'...
+done.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
+ * [new tag]         testTag    -> testTag
+[main 9770895] file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename path1 => file1 (100%)
+Updated tag 'testTag' (was b9c09d6)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
+ ! [rejected]        testTag    -> testTag  (would clobber existing tag)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
+ t [tag update]      testTag    -> testTag
+ok 87 - fetch will not clobber an existing annotated tag without --force
+
+expecting success of 5516.88 'push --porcelain': 
+	mk_empty testrepo &&
+	echo >.git/foo  "To testrepo" &&
+	echo >>.git/foo "*	refs/heads/main:refs/remotes/origin/main	[new reference]"  &&
+	echo >>.git/foo "Done" &&
+	git push >.git/bar --porcelain  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
+	) &&
+	test_cmp .git/foo .git/bar
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+ok 88 - push --porcelain
+
+expecting success of 5516.89 'push --porcelain bad url': 
+	mk_empty testrepo &&
+	test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/main:refs/remotes/origin/main &&
+	! grep -q Done .git/bar
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+fatal: 'asdfasdfasd' 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.
+ok 89 - push --porcelain bad url
+
+expecting success of 5516.90 'push --porcelain rejected': 
+	mk_empty testrepo &&
+	git push testrepo refs/heads/main:refs/remotes/origin/main &&
+	(cd testrepo &&
+		git reset --hard origin/main^ &&
+		git config receive.denyCurrentBranch true) &&
+
+	echo >.git/foo  "To testrepo"  &&
+	echo >>.git/foo "!	refs/heads/main:refs/heads/main	[remote rejected] (branch is currently checked out)" &&
+	echo >>.git/foo "Done" &&
+
+	test_must_fail git push >.git/bar --porcelain  testrepo refs/heads/main:refs/heads/main &&
+	test_cmp .git/foo .git/bar
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new reference]   main -> origin/main
+HEAD is now at b9c09d6 repo
+remote: error: refusing to update checked out branch: refs/heads/main        
+error: failed to push some refs to 'testrepo'
+ok 90 - push --porcelain rejected
+
+expecting success of 5516.91 'push --porcelain --dry-run rejected': 
+	mk_empty testrepo &&
+	git push testrepo refs/heads/main:refs/remotes/origin/main &&
+	(cd testrepo &&
+		git reset --hard origin/main &&
+		git config receive.denyCurrentBranch true) &&
+
+	echo >.git/foo  "To testrepo"  &&
+	echo >>.git/foo "!	refs/heads/main^:refs/heads/main	[rejected] (non-fast-forward)" &&
+	echo >>.git/foo "Done" &&
+
+	test_must_fail git push >.git/bar --porcelain  --dry-run testrepo refs/heads/main^:refs/heads/main &&
+	test_cmp .git/foo .git/bar
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new reference]   main -> origin/main
+HEAD is now at 9ad36e1 second
+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.
+ok 91 - push --porcelain --dry-run rejected
+
+expecting success of 5516.92 'push --prune': 
+	mk_test testrepo heads/main heads/foo heads/bar &&
+	git push --prune testrepo : &&
+	check_push_result testrepo $the_commit heads/main &&
+	! check_push_result testrepo $the_first_commit heads/foo heads/bar
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> foo
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> bar
+remote: warning: updating the current branch        
+To testrepo
+ - [deleted]         bar
+ - [deleted]         foo
+   b9c09d6..9ad36e1  main -> main
+fatal: 'refs/heads/foo' - not a valid ref
+ok 92 - push --prune
+
+expecting success of 5516.93 'push --prune refspec': 
+	mk_test testrepo tmp/main tmp/foo tmp/bar &&
+	git push --prune testrepo "refs/heads/*:refs/tmp/*" &&
+	check_push_result testrepo $the_commit tmp/main &&
+	! check_push_result testrepo $the_first_commit tmp/foo tmp/bar
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/tmp/main
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/tmp/foo
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/tmp/bar
+notice: HEAD points to an unborn branch (main)
+To testrepo
+ - [deleted]         refs/tmp/bar
+ - [deleted]         refs/tmp/foo
+   b9c09d6..9ad36e1  main -> refs/tmp/main
+ * [new reference]   branch1 -> refs/tmp/branch1
+ * [new reference]   branch2 -> refs/tmp/branch2
+ * [new reference]   second -> refs/tmp/second
+ * [new reference]   t/main -> refs/tmp/t/main
+notice: HEAD points to an unborn branch (main)
+fatal: 'refs/tmp/foo' - not a valid ref
+ok 93 - push --prune refspec
+
+expecting success of 5516.94 'push to update a ref hidden by transfer.hiderefs': 
+		mk_test testrepo heads/main hidden/one hidden/two hidden/three &&
+		(
+			cd testrepo &&
+			git config $configsection.hiderefs refs/hidden
+		) &&
+
+		# push to unhidden ref succeeds normally
+		git push testrepo main:refs/heads/main &&
+		check_push_result testrepo $the_commit heads/main &&
+
+		# push to update a hidden ref should fail
+		test_must_fail git push testrepo main:refs/hidden/one &&
+		check_push_result testrepo $the_first_commit hidden/one &&
+
+		# push to delete a hidden ref should fail
+		test_must_fail git push testrepo :refs/hidden/two &&
+		check_push_result testrepo $the_first_commit hidden/two &&
+
+		# idempotent push to update a hidden ref should fail
+		test_must_fail git push testrepo $the_first_commit:refs/hidden/three &&
+		check_push_result testrepo $the_first_commit hidden/three
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> refs/hidden/one
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/hidden/two
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/hidden/three
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+To testrepo
+ ! [remote rejected] main -> refs/hidden/one (deny updating a hidden ref)
+error: failed to push some refs to 'testrepo'
+To testrepo
+ ! [remote rejected] refs/hidden/two (deny deleting a hidden ref)
+error: failed to push some refs to 'testrepo'
+To testrepo
+ ! [remote rejected] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/hidden/three (deny updating a hidden ref)
+error: failed to push some refs to 'testrepo'
+ok 94 - push to update a ref hidden by transfer.hiderefs
+
+expecting success of 5516.95 'push to update a ref hidden by receive.hiderefs': 
+		mk_test testrepo heads/main hidden/one hidden/two hidden/three &&
+		(
+			cd testrepo &&
+			git config $configsection.hiderefs refs/hidden
+		) &&
+
+		# push to unhidden ref succeeds normally
+		git push testrepo main:refs/heads/main &&
+		check_push_result testrepo $the_commit heads/main &&
+
+		# push to update a hidden ref should fail
+		test_must_fail git push testrepo main:refs/hidden/one &&
+		check_push_result testrepo $the_first_commit hidden/one &&
+
+		# push to delete a hidden ref should fail
+		test_must_fail git push testrepo :refs/hidden/two &&
+		check_push_result testrepo $the_first_commit hidden/two &&
+
+		# idempotent push to update a hidden ref should fail
+		test_must_fail git push testrepo $the_first_commit:refs/hidden/three &&
+		check_push_result testrepo $the_first_commit hidden/three
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> refs/hidden/one
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/hidden/two
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/hidden/three
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+To testrepo
+ ! [remote rejected] main -> refs/hidden/one (deny updating a hidden ref)
+error: failed to push some refs to 'testrepo'
+To testrepo
+ ! [remote rejected] refs/hidden/two (deny deleting a hidden ref)
+error: failed to push some refs to 'testrepo'
+To testrepo
+ ! [remote rejected] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/hidden/three (deny updating a hidden ref)
+error: failed to push some refs to 'testrepo'
+ok 95 - push to update a ref hidden by receive.hiderefs
+
+expecting success of 5516.96 'fetch exact oid': 
+	mk_test testrepo heads/main hidden/one &&
+	git push testrepo main:refs/hidden/one &&
+	(
+		cd testrepo &&
+		git config transfer.hiderefs refs/hidden
+	) &&
+	check_push_result testrepo $the_commit hidden/one &&
+
+	mk_child testrepo child &&
+	(
+		cd child &&
+
+		# make sure $the_commit does not exist here
+		git repack -a -d &&
+		git prune &&
+		test_must_fail git cat-file -t $the_commit &&
+
+		# Some protocol versions (e.g. 2) support fetching
+		# unadvertised objects, so restrict this test to v0.
+
+		# fetching the hidden object should fail by default
+		test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+			git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err &&
+		test_grep "Server does not allow request for unadvertised object" err &&
+		test_must_fail git rev-parse --verify refs/heads/copy &&
+
+		# the server side can allow it to succeed
+		(
+			cd ../testrepo &&
+			git config uploadpack.allowtipsha1inwant true
+		) &&
+
+		git fetch -v ../testrepo $the_commit:refs/heads/copy main:refs/heads/extra &&
+		cat >expect <<-EOF &&
+		$the_commit
+		$the_first_commit
+		EOF
+		{
+			git rev-parse --verify refs/heads/copy &&
+			git rev-parse --verify refs/heads/extra
+		} >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> refs/hidden/one
+To testrepo
+   b9c09d6..9ad36e1  main -> refs/hidden/one
+Cloning into 'child'...
+done.
+fatal: git cat-file: could not get object info
+error: Server does not allow request for unadvertised object 9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
+fatal: Needed a single revision
+From ../testrepo
+ * [new ref]         9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f -> copy
+ * [new branch]      main                                     -> extra
+ok 96 - fetch exact oid
+
+expecting success of 5516.97 'fetch exact oid in protocol v2': 
+	mk_test testrepo heads/main hidden/one &&
+	git push testrepo main:refs/hidden/one &&
+	git -C testrepo config transfer.hiderefs refs/hidden &&
+	check_push_result testrepo $the_commit hidden/one &&
+
+	mk_child testrepo child &&
+	git -C child config protocol.version 2 &&
+
+	# make sure $the_commit does not exist here
+	git -C child repack -a -d &&
+	git -C child prune &&
+	test_must_fail git -C child cat-file -t $the_commit &&
+
+	# fetching the hidden object succeeds by default
+	GIT_TRACE_PACKET=$PWD/trace.out \
+	git -C child fetch -v ../testrepo $the_commit:refs/heads/copy &&
+
+	test_grep ! "ref-prefix.*$the_commit" trace.out
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> refs/hidden/one
+To testrepo
+   b9c09d6..9ad36e1  main -> refs/hidden/one
+Cloning into 'child'...
+done.
+fatal: git cat-file: could not get object info
+From ../testrepo
+ * [new ref]         9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f -> copy
+ok 97 - fetch exact oid in protocol v2
+
+expecting success of 5516.98 'shallow fetch reachable SHA1 (but not a ref), allowtipsha1inwant=true': 
+		mk_empty testrepo &&
+		(
+			cd testrepo &&
+			git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
+			git commit --allow-empty -m foo &&
+			git commit --allow-empty -m bar
+		) &&
+		SHA1=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
+		mk_empty shallow &&
+		(
+			cd shallow &&
+			# 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 fetch --depth=1 ../testrepo/.git $SHA1 &&
+			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
+			git fetch --depth=1 ../testrepo/.git $SHA1 &&
+			git cat-file commit $SHA1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+[main (root-commit) 27a428a] foo
+ Author: A U Thor <author@example.com>
+[main 0722cdc] bar
+ Author: A U Thor <author@example.com>
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/shallow/.git/
+error: git upload-pack: not our ref 27a428ae90b537d8c39cbd2f79affd38be38d173
+fatal: remote error: upload-pack: not our ref 27a428ae90b537d8c39cbd2f79affd38be38d173
+From ../testrepo/
+ * branch            27a428ae90b537d8c39cbd2f79affd38be38d173 -> FETCH_HEAD
+tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+author A U Thor <author@example.com> 1112912353 -0700
+committer C O Mitter <committer@example.com> 1112912353 -0700
+
+foo
+ok 98 - shallow fetch reachable SHA1 (but not a ref), allowtipsha1inwant=true
+
+expecting success of 5516.99 'deny fetch unreachable SHA1, allowtipsha1inwant=true': 
+		mk_empty testrepo &&
+		(
+			cd testrepo &&
+			git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
+			git commit --allow-empty -m foo &&
+			git commit --allow-empty -m bar &&
+			git commit --allow-empty -m xyz
+		) &&
+		SHA1_1=$(git --git-dir=testrepo/.git rev-parse HEAD^^) &&
+		SHA1_2=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
+		SHA1_3=$(git --git-dir=testrepo/.git rev-parse HEAD) &&
+		(
+			cd testrepo &&
+			git reset --hard $SHA1_2 &&
+			git cat-file commit $SHA1_1 &&
+			git cat-file commit $SHA1_3
+		) &&
+		mk_empty shallow &&
+		(
+			cd shallow &&
+			# 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 fetch ../testrepo/.git $SHA1_3 &&
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+				git fetch ../testrepo/.git $SHA1_1 &&
+			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
+			git fetch ../testrepo/.git $SHA1_1 &&
+			git cat-file commit $SHA1_1 &&
+			test_must_fail git cat-file commit $SHA1_2 &&
+			git fetch ../testrepo/.git $SHA1_2 &&
+			git cat-file commit $SHA1_2 &&
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+				git fetch ../testrepo/.git $SHA1_3 2>err &&
+			# ideally we would insist this be on a "remote error:"
+			# line, but it is racy; see the commit message
+			test_grep "not our ref.*$SHA1_3\$" err
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+[main (root-commit) 27a428a] foo
+ Author: A U Thor <author@example.com>
+[main 0722cdc] bar
+ Author: A U Thor <author@example.com>
+[main 53e3aa4] xyz
+ Author: A U Thor <author@example.com>
+HEAD is now at 0722cdc bar
+tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+author A U Thor <author@example.com> 1112912353 -0700
+committer C O Mitter <committer@example.com> 1112912353 -0700
+
+foo
+tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+parent 0722cdcaa8018927dc8055be38d3931723602b78
+author A U Thor <author@example.com> 1112912353 -0700
+committer C O Mitter <committer@example.com> 1112912353 -0700
+
+xyz
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/shallow/.git/
+error: git upload-pack: not our ref 53e3aa4356160fbed444579cbd52c3ecb9817950
+fatal: remote error: upload-pack: not our ref 53e3aa4356160fbed444579cbd52c3ecb9817950
+error: git upload-pack: not our ref 27a428ae90b537d8c39cbd2f79affd38be38d173
+fatal: remote error: upload-pack: not our ref 27a428ae90b537d8c39cbd2f79affd38be38d173
+From ../testrepo/
+ * branch            27a428ae90b537d8c39cbd2f79affd38be38d173 -> FETCH_HEAD
+tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+author A U Thor <author@example.com> 1112912353 -0700
+committer C O Mitter <committer@example.com> 1112912353 -0700
+
+foo
+fatal: git cat-file 0722cdcaa8018927dc8055be38d3931723602b78: bad file
+From ../testrepo/
+ * branch            0722cdcaa8018927dc8055be38d3931723602b78 -> FETCH_HEAD
+tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+parent 27a428ae90b537d8c39cbd2f79affd38be38d173
+author A U Thor <author@example.com> 1112912353 -0700
+committer C O Mitter <committer@example.com> 1112912353 -0700
+
+bar
+error: git upload-pack: not our ref 53e3aa4356160fbed444579cbd52c3ecb9817950
+fatal: remote error: upload-pack: not our ref 53e3aa4356160fbed444579cbd52c3ecb9817950
+ok 99 - deny fetch unreachable SHA1, allowtipsha1inwant=true
+
+expecting success of 5516.100 'shallow fetch reachable SHA1 (but not a ref), allowtipsha1inwant=false': 
+		mk_empty testrepo &&
+		(
+			cd testrepo &&
+			git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
+			git commit --allow-empty -m foo &&
+			git commit --allow-empty -m bar
+		) &&
+		SHA1=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
+		mk_empty shallow &&
+		(
+			cd shallow &&
+			# 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 fetch --depth=1 ../testrepo/.git $SHA1 &&
+			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
+			git fetch --depth=1 ../testrepo/.git $SHA1 &&
+			git cat-file commit $SHA1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+[main (root-commit) 27a428a] foo
+ Author: A U Thor <author@example.com>
+[main 0722cdc] bar
+ Author: A U Thor <author@example.com>
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/shallow/.git/
+error: Server does not allow request for unadvertised object 27a428ae90b537d8c39cbd2f79affd38be38d173
+From ../testrepo/
+ * branch            27a428ae90b537d8c39cbd2f79affd38be38d173 -> FETCH_HEAD
+tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+author A U Thor <author@example.com> 1112912353 -0700
+committer C O Mitter <committer@example.com> 1112912353 -0700
+
+foo
+ok 100 - shallow fetch reachable SHA1 (but not a ref), allowtipsha1inwant=false
+
+expecting success of 5516.101 'deny fetch unreachable SHA1, allowtipsha1inwant=false': 
+		mk_empty testrepo &&
+		(
+			cd testrepo &&
+			git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
+			git commit --allow-empty -m foo &&
+			git commit --allow-empty -m bar &&
+			git commit --allow-empty -m xyz
+		) &&
+		SHA1_1=$(git --git-dir=testrepo/.git rev-parse HEAD^^) &&
+		SHA1_2=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
+		SHA1_3=$(git --git-dir=testrepo/.git rev-parse HEAD) &&
+		(
+			cd testrepo &&
+			git reset --hard $SHA1_2 &&
+			git cat-file commit $SHA1_1 &&
+			git cat-file commit $SHA1_3
+		) &&
+		mk_empty shallow &&
+		(
+			cd shallow &&
+			# 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 fetch ../testrepo/.git $SHA1_3 &&
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+				git fetch ../testrepo/.git $SHA1_1 &&
+			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
+			git fetch ../testrepo/.git $SHA1_1 &&
+			git cat-file commit $SHA1_1 &&
+			test_must_fail git cat-file commit $SHA1_2 &&
+			git fetch ../testrepo/.git $SHA1_2 &&
+			git cat-file commit $SHA1_2 &&
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+				git fetch ../testrepo/.git $SHA1_3 2>err &&
+			# ideally we would insist this be on a "remote error:"
+			# line, but it is racy; see the commit message
+			test_grep "not our ref.*$SHA1_3\$" err
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+[main (root-commit) 27a428a] foo
+ Author: A U Thor <author@example.com>
+[main 0722cdc] bar
+ Author: A U Thor <author@example.com>
+[main 53e3aa4] xyz
+ Author: A U Thor <author@example.com>
+HEAD is now at 0722cdc bar
+tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+author A U Thor <author@example.com> 1112912353 -0700
+committer C O Mitter <committer@example.com> 1112912353 -0700
+
+foo
+tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+parent 0722cdcaa8018927dc8055be38d3931723602b78
+author A U Thor <author@example.com> 1112912353 -0700
+committer C O Mitter <committer@example.com> 1112912353 -0700
 
-	test_when_finished "rm -f log" &&
-	GIT_TRACE_PACKET="$(pwd)/log" \
-		git -C exact-oid-head fetch --no-tags origin \
-			$commit:refs/heads/exact &&
-	test_grep ! command=ls-refs log
+xyz
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/shallow/.git/
+error: Server does not allow request for unadvertised object 53e3aa4356160fbed444579cbd52c3ecb9817950
+error: Server does not allow request for unadvertised object 27a428ae90b537d8c39cbd2f79affd38be38d173
+From ../testrepo/
+ * branch            27a428ae90b537d8c39cbd2f79affd38be38d173 -> FETCH_HEAD
+tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+author A U Thor <author@example.com> 1112912353 -0700
+committer C O Mitter <committer@example.com> 1112912353 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5702-protocol-v2/exact-oid-head/.git/
-From ../prefix-parent
- * [new ref]         70654ada25b2d7f3366dc3dfeb714cdc906df73c -> exact
-ok 47 - exact oid fetch avoids pointless HEAD request
+foo
+fatal: git cat-file 0722cdcaa8018927dc8055be38d3931723602b78: bad file
+From ../testrepo/
+ * branch            0722cdcaa8018927dc8055be38d3931723602b78 -> FETCH_HEAD
+tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+parent 27a428ae90b537d8c39cbd2f79affd38be38d173
+author A U Thor <author@example.com> 1112912353 -0700
+committer C O Mitter <committer@example.com> 1112912353 -0700
 
-expecting success of 5702.48 '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") &&
+bar
+error: git upload-pack: not our ref 53e3aa4356160fbed444579cbd52c3ecb9817950
+fatal: remote error: upload-pack: not our ref 53e3aa4356160fbed444579cbd52c3ecb9817950
+ok 101 - deny fetch unreachable SHA1, allowtipsha1inwant=false
 
-	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)" &&
+expecting success of 5516.102 'fetch follows tags by default': 
+	mk_test testrepo heads/main &&
+	test_when_finished "rm -rf src" &&
+	git init src &&
+	(
+		cd src &&
+		git pull ../testrepo main &&
+		git tag -m "annotated" tag &&
+		git for-each-ref >tmp1 &&
+		sed -n "p; s|refs/heads/main$|refs/remotes/origin/main|p" tmp1 |
+		sed -n "p; s|refs/heads/main$|refs/remotes/origin/HEAD|p"  |
+		sort -k 4 >../expect
+	) &&
+	test_when_finished "rm -rf dst" &&
+	git init dst &&
+	(
+		cd dst &&
+		git remote add origin ../src &&
+		git config branch.main.remote origin &&
+		git config branch.main.merge refs/heads/main &&
+		git pull &&
+		git for-each-ref >../actual
+	) &&
+	test_cmp expect actual
 
-	# 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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/src/.git/
+From ../testrepo
+ * branch            main       -> FETCH_HEAD
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst/.git/
+From ../src
+ * [new branch]      main       -> origin/main
+ * [new tag]         tag        -> tag
+ok 102 - fetch follows tags by default
 
-	# 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)
+expecting success of 5516.103 'peeled advertisements are not considered ref tips': 
+	mk_empty testrepo &&
+	git -C testrepo commit --allow-empty -m one &&
+	git -C testrepo commit --allow-empty -m two &&
+	git -C testrepo tag -m foo mytag HEAD^ &&
+	oid=$(git -C testrepo rev-parse mytag^{commit}) &&
+	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+		git fetch testrepo $oid 2>err &&
+	test_grep "Server does not allow request for unadvertised object" err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5702-protocol-v2/server/.git/
-[main (root-commit) 7f427d6] dwim
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+[main (root-commit) ae80332] one
  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.51.0/t/trash directory.t5702-protocol-v2/client/.git/
-From file:///build/reproducible-path/git-2.51.0/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 48 - fetch supports various ways of have lines
-
-expecting success of 5702.49 '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 &&
+[main 882ef1f] two
+ Author: A U Thor <author@example.com>
+error: Server does not allow request for unadvertised object ae8033205e59137fe14e6d2202714f7f9987ca7e
+ok 103 - peeled advertisements are not considered ref tips
 
-	git -C client cat-file -e $(git -C client rev-parse annotated_tag)
+expecting success of 5516.104 'pushing a specific ref applies remote.$name.push as refmap': 
+	mk_test testrepo heads/main &&
+	test_when_finished "rm -rf src" &&
+	git init src &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	(
+		cd src &&
+		git pull ../testrepo main &&
+		git branch next &&
+		git config remote.dst.url ../dst &&
+		git config remote.dst.push "+refs/heads/*:refs/remotes/src/*" &&
+		git push dst main &&
+		git show-ref refs/heads/main |
+		sed -e "s|refs/heads/|refs/remotes/src/|" >../dst/expect
+	) &&
+	(
+		cd dst &&
+		test_must_fail git show-ref refs/heads/next &&
+		test_must_fail git show-ref refs/heads/main &&
+		git show-ref refs/remotes/src/main >actual
+	) &&
+	test_cmp dst/expect dst/actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t5702-protocol-v2/client/.git/
-From /build/reproducible-path/git-2.51.0/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 49 - fetch supports include-tag and tag following
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst/
+From ../testrepo
+ * branch            main       -> FETCH_HEAD
+To ../dst
+ * [new reference]   main -> src/main
+ok 104 - pushing a specific ref applies remote.$name.push as refmap
 
-expecting success of 5702.50 'upload-pack respects client shallows': 
-	rm -rf server client trace &&
+expecting success of 5516.105 'with no remote.$name.push, it is not used as refmap': 
+	mk_test testrepo heads/main &&
+	test_when_finished "rm -rf src" &&
+	git init src &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	(
+		cd src &&
+		git pull ../testrepo main &&
+		git branch next &&
+		git config remote.dst.url ../dst &&
+		git config push.default matching &&
+		git push dst main &&
+		git show-ref refs/heads/main >../dst/expect
+	) &&
+	(
+		cd dst &&
+		test_must_fail git show-ref refs/heads/next &&
+		git show-ref refs/heads/main >actual
+	) &&
+	test_cmp dst/expect dst/actual
 
-	git init server &&
-	test_commit -C server base &&
-	test_commit -C server client_has &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst/
+From ../testrepo
+ * branch            main       -> FETCH_HEAD
+To ../dst
+ * [new branch]      main -> main
+ok 105 - with no remote.$name.push, it is not used as refmap
 
-	git clone --depth=1 "file://$(pwd)/server" client &&
+expecting success of 5516.106 'with no remote.$name.push, upstream mapping is used': 
+	mk_test testrepo heads/main &&
+	test_when_finished "rm -rf src" &&
+	git init src &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	(
+		cd src &&
+		git pull ../testrepo main &&
+		git branch next &&
+		git config remote.dst.url ../dst &&
+		git config remote.dst.fetch "+refs/heads/*:refs/remotes/dst/*" &&
+		git config push.default upstream &&
 
-	# 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 config branch.main.merge refs/heads/trunk &&
+		git config branch.main.remote dst &&
 
-	git -C server checkout -b newbranch base &&
-	test_commit -C server client_wants &&
+		git push dst main &&
+		git show-ref refs/heads/main |
+		sed -e "s|refs/heads/main|refs/heads/trunk|" >../dst/expect
+	) &&
+	(
+		cd dst &&
+		test_must_fail git show-ref refs/heads/main &&
+		test_must_fail git show-ref refs/heads/next &&
+		git show-ref refs/heads/trunk >actual
+	) &&
+	test_cmp dst/expect dst/actual
 
-	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.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst/
+From ../testrepo
+ * branch            main       -> FETCH_HEAD
+To ../dst
+ * [new branch]      main -> trunk
+ok 106 - with no remote.$name.push, upstream mapping is used
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
----------------------------------------------------------------------
+expecting success of 5516.107 'push does not follow tags by default': 
+	mk_test testrepo heads/main &&
+	test_when_finished "rm -rf src" &&
+	git init src &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	(
+		cd src &&
+		git pull ../testrepo main &&
+		git tag -m "annotated" tag &&
+		git checkout -b another &&
+		git commit --allow-empty -m "future commit" &&
+		git tag -m "future" future &&
+		git checkout main &&
+		git for-each-ref refs/heads/main >../expect &&
+		git push ../dst main
+	) &&
+	(
+		cd dst &&
+		git for-each-ref >../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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst/
+From ../testrepo
+ * branch            main       -> FETCH_HEAD
+Switched to a new branch 'another'
+[another a35c877] future commit
  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.51.0/t/trash directory.t5702-protocol-v2/server
- * branch            newbranch  -> FETCH_HEAD
-packet:        fetch< version 2
-ok 50 - upload-pack respects client shallows
-
-expecting success of 5702.51 'ensure that multiple fetches in same process from a shallow repo works': 
-	rm -rf server client trace &&
+Switched to branch 'main'
+To ../dst
+ * [new branch]      main -> main
+ok 107 - push does not follow tags by default
 
-	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 &&
+expecting success of 5516.108 'push --follow-tags only pushes relevant tags': 
+	mk_test testrepo heads/main &&
+	test_when_finished "rm -rf src" &&
+	git init src &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	(
+		cd src &&
+		git pull ../testrepo main &&
+		git tag -m "annotated" tag &&
+		git checkout -b another &&
+		git commit --allow-empty -m "future commit" &&
+		git tag -m "future" future &&
+		git checkout main &&
+		git for-each-ref refs/heads/main refs/tags/tag >../expect &&
+		git push --follow-tags ../dst main
+	) &&
+	(
+		cd dst &&
+		git for-each-ref >../actual
+	) &&
+	test_cmp expect actual
 
-	git -C server tag -a -m "an annotated tag" twotag two &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst/
+From ../testrepo
+ * branch            main       -> FETCH_HEAD
+Switched to a new branch 'another'
+[another a35c877] future commit
+ Author: A U Thor <author@example.com>
+Switched to branch 'main'
+To ../dst
+ * [new branch]      main -> main
+ * [new tag]         tag -> tag
+ok 108 - push --follow-tags only pushes relevant tags
 
-	# 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
+expecting success of 5516.109 'push --no-thin must produce non-thin pack': 
+	cat >>path1 <<\EOF &&
+keep base version of path1 big enough, compared to the new changes
+later, in order to pass size heuristics in
+builtin/pack-objects.c:try_delta()
+EOF
+	git commit -am initial &&
+	git init no-thin &&
+	git --git-dir=no-thin/.git config receive.unpacklimit 0 &&
+	git push no-thin/.git refs/heads/main:refs/heads/foo &&
+	echo modified >> path1 &&
+	git commit -am modified &&
+	git repack -adf &&
+	rcvpck="git receive-pack --reject-thin-pack-for-testing" &&
+	git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/main:refs/heads/foo
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+[main b9296ea] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main 94705d7] three
+ 1 file changed, 3 insertions(+)
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/no-thin/.git/
+To no-thin/.git
+ * [new branch]      main -> foo
+[main a9cf62b] modified
  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.51.0/t/trash directory.t5702-protocol-v2/server
- * [new tag]         two        -> two
- * [new tag]         twotag     -> twotag
-packet:        fetch< version 2
-packet:        fetch< version 2
-ok 51 - ensure that multiple fetches in same process from a shallow repo works
+To no-thin/.git
+   b9296ea..a9cf62b  main -> foo
+ok 109 - push --no-thin must produce non-thin pack
 
-expecting success of 5702.52 'deepen-relative': 
-	rm -rf server client trace &&
+expecting success of 5516.110 'pushing a tag pushes the tagged object': 
+	blob=$(echo unreferenced | git hash-object -w --stdin) &&
+	git tag -m foo tag-of-blob $blob &&
+	test_when_finished "rm -rf dst.git" &&
+	git init --bare dst.git &&
+	git push dst.git tag-of-blob &&
+	# the receiving index-pack should have noticed
+	# any problems, but we double check
+	echo unreferenced >expect &&
+	git --git-dir=dst.git cat-file blob tag-of-blob >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 --depth 1 "file://$(pwd)/server" client &&
-	test_commit -C server four &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst.git/
+To dst.git
+ * [new tag]         tag-of-blob -> tag-of-blob
+ok 110 - pushing a tag pushes the tagged object
 
-	# Sanity check that only "three" is downloaded
-	git -C client log --pretty=tformat:%s main >actual &&
-	echo three >expected &&
-	test_cmp expected actual &&
+expecting success of 5516.111 'push into bare respects core.logallrefupdates': 
+	test_when_finished "rm -rf dst.git" &&
+	git init --bare dst.git &&
+	git -C dst.git config core.logallrefupdates true &&
 
-	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 &&
+	# double push to test both with and without
+	# the actual pack transfer
+	git push dst.git main:one &&
+	echo "one@{0} push" >expect &&
+	git -C dst.git log -g --format="%gd %gs" one >actual &&
+	test_cmp expect actual &&
 
-	git -C client log --pretty=tformat:%s origin/main >actual &&
-	cat >expected <<-\EOF &&
-	four
-	three
-	two
-	EOF
-	test_cmp expected actual
+	git push dst.git main:two &&
+	echo "two@{0} push" >expect &&
+	git -C dst.git log -g --format="%gd %gs" two >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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 52 - deepen-relative
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst.git/
+To dst.git
+ * [new branch]      main -> one
+To dst.git
+ * [new branch]      main -> two
+ok 111 - push into bare respects core.logallrefupdates
 
-expecting success of 5702.53 'usage: --negotiate-only without --negotiation-tip': 
-	SERVER="server" &&
-	URI="file://$(pwd)/server" &&
+expecting success of 5516.112 'fetch into bare respects core.logallrefupdates': 
+	test_when_finished "rm -rf dst.git" &&
+	git init --bare dst.git &&
+	(
+		cd dst.git &&
+		git config core.logallrefupdates true &&
 
-	setup_negotiate_only "$SERVER" "$URI" &&
+		# as above, we double-fetch to test both
+		# with and without pack transfer
+		git fetch .. main:one &&
+		echo "one@{0} fetch .. main:one: storing head" >expect &&
+		git log -g --format="%gd %gs" one >actual &&
+		test_cmp expect actual &&
 
-	cat >err.expect <<-\EOF &&
-	fatal: --negotiate-only needs one or more --negotiation-tip=*
-	EOF
+		git fetch .. main:two &&
+		echo "two@{0} fetch .. main:two: storing head" >expect &&
+		git log -g --format="%gd %gs" two >actual &&
+		test_cmp expect actual
+	)
 
-	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.51.0/t/trash directory.t5516-fetch-push/dst.git/
+From ..
+ * [new branch]      main       -> one
+ * [new tag]         deltag     -> deltag
+ * [new tag]         frotz      -> frotz
+ * [new tag]         v1.0       -> v1.0
+From ..
+ * [new branch]      main       -> two
+ok 112 - fetch into bare respects core.logallrefupdates
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 53 - usage: --negotiate-only without --negotiation-tip
+expecting success of 5516.113 'receive.denyCurrentBranch = updateInstead': 
+	mk_empty testrepo &&
+	git push testrepo main &&
+	(
+		cd testrepo &&
+		git reset --hard &&
+		git config receive.denyCurrentBranch updateInstead
+	) &&
+	test_commit third path2 &&
 
-expecting success of 5702.54 'usage: --negotiate-only with --recurse-submodules': 
-	cat >err.expect <<-\EOF &&
-	fatal: options '--negotiate-only' and '--recurse-submodules' cannot be used together
-	EOF
+	# Try pushing into a repository with pristine working tree
+	git push testrepo main &&
+	(
+		cd testrepo &&
+		git update-index -q --refresh &&
+		git diff-files --quiet -- &&
+		git diff-index --quiet --cached HEAD -- &&
+		test third = "$(cat path2)" &&
+		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
+	) &&
 
-	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
+	# Try pushing into a repository with working tree needing a refresh
+	(
+		cd testrepo &&
+		git reset --hard HEAD^ &&
+		test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
+		test-tool chmtime +100 path1
+	) &&
+	git push testrepo main &&
+	(
+		cd testrepo &&
+		git update-index -q --refresh &&
+		git diff-files --quiet -- &&
+		git diff-index --quiet --cached HEAD -- &&
+		test_cmp ../path1 path1 &&
+		test third = "$(cat path2)" &&
+		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
+	) &&
 
-ok 54 - usage: --negotiate-only with --recurse-submodules
+	# Update what is to be pushed
+	test_commit fourth path2 &&
 
-expecting success of 5702.55 'file:// --negotiate-only': 
-	SERVER="server" &&
-	URI="file://$(pwd)/server" &&
+	# Try pushing into a repository with a dirty working tree
+	# (1) the working tree updated
+	(
+		cd testrepo &&
+		echo changed >path1
+	) &&
+	test_must_fail git push testrepo main &&
+	(
+		cd testrepo &&
+		test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
+		git diff --quiet --cached &&
+		test changed = "$(cat path1)"
+	) &&
 
-	setup_negotiate_only "$SERVER" "$URI" &&
+	# (2) the index updated
+	(
+		cd testrepo &&
+		echo changed >path1 &&
+		git add path1
+	) &&
+	test_must_fail git push testrepo main &&
+	(
+		cd testrepo &&
+		test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
+		git diff --quiet &&
+		test changed = "$(cat path1)"
+	) &&
 
-	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
+	# Introduce a new file in the update
+	test_commit fifth path3 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 55 - file:// --negotiate-only
+	# (3) the working tree has an untracked file that would interfere
+	(
+		cd testrepo &&
+		git reset --hard &&
+		echo changed >path3
+	) &&
+	test_must_fail git push testrepo main &&
+	(
+		cd testrepo &&
+		test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
+		git diff --quiet &&
+		git diff --quiet --cached &&
+		test changed = "$(cat path3)"
+	) &&
 
-expecting success of 5702.56 'file:// --negotiate-only with protocol v0': 
-	SERVER="server" &&
-	URI="file://$(pwd)/server" &&
+	# (4) the target changes to what gets pushed but it still is a change
+	(
+		cd testrepo &&
+		git reset --hard &&
+		echo fifth >path3 &&
+		git add path3
+	) &&
+	test_must_fail git push testrepo main &&
+	(
+		cd testrepo &&
+		test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
+		git diff --quiet &&
+		test fifth = "$(cat path3)"
+	) &&
 
-	setup_negotiate_only "$SERVER" "$URI" &&
+	# (5) push into void
+	test_when_finished "rm -rf void" &&
+	git init void &&
+	(
+		cd void &&
+		git config receive.denyCurrentBranch updateInstead
+	) &&
+	git push void main &&
+	(
+		cd void &&
+		test $(git -C .. rev-parse main) = $(git rev-parse HEAD) &&
+		git diff --quiet &&
+		git diff --cached --quiet
+	) &&
 
-	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
+	# (6) updateInstead intervened by fast-forward check
+	test_must_fail git push void main^:main &&
+	test $(git -C void rev-parse HEAD) = $(git rev-parse main) &&
+	git -C void diff --quiet &&
+	git -C void diff --cached --quiet
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5702-protocol-v2/server/.git/
-[main (root-commit) 2472fbc] one
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      main -> main
+HEAD is now at a9cf62b modified
+[main f026489] third
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 6b8fd04] two
+To testrepo
+   a9cf62b..f026489  main -> main
+HEAD is now at a9cf62b modified
+To testrepo
+   a9cf62b..f026489  main -> main
+[main 98a4253] fourth
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Cloning into 'client'...
-[main 27885d4] three
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To testrepo
+ ! [remote rejected] main -> main (Working directory has unstaged changes)
+error: failed to push some refs to 'testrepo'
+To testrepo
+ ! [remote rejected] main -> main (Working directory has staged changes)
+error: failed to push some refs to 'testrepo'
+[main 7bb1bc8] fifth
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 three.t
-warning: --negotiate-only requires protocol v2
-ok 56 - file:// --negotiate-only with protocol v0
+ create mode 100644 path3
+HEAD is now at f026489 third
+error: Untracked working tree file 'path3' would be overwritten by merge.
+To testrepo
+ ! [remote rejected] main -> main (Could not update working tree to new HEAD)
+error: failed to push some refs to 'testrepo'
+HEAD is now at f026489 third
+To testrepo
+ ! [remote rejected] main -> main (Working directory has staged changes)
+error: failed to push some refs to 'testrepo'
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/void/.git/
+To void
+ * [new branch]      main -> main
+To void
+ ! [rejected]        main^ -> main (non-fast-forward)
+error: failed to push some refs to 'void'
+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.
+ok 113 - receive.denyCurrentBranch = updateInstead
 
-expecting success of 5702.57 '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
+expecting success of 5516.114 'updateInstead with push-to-checkout hook': 
+	test_when_finished "rm -rf testrepo" &&
+	git init testrepo &&
+	git -C testrepo pull .. main &&
+	git -C testrepo reset --hard HEAD^^ &&
+	git -C testrepo tag initial &&
+	git -C testrepo config receive.denyCurrentBranch updateInstead &&
+	test_hook -C testrepo push-to-checkout <<-\EOF &&
+	echo >&2 updating from $(git rev-parse HEAD)
+	echo >&2 updating to "$1"
 
-To file:///build/reproducible-path/git-2.51.0/t/trash directory.t5702-protocol-v2/server
- * [new branch]      HEAD -> custom-push-test
-ok 57 - push with custom path does not request v2
+	git update-index -q --refresh &&
+	git read-tree -u -m HEAD "$1" || {
+		status=$?
+		echo >&2 read-tree failed
+		exit $status
+	}
+	EOF
 
-expecting success of 5702.58 '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
+	# Try pushing into a pristine
+	git push testrepo main &&
+	(
+		cd testrepo &&
+		git diff --quiet &&
+		git diff HEAD --quiet &&
+		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
+	) &&
 
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5702-protocol-v2/server
- * branch            HEAD       -> FETCH_HEAD
-GIT_PROTOCOL=version=2
-ok 58 - fetch with custom path does request v2
+	# Try pushing into a repository with conflicting change
+	(
+		cd testrepo &&
+		git reset --hard initial &&
+		echo conflicting >path2
+	) &&
+	test_must_fail git push testrepo main &&
+	(
+		cd testrepo &&
+		test $(git rev-parse initial) = $(git rev-parse HEAD) &&
+		test conflicting = "$(cat path2)" &&
+		git diff-index --quiet --cached HEAD
+	) &&
 
-expecting success of 5702.59 '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
+	# Try pushing into a repository with unrelated change
+	(
+		cd testrepo &&
+		git reset --hard initial &&
+		echo unrelated >path1 &&
+		echo irrelevant >path5 &&
+		git add path5
+	) &&
+	git push testrepo main &&
+	(
+		cd testrepo &&
+		test "$(cat path1)" = unrelated &&
+		test "$(cat path5)" = irrelevant &&
+		test "$(git diff --name-only --cached HEAD)" = path5 &&
+		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
+	) &&
 
-ok 59 - archive with custom path does not request v2
+	# push into void
+	test_when_finished "rm -rf void" &&
+	git init void &&
+	git -C void config receive.denyCurrentBranch updateInstead &&
+	test_hook -C void push-to-checkout <<-\EOF &&
+	if git rev-parse --quiet --verify HEAD
+	then
+		has_head=yes
+		echo >&2 updating from $(git rev-parse HEAD)
+	else
+		has_head=no
+		echo >&2 pushing into void
+	fi
+	echo >&2 updating to "$1"
 
-expecting success of 5702.60 '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
+	git update-index -q --refresh &&
+	case "$has_head" in
+	yes)
+		git read-tree -u -m HEAD "$1" ;;
+	no)
+		git read-tree -u -m "$1" ;;
+	esac || {
+		status=$?
+		echo >&2 read-tree failed
+		exit $status
+	}
+	EOF
 
-000eversion 2
-001bagent=git/2.51.0-Linux
-0013ls-refs=unborn
-0020fetch=shallow wait-for-done
-0012server-option
-0017object-format=sha1
-0000fatal: unexpected line: 'packfile-uris https'
-000eversion 2
-001bagent=git/2.51.0-Linux
-0013ls-refs=unborn
-0020fetch=shallow wait-for-done
-0012server-option
-0017object-format=sha1
-0000fatal: unexpected line: 'packfile-uris https'
-000eversion 2
-001bagent=git/2.51.0-Linux
-0013ls-refs=unborn
-002efetch=shallow wait-for-done packfile-uris
-0012server-option
-0017object-format=sha1
-0000ok 60 - reject client packfile-uris if not advertised
+	git push void main &&
+	(
+		cd void &&
+		git diff --quiet &&
+		git diff --cached --quiet &&
+		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
+	)
 
-checking prerequisite: NOT_ROOT
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+From ..
+ * branch            main       -> FETCH_HEAD
+HEAD is now at f026489 third
+updating from f0264897557d25326474e587933c192b6d338b33
+updating to 7bb1bc8bd0518772ab617a9b8715716f26c682ab
+To testrepo
+   f026489..7bb1bc8  main -> main
+HEAD is now at f026489 third
+updating from f0264897557d25326474e587933c192b6d338b33
+updating to 7bb1bc8bd0518772ab617a9b8715716f26c682ab
+error: Entry 'path2' not uptodate. Cannot merge.
+read-tree failed
+To testrepo
+ ! [remote rejected] main -> main (push-to-checkout hook declined)
+error: failed to push some refs to 'testrepo'
+HEAD is now at f026489 third
+updating from f0264897557d25326474e587933c192b6d338b33
+updating to 7bb1bc8bd0518772ab617a9b8715716f26c682ab
+To testrepo
+   f026489..7bb1bc8  main -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/void/.git/
+pushing into void
+updating to 7bb1bc8bd0518772ab617a9b8715716f26c682ab
+To void
+ * [new branch]      main -> main
+ok 114 - updateInstead with push-to-checkout hook
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+expecting success of 5516.115 'denyCurrentBranch and worktrees': 
+	git worktree add new-wt &&
+	git clone . cloned &&
+	test_commit -C cloned first &&
+	test_config receive.denyCurrentBranch refuse &&
+	test_must_fail git -C cloned push origin HEAD:new-wt &&
+	test_config receive.denyCurrentBranch updateInstead &&
+	git -C cloned push origin HEAD:new-wt &&
+	test_path_exists new-wt/first.t &&
+	test_must_fail git -C cloned push --delete origin new-wt
 
-)
-prerequisite NOT_ROOT ok
-# passed all 60 test(s)
-# SKIP no web server found at ''
-1..60
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6013-rev-list-reverse-parents.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+Preparing worktree (new branch 'new-wt')
+HEAD is now at 7bb1bc8 fifth
+Cloning into 'cloned'...
+done.
+[main 659b608] first
  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 6013.2 '--reverse --parents --full-history combines correctly': 
-	git rev-list --parents --full-history main -- foo | reverse >expected &&
-	git rev-list --reverse --parents --full-history main -- foo \
-		> actual &&
-	test_cmp expected actual
-	
-ok 2 - --reverse --parents --full-history combines correctly
-
-expecting success of 6013.3 '--boundary does too': 
-	git rev-list --boundary --parents --full-history main ^root -- foo | reverse >expected &&
-	git rev-list --boundary --reverse --parents --full-history \
-		main ^root -- foo > actual &&
-	test_cmp expected actual
-	
-ok 3 - --boundary does too
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6014-rev-list-all.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6014-rev-list-all/.git/
-expecting success of 6014.1 'setup': 
-
-	commit one &&
-	commit two &&
-	git checkout HEAD^ &&
-	commit detached
+ create mode 100644 first.t
+remote: error: refusing to update checked out branch: refs/heads/new-wt        
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/.
+ ! [remote rejected] HEAD -> new-wt (branch is currently checked out)
+error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/.'
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/.
+   7bb1bc8..659b608  HEAD -> new-wt
+remote: error: By default, deleting the current branch is denied, because the next        
+remote: 'git clone' won't result in any file checked out, causing confusion.        
+remote: 
+remote: You can set 'receive.denyDeleteCurrent' configuration variable to        
+remote: 'warn' or 'ignore' in the remote repository to allow deleting the        
+remote: current branch, with or without a warning message.        
+remote: 
+remote: To squelch this message, you can set it to 'refuse'.        
+remote: error: refusing to delete the current branch: refs/heads/new-wt        
+To /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/.
+ ! [remote rejected] new-wt (deletion of the current branch prohibited)
+error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/.'
+ok 115 - denyCurrentBranch and worktrees
 
+expecting success of 5516.116 'denyCurrentBranch and bare repository worktrees': 
+	test_when_finished "rm -fr bare.git" &&
+	git clone --bare . bare.git &&
+	git -C bare.git worktree add wt &&
+	test_commit grape &&
+	git -C bare.git config receive.denyCurrentBranch refuse &&
+	test_must_fail git push bare.git HEAD:wt &&
+	git -C bare.git config receive.denyCurrentBranch updateInstead &&
+	git push bare.git HEAD:wt &&
+	test_path_exists bare.git/wt/grape.t &&
+	test_must_fail git push --delete bare.git wt
 
-[master (root-commit) 86412ff] one
+Cloning into bare repository 'bare.git'...
+done.
+Preparing worktree (new branch 'wt')
+HEAD is now at 7bb1bc8 fifth
+[main 9b41c21] grape
  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^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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>
+ create mode 100644 grape.t
+remote: error: refusing to update checked out branch: refs/heads/wt        
+To bare.git
+ ! [remote rejected] HEAD -> wt (branch is currently checked out)
+error: failed to push some refs to 'bare.git'
+To bare.git
+   7bb1bc8..9b41c21  HEAD -> wt
+remote: error: By default, deleting the current branch is denied, because the next        
+remote: 'git clone' won't result in any file checked out, causing confusion.        
+remote: 
+remote: You can set 'receive.denyDeleteCurrent' configuration variable to        
+remote: 'warn' or 'ignore' in the remote repository to allow deleting the        
+remote: current branch, with or without a warning message.        
+remote: 
+remote: To squelch this message, you can set it to 'refuse'.        
+remote: error: refusing to delete the current branch: refs/heads/wt        
+To bare.git
+ ! [remote rejected] wt (deletion of the current branch prohibited)
+error: failed to push some refs to 'bare.git'
+ok 116 - denyCurrentBranch and bare repository worktrees
 
-Or undo this operation with:
+expecting success of 5516.117 'refuse fetch to current branch of worktree': 
+	test_when_finished "git worktree remove --force wt && git branch -D wt" &&
+	git worktree add wt &&
+	test_commit apple &&
+	test_must_fail git fetch . HEAD:wt &&
+	git fetch -u . HEAD:wt
 
-  git switch -
+Preparing worktree (new branch 'wt')
+HEAD is now at 9b41c21 grape
+[main d190886] apple
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 apple.t
+fatal: refusing to fetch into branch 'refs/heads/wt' checked out at '/build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/wt'
+From .
+   9b41c21..d190886  HEAD       -> wt
+Deleted branch wt (was d190886).
+ok 117 - refuse fetch to current branch of worktree
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5516.118 'refuse fetch to current branch of bare repository worktree': 
+	test_when_finished "rm -fr bare.git" &&
+	git clone --bare . bare.git &&
+	git -C bare.git worktree add wt &&
+	test_commit banana &&
+	test_must_fail git -C bare.git fetch .. HEAD:wt &&
+	git -C bare.git fetch -u .. HEAD:wt
 
-HEAD is now at 86412ff one
-[detached HEAD 13d8fe0] detached
+Cloning into bare repository 'bare.git'...
+done.
+Preparing worktree (new branch 'wt')
+HEAD is now at d190886 apple
+[main 35a3221] banana
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 6014.2 'rev-list --all lists detached HEAD': 
+ 1 file changed, 1 insertion(+)
+ create mode 100644 banana.t
+fatal: refusing to fetch into branch 'refs/heads/wt' checked out at '/build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/bare.git/wt'
+From ..
+   d190886..35a3221  HEAD       -> wt
+ * [new tag]         banana     -> banana
+ok 118 - refuse fetch to current branch of bare repository worktree
 
-	test 3 = $(git rev-list --all | wc -l)
+expecting success of 5516.119 'refuse to push a hidden ref, and make sure do not pollute the repository': 
+	mk_empty testrepo &&
+	git -C testrepo config receive.hiderefs refs/hidden &&
+	git -C testrepo config receive.unpackLimit 1 &&
+	test_must_fail git push testrepo HEAD:refs/hidden/foo &&
+	test_dir_is_empty testrepo/.git/objects/pack
 
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ ! [remote rejected] HEAD -> refs/hidden/foo (deny updating a hidden ref)
+error: failed to push some refs to 'testrepo'
+ok 119 - refuse to push a hidden ref, and make sure do not pollute the repository
 
-ok 2 - rev-list --all lists detached HEAD
+expecting success of 5516.120 'push with config push.useBitmaps': 
+	mk_test testrepo heads/main &&
+	git checkout main &&
+	test_unconfig push.useBitmaps &&
+	GIT_TRACE2_EVENT="$PWD/default" \
+	git push --quiet testrepo main:test &&
+	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
+		--thin --delta-base-offset -q <default &&
 
-expecting success of 6014.3 'repack does not lose detached HEAD': 
+	test_config push.useBitmaps true &&
+	GIT_TRACE2_EVENT="$PWD/true" \
+	git push --quiet testrepo main:test2 &&
+	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
+		--thin --delta-base-offset -q <true &&
 
-	git gc &&
-	git prune --expire=now &&
-	git show HEAD
+	test_config push.useBitmaps false &&
+	GIT_TRACE2_EVENT="$PWD/false" \
+	git push --quiet testrepo main:test3 &&
+	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
+		--thin --delta-base-offset -q --no-use-bitmap-index <false
 
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Already on 'main'
+{"event":"child_start","sid":"20260929T145310.405518Z-H5c947e1c-P0024240a","thread":"main","time":"2026-09-29T14:53:10.410027Z","file":"run-command.c","line":740,"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":"20260929T145310.447865Z-H5c947e1c-P002424b0","thread":"main","time":"2026-09-29T14:53:10.452566Z","file":"run-command.c","line":740,"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":"20260929T145310.487301Z-H5c947e1c-P0024254d","thread":"main","time":"2026-09-29T14:53:10.492067Z","file":"run-command.c","line":740,"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
 
-commit 13d8fe0bae4079d4dedb755a88319ddebda9a07b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
+expecting success of 5516.121 'push with config pack.usePathWalk=true': 
+	mk_test testrepo heads/main &&
+	git checkout main &&
+	test_config pack.usePathWalk true &&
+	GIT_TRACE2_EVENT="$(pwd)/path-walk.txt" \
+	git push --quiet testrepo main:test &&
 
-    detached
+	test_region pack-objects path-walk path-walk.txt
 
-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.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Already on 'main'
+{"event":"region_enter","sid":"20260929T145310.630804Z-H5c947e1c-P00242754/20260929T145310.640010Z-H5c947e1c-P0024278f","thread":"main","time":"2026-09-29T14:53:10.642457Z","file":"builtin/pack-objects.c","line":4645,"repo":1,"nesting":2,"category":"pack-objects","label":"path-walk"}
+{"event":"region_leave","sid":"20260929T145310.630804Z-H5c947e1c-P00242754/20260929T145310.640010Z-H5c947e1c-P0024278f","thread":"main","time":"2026-09-29T14:53:10.643327Z","file":"builtin/pack-objects.c","line":4647,"repo":1,"t_rel":0.000873,"nesting":2,"category":"pack-objects","label":"path-walk"}
+ok 121 - push with config pack.usePathWalk=true
 
-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 5516.122 'push with F/D conflict with deletion and creation': 
+	test_when_finished "git branch -D branch" &&
+	git branch branch/conflict &&
+	mk_test testrepo heads/branch/conflict &&
+	git branch -D branch/conflict &&
+	git branch branch &&
+	git push testrepo :refs/heads/branch/conflict refs/heads/branch
 
-fatal: options '--no-walk' and '--graph' cannot be used together
-ok 4 - rev-list --graph --no-walk is forbidden
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> branch/conflict
+notice: HEAD points to an unborn branch (main)
+Deleted branch branch/conflict (was 35a3221).
+To testrepo
+ - [deleted]         branch/conflict
+ * [new branch]      branch -> branch
+Deleted branch branch (was 35a3221).
+ok 122 - push with F/D conflict with deletion and creation
 
-# passed all 4 test(s)
-1..4
+# passed all 122 test(s)
+1..122
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6006-rev-list-format.sh ***
@@ -388252,8 +392749,8 @@
 	test_cmp expect3 fuzzy3 &&
 	! test_cmp actual1 actual2
 
---- actual1	2025-08-27 08:22:09.116121319 +0000
-+++ actual2	2025-08-27 08:22:09.128121398 +0000
+--- actual1	2026-09-29 14:53:10.666548970 +0000
++++ actual2	2026-09-29 14:53:10.686548970 +0000
 @@ -1 +1 @@
 -79c1a11 79c1a11 79c1a11
 +79c1a 79c1a 79c1a
@@ -388344,213 +392841,6 @@
 1..80
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6002-rev-list-bisect.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6016-rev-list-graph-simplify-history.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6016-rev-list-graph-simplify-history/.git/
 expecting success of 6016.1 'set up rev-list --graph test': 
@@ -388844,6 +393134,213 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6002-rev-list-bisect.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6003-rev-list-topo-order.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 \" \""
@@ -388958,6 +393455,790 @@
 1..36
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6019-rev-list-ancestry-path.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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) 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
+ 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
+ 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 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 &&
+
+		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 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 &&
+
+		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 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 &&
+
+		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 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 &&
+
+		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 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 &&
+
+		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 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 &&
+
+		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 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 &&
+
+		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 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
+
+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 &&
+
+		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 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
+
+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 &&
+
+		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 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
+
+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 &&
+
+		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 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 &&
+
+		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 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)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+ 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
+
+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)
+
+ok 17 - criss-cross: rev-list --ancestry-path cb..bc
+
+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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6010-merge-base.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6010-merge-base/.git/
+expecting success of 6010.1 'setup': 
+	T=$(git mktree </dev/null)
+
+ok 1 - setup
+
+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)
+
+ok 2 - set up G and H
+
+expecting success of 6010.3 'merge-base G H': 
+	git name-rev $B >expected &&
+
+	MB=$(git merge-base G H) &&
+	git name-rev "$MB" >actual.single &&
+
+	MB=$(git merge-base --all G H) &&
+	git name-rev "$MB" >actual.all &&
+
+	MB=$(git show-branch --merge-base G H) &&
+	git name-rev "$MB" >actual.sb &&
+
+	test_cmp expected actual.single &&
+	test_cmp expected actual.all &&
+	test_cmp expected actual.sb
+
+ok 3 - merge-base G H
+
+expecting success of 6010.4 'merge-base/show-branch --independent': 
+	git name-rev "$H" >expected1 &&
+	git name-rev "$H" "$G" >expected2 &&
+
+	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 &&
+
+	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 &&
+
+	test_cmp expected1 actual1.mb &&
+	test_cmp expected2 actual2.mb &&
+	test_cmp expected1 actual1.sb &&
+	test_cmp expected2 actual2.sb
+
+ok 4 - merge-base/show-branch --independent
+
+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.
+
+	S=$(doit  0 S) &&
+
+	C0=$(doit -3 C0 $S) &&
+	C1=$(doit -2 C1 $C0) &&
+	C2=$(doit -1 C2 $C1) &&
+
+	L0=$(doit  1 L0 $S) &&
+	L1=$(doit  2 L1 $L0) &&
+	L2=$(doit  3 L2 $L1) &&
+
+	R0=$(doit  1 R0 $S) &&
+	R1=$(doit  2 R1 $R0) &&
+	R2=$(doit  3 R2 $R1) &&
+
+	PL=$(doit  4 PL $L2 $C2) &&
+	PR=$(doit  4 PR $C2 $R2) &&
+
+	git name-rev $C2 >expected &&
+
+	MB=$(git merge-base PL PR) &&
+	git name-rev "$MB" >actual.single &&
+
+	MB=$(git merge-base --all PL PR) &&
+	git name-rev "$MB" >actual.all &&
+
+	test_cmp expected actual.single &&
+	test_cmp expected actual.all
+
+ok 5 - unsynchronized clocks
+
+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) &&
+
+	echo $IH >expected &&
+	git merge-base --independent IB IH >actual &&
+	test_cmp expected actual
+
+ok 6 - --independent with unsynchronized clocks
+
+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)
+
+	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
+
+[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'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 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)
+
+expecting success of 6010.8 'merge-base A B C': 
+	git rev-parse --verify MM1 >expected &&
+	git rev-parse --verify MMR >expected.sb &&
+
+	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 &&
+
+	test_cmp expected actual &&
+	test_cmp expected.sb actual.common &&
+	test_cmp expected.sb actual.sb
+
+ok 8 - merge-base A B C
+
+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 &&
+
+	git rev-parse CC1 CC2 >expected &&
+	git merge-base --all CCB CCA^^ CCA^^2 >actual &&
+
+	sort expected >expected.sorted &&
+	sort actual >actual.sorted &&
+	test_cmp expected.sorted actual.sorted
+
+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
+
+expecting success of 6010.10 'using reflog to find the fork point': 
+	git reset --hard &&
+	git checkout -b base $E &&
+
+	(
+		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 &&
+
+		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
+
+	) &&
+	# check that we correctly default to HEAD
+	git checkout derived &&
+	git merge-base --fork-point base >actual &&
+	test_cmp expect3 actual
+
+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 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
+
+e34970abbab4461223052769885c56a229ee9299
+ok 11 - --fork-point works with empty reflog
+
+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
+
+[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 +
+ 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 d2ca2eb] JTEMP2
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ 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 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6009-rev-list-parent.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6009-rev-list-parent/.git/
 expecting success of 6009.1 'setup': 
@@ -389335,4035 +394616,3704 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6010-merge-base.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6010-merge-base/.git/
-expecting success of 6010.1 'setup': 
-	T=$(git mktree </dev/null)
-
-ok 1 - setup
-
-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)
+*** t6017-rev-list-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
 
-ok 2 - set up G and H
+		git update-ref refs/heads/-dashed-branch HEAD
+	)
 
-expecting success of 6010.3 'merge-base G H': 
-	git name-rev $B >expected &&
+[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
 
-	MB=$(git merge-base G H) &&
-	git name-rev "$MB" >actual.single &&
+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
 
-	MB=$(git merge-base --all G H) &&
-	git name-rev "$MB" >actual.all &&
+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
 
-	MB=$(git show-branch --merge-base G H) &&
-	git name-rev "$MB" >actual.sb &&
+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
 
-	test_cmp expected actual.single &&
-	test_cmp expected actual.all &&
-	test_cmp expected actual.sb
+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
 
-ok 3 - merge-base G H
+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 6010.4 'merge-base/show-branch --independent': 
-	git name-rev "$H" >expected1 &&
-	git name-rev "$H" "$G" >expected2 &&
+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 --
 
-	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 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
 
-	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 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
 
-	test_cmp expected1 actual1.mb &&
-	test_cmp expected2 actual2.mb &&
-	test_cmp expected1 actual1.sb &&
-	test_cmp expected2 actual2.sb
+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
 
-ok 4 - merge-base/show-branch --independent
+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 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 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
 
-	S=$(doit  0 S) &&
+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
 
-	C0=$(doit -3 C0 $S) &&
-	C1=$(doit -2 C1 $C0) &&
-	C2=$(doit -1 C2 $C1) &&
+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
 
-	L0=$(doit  1 L0 $S) &&
-	L1=$(doit  2 L1 $L0) &&
-	L2=$(doit  3 L2 $L1) &&
+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
 
-	R0=$(doit  1 R0 $S) &&
-	R1=$(doit  2 R1 $R0) &&
-	R2=$(doit  3 R2 $R1) &&
+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
 
-	PL=$(doit  4 PL $L2 $C2) &&
-	PR=$(doit  4 PR $C2 $R2) &&
+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
 
-	git name-rev $C2 >expected &&
+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
 
-	MB=$(git merge-base PL PR) &&
-	git name-rev "$MB" >actual.single &&
+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
 
-	MB=$(git merge-base --all PL PR) &&
-	git name-rev "$MB" >actual.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
 
-	test_cmp expected actual.single &&
-	test_cmp expected actual.all
+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
 
-ok 5 - unsynchronized clocks
+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 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) &&
+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
 
-	echo $IH >expected &&
-	git merge-base --independent IB IH >actual &&
-	test_cmp expected actual
+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 --
 
-ok 6 - --independent with unsynchronized clocks
+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 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 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
 
-	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
+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
 
-[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 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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 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
 
-If you want to 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 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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+expecting success of 6017.32 'not only --stdin': 
+	cat >expect <<-EOF &&
+	7
 
-  git switch -
+	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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 32 - not only --stdin
 
-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)
+expecting success of 6017.33 'pseudo-opt with missing value': 
+	cat >input <<-EOF &&
+	--glob
+	refs/heads
+	EOF
 
-expecting success of 6010.8 'merge-base A B C': 
-	git rev-parse --verify MM1 >expected &&
-	git rev-parse --verify MMR >expected.sb &&
+	cat >expect <<-EOF &&
+	fatal: Option ${SQ}--glob${SQ} requires a value
+	EOF
 
-	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 &&
+	test_must_fail git rev-list --stdin <input 2>error &&
+	test_cmp expect error
 
-	test_cmp expected actual &&
-	test_cmp expected.sb actual.common &&
-	test_cmp expected.sb actual.sb
+ok 33 - pseudo-opt with missing value
 
-ok 8 - merge-base A B C
+expecting success of 6017.34 'pseudo-opt with invalid value': 
+	cat >input <<-EOF &&
+	--no-walk=garbage
+	EOF
 
-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 &&
+	cat >expect <<-EOF &&
+	error: invalid argument to --no-walk
+	fatal: invalid option ${SQ}--no-walk=garbage${SQ} in --stdin mode
+	EOF
 
-	git rev-parse CC1 CC2 >expected &&
-	git merge-base --all CCB CCA^^ CCA^^2 >actual &&
+	test_must_fail git rev-list --stdin <input 2>error &&
+	test_cmp expect error
 
-	sort expected >expected.sorted &&
-	sort actual >actual.sorted &&
-	test_cmp expected.sorted actual.sorted
+ok 34 - pseudo-opt with invalid value
 
-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
+expecting success of 6017.35 'unknown option without --end-of-options': 
+	cat >input <<-EOF &&
+	-dashed-branch
+	EOF
 
-expecting success of 6010.10 'using reflog to find the fork point': 
-	git reset --hard &&
-	git checkout -b base $E &&
+	cat >expect <<-EOF &&
+	fatal: invalid option ${SQ}-dashed-branch${SQ} in --stdin mode
+	EOF
 
-	(
-		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 &&
+	test_must_fail git rev-list --stdin <input 2>error &&
+	test_cmp expect error
 
-		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
+ok 35 - unknown option without --end-of-options
 
-	) &&
-	# check that we correctly default to HEAD
-	git checkout derived &&
-	git merge-base --fork-point base >actual &&
-	test_cmp expect3 actual
+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 &&
 
-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
+	git rev-list refs/heads/main --not --stdin <input >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 36 - --not on command line does not influence revisions read via --stdin
 
-e34970abbab4461223052769885c56a229ee9299
-ok 11 - --fork-point works with empty reflog
+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 &&
 
-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
+	git rev-list refs/heads/main --stdin refs/heads/main <input >actual &&
+	test_cmp expect actual
 
-[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 +
- 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 d2ca2eb] JTEMP2
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- 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
+ok 37 - --not via stdin does not influence revisions from command line
 
-# passed all 12 test(s)
-1..12
+# passed all 37 test(s)
+1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t5516-fetch-push.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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'
+*** t6012-rev-list-simplify.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.6 'fetch without wildcard': 
-	mk_empty testrepo &&
-	(
-		cd testrepo &&
-		git fetch .. refs/heads/main:refs/remotes/origin/main &&
+	git branch other-branch &&
 
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+	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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-From ..
- * [new branch]      main       -> origin/main
-ok 6 - fetch without wildcard
+	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 &&
 
-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 &&
+	git checkout other-branch &&
 
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+	echo "Hello" >file &&
+	>lost &&
+	git add file lost &&
+	test_tick && git commit -m "Modified the file identically" &&
+	note C &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-From ..
- * [new branch]      main       -> origin/main
-ok 7 - fetch with wildcard
+	echo "This is a stupid example" >another-file &&
+	git add another-file &&
+	test_tick && git commit -m "Add another file" &&
+	note D &&
 
-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 &&
+	test_tick &&
+	test_must_fail git merge -m "merge" main &&
+	>lost && git commit -a -m "merge" &&
+	note E &&
 
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+	echo "Yet another" >elif &&
+	git add elif &&
+	test_tick && git commit -m "Irrelevant change" &&
+	note F &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/.
- * [new branch]      main       -> origin/main
-ok 8 - fetch with insteadOf
+	git checkout main &&
+	echo "Yet another" >elif &&
+	git add elif &&
+	test_tick && git commit -m "Another irrelevant change" &&
+	note G &&
 
-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 &&
+	test_tick && git merge -m "merge" other-branch &&
+	note H &&
 
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+	echo "Final change" >file &&
+	test_tick && git commit -a -m "Final change" &&
+	note I &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/.
- * [new branch]      main       -> origin/main
-ok 9 - fetch with pushInsteadOf (should not rewrite)
+	git checkout main &&
+	test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated &&
+	note K &&
 
-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
+	echo "Immaterial" >elif &&
+	git add elif &&
+	test_tick && git commit -m "Last" &&
+	note L
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/first_commit
-[main (root-commit) 1aad98e] unrelated_commit
+[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 unrelated_commit.t
-To testrepo
- * [new reference]   main -> origin/main
-{"event":"data","sid":"20250827T082142.886615Z-Hcf858c9d-P0009eb12/20250827T082142.902023Z-Hcf858c9d-P0009eb3b","thread":"main","time":"2025-08-27T08:21:42.904128Z","file":"builtin/pack-objects.c","line":1479,"repo":1,"t_abs":0.002307,"t_rel":0.000676,"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.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/first_commit
-[main (root-commit) 8e794eb] unrelated_commit
+ 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 unrelated_commit.t
-To testrepo
- * [new reference]   main -> origin/main
-{"event":"data","sid":"20250827T082143.082620Z-Hcf858c9d-P0009ed79/20250827T082143.092378Z-Hcf858c9d-P0009ed99","thread":"main","time":"2025-08-27T08:21:43.100399Z","file":"fetch-pack.c","line":2246,"repo":1,"t_abs":0.008176,"t_rel":0.007455,"nesting":2,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
-{"event":"data","sid":"20250827T082143.082620Z-Hcf858c9d-P0009ed79/20250827T082143.106972Z-Hcf858c9d-P0009edc1","thread":"main","time":"2025-08-27T08:21:43.117844Z","file":"builtin/pack-objects.c","line":1479,"repo":1,"t_abs":0.011046,"t_rel":0.000440,"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.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/first_commit
-[main (root-commit) 294c9e5] unrelated_commit
+ 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 unrelated_commit.t
-{"event":"data","sid":"20250827T082143.280326Z-Hcf858c9d-P0009efd4/20250827T082143.305842Z-Hcf858c9d-P0009f01b","thread":"main","time":"2025-08-27T08:21:43.314496Z","file":"builtin/pack-objects.c","line":1479,"repo":1,"t_abs":0.008847,"t_rel":0.001380,"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.51.0/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.51.0/t/trash directory.t5516-fetch-push/submodule_upstream/.git/
-[main (root-commit) 7c5b5fd] submodule_commit
+ 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 submodule_commit.t
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/submodule'...
-done.
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/first_commit
-[main (root-commit) 3be3d20] unrelated_commit
+ 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 unrelated_commit.t
-{"event":"data","sid":"20250827T082143.818069Z-Hcf858c9d-P0009f5cf/20250827T082143.830370Z-Hcf858c9d-P0009f5e4","thread":"main","time":"2025-08-27T08:21:43.838451Z","file":"fetch-pack.c","line":2246,"repo":1,"t_abs":0.008291,"t_rel":0.007529,"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.51.0/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.51.0/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.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To /build/reproducible-path/git-2.51.0/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
-	)
+ create mode 100644 side
+[main 1be1b21] Last
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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 5516.20 'push with matching heads': 
+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
 
-	mk_test testrepo heads/main &&
-	git push testrepo : &&
-	check_push_result testrepo $the_commit heads/main
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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 5516.21 'push with matching heads on the command line': 
+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
 
-	mk_test testrepo heads/main &&
-	git push testrepo : &&
-	check_push_result testrepo $the_commit heads/main
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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 5516.22 'failed (non-fast-forward) push with matching heads': 
+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
 
-	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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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
 
-    git push --set-upstream testrepo main
+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
 
-To have this happen automatically for branches without a tracking
-upstream, see 'push.autoSetupRemote' in 'git help config'.
+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
 
-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 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.23 'push --force with matching heads': 
+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/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
+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.51.0/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-08-27 08:21:45.195963529 +0000
-+++ actual	2025-08-27 08:21:45.199963556 +0000
-@@ -1 +1 @@
--9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
-+935970ff2fd2257ae1a73d15652c0ac6f837cf17
-HEAD is now at 9ad36e1 second
-ok 23 - push --force with matching heads
+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.24 'push with matching heads and forced update': 
+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 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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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-08-27 08:21:45.479965403 +0000
-+++ actual	2025-08-27 08:21:45.487965455 +0000
-@@ -1 +1 @@
--9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
-+935970ff2fd2257ae1a73d15652c0ac6f837cf17
-HEAD is now at 9ad36e1 second
-ok 24 - push with matching heads and forced update
+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 5516.25 'push with no ambiguity (1)': 
+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
 
-	mk_test testrepo heads/main &&
-	git push testrepo main:main &&
-	check_push_result testrepo $the_commit heads/main
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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
 
-expecting success of 5516.26 'push with no ambiguity (2)': 
+ok 28 - --full-diff is not affected by --parents
 
-	mk_test testrepo remotes/origin/main &&
-	git push testrepo main:origin/main &&
-	check_push_result testrepo $the_commit remotes/origin/main
+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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 A >file &&
+	git add file &&
+	test_commit A &&
 
-expecting success of 5516.27 'push with colon-less refspec, no ambiguity': 
+	git switch -c branchB I &&
+	echo B >file &&
+	git add file &&
+	test_commit B &&
 
-	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
+	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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 switch -c branchX I &&
+	echo X >file &&
+	git add file &&
+	test_commit X &&
 
-expecting success of 5516.28 'push with weak ambiguity (1)': 
+	git switch -c branchR M &&
+	git merge -m R -Xtheirs X &&
+	note R &&
 
-	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
+	git switch topic &&
+	git merge -m N R &&
+	note N &&
 
+	git switch -c branchY M &&
+	echo Y >y &&
+	git add y &&
+	test_commit Y &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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)
+	git switch -c branchZ C &&
+	echo Z >z &&
+	git add z &&
+	test_commit Z &&
 
-expecting success of 5516.29 'push with weak ambiguity (2)': 
+	git switch topic &&
+	git merge -m O Z &&
+	note O &&
 
-	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
+	git merge -m P Y &&
+	note P
 
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.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 5516.30 'push with ambiguity': 
+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
 
-	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.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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.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 5516.31 'push with onelevel ref': 
-	mk_test testrepo heads/main &&
-	test_must_fail git push testrepo HEAD:refs/onelevel
+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.51.0/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.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 5516.32 'push with colon-less refspec (1)': 
+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
 
-	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.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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.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 5516.33 'push with colon-less refspec (2)': 
+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
 
-	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.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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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)
+# passed all 42 test(s)
+1..42
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6021-rev-list-exclude-hidden.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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)
 
-expecting success of 5516.34 'push with colon-less refspec (3)': 
+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
+---------------------------------------------------------------------
 
-	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 )
+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
+---------------------------------------------------------------------
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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)
+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
+---------------------------------------------------------------------
 
-expecting success of 5516.35 'push with colon-less refspec (4)': 
+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
+---------------------------------------------------------------------
 
-	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 )
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 2 - invalid section
 
-expecting success of 5516.36 'push head with non-existent, incomplete dest': 
+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
 
-	mk_test testrepo &&
-	git push testrepo main:branch &&
-	check_push_result testrepo $the_commit heads/branch
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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 5516.37 'push tag with non-existent, incomplete dest': 
+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
 
-	mk_test testrepo &&
-	git tag -f v1.0 &&
-	git push testrepo v1.0:tag &&
-	check_push_result testrepo $the_commit tags/tag
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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 5516.38 'push oid with non-existent, incomplete dest': 
+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
 
-	mk_test testrepo &&
-	test_must_fail git push testrepo $(git rev-parse main):foo
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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
 
-- 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.
+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
 
-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 oid with non-existent, incomplete dest
+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 5516.39 'push ref expression with non-existent, incomplete dest': 
+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
 
-	mk_test testrepo &&
-	test_must_fail git push testrepo main^:branch
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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
 
-- 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 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
 
-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 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 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
+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
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+ok 23 - receive: passed multiple times
 
-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
+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
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
+ok 24 - receive: without hiddenRefs
 
-		# With force rewinding should succeed
-		git push testrepo +$head &&
-		check_push_result testrepo $the_first_commit heads/local
+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
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+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
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+ok 26 - receive: hidden via receive.hideRefs
 
-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
+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
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+ok 27 - receive: respects both transfer.hideRefs and receive.hideRefs
 
-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
+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
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 @
+ok 28 - receive: negation without hidden refs marks everything as uninteresting
 
-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
+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
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
+ok 29 - receive: negation with hidden refs marks them as interesting
 
-		# With force rewinding should succeed
-		git push testrepo +$head &&
-		check_push_result testrepo $the_first_commit heads/local
+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
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 +@
+ok 30 - receive: hidden refs and excludes work together
 
-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 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
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+ok 32 - receive: excluded hidden refs can be used with multiple pseudo-refs
 
-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
+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
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 = @
+ok 33 - receive: works with --glob
 
-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
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Note: switching to 'b9c09d6cc74d3857142fb7c082dca65b88254c6d'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 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
 
-If you want to 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 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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at b9c09d6 repo
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-ok 50 - push to remote with no explicit refspec and config remote.*.push = src:dest
+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 5516.51 'push with remote.pushdefault': 
-	mk_test up_repo heads/main &&
-	mk_test down_repo heads/main &&
-	test_config remote.up.url up_repo &&
-	test_config remote.down.url down_repo &&
-	test_config branch.main.remote up &&
-	test_config remote.pushdefault down &&
-	test_config push.default matching &&
-	git push &&
-	check_push_result up_repo $the_first_commit heads/main &&
-	check_push_result down_repo $the_commit heads/main
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/up_repo/.git/
-remote: warning: updating the current branch        
-To up_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/down_repo/.git/
-remote: warning: updating the current branch        
-To down_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-remote: warning: updating the current branch        
-To down_repo
-   b9c09d6..9ad36e1  main -> main
-ok 51 - push with remote.pushdefault
+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 5516.52 'push with config remote.*.pushurl': 
+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
 
-	mk_test testrepo heads/main &&
-	git checkout main &&
-	test_config remote.there.url test2repo &&
-	test_config remote.there.pushurl testrepo &&
-	git push there : &&
-	check_push_result testrepo $the_commit heads/main
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Previous HEAD position was b9c09d6 repo
-Switched to branch 'main'
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-ok 52 - push with config remote.*.pushurl
+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 5516.53 'push with config branch.*.pushremote': 
-	mk_test up_repo heads/main &&
-	mk_test side_repo heads/main &&
-	mk_test down_repo heads/main &&
-	test_config remote.up.url up_repo &&
-	test_config remote.pushdefault side_repo &&
-	test_config remote.down.url down_repo &&
-	test_config branch.main.remote up &&
-	test_config branch.main.pushremote down &&
-	test_config push.default matching &&
-	git push &&
-	check_push_result up_repo $the_first_commit heads/main &&
-	check_push_result side_repo $the_first_commit heads/main &&
-	check_push_result down_repo $the_commit heads/main
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/up_repo/.git/
-remote: warning: updating the current branch        
-To up_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/side_repo/.git/
-remote: warning: updating the current branch        
-To side_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/down_repo/.git/
-remote: warning: updating the current branch        
-To down_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-remote: warning: updating the current branch        
-To down_repo
-   b9c09d6..9ad36e1  main -> main
-ok 53 - push with config branch.*.pushremote
+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 5516.54 'branch.*.pushremote config order is irrelevant': 
-	mk_test one_repo heads/main &&
-	mk_test two_repo heads/main &&
-	test_config remote.one.url one_repo &&
-	test_config remote.two.url two_repo &&
-	test_config branch.main.pushremote two_repo &&
-	test_config remote.pushdefault one_repo &&
-	test_config push.default matching &&
-	git push &&
-	check_push_result one_repo $the_first_commit heads/main &&
-	check_push_result two_repo $the_commit heads/main
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/one_repo/.git/
-remote: warning: updating the current branch        
-To one_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/two_repo/.git/
-remote: warning: updating the current branch        
-To two_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-remote: warning: updating the current branch        
-To two_repo
-   b9c09d6..9ad36e1  main -> main
-ok 54 - branch.*.pushremote config order is irrelevant
+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 5516.55 'push rejects empty branch name entries': 
-	mk_test one_repo heads/main &&
-	test_config remote.one.url one_repo &&
-	test_config branch..remote one &&
-	test_config branch..merge refs/heads/ &&
-	test_config branch.main.remote one &&
-	test_config branch.main.merge refs/heads/main &&
-	test_must_fail git push 2>err &&
-	grep "bad config variable .branch\.\." err
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/one_repo/.git/
-remote: warning: updating the current branch        
-To one_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-fatal: bad config variable 'branch..remote' in file '.git/config' at line 12
-ok 55 - push rejects empty branch name entries
+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 5516.56 'push ignores "branch." config without subsection': 
-	mk_test one_repo heads/main &&
-	test_config remote.one.url one_repo &&
-	test_config branch.autoSetupMerge true &&
-	test_config branch.main.remote one &&
-	test_config branch.main.merge refs/heads/main &&
-	git push
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/one_repo/.git/
-remote: warning: updating the current branch        
-To one_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-remote: warning: updating the current branch        
-To one_repo
-   b9c09d6..9ad36e1  main -> main
-ok 56 - push ignores "branch." config without subsection
+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 5516.57 'push with dry-run': 
+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
 
-	mk_test testrepo heads/main &&
-	old_commit=$(git -C testrepo show-ref -s --verify refs/heads/main) &&
-	git push --dry-run testrepo : &&
-	check_push_result testrepo $old_commit heads/main
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-ok 57 - push with dry-run
+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 5516.58 'push updates local refs': 
+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
 
-	mk_test testrepo heads/main &&
-	mk_child testrepo child &&
-	(
-		cd child &&
-		git pull .. main &&
-		git push &&
-		test $(git rev-parse main) = \
-			$(git rev-parse remotes/origin/main)
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Cloning into 'child'...
-done.
-From ..
- * branch            main       -> FETCH_HEAD
-Updating b9c09d6..9ad36e1
-Fast-forward
- path2 | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-remote: warning: updating the current branch        
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
-   b9c09d6..9ad36e1  main -> main
-ok 58 - push updates local refs
+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
 
-expecting success of 5516.59 'push updates up-to-date local refs': 
+# passed all 62 test(s)
+1..62
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6018-rev-list-glob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6018-rev-list-glob/.git/
+expecting success of 6018.1 'setup': 
 
-	mk_test testrepo heads/main &&
-	mk_child testrepo child1 &&
-	mk_child testrepo child2 &&
-	(cd child1 && git pull .. main && git push) &&
-	(
-		cd child2 &&
-		git pull ../child1 main &&
-		git push &&
-		test $(git rev-parse main) = \
-			$(git rev-parse remotes/origin/main)
-	)
+	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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Cloning into 'child1'...
-done.
-Cloning into 'child2'...
-done.
-From ..
- * branch            main       -> FETCH_HEAD
-Updating b9c09d6..9ad36e1
-Fast-forward
- path2 | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-remote: warning: updating the current branch        
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
-   b9c09d6..9ad36e1  main -> main
-From ../child1
- * branch            main       -> FETCH_HEAD
-Updating b9c09d6..9ad36e1
-Fast-forward
- path2 | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-Everything up-to-date
-ok 59 - push updates up-to-date local refs
+expecting success of 6018.2 'rev-parse --glob=refs/heads/subspace/*': 
 
-expecting success of 5516.60 'push preserves up-to-date packed refs': 
+	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
 
-	mk_test testrepo heads/main &&
-	mk_child testrepo child &&
-	(
-		cd child &&
-		git push &&
-		! test -f .git/refs/remotes/origin/main
-	)
 
+ok 2 - rev-parse --glob=refs/heads/subspace/*
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Cloning into 'child'...
-done.
-Everything up-to-date
-ok 60 - push preserves up-to-date packed refs
+expecting success of 6018.3 'rev-parse --glob=heads/subspace/*': 
 
-expecting success of 5516.61 'push does not update local refs on failure': 
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/*"
 
-	mk_test testrepo heads/main &&
-	mk_child testrepo child &&
-	echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
-	chmod +x testrepo/.git/hooks/pre-receive &&
-	(
-		cd child &&
-		git pull .. main &&
-		test_must_fail git push &&
-		test $(git rev-parse main) != \
-			$(git rev-parse remotes/origin/main)
-	)
 
+ok 3 - rev-parse --glob=heads/subspace/*
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Cloning into 'child'...
-done.
-From ..
- * branch            main       -> FETCH_HEAD
-Updating b9c09d6..9ad36e1
-Fast-forward
- path2 | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-fatal: cannot exec 'hooks/pre-receive': No such file or directory
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
- ! [remote rejected] main -> main (pre-receive hook declined)
-error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo'
-ok 61 - push does not update local refs on failure
+expecting success of 6018.4 'rev-parse --glob=refs/heads/subspace/': 
 
-expecting success of 5516.62 'allow deleting an invalid remote ref': 
+	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/"
 
-	mk_test testrepo heads/branch &&
-	rm -f testrepo/.git/objects/??/* &&
-	git push testrepo :refs/heads/branch &&
-	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/branch)
 
+ok 4 - rev-parse --glob=refs/heads/subspace/
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> branch
-notice: HEAD points to an unborn branch (main)
-remote: warning: allowing deletion of corrupt ref        
-To testrepo
- - [deleted]         branch
-fatal: Needed a single revision
-ok 62 - allow deleting an invalid remote ref
+expecting success of 6018.5 'rev-parse --glob=heads/subspace/': 
 
-expecting success of 5516.63 'pushing valid refs triggers post-receive and post-update hooks': 
-	mk_test_with_hooks testrepo heads/main heads/next &&
-	orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
-	newmain=$(git show-ref -s --verify refs/heads/main) &&
-	orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
-	newnext=$ZERO_OID &&
-	git push testrepo refs/heads/main:refs/heads/main :refs/heads/next &&
-	(
-		cd testrepo/.git &&
-		cat >pre-receive.expect <<-EOF &&
-		$orgmain $newmain refs/heads/main
-		$orgnext $newnext refs/heads/next
-		EOF
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/"
 
-		cat >update.expect <<-EOF &&
-		refs/heads/next $orgnext $newnext
-		refs/heads/main $orgmain $newmain
-		EOF
 
-		cat >post-receive.expect <<-EOF &&
-		$orgmain $newmain refs/heads/main
-		$orgnext $newnext refs/heads/next
-		EOF
+ok 5 - rev-parse --glob=heads/subspace/
 
-		cat >post-update.expect <<-EOF &&
-		refs/heads/main
-		refs/heads/next
-		EOF
+expecting success of 6018.6 'rev-parse --glob=heads/subspace': 
 
-		test_cmp pre-receive.expect pre-receive.actual &&
-		test_cmp update.expect update.actual &&
-		test_cmp post-receive.expect post-receive.actual &&
-		test_cmp post-update.expect post-update.actual
-	)
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> next
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
- - [deleted]         next
-ok 63 - pushing valid refs triggers post-receive and post-update hooks
 
-expecting success of 5516.64 'deleting dangling ref triggers hooks with correct args': 
-	mk_test_with_hooks testrepo heads/branch &&
-	orig=$(git -C testrepo rev-parse refs/heads/branch) &&
-	rm -f testrepo/.git/objects/??/* &&
-	git push testrepo :refs/heads/branch &&
-	(
-		cd testrepo/.git &&
-		cat >pre-receive.expect <<-EOF &&
-		$orig $ZERO_OID refs/heads/branch
-		EOF
+ok 6 - rev-parse --glob=heads/subspace
 
-		cat >update.expect <<-EOF &&
-		refs/heads/branch $orig $ZERO_OID
-		EOF
+checking known breakage of 6018.7 'rev-parse accepts --glob as detached option': 
 
-		cat >post-receive.expect <<-EOF &&
-		$orig $ZERO_OID refs/heads/branch
-		EOF
+	compare rev-parse "subspace/one subspace/two" "--glob heads/subspace"
 
-		cat >post-update.expect <<-EOF &&
-		refs/heads/branch
-		EOF
 
-		test_cmp pre-receive.expect pre-receive.actual &&
-		test_cmp update.expect update.actual &&
-		test_cmp post-receive.expect post-receive.actual &&
-		test_cmp post-update.expect post-update.actual
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> branch
-notice: HEAD points to an unborn branch (main)
-remote: warning: allowing deletion of corrupt ref        
-To testrepo
- - [deleted]         branch
-ok 64 - deleting dangling ref triggers hooks with correct args
+checking known breakage of 6018.8 'rev-parse is not confused by option-like glob': 
 
-expecting success of 5516.65 'deletion of a non-existent ref is not fed to post-receive and post-update hooks': 
-	mk_test_with_hooks testrepo heads/main &&
-	orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
-	newmain=$(git show-ref -s --verify refs/heads/main) &&
-	git push testrepo main :refs/heads/nonexistent &&
-	(
-		cd testrepo/.git &&
-		cat >pre-receive.expect <<-EOF &&
-		$orgmain $newmain refs/heads/main
-		$ZERO_OID $ZERO_OID refs/heads/nonexistent
-		EOF
+	compare rev-parse "main" "--glob --symbolic main"
 
-		cat >update.expect <<-EOF &&
-		refs/heads/nonexistent $ZERO_OID $ZERO_OID
-		refs/heads/main $orgmain $newmain
-		EOF
 
-		cat >post-receive.expect <<-EOF &&
-		$orgmain $newmain refs/heads/main
-		EOF
+--- expected	2026-09-29 14:53:11.358548970 +0000
++++ actual	2026-09-29 14:53:11.362548970 +0000
+@@ -1 +1,2 @@
+-88fe3d283ae350159b6dcc1f45481c8fa40ad3d8
++--glob
++main
+not ok 8 - rev-parse is not confused by option-like glob # TODO known breakage
 
-		cat >post-update.expect <<-EOF &&
-		refs/heads/main
-		EOF
+expecting success of 6018.9 'rev-parse --branches=subspace/*': 
 
-		test_cmp pre-receive.expect pre-receive.actual &&
-		test_cmp update.expect update.actual &&
-		test_cmp post-receive.expect post-receive.actual &&
-		test_cmp post-update.expect post-update.actual
-	)
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-remote: warning: deleting a non-existent ref        
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
- - [deleted]         nonexistent
-ok 65 - deletion of a non-existent ref is not fed to post-receive and post-update hooks
 
-expecting success of 5516.66 'deletion of a non-existent ref alone does trigger post-receive and post-update hooks': 
-	mk_test_with_hooks testrepo heads/main &&
-	git push testrepo :refs/heads/nonexistent &&
-	(
-		cd testrepo/.git &&
-		cat >pre-receive.expect <<-EOF &&
-		$ZERO_OID $ZERO_OID refs/heads/nonexistent
-		EOF
+ok 9 - rev-parse --branches=subspace/*
 
-		cat >update.expect <<-EOF &&
-		refs/heads/nonexistent $ZERO_OID $ZERO_OID
-		EOF
+expecting success of 6018.10 'rev-parse --branches=subspace/': 
 
-		test_cmp pre-receive.expect pre-receive.actual &&
-		test_cmp update.expect update.actual &&
-		test_path_is_missing post-receive.actual &&
-		test_path_is_missing post-update.actual
-	)
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace/"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-remote: warning: deleting a non-existent ref        
-To testrepo
- - [deleted]         nonexistent
-ok 66 - deletion of a non-existent ref alone does trigger post-receive and post-update hooks
 
-expecting success of 5516.67 'mixed ref updates, deletes, invalid deletes trigger hooks with correct input': 
-	mk_test_with_hooks testrepo heads/main heads/next heads/seen &&
-	orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
-	newmain=$(git show-ref -s --verify refs/heads/main) &&
-	orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
-	newnext=$ZERO_OID &&
-	orgseen=$(cd testrepo && git show-ref -s --verify refs/heads/seen) &&
-	newseen=$(git show-ref -s --verify refs/heads/main) &&
-	git push testrepo refs/heads/main:refs/heads/main \
-	    refs/heads/main:refs/heads/seen :refs/heads/next \
-	    :refs/heads/nonexistent &&
-	(
-		cd testrepo/.git &&
-		cat >pre-receive.expect <<-EOF &&
-		$orgmain $newmain refs/heads/main
-		$orgnext $newnext refs/heads/next
-		$orgseen $newseen refs/heads/seen
-		$ZERO_OID $ZERO_OID refs/heads/nonexistent
-		EOF
+ok 10 - rev-parse --branches=subspace/
 
-		cat >update.expect <<-EOF &&
-		refs/heads/next $orgnext $newnext
-		refs/heads/nonexistent $ZERO_OID $ZERO_OID
-		refs/heads/main $orgmain $newmain
-		refs/heads/seen $orgseen $newseen
-		EOF
+expecting success of 6018.11 'rev-parse --branches=subspace': 
 
-		cat >post-receive.expect <<-EOF &&
-		$orgmain $newmain refs/heads/main
-		$orgnext $newnext refs/heads/next
-		$orgseen $newseen refs/heads/seen
-		EOF
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace"
 
-		cat >post-update.expect <<-EOF &&
-		refs/heads/main
-		refs/heads/next
-		refs/heads/seen
-		EOF
 
-		test_cmp pre-receive.expect pre-receive.actual &&
-		test_cmp update.expect update.actual &&
-		test_cmp post-receive.expect post-receive.actual &&
-		test_cmp post-update.expect post-update.actual
-	)
+ok 11 - rev-parse --branches=subspace
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> next
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> seen
-remote: warning: deleting a non-existent ref        
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
- - [deleted]         next
-   b9c09d6..9ad36e1  main -> seen
- - [deleted]         nonexistent
-ok 67 - mixed ref updates, deletes, invalid deletes trigger hooks with correct input
+expecting success of 6018.12 'rev-parse --glob=heads/subspace/* --glob=heads/other/*': 
 
-expecting success of 5516.68 'allow deleting a ref using --delete': 
-	mk_test testrepo heads/main &&
-	(cd testrepo && git config receive.denyDeleteCurrent warn) &&
-	git push testrepo --delete main &&
-	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/main)
+	compare rev-parse "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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        
-remote: warning: deleting the current branch        
-To testrepo
- - [deleted]         main
-fatal: Needed a single revision
-ok 68 - allow deleting a ref using --delete
 
-expecting success of 5516.69 'allow deleting a tag using --delete': 
-	mk_test testrepo heads/main &&
-	git tag -a -m dummy_message deltag heads/main &&
-	git push testrepo --tags &&
-	(cd testrepo && git rev-parse --verify -q refs/tags/deltag) &&
-	git push testrepo --delete tag deltag &&
-	(cd testrepo && test_must_fail git rev-parse --verify refs/tags/deltag)
+ok 12 - rev-parse --glob=heads/subspace/* --glob=heads/other/*
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-To testrepo
- * [new tag]         deltag -> deltag
- * [new tag]         frotz -> frotz
- * [new tag]         v1.0 -> v1.0
-7bbc2bd37a7570491d071ea0fdc2120c9eed7718
-To testrepo
- - [deleted]         deltag
-fatal: Needed a single revision
-ok 69 - allow deleting a tag using --delete
+expecting success of 6018.13 'rev-parse --glob=heads/someref/* main': 
 
-expecting success of 5516.70 'push --delete without args aborts': 
-	mk_test testrepo heads/main &&
-	test_must_fail git push testrepo --delete
+	compare rev-parse "main" "--glob=heads/someref/* main"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-fatal: --delete doesn't make sense without any refs
-ok 70 - push --delete without args aborts
 
-expecting success of 5516.71 'push --delete refuses src:dest refspecs': 
-	mk_test testrepo heads/main &&
-	test_must_fail git push testrepo --delete main:foo
+ok 13 - rev-parse --glob=heads/someref/* main
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-fatal: --delete only accepts plain target ref names
-ok 71 - push --delete refuses src:dest refspecs
+expecting success of 6018.14 'rev-parse --glob=heads/*': 
 
-expecting success of 5516.72 'push --delete refuses empty string': 
-	mk_test testrepo heads/master &&
-	test_must_fail git push testrepo --delete ""
+	compare rev-parse "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-notice: HEAD points to an unborn branch (main)
-fatal: --delete only accepts plain target ref names
-ok 72 - push --delete refuses empty string
 
-expecting success of 5516.73 'push --delete onelevel refspecs': 
-	mk_test testrepo heads/main &&
-	git -C testrepo update-ref refs/onelevel refs/heads/main &&
-	git push testrepo --delete refs/onelevel &&
-	test_must_fail git -C testrepo rev-parse --verify refs/onelevel
+ok 14 - rev-parse --glob=heads/*
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-To testrepo
- - [deleted]         refs/onelevel
-fatal: Needed a single revision
-ok 73 - push --delete onelevel refspecs
+expecting success of 6018.15 'rev-parse --tags=foo': 
 
-expecting success of 5516.74 'warn on push to HEAD of non-bare repository': 
-	mk_test testrepo heads/main &&
-	(
-		cd testrepo &&
-		git checkout main &&
-		git config receive.denyCurrentBranch warn
-	) &&
-	git push testrepo main 2>stderr &&
-	grep "warning: updating the current branch" stderr
+	compare rev-parse "foo/bar" "--tags=foo"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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        
-ok 74 - warn on push to HEAD of non-bare repository
 
-expecting success of 5516.75 'deny push to HEAD of non-bare repository': 
-	mk_test testrepo heads/main &&
-	(
-		cd testrepo &&
-		git checkout main &&
-		git config receive.denyCurrentBranch true
-	) &&
-	test_must_fail git push testrepo main
+ok 15 - rev-parse --tags=foo
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Already on 'main'
-remote: error: refusing to update checked out branch: refs/heads/main        
-To testrepo
- ! [remote rejected] main -> main (branch is currently checked out)
-error: failed to push some refs to 'testrepo'
-ok 75 - deny push to HEAD of non-bare repository
+expecting success of 6018.16 'rev-parse --remotes=foo': 
 
-expecting success of 5516.76 'allow push to HEAD of bare repository (bare)': 
-	mk_test testrepo heads/main &&
-	(
-		cd testrepo &&
-		git checkout main &&
-		git config receive.denyCurrentBranch true &&
-		git config core.bare true
-	) &&
-	git push testrepo main 2>stderr &&
-	! grep "warning: updating the current branch" stderr
+	compare rev-parse "foo/baz" "--remotes=foo"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Already on 'main'
-ok 76 - allow push to HEAD of bare repository (bare)
 
-expecting success of 5516.77 'allow push to HEAD of non-bare repository (config)': 
-	mk_test testrepo heads/main &&
-	(
-		cd testrepo &&
-		git checkout main &&
-		git config receive.denyCurrentBranch false
-	) &&
-	git push testrepo main 2>stderr &&
-	! grep "warning: updating the current branch" stderr
+ok 16 - rev-parse --remotes=foo
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Already on 'main'
-ok 77 - allow push to HEAD of non-bare repository (config)
+expecting success of 6018.17 'rev-parse --exclude with --branches': 
+	compare rev-parse "--exclude=*/* --branches" "main someref subspace-x"
 
-checking prerequisite: WITH_BREAKING_CHANGES
+ok 17 - rev-parse --exclude with --branches
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-WITH_BREAKING_CHANGES" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-WITH_BREAKING_CHANGES" &&
-	test -n "$WITH_BREAKING_CHANGES"
+expecting success of 6018.18 'rev-parse --exclude with --all': 
+	compare rev-parse "--exclude=refs/remotes/* --all" "--branches --tags"
 
-)
-prerequisite WITH_BREAKING_CHANGES not satisfied
-expecting success of 5516.78 'fetch with branches': 
-	mk_empty testrepo &&
-	git branch second $the_first_commit &&
-	git checkout second &&
-	mkdir testrepo/.git/branches &&
-	echo ".." > testrepo/.git/branches/branch1 &&
-	(
-		cd testrepo &&
-		git fetch branch1 &&
-		echo "$the_commit commit	refs/heads/branch1" >expect &&
-		git for-each-ref refs/heads >actual &&
-		test_cmp expect actual
-	) &&
-	git checkout main
+ok 18 - rev-parse --exclude with --all
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-Switched to branch 'second'
-warning: reading remote from "branches/branch1", which is nominated for removal.
+expecting success of 6018.19 'rev-parse accumulates multiple --exclude': 
+	compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
 
-If you still use the "remotes/" directory it is recommended to
-migrate to config-based remotes:
+ok 19 - rev-parse accumulates multiple --exclude
 
-	git remote rename branch1 branch1
+expecting success of 6018.20 'rev-parse --branches clears --exclude': 
+	compare rev-parse "--exclude=* --branches --branches" "--branches"
 
-If you cannot, please let us know why you still need to use it by
-sending an e-mail to <git@vger.kernel.org>.
-From ..
- * [new branch]      main       -> branch1
- * [new tag]         deltag     -> deltag
- * [new tag]         frotz      -> frotz
- * [new tag]         v1.0       -> v1.0
-Switched to branch 'main'
-ok 78 - fetch with branches
+ok 20 - rev-parse --branches clears --exclude
 
-expecting success of 5516.79 'fetch with branches containing #': 
-	mk_empty testrepo &&
-	mkdir testrepo/.git/branches &&
-	echo "..#second" > testrepo/.git/branches/branch2 &&
-	(
-		cd testrepo &&
-		git fetch branch2 &&
-		echo "$the_first_commit commit	refs/heads/branch2" >expect &&
-		git for-each-ref refs/heads >actual &&
-		test_cmp expect actual
-	) &&
-	git checkout main
+expecting success of 6018.21 'rev-parse --tags clears --exclude': 
+	compare rev-parse "--exclude=* --tags --tags" "--tags"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-warning: reading remote from "branches/branch2", which is nominated for removal.
+ok 21 - rev-parse --tags clears --exclude
 
-If you still use the "remotes/" directory it is recommended to
-migrate to config-based remotes:
+expecting success of 6018.22 'rev-parse --all clears --exclude': 
+	compare rev-parse "--exclude=* --all --all" "--all"
 
-	git remote rename branch2 branch2
+ok 22 - rev-parse --all clears --exclude
 
-If you cannot, please let us know why you still need to use it by
-sending an e-mail to <git@vger.kernel.org>.
-From ..
- * [new branch]      second     -> branch2
-Already on 'main'
-ok 79 - fetch with branches containing #
+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 5516.80 'push with branches': 
-	mk_empty testrepo &&
-	git checkout second &&
+ok 23 - rev-parse --exclude=glob with --branches=glob
 
-	test_when_finished "rm -rf .git/branches" &&
-	mkdir .git/branches &&
-	echo "testrepo" > .git/branches/branch1 &&
+expecting success of 6018.24 'rev-parse --exclude=glob with --tags=glob': 
+	compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
 
-	git push branch1 &&
-	(
-		cd testrepo &&
-		echo "$the_first_commit commit	refs/heads/main" >expect &&
-		git for-each-ref refs/heads >actual &&
-		test_cmp expect actual
-	)
+ok 24 - rev-parse --exclude=glob with --tags=glob
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-Switched to branch 'second'
-warning: reading remote from "branches/branch1", which is nominated for removal.
+expecting success of 6018.25 'rev-parse --exclude=glob with --remotes=glob': 
+	compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
 
-If you still use the "remotes/" directory it is recommended to
-migrate to config-based remotes:
+ok 25 - rev-parse --exclude=glob with --remotes=glob
 
-	git remote rename branch1 branch1
+expecting success of 6018.26 'rev-parse --exclude=ref with --branches=glob': 
+	compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
 
-If you cannot, please let us know why you still need to use it by
-sending an e-mail to <git@vger.kernel.org>.
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      HEAD -> main
-ok 80 - push with branches
+ok 26 - rev-parse --exclude=ref with --branches=glob
 
-expecting success of 5516.81 'push with branches containing #': 
-	mk_empty testrepo &&
+expecting success of 6018.27 'rev-parse --exclude=ref with --tags=glob': 
+	compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
 
-	test_when_finished "rm -rf .git/branches" &&
-	mkdir .git/branches &&
-	echo "testrepo#branch3" > .git/branches/branch2 &&
+ok 27 - rev-parse --exclude=ref with --tags=glob
 
-	git push branch2 &&
-	(
-		cd testrepo &&
-		echo "$the_first_commit commit	refs/heads/branch3" >expect &&
-		git for-each-ref refs/heads >actual &&
-		test_cmp expect actual
-	) &&
-	git checkout main
+expecting success of 6018.28 'rev-parse --exclude=ref with --remotes=glob': 
+	compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-warning: reading remote from "branches/branch2", which is nominated for removal.
+ok 28 - rev-parse --exclude=ref with --remotes=glob
 
-If you still use the "remotes/" directory it is recommended to
-migrate to config-based remotes:
+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
 
-	git remote rename branch2 branch2
+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
 
-If you cannot, please let us know why you still need to use it by
-sending an e-mail to <git@vger.kernel.org>.
-To testrepo
- * [new branch]      HEAD -> branch3
-Switched to branch 'main'
-ok 81 - push with branches containing #
+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 5516.82 'push into aliased refs (consistent)': 
-	mk_test testrepo heads/main &&
-	mk_child testrepo child1 &&
-	mk_child testrepo child2 &&
-	(
-		cd child1 &&
-		git branch foo &&
-		git symbolic-ref refs/heads/bar refs/heads/foo &&
-		git config receive.denyCurrentBranch false
-	) &&
-	(
-		cd child2 &&
-		>path2 &&
-		git add path2 &&
-		test_tick &&
-		git commit -a -m child2 &&
-		git branch foo &&
-		git branch bar &&
-		git push ../child1 foo bar
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Cloning into 'child1'...
-done.
-Cloning into 'child2'...
-done.
-[main aee3f74] child2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-To ../child1
-   b9c09d6..aee3f74  bar -> bar
-   b9c09d6..aee3f74  foo -> foo
-ok 82 - push into aliased refs (consistent)
+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 5516.83 'push into aliased refs (inconsistent)': 
-	mk_test testrepo heads/main &&
-	mk_child testrepo child1 &&
-	mk_child testrepo child2 &&
-	(
-		cd child1 &&
-		git branch foo &&
-		git symbolic-ref refs/heads/bar refs/heads/foo &&
-		git config receive.denyCurrentBranch false
-	) &&
-	(
-		cd child2 &&
-		>path2 &&
-		git add path2 &&
-		test_tick &&
-		git commit -a -m child2 &&
-		git branch foo &&
-		>path3 &&
-		git add path3 &&
-		test_tick &&
-		git commit -a -m child2 &&
-		git branch bar &&
-		test_must_fail git push ../child1 foo bar 2>stderr &&
-		grep "refusing inconsistent update" stderr
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Cloning into 'child1'...
-done.
-Cloning into 'child2'...
-done.
-[main aee3f74] child2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-[main a725715] child2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path3
-remote: error: refusing inconsistent update between symref 'refs/heads/bar' (b9c09d6..a725715) and its target 'refs/heads/foo' (b9c09d6..aee3f74)        
-ok 83 - push into aliased refs (inconsistent)
+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 5516.84 'force pushing required to update lightweight tag': 
-		mk_test testrepo heads/main &&
-		mk_child testrepo child1 &&
-		mk_child testrepo child2 &&
-		(
-			cd child1 &&
-			git tag testTag &&
-			git push ../child2 testTag &&
-			>file1 &&
-			git add file1 &&
-			git commit -m 'file1' &&
-			git tag -f testTag &&
-			test_must_fail git push ../child2 testTag &&
-			git push --force ../child2 testTag &&
-			git tag -f testTag HEAD~ &&
-			test_must_fail git push ../child2 testTag &&
-			git push --force ../child2 testTag &&
+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
 
-			# Clobbering without + in refspec needs --force
-			git tag -f testTag &&
-			test_must_fail git push ../child2 'refs/tags/*:refs/tags/*' &&
-			git push --force ../child2 'refs/tags/*:refs/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
 
-			# Clobbering with + in refspec does not need --force
-			git tag -f testTag HEAD~ &&
-			git push ../child2 '+refs/tags/*:refs/tags/*' &&
+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
 
-			# Clobbering with --no-force still obeys + in refspec
-			git tag -f testTag &&
-			git push --no-force ../child2 '+refs/tags/*:refs/tags/*' &&
+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
 
-			# Clobbering with/without --force and 'tag <name>' format
-			git tag -f testTag HEAD~ &&
-			test_must_fail git push ../child2 tag testTag &&
-			git push --force ../child2 tag testTag
-		)
+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"
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Cloning into 'child1'...
-done.
-Cloning into 'child2'...
-done.
-To ../child2
- * [new tag]         testTag -> testTag
-[main 679dfc1] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
-Updated tag 'testTag' (was b9c09d6)
-To ../child2
- ! [rejected]        testTag -> testTag (already exists)
-error: failed to push some refs to '../child2'
-hint: Updates were rejected because the tag already exists in the remote.
-To ../child2
- + b9c09d6...679dfc1 testTag -> testTag (forced update)
-Updated tag 'testTag' (was 679dfc1)
-To ../child2
- ! [rejected]        testTag -> testTag (already exists)
-error: failed to push some refs to '../child2'
-hint: Updates were rejected because the tag already exists in the remote.
-To ../child2
- + 679dfc1...b9c09d6 testTag -> testTag (forced update)
-Updated tag 'testTag' (was b9c09d6)
-To ../child2
- ! [rejected]        testTag -> testTag (already exists)
-error: failed to push some refs to '../child2'
-hint: Updates were rejected because the tag already exists in the remote.
-To ../child2
- + b9c09d6...679dfc1 testTag -> testTag (forced update)
-Updated tag 'testTag' (was 679dfc1)
-To ../child2
- + 679dfc1...b9c09d6 testTag -> testTag (forced update)
-Updated tag 'testTag' (was b9c09d6)
-To ../child2
- + b9c09d6...679dfc1 testTag -> testTag (forced update)
-Updated tag 'testTag' (was 679dfc1)
-To ../child2
- ! [rejected]        testTag -> testTag (already exists)
-error: failed to push some refs to '../child2'
-hint: Updates were rejected because the tag already exists in the remote.
-To ../child2
- + 679dfc1...b9c09d6 testTag -> testTag (forced update)
-ok 84 - force pushing required to update lightweight tag
-
-expecting success of 5516.85 'force pushing required to update annotated tag': 
-		mk_test testrepo heads/main &&
-		mk_child testrepo child1 &&
-		mk_child testrepo child2 &&
-		(
-			cd child1 &&
-			git tag testTag &&
-			git push ../child2 testTag &&
-			>file1 &&
-			git add file1 &&
-			git commit -m 'file1' &&
-			git tag -f -a -m'tag message' testTag &&
-			test_must_fail git push ../child2 testTag &&
-			git push --force ../child2 testTag &&
-			git tag -f -a -m'tag message' testTag HEAD~ &&
-			test_must_fail git push ../child2 testTag &&
-			git push --force ../child2 testTag &&
-
-			# Clobbering without + in refspec needs --force
-			git tag -f testTag &&
-			test_must_fail git push ../child2 'refs/tags/*:refs/tags/*' &&
-			git push --force ../child2 'refs/tags/*:refs/tags/*' &&
-
-			# Clobbering with + in refspec does not need --force
-			git tag -f testTag HEAD~ &&
-			git push ../child2 '+refs/tags/*:refs/tags/*' &&
+ok 40 - rev-parse --exclude-hidden=receive with --all
 
-			# Clobbering with --no-force still obeys + in refspec
-			git tag -f testTag &&
-			git push --no-force ../child2 '+refs/tags/*:refs/tags/*' &&
+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
 
-			# Clobbering with/without --force and 'tag <name>' format
-			git tag -f testTag HEAD~ &&
-			test_must_fail git push ../child2 tag testTag &&
-			git push --force ../child2 tag testTag
-		)
+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/*"
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Cloning into 'child1'...
-done.
-Cloning into 'child2'...
-done.
-To ../child2
- * [new tag]         testTag -> testTag
-[main 679dfc1] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
-Updated tag 'testTag' (was b9c09d6)
-To ../child2
- ! [rejected]        testTag -> testTag (already exists)
-error: failed to push some refs to '../child2'
-hint: Updates were rejected because the tag already exists in the remote.
-To ../child2
- + b9c09d6...18e054b testTag -> testTag (forced update)
-Updated tag 'testTag' (was 18e054b)
-To ../child2
- ! [rejected]        testTag -> testTag (already exists)
-error: failed to push some refs to '../child2'
-hint: Updates were rejected because the tag already exists in the remote.
-To ../child2
- + 18e054b...4655ebe testTag -> testTag (forced update)
-Updated tag 'testTag' (was 4655ebe)
-To ../child2
- ! [rejected]        testTag -> testTag (already exists)
-error: failed to push some refs to '../child2'
-hint: Updates were rejected because the tag already exists in the remote.
-To ../child2
- + 4655ebe...679dfc1 testTag -> testTag (forced update)
-Updated tag 'testTag' (was 679dfc1)
-To ../child2
- + 679dfc1...b9c09d6 testTag -> testTag (forced update)
-Updated tag 'testTag' (was b9c09d6)
-To ../child2
- + b9c09d6...679dfc1 testTag -> testTag (forced update)
-Updated tag 'testTag' (was 679dfc1)
-To ../child2
- ! [rejected]        testTag -> testTag (already exists)
-error: failed to push some refs to '../child2'
-hint: Updates were rejected because the tag already exists in the remote.
-To ../child2
- + 679dfc1...b9c09d6 testTag -> testTag (forced update)
-ok 85 - force pushing required to update annotated tag
+ok 42 - rev-parse --exclude-hidden=receive with --glob
 
-expecting success of 5516.86 'fetch will not clobber an existing lightweight tag without --force': 
-		mk_test testrepo heads/main &&
-		mk_child testrepo child1 &&
-		mk_child testrepo child2 &&
-		(
-			cd testrepo &&
-			git tag testTag &&
-			git -C ../child1 fetch origin tag testTag &&
-			>file1 &&
-			git add file1 &&
-			git commit -m 'file1' &&
-			git tag -f testTag &&
-			test_must_fail git -C ../child1 fetch origin tag testTag &&
-			git -C ../child1 fetch origin '+refs/tags/*:refs/tags/*'
-		)
+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"
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Cloning into 'child1'...
-done.
-Cloning into 'child2'...
-done.
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
- * [new tag]         testTag    -> testTag
-[main 9770895] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename path1 => file1 (100%)
-Updated tag 'testTag' (was b9c09d6)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
- ! [rejected]        testTag    -> testTag  (would clobber existing tag)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
- t [tag update]      testTag    -> testTag
-ok 86 - fetch will not clobber an existing lightweight tag without --force
+ok 43 - rev-parse --exclude-hidden=receive can be passed once per pseudo-ref
 
-expecting success of 5516.87 'fetch will not clobber an existing annotated tag without --force': 
-		mk_test testrepo heads/main &&
-		mk_child testrepo child1 &&
-		mk_child testrepo child2 &&
-		(
-			cd testrepo &&
-			git tag testTag &&
-			git -C ../child1 fetch origin tag testTag &&
-			>file1 &&
-			git add file1 &&
-			git commit -m 'file1' &&
-			git tag -f -a -m'tag message' testTag &&
-			test_must_fail git -C ../child1 fetch origin tag testTag &&
-			git -C ../child1 fetch origin '+refs/tags/*:refs/tags/*'
-		)
+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
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Cloning into 'child1'...
-done.
-Cloning into 'child2'...
-done.
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
- * [new tag]         testTag    -> testTag
-[main 9770895] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename path1 => file1 (100%)
-Updated tag 'testTag' (was b9c09d6)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
- ! [rejected]        testTag    -> testTag  (would clobber existing tag)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo
- t [tag update]      testTag    -> testTag
-ok 87 - fetch will not clobber an existing annotated tag without --force
+ok 44 - rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref
 
-expecting success of 5516.88 'push --porcelain': 
-	mk_empty testrepo &&
-	echo >.git/foo  "To testrepo" &&
-	echo >>.git/foo "*	refs/heads/main:refs/remotes/origin/main	[new reference]"  &&
-	echo >>.git/foo "Done" &&
-	git push >.git/bar --porcelain  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
-	) &&
-	test_cmp .git/foo .git/bar
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-ok 88 - push --porcelain
+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 5516.89 'push --porcelain bad url': 
-	mk_empty testrepo &&
-	test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/main:refs/remotes/origin/main &&
-	! grep -q Done .git/bar
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-fatal: 'asdfasdfasd' does not appear to be a git repository
-fatal: Could not read from remote repository.
+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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 89 - push --porcelain bad url
+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 5516.90 'push --porcelain rejected': 
-	mk_empty testrepo &&
-	git push testrepo refs/heads/main:refs/remotes/origin/main &&
-	(cd testrepo &&
-		git reset --hard origin/main^ &&
-		git config receive.denyCurrentBranch true) &&
+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
 
-	echo >.git/foo  "To testrepo"  &&
-	echo >>.git/foo "!	refs/heads/main:refs/heads/main	[remote rejected] (branch is currently checked out)" &&
-	echo >>.git/foo "Done" &&
+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
 
-	test_must_fail git push >.git/bar --porcelain  testrepo refs/heads/main:refs/heads/main &&
-	test_cmp .git/foo .git/bar
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   main -> origin/main
-HEAD is now at b9c09d6 repo
-remote: error: refusing to update checked out branch: refs/heads/main        
-error: failed to push some refs to 'testrepo'
-ok 90 - push --porcelain rejected
+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 5516.91 'push --porcelain --dry-run rejected': 
-	mk_empty testrepo &&
-	git push testrepo refs/heads/main:refs/remotes/origin/main &&
-	(cd testrepo &&
-		git reset --hard origin/main &&
-		git config receive.denyCurrentBranch true) &&
+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
 
-	echo >.git/foo  "To testrepo"  &&
-	echo >>.git/foo "!	refs/heads/main^:refs/heads/main	[rejected] (non-fast-forward)" &&
-	echo >>.git/foo "Done" &&
+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
 
-	test_must_fail git push >.git/bar --porcelain  --dry-run testrepo refs/heads/main^:refs/heads/main &&
-	test_cmp .git/foo .git/bar
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   main -> origin/main
-HEAD is now at 9ad36e1 second
-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.
-ok 91 - push --porcelain --dry-run rejected
+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 5516.92 'push --prune': 
-	mk_test testrepo heads/main heads/foo heads/bar &&
-	git push --prune testrepo : &&
-	check_push_result testrepo $the_commit heads/main &&
-	! check_push_result testrepo $the_first_commit heads/foo heads/bar
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> foo
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> bar
-remote: warning: updating the current branch        
-To testrepo
- - [deleted]         bar
- - [deleted]         foo
-   b9c09d6..9ad36e1  main -> main
-fatal: 'refs/heads/foo' - not a valid ref
-ok 92 - push --prune
+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 5516.93 'push --prune refspec': 
-	mk_test testrepo tmp/main tmp/foo tmp/bar &&
-	git push --prune testrepo "refs/heads/*:refs/tmp/*" &&
-	check_push_result testrepo $the_commit tmp/main &&
-	! check_push_result testrepo $the_first_commit tmp/foo tmp/bar
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/tmp/main
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/tmp/foo
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/tmp/bar
-notice: HEAD points to an unborn branch (main)
-To testrepo
- - [deleted]         refs/tmp/bar
- - [deleted]         refs/tmp/foo
-   b9c09d6..9ad36e1  main -> refs/tmp/main
- * [new reference]   branch1 -> refs/tmp/branch1
- * [new reference]   branch2 -> refs/tmp/branch2
- * [new reference]   second -> refs/tmp/second
- * [new reference]   t/main -> refs/tmp/t/main
-notice: HEAD points to an unborn branch (main)
-fatal: 'refs/tmp/foo' - not a valid ref
-ok 93 - push --prune refspec
+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 5516.94 'push to update a ref hidden by transfer.hiderefs': 
-		mk_test testrepo heads/main hidden/one hidden/two hidden/three &&
-		(
-			cd testrepo &&
-			git config $configsection.hiderefs refs/hidden
-		) &&
+expecting success of 6018.62 'rev-list --exclude=glob with --branches=glob': 
+	compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
 
-		# push to unhidden ref succeeds normally
-		git push testrepo main:refs/heads/main &&
-		check_push_result testrepo $the_commit heads/main &&
+ok 62 - rev-list --exclude=glob with --branches=glob
 
-		# push to update a hidden ref should fail
-		test_must_fail git push testrepo main:refs/hidden/one &&
-		check_push_result testrepo $the_first_commit hidden/one &&
+expecting success of 6018.63 'rev-list --exclude=glob with --tags=glob': 
+	compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
 
-		# push to delete a hidden ref should fail
-		test_must_fail git push testrepo :refs/hidden/two &&
-		check_push_result testrepo $the_first_commit hidden/two &&
+ok 63 - rev-list --exclude=glob with --tags=glob
 
-		# idempotent push to update a hidden ref should fail
-		test_must_fail git push testrepo $the_first_commit:refs/hidden/three &&
-		check_push_result testrepo $the_first_commit hidden/three
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> refs/hidden/one
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/hidden/two
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/hidden/three
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-To testrepo
- ! [remote rejected] main -> refs/hidden/one (deny updating a hidden ref)
-error: failed to push some refs to 'testrepo'
-To testrepo
- ! [remote rejected] refs/hidden/two (deny deleting a hidden ref)
-error: failed to push some refs to 'testrepo'
-To testrepo
- ! [remote rejected] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/hidden/three (deny updating a hidden ref)
-error: failed to push some refs to 'testrepo'
-ok 94 - push to update a ref hidden by transfer.hiderefs
+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 5516.95 'push to update a ref hidden by receive.hiderefs': 
-		mk_test testrepo heads/main hidden/one hidden/two hidden/three &&
-		(
-			cd testrepo &&
-			git config $configsection.hiderefs refs/hidden
-		) &&
+ok 64 - rev-list --exclude=glob with --remotes=glob
 
-		# push to unhidden ref succeeds normally
-		git push testrepo main:refs/heads/main &&
-		check_push_result testrepo $the_commit heads/main &&
+expecting success of 6018.65 'rev-list --exclude=ref with --branches=glob': 
+	compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
 
-		# push to update a hidden ref should fail
-		test_must_fail git push testrepo main:refs/hidden/one &&
-		check_push_result testrepo $the_first_commit hidden/one &&
+ok 65 - rev-list --exclude=ref with --branches=glob
 
-		# push to delete a hidden ref should fail
-		test_must_fail git push testrepo :refs/hidden/two &&
-		check_push_result testrepo $the_first_commit hidden/two &&
+expecting success of 6018.66 'rev-list --exclude=ref with --tags=glob': 
+	compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
 
-		# idempotent push to update a hidden ref should fail
-		test_must_fail git push testrepo $the_first_commit:refs/hidden/three &&
-		check_push_result testrepo $the_first_commit hidden/three
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> refs/hidden/one
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/hidden/two
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/hidden/three
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-To testrepo
- ! [remote rejected] main -> refs/hidden/one (deny updating a hidden ref)
-error: failed to push some refs to 'testrepo'
-To testrepo
- ! [remote rejected] refs/hidden/two (deny deleting a hidden ref)
-error: failed to push some refs to 'testrepo'
-To testrepo
- ! [remote rejected] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/hidden/three (deny updating a hidden ref)
-error: failed to push some refs to 'testrepo'
-ok 95 - push to update a ref hidden by receive.hiderefs
+ok 66 - rev-list --exclude=ref with --tags=glob
 
-expecting success of 5516.96 'fetch exact oid': 
-	mk_test testrepo heads/main hidden/one &&
-	git push testrepo main:refs/hidden/one &&
-	(
-		cd testrepo &&
-		git config transfer.hiderefs refs/hidden
-	) &&
-	check_push_result testrepo $the_commit hidden/one &&
+expecting success of 6018.67 'rev-list --exclude=ref with --remotes=glob': 
+	compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
 
-	mk_child testrepo child &&
-	(
-		cd child &&
+ok 67 - rev-list --exclude=ref with --remotes=glob
 
-		# make sure $the_commit does not exist here
-		git repack -a -d &&
-		git prune &&
-		test_must_fail git cat-file -t $the_commit &&
+expecting success of 6018.68 'rev-list --glob=refs/heads/subspace/*': 
 
-		# Some protocol versions (e.g. 2) support fetching
-		# unadvertised objects, so restrict this test to v0.
+	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
 
-		# fetching the hidden object should fail by default
-		test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
-			git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err &&
-		test_grep "Server does not allow request for unadvertised object" err &&
-		test_must_fail git rev-parse --verify refs/heads/copy &&
 
-		# the server side can allow it to succeed
-		(
-			cd ../testrepo &&
-			git config uploadpack.allowtipsha1inwant true
-		) &&
+ok 68 - rev-list --glob=refs/heads/subspace/*
 
-		git fetch -v ../testrepo $the_commit:refs/heads/copy main:refs/heads/extra &&
-		cat >expect <<-EOF &&
-		$the_commit
-		$the_first_commit
-		EOF
-		{
-			git rev-parse --verify refs/heads/copy &&
-			git rev-parse --verify refs/heads/extra
-		} >actual &&
-		test_cmp expect actual
-	)
+expecting success of 6018.69 'rev-list --glob refs/heads/subspace/*': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> refs/hidden/one
-To testrepo
-   b9c09d6..9ad36e1  main -> refs/hidden/one
-Cloning into 'child'...
-done.
-fatal: git cat-file: could not get object info
-error: Server does not allow request for unadvertised object 9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
-fatal: Needed a single revision
-From ../testrepo
- * [new ref]         9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f -> copy
- * [new branch]      main                                     -> extra
-ok 96 - fetch exact oid
+	compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
 
-expecting success of 5516.97 'fetch exact oid in protocol v2': 
-	mk_test testrepo heads/main hidden/one &&
-	git push testrepo main:refs/hidden/one &&
-	git -C testrepo config transfer.hiderefs refs/hidden &&
-	check_push_result testrepo $the_commit hidden/one &&
 
-	mk_child testrepo child &&
-	git -C child config protocol.version 2 &&
+ok 69 - rev-list --glob refs/heads/subspace/*
 
-	# make sure $the_commit does not exist here
-	git -C child repack -a -d &&
-	git -C child prune &&
-	test_must_fail git -C child cat-file -t $the_commit &&
+expecting success of 6018.70 'rev-list not confused by option-like --glob arg': 
 
-	# fetching the hidden object succeeds by default
-	GIT_TRACE_PACKET=$PWD/trace.out \
-	git -C child fetch -v ../testrepo $the_commit:refs/heads/copy &&
+	compare rev-list "main" "--glob -0 main"
 
-	test_grep ! "ref-prefix.*$the_commit" trace.out
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -> refs/hidden/one
-To testrepo
-   b9c09d6..9ad36e1  main -> refs/hidden/one
-Cloning into 'child'...
-done.
-fatal: git cat-file: could not get object info
-From ../testrepo
- * [new ref]         9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f -> copy
-ok 97 - fetch exact oid in protocol v2
+ok 70 - rev-list not confused by option-like --glob arg
+
+expecting success of 6018.71 'rev-list --glob=heads/subspace/*': 
 
-expecting success of 5516.98 'shallow fetch reachable SHA1 (but not a ref), allowtipsha1inwant=true': 
-		mk_empty testrepo &&
-		(
-			cd testrepo &&
-			git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
-			git commit --allow-empty -m foo &&
-			git commit --allow-empty -m bar
-		) &&
-		SHA1=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
-		mk_empty shallow &&
-		(
-			cd shallow &&
-			# 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 fetch --depth=1 ../testrepo/.git $SHA1 &&
-			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
-			git fetch --depth=1 ../testrepo/.git $SHA1 &&
-			git cat-file commit $SHA1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-[main (root-commit) 27a428a] foo
- Author: A U Thor <author@example.com>
-[main 0722cdc] bar
- Author: A U Thor <author@example.com>
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/shallow/.git/
-error: git upload-pack: not our ref 27a428ae90b537d8c39cbd2f79affd38be38d173
-fatal: remote error: upload-pack: not our ref 27a428ae90b537d8c39cbd2f79affd38be38d173
-From ../testrepo/
- * branch            27a428ae90b537d8c39cbd2f79affd38be38d173 -> FETCH_HEAD
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-author A U Thor <author@example.com> 1112912353 -0700
-committer C O Mitter <committer@example.com> 1112912353 -0700
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
 
-foo
-ok 98 - shallow fetch reachable SHA1 (but not a ref), allowtipsha1inwant=true
 
-expecting success of 5516.99 'deny fetch unreachable SHA1, allowtipsha1inwant=true': 
-		mk_empty testrepo &&
-		(
-			cd testrepo &&
-			git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
-			git commit --allow-empty -m foo &&
-			git commit --allow-empty -m bar &&
-			git commit --allow-empty -m xyz
-		) &&
-		SHA1_1=$(git --git-dir=testrepo/.git rev-parse HEAD^^) &&
-		SHA1_2=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
-		SHA1_3=$(git --git-dir=testrepo/.git rev-parse HEAD) &&
-		(
-			cd testrepo &&
-			git reset --hard $SHA1_2 &&
-			git cat-file commit $SHA1_1 &&
-			git cat-file commit $SHA1_3
-		) &&
-		mk_empty shallow &&
-		(
-			cd shallow &&
-			# 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 fetch ../testrepo/.git $SHA1_3 &&
-			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
-				git fetch ../testrepo/.git $SHA1_1 &&
-			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
-			git fetch ../testrepo/.git $SHA1_1 &&
-			git cat-file commit $SHA1_1 &&
-			test_must_fail git cat-file commit $SHA1_2 &&
-			git fetch ../testrepo/.git $SHA1_2 &&
-			git cat-file commit $SHA1_2 &&
-			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
-				git fetch ../testrepo/.git $SHA1_3 2>err &&
-			# ideally we would insist this be on a "remote error:"
-			# line, but it is racy; see the commit message
-			test_grep "not our ref.*$SHA1_3\$" err
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-[main (root-commit) 27a428a] foo
- Author: A U Thor <author@example.com>
-[main 0722cdc] bar
- Author: A U Thor <author@example.com>
-[main 53e3aa4] xyz
- Author: A U Thor <author@example.com>
-HEAD is now at 0722cdc bar
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-author A U Thor <author@example.com> 1112912353 -0700
-committer C O Mitter <committer@example.com> 1112912353 -0700
+ok 71 - rev-list --glob=heads/subspace/*
 
-foo
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-parent 0722cdcaa8018927dc8055be38d3931723602b78
-author A U Thor <author@example.com> 1112912353 -0700
-committer C O Mitter <committer@example.com> 1112912353 -0700
+expecting success of 6018.72 'rev-list --glob=refs/heads/subspace/': 
 
-xyz
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/shallow/.git/
-error: git upload-pack: not our ref 53e3aa4356160fbed444579cbd52c3ecb9817950
-fatal: remote error: upload-pack: not our ref 53e3aa4356160fbed444579cbd52c3ecb9817950
-error: git upload-pack: not our ref 27a428ae90b537d8c39cbd2f79affd38be38d173
-fatal: remote error: upload-pack: not our ref 27a428ae90b537d8c39cbd2f79affd38be38d173
-From ../testrepo/
- * branch            27a428ae90b537d8c39cbd2f79affd38be38d173 -> FETCH_HEAD
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-author A U Thor <author@example.com> 1112912353 -0700
-committer C O Mitter <committer@example.com> 1112912353 -0700
+	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/"
 
-foo
-fatal: git cat-file 0722cdcaa8018927dc8055be38d3931723602b78: bad file
-From ../testrepo/
- * branch            0722cdcaa8018927dc8055be38d3931723602b78 -> FETCH_HEAD
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-parent 27a428ae90b537d8c39cbd2f79affd38be38d173
-author A U Thor <author@example.com> 1112912353 -0700
-committer C O Mitter <committer@example.com> 1112912353 -0700
 
-bar
-error: git upload-pack: not our ref 53e3aa4356160fbed444579cbd52c3ecb9817950
-fatal: remote error: upload-pack: not our ref 53e3aa4356160fbed444579cbd52c3ecb9817950
-ok 99 - deny fetch unreachable SHA1, allowtipsha1inwant=true
+ok 72 - rev-list --glob=refs/heads/subspace/
 
-expecting success of 5516.100 'shallow fetch reachable SHA1 (but not a ref), allowtipsha1inwant=false': 
-		mk_empty testrepo &&
-		(
-			cd testrepo &&
-			git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
-			git commit --allow-empty -m foo &&
-			git commit --allow-empty -m bar
-		) &&
-		SHA1=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
-		mk_empty shallow &&
-		(
-			cd shallow &&
-			# 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 fetch --depth=1 ../testrepo/.git $SHA1 &&
-			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
-			git fetch --depth=1 ../testrepo/.git $SHA1 &&
-			git cat-file commit $SHA1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-[main (root-commit) 27a428a] foo
- Author: A U Thor <author@example.com>
-[main 0722cdc] bar
- Author: A U Thor <author@example.com>
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/shallow/.git/
-error: Server does not allow request for unadvertised object 27a428ae90b537d8c39cbd2f79affd38be38d173
-From ../testrepo/
- * branch            27a428ae90b537d8c39cbd2f79affd38be38d173 -> FETCH_HEAD
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-author A U Thor <author@example.com> 1112912353 -0700
-committer C O Mitter <committer@example.com> 1112912353 -0700
+expecting success of 6018.73 'rev-list --glob=heads/subspace/': 
 
-foo
-ok 100 - shallow fetch reachable SHA1 (but not a ref), allowtipsha1inwant=false
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/"
 
-expecting success of 5516.101 'deny fetch unreachable SHA1, allowtipsha1inwant=false': 
-		mk_empty testrepo &&
-		(
-			cd testrepo &&
-			git config uploadpack.allowtipsha1inwant $configallowtipsha1inwant &&
-			git commit --allow-empty -m foo &&
-			git commit --allow-empty -m bar &&
-			git commit --allow-empty -m xyz
-		) &&
-		SHA1_1=$(git --git-dir=testrepo/.git rev-parse HEAD^^) &&
-		SHA1_2=$(git --git-dir=testrepo/.git rev-parse HEAD^) &&
-		SHA1_3=$(git --git-dir=testrepo/.git rev-parse HEAD) &&
-		(
-			cd testrepo &&
-			git reset --hard $SHA1_2 &&
-			git cat-file commit $SHA1_1 &&
-			git cat-file commit $SHA1_3
-		) &&
-		mk_empty shallow &&
-		(
-			cd shallow &&
-			# 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 fetch ../testrepo/.git $SHA1_3 &&
-			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
-				git fetch ../testrepo/.git $SHA1_1 &&
-			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
-			git fetch ../testrepo/.git $SHA1_1 &&
-			git cat-file commit $SHA1_1 &&
-			test_must_fail git cat-file commit $SHA1_2 &&
-			git fetch ../testrepo/.git $SHA1_2 &&
-			git cat-file commit $SHA1_2 &&
-			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
-				git fetch ../testrepo/.git $SHA1_3 2>err &&
-			# ideally we would insist this be on a "remote error:"
-			# line, but it is racy; see the commit message
-			test_grep "not our ref.*$SHA1_3\$" err
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-[main (root-commit) 27a428a] foo
- Author: A U Thor <author@example.com>
-[main 0722cdc] bar
- Author: A U Thor <author@example.com>
-[main 53e3aa4] xyz
- Author: A U Thor <author@example.com>
-HEAD is now at 0722cdc bar
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-author A U Thor <author@example.com> 1112912353 -0700
-committer C O Mitter <committer@example.com> 1112912353 -0700
 
-foo
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-parent 0722cdcaa8018927dc8055be38d3931723602b78
-author A U Thor <author@example.com> 1112912353 -0700
-committer C O Mitter <committer@example.com> 1112912353 -0700
+ok 73 - rev-list --glob=heads/subspace/
 
-xyz
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/shallow/.git/
-error: Server does not allow request for unadvertised object 53e3aa4356160fbed444579cbd52c3ecb9817950
-error: Server does not allow request for unadvertised object 27a428ae90b537d8c39cbd2f79affd38be38d173
-From ../testrepo/
- * branch            27a428ae90b537d8c39cbd2f79affd38be38d173 -> FETCH_HEAD
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-author A U Thor <author@example.com> 1112912353 -0700
-committer C O Mitter <committer@example.com> 1112912353 -0700
+expecting success of 6018.74 'rev-list --glob=heads/subspace': 
 
-foo
-fatal: git cat-file 0722cdcaa8018927dc8055be38d3931723602b78: bad file
-From ../testrepo/
- * branch            0722cdcaa8018927dc8055be38d3931723602b78 -> FETCH_HEAD
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-parent 27a428ae90b537d8c39cbd2f79affd38be38d173
-author A U Thor <author@example.com> 1112912353 -0700
-committer C O Mitter <committer@example.com> 1112912353 -0700
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace"
 
-bar
-error: git upload-pack: not our ref 53e3aa4356160fbed444579cbd52c3ecb9817950
-fatal: remote error: upload-pack: not our ref 53e3aa4356160fbed444579cbd52c3ecb9817950
-ok 101 - deny fetch unreachable SHA1, allowtipsha1inwant=false
 
-expecting success of 5516.102 'fetch follows tags by default': 
-	mk_test testrepo heads/main &&
-	test_when_finished "rm -rf src" &&
-	git init src &&
-	(
-		cd src &&
-		git pull ../testrepo main &&
-		git tag -m "annotated" tag &&
-		git for-each-ref >tmp1 &&
-		sed -n "p; s|refs/heads/main$|refs/remotes/origin/main|p" tmp1 |
-		sed -n "p; s|refs/heads/main$|refs/remotes/origin/HEAD|p"  |
-		sort -k 4 >../expect
-	) &&
-	test_when_finished "rm -rf dst" &&
-	git init dst &&
-	(
-		cd dst &&
-		git remote add origin ../src &&
-		git config branch.main.remote origin &&
-		git config branch.main.merge refs/heads/main &&
-		git pull &&
-		git for-each-ref >../actual
-	) &&
-	test_cmp expect actual
+ok 74 - rev-list --glob=heads/subspace
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/src/.git/
-From ../testrepo
- * branch            main       -> FETCH_HEAD
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst/.git/
-From ../src
- * [new branch]      main       -> origin/main
- * [new tag]         tag        -> tag
-ok 102 - fetch follows tags by default
+expecting success of 6018.75 'rev-list --branches=subspace/*': 
 
-expecting success of 5516.103 'peeled advertisements are not considered ref tips': 
-	mk_empty testrepo &&
-	git -C testrepo commit --allow-empty -m one &&
-	git -C testrepo commit --allow-empty -m two &&
-	git -C testrepo tag -m foo mytag HEAD^ &&
-	oid=$(git -C testrepo rev-parse mytag^{commit}) &&
-	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
-		git fetch testrepo $oid 2>err &&
-	test_grep "Server does not allow request for unadvertised object" err
+	compare rev-list "subspace/one subspace/two" "--branches=subspace/*"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-[main (root-commit) ae80332] one
- Author: A U Thor <author@example.com>
-[main 882ef1f] two
- Author: A U Thor <author@example.com>
-error: Server does not allow request for unadvertised object ae8033205e59137fe14e6d2202714f7f9987ca7e
-ok 103 - peeled advertisements are not considered ref tips
 
-expecting success of 5516.104 'pushing a specific ref applies remote.$name.push as refmap': 
-	mk_test testrepo heads/main &&
-	test_when_finished "rm -rf src" &&
-	git init src &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	(
-		cd src &&
-		git pull ../testrepo main &&
-		git branch next &&
-		git config remote.dst.url ../dst &&
-		git config remote.dst.push "+refs/heads/*:refs/remotes/src/*" &&
-		git push dst main &&
-		git show-ref refs/heads/main |
-		sed -e "s|refs/heads/|refs/remotes/src/|" >../dst/expect
-	) &&
-	(
-		cd dst &&
-		test_must_fail git show-ref refs/heads/next &&
-		test_must_fail git show-ref refs/heads/main &&
-		git show-ref refs/remotes/src/main >actual
-	) &&
-	test_cmp dst/expect dst/actual
+ok 75 - rev-list --branches=subspace/*
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst/
-From ../testrepo
- * branch            main       -> FETCH_HEAD
-To ../dst
- * [new reference]   main -> src/main
-ok 104 - pushing a specific ref applies remote.$name.push as refmap
+expecting success of 6018.76 'rev-list --branches=subspace/': 
 
-expecting success of 5516.105 'with no remote.$name.push, it is not used as refmap': 
-	mk_test testrepo heads/main &&
-	test_when_finished "rm -rf src" &&
-	git init src &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	(
-		cd src &&
-		git pull ../testrepo main &&
-		git branch next &&
-		git config remote.dst.url ../dst &&
-		git config push.default matching &&
-		git push dst main &&
-		git show-ref refs/heads/main >../dst/expect
-	) &&
-	(
-		cd dst &&
-		test_must_fail git show-ref refs/heads/next &&
-		git show-ref refs/heads/main >actual
-	) &&
-	test_cmp dst/expect dst/actual
+	compare rev-list "subspace/one subspace/two" "--branches=subspace/"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst/
-From ../testrepo
- * branch            main       -> FETCH_HEAD
-To ../dst
- * [new branch]      main -> main
-ok 105 - with no remote.$name.push, it is not used as refmap
 
-expecting success of 5516.106 'with no remote.$name.push, upstream mapping is used': 
-	mk_test testrepo heads/main &&
-	test_when_finished "rm -rf src" &&
-	git init src &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	(
-		cd src &&
-		git pull ../testrepo main &&
-		git branch next &&
-		git config remote.dst.url ../dst &&
-		git config remote.dst.fetch "+refs/heads/*:refs/remotes/dst/*" &&
-		git config push.default upstream &&
+ok 76 - rev-list --branches=subspace/
 
-		git config branch.main.merge refs/heads/trunk &&
-		git config branch.main.remote dst &&
+expecting success of 6018.77 'rev-list --branches=subspace': 
 
-		git push dst main &&
-		git show-ref refs/heads/main |
-		sed -e "s|refs/heads/main|refs/heads/trunk|" >../dst/expect
-	) &&
-	(
-		cd dst &&
-		test_must_fail git show-ref refs/heads/main &&
-		test_must_fail git show-ref refs/heads/next &&
-		git show-ref refs/heads/trunk >actual
-	) &&
-	test_cmp dst/expect dst/actual
+	compare rev-list "subspace/one subspace/two" "--branches=subspace"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst/
-From ../testrepo
- * branch            main       -> FETCH_HEAD
-To ../dst
- * [new branch]      main -> trunk
-ok 106 - with no remote.$name.push, upstream mapping is used
 
-expecting success of 5516.107 'push does not follow tags by default': 
-	mk_test testrepo heads/main &&
-	test_when_finished "rm -rf src" &&
-	git init src &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	(
-		cd src &&
-		git pull ../testrepo main &&
-		git tag -m "annotated" tag &&
-		git checkout -b another &&
-		git commit --allow-empty -m "future commit" &&
-		git tag -m "future" future &&
-		git checkout main &&
-		git for-each-ref refs/heads/main >../expect &&
-		git push ../dst main
-	) &&
-	(
-		cd dst &&
-		git for-each-ref >../actual
-	) &&
-	test_cmp expect actual
+ok 77 - rev-list --branches=subspace
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst/
-From ../testrepo
- * branch            main       -> FETCH_HEAD
-Switched to a new branch 'another'
-[another a35c877] future commit
- Author: A U Thor <author@example.com>
-Switched to branch 'main'
-To ../dst
- * [new branch]      main -> main
-ok 107 - push does not follow tags by default
+expecting success of 6018.78 'rev-list --branches': 
 
-expecting success of 5516.108 'push --follow-tags only pushes relevant tags': 
-	mk_test testrepo heads/main &&
-	test_when_finished "rm -rf src" &&
-	git init src &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	(
-		cd src &&
-		git pull ../testrepo main &&
-		git tag -m "annotated" tag &&
-		git checkout -b another &&
-		git commit --allow-empty -m "future commit" &&
-		git tag -m "future" future &&
-		git checkout main &&
-		git for-each-ref refs/heads/main refs/tags/tag >../expect &&
-		git push --follow-tags ../dst main
-	) &&
-	(
-		cd dst &&
-		git for-each-ref >../actual
-	) &&
-	test_cmp expect actual
+	compare rev-list "main subspace-x someref other/three subspace/one subspace/two" "--branches"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst/
-From ../testrepo
- * branch            main       -> FETCH_HEAD
-Switched to a new branch 'another'
-[another a35c877] future commit
- Author: A U Thor <author@example.com>
-Switched to branch 'main'
-To ../dst
- * [new branch]      main -> main
- * [new tag]         tag -> tag
-ok 108 - push --follow-tags only pushes relevant tags
 
-expecting success of 5516.109 'push --no-thin must produce non-thin pack': 
-	cat >>path1 <<\EOF &&
-keep base version of path1 big enough, compared to the new changes
-later, in order to pass size heuristics in
-builtin/pack-objects.c:try_delta()
-EOF
-	git commit -am initial &&
-	git init no-thin &&
-	git --git-dir=no-thin/.git config receive.unpacklimit 0 &&
-	git push no-thin/.git refs/heads/main:refs/heads/foo &&
-	echo modified >> path1 &&
-	git commit -am modified &&
-	git repack -adf &&
-	rcvpck="git receive-pack --reject-thin-pack-for-testing" &&
-	git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/main:refs/heads/foo
+ok 78 - rev-list --branches
 
-[main b9296ea] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/no-thin/.git/
-To no-thin/.git
- * [new branch]      main -> foo
-[main a9cf62b] modified
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To no-thin/.git
-   b9296ea..a9cf62b  main -> foo
-ok 109 - push --no-thin must produce non-thin pack
+expecting success of 6018.79 'rev-list --glob=heads/someref/* main': 
 
-expecting success of 5516.110 'pushing a tag pushes the tagged object': 
-	blob=$(echo unreferenced | git hash-object -w --stdin) &&
-	git tag -m foo tag-of-blob $blob &&
-	test_when_finished "rm -rf dst.git" &&
-	git init --bare dst.git &&
-	git push dst.git tag-of-blob &&
-	# the receiving index-pack should have noticed
-	# any problems, but we double check
-	echo unreferenced >expect &&
-	git --git-dir=dst.git cat-file blob tag-of-blob >actual &&
-	test_cmp expect actual
+	compare rev-list "main" "--glob=heads/someref/* main"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst.git/
-To dst.git
- * [new tag]         tag-of-blob -> tag-of-blob
-ok 110 - pushing a tag pushes the tagged object
 
-expecting success of 5516.111 'push into bare respects core.logallrefupdates': 
-	test_when_finished "rm -rf dst.git" &&
-	git init --bare dst.git &&
-	git -C dst.git config core.logallrefupdates true &&
+ok 79 - rev-list --glob=heads/someref/* main
 
-	# double push to test both with and without
-	# the actual pack transfer
-	git push dst.git main:one &&
-	echo "one@{0} push" >expect &&
-	git -C dst.git log -g --format="%gd %gs" one >actual &&
-	test_cmp expect actual &&
+expecting success of 6018.80 'rev-list --glob=heads/subspace/* --glob=heads/other/*': 
 
-	git push dst.git main:two &&
-	echo "two@{0} push" >expect &&
-	git -C dst.git log -g --format="%gd %gs" two >actual &&
-	test_cmp expect actual
+	compare rev-list "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst.git/
-To dst.git
- * [new branch]      main -> one
-To dst.git
- * [new branch]      main -> two
-ok 111 - push into bare respects core.logallrefupdates
 
-expecting success of 5516.112 'fetch into bare respects core.logallrefupdates': 
-	test_when_finished "rm -rf dst.git" &&
-	git init --bare dst.git &&
-	(
-		cd dst.git &&
-		git config core.logallrefupdates true &&
+ok 80 - rev-list --glob=heads/subspace/* --glob=heads/other/*
 
-		# as above, we double-fetch to test both
-		# with and without pack transfer
-		git fetch .. main:one &&
-		echo "one@{0} fetch .. main:one: storing head" >expect &&
-		git log -g --format="%gd %gs" one >actual &&
-		test_cmp expect actual &&
+expecting success of 6018.81 'rev-list --glob=heads/*': 
 
-		git fetch .. main:two &&
-		echo "two@{0} fetch .. main:two: storing head" >expect &&
-		git log -g --format="%gd %gs" two >actual &&
-		test_cmp expect actual
-	)
+	compare rev-list "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/dst.git/
-From ..
- * [new branch]      main       -> one
- * [new tag]         deltag     -> deltag
- * [new tag]         frotz      -> frotz
- * [new tag]         v1.0       -> v1.0
-From ..
- * [new branch]      main       -> two
-ok 112 - fetch into bare respects core.logallrefupdates
 
-expecting success of 5516.113 'receive.denyCurrentBranch = updateInstead': 
-	mk_empty testrepo &&
-	git push testrepo main &&
-	(
-		cd testrepo &&
-		git reset --hard &&
-		git config receive.denyCurrentBranch updateInstead
-	) &&
-	test_commit third path2 &&
+ok 81 - rev-list --glob=heads/*
 
-	# Try pushing into a repository with pristine working tree
-	git push testrepo main &&
-	(
-		cd testrepo &&
-		git update-index -q --refresh &&
-		git diff-files --quiet -- &&
-		git diff-index --quiet --cached HEAD -- &&
-		test third = "$(cat path2)" &&
-		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
-	) &&
+expecting success of 6018.82 'rev-list --tags=foo': 
 
-	# Try pushing into a repository with working tree needing a refresh
-	(
-		cd testrepo &&
-		git reset --hard HEAD^ &&
-		test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
-		test-tool chmtime +100 path1
-	) &&
-	git push testrepo main &&
-	(
-		cd testrepo &&
-		git update-index -q --refresh &&
-		git diff-files --quiet -- &&
-		git diff-index --quiet --cached HEAD -- &&
-		test_cmp ../path1 path1 &&
-		test third = "$(cat path2)" &&
-		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
-	) &&
+	compare rev-list "foo/bar" "--tags=foo"
 
-	# Update what is to be pushed
-	test_commit fourth path2 &&
 
-	# Try pushing into a repository with a dirty working tree
-	# (1) the working tree updated
-	(
-		cd testrepo &&
-		echo changed >path1
-	) &&
-	test_must_fail git push testrepo main &&
-	(
-		cd testrepo &&
-		test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
-		git diff --quiet --cached &&
-		test changed = "$(cat path1)"
-	) &&
+ok 82 - rev-list --tags=foo
 
-	# (2) the index updated
-	(
-		cd testrepo &&
-		echo changed >path1 &&
-		git add path1
-	) &&
-	test_must_fail git push testrepo main &&
-	(
-		cd testrepo &&
-		test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
-		git diff --quiet &&
-		test changed = "$(cat path1)"
-	) &&
+expecting success of 6018.83 'rev-list --tags': 
 
-	# Introduce a new file in the update
-	test_commit fifth path3 &&
+	compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
 
-	# (3) the working tree has an untracked file that would interfere
-	(
-		cd testrepo &&
-		git reset --hard &&
-		echo changed >path3
-	) &&
-	test_must_fail git push testrepo main &&
-	(
-		cd testrepo &&
-		test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
-		git diff --quiet &&
-		git diff --quiet --cached &&
-		test changed = "$(cat path3)"
-	) &&
 
-	# (4) the target changes to what gets pushed but it still is a change
-	(
-		cd testrepo &&
-		git reset --hard &&
-		echo fifth >path3 &&
-		git add path3
-	) &&
-	test_must_fail git push testrepo main &&
-	(
-		cd testrepo &&
-		test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
-		git diff --quiet &&
-		test fifth = "$(cat path3)"
-	) &&
+ok 83 - rev-list --tags
 
-	# (5) push into void
-	test_when_finished "rm -rf void" &&
-	git init void &&
-	(
-		cd void &&
-		git config receive.denyCurrentBranch updateInstead
-	) &&
-	git push void main &&
-	(
-		cd void &&
-		test $(git -C .. rev-parse main) = $(git rev-parse HEAD) &&
-		git diff --quiet &&
-		git diff --cached --quiet
-	) &&
+expecting success of 6018.84 'rev-list --remotes=foo': 
 
-	# (6) updateInstead intervened by fast-forward check
-	test_must_fail git push void main^:main &&
-	test $(git -C void rev-parse HEAD) = $(git rev-parse main) &&
-	git -C void diff --quiet &&
-	git -C void diff --cached --quiet
+	compare rev-list "foo/baz" "--remotes=foo"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      main -> main
-HEAD is now at a9cf62b modified
-[main f026489] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To testrepo
-   a9cf62b..f026489  main -> main
-HEAD is now at a9cf62b modified
-To testrepo
-   a9cf62b..f026489  main -> main
-[main 98a4253] fourth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To testrepo
- ! [remote rejected] main -> main (Working directory has unstaged changes)
-error: failed to push some refs to 'testrepo'
-To testrepo
- ! [remote rejected] main -> main (Working directory has staged changes)
-error: failed to push some refs to 'testrepo'
-[main 7bb1bc8] fifth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 path3
-HEAD is now at f026489 third
-error: Untracked working tree file 'path3' would be overwritten by merge.
-To testrepo
- ! [remote rejected] main -> main (Could not update working tree to new HEAD)
-error: failed to push some refs to 'testrepo'
-HEAD is now at f026489 third
-To testrepo
- ! [remote rejected] main -> main (Working directory has staged changes)
-error: failed to push some refs to 'testrepo'
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/void/.git/
-To void
- * [new branch]      main -> main
-To void
- ! [rejected]        main^ -> main (non-fast-forward)
-error: failed to push some refs to 'void'
-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.
-ok 113 - receive.denyCurrentBranch = updateInstead
 
-expecting success of 5516.114 'updateInstead with push-to-checkout hook': 
-	test_when_finished "rm -rf testrepo" &&
-	git init testrepo &&
-	git -C testrepo pull .. main &&
-	git -C testrepo reset --hard HEAD^^ &&
-	git -C testrepo tag initial &&
-	git -C testrepo config receive.denyCurrentBranch updateInstead &&
-	test_hook -C testrepo push-to-checkout <<-\EOF &&
-	echo >&2 updating from $(git rev-parse HEAD)
-	echo >&2 updating to "$1"
+ok 84 - rev-list --remotes=foo
 
-	git update-index -q --refresh &&
-	git read-tree -u -m HEAD "$1" || {
-		status=$?
-		echo >&2 read-tree failed
-		exit $status
-	}
-	EOF
+expecting success of 6018.85 'rev-list --exclude with --branches': 
+	compare rev-list "--exclude=*/* --branches" "main someref subspace-x"
 
-	# Try pushing into a pristine
-	git push testrepo main &&
-	(
-		cd testrepo &&
-		git diff --quiet &&
-		git diff HEAD --quiet &&
-		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
-	) &&
+ok 85 - rev-list --exclude with --branches
 
-	# Try pushing into a repository with conflicting change
-	(
-		cd testrepo &&
-		git reset --hard initial &&
-		echo conflicting >path2
-	) &&
-	test_must_fail git push testrepo main &&
-	(
-		cd testrepo &&
-		test $(git rev-parse initial) = $(git rev-parse HEAD) &&
-		test conflicting = "$(cat path2)" &&
-		git diff-index --quiet --cached HEAD
-	) &&
+expecting success of 6018.86 'rev-list --exclude with --all': 
+	compare rev-list "--exclude=refs/remotes/* --all" "--branches --tags"
 
-	# Try pushing into a repository with unrelated change
-	(
-		cd testrepo &&
-		git reset --hard initial &&
-		echo unrelated >path1 &&
-		echo irrelevant >path5 &&
-		git add path5
-	) &&
-	git push testrepo main &&
-	(
-		cd testrepo &&
-		test "$(cat path1)" = unrelated &&
-		test "$(cat path5)" = irrelevant &&
-		test "$(git diff --name-only --cached HEAD)" = path5 &&
-		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
-	) &&
+ok 86 - rev-list --exclude with --all
 
-	# push into void
-	test_when_finished "rm -rf void" &&
-	git init void &&
-	git -C void config receive.denyCurrentBranch updateInstead &&
-	test_hook -C void push-to-checkout <<-\EOF &&
-	if git rev-parse --quiet --verify HEAD
-	then
-		has_head=yes
-		echo >&2 updating from $(git rev-parse HEAD)
-	else
-		has_head=no
-		echo >&2 pushing into void
-	fi
-	echo >&2 updating to "$1"
+expecting success of 6018.87 'rev-list accumulates multiple --exclude': 
+	compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
 
-	git update-index -q --refresh &&
-	case "$has_head" in
-	yes)
-		git read-tree -u -m HEAD "$1" ;;
-	no)
-		git read-tree -u -m "$1" ;;
-	esac || {
-		status=$?
-		echo >&2 read-tree failed
-		exit $status
-	}
-	EOF
+ok 87 - rev-list accumulates multiple --exclude
 
-	git push void main &&
+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': 
 	(
-		cd void &&
-		git diff --quiet &&
-		git diff --cached --quiet &&
-		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
+		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.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-From ..
- * branch            main       -> FETCH_HEAD
-HEAD is now at f026489 third
-updating from f0264897557d25326474e587933c192b6d338b33
-updating to 7bb1bc8bd0518772ab617a9b8715716f26c682ab
-To testrepo
-   f026489..7bb1bc8  main -> main
-HEAD is now at f026489 third
-updating from f0264897557d25326474e587933c192b6d338b33
-updating to 7bb1bc8bd0518772ab617a9b8715716f26c682ab
-error: Entry 'path2' not uptodate. Cannot merge.
-read-tree failed
-To testrepo
- ! [remote rejected] main -> main (push-to-checkout hook declined)
-error: failed to push some refs to 'testrepo'
-HEAD is now at f026489 third
-updating from f0264897557d25326474e587933c192b6d338b33
-updating to 7bb1bc8bd0518772ab617a9b8715716f26c682ab
-To testrepo
-   f026489..7bb1bc8  main -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/void/.git/
-pushing into void
-updating to 7bb1bc8bd0518772ab617a9b8715716f26c682ab
-To void
- * [new branch]      main -> main
-ok 114 - updateInstead with push-to-checkout hook
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6018-rev-list-glob/empty/.git/
+ok 90 - rev-list should succeed with empty output with empty --all
 
-expecting success of 5516.115 'denyCurrentBranch and worktrees': 
-	git worktree add new-wt &&
-	git clone . cloned &&
-	test_commit -C cloned first &&
-	test_config receive.denyCurrentBranch refuse &&
-	test_must_fail git -C cloned push origin HEAD:new-wt &&
-	test_config receive.denyCurrentBranch updateInstead &&
-	git -C cloned push origin HEAD:new-wt &&
-	test_path_exists new-wt/first.t &&
-	test_must_fail git -C cloned push --delete origin new-wt
+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
 
-Preparing worktree (new branch 'new-wt')
-HEAD is now at 7bb1bc8 fifth
-Cloning into 'cloned'...
-done.
-[main 659b608] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-remote: error: refusing to update checked out branch: refs/heads/new-wt        
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/.
- ! [remote rejected] HEAD -> new-wt (branch is currently checked out)
-error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/.'
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/.
-   7bb1bc8..659b608  HEAD -> new-wt
-remote: error: By default, deleting the current branch is denied, because the next        
-remote: 'git clone' won't result in any file checked out, causing confusion.        
-remote: 
-remote: You can set 'receive.denyDeleteCurrent' configuration variable to        
-remote: 'warn' or 'ignore' in the remote repository to allow deleting the        
-remote: current branch, with or without a warning message.        
-remote: 
-remote: To squelch this message, you can set it to 'refuse'.        
-remote: error: refusing to delete the current branch: refs/heads/new-wt        
-To /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/.
- ! [remote rejected] new-wt (deletion of the current branch prohibited)
-error: failed to push some refs to '/build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/.'
-ok 115 - denyCurrentBranch and worktrees
+ok 91 - rev-list should succeed with empty output with empty glob
 
-expecting success of 5516.116 'denyCurrentBranch and bare repository worktrees': 
-	test_when_finished "rm -fr bare.git" &&
-	git clone --bare . bare.git &&
-	git -C bare.git worktree add wt &&
-	test_commit grape &&
-	git -C bare.git config receive.denyCurrentBranch refuse &&
-	test_must_fail git push bare.git HEAD:wt &&
-	git -C bare.git config receive.denyCurrentBranch updateInstead &&
-	git push bare.git HEAD:wt &&
-	test_path_exists bare.git/wt/grape.t &&
-	test_must_fail git push --delete bare.git wt
+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
 
-Cloning into bare repository 'bare.git'...
-done.
-Preparing worktree (new branch 'wt')
-HEAD is now at 7bb1bc8 fifth
-[main 9b41c21] grape
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 grape.t
-remote: error: refusing to update checked out branch: refs/heads/wt        
-To bare.git
- ! [remote rejected] HEAD -> wt (branch is currently checked out)
-error: failed to push some refs to 'bare.git'
-To bare.git
-   7bb1bc8..9b41c21  HEAD -> wt
-remote: error: By default, deleting the current branch is denied, because the next        
-remote: 'git clone' won't result in any file checked out, causing confusion.        
-remote: 
-remote: You can set 'receive.denyDeleteCurrent' configuration variable to        
-remote: 'warn' or 'ignore' in the remote repository to allow deleting the        
-remote: current branch, with or without a warning message.        
-remote: 
-remote: To squelch this message, you can set it to 'refuse'.        
-remote: error: refusing to delete the current branch: refs/heads/wt        
-To bare.git
- ! [remote rejected] wt (deletion of the current branch prohibited)
-error: failed to push some refs to 'bare.git'
-ok 116 - denyCurrentBranch and bare repository worktrees
+ok 92 - rev-list should succeed with empty output when ignoring missing
 
-expecting success of 5516.117 'refuse fetch to current branch of worktree': 
-	test_when_finished "git worktree remove --force wt && git branch -D wt" &&
-	git worktree add wt &&
-	test_commit apple &&
-	test_must_fail git fetch . HEAD:wt &&
-	git fetch -u . HEAD:wt
+expecting success of 6018.93 'shortlog accepts --glob/--tags/--remotes': 
 
-Preparing worktree (new branch 'wt')
-HEAD is now at 9b41c21 grape
-[main d190886] apple
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 apple.t
-fatal: refusing to fetch into branch 'refs/heads/wt' checked out at '/build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/wt'
-From .
-   9b41c21..d190886  HEAD       -> wt
-Deleted branch wt (was d190886).
-ok 117 - refuse fetch to current branch of worktree
+	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
 
-expecting success of 5516.118 'refuse fetch to current branch of bare repository worktree': 
-	test_when_finished "rm -fr bare.git" &&
-	git clone --bare . bare.git &&
-	git -C bare.git worktree add wt &&
-	test_commit banana &&
-	test_must_fail git -C bare.git fetch .. HEAD:wt &&
-	git -C bare.git fetch -u .. HEAD:wt
 
-Cloning into bare repository 'bare.git'...
-done.
-Preparing worktree (new branch 'wt')
-HEAD is now at d190886 apple
-[main 35a3221] banana
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 banana.t
-fatal: refusing to fetch into branch 'refs/heads/wt' checked out at '/build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/bare.git/wt'
-From ..
-   d190886..35a3221  HEAD       -> wt
- * [new tag]         banana     -> banana
-ok 118 - refuse fetch to current branch of bare repository worktree
+ok 93 - shortlog accepts --glob/--tags/--remotes
 
-expecting success of 5516.119 'refuse to push a hidden ref, and make sure do not pollute the repository': 
-	mk_empty testrepo &&
-	git -C testrepo config receive.hiderefs refs/hidden &&
-	git -C testrepo config receive.unpackLimit 1 &&
-	test_must_fail git push testrepo HEAD:refs/hidden/foo &&
-	test_dir_is_empty testrepo/.git/objects/pack
+checking known breakage of 6018.94 'shortlog accepts --glob as detached option': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- ! [remote rejected] HEAD -> refs/hidden/foo (deny updating a hidden ref)
-error: failed to push some refs to 'testrepo'
-ok 119 - refuse to push a hidden ref, and make sure do not pollute the repository
+	compare shortlog \
+	  "main other/three someref subspace-x subspace/one subspace/two" \
+	  "--glob heads/*"
 
-expecting success of 5516.120 'push with config push.useBitmaps': 
-	mk_test testrepo heads/main &&
-	git checkout main &&
-	test_unconfig push.useBitmaps &&
-	GIT_TRACE2_EVENT="$PWD/default" \
-	git push --quiet testrepo main:test &&
-	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
-		--thin --delta-base-offset -q <default &&
 
-	test_config push.useBitmaps true &&
-	GIT_TRACE2_EVENT="$PWD/true" \
-	git push --quiet testrepo main:test2 &&
-	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
-		--thin --delta-base-offset -q <true &&
+error: unknown option `--glob'
+usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
+   or: git log --pretty=short | git shortlog [<options>]
 
-	test_config push.useBitmaps false &&
-	GIT_TRACE2_EVENT="$PWD/false" \
-	git push --quiet testrepo main:test3 &&
-	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
-		--thin --delta-base-offset -q --no-use-bitmap-index <false
+    -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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Already on 'main'
-{"event":"child_start","sid":"20250827T082210.145335Z-Hcf858c9d-P000b0c5e","thread":"main","time":"2025-08-27T08:22:10.154610Z","file":"run-command.c","line":740,"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":"20250827T082210.239693Z-Hcf858c9d-P000b0d51","thread":"main","time":"2025-08-27T08:22:10.252472Z","file":"run-command.c","line":740,"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":"20250827T082210.317900Z-Hcf858c9d-P000b0e2d","thread":"main","time":"2025-08-27T08:22:10.323869Z","file":"run-command.c","line":740,"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
+not ok 94 - shortlog accepts --glob as detached option # TODO known breakage
 
-expecting success of 5516.121 'push with config pack.usePathWalk=true': 
-	mk_test testrepo heads/main &&
-	git checkout main &&
-	test_config pack.usePathWalk true &&
-	GIT_TRACE2_EVENT="$(pwd)/path-walk.txt" \
-	git push --quiet testrepo main:test &&
+checking known breakage of 6018.95 'shortlog --glob is not confused by option-like argument': 
 
-	test_region pack-objects path-walk path-walk.txt
+	compare shortlog main "--glob -e main"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Already on 'main'
-{"event":"region_enter","sid":"20250827T082210.572954Z-Hcf858c9d-P000b1049/20250827T082210.587738Z-Hcf858c9d-P000b1067","thread":"main","time":"2025-08-27T08:22:10.596773Z","file":"builtin/pack-objects.c","line":4645,"repo":1,"nesting":2,"category":"pack-objects","label":"path-walk"}
-{"event":"region_leave","sid":"20250827T082210.572954Z-Hcf858c9d-P000b1049/20250827T082210.587738Z-Hcf858c9d-P000b1067","thread":"main","time":"2025-08-27T08:22:10.597635Z","file":"builtin/pack-objects.c","line":4647,"repo":1,"t_rel":0.000865,"nesting":2,"category":"pack-objects","label":"path-walk"}
-ok 121 - push with config pack.usePathWalk=true
 
-expecting success of 5516.122 'push with F/D conflict with deletion and creation': 
-	test_when_finished "git branch -D branch" &&
-	git branch branch/conflict &&
-	mk_test testrepo heads/branch/conflict &&
-	git branch -D branch/conflict &&
-	git branch branch &&
-	git push testrepo :refs/heads/branch/conflict refs/heads/branch
+error: unknown option `--glob'
+usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
+   or: git log --pretty=short | git shortlog [<options>]
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> branch/conflict
-notice: HEAD points to an unborn branch (main)
-Deleted branch branch/conflict (was 35a3221).
-To testrepo
- - [deleted]         branch/conflict
- * [new branch]      branch -> branch
-Deleted branch branch (was 35a3221).
-ok 122 - push with F/D conflict with deletion and creation
+    -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
 
-# passed all 122 test(s)
-1..122
+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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5510-fetch.sh ***
@@ -397334,2986 +402284,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 114 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
-
-expecting success of 5510.115 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 115 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
-
-expecting success of 5510.116 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 116 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
-
-expecting success of 5510.117 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 117 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
-
-expecting success of 5510.118 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 118 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
-
-expecting success of 5510.119 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 119 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
-
-expecting success of 5510.120 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 120 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
-
-expecting success of 5510.121 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 121 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
-
-expecting success of 5510.122 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 122 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
-
-expecting success of 5510.123 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 123 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
-
-expecting success of 5510.124 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 124 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
-
-expecting success of 5510.125 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 125 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
-
-expecting success of 5510.126 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 126 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
-
-expecting success of 5510.127 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 127 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
-
-expecting success of 5510.128 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 128 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
-
-expecting success of 5510.129 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 129 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
-
-expecting success of 5510.130 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 130 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
-
-expecting success of 5510.131 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 131 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
-
-expecting success of 5510.132 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 132 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
-
-expecting success of 5510.133 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 133 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
-
-expecting success of 5510.134 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 134 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
-
-expecting success of 5510.135 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 135 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
-
-expecting success of 5510.136 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 136 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
-
-expecting success of 5510.137 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 137 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
-
-expecting success of 5510.138 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 138 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
-
-expecting success of 5510.139 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 139 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
-
-expecting success of 5510.140 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 140 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
-
-expecting success of 5510.141 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 141 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
-
-expecting success of 5510.142 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 142 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
-
-expecting success of 5510.143 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 143 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept
-
-expecting success of 5510.144 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 144 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept
-
-expecting success of 5510.145 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 145 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept
-
-expecting success of 5510.146 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 146 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept
-
-expecting success of 5510.147 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 147 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept
-
-expecting success of 5510.148 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 148 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept
-
-expecting success of 5510.149 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 149 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned
-
-expecting success of 5510.150 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 150 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned
-
-expecting success of 5510.151 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 151 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
-
-expecting success of 5510.152 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 152 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
-
-expecting success of 5510.153 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 153 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned
-
-expecting success of 5510.154 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 154 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned
-
-expecting success of 5510.155 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 155 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
-
-expecting success of 5510.156 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 156 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
-
-expecting success of 5510.157 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 157 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned
-
-expecting success of 5510.158 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 158 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned
-
-expecting success of 5510.159 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 159 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept
-
-expecting success of 5510.160 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 160 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept
-
-expecting success of 5510.161 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 161 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
-
-expecting success of 5510.162 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
-
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune --prune-tags file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -400334,17 +402305,19 @@
 	
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
 fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 162 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+fatal: Needed a single revision
+ok 114 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
-expecting success of 5510.163 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+expecting success of 5510.115 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -400376,7 +402349,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune origin +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch  &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -400397,17 +402370,16 @@
 	
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 163 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 115 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
-expecting success of 5510.164 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+expecting success of 5510.116 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -400439,7 +402411,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -400458,19 +402430,15 @@
 			esac
 		)
 	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 164 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 116 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
-expecting success of 5510.165 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+expecting success of 5510.117 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -400502,7 +402470,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune origin +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -400521,8 +402489,6 @@
 			esac
 		)
 	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
@@ -400531,9 +402497,9 @@
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 165 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+ok 117 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 5510.166 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+expecting success of 5510.118 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -400565,7 +402531,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -400590,13 +402556,13 @@
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 166 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+ok 118 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 5510.167 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept': 
+expecting success of 5510.119 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -400628,7 +402594,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch origin --prune-tags &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -400655,9 +402621,9 @@
 Deleted tag 'newtag' (was b4eae8a)
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 167 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept
+ok 119 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-expecting success of 5510.168 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept': 
+expecting success of 5510.120 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -400689,7 +402655,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. --prune-tags &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -400714,9 +402680,9 @@
 Deleted tag 'newtag' (was b4eae8a)
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 168 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept
+ok 120 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-expecting success of 5510.169 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:pruned tag:pruned': 
+expecting success of 5510.121 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -400748,7 +402714,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch origin --prune --prune-tags &&
+			git$git_fetch_c fetch  &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -400773,12 +402739,11 @@
 Deleted tag 'newtag' (was b4eae8a)
 From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
 fatal: Needed a single revision
-fatal: Needed a single revision
-ok 169 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:pruned tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 121 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
-expecting success of 5510.170 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned': 
+expecting success of 5510.122 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -400810,7 +402775,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. --prune --prune-tags &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -400831,18 +402796,17 @@
 	
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-ok 170 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 122 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
-expecting success of 5510.171 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:pruned tag:pruned': 
+expecting success of 5510.123 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -400874,7 +402838,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune --prune-tags origin &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -400894,19 +402858,16 @@
 		)
 	
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
+ * [new branch]      newbranch  -> origin/newbranch
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 171 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:pruned tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 123 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-expecting success of 5510.172 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:kept tag:pruned': 
+expecting success of 5510.124 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -400938,7 +402899,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune --prune-tags file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -400957,20 +402918,15 @@
 			esac
 		)
 	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 172 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:kept tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 124 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-expecting success of 5510.173 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:pruned tag:pruned': 
+expecting success of 5510.125 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -401002,7 +402958,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune origin &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -401021,20 +402977,17 @@
 			esac
 		)
 	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
 From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
 fatal: Needed a single revision
-fatal: Needed a single revision
-ok 173 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:pruned tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 125 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 5510.174 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:kept tag:pruned': 
+expecting success of 5510.126 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -401066,7 +403019,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -401087,18 +403040,17 @@
 	
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-ok 174 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:kept tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 126 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 5510.175 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:pruned tag:pruned': 
+expecting success of 5510.127 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -401130,7 +403082,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune origin &&
+			git$git_fetch_c fetch  &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -401150,19 +403102,18 @@
 		)
 	
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
+ * [new branch]      newbranch  -> origin/newbranch
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
 From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
 fatal: Needed a single revision
-fatal: Needed a single revision
-ok 175 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:pruned tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 127 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
-expecting success of 5510.176 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:kept tag:pruned': 
+expecting success of 5510.128 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -401194,7 +403145,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -401215,18 +403166,17 @@
 	
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-ok 176 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:kept tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 128 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
-expecting success of 5510.177 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned': 
+expecting success of 5510.129 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -401258,7 +403208,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch origin &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -401278,19 +403228,16 @@
 		)
 	
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
+ * [new branch]      newbranch  -> origin/newbranch
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 177 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 129 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-expecting success of 5510.178 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned': 
+expecting success of 5510.130 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -401322,7 +403269,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -401341,20 +403288,15 @@
 			esac
 		)
 	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 178 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 130 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-expecting success of 5510.179 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned': 
+expecting success of 5510.131 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -401386,7 +403328,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch origin &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -401405,20 +403347,17 @@
 			esac
 		)
 	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
 From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
 fatal: Needed a single revision
-fatal: Needed a single revision
-ok 179 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 131 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 5510.180 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned': 
+expecting success of 5510.132 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -401450,7 +403389,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -401471,18 +403410,17 @@
 	
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-ok 180 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 132 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 5510.181 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:pruned tag:pruned': 
+expecting success of 5510.133 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -401514,7 +403452,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch origin &&
+			git$git_fetch_c fetch  &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -401534,19 +403472,18 @@
 		)
 	
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
+ * [new branch]      newbranch  -> origin/newbranch
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
 From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
 fatal: Needed a single revision
-fatal: Needed a single revision
-ok 181 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:pruned tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 133 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
-expecting success of 5510.182 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:kept tag:pruned': 
+expecting success of 5510.134 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -401578,7 +403515,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -401599,26 +403536,17 @@
 	
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-ok 182 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:kept tag:pruned
-
-expecting success of 5510.183 'remove remote.origin.fetch "one"': 
-	(
-		cd one &&
-		git config --unset-all remote.origin.fetch
-	)
-
-ok 183 - remove remote.origin.fetch "one"
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 134 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
-expecting success of 5510.184 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned': 
+expecting success of 5510.135 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -401650,7 +403578,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch origin --prune --prune-tags &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -401670,19 +403598,18 @@
 		)
 	
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
+ * [new branch]      newbranch  -> origin/newbranch
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 b4eae8a1c2baba90c41b436d5796ef43ea5df434
 Deleted branch newbranch (was b4eae8a).
 Deleted tag 'newtag' (was b4eae8a)
 From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
- * branch            main       -> FETCH_HEAD
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-ok 184 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 135 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 5510.185 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned': 
+expecting success of 5510.136 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
 		# make sure a newbranch is there in . and also in one
 		git branch -f newbranch &&
 		git tag -f newtag &&
@@ -401697,4574 +403624,3574 @@
 			git rev-parse --verify refs/tags/newtag
 		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
-
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
-
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. --prune --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 185 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
-
-expecting success of 5510.186 'all boundary commits are excluded': 
-	test_commit base &&
-	test_commit oneside &&
-	git checkout HEAD^ &&
-	test_commit otherside &&
-	git checkout main &&
-	test_tick &&
-	git merge otherside &&
-	ad=$(git log --no-walk --format=%ad HEAD) &&
-
-	# If the a different name hash function is used here, then no delta
-	# pair is found and the bundle does not expand to three objects
-	# when fixing the thin object.
-	GIT_TEST_NAME_HASH_VERSION=1 \
-		git bundle create twoside-boundary.bdl main --since="$ad" &&
-	test_bundle_object_count --thin twoside-boundary.bdl 3
-
-[main dc1ab9d] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[main 9ab9525] oneside
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 oneside.t
-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 dc1ab9d base
-[detached HEAD 5c45805] otherside
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 otherside.t
-Previous HEAD position was 5c45805 otherside
-Switched to branch 'main'
-Your branch is based on 'one/main_not', but the upstream is gone.
-  (use "git branch --unset-upstream" to fixup)
-Merge made by the 'ort' strategy.
- otherside.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 otherside.t
-pack	fe30107d3d1ce0764ae8d8193ffe6b4c2fd3f327
-ok 186 - all boundary commits are excluded
-
-expecting success of 5510.187 'fetch --prune prints the remotes url': 
-	git branch goodbye &&
-	git clone . only-prunes &&
-	git branch -D goodbye &&
-	(
-		cd only-prunes &&
-		git fetch --prune origin 2>&1 | head -n1 >../actual
-	) &&
-	echo "From ${D}/." >expect &&
-	test_cmp expect actual
-
-Cloning into 'only-prunes'...
-done.
-Deleted branch goodbye (was a008302).
-ok 187 - fetch --prune prints the remotes url
-
-expecting success of 5510.188 'branchname D/F conflict resolved by --prune': 
-	git branch dir/file &&
-	git clone . prune-df-conflict &&
-	git branch -D dir/file &&
-	git branch dir &&
-	(
-		cd prune-df-conflict &&
-		git fetch --prune &&
-		git rev-parse origin/dir >../actual
-	) &&
-	git rev-parse dir >expect &&
-	test_cmp expect actual
-
-Cloning into 'prune-df-conflict'...
-done.
-Deleted branch dir/file (was a008302).
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/dir/file
- * [new branch]      dir        -> origin/dir
-ok 188 - branchname D/F conflict resolved by --prune
-
-expecting success of 5510.189 'branchname D/F conflict rejected with targeted error message': 
-	git clone . df-conflict-error &&
-	git branch dir_conflict &&
-	(
-		cd df-conflict-error &&
-		git update-ref refs/remotes/origin/dir_conflict/file HEAD &&
-		test_must_fail git fetch 2>err &&
-		test_grep "error: some local refs could not be updated; try running" err &&
-		test_grep " ${SQ}git remote prune origin${SQ} to remove any old, conflicting branches" err &&
-		git pack-refs --all &&
-		test_must_fail git fetch 2>err-packed &&
-		test_grep "error: some local refs could not be updated; try running" err-packed &&
-		test_grep " ${SQ}git remote prune origin${SQ} to remove any old, conflicting branches" err-packed
-	)
-
-Cloning into 'df-conflict-error'...
-done.
-error: some local refs could not be updated; try running
- 'git remote prune origin' to remove any old, conflicting branches
-error: some local refs could not be updated; try running
- 'git remote prune origin' to remove any old, conflicting branches
-ok 189 - branchname D/F conflict rejected with targeted error message
-
-expecting success of 5510.190 'fetching a one-level ref works': 
-	test_commit extra &&
-	git reset --hard HEAD^ &&
-	git update-ref refs/foo extra &&
-	git init one-level &&
-	(
-		cd one-level &&
-		git fetch .. HEAD refs/foo
-	)
-
-[main 445a4b6] extra
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 extra.t
-HEAD is now at a008302 Merge tag 'otherside'
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/one-level/.git/
-From ..
- * branch            HEAD       -> FETCH_HEAD
- * branch            refs/foo   -> FETCH_HEAD
-ok 190 - fetching a one-level ref works
-
-expecting success of 5510.191 'fetching with auto-gc does not lock up': 
-	write_script askyesno <<-\EOF &&
-	echo "$*" &&
-	false
-	EOF
-	git clone "file://$D" auto-gc &&
-	test_commit test2 &&
-	(
-		cd auto-gc &&
-		git config fetch.unpackLimit 1 &&
-		git config gc.autoPackLimit 1 &&
-		git config gc.autoDetach false &&
-		GIT_ASK_YESNO="$D/askyesno" git fetch --verbose >fetch.out 2>&1 &&
-		test_grep "Auto packing the repository" fetch.out &&
-		! grep "Should I try again" fetch.out
-	)
-
-Cloning into 'auto-gc'...
-[main d0a2253] test2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test2.t
-Auto packing the repository for optimum performance.
-ok 191 - fetching with auto-gc does not lock up
-
-expecting success of 5510.192 'fetch.hideRefs affects connectivity check': 
-		GIT_TRACE="$PWD"/trace git -c $section.hideRefs=refs -c \
-			$section.hideRefs="!refs/tags/" fetch &&
-		grep "git rev-list .*--exclude-hidden=fetch" trace
-	
-trace: run_command: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-trace: start_command: /build/reproducible-path/git-2.51.0/git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-trace: built-in: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-ok 192 - fetch.hideRefs affects connectivity check
-
-expecting success of 5510.193 'transfer.hideRefs affects connectivity check': 
-		GIT_TRACE="$PWD"/trace git -c $section.hideRefs=refs -c \
-			$section.hideRefs="!refs/tags/" fetch &&
-		grep "git rev-list .*--exclude-hidden=fetch" trace
-	
-trace: run_command: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-trace: start_command: /build/reproducible-path/git-2.51.0/git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-trace: built-in: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-trace: run_command: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-trace: start_command: /build/reproducible-path/git-2.51.0/git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-trace: built-in: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-ok 193 - transfer.hideRefs affects connectivity check
-
-expecting success of 5510.194 'prepare source branch': 
-	echo one >onebranch &&
-	git checkout --orphan onebranch &&
-	git rm --cached -r . &&
-	git add onebranch &&
-	git commit -m onebranch &&
-	git rev-list --objects onebranch -- >actual &&
-	# 3 objects should be created, at least ...
-	test 3 -le $(wc -l <actual)
-
-Switched to a new branch 'onebranch'
-rm 'base.t'
-rm 'file'
-rm 'file2'
-rm 'oneside.t'
-rm 'otherside.t'
-rm 'test2.t'
-[onebranch (root-commit) 609ade1] onebranch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 onebranch
-ok 194 - prepare source branch
-
-expecting success of 5510.195 'fetch trumps transfer limit': 
-		rm -fr dest &&
-		git --bare init dest &&
-		git -C dest config fetch.unpacklimit $fetch_limit &&
-		git -C dest config transfer.unpacklimit $transfer_limit &&
-		git -C dest fetch .. onebranch &&
-		validate_store_type
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/dest/
-From ..
- * branch            onebranch  -> FETCH_HEAD
-count: 0
-ok 195 - fetch trumps transfer limit
-
-expecting success of 5510.196 'fetch trumps transfer limit': 
-		rm -fr dest &&
-		git --bare init dest &&
-		git -C dest config fetch.unpacklimit $fetch_limit &&
-		git -C dest config transfer.unpacklimit $transfer_limit &&
-		git -C dest fetch .. onebranch &&
-		validate_store_type
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/dest/
-From ..
- * branch            onebranch  -> FETCH_HEAD
-packs: 0
-ok 196 - fetch trumps transfer limit
-
-expecting success of 5510.197 '--negotiation-tip limits "have" lines sent': 
-	setup_negotiation_tip server server 0 &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
-		--negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
-		origin alpha_s beta_s &&
-	check_negotiation_tip
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server/.git/
-[main (root-commit) facd226] alpha_1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_1.t
-[main f31e7ad] alpha_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_2.t
-Switched to a new branch 'beta'
-[beta (root-commit) 754b9c2] beta_1
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 alpha_1.t
- create mode 100644 alpha_2.t
- create mode 100644 beta_1.t
-[beta c202648] beta_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_2.t
-Cloning into 'client'...
-done.
-[beta 0e40751] beta_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_s.t
-Switched to branch 'main'
-[main 2c3426a] alpha_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_s.t
-Deleted tag 'alpha_1' (was facd226)
-Deleted tag 'alpha_2' (was f31e7ad)
-Deleted tag 'beta_1' (was 754b9c2)
-Deleted tag 'beta_2' (was c202648)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server
- * tag               alpha_s    -> FETCH_HEAD
- * tag               beta_s     -> FETCH_HEAD
-packet:        fetch> have facd2269ff2b5eb30cddd3d918ecf236d8f8298a
-packet:        fetch> have 754b9c2db9900588a06477b6d65461d82e960d37
-ok 197 - --negotiation-tip limits "have" lines sent
-
-expecting success of 5510.198 '--negotiation-tip understands globs': 
-	setup_negotiation_tip server server 0 &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
-		--negotiation-tip=*_1 \
-		origin alpha_s beta_s &&
-	check_negotiation_tip
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server/.git/
-[main (root-commit) a849d09] alpha_1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_1.t
-[main 9c9efb3] alpha_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_2.t
-Switched to a new branch 'beta'
-[beta (root-commit) dfcc514] beta_1
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 alpha_1.t
- create mode 100644 alpha_2.t
- create mode 100644 beta_1.t
-[beta a75b0f1] beta_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_2.t
-Cloning into 'client'...
-done.
-[beta a144366] beta_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_s.t
-Switched to branch 'main'
-[main 1f3e2f1] alpha_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_s.t
-Deleted tag 'alpha_1' (was a849d09)
-Deleted tag 'alpha_2' (was 9c9efb3)
-Deleted tag 'beta_1' (was dfcc514)
-Deleted tag 'beta_2' (was a75b0f1)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server
- * tag               alpha_s    -> FETCH_HEAD
- * tag               beta_s     -> FETCH_HEAD
-packet:        fetch> have a849d093bd04034e02b320b915812e2e739a6e71
-packet:        fetch> have dfcc514b92ea54d0eec2fdc71577e40710161dd5
-ok 198 - --negotiation-tip understands globs
-
-expecting success of 5510.199 '--negotiation-tip understands abbreviated SHA-1': 
-	setup_negotiation_tip server server 0 &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
-		--negotiation-tip=$(git -C client rev-parse --short alpha_1) \
-		--negotiation-tip=$(git -C client rev-parse --short beta_1) \
-		origin alpha_s beta_s &&
-	check_negotiation_tip
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server/.git/
-[main (root-commit) 91c1c9f] alpha_1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_1.t
-[main e0da29d] alpha_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_2.t
-Switched to a new branch 'beta'
-[beta (root-commit) dcd8861] beta_1
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 alpha_1.t
- create mode 100644 alpha_2.t
- create mode 100644 beta_1.t
-[beta 012e63c] beta_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_2.t
-Cloning into 'client'...
-done.
-[beta a6cc847] beta_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_s.t
-Switched to branch 'main'
-[main 60cc95d] alpha_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_s.t
-Deleted tag 'alpha_1' (was 91c1c9f)
-Deleted tag 'alpha_2' (was e0da29d)
-Deleted tag 'beta_1' (was dcd8861)
-Deleted tag 'beta_2' (was 012e63c)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server
- * tag               alpha_s    -> FETCH_HEAD
- * tag               beta_s     -> FETCH_HEAD
-packet:        fetch> have 91c1c9ff43e3e8c21c626f9d53f98fd98b41a1bc
-packet:        fetch> have dcd8861f9d94ce1c6e0f4e6bc6980e72c660e839
-ok 199 - --negotiation-tip understands abbreviated SHA-1
-
-expecting success of 5510.200 '--negotiation-tip rejects missing OIDs': 
-	setup_negotiation_tip server server 0 &&
-	test_must_fail git -C client fetch \
-		--negotiation-tip=alpha_1 \
-		--negotiation-tip=$(test_oid zero) \
-		origin alpha_s beta_s 2>err &&
-	cat >fatal-expect <<-EOF &&
-	fatal: the object $(test_oid zero) does not exist
-EOF
-	grep fatal: err >fatal-actual &&
-	test_cmp fatal-expect fatal-actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server/.git/
-[main (root-commit) 8158d9a] alpha_1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_1.t
-[main 159269a] alpha_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_2.t
-Switched to a new branch 'beta'
-[beta (root-commit) ab9489d] beta_1
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 alpha_1.t
- create mode 100644 alpha_2.t
- create mode 100644 beta_1.t
-[beta 66378fb] beta_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_2.t
-Cloning into 'client'...
-done.
-[beta 5c64d87] beta_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_s.t
-Switched to branch 'main'
-[main 92cb688] alpha_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_s.t
-Deleted tag 'alpha_1' (was 8158d9a)
-Deleted tag 'alpha_2' (was 159269a)
-Deleted tag 'beta_1' (was ab9489d)
-Deleted tag 'beta_2' (was 66378fb)
-ok 200 - --negotiation-tip rejects missing OIDs
-
-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 5510.201 'clone does not get confused by a D/F conflict': 
-	git init df-conflict &&
-	(
-		cd df-conflict &&
-		ln -s .git a &&
-		git add a &&
-		test_tick &&
-		git commit -m symlink &&
-		test_commit a- &&
-		rm a &&
-		mkdir -p a/hooks &&
-		write_script a/hooks/post-checkout <<-EOF &&
-		echo WHOOPSIE >&2
-		echo whoopsie >"$TRASH_DIRECTORY"/whoops
-		EOF
-		git add a/hooks/post-checkout &&
-		test_tick &&
-		git commit -m post-checkout
-	) &&
-	git clone df-conflict clone 2>err &&
-	test_grep ! WHOOPS err &&
-	test_path_is_missing whoops
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/df-conflict/.git/
-[master (root-commit) ca09cd7] symlink
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 a
-[master 6b77001] a-
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a-.t
-[master 5c75565] post-checkout
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+), 1 deletion(-)
- delete mode 120000 a
- create mode 100755 a/hooks/post-checkout
-ok 201 - clone does not get confused by a D/F conflict
-
-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 201 test(s)
-# SKIP no web server found at ''
-1..201
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6012-rev-list-simplify.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6019-rev-list-ancestry-path.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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) 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
- 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
- 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 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 &&
-
-		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 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 &&
-
-		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 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 &&
-
-		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 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 &&
-
-		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 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 &&
-
-		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 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 &&
-
-		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 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 &&
-
-		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 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
-
-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 &&
-
-		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 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
-
-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 &&
-
-		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 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
-
-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 &&
-
-		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 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 &&
-
-		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 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)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
- 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
-
-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)
-
-ok 17 - criss-cross: rev-list --ancestry-path cb..bc
-
-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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6017-rev-list-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6021-rev-list-exclude-hidden.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-# passed all 62 test(s)
-1..62
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6018-rev-list-glob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6018-rev-list-glob/.git/
-expecting success of 6018.1 'setup': 
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 136 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-	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
+expecting success of 5510.137 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-[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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.2 'rev-parse --glob=refs/heads/subspace/*': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 137 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
+expecting success of 5510.138 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 2 - rev-parse --glob=refs/heads/subspace/*
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.3 'rev-parse --glob=heads/subspace/*': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/*"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 138 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
+expecting success of 5510.139 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 3 - rev-parse --glob=heads/subspace/*
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.4 'rev-parse --glob=refs/heads/subspace/': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 139 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
+expecting success of 5510.140 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 4 - rev-parse --glob=refs/heads/subspace/
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.5 'rev-parse --glob=heads/subspace/': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 140 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
+expecting success of 5510.141 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 5 - rev-parse --glob=heads/subspace/
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.6 'rev-parse --glob=heads/subspace': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 141 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
+expecting success of 5510.142 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 6 - rev-parse --glob=heads/subspace
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-checking known breakage of 6018.7 'rev-parse accepts --glob as detached option': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "subspace/one subspace/two" "--glob heads/subspace"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 142 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
+expecting success of 5510.143 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-checking known breakage of 6018.8 'rev-parse is not confused by option-like glob': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "main" "--glob --symbolic main"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 143 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept
 
+expecting success of 5510.144 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
---- expected	2025-08-27 08:22:10.080127678 +0000
-+++ actual	2025-08-27 08:22:10.088127731 +0000
-@@ -1 +1,2 @@
--88fe3d283ae350159b6dcc1f45481c8fa40ad3d8
-+--glob
-+main
-not ok 8 - rev-parse is not confused by option-like glob # TODO known breakage
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.9 'rev-parse --branches=subspace/*': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 144 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept
 
+expecting success of 5510.145 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 9 - rev-parse --branches=subspace/*
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.10 'rev-parse --branches=subspace/': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace/"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 145 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept
 
+expecting success of 5510.146 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 10 - rev-parse --branches=subspace/
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.11 'rev-parse --branches=subspace': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 146 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept
 
+expecting success of 5510.147 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 11 - rev-parse --branches=subspace
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.12 'rev-parse --glob=heads/subspace/* --glob=heads/other/*': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 147 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept
 
+expecting success of 5510.148 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 12 - rev-parse --glob=heads/subspace/* --glob=heads/other/*
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.13 'rev-parse --glob=heads/someref/* main': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "main" "--glob=heads/someref/* main"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 148 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept
 
+expecting success of 5510.149 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 13 - rev-parse --glob=heads/someref/* main
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.14 'rev-parse --glob=heads/*': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 149 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned
 
+expecting success of 5510.150 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 14 - rev-parse --glob=heads/*
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.15 'rev-parse --tags=foo': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "foo/bar" "--tags=foo"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 150 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned
 
+expecting success of 5510.151 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 15 - rev-parse --tags=foo
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.16 'rev-parse --remotes=foo': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-parse "foo/baz" "--remotes=foo"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 151 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
 
+expecting success of 5510.152 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 16 - rev-parse --remotes=foo
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.17 'rev-parse --exclude with --branches': 
-	compare rev-parse "--exclude=*/* --branches" "main someref subspace-x"
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 17 - rev-parse --exclude with --branches
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 152 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
 
-expecting success of 6018.18 'rev-parse --exclude with --all': 
-	compare rev-parse "--exclude=refs/remotes/* --all" "--branches --tags"
+expecting success of 5510.153 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 18 - rev-parse --exclude with --all
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.19 'rev-parse accumulates multiple --exclude': 
-	compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 19 - rev-parse accumulates multiple --exclude
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 153 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned
 
-expecting success of 6018.20 'rev-parse --branches clears --exclude': 
-	compare rev-parse "--exclude=* --branches --branches" "--branches"
+expecting success of 5510.154 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 20 - rev-parse --branches clears --exclude
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.21 'rev-parse --tags clears --exclude': 
-	compare rev-parse "--exclude=* --tags --tags" "--tags"
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 21 - rev-parse --tags clears --exclude
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 154 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned
 
-expecting success of 6018.22 'rev-parse --all clears --exclude': 
-	compare rev-parse "--exclude=* --all --all" "--all"
+expecting success of 5510.155 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 22 - rev-parse --all clears --exclude
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.23 'rev-parse --exclude=glob with --branches=glob': 
-	compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 23 - rev-parse --exclude=glob with --branches=glob
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 155 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
 
-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 5510.156 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 24 - rev-parse --exclude=glob with --tags=glob
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.25 'rev-parse --exclude=glob with --remotes=glob': 
-	compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 25 - rev-parse --exclude=glob with --remotes=glob
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 156 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
 
-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 5510.157 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 26 - rev-parse --exclude=ref with --branches=glob
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.27 'rev-parse --exclude=ref with --tags=glob': 
-	compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 27 - rev-parse --exclude=ref with --tags=glob
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 157 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned
 
-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 5510.158 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 28 - rev-parse --exclude=ref with --remotes=glob
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-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"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 30 - rev-parse --exclude-hidden=fetch with --all
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 158 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned
 
-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 5510.159 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 33 - rev-parse --exclude-hidden=fetch can only be passed once per pseudo-ref
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 159 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept
 
-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 5510.160 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_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
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 160 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept
 
-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 5510.161 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-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"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 41 - rev-parse --exclude-hidden=receive with --all
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 161 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
 
-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 5510.162 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 44 - rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 162 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
 
-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 5510.163 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_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
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 163 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
 
-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 5510.164 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-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"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 52 - rev-parse --exclude-hidden=uploadpack with --all
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 164 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
 
-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 5510.165 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 55 - rev-parse --exclude-hidden=uploadpack can only be passed once per pseudo-ref
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 165 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
 
-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 5510.166 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_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
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 166 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
 
-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 5510.167 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.62 'rev-list --exclude=glob with --branches=glob': 
-	compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 62 - rev-list --exclude=glob with --branches=glob
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 167 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept
 
-expecting success of 6018.63 'rev-list --exclude=glob with --tags=glob': 
-	compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
+expecting success of 5510.168 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 63 - rev-list --exclude=glob with --tags=glob
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.64 'rev-list --exclude=glob with --remotes=glob': 
-	compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 64 - rev-list --exclude=glob with --remotes=glob
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 168 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept
 
-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 5510.169 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 65 - rev-list --exclude=ref with --branches=glob
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.66 'rev-list --exclude=ref with --tags=glob': 
-	compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 66 - rev-list --exclude=ref with --tags=glob
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 169 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:pruned tag:pruned
 
-expecting success of 6018.67 'rev-list --exclude=ref with --remotes=glob': 
-	compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
+expecting success of 5510.170 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 67 - rev-list --exclude=ref with --remotes=glob
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.68 'rev-list --glob=refs/heads/subspace/*': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 170 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
 
+expecting success of 5510.171 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 68 - rev-list --glob=refs/heads/subspace/*
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.69 'rev-list --glob refs/heads/subspace/*': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 171 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:pruned tag:pruned
 
+expecting success of 5510.172 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 69 - rev-list --glob refs/heads/subspace/*
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.70 'rev-list not confused by option-like --glob arg': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-list "main" "--glob -0 main"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 172 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:kept tag:pruned
 
+expecting success of 5510.173 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 70 - rev-list not confused by option-like --glob arg
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.71 'rev-list --glob=heads/subspace/*': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 173 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:pruned tag:pruned
 
+expecting success of 5510.174 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 71 - rev-list --glob=heads/subspace/*
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.72 'rev-list --glob=refs/heads/subspace/': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 174 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:kept tag:pruned
 
+expecting success of 5510.175 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 72 - rev-list --glob=refs/heads/subspace/
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.73 'rev-list --glob=heads/subspace/': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 175 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:pruned tag:pruned
 
+expecting success of 5510.176 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 73 - rev-list --glob=heads/subspace/
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.74 'rev-list --glob=heads/subspace': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 176 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:kept tag:pruned
 
+expecting success of 5510.177 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 74 - rev-list --glob=heads/subspace
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.75 'rev-list --branches=subspace/*': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-list "subspace/one subspace/two" "--branches=subspace/*"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 177 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned
 
+expecting success of 5510.178 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 75 - rev-list --branches=subspace/*
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.76 'rev-list --branches=subspace/': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-list "subspace/one subspace/two" "--branches=subspace/"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 178 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned
 
+expecting success of 5510.179 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 76 - rev-list --branches=subspace/
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.77 'rev-list --branches=subspace': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-list "subspace/one subspace/two" "--branches=subspace"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 179 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned
 
+expecting success of 5510.180 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 77 - rev-list --branches=subspace
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.78 'rev-list --branches': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-list "main subspace-x someref other/three subspace/one subspace/two" "--branches"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 180 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned
 
+expecting success of 5510.181 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 78 - rev-list --branches
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.79 'rev-list --glob=heads/someref/* main': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-list "main" "--glob=heads/someref/* main"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 181 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:pruned tag:pruned
 
+expecting success of 5510.182 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 79 - rev-list --glob=heads/someref/* main
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6018.80 'rev-list --glob=heads/subspace/* --glob=heads/other/*': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	compare rev-list "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 182 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:kept tag:pruned
 
+expecting success of 5510.183 'remove remote.origin.fetch "one"': 
+	(
+		cd one &&
+		git config --unset-all remote.origin.fetch
+	)
 
-ok 80 - rev-list --glob=heads/subspace/* --glob=heads/other/*
+ok 183 - remove remote.origin.fetch "one"
 
-expecting success of 6018.81 'rev-list --glob=heads/*': 
+expecting success of 5510.184 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-	compare rev-list "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 81 - rev-list --glob=heads/*
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+ * branch            main       -> FETCH_HEAD
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 184 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
 
-expecting success of 6018.82 'rev-list --tags=foo': 
+expecting success of 5510.185 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-	compare rev-list "foo/bar" "--tags=foo"
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 82 - rev-list --tags=foo
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.51\.0\/t\/trash\ directory\.t5510\-fetch\/\. --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 185 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
 
-expecting success of 6018.83 'rev-list --tags': 
+expecting success of 5510.186 'all boundary commits are excluded': 
+	test_commit base &&
+	test_commit oneside &&
+	git checkout HEAD^ &&
+	test_commit otherside &&
+	git checkout main &&
+	test_tick &&
+	git merge otherside &&
+	ad=$(git log --no-walk --format=%ad HEAD) &&
 
-	compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
+	# If the a different name hash function is used here, then no delta
+	# pair is found and the bundle does not expand to three objects
+	# when fixing the thin object.
+	GIT_TEST_NAME_HASH_VERSION=1 \
+		git bundle create twoside-boundary.bdl main --since="$ad" &&
+	test_bundle_object_count --thin twoside-boundary.bdl 3
 
+[main dc1ab9d] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[main 9ab9525] oneside
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 oneside.t
+Note: switching to 'HEAD^'.
 
-ok 83 - rev-list --tags
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 6018.84 'rev-list --remotes=foo': 
+If you want to 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 rev-list "foo/baz" "--remotes=foo"
+  git switch -c <new-branch-name>
 
+Or undo this operation with:
 
-ok 84 - rev-list --remotes=foo
+  git switch -
 
-expecting success of 6018.85 'rev-list --exclude with --branches': 
-	compare rev-list "--exclude=*/* --branches" "main someref subspace-x"
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 85 - rev-list --exclude with --branches
+HEAD is now at dc1ab9d base
+[detached HEAD 5c45805] otherside
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 otherside.t
+Previous HEAD position was 5c45805 otherside
+Switched to branch 'main'
+Your branch is based on 'one/main_not', but the upstream is gone.
+  (use "git branch --unset-upstream" to fixup)
+Merge made by the 'ort' strategy.
+ otherside.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 otherside.t
+pack	fe30107d3d1ce0764ae8d8193ffe6b4c2fd3f327
+ok 186 - all boundary commits are excluded
 
-expecting success of 6018.86 'rev-list --exclude with --all': 
-	compare rev-list "--exclude=refs/remotes/* --all" "--branches --tags"
+expecting success of 5510.187 'fetch --prune prints the remotes url': 
+	git branch goodbye &&
+	git clone . only-prunes &&
+	git branch -D goodbye &&
+	(
+		cd only-prunes &&
+		git fetch --prune origin 2>&1 | head -n1 >../actual
+	) &&
+	echo "From ${D}/." >expect &&
+	test_cmp expect actual
 
-ok 86 - rev-list --exclude with --all
+Cloning into 'only-prunes'...
+done.
+Deleted branch goodbye (was a008302).
+ok 187 - fetch --prune prints the remotes url
 
-expecting success of 6018.87 'rev-list accumulates multiple --exclude': 
-	compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
+expecting success of 5510.188 'branchname D/F conflict resolved by --prune': 
+	git branch dir/file &&
+	git clone . prune-df-conflict &&
+	git branch -D dir/file &&
+	git branch dir &&
+	(
+		cd prune-df-conflict &&
+		git fetch --prune &&
+		git rev-parse origin/dir >../actual
+	) &&
+	git rev-parse dir >expect &&
+	test_cmp expect actual
 
-ok 87 - rev-list accumulates multiple --exclude
+Cloning into 'prune-df-conflict'...
+done.
+Deleted branch dir/file (was a008302).
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/dir/file
+ * [new branch]      dir        -> origin/dir
+ok 188 - branchname D/F conflict resolved by --prune
 
-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
+expecting success of 5510.189 'branchname D/F conflict rejected with targeted error message': 
+	git clone . df-conflict-error &&
+	git branch dir_conflict &&
+	(
+		cd df-conflict-error &&
+		git update-ref refs/remotes/origin/dir_conflict/file HEAD &&
+		test_must_fail git fetch 2>err &&
+		test_grep "error: some local refs could not be updated; try running" err &&
+		test_grep " ${SQ}git remote prune origin${SQ} to remove any old, conflicting branches" err &&
+		git pack-refs --all &&
+		test_must_fail git fetch 2>err-packed &&
+		test_grep "error: some local refs could not be updated; try running" err-packed &&
+		test_grep " ${SQ}git remote prune origin${SQ} to remove any old, conflicting branches" err-packed
+	)
 
-ok 88 - rev-list should succeed with empty output on empty stdin
+Cloning into 'df-conflict-error'...
+done.
+error: some local refs could not be updated; try running
+ 'git remote prune origin' to remove any old, conflicting branches
+error: some local refs could not be updated; try running
+ 'git remote prune origin' to remove any old, conflicting branches
+ok 189 - branchname D/F conflict rejected with targeted error message
 
-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
+expecting success of 5510.190 'fetching a one-level ref works': 
+	test_commit extra &&
+	git reset --hard HEAD^ &&
+	git update-ref refs/foo extra &&
+	git init one-level &&
+	(
+		cd one-level &&
+		git fetch .. HEAD refs/foo
+	)
 
-ok 89 - rev-list should succeed with empty output with all refs excluded
+[main 445a4b6] extra
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 extra.t
+HEAD is now at a008302 Merge tag 'otherside'
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/one-level/.git/
+From ..
+ * branch            HEAD       -> FETCH_HEAD
+ * branch            refs/foo   -> FETCH_HEAD
+ok 190 - fetching a one-level ref works
 
-expecting success of 6018.90 'rev-list should succeed with empty output with empty --all': 
+expecting success of 5510.191 'fetching with auto-gc does not lock up': 
+	write_script askyesno <<-\EOF &&
+	echo "$*" &&
+	false
+	EOF
+	git clone "file://$D" auto-gc &&
+	test_commit test2 &&
 	(
-		test_create_repo empty &&
-		cd empty &&
-		git rev-list --all >actual &&
-		test_must_be_empty actual
+		cd auto-gc &&
+		git config fetch.unpackLimit 1 &&
+		git config gc.autoPackLimit 1 &&
+		git config gc.autoDetach false &&
+		GIT_ASK_YESNO="$D/askyesno" git fetch --verbose >fetch.out 2>&1 &&
+		test_grep "Auto packing the repository" fetch.out &&
+		! grep "Should I try again" fetch.out
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6018-rev-list-glob/empty/.git/
-ok 90 - rev-list should succeed with empty output with empty --all
+Cloning into 'auto-gc'...
+[main d0a2253] test2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test2.t
+Auto packing the repository for optimum performance.
+ok 191 - fetching with auto-gc does not lock up
 
-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
+expecting success of 5510.192 'fetch.hideRefs affects connectivity check': 
+		GIT_TRACE="$PWD"/trace git -c $section.hideRefs=refs -c \
+			$section.hideRefs="!refs/tags/" fetch &&
+		grep "git rev-list .*--exclude-hidden=fetch" trace
+	
+trace: run_command: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+trace: start_command: /build/reproducible-path/git-2.51.0/git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+trace: built-in: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+ok 192 - fetch.hideRefs affects connectivity check
 
-ok 91 - rev-list should succeed with empty output with empty glob
+expecting success of 5510.193 'transfer.hideRefs affects connectivity check': 
+		GIT_TRACE="$PWD"/trace git -c $section.hideRefs=refs -c \
+			$section.hideRefs="!refs/tags/" fetch &&
+		grep "git rev-list .*--exclude-hidden=fetch" trace
+	
+trace: run_command: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+trace: start_command: /build/reproducible-path/git-2.51.0/git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+trace: built-in: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+trace: run_command: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+trace: start_command: /build/reproducible-path/git-2.51.0/git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+trace: built-in: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+ok 193 - transfer.hideRefs affects connectivity check
 
-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
+expecting success of 5510.194 'prepare source branch': 
+	echo one >onebranch &&
+	git checkout --orphan onebranch &&
+	git rm --cached -r . &&
+	git add onebranch &&
+	git commit -m onebranch &&
+	git rev-list --objects onebranch -- >actual &&
+	# 3 objects should be created, at least ...
+	test 3 -le $(wc -l <actual)
 
-ok 92 - rev-list should succeed with empty output when ignoring missing
+Switched to a new branch 'onebranch'
+rm 'base.t'
+rm 'file'
+rm 'file2'
+rm 'oneside.t'
+rm 'otherside.t'
+rm 'test2.t'
+[onebranch (root-commit) 609ade1] onebranch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 onebranch
+ok 194 - prepare source branch
 
-expecting success of 6018.93 'shortlog accepts --glob/--tags/--remotes': 
+expecting success of 5510.195 'fetch trumps transfer limit': 
+		rm -fr dest &&
+		git --bare init dest &&
+		git -C dest config fetch.unpacklimit $fetch_limit &&
+		git -C dest config transfer.unpacklimit $transfer_limit &&
+		git -C dest fetch .. onebranch &&
+		validate_store_type
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/dest/
+From ..
+ * branch            onebranch  -> FETCH_HEAD
+count: 0
+ok 195 - fetch trumps transfer limit
 
-	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
+expecting success of 5510.196 'fetch trumps transfer limit': 
+		rm -fr dest &&
+		git --bare init dest &&
+		git -C dest config fetch.unpacklimit $fetch_limit &&
+		git -C dest config transfer.unpacklimit $transfer_limit &&
+		git -C dest fetch .. onebranch &&
+		validate_store_type
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/dest/
+From ..
+ * branch            onebranch  -> FETCH_HEAD
+packs: 0
+ok 196 - fetch trumps transfer limit
 
+expecting success of 5510.197 '--negotiation-tip limits "have" lines sent': 
+	setup_negotiation_tip server server 0 &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
+		--negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
+		origin alpha_s beta_s &&
+	check_negotiation_tip
 
-ok 93 - shortlog accepts --glob/--tags/--remotes
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server/.git/
+[main (root-commit) facd226] alpha_1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpha_1.t
+[main f31e7ad] alpha_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpha_2.t
+Switched to a new branch 'beta'
+[beta (root-commit) 754b9c2] beta_1
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 alpha_1.t
+ create mode 100644 alpha_2.t
+ create mode 100644 beta_1.t
+[beta c202648] beta_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 beta_2.t
+Cloning into 'client'...
+done.
+[beta 0e40751] beta_s
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 beta_s.t
+Switched to branch 'main'
+[main 2c3426a] alpha_s
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpha_s.t
+Deleted tag 'alpha_1' (was facd226)
+Deleted tag 'alpha_2' (was f31e7ad)
+Deleted tag 'beta_1' (was 754b9c2)
+Deleted tag 'beta_2' (was c202648)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server
+ * tag               alpha_s    -> FETCH_HEAD
+ * tag               beta_s     -> FETCH_HEAD
+packet:        fetch> have facd2269ff2b5eb30cddd3d918ecf236d8f8298a
+packet:        fetch> have 754b9c2db9900588a06477b6d65461d82e960d37
+ok 197 - --negotiation-tip limits "have" lines sent
 
-checking known breakage of 6018.94 'shortlog accepts --glob as detached option': 
+expecting success of 5510.198 '--negotiation-tip understands globs': 
+	setup_negotiation_tip server server 0 &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
+		--negotiation-tip=*_1 \
+		origin alpha_s beta_s &&
+	check_negotiation_tip
 
-	compare shortlog \
-	  "main other/three someref subspace-x subspace/one subspace/two" \
-	  "--glob heads/*"
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server/.git/
+[main (root-commit) a849d09] alpha_1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpha_1.t
+[main 9c9efb3] alpha_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpha_2.t
+Switched to a new branch 'beta'
+[beta (root-commit) dfcc514] beta_1
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 alpha_1.t
+ create mode 100644 alpha_2.t
+ create mode 100644 beta_1.t
+[beta a75b0f1] beta_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 beta_2.t
+Cloning into 'client'...
+done.
+[beta a144366] beta_s
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 beta_s.t
+Switched to branch 'main'
+[main 1f3e2f1] alpha_s
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpha_s.t
+Deleted tag 'alpha_1' (was a849d09)
+Deleted tag 'alpha_2' (was 9c9efb3)
+Deleted tag 'beta_1' (was dfcc514)
+Deleted tag 'beta_2' (was a75b0f1)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server
+ * tag               alpha_s    -> FETCH_HEAD
+ * tag               beta_s     -> FETCH_HEAD
+packet:        fetch> have a849d093bd04034e02b320b915812e2e739a6e71
+packet:        fetch> have dfcc514b92ea54d0eec2fdc71577e40710161dd5
+ok 198 - --negotiation-tip understands globs
 
+expecting success of 5510.199 '--negotiation-tip understands abbreviated SHA-1': 
+	setup_negotiation_tip server server 0 &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
+		--negotiation-tip=$(git -C client rev-parse --short alpha_1) \
+		--negotiation-tip=$(git -C client rev-parse --short beta_1) \
+		origin alpha_s beta_s &&
+	check_negotiation_tip
 
-error: unknown option `--glob'
-usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
-   or: git log --pretty=short | git shortlog [<options>]
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server/.git/
+[main (root-commit) 91c1c9f] alpha_1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpha_1.t
+[main e0da29d] alpha_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpha_2.t
+Switched to a new branch 'beta'
+[beta (root-commit) dcd8861] beta_1
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 alpha_1.t
+ create mode 100644 alpha_2.t
+ create mode 100644 beta_1.t
+[beta 012e63c] beta_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 beta_2.t
+Cloning into 'client'...
+done.
+[beta a6cc847] beta_s
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 beta_s.t
+Switched to branch 'main'
+[main 60cc95d] alpha_s
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpha_s.t
+Deleted tag 'alpha_1' (was 91c1c9f)
+Deleted tag 'alpha_2' (was e0da29d)
+Deleted tag 'beta_1' (was dcd8861)
+Deleted tag 'beta_2' (was 012e63c)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server
+ * tag               alpha_s    -> FETCH_HEAD
+ * tag               beta_s     -> FETCH_HEAD
+packet:        fetch> have 91c1c9ff43e3e8c21c626f9d53f98fd98b41a1bc
+packet:        fetch> have dcd8861f9d94ce1c6e0f4e6bc6980e72c660e839
+ok 199 - --negotiation-tip understands abbreviated SHA-1
 
-    -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
+expecting success of 5510.200 '--negotiation-tip rejects missing OIDs': 
+	setup_negotiation_tip server server 0 &&
+	test_must_fail git -C client fetch \
+		--negotiation-tip=alpha_1 \
+		--negotiation-tip=$(test_oid zero) \
+		origin alpha_s beta_s 2>err &&
+	cat >fatal-expect <<-EOF &&
+	fatal: the object $(test_oid zero) does not exist
+EOF
+	grep fatal: err >fatal-actual &&
+	test_cmp fatal-expect fatal-actual
 
-not ok 94 - shortlog accepts --glob as detached option # TODO known breakage
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/server/.git/
+[main (root-commit) 8158d9a] alpha_1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpha_1.t
+[main 159269a] alpha_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpha_2.t
+Switched to a new branch 'beta'
+[beta (root-commit) ab9489d] beta_1
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 alpha_1.t
+ create mode 100644 alpha_2.t
+ create mode 100644 beta_1.t
+[beta 66378fb] beta_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 beta_2.t
+Cloning into 'client'...
+done.
+[beta 5c64d87] beta_s
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 beta_s.t
+Switched to branch 'main'
+[main 92cb688] alpha_s
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpha_s.t
+Deleted tag 'alpha_1' (was 8158d9a)
+Deleted tag 'alpha_2' (was 159269a)
+Deleted tag 'beta_1' (was ab9489d)
+Deleted tag 'beta_2' (was 66378fb)
+ok 200 - --negotiation-tip rejects missing OIDs
 
-checking known breakage of 6018.95 'shortlog --glob is not confused by option-like argument': 
+checking prerequisite: SYMLINKS
 
-	compare shortlog main "--glob -e main"
+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 5510.201 'clone does not get confused by a D/F conflict': 
+	git init df-conflict &&
+	(
+		cd df-conflict &&
+		ln -s .git a &&
+		git add a &&
+		test_tick &&
+		git commit -m symlink &&
+		test_commit a- &&
+		rm a &&
+		mkdir -p a/hooks &&
+		write_script a/hooks/post-checkout <<-EOF &&
+		echo WHOOPSIE >&2
+		echo whoopsie >"$TRASH_DIRECTORY"/whoops
+		EOF
+		git add a/hooks/post-checkout &&
+		test_tick &&
+		git commit -m post-checkout
+	) &&
+	git clone df-conflict clone 2>err &&
+	test_grep ! WHOOPS err &&
+	test_path_is_missing whoops
 
-error: unknown option `--glob'
-usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
-   or: git log --pretty=short | git shortlog [<options>]
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5510-fetch/df-conflict/.git/
+[master (root-commit) ca09cd7] symlink
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 a
+[master 6b77001] a-
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a-.t
+[master 5c75565] post-checkout
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+ delete mode 120000 a
+ create mode 100755 a/hooks/post-checkout
+ok 201 - clone does not get confused by a D/F conflict
 
-    -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
+checking prerequisite: NOT_ROOT
 
-not ok 95 - shortlog --glob is not confused by option-like argument # TODO known breakage
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
-# still have 4 known breakage(s)
-# passed all remaining 91 test(s)
-1..95
+)
+prerequisite NOT_ROOT ok
+# passed all 201 test(s)
+# SKIP no web server found at ''
+1..201
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6100-rev-list-in-order.sh ***
@@ -406372,118 +407299,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6060-merge-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6040-tracking-info.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6040-tracking-info/.git/
 expecting success of 6040.1 'setup': 
@@ -406764,304 +407579,190 @@
 	) >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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6102-rev-list-unexpected-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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)
+Switched to branch 'b6'
+ok 19 - status -s -b (up-to-date with upstream)
 
-Deleted tag 'tag' (was a857fb4)
-ok 14 - setup unexpected non-commit tag
+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 6102.15 'traverse unexpected non-commit tag (lone)': 
-	test_must_fail git rev-list --objects $tag
+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
 
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a commit, not a blob
-fatal: bad object 19102815663d23f8b75a47e7a01965dcdc96468c
-ok 15 - traverse unexpected non-commit tag (lone)
+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 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
+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
 
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a commit
-ok 16 - traverse unexpected non-commit tag (seen)
+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 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)
+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
 
-Deleted tag 'tag' (was 7f85285)
-ok 17 - setup unexpected non-tree tag
+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 6102.18 'traverse unexpected non-tree tag (lone)': 
-	test_must_fail git rev-list --objects $tag
+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}
 
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a tree, not a blob
-fatal: bad object 19102815663d23f8b75a47e7a01965dcdc96468c
-ok 18 - traverse unexpected non-tree tag (lone)
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6060-merge-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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
+[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
 
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a tree
-ok 19 - traverse unexpected non-tree tag (seen)
+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
 
-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)
+ok 2 - read-tree does not resolve content merge
 
-Deleted tag 'tag' (was 5ff9998)
-ok 20 - setup unexpected non-blob tag
+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
 
-expecting success of 6102.21 'traverse unexpected non-blob tag (lone)': 
-	test_must_fail git rev-list --objects $tag
+Auto-merging file
+ok 3 - git merge-index git-merge-one-file resolves
 
-error: object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd is a blob, not a commit
-fatal: bad object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd
-ok 21 - traverse unexpected non-blob tag (lone)
+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
+	)
 
-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
+Cloning into bare repository 'bare.git'...
+done.
+ok 4 - setup bare merge
 
-error: object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd is a commit, not a blob
-ok 22 - traverse unexpected non-blob tag (seen)
+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
+	)
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6110-rev-list-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+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
 
-[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 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 6110.2 'rev-list --first-parent --boundary': 
-	git rev-list --first-parent --boundary HEAD^..
+Auto-merging file
+ok 6 - merge-one-file respects GIT_WORK_TREE
 
-e8ee201b06a2eb86519e2b246f4c082e43aa5e90
--35a8500a6c116c9ddf35e140fa3277a7fe0b4196
--dc25130fe5e9f5d4a18aa4e0dff022e489b22c75
-ok 2 - rev-list --first-parent --boundary
+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
 
-# passed all 2 test(s)
-1..2
+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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5616-partial-clone.sh ***
@@ -407451,39 +408152,40 @@
 	grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace3.event &&
 	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"0\" trace3.event
 
-{"event":"child_start","sid":"20250827T082202.167170Z-Hcf858c9d-P000ab4c7","thread":"main","time":"2025-08-27T08:22:02.234702Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
-{"event":"def_param","sid":"20250827T082202.167170Z-Hcf858c9d-P000ab4c7/20250827T082202.241719Z-Hcf858c9d-P000ab591","thread":"main","time":"2025-08-27T08:22:02.242229Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250827T082202.167170Z-Hcf858c9d-P000ab4c7/20250827T082202.241719Z-Hcf858c9d-P000ab591/20250827T082202.244005Z-Hcf858c9d-P000ab5a8","thread":"main","time":"2025-08-27T08:22:02.248912Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250827T082202.167170Z-Hcf858c9d-P000ab4c7/20250827T082202.241719Z-Hcf858c9d-P000ab591/20250827T082202.258058Z-Hcf858c9d-P000ab5c0","thread":"main","time":"2025-08-27T08:22:02.258577Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250827T082202.167170Z-Hcf858c9d-P000ab4c7/20250827T082202.241719Z-Hcf858c9d-P000ab591/20250827T082202.261873Z-Hcf858c9d-P000ab5de","thread":"main","time":"2025-08-27T08:22:02.264404Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250827T082202.167170Z-Hcf858c9d-P000ab4c7/20250827T082202.241719Z-Hcf858c9d-P000ab591","thread":"main","time":"2025-08-27T08:22:02.242234Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20250827T082202.167170Z-Hcf858c9d-P000ab4c7/20250827T082202.241719Z-Hcf858c9d-P000ab591/20250827T082202.244005Z-Hcf858c9d-P000ab5a8","thread":"main","time":"2025-08-27T08:22:02.248918Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20250827T082202.167170Z-Hcf858c9d-P000ab4c7/20250827T082202.241719Z-Hcf858c9d-P000ab591/20250827T082202.258058Z-Hcf858c9d-P000ab5c0","thread":"main","time":"2025-08-27T08:22:02.258586Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20250827T082202.167170Z-Hcf858c9d-P000ab4c7/20250827T082202.241719Z-Hcf858c9d-P000ab591/20250827T082202.261873Z-Hcf858c9d-P000ab5de","thread":"main","time":"2025-08-27T08:22:02.264409Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20250827T082202.167170Z-Hcf858c9d-P000ab4c7/20250827T082202.241719Z-Hcf858c9d-P000ab591/20250827T082202.261873Z-Hcf858c9d-P000ab5de/20250827T082202.269463Z-Hcf858c9d-P000ab5f3","thread":"main","time":"2025-08-27T08:22:02.269769Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20250827T082202.167170Z-Hcf858c9d-P000ab4c7/20250827T082202.241719Z-Hcf858c9d-P000ab591/20250827T082202.261873Z-Hcf858c9d-P000ab5de/20250827T082202.269463Z-Hcf858c9d-P000ab5f3/20250827T082202.271961Z-Hcf858c9d-P000ab5f9","thread":"main","time":"2025-08-27T08:22:02.272275Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"child_start","sid":"20250827T082202.291609Z-Hcf858c9d-P000ab615","thread":"main","time":"2025-08-27T08:22:02.369047Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
-{"event":"def_param","sid":"20250827T082202.291609Z-Hcf858c9d-P000ab615","thread":"main","time":"2025-08-27T08:22:02.292114Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20250827T082202.291609Z-Hcf858c9d-P000ab615/20250827T082202.353434Z-Hcf858c9d-P000ab6b6","thread":"main","time":"2025-08-27T08:22:02.353954Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20250827T082202.291609Z-Hcf858c9d-P000ab615/20250827T082202.353434Z-Hcf858c9d-P000ab6b6/20250827T082202.366099Z-Hcf858c9d-P000ab6f3","thread":"main","time":"2025-08-27T08:22:02.366790Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20250827T082202.291609Z-Hcf858c9d-P000ab615/20250827T082202.372120Z-Hcf858c9d-P000ab703","thread":"main","time":"2025-08-27T08:22:02.376794Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20250827T082202.291609Z-Hcf858c9d-P000ab615/20250827T082202.372120Z-Hcf858c9d-P000ab703","thread":"main","time":"2025-08-27T08:22:02.376803Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"child_start","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f","thread":"main","time":"2025-08-27T08:22:02.478883Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.483210Z-Hcf858c9d-P000ab841","thread":"main","time":"2025-08-27T08:22:02.488165Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.483210Z-Hcf858c9d-P000ab841/20250827T082202.494966Z-Hcf858c9d-P000ab85f","thread":"main","time":"2025-08-27T08:22:02.495500Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.483210Z-Hcf858c9d-P000ab841/20250827T082202.498106Z-Hcf858c9d-P000ab86a","thread":"main","time":"2025-08-27T08:22:02.498628Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.483210Z-Hcf858c9d-P000ab841/20250827T082202.506068Z-Hcf858c9d-P000ab87e","thread":"main","time":"2025-08-27T08:22:02.506359Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.483210Z-Hcf858c9d-P000ab841/20250827T082202.506068Z-Hcf858c9d-P000ab87e/20250827T082202.510159Z-Hcf858c9d-P000ab88a","thread":"main","time":"2025-08-27T08:22:02.510476Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.483210Z-Hcf858c9d-P000ab841/20250827T082202.506068Z-Hcf858c9d-P000ab87e/20250827T082202.510159Z-Hcf858c9d-P000ab88a/20250827T082202.513581Z-Hcf858c9d-P000ab89a","thread":"main","time":"2025-08-27T08:22:02.513908Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f","thread":"main","time":"2025-08-27T08:22:02.411576Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.458981Z-Hcf858c9d-P000ab802","thread":"main","time":"2025-08-27T08:22:02.460932Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.458981Z-Hcf858c9d-P000ab802/20250827T082202.470664Z-Hcf858c9d-P000ab827","thread":"main","time":"2025-08-27T08:22:02.471185Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.483210Z-Hcf858c9d-P000ab841","thread":"main","time":"2025-08-27T08:22:02.488161Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.483210Z-Hcf858c9d-P000ab841/20250827T082202.494966Z-Hcf858c9d-P000ab85f","thread":"main","time":"2025-08-27T08:22:02.495496Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.483210Z-Hcf858c9d-P000ab841/20250827T082202.498106Z-Hcf858c9d-P000ab86a","thread":"main","time":"2025-08-27T08:22:02.498624Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.483210Z-Hcf858c9d-P000ab841/20250827T082202.506068Z-Hcf858c9d-P000ab87e","thread":"main","time":"2025-08-27T08:22:02.506355Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.483210Z-Hcf858c9d-P000ab841/20250827T082202.506068Z-Hcf858c9d-P000ab87e/20250827T082202.510159Z-Hcf858c9d-P000ab88a","thread":"main","time":"2025-08-27T08:22:02.510472Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250827T082202.411037Z-Hcf858c9d-P000ab74f/20250827T082202.483210Z-Hcf858c9d-P000ab841/20250827T082202.506068Z-Hcf858c9d-P000ab87e/20250827T082202.510159Z-Hcf858c9d-P000ab88a/20250827T082202.513581Z-Hcf858c9d-P000ab89a","thread":"main","time":"2025-08-27T08:22:02.513904Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"child_start","sid":"20260929T145305.627329Z-H5c947e1c-P0023df18","thread":"main","time":"2026-09-29T14:53:05.662998Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
+{"event":"def_param","sid":"20260929T145305.627329Z-H5c947e1c-P0023df18/20260929T145305.664598Z-H5c947e1c-P0023dfb2","thread":"main","time":"2026-09-29T14:53:05.667265Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260929T145305.627329Z-H5c947e1c-P0023df18/20260929T145305.664598Z-H5c947e1c-P0023dfb2/20260929T145305.668923Z-H5c947e1c-P0023dfc5","thread":"main","time":"2026-09-29T14:53:05.669456Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260929T145305.627329Z-H5c947e1c-P0023df18/20260929T145305.664598Z-H5c947e1c-P0023dfb2/20260929T145305.671904Z-H5c947e1c-P0023dfd0","thread":"main","time":"2026-09-29T14:53:05.672419Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260929T145305.627329Z-H5c947e1c-P0023df18/20260929T145305.664598Z-H5c947e1c-P0023dfb2/20260929T145305.676717Z-H5c947e1c-P0023dfde","thread":"main","time":"2026-09-29T14:53:05.677054Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260929T145305.627329Z-H5c947e1c-P0023df18/20260929T145305.664598Z-H5c947e1c-P0023dfb2","thread":"main","time":"2026-09-29T14:53:05.667269Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20260929T145305.627329Z-H5c947e1c-P0023df18/20260929T145305.664598Z-H5c947e1c-P0023dfb2/20260929T145305.668923Z-H5c947e1c-P0023dfc5","thread":"main","time":"2026-09-29T14:53:05.669461Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20260929T145305.627329Z-H5c947e1c-P0023df18/20260929T145305.664598Z-H5c947e1c-P0023dfb2/20260929T145305.671904Z-H5c947e1c-P0023dfd0","thread":"main","time":"2026-09-29T14:53:05.672424Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20260929T145305.627329Z-H5c947e1c-P0023df18/20260929T145305.664598Z-H5c947e1c-P0023dfb2/20260929T145305.676717Z-H5c947e1c-P0023dfde","thread":"main","time":"2026-09-29T14:53:05.677059Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20260929T145305.627329Z-H5c947e1c-P0023df18/20260929T145305.664598Z-H5c947e1c-P0023dfb2/20260929T145305.676717Z-H5c947e1c-P0023dfde/20260929T145305.681355Z-H5c947e1c-P0023dff0","thread":"main","time":"2026-09-29T14:53:05.681684Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20260929T145305.627329Z-H5c947e1c-P0023df18/20260929T145305.664598Z-H5c947e1c-P0023dfb2/20260929T145305.676717Z-H5c947e1c-P0023dfde/20260929T145305.681355Z-H5c947e1c-P0023dff0/20260929T145305.683239Z-H5c947e1c-P0023dffd","thread":"main","time":"2026-09-29T14:53:05.683567Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"child_start","sid":"20260929T145305.689795Z-H5c947e1c-P0023e00d","thread":"main","time":"2026-09-29T14:53:05.730633Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
+{"event":"def_param","sid":"20260929T145305.689795Z-H5c947e1c-P0023e00d","thread":"main","time":"2026-09-29T14:53:05.690297Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20260929T145305.689795Z-H5c947e1c-P0023e00d/20260929T145305.718275Z-H5c947e1c-P0023e07e","thread":"main","time":"2026-09-29T14:53:05.718771Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20260929T145305.689795Z-H5c947e1c-P0023e00d/20260929T145305.718275Z-H5c947e1c-P0023e07e/20260929T145305.725837Z-H5c947e1c-P0023e099","thread":"main","time":"2026-09-29T14:53:05.726340Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20260929T145305.689795Z-H5c947e1c-P0023e00d/20260929T145305.732293Z-H5c947e1c-P0023e0b3","thread":"main","time":"2026-09-29T14:53:05.732763Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20260929T145305.689795Z-H5c947e1c-P0023e00d/20260929T145305.732293Z-H5c947e1c-P0023e0b3","thread":"main","time":"2026-09-29T14:53:05.732772Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"child_start","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9","thread":"main","time":"2026-09-29T14:53:05.783334Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.785334Z-H5c947e1c-P0023e184","thread":"main","time":"2026-09-29T14:53:05.785844Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.785334Z-H5c947e1c-P0023e184/20260929T145305.787535Z-H5c947e1c-P0023e188","thread":"main","time":"2026-09-29T14:53:05.788114Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.785334Z-H5c947e1c-P0023e184/20260929T145305.790251Z-H5c947e1c-P0023e192","thread":"main","time":"2026-09-29T14:53:05.790770Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.785334Z-H5c947e1c-P0023e184/20260929T145305.794188Z-H5c947e1c-P0023e19c","thread":"main","time":"2026-09-29T14:53:05.794485Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.785334Z-H5c947e1c-P0023e184/20260929T145305.794188Z-H5c947e1c-P0023e19c/20260929T145305.796238Z-H5c947e1c-P0023e1a3","thread":"main","time":"2026-09-29T14:53:05.796573Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.785334Z-H5c947e1c-P0023e184/20260929T145305.794188Z-H5c947e1c-P0023e19c/20260929T145305.796238Z-H5c947e1c-P0023e1a3/20260929T145305.798405Z-H5c947e1c-P0023e1ad","thread":"main","time":"2026-09-29T14:53:05.798732Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9","thread":"main","time":"2026-09-29T14:53:05.746048Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.774913Z-H5c947e1c-P0023e161","thread":"main","time":"2026-09-29T14:53:05.775402Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.774913Z-H5c947e1c-P0023e161/20260929T145305.780272Z-H5c947e1c-P0023e175","thread":"main","time":"2026-09-29T14:53:05.780810Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.785334Z-H5c947e1c-P0023e184","thread":"main","time":"2026-09-29T14:53:05.785841Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.785334Z-H5c947e1c-P0023e184/20260929T145305.787535Z-H5c947e1c-P0023e188","thread":"main","time":"2026-09-29T14:53:05.788110Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.785334Z-H5c947e1c-P0023e184/20260929T145305.790251Z-H5c947e1c-P0023e192","thread":"main","time":"2026-09-29T14:53:05.790766Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.785334Z-H5c947e1c-P0023e184/20260929T145305.794188Z-H5c947e1c-P0023e19c","thread":"main","time":"2026-09-29T14:53:05.794481Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.785334Z-H5c947e1c-P0023e184/20260929T145305.794188Z-H5c947e1c-P0023e19c/20260929T145305.796238Z-H5c947e1c-P0023e1a3","thread":"main","time":"2026-09-29T14:53:05.796569Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.785334Z-H5c947e1c-P0023e184/20260929T145305.794188Z-H5c947e1c-P0023e19c/20260929T145305.796238Z-H5c947e1c-P0023e1a3/20260929T145305.798405Z-H5c947e1c-P0023e1ad","thread":"main","time":"2026-09-29T14:53:05.798728Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260929T145305.745548Z-H5c947e1c-P0023e0e9/20260929T145305.785334Z-H5c947e1c-P0023e184/20260929T145305.794188Z-H5c947e1c-P0023e19c/20260929T145305.796238Z-H5c947e1c-P0023e1a3/20260929T145305.802077Z-H5c947e1c-P0023e1bc","thread":"main","time":"2026-09-29T14:53:05.802387Z","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': 
@@ -407542,9 +408244,9 @@
  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 703959 on codethink04-arm64' --promisor --fsck-objects
-trace: start_command: /build/reproducible-path/git-2.51.0/git index-pack --stdin --fix-thin '--keep=fetch-pack 703959 on codethink04-arm64' --promisor --fsck-objects
-trace: built-in: git index-pack --stdin --fix-thin '--keep=fetch-pack 703959 on codethink04-arm64' --promisor --fsck-objects
+trace: run_command: git index-pack --stdin --fix-thin '--keep=fetch-pack 2352694 on i-capture-the-hostname' --promisor --fsck-objects
+trace: start_command: /build/reproducible-path/git-2.51.0/git index-pack --stdin --fix-thin '--keep=fetch-pack 2352694 on i-capture-the-hostname' --promisor --fsck-objects
+trace: built-in: git index-pack --stdin --fix-thin '--keep=fetch-pack 2352694 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.51.0/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
@@ -407694,8 +408396,8 @@
 		"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
+fatal: 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': 
@@ -407718,8 +408420,8 @@
 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
+fatal: 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': 
@@ -408326,7 +409028,7 @@
 	grep "loosen_unused_packed_objects/loosened:0" trace
 
 Cloning into bare repository 'client'...
-08:22:11.709797 builtin/pack-objects.c:4464  | d1 | main                     | data         | r0  |  0.005917 |  0.000402 | pack-objects | ..loosen_unused_packed_objects/loosened:0
+14:53:12.316356 builtin/pack-objects.c:4464  | d1 | main                     | data         | r0  |  0.001257 |  0.000394 | 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': 
@@ -408484,6 +409186,232 @@
 1..44
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6102-rev-list-unexpected-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6110-rev-list-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6114-keep-packs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6114-keep-packs/.git/
 expecting success of 6114.1 'setup': 
@@ -410527,6 +411455,144 @@
 1..40
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6115-rev-list-du.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6113-rev-list-bitmap-filters.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6113-rev-list-bitmap-filters/.git/
 expecting success of 6113.1 'set up bitmapped repo': 
@@ -410731,144 +411797,6 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6115-rev-list-du.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6130-pathspec-noglob.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6130-pathspec-noglob/.git/
 expecting success of 6130.1 'create commits with glob characters': 
@@ -411074,6 +412002,1047 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6131-pathspec-icase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6131-pathspec-icase/.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
+expecting success of 6131.1 'create commits with glob characters': 
+	test_commit bar bar &&
+	test_commit bAr bAr &&
+	test_commit BAR BAR &&
+	mkdir foo &&
+	test_commit foo/bar foo/bar &&
+	test_commit foo/bAr foo/bAr &&
+	test_commit foo/BAR foo/BAR &&
+	mkdir fOo &&
+	test_commit fOo/bar fOo/bar &&
+	test_commit fOo/bAr fOo/bAr &&
+	test_commit fOo/BAR fOo/BAR &&
+	mkdir FOO &&
+	test_commit FOO/bar FOO/bar &&
+	test_commit FOO/bAr FOO/bAr &&
+	test_commit FOO/BAR FOO/BAR
+
+[master (root-commit) b257e7a] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[master 09d2e74] bAr
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bAr
+[master ae27bbe] BAR
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 BAR
+[master 016d22a] foo/bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar
+[master f3c37ed] foo/bAr
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bAr
+[master 98eb41e] foo/BAR
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/BAR
+[master edcb5cb] fOo/bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fOo/bar
+[master ed5b100] fOo/bAr
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fOo/bAr
+[master 2f49636] fOo/BAR
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fOo/BAR
+[master c65ab92] FOO/bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 FOO/bar
+[master cd48380] FOO/bAr
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 FOO/bAr
+[master 4e818f3] FOO/BAR
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 FOO/BAR
+ok 1 - create commits with glob characters
+
+expecting success of 6131.2 'tree_entry_interesting matches bar': 
+	echo bar >expect &&
+	git log --format=%s -- "bar" >actual &&
+	test_cmp expect actual
+
+ok 2 - tree_entry_interesting matches bar
+
+expecting success of 6131.3 'tree_entry_interesting matches :(icase)bar': 
+	cat <<-EOF >expect &&
+	BAR
+	bAr
+	bar
+	EOF
+	git log --format=%s -- ":(icase)bar" >actual &&
+	test_cmp expect actual
+
+ok 3 - tree_entry_interesting matches :(icase)bar
+
+expecting success of 6131.4 'tree_entry_interesting matches :(icase)bar with prefix': 
+	cat <<-EOF >expect &&
+	fOo/BAR
+	fOo/bAr
+	fOo/bar
+	EOF
+	( cd fOo && git log --format=%s -- ":(icase)bar" ) >actual &&
+	test_cmp expect actual
+
+ok 4 - tree_entry_interesting matches :(icase)bar with prefix
+
+expecting success of 6131.5 'tree_entry_interesting matches :(icase)bar with empty prefix': 
+	cat <<-EOF >expect &&
+	FOO/BAR
+	FOO/bAr
+	FOO/bar
+	fOo/BAR
+	fOo/bAr
+	fOo/bar
+	foo/BAR
+	foo/bAr
+	foo/bar
+	EOF
+	( cd fOo && git log --format=%s -- ":(icase)../foo/bar" ) >actual &&
+	test_cmp expect actual
+
+ok 5 - tree_entry_interesting matches :(icase)bar with empty prefix
+
+expecting success of 6131.6 'match_pathspec matches :(icase)bar': 
+	cat <<-EOF >expect &&
+	BAR
+	bAr
+	bar
+	EOF
+	git ls-files ":(icase)bar" >actual &&
+	test_cmp expect actual
+
+ok 6 - match_pathspec matches :(icase)bar
+
+expecting success of 6131.7 'match_pathspec matches :(icase)bar with prefix': 
+	cat <<-EOF >expect &&
+	fOo/BAR
+	fOo/bAr
+	fOo/bar
+	EOF
+	( cd fOo && git ls-files --full-name ":(icase)bar" ) >actual &&
+	test_cmp expect actual
+
+ok 7 - match_pathspec matches :(icase)bar with prefix
+
+expecting success of 6131.8 'match_pathspec matches :(icase)bar with empty prefix': 
+	cat <<-EOF >expect &&
+	bar
+	fOo/BAR
+	fOo/bAr
+	fOo/bar
+	EOF
+	( cd fOo && git ls-files --full-name ":(icase)bar" ../bar ) >actual &&
+	test_cmp expect actual
+
+ok 8 - match_pathspec matches :(icase)bar with empty prefix
+
+expecting success of 6131.9 '"git diff" can take magic :(icase) pathspec': 
+	echo FOO/BAR >expect &&
+	git diff --name-only HEAD^ HEAD -- ":(icase)foo/bar" >actual &&
+	test_cmp expect actual
+
+ok 9 - "git diff" can take magic :(icase) pathspec
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6133-pathspec-rev-dwim.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6050-replace.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6050-replace/.git/
+expecting success of 6050.1 'set up buggy branch': 
+	echo "line 1" >>hello &&
+	echo "line 2" >>hello &&
+	echo "line 3" >>hello &&
+	echo "line 4" >>hello &&
+	add_and_commit_file hello "4 lines" &&
+	HASH1=$(git rev-parse --verify HEAD) &&
+	echo "line BUG" >>hello &&
+	echo "line 6" >>hello &&
+	echo "line 7" >>hello &&
+	echo "line 8" >>hello &&
+	add_and_commit_file hello "4 more lines with a BUG" &&
+	HASH2=$(git rev-parse --verify HEAD) &&
+	echo "line 9" >>hello &&
+	echo "line 10" >>hello &&
+	add_and_commit_file hello "2 more lines" &&
+	HASH3=$(git rev-parse --verify HEAD) &&
+	echo "line 11" >>hello &&
+	add_and_commit_file hello "1 more line" &&
+	HASH4=$(git rev-parse --verify HEAD) &&
+	sed -e "s/BUG/5/" hello >hello.new &&
+	mv hello.new hello &&
+	add_and_commit_file hello "BUG fixed" &&
+	HASH5=$(git rev-parse --verify HEAD) &&
+	echo "line 12" >>hello &&
+	echo "line 13" >>hello &&
+	add_and_commit_file hello "2 more lines" &&
+	HASH6=$(git rev-parse --verify HEAD) &&
+	echo "line 14" >>hello &&
+	echo "line 15" >>hello &&
+	echo "line 16" >>hello &&
+	add_and_commit_file hello "again 3 more lines" &&
+	HASH7=$(git rev-parse --verify HEAD)
+
+ok 1 - set up buggy branch
+
+expecting success of 6050.2 'replace the author': 
+	git cat-file commit $HASH2 >actual &&
+	test_grep "author A U Thor" actual &&
+	R=$(sed -e "s/A U/O/" actual | git hash-object -t commit --stdin -w) &&
+	git cat-file commit $R >actual &&
+	test_grep "author O Thor" actual &&
+	git update-ref refs/replace/$HASH2 $R &&
+	git show HEAD~5 >actual &&
+	test_grep "O Thor" actual &&
+	git show $HASH2 >actual &&
+	test_grep "O Thor" actual
+
+author A U Thor <author@example.com> 1112912053 -0700
+author O Thor <author@example.com> 1112912053 -0700
+Author: O Thor <author@example.com>
+Author: O Thor <author@example.com>
+ok 2 - replace the author
+
+expecting success of 6050.3 'test --no-replace-objects option': 
+	git cat-file commit $HASH2 >actual &&
+	test_grep "author O Thor" actual &&
+	git --no-replace-objects cat-file commit $HASH2 >actual &&
+	test_grep "author A U Thor" actual &&
+	git show $HASH2 >actual &&
+	test_grep "O Thor" actual &&
+	git --no-replace-objects show $HASH2 >actual &&
+	test_grep "A U Thor" actual
+
+author O Thor <author@example.com> 1112912053 -0700
+author A U Thor <author@example.com> 1112912053 -0700
+Author: O Thor <author@example.com>
+Author: A U Thor <author@example.com>
+ok 3 - test --no-replace-objects option
+
+expecting success of 6050.4 'test GIT_NO_REPLACE_OBJECTS env variable': 
+	GIT_NO_REPLACE_OBJECTS=1 git cat-file commit $HASH2 >actual &&
+	test_grep "author A U Thor" actual &&
+	GIT_NO_REPLACE_OBJECTS=1 git show $HASH2 >actual &&
+	test_grep "A U Thor" actual
+
+author A U Thor <author@example.com> 1112912053 -0700
+Author: A U Thor <author@example.com>
+ok 4 - test GIT_NO_REPLACE_OBJECTS env variable
+
+expecting success of 6050.5 'test core.usereplacerefs config option': 
+	test_config core.usereplacerefs false &&
+	git cat-file commit $HASH2 >actual &&
+	test_grep "author A U Thor" actual &&
+	git show $HASH2 >actual &&
+	test_grep "A U Thor" actual
+
+author A U Thor <author@example.com> 1112912053 -0700
+Author: A U Thor <author@example.com>
+ok 5 - test core.usereplacerefs config option
+
+expecting success of 6050.6 'tag replaced commit': 
+	git update-ref refs/tags/mytag $(git mktag <tag.sig)
+
+ok 6 - tag replaced commit
+
+expecting success of 6050.7 '"git fsck" works': 
+	git fsck main >fsck_main.out &&
+	test_grep "dangling commit $R" fsck_main.out &&
+	test_grep "dangling tag $(git show-ref -s refs/tags/mytag)" fsck_main.out &&
+	test -z "$(git fsck)"
+
+dangling commit c06ac9b8cd2f38349af40ec00e5d5c761b3bf513
+dangling tag e25dc7954f0832d962347872884aab2dffb426c5
+ok 7 - "git fsck" works
+
+expecting success of 6050.8 'repack, clone and fetch work': 
+	git repack -a -d &&
+	git clone --no-hardlinks . clone_dir &&
+	(
+		cd clone_dir &&
+		git show HEAD~5 >actual &&
+		test_grep "A U Thor" actual &&
+		git show $HASH2 >actual &&
+		test_grep "A U Thor" actual &&
+		git cat-file commit $R &&
+		git repack -a -d &&
+		test_must_fail git cat-file commit $R &&
+		git fetch ../ "refs/replace/*:refs/replace/*" &&
+		git show HEAD~5 >actual &&
+		test_grep "O Thor" actual &&
+		git show $HASH2 >actual &&
+		test_grep "O Thor" actual &&
+		git cat-file commit $R
+	)
+
+Cloning into 'clone_dir'...
+done.
+Author: A U Thor <author@example.com>
+Author: A U Thor <author@example.com>
+tree 242e3e36d5c0616fbf715682c322254dadb55168
+parent 00ad688edb1a79423184992de45a5f0322c8bdf5
+author O Thor <author@example.com> 1112912053 -0700
+committer C O Mitter <committer@example.com> 1112912053 -0700
+
+hello: 4 more lines with a BUG
+fatal: git cat-file c06ac9b8cd2f38349af40ec00e5d5c761b3bf513: bad file
+From ..
+ * [new ref]         refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0 -> refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0
+Author: O Thor <author@example.com>
+Author: O Thor <author@example.com>
+tree 242e3e36d5c0616fbf715682c322254dadb55168
+parent 00ad688edb1a79423184992de45a5f0322c8bdf5
+author O Thor <author@example.com> 1112912053 -0700
+committer C O Mitter <committer@example.com> 1112912053 -0700
+
+hello: 4 more lines with a BUG
+ok 8 - repack, clone and fetch work
+
+expecting success of 6050.9 '"git replace" listing and deleting': 
+	test "$HASH2" = "$(git replace -l)" &&
+	test "$HASH2" = "$(git replace)" &&
+	aa=${HASH2%??????????????????????????????????????} &&
+	test "$HASH2" = "$(git replace --list "$aa*")" &&
+	test_must_fail git replace -d $R &&
+	test_must_fail git replace --delete &&
+	test_must_fail git replace -l -d $HASH2 &&
+	git replace -d $HASH2 &&
+	git show $HASH2 >actual &&
+	test_grep "A U Thor" actual &&
+	test -z "$(git replace -l)"
+
+error: replace ref 'c06ac9b8cd2f38349af40ec00e5d5c761b3bf513' not found
+fatal: -d needs at least one argument
+
+usage: git replace [-f] <object> <replacement>
+   or: git replace [-f] --edit <object>
+   or: git replace [-f] --graft <commit> [<parent>...]
+   or: git replace [-f] --convert-graft-file
+   or: git replace -d <object>...
+   or: git replace [--format=<format>] [-l [<pattern>]]
+
+    -l, --list            list replace refs
+    -d, --delete          delete replace refs
+    -e, --edit            edit existing object
+    -g, --graft           change a commit's parents
+    --convert-graft-file  convert existing graft file
+    -f, --[no-]force      replace the ref if it exists
+    --[no-]raw            do not pretty-print contents for --edit
+    --[no-]format <format>
+                          use this format
+
+error: options '-d' and '-l' cannot be used together
+Deleted replace ref '4217adb325b9db7bfc0c7b223183cc8546638cf0'
+Author: A U Thor <author@example.com>
+ok 9 - "git replace" listing and deleting
+
+expecting success of 6050.10 '"git replace" replacing': 
+	git replace $HASH2 $R &&
+	git show $HASH2 >actual &&
+	test_grep "O Thor" actual &&
+	test_must_fail git replace $HASH2 $R &&
+	git replace -f $HASH2 $R &&
+	test_must_fail git replace -f &&
+	test "$HASH2" = "$(git replace)"
+
+Author: O Thor <author@example.com>
+error: replace ref 'refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0' already exists
+fatal: -f only makes sense when writing a replacement
+
+usage: git replace [-f] <object> <replacement>
+   or: git replace [-f] --edit <object>
+   or: git replace [-f] --graft <commit> [<parent>...]
+   or: git replace [-f] --convert-graft-file
+   or: git replace -d <object>...
+   or: git replace [--format=<format>] [-l [<pattern>]]
+
+    -l, --list            list replace refs
+    -d, --delete          delete replace refs
+    -e, --edit            edit existing object
+    -g, --graft           change a commit's parents
+    --convert-graft-file  convert existing graft file
+    -f, --[no-]force      replace the ref if it exists
+    --[no-]raw            do not pretty-print contents for --edit
+    --[no-]format <format>
+                          use this format
+
+ok 10 - "git replace" replacing
+
+expecting success of 6050.11 '"git replace" resolves sha1': 
+	SHORTHASH2=$(git rev-parse --short=8 $HASH2) &&
+	git replace -d $SHORTHASH2 &&
+	git replace $SHORTHASH2 $R &&
+	git show $HASH2 >actual &&
+	test_grep "O Thor" actual &&
+	test_must_fail git replace $HASH2 $R &&
+	git replace -f $HASH2 $R &&
+	test_must_fail git replace --force &&
+	test "$HASH2" = "$(git replace)"
+
+Deleted replace ref '4217adb325b9db7bfc0c7b223183cc8546638cf0'
+Author: O Thor <author@example.com>
+error: replace ref 'refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0' already exists
+fatal: -f only makes sense when writing a replacement
+
+usage: git replace [-f] <object> <replacement>
+   or: git replace [-f] --edit <object>
+   or: git replace [-f] --graft <commit> [<parent>...]
+   or: git replace [-f] --convert-graft-file
+   or: git replace -d <object>...
+   or: git replace [--format=<format>] [-l [<pattern>]]
+
+    -l, --list            list replace refs
+    -d, --delete          delete replace refs
+    -e, --edit            edit existing object
+    -g, --graft           change a commit's parents
+    --convert-graft-file  convert existing graft file
+    -f, --[no-]force      replace the ref if it exists
+    --[no-]raw            do not pretty-print contents for --edit
+    --[no-]format <format>
+                          use this format
+
+ok 11 - "git replace" resolves sha1
+
+expecting success of 6050.12 'create parallel branch without the bug': 
+	git replace -d $HASH2 &&
+	git show $HASH2 >actual &&
+	test_grep "A U Thor" actual &&
+	git checkout $HASH1 &&
+	git cherry-pick $HASH2 &&
+	git show $HASH5 >actual &&
+	git apply actual &&
+	git commit --amend -m "hello: 4 more lines WITHOUT the bug" hello &&
+	PARA2=$(git rev-parse --verify HEAD) &&
+	git cherry-pick $HASH3 &&
+	PARA3=$(git rev-parse --verify HEAD) &&
+	git cherry-pick $HASH4 &&
+	PARA4=$(git rev-parse --verify HEAD) &&
+	git cherry-pick $HASH6 &&
+	PARA6=$(git rev-parse --verify HEAD) &&
+	git replace $HASH6 $PARA6 &&
+	git checkout main &&
+	cur=$(git rev-parse --verify HEAD) &&
+	test "$cur" = "$HASH7" &&
+	git log --pretty=oneline >actual &&
+	test_grep $PARA2 actual &&
+	git remote add cloned ./clone_dir
+
+Deleted replace ref '4217adb325b9db7bfc0c7b223183cc8546638cf0'
+Author: A U Thor <author@example.com>
+Note: switching to '00ad688edb1a79423184992de45a5f0322c8bdf5'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 00ad688 hello: 4 lines
+[detached HEAD dcda230] hello: 4 more lines with a BUG
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 4 insertions(+)
+[detached HEAD af6d994] hello: 4 more lines WITHOUT the bug
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 4 insertions(+)
+Auto-merging hello
+[detached HEAD a3fb2e1] hello: 2 more lines
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Auto-merging hello
+[detached HEAD f486255] hello: 1 more line
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+[detached HEAD 911408d] hello: 2 more lines
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Previous HEAD position was 911408d hello: 2 more lines
+Switched to branch 'main'
+af6d994c7106b0846fb80f09fa5bcbc460432c6d hello: 4 more lines WITHOUT the bug
+ok 12 - create parallel branch without the bug
+
+expecting success of 6050.13 'push to cloned repo': 
+	git push cloned $HASH6^:refs/heads/parallel &&
+	(
+		cd clone_dir &&
+		git checkout parallel &&
+		git log --pretty=oneline >actual &&
+		test_grep $PARA2 actual
+	)
+
+To ./clone_dir
+ * [new branch]      14ac020163ea60a9d683ce68e36c946f31ecc856^ -> parallel
+Switched to branch 'parallel'
+af6d994c7106b0846fb80f09fa5bcbc460432c6d hello: 4 more lines WITHOUT the bug
+ok 13 - push to cloned repo
+
+expecting success of 6050.14 'push branch with replacement': 
+	git cat-file commit $PARA3 >actual &&
+	test_grep "author A U Thor" actual &&
+	S=$(sed -e "s/A U/O/" actual | git hash-object -t commit --stdin -w) &&
+	git cat-file commit $S >actual &&
+	test_grep "author O Thor" actual &&
+	git replace $PARA3 $S &&
+	git show $HASH6~2 >actual &&
+	test_grep "O Thor" actual &&
+	git show $PARA3 >actual &&
+	test_grep "O Thor" actual &&
+	git push cloned $HASH6^:refs/heads/parallel2 &&
+	(
+		cd clone_dir &&
+		git checkout parallel2 &&
+		git log --pretty=oneline >actual &&
+		test_grep $PARA3 actual &&
+		git show $PARA3 >actual &&
+		test_grep "A U Thor" actual
+	)
+
+author A U Thor <author@example.com> 1112912113 -0700
+author O Thor <author@example.com> 1112912113 -0700
+Author: O Thor <author@example.com>
+Author: O Thor <author@example.com>
+To ./clone_dir
+ * [new branch]      14ac020163ea60a9d683ce68e36c946f31ecc856^ -> parallel2
+Switched to branch 'parallel2'
+a3fb2e1845a1aaf129b7975048973414dc172173 hello: 2 more lines
+Author: A U Thor <author@example.com>
+ok 14 - push branch with replacement
+
+expecting success of 6050.15 'fetch branch with replacement': 
+	git branch tofetch $HASH6 &&
+	(
+		cd clone_dir &&
+		git fetch origin refs/heads/tofetch:refs/heads/parallel3 &&
+		git log --pretty=oneline parallel3 >output.txt &&
+		test_grep ! $PARA3 output.txt &&
+		git show $PARA3 >para3.txt &&
+		test_grep "A U Thor" para3.txt &&
+		git fetch origin "refs/replace/*:refs/replace/*" &&
+		git log --pretty=oneline parallel3 >output.txt &&
+		test_grep $PARA3 output.txt &&
+		git show $PARA3 >para3.txt &&
+		test_grep "O Thor" para3.txt
+	)
+
+From /build/reproducible-path/git-2.51.0/t/trash directory.t6050-replace/.
+ * [new branch]      tofetch    -> parallel3
+ * [new branch]      tofetch    -> origin/tofetch
+Author: A U Thor <author@example.com>
+From /build/reproducible-path/git-2.51.0/t/trash directory.t6050-replace/.
+ * [new ref]         refs/replace/14ac020163ea60a9d683ce68e36c946f31ecc856 -> refs/replace/14ac020163ea60a9d683ce68e36c946f31ecc856
+ * [new ref]         refs/replace/a3fb2e1845a1aaf129b7975048973414dc172173 -> refs/replace/a3fb2e1845a1aaf129b7975048973414dc172173
+a3fb2e1845a1aaf129b7975048973414dc172173 hello: 2 more lines
+Author: O Thor <author@example.com>
+ok 15 - fetch branch with replacement
+
+expecting success of 6050.16 'bisect and replacements': 
+	git bisect start $HASH7 $HASH1 &&
+	test "$PARA3" = "$(git rev-parse --verify HEAD)" &&
+	git bisect reset &&
+	GIT_NO_REPLACE_OBJECTS=1 git bisect start $HASH7 $HASH1 &&
+	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
+	git bisect reset &&
+	git --no-replace-objects bisect start $HASH7 $HASH1 &&
+	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
+	git bisect reset
+
+Bisecting: 2 revisions left to test after this (roughly 1 step)
+[a3fb2e1845a1aaf129b7975048973414dc172173] hello: 2 more lines
+Previous HEAD position was a3fb2e1 hello: 2 more lines
+Switched to branch 'main'
+Bisecting: 2 revisions left to test after this (roughly 2 steps)
+[40237c8b8add42b8ca9d277edebf9dd36b4edbd8] hello: 1 more line
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  40237c8 hello: 1 more line
+  8fc2a8e hello: 2 more lines
+
+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> 40237c8
+
+Switched to branch 'main'
+Bisecting: 2 revisions left to test after this (roughly 2 steps)
+[40237c8b8add42b8ca9d277edebf9dd36b4edbd8] hello: 1 more line
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  40237c8 hello: 1 more line
+  8fc2a8e hello: 2 more lines
+
+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> 40237c8
+
+Switched to branch 'main'
+ok 16 - bisect and replacements
+
+expecting success of 6050.17 'index-pack and replacements': 
+	git --no-replace-objects rev-list --objects HEAD >actual &&
+	git --no-replace-objects pack-objects test- <actual &&
+	git index-pack test-*.pack
+
+d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7
+d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7
+ok 17 - index-pack and replacements
+
+expecting success of 6050.18 'not just commits': 
+	echo replaced >file &&
+	git add file &&
+	REPLACED=$(git rev-parse :file) &&
+	mv file file.replaced &&
+
+	echo original >file &&
+	git add file &&
+	ORIGINAL=$(git rev-parse :file) &&
+	git update-ref refs/replace/$ORIGINAL $REPLACED &&
+	mv file file.original &&
+
+	git checkout file &&
+	test_cmp file.replaced file
+
+Updated 1 path from the index
+ok 18 - not just commits
+
+expecting success of 6050.19 'replaced and replacement objects must be of the same type': 
+	test_must_fail git replace mytag $HASH1 &&
+	test_must_fail git replace HEAD^{tree} HEAD~1 &&
+	BLOB=$(git rev-parse :file) &&
+	test_must_fail git replace HEAD^ $BLOB
+
+error: Objects must be of the same type.
+'mytag' points to a replaced object of type 'tag'
+while '00ad688edb1a79423184992de45a5f0322c8bdf5' points to a replacement object of type 'commit'.
+error: Objects must be of the same type.
+'HEAD^{tree}' points to a replaced object of type 'tree'
+while 'HEAD~1' points to a replacement object of type 'commit'.
+error: Objects must be of the same type.
+'HEAD^' points to a replaced object of type 'commit'
+while '4b48deed3a433909bfd6b6ab3d4b91348b6af464' points to a replacement object of type 'blob'.
+ok 19 - replaced and replacement objects must be of the same type
+
+expecting success of 6050.20 '-f option bypasses the type check': 
+	git replace -f mytag $HASH1 &&
+	git replace --force HEAD^{tree} HEAD~1 &&
+	git replace -f HEAD^ $BLOB
+
+ok 20 - -f option bypasses the type check
+
+expecting success of 6050.21 'git cat-file --batch works on replace objects': 
+	git replace >actual &&
+	test_grep $PARA3 actual &&
+	echo $PARA3 | git cat-file --batch
+
+a3fb2e1845a1aaf129b7975048973414dc172173
+a3fb2e1845a1aaf129b7975048973414dc172173 commit 229
+tree 2b0c71265a7705e0c171a5530d9ed18d5e1c31a6
+parent af6d994c7106b0846fb80f09fa5bcbc460432c6d
+author O Thor <author@example.com> 1112912113 -0700
+committer C O Mitter <committer@example.com> 1112912353 -0700
+
+hello: 2 more lines
+
+ok 21 - git cat-file --batch works on replace objects
+
+expecting success of 6050.22 'test --format bogus': 
+	test_must_fail git replace --format bogus >/dev/null 2>&1
+
+ok 22 - test --format bogus
+
+expecting success of 6050.23 'test --format short': 
+	git replace --format=short >actual &&
+	git replace >expected &&
+	test_cmp expected actual
+
+ok 23 - test --format short
+
+expecting success of 6050.24 'test --format medium': 
+	H1=$(git --no-replace-objects rev-parse HEAD~1) &&
+	HT=$(git --no-replace-objects rev-parse HEAD^{tree}) &&
+	MYTAG=$(git --no-replace-objects rev-parse mytag) &&
+	{
+		echo "$H1 -> $BLOB" &&
+		echo "$BLOB -> $REPLACED" &&
+		echo "$HT -> $H1" &&
+		echo "$PARA3 -> $S" &&
+		echo "$MYTAG -> $HASH1"
+	} | sort >expected &&
+	git replace -l --format medium >output &&
+	sort output >actual &&
+	test_cmp expected actual
+
+ok 24 - test --format medium
+
+expecting success of 6050.25 'test --format long': 
+	{
+		echo "$H1 (commit) -> $BLOB (blob)" &&
+		echo "$BLOB (blob) -> $REPLACED (blob)" &&
+		echo "$HT (tree) -> $H1 (commit)" &&
+		echo "$PARA3 (commit) -> $S (commit)" &&
+		echo "$MYTAG (tag) -> $HASH1 (commit)"
+	} | sort >expected &&
+	git replace --format=long >output &&
+	sort output >actual &&
+	test_cmp expected actual
+
+ok 25 - test --format long
+
+expecting success of 6050.26 'setup fake editors': 
+	write_script fakeeditor <<-\EOF &&
+		sed -e "s/A U Thor/A fake Thor/" "$1" >"$1.new"
+		mv "$1.new" "$1"
+	EOF
+	write_script failingfakeeditor <<-\EOF
+		./fakeeditor "$@"
+		false
+	EOF
+
+ok 26 - setup fake editors
+
+expecting success of 6050.27 '--edit with and without already replaced object': 
+	test_must_fail env GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
+	GIT_EDITOR=./fakeeditor git replace --force --edit "$PARA3" &&
+	git replace -l >actual &&
+	test_grep "$PARA3" actual &&
+	git cat-file commit "$PARA3" >actual &&
+	test_grep "A fake Thor" actual &&
+	git replace -d "$PARA3" &&
+	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
+	git replace -l >actual &&
+	test_grep "$PARA3" actual &&
+	git cat-file commit "$PARA3" >actual &&
+	test_grep "A fake Thor" actual
+
+error: replace ref 'refs/replace/a3fb2e1845a1aaf129b7975048973414dc172173' already exists
+a3fb2e1845a1aaf129b7975048973414dc172173
+author A fake Thor <author@example.com> 1112912113 -0700
+Deleted replace ref 'a3fb2e1845a1aaf129b7975048973414dc172173'
+a3fb2e1845a1aaf129b7975048973414dc172173
+author A fake Thor <author@example.com> 1112912113 -0700
+ok 27 - --edit with and without already replaced object
+
+expecting success of 6050.28 '--edit and change nothing or command failed': 
+	git replace -d "$PARA3" &&
+	test_must_fail env GIT_EDITOR=true git replace --edit "$PARA3" &&
+	test_must_fail env GIT_EDITOR="./failingfakeeditor" git replace --edit "$PARA3" &&
+	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
+	git replace -l >actual &&
+	test_grep "$PARA3" actual &&
+	git cat-file commit "$PARA3" >actual &&
+	test_grep "A fake Thor" actual
+
+Deleted replace ref 'a3fb2e1845a1aaf129b7975048973414dc172173'
+error: new object is the same as the old one: 'a3fb2e1845a1aaf129b7975048973414dc172173'
+error: there was a problem with the editor './failingfakeeditor'
+error: editing object file failed
+a3fb2e1845a1aaf129b7975048973414dc172173
+author A fake Thor <author@example.com> 1112912113 -0700
+ok 28 - --edit and change nothing or command failed
+
+expecting success of 6050.29 'replace ref cleanup': 
+	test -n "$(git replace)" &&
+	git replace -d $(git replace) &&
+	test -z "$(git replace)"
+
+Deleted replace ref '14ac020163ea60a9d683ce68e36c946f31ecc856'
+Deleted replace ref '4b48deed3a433909bfd6b6ab3d4b91348b6af464'
+Deleted replace ref '5c37393794868bc8e708cccd7c9d9aaa7a5e53cb'
+Deleted replace ref 'a3fb2e1845a1aaf129b7975048973414dc172173'
+Deleted replace ref 'e25dc7954f0832d962347872884aab2dffb426c5'
+ok 29 - replace ref cleanup
+
+expecting success of 6050.30 '--graft with and without already replaced object': 
+	git log --oneline >log &&
+	test_line_count = 7 log &&
+	git replace --graft $HASH5 &&
+	git log --oneline >log &&
+	test_line_count = 3 log &&
+	commit_has_parents $HASH5 &&
+	test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 &&
+	git replace --force -g $HASH5 $HASH4 $HASH3 &&
+	commit_has_parents $HASH5 $HASH4 $HASH3 &&
+	git replace -d $HASH5
+
+fatal: Needed a single revision
+error: replace ref 'refs/replace/093e41a79d4a8bfe3c758a96c95e5bf9e35ed89c' already exists
+fatal: Needed a single revision
+Deleted replace ref '093e41a79d4a8bfe3c758a96c95e5bf9e35ed89c'
+ok 30 - --graft with and without already replaced object
+
+expecting success of 6050.31 '--graft using a tag as the new parent': 
+	git tag new_parent $HASH5 &&
+	git replace --graft $HASH7 new_parent &&
+	commit_has_parents $HASH7 $HASH5 &&
+	git replace -d $HASH7 &&
+	git tag -a -m "annotated new parent tag" annotated_new_parent $HASH5 &&
+	git replace --graft $HASH7 annotated_new_parent &&
+	commit_has_parents $HASH7 $HASH5 &&
+	git replace -d $HASH7
+
+fatal: Needed a single revision
+Deleted replace ref 'ffccc9d552388844dbe94a361c07e7cb1731e12f'
+fatal: Needed a single revision
+Deleted replace ref 'ffccc9d552388844dbe94a361c07e7cb1731e12f'
+ok 31 - --graft using a tag as the new parent
+
+expecting success of 6050.32 '--graft using a tag as the replaced object': 
+	git tag replaced_object $HASH7 &&
+	git replace --graft replaced_object $HASH5 &&
+	commit_has_parents $HASH7 $HASH5 &&
+	git replace -d $HASH7 &&
+	git tag -a -m "annotated replaced object tag" annotated_replaced_object $HASH7 &&
+	git replace --graft annotated_replaced_object $HASH5 &&
+	commit_has_parents $HASH7 $HASH5 &&
+	git replace -d $HASH7
+
+fatal: Needed a single revision
+Deleted replace ref 'ffccc9d552388844dbe94a361c07e7cb1731e12f'
+fatal: Needed a single revision
+Deleted replace ref 'ffccc9d552388844dbe94a361c07e7cb1731e12f'
+ok 32 - --graft using a tag as the replaced object
+
+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 33 # skip set up a signed commit (missing GPG)
+
+ok 34 # skip --graft with a signed commit (missing GPG)
+
+ok 35 # skip set up a merge commit with a mergetag (missing GPG)
+
+ok 36 # skip --graft on a commit with a mergetag (missing GPG)
+
+expecting success of 6050.37 '--convert-graft-file': 
+	git checkout -b with-graft-file &&
+	test_commit root2 &&
+	git reset --hard root2^ &&
+	test_commit root1 &&
+	test_commit after-root1 &&
+	test_tick &&
+	git merge -m merge-root2 root2 &&
+
+	: add and convert graft file &&
+	printf "%s\n%s %s\n\n# comment\n%s\n" \
+		$(git rev-parse HEAD^^ HEAD^ HEAD^^ HEAD^2) \
+		>.git/info/grafts &&
+	git status 2>stderr &&
+	test_grep "hint:.*grafts is deprecated" stderr &&
+	git replace --convert-graft-file 2>stderr &&
+	test_grep ! "hint:.*grafts is deprecated" stderr &&
+	test_path_is_missing .git/info/grafts &&
+
+	: verify that the history is now "grafted" &&
+	git rev-list HEAD >out &&
+	test_line_count = 4 out &&
+
+	: create invalid graft file and verify that it is not deleted &&
+	test_when_finished "rm -f .git/info/grafts" &&
+	echo $EMPTY_BLOB $EMPTY_TREE >.git/info/grafts &&
+	test_must_fail git replace --convert-graft-file 2>err &&
+	test_grep "$EMPTY_BLOB $EMPTY_TREE" err &&
+	test_grep "$EMPTY_BLOB $EMPTY_TREE" .git/info/grafts
+
+Switched to a new branch 'with-graft-file'
+[with-graft-file 614a70e] root2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file
+ create mode 100644 root2.t
+HEAD is now at ffccc9d hello: again 3 more lines
+[with-graft-file bf41581] root1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 root1.t
+[with-graft-file f85c1b2] after-root1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 after-root1.t
+Merge made by the 'ort' strategy.
+ file    | 1 +
+ root2.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file
+ create mode 100644 root2.t
+On branch with-graft-file
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	clone_dir/
+	err
+	expected
+	failingfakeeditor
+	fakeeditor
+	file.original
+	file.replaced
+	fsck_main.out
+	log
+	output
+	payload
+	stderr
+	tag.sig
+	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.idx
+	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.pack
+	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.rev
+
+nothing added to commit but untracked files present (use "git add" to track)
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+	e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+ok 37 - --convert-graft-file
+
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6101-rev-parse-parents.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6101-rev-parse-parents/.git/
 expecting success of 6101.1 'setup': 
@@ -412787,1047 +414756,6 @@
 1..38
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6133-pathspec-rev-dwim.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6050-replace.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6050-replace/.git/
-expecting success of 6050.1 'set up buggy branch': 
-	echo "line 1" >>hello &&
-	echo "line 2" >>hello &&
-	echo "line 3" >>hello &&
-	echo "line 4" >>hello &&
-	add_and_commit_file hello "4 lines" &&
-	HASH1=$(git rev-parse --verify HEAD) &&
-	echo "line BUG" >>hello &&
-	echo "line 6" >>hello &&
-	echo "line 7" >>hello &&
-	echo "line 8" >>hello &&
-	add_and_commit_file hello "4 more lines with a BUG" &&
-	HASH2=$(git rev-parse --verify HEAD) &&
-	echo "line 9" >>hello &&
-	echo "line 10" >>hello &&
-	add_and_commit_file hello "2 more lines" &&
-	HASH3=$(git rev-parse --verify HEAD) &&
-	echo "line 11" >>hello &&
-	add_and_commit_file hello "1 more line" &&
-	HASH4=$(git rev-parse --verify HEAD) &&
-	sed -e "s/BUG/5/" hello >hello.new &&
-	mv hello.new hello &&
-	add_and_commit_file hello "BUG fixed" &&
-	HASH5=$(git rev-parse --verify HEAD) &&
-	echo "line 12" >>hello &&
-	echo "line 13" >>hello &&
-	add_and_commit_file hello "2 more lines" &&
-	HASH6=$(git rev-parse --verify HEAD) &&
-	echo "line 14" >>hello &&
-	echo "line 15" >>hello &&
-	echo "line 16" >>hello &&
-	add_and_commit_file hello "again 3 more lines" &&
-	HASH7=$(git rev-parse --verify HEAD)
-
-ok 1 - set up buggy branch
-
-expecting success of 6050.2 'replace the author': 
-	git cat-file commit $HASH2 >actual &&
-	test_grep "author A U Thor" actual &&
-	R=$(sed -e "s/A U/O/" actual | git hash-object -t commit --stdin -w) &&
-	git cat-file commit $R >actual &&
-	test_grep "author O Thor" actual &&
-	git update-ref refs/replace/$HASH2 $R &&
-	git show HEAD~5 >actual &&
-	test_grep "O Thor" actual &&
-	git show $HASH2 >actual &&
-	test_grep "O Thor" actual
-
-author A U Thor <author@example.com> 1112912053 -0700
-author O Thor <author@example.com> 1112912053 -0700
-Author: O Thor <author@example.com>
-Author: O Thor <author@example.com>
-ok 2 - replace the author
-
-expecting success of 6050.3 'test --no-replace-objects option': 
-	git cat-file commit $HASH2 >actual &&
-	test_grep "author O Thor" actual &&
-	git --no-replace-objects cat-file commit $HASH2 >actual &&
-	test_grep "author A U Thor" actual &&
-	git show $HASH2 >actual &&
-	test_grep "O Thor" actual &&
-	git --no-replace-objects show $HASH2 >actual &&
-	test_grep "A U Thor" actual
-
-author O Thor <author@example.com> 1112912053 -0700
-author A U Thor <author@example.com> 1112912053 -0700
-Author: O Thor <author@example.com>
-Author: A U Thor <author@example.com>
-ok 3 - test --no-replace-objects option
-
-expecting success of 6050.4 'test GIT_NO_REPLACE_OBJECTS env variable': 
-	GIT_NO_REPLACE_OBJECTS=1 git cat-file commit $HASH2 >actual &&
-	test_grep "author A U Thor" actual &&
-	GIT_NO_REPLACE_OBJECTS=1 git show $HASH2 >actual &&
-	test_grep "A U Thor" actual
-
-author A U Thor <author@example.com> 1112912053 -0700
-Author: A U Thor <author@example.com>
-ok 4 - test GIT_NO_REPLACE_OBJECTS env variable
-
-expecting success of 6050.5 'test core.usereplacerefs config option': 
-	test_config core.usereplacerefs false &&
-	git cat-file commit $HASH2 >actual &&
-	test_grep "author A U Thor" actual &&
-	git show $HASH2 >actual &&
-	test_grep "A U Thor" actual
-
-author A U Thor <author@example.com> 1112912053 -0700
-Author: A U Thor <author@example.com>
-ok 5 - test core.usereplacerefs config option
-
-expecting success of 6050.6 'tag replaced commit': 
-	git update-ref refs/tags/mytag $(git mktag <tag.sig)
-
-ok 6 - tag replaced commit
-
-expecting success of 6050.7 '"git fsck" works': 
-	git fsck main >fsck_main.out &&
-	test_grep "dangling commit $R" fsck_main.out &&
-	test_grep "dangling tag $(git show-ref -s refs/tags/mytag)" fsck_main.out &&
-	test -z "$(git fsck)"
-
-dangling commit c06ac9b8cd2f38349af40ec00e5d5c761b3bf513
-dangling tag e25dc7954f0832d962347872884aab2dffb426c5
-ok 7 - "git fsck" works
-
-expecting success of 6050.8 'repack, clone and fetch work': 
-	git repack -a -d &&
-	git clone --no-hardlinks . clone_dir &&
-	(
-		cd clone_dir &&
-		git show HEAD~5 >actual &&
-		test_grep "A U Thor" actual &&
-		git show $HASH2 >actual &&
-		test_grep "A U Thor" actual &&
-		git cat-file commit $R &&
-		git repack -a -d &&
-		test_must_fail git cat-file commit $R &&
-		git fetch ../ "refs/replace/*:refs/replace/*" &&
-		git show HEAD~5 >actual &&
-		test_grep "O Thor" actual &&
-		git show $HASH2 >actual &&
-		test_grep "O Thor" actual &&
-		git cat-file commit $R
-	)
-
-Cloning into 'clone_dir'...
-done.
-Author: A U Thor <author@example.com>
-Author: A U Thor <author@example.com>
-tree 242e3e36d5c0616fbf715682c322254dadb55168
-parent 00ad688edb1a79423184992de45a5f0322c8bdf5
-author O Thor <author@example.com> 1112912053 -0700
-committer C O Mitter <committer@example.com> 1112912053 -0700
-
-hello: 4 more lines with a BUG
-fatal: git cat-file c06ac9b8cd2f38349af40ec00e5d5c761b3bf513: bad file
-From ..
- * [new ref]         refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0 -> refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0
-Author: O Thor <author@example.com>
-Author: O Thor <author@example.com>
-tree 242e3e36d5c0616fbf715682c322254dadb55168
-parent 00ad688edb1a79423184992de45a5f0322c8bdf5
-author O Thor <author@example.com> 1112912053 -0700
-committer C O Mitter <committer@example.com> 1112912053 -0700
-
-hello: 4 more lines with a BUG
-ok 8 - repack, clone and fetch work
-
-expecting success of 6050.9 '"git replace" listing and deleting': 
-	test "$HASH2" = "$(git replace -l)" &&
-	test "$HASH2" = "$(git replace)" &&
-	aa=${HASH2%??????????????????????????????????????} &&
-	test "$HASH2" = "$(git replace --list "$aa*")" &&
-	test_must_fail git replace -d $R &&
-	test_must_fail git replace --delete &&
-	test_must_fail git replace -l -d $HASH2 &&
-	git replace -d $HASH2 &&
-	git show $HASH2 >actual &&
-	test_grep "A U Thor" actual &&
-	test -z "$(git replace -l)"
-
-error: replace ref 'c06ac9b8cd2f38349af40ec00e5d5c761b3bf513' not found
-fatal: -d needs at least one argument
-
-usage: git replace [-f] <object> <replacement>
-   or: git replace [-f] --edit <object>
-   or: git replace [-f] --graft <commit> [<parent>...]
-   or: git replace [-f] --convert-graft-file
-   or: git replace -d <object>...
-   or: git replace [--format=<format>] [-l [<pattern>]]
-
-    -l, --list            list replace refs
-    -d, --delete          delete replace refs
-    -e, --edit            edit existing object
-    -g, --graft           change a commit's parents
-    --convert-graft-file  convert existing graft file
-    -f, --[no-]force      replace the ref if it exists
-    --[no-]raw            do not pretty-print contents for --edit
-    --[no-]format <format>
-                          use this format
-
-error: options '-d' and '-l' cannot be used together
-Deleted replace ref '4217adb325b9db7bfc0c7b223183cc8546638cf0'
-Author: A U Thor <author@example.com>
-ok 9 - "git replace" listing and deleting
-
-expecting success of 6050.10 '"git replace" replacing': 
-	git replace $HASH2 $R &&
-	git show $HASH2 >actual &&
-	test_grep "O Thor" actual &&
-	test_must_fail git replace $HASH2 $R &&
-	git replace -f $HASH2 $R &&
-	test_must_fail git replace -f &&
-	test "$HASH2" = "$(git replace)"
-
-Author: O Thor <author@example.com>
-error: replace ref 'refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0' already exists
-fatal: -f only makes sense when writing a replacement
-
-usage: git replace [-f] <object> <replacement>
-   or: git replace [-f] --edit <object>
-   or: git replace [-f] --graft <commit> [<parent>...]
-   or: git replace [-f] --convert-graft-file
-   or: git replace -d <object>...
-   or: git replace [--format=<format>] [-l [<pattern>]]
-
-    -l, --list            list replace refs
-    -d, --delete          delete replace refs
-    -e, --edit            edit existing object
-    -g, --graft           change a commit's parents
-    --convert-graft-file  convert existing graft file
-    -f, --[no-]force      replace the ref if it exists
-    --[no-]raw            do not pretty-print contents for --edit
-    --[no-]format <format>
-                          use this format
-
-ok 10 - "git replace" replacing
-
-expecting success of 6050.11 '"git replace" resolves sha1': 
-	SHORTHASH2=$(git rev-parse --short=8 $HASH2) &&
-	git replace -d $SHORTHASH2 &&
-	git replace $SHORTHASH2 $R &&
-	git show $HASH2 >actual &&
-	test_grep "O Thor" actual &&
-	test_must_fail git replace $HASH2 $R &&
-	git replace -f $HASH2 $R &&
-	test_must_fail git replace --force &&
-	test "$HASH2" = "$(git replace)"
-
-Deleted replace ref '4217adb325b9db7bfc0c7b223183cc8546638cf0'
-Author: O Thor <author@example.com>
-error: replace ref 'refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0' already exists
-fatal: -f only makes sense when writing a replacement
-
-usage: git replace [-f] <object> <replacement>
-   or: git replace [-f] --edit <object>
-   or: git replace [-f] --graft <commit> [<parent>...]
-   or: git replace [-f] --convert-graft-file
-   or: git replace -d <object>...
-   or: git replace [--format=<format>] [-l [<pattern>]]
-
-    -l, --list            list replace refs
-    -d, --delete          delete replace refs
-    -e, --edit            edit existing object
-    -g, --graft           change a commit's parents
-    --convert-graft-file  convert existing graft file
-    -f, --[no-]force      replace the ref if it exists
-    --[no-]raw            do not pretty-print contents for --edit
-    --[no-]format <format>
-                          use this format
-
-ok 11 - "git replace" resolves sha1
-
-expecting success of 6050.12 'create parallel branch without the bug': 
-	git replace -d $HASH2 &&
-	git show $HASH2 >actual &&
-	test_grep "A U Thor" actual &&
-	git checkout $HASH1 &&
-	git cherry-pick $HASH2 &&
-	git show $HASH5 >actual &&
-	git apply actual &&
-	git commit --amend -m "hello: 4 more lines WITHOUT the bug" hello &&
-	PARA2=$(git rev-parse --verify HEAD) &&
-	git cherry-pick $HASH3 &&
-	PARA3=$(git rev-parse --verify HEAD) &&
-	git cherry-pick $HASH4 &&
-	PARA4=$(git rev-parse --verify HEAD) &&
-	git cherry-pick $HASH6 &&
-	PARA6=$(git rev-parse --verify HEAD) &&
-	git replace $HASH6 $PARA6 &&
-	git checkout main &&
-	cur=$(git rev-parse --verify HEAD) &&
-	test "$cur" = "$HASH7" &&
-	git log --pretty=oneline >actual &&
-	test_grep $PARA2 actual &&
-	git remote add cloned ./clone_dir
-
-Deleted replace ref '4217adb325b9db7bfc0c7b223183cc8546638cf0'
-Author: A U Thor <author@example.com>
-Note: switching to '00ad688edb1a79423184992de45a5f0322c8bdf5'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 00ad688 hello: 4 lines
-[detached HEAD dcda230] hello: 4 more lines with a BUG
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 4 insertions(+)
-[detached HEAD af6d994] hello: 4 more lines WITHOUT the bug
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 4 insertions(+)
-Auto-merging hello
-[detached HEAD a3fb2e1] hello: 2 more lines
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Auto-merging hello
-[detached HEAD f486255] hello: 1 more line
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
-[detached HEAD 911408d] hello: 2 more lines
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Previous HEAD position was 911408d hello: 2 more lines
-Switched to branch 'main'
-af6d994c7106b0846fb80f09fa5bcbc460432c6d hello: 4 more lines WITHOUT the bug
-ok 12 - create parallel branch without the bug
-
-expecting success of 6050.13 'push to cloned repo': 
-	git push cloned $HASH6^:refs/heads/parallel &&
-	(
-		cd clone_dir &&
-		git checkout parallel &&
-		git log --pretty=oneline >actual &&
-		test_grep $PARA2 actual
-	)
-
-To ./clone_dir
- * [new branch]      14ac020163ea60a9d683ce68e36c946f31ecc856^ -> parallel
-Switched to branch 'parallel'
-af6d994c7106b0846fb80f09fa5bcbc460432c6d hello: 4 more lines WITHOUT the bug
-ok 13 - push to cloned repo
-
-expecting success of 6050.14 'push branch with replacement': 
-	git cat-file commit $PARA3 >actual &&
-	test_grep "author A U Thor" actual &&
-	S=$(sed -e "s/A U/O/" actual | git hash-object -t commit --stdin -w) &&
-	git cat-file commit $S >actual &&
-	test_grep "author O Thor" actual &&
-	git replace $PARA3 $S &&
-	git show $HASH6~2 >actual &&
-	test_grep "O Thor" actual &&
-	git show $PARA3 >actual &&
-	test_grep "O Thor" actual &&
-	git push cloned $HASH6^:refs/heads/parallel2 &&
-	(
-		cd clone_dir &&
-		git checkout parallel2 &&
-		git log --pretty=oneline >actual &&
-		test_grep $PARA3 actual &&
-		git show $PARA3 >actual &&
-		test_grep "A U Thor" actual
-	)
-
-author A U Thor <author@example.com> 1112912113 -0700
-author O Thor <author@example.com> 1112912113 -0700
-Author: O Thor <author@example.com>
-Author: O Thor <author@example.com>
-To ./clone_dir
- * [new branch]      14ac020163ea60a9d683ce68e36c946f31ecc856^ -> parallel2
-Switched to branch 'parallel2'
-a3fb2e1845a1aaf129b7975048973414dc172173 hello: 2 more lines
-Author: A U Thor <author@example.com>
-ok 14 - push branch with replacement
-
-expecting success of 6050.15 'fetch branch with replacement': 
-	git branch tofetch $HASH6 &&
-	(
-		cd clone_dir &&
-		git fetch origin refs/heads/tofetch:refs/heads/parallel3 &&
-		git log --pretty=oneline parallel3 >output.txt &&
-		test_grep ! $PARA3 output.txt &&
-		git show $PARA3 >para3.txt &&
-		test_grep "A U Thor" para3.txt &&
-		git fetch origin "refs/replace/*:refs/replace/*" &&
-		git log --pretty=oneline parallel3 >output.txt &&
-		test_grep $PARA3 output.txt &&
-		git show $PARA3 >para3.txt &&
-		test_grep "O Thor" para3.txt
-	)
-
-From /build/reproducible-path/git-2.51.0/t/trash directory.t6050-replace/.
- * [new branch]      tofetch    -> parallel3
- * [new branch]      tofetch    -> origin/tofetch
-Author: A U Thor <author@example.com>
-From /build/reproducible-path/git-2.51.0/t/trash directory.t6050-replace/.
- * [new ref]         refs/replace/14ac020163ea60a9d683ce68e36c946f31ecc856 -> refs/replace/14ac020163ea60a9d683ce68e36c946f31ecc856
- * [new ref]         refs/replace/a3fb2e1845a1aaf129b7975048973414dc172173 -> refs/replace/a3fb2e1845a1aaf129b7975048973414dc172173
-a3fb2e1845a1aaf129b7975048973414dc172173 hello: 2 more lines
-Author: O Thor <author@example.com>
-ok 15 - fetch branch with replacement
-
-expecting success of 6050.16 'bisect and replacements': 
-	git bisect start $HASH7 $HASH1 &&
-	test "$PARA3" = "$(git rev-parse --verify HEAD)" &&
-	git bisect reset &&
-	GIT_NO_REPLACE_OBJECTS=1 git bisect start $HASH7 $HASH1 &&
-	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
-	git bisect reset &&
-	git --no-replace-objects bisect start $HASH7 $HASH1 &&
-	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
-	git bisect reset
-
-Bisecting: 2 revisions left to test after this (roughly 1 step)
-[a3fb2e1845a1aaf129b7975048973414dc172173] hello: 2 more lines
-Previous HEAD position was a3fb2e1 hello: 2 more lines
-Switched to branch 'main'
-Bisecting: 2 revisions left to test after this (roughly 2 steps)
-[40237c8b8add42b8ca9d277edebf9dd36b4edbd8] hello: 1 more line
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  40237c8 hello: 1 more line
-  8fc2a8e hello: 2 more lines
-
-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> 40237c8
-
-Switched to branch 'main'
-Bisecting: 2 revisions left to test after this (roughly 2 steps)
-[40237c8b8add42b8ca9d277edebf9dd36b4edbd8] hello: 1 more line
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  40237c8 hello: 1 more line
-  8fc2a8e hello: 2 more lines
-
-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> 40237c8
-
-Switched to branch 'main'
-ok 16 - bisect and replacements
-
-expecting success of 6050.17 'index-pack and replacements': 
-	git --no-replace-objects rev-list --objects HEAD >actual &&
-	git --no-replace-objects pack-objects test- <actual &&
-	git index-pack test-*.pack
-
-d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7
-d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7
-ok 17 - index-pack and replacements
-
-expecting success of 6050.18 'not just commits': 
-	echo replaced >file &&
-	git add file &&
-	REPLACED=$(git rev-parse :file) &&
-	mv file file.replaced &&
-
-	echo original >file &&
-	git add file &&
-	ORIGINAL=$(git rev-parse :file) &&
-	git update-ref refs/replace/$ORIGINAL $REPLACED &&
-	mv file file.original &&
-
-	git checkout file &&
-	test_cmp file.replaced file
-
-Updated 1 path from the index
-ok 18 - not just commits
-
-expecting success of 6050.19 'replaced and replacement objects must be of the same type': 
-	test_must_fail git replace mytag $HASH1 &&
-	test_must_fail git replace HEAD^{tree} HEAD~1 &&
-	BLOB=$(git rev-parse :file) &&
-	test_must_fail git replace HEAD^ $BLOB
-
-error: Objects must be of the same type.
-'mytag' points to a replaced object of type 'tag'
-while '00ad688edb1a79423184992de45a5f0322c8bdf5' points to a replacement object of type 'commit'.
-error: Objects must be of the same type.
-'HEAD^{tree}' points to a replaced object of type 'tree'
-while 'HEAD~1' points to a replacement object of type 'commit'.
-error: Objects must be of the same type.
-'HEAD^' points to a replaced object of type 'commit'
-while '4b48deed3a433909bfd6b6ab3d4b91348b6af464' points to a replacement object of type 'blob'.
-ok 19 - replaced and replacement objects must be of the same type
-
-expecting success of 6050.20 '-f option bypasses the type check': 
-	git replace -f mytag $HASH1 &&
-	git replace --force HEAD^{tree} HEAD~1 &&
-	git replace -f HEAD^ $BLOB
-
-ok 20 - -f option bypasses the type check
-
-expecting success of 6050.21 'git cat-file --batch works on replace objects': 
-	git replace >actual &&
-	test_grep $PARA3 actual &&
-	echo $PARA3 | git cat-file --batch
-
-a3fb2e1845a1aaf129b7975048973414dc172173
-a3fb2e1845a1aaf129b7975048973414dc172173 commit 229
-tree 2b0c71265a7705e0c171a5530d9ed18d5e1c31a6
-parent af6d994c7106b0846fb80f09fa5bcbc460432c6d
-author O Thor <author@example.com> 1112912113 -0700
-committer C O Mitter <committer@example.com> 1112912353 -0700
-
-hello: 2 more lines
-
-ok 21 - git cat-file --batch works on replace objects
-
-expecting success of 6050.22 'test --format bogus': 
-	test_must_fail git replace --format bogus >/dev/null 2>&1
-
-ok 22 - test --format bogus
-
-expecting success of 6050.23 'test --format short': 
-	git replace --format=short >actual &&
-	git replace >expected &&
-	test_cmp expected actual
-
-ok 23 - test --format short
-
-expecting success of 6050.24 'test --format medium': 
-	H1=$(git --no-replace-objects rev-parse HEAD~1) &&
-	HT=$(git --no-replace-objects rev-parse HEAD^{tree}) &&
-	MYTAG=$(git --no-replace-objects rev-parse mytag) &&
-	{
-		echo "$H1 -> $BLOB" &&
-		echo "$BLOB -> $REPLACED" &&
-		echo "$HT -> $H1" &&
-		echo "$PARA3 -> $S" &&
-		echo "$MYTAG -> $HASH1"
-	} | sort >expected &&
-	git replace -l --format medium >output &&
-	sort output >actual &&
-	test_cmp expected actual
-
-ok 24 - test --format medium
-
-expecting success of 6050.25 'test --format long': 
-	{
-		echo "$H1 (commit) -> $BLOB (blob)" &&
-		echo "$BLOB (blob) -> $REPLACED (blob)" &&
-		echo "$HT (tree) -> $H1 (commit)" &&
-		echo "$PARA3 (commit) -> $S (commit)" &&
-		echo "$MYTAG (tag) -> $HASH1 (commit)"
-	} | sort >expected &&
-	git replace --format=long >output &&
-	sort output >actual &&
-	test_cmp expected actual
-
-ok 25 - test --format long
-
-expecting success of 6050.26 'setup fake editors': 
-	write_script fakeeditor <<-\EOF &&
-		sed -e "s/A U Thor/A fake Thor/" "$1" >"$1.new"
-		mv "$1.new" "$1"
-	EOF
-	write_script failingfakeeditor <<-\EOF
-		./fakeeditor "$@"
-		false
-	EOF
-
-ok 26 - setup fake editors
-
-expecting success of 6050.27 '--edit with and without already replaced object': 
-	test_must_fail env GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
-	GIT_EDITOR=./fakeeditor git replace --force --edit "$PARA3" &&
-	git replace -l >actual &&
-	test_grep "$PARA3" actual &&
-	git cat-file commit "$PARA3" >actual &&
-	test_grep "A fake Thor" actual &&
-	git replace -d "$PARA3" &&
-	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
-	git replace -l >actual &&
-	test_grep "$PARA3" actual &&
-	git cat-file commit "$PARA3" >actual &&
-	test_grep "A fake Thor" actual
-
-error: replace ref 'refs/replace/a3fb2e1845a1aaf129b7975048973414dc172173' already exists
-a3fb2e1845a1aaf129b7975048973414dc172173
-author A fake Thor <author@example.com> 1112912113 -0700
-Deleted replace ref 'a3fb2e1845a1aaf129b7975048973414dc172173'
-a3fb2e1845a1aaf129b7975048973414dc172173
-author A fake Thor <author@example.com> 1112912113 -0700
-ok 27 - --edit with and without already replaced object
-
-expecting success of 6050.28 '--edit and change nothing or command failed': 
-	git replace -d "$PARA3" &&
-	test_must_fail env GIT_EDITOR=true git replace --edit "$PARA3" &&
-	test_must_fail env GIT_EDITOR="./failingfakeeditor" git replace --edit "$PARA3" &&
-	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
-	git replace -l >actual &&
-	test_grep "$PARA3" actual &&
-	git cat-file commit "$PARA3" >actual &&
-	test_grep "A fake Thor" actual
-
-Deleted replace ref 'a3fb2e1845a1aaf129b7975048973414dc172173'
-error: new object is the same as the old one: 'a3fb2e1845a1aaf129b7975048973414dc172173'
-error: there was a problem with the editor './failingfakeeditor'
-error: editing object file failed
-a3fb2e1845a1aaf129b7975048973414dc172173
-author A fake Thor <author@example.com> 1112912113 -0700
-ok 28 - --edit and change nothing or command failed
-
-expecting success of 6050.29 'replace ref cleanup': 
-	test -n "$(git replace)" &&
-	git replace -d $(git replace) &&
-	test -z "$(git replace)"
-
-Deleted replace ref '14ac020163ea60a9d683ce68e36c946f31ecc856'
-Deleted replace ref '4b48deed3a433909bfd6b6ab3d4b91348b6af464'
-Deleted replace ref '5c37393794868bc8e708cccd7c9d9aaa7a5e53cb'
-Deleted replace ref 'a3fb2e1845a1aaf129b7975048973414dc172173'
-Deleted replace ref 'e25dc7954f0832d962347872884aab2dffb426c5'
-ok 29 - replace ref cleanup
-
-expecting success of 6050.30 '--graft with and without already replaced object': 
-	git log --oneline >log &&
-	test_line_count = 7 log &&
-	git replace --graft $HASH5 &&
-	git log --oneline >log &&
-	test_line_count = 3 log &&
-	commit_has_parents $HASH5 &&
-	test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 &&
-	git replace --force -g $HASH5 $HASH4 $HASH3 &&
-	commit_has_parents $HASH5 $HASH4 $HASH3 &&
-	git replace -d $HASH5
-
-fatal: Needed a single revision
-error: replace ref 'refs/replace/093e41a79d4a8bfe3c758a96c95e5bf9e35ed89c' already exists
-fatal: Needed a single revision
-Deleted replace ref '093e41a79d4a8bfe3c758a96c95e5bf9e35ed89c'
-ok 30 - --graft with and without already replaced object
-
-expecting success of 6050.31 '--graft using a tag as the new parent': 
-	git tag new_parent $HASH5 &&
-	git replace --graft $HASH7 new_parent &&
-	commit_has_parents $HASH7 $HASH5 &&
-	git replace -d $HASH7 &&
-	git tag -a -m "annotated new parent tag" annotated_new_parent $HASH5 &&
-	git replace --graft $HASH7 annotated_new_parent &&
-	commit_has_parents $HASH7 $HASH5 &&
-	git replace -d $HASH7
-
-fatal: Needed a single revision
-Deleted replace ref 'ffccc9d552388844dbe94a361c07e7cb1731e12f'
-fatal: Needed a single revision
-Deleted replace ref 'ffccc9d552388844dbe94a361c07e7cb1731e12f'
-ok 31 - --graft using a tag as the new parent
-
-expecting success of 6050.32 '--graft using a tag as the replaced object': 
-	git tag replaced_object $HASH7 &&
-	git replace --graft replaced_object $HASH5 &&
-	commit_has_parents $HASH7 $HASH5 &&
-	git replace -d $HASH7 &&
-	git tag -a -m "annotated replaced object tag" annotated_replaced_object $HASH7 &&
-	git replace --graft annotated_replaced_object $HASH5 &&
-	commit_has_parents $HASH7 $HASH5 &&
-	git replace -d $HASH7
-
-fatal: Needed a single revision
-Deleted replace ref 'ffccc9d552388844dbe94a361c07e7cb1731e12f'
-fatal: Needed a single revision
-Deleted replace ref 'ffccc9d552388844dbe94a361c07e7cb1731e12f'
-ok 32 - --graft using a tag as the replaced object
-
-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 33 # skip set up a signed commit (missing GPG)
-
-ok 34 # skip --graft with a signed commit (missing GPG)
-
-ok 35 # skip set up a merge commit with a mergetag (missing GPG)
-
-ok 36 # skip --graft on a commit with a mergetag (missing GPG)
-
-expecting success of 6050.37 '--convert-graft-file': 
-	git checkout -b with-graft-file &&
-	test_commit root2 &&
-	git reset --hard root2^ &&
-	test_commit root1 &&
-	test_commit after-root1 &&
-	test_tick &&
-	git merge -m merge-root2 root2 &&
-
-	: add and convert graft file &&
-	printf "%s\n%s %s\n\n# comment\n%s\n" \
-		$(git rev-parse HEAD^^ HEAD^ HEAD^^ HEAD^2) \
-		>.git/info/grafts &&
-	git status 2>stderr &&
-	test_grep "hint:.*grafts is deprecated" stderr &&
-	git replace --convert-graft-file 2>stderr &&
-	test_grep ! "hint:.*grafts is deprecated" stderr &&
-	test_path_is_missing .git/info/grafts &&
-
-	: verify that the history is now "grafted" &&
-	git rev-list HEAD >out &&
-	test_line_count = 4 out &&
-
-	: create invalid graft file and verify that it is not deleted &&
-	test_when_finished "rm -f .git/info/grafts" &&
-	echo $EMPTY_BLOB $EMPTY_TREE >.git/info/grafts &&
-	test_must_fail git replace --convert-graft-file 2>err &&
-	test_grep "$EMPTY_BLOB $EMPTY_TREE" err &&
-	test_grep "$EMPTY_BLOB $EMPTY_TREE" .git/info/grafts
-
-Switched to a new branch 'with-graft-file'
-[with-graft-file 614a70e] root2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file
- create mode 100644 root2.t
-HEAD is now at ffccc9d hello: again 3 more lines
-[with-graft-file bf41581] root1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 root1.t
-[with-graft-file f85c1b2] after-root1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 after-root1.t
-Merge made by the 'ort' strategy.
- file    | 1 +
- root2.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 file
- create mode 100644 root2.t
-On branch with-graft-file
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	clone_dir/
-	err
-	expected
-	failingfakeeditor
-	fakeeditor
-	file.original
-	file.replaced
-	fsck_main.out
-	log
-	output
-	payload
-	stderr
-	tag.sig
-	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.idx
-	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.pack
-	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.rev
-
-nothing added to commit but untracked files present (use "git add" to track)
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-	e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 37 - --convert-graft-file
-
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6131-pathspec-icase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6131-pathspec-icase/.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
-expecting success of 6131.1 'create commits with glob characters': 
-	test_commit bar bar &&
-	test_commit bAr bAr &&
-	test_commit BAR BAR &&
-	mkdir foo &&
-	test_commit foo/bar foo/bar &&
-	test_commit foo/bAr foo/bAr &&
-	test_commit foo/BAR foo/BAR &&
-	mkdir fOo &&
-	test_commit fOo/bar fOo/bar &&
-	test_commit fOo/bAr fOo/bAr &&
-	test_commit fOo/BAR fOo/BAR &&
-	mkdir FOO &&
-	test_commit FOO/bar FOO/bar &&
-	test_commit FOO/bAr FOO/bAr &&
-	test_commit FOO/BAR FOO/BAR
-
-[master (root-commit) b257e7a] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[master 09d2e74] bAr
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bAr
-[master ae27bbe] BAR
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 BAR
-[master 016d22a] foo/bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar
-[master f3c37ed] foo/bAr
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bAr
-[master 98eb41e] foo/BAR
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/BAR
-[master edcb5cb] fOo/bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fOo/bar
-[master ed5b100] fOo/bAr
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fOo/bAr
-[master 2f49636] fOo/BAR
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fOo/BAR
-[master c65ab92] FOO/bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 FOO/bar
-[master cd48380] FOO/bAr
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 FOO/bAr
-[master 4e818f3] FOO/BAR
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 FOO/BAR
-ok 1 - create commits with glob characters
-
-expecting success of 6131.2 'tree_entry_interesting matches bar': 
-	echo bar >expect &&
-	git log --format=%s -- "bar" >actual &&
-	test_cmp expect actual
-
-ok 2 - tree_entry_interesting matches bar
-
-expecting success of 6131.3 'tree_entry_interesting matches :(icase)bar': 
-	cat <<-EOF >expect &&
-	BAR
-	bAr
-	bar
-	EOF
-	git log --format=%s -- ":(icase)bar" >actual &&
-	test_cmp expect actual
-
-ok 3 - tree_entry_interesting matches :(icase)bar
-
-expecting success of 6131.4 'tree_entry_interesting matches :(icase)bar with prefix': 
-	cat <<-EOF >expect &&
-	fOo/BAR
-	fOo/bAr
-	fOo/bar
-	EOF
-	( cd fOo && git log --format=%s -- ":(icase)bar" ) >actual &&
-	test_cmp expect actual
-
-ok 4 - tree_entry_interesting matches :(icase)bar with prefix
-
-expecting success of 6131.5 'tree_entry_interesting matches :(icase)bar with empty prefix': 
-	cat <<-EOF >expect &&
-	FOO/BAR
-	FOO/bAr
-	FOO/bar
-	fOo/BAR
-	fOo/bAr
-	fOo/bar
-	foo/BAR
-	foo/bAr
-	foo/bar
-	EOF
-	( cd fOo && git log --format=%s -- ":(icase)../foo/bar" ) >actual &&
-	test_cmp expect actual
-
-ok 5 - tree_entry_interesting matches :(icase)bar with empty prefix
-
-expecting success of 6131.6 'match_pathspec matches :(icase)bar': 
-	cat <<-EOF >expect &&
-	BAR
-	bAr
-	bar
-	EOF
-	git ls-files ":(icase)bar" >actual &&
-	test_cmp expect actual
-
-ok 6 - match_pathspec matches :(icase)bar
-
-expecting success of 6131.7 'match_pathspec matches :(icase)bar with prefix': 
-	cat <<-EOF >expect &&
-	fOo/BAR
-	fOo/bAr
-	fOo/bar
-	EOF
-	( cd fOo && git ls-files --full-name ":(icase)bar" ) >actual &&
-	test_cmp expect actual
-
-ok 7 - match_pathspec matches :(icase)bar with prefix
-
-expecting success of 6131.8 'match_pathspec matches :(icase)bar with empty prefix': 
-	cat <<-EOF >expect &&
-	bar
-	fOo/BAR
-	fOo/bAr
-	fOo/bar
-	EOF
-	( cd fOo && git ls-files --full-name ":(icase)bar" ../bar ) >actual &&
-	test_cmp expect actual
-
-ok 8 - match_pathspec matches :(icase)bar with empty prefix
-
-expecting success of 6131.9 '"git diff" can take magic :(icase) pathspec': 
-	echo FOO/BAR >expect &&
-	git diff --name-only HEAD^ HEAD -- ":(icase)foo/bar" >actual &&
-	test_cmp expect actual
-
-ok 9 - "git diff" can take magic :(icase) pathspec
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6111-rev-list-treesame.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6111-rev-list-treesame/.git/
 expecting success of 6111.1 'setup': 
@@ -414442,6 +415370,51 @@
 1..65
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6134-pathspec-in-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6134-pathspec-in-submodule/.git/
+expecting success of 6134.1 'setup a submodule': 
+	test_create_repo pretzel &&
+	: >pretzel/a &&
+	git -C pretzel add a &&
+	git -C pretzel commit -m "add a file" -- a &&
+	git -c protocol.file.allow=always submodule add ./pretzel sub &&
+	git commit -a -m "add submodule" &&
+	git submodule deinit --all
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6134-pathspec-in-submodule/pretzel/.git/
+[master (root-commit) c23f8b6] add a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t6134-pathspec-in-submodule/sub'...
+done.
+[master (root-commit) b7d593e] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Cleared directory 'sub'
+Submodule 'sub' (./pretzel) unregistered for path 'sub'
+ok 1 - setup a submodule
+
+expecting success of 6134.2 'error message for path inside submodule': 
+	echo a >sub/a &&
+	test_must_fail git add sub/a 2>actual &&
+	test_cmp expect actual
+
+ok 2 - error message for path inside submodule
+
+expecting success of 6134.3 'error message for path inside submodule from within submodule': 
+	test_must_fail git -C sub add . 2>actual &&
+	test_grep "in unpopulated submodule" actual
+
+fatal: in unpopulated submodule 'sub'
+ok 3 - error message for path inside submodule from within submodule
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6136-pathspec-in-bare.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6136-pathspec-in-bare/.git/
 expecting success of 6136.1 'setup a bare and non-bare repository': 
@@ -415328,665 +416301,6 @@
 1..55
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6134-pathspec-in-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6134-pathspec-in-submodule/.git/
-expecting success of 6134.1 'setup a submodule': 
-	test_create_repo pretzel &&
-	: >pretzel/a &&
-	git -C pretzel add a &&
-	git -C pretzel commit -m "add a file" -- a &&
-	git -c protocol.file.allow=always submodule add ./pretzel sub &&
-	git commit -a -m "add submodule" &&
-	git submodule deinit --all
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6134-pathspec-in-submodule/pretzel/.git/
-[master (root-commit) c23f8b6] add a file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t6134-pathspec-in-submodule/sub'...
-done.
-[master (root-commit) b7d593e] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-Cleared directory 'sub'
-Submodule 'sub' (./pretzel) unregistered for path 'sub'
-ok 1 - setup a submodule
-
-expecting success of 6134.2 'error message for path inside submodule': 
-	echo a >sub/a &&
-	test_must_fail git add sub/a 2>actual &&
-	test_cmp expect actual
-
-ok 2 - error message for path inside submodule
-
-expecting success of 6134.3 'error message for path inside submodule from within submodule': 
-	test_must_fail git -C sub add . 2>actual &&
-	test_grep "in unpopulated submodule" actual
-
-fatal: in unpopulated submodule 'sub'
-ok 3 - error message for path inside submodule from within submodule
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6301-for-each-ref-errors.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6132-pathspec-exclude.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6132-pathspec-exclude/.git/
-expecting success of 6132.1 'setup': 
-	for p in file sub/file sub/sub/file sub/file2 sub/sub/sub/file sub2/file; do
-		if echo $p | grep /; then
-			mkdir -p $(dirname $p)
-		fi &&
-		: >$p &&
-		git add $p &&
-		git commit -m $p || return 1
-	done &&
-	git log --oneline --format=%s >actual &&
-	cat <<EOF >expect &&
-sub2/file
-sub/sub/sub/file
-sub/file2
-sub/sub/file
-sub/file
-file
-EOF
-	test_cmp expect actual
-
-[master (root-commit) 229083b] file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-sub/file
-[master dfdea7d] sub/file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 sub/file
-sub/sub/file
-[master 37483ca] sub/sub/file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 sub/sub/file
-sub/file2
-[master bc3972c] sub/file2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 sub/file2
-sub/sub/sub/file
-[master a62d33f] sub/sub/sub/file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 sub/sub/sub/file
-sub2/file
-[master ddefea6] sub2/file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 sub2/file
-ok 1 - setup
-
-expecting success of 6132.2 'exclude only pathspec uses default implicit pathspec': 
-	git log --oneline --format=%s -- . ":(exclude)sub" >expect &&
-	git log --oneline --format=%s -- ":(exclude)sub" >actual &&
-	test_cmp expect actual
-
-ok 2 - exclude only pathspec uses default implicit pathspec
-
-expecting success of 6132.3 't_e_i() exclude sub': 
-	git log --oneline --format=%s -- . ":(exclude)sub" >actual &&
-	cat <<EOF >expect &&
-sub2/file
-file
-EOF
-	test_cmp expect actual
-
-ok 3 - t_e_i() exclude sub
-
-expecting success of 6132.4 't_e_i() exclude sub/sub/file': 
-	git log --oneline --format=%s -- . ":(exclude)sub/sub/file" >actual &&
-	cat <<EOF >expect &&
-sub2/file
-sub/sub/sub/file
-sub/file2
-sub/file
-file
-EOF
-	test_cmp expect actual
-
-ok 4 - t_e_i() exclude sub/sub/file
-
-expecting success of 6132.5 't_e_i() exclude sub using mnemonic': 
-	git log --oneline --format=%s -- . ":!sub" >actual &&
-	cat <<EOF >expect &&
-sub2/file
-file
-EOF
-	test_cmp expect actual
-
-ok 5 - t_e_i() exclude sub using mnemonic
-
-expecting success of 6132.6 't_e_i() exclude :(icase)SUB': 
-	git log --oneline --format=%s -- . ":(exclude,icase)SUB" >actual &&
-	cat <<EOF >expect &&
-sub2/file
-file
-EOF
-	test_cmp expect actual
-
-ok 6 - t_e_i() exclude :(icase)SUB
-
-expecting success of 6132.7 't_e_i() exclude sub2 from sub': 
-	(
-	cd sub &&
-	git log --oneline --format=%s -- :/ ":/!sub2" >actual &&
-	cat <<EOF >expect &&
-sub/sub/sub/file
-sub/file2
-sub/sub/file
-sub/file
-file
-EOF
-	test_cmp expect actual
-	)
-
-ok 7 - t_e_i() exclude sub2 from sub
-
-expecting success of 6132.8 't_e_i() exclude sub/*file': 
-	git log --oneline --format=%s -- . ":(exclude)sub/*file" >actual &&
-	cat <<EOF >expect &&
-sub2/file
-sub/file2
-file
-EOF
-	test_cmp expect actual
-
-ok 8 - t_e_i() exclude sub/*file
-
-expecting success of 6132.9 't_e_i() exclude :(glob)sub/*/file': 
-	git log --oneline --format=%s -- . ":(exclude,glob)sub/*/file" >actual &&
-	cat <<EOF >expect &&
-sub2/file
-sub/sub/sub/file
-sub/file2
-sub/file
-file
-EOF
-	test_cmp expect actual
-
-ok 9 - t_e_i() exclude :(glob)sub/*/file
-
-expecting success of 6132.10 'm_p_d() exclude sub': 
-	git ls-files -- . ":(exclude)sub" >actual &&
-	cat <<EOF >expect &&
-file
-sub2/file
-EOF
-	test_cmp expect actual
-
-ok 10 - m_p_d() exclude sub
-
-expecting success of 6132.11 'm_p_d() exclude sub/sub/file': 
-	git ls-files -- . ":(exclude)sub/sub/file" >actual &&
-	cat <<EOF >expect &&
-file
-sub/file
-sub/file2
-sub/sub/sub/file
-sub2/file
-EOF
-	test_cmp expect actual
-
-ok 11 - m_p_d() exclude sub/sub/file
-
-expecting success of 6132.12 'm_p_d() exclude sub using mnemonic': 
-	git ls-files -- . ":!sub" >actual &&
-	cat <<EOF >expect &&
-file
-sub2/file
-EOF
-	test_cmp expect actual
-
-ok 12 - m_p_d() exclude sub using mnemonic
-
-expecting success of 6132.13 'm_p_d() exclude :(icase)SUB': 
-	git ls-files -- . ":(exclude,icase)SUB" >actual &&
-	cat <<EOF >expect &&
-file
-sub2/file
-EOF
-	test_cmp expect actual
-
-ok 13 - m_p_d() exclude :(icase)SUB
-
-expecting success of 6132.14 'm_p_d() exclude sub2 from sub': 
-	(
-	cd sub &&
-	git ls-files -- :/ ":/!sub2" >actual &&
-	cat <<EOF >expect &&
-../file
-file
-file2
-sub/file
-sub/sub/file
-EOF
-	test_cmp expect actual
-	)
-
-ok 14 - m_p_d() exclude sub2 from sub
-
-expecting success of 6132.15 'm_p_d() exclude sub/*file': 
-	git ls-files -- . ":(exclude)sub/*file" >actual &&
-	cat <<EOF >expect &&
-file
-sub/file2
-sub2/file
-EOF
-	test_cmp expect actual
-
-ok 15 - m_p_d() exclude sub/*file
-
-expecting success of 6132.16 'm_p_d() exclude :(glob)sub/*/file': 
-	git ls-files -- . ":(exclude,glob)sub/*/file" >actual &&
-	cat <<EOF >expect &&
-file
-sub/file
-sub/file2
-sub/sub/sub/file
-sub2/file
-EOF
-	test_cmp expect actual
-
-ok 16 - m_p_d() exclude :(glob)sub/*/file
-
-expecting success of 6132.17 'multiple exclusions': 
-	git ls-files -- ":^*/file2" ":^sub2" >actual &&
-	cat <<-\EOF >expect &&
-	file
-	sub/file
-	sub/sub/file
-	sub/sub/sub/file
-	EOF
-	test_cmp expect actual
-
-ok 17 - multiple exclusions
-
-expecting success of 6132.18 't_e_i() exclude case #8': 
-	test_when_finished "rm -fr case8" &&
-	git init case8 &&
-	(
-		cd case8 &&
-		echo file >file1 &&
-		echo file >file2 &&
-		git add file1 file2 &&
-		git commit -m twofiles &&
-		git grep -l file HEAD :^file2 >actual &&
-		echo HEAD:file1 >expected &&
-		test_cmp expected actual &&
-		git grep -l file HEAD :^file1 >actual &&
-		echo HEAD:file2 >expected &&
-		test_cmp expected actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6132-pathspec-exclude/case8/.git/
-[master (root-commit) e695e35] twofiles
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-ok 18 - t_e_i() exclude case #8
-
-expecting success of 6132.19 'grep --untracked PATTERN': 
-	# This test is not an actual test of exclude patterns, rather it
-	# is here solely to ensure that if any tests are inserted, deleted, or
-	# changed above, that we still have untracked files with the expected
-	# contents for the NEXT two tests.
-	cat <<-\EOF >expect-grep &&
-	actual
-	expect
-	sub/actual
-	sub/expect
-	EOF
-	git grep -l --untracked file -- >actual-grep &&
-	test_cmp expect-grep actual-grep
-
-ok 19 - grep --untracked PATTERN
-
-expecting success of 6132.20 'grep --untracked PATTERN :(exclude)DIR': 
-	cat <<-\EOF >expect-grep &&
-	actual
-	expect
-	EOF
-	git grep -l --untracked file -- ":(exclude)sub" >actual-grep &&
-	test_cmp expect-grep actual-grep
-
-ok 20 - grep --untracked PATTERN :(exclude)DIR
-
-expecting success of 6132.21 'grep --untracked PATTERN :(exclude)*FILE': 
-	cat <<-\EOF >expect-grep &&
-	actual
-	sub/actual
-	EOF
-	git grep -l --untracked file -- ":(exclude)*expect" >actual-grep &&
-	test_cmp expect-grep actual-grep
-
-ok 21 - grep --untracked PATTERN :(exclude)*FILE
-
-expecting success of 6132.22 'archive with all negative': 
-	git reset --hard &&
-	git clean -f &&
-	git -C sub archive --format=tar HEAD -- ":!sub/" >archive &&
-	"$TAR" tf archive >actual &&
-	cat >expect <<-\EOF &&
-	file
-	file2
-	EOF
-	test_cmp expect actual
-
-HEAD is now at ddefea6 sub2/file
-Removing actual
-Removing actual-grep
-Removing expect
-Removing expect-grep
-Removing sub/actual
-Removing sub/expect
-ok 22 - archive with all negative
-
-expecting success of 6132.23 'add with all negative': 
-	H=$(git rev-parse HEAD) &&
-	git reset --hard $H &&
-	git clean -f &&
-	test_when_finished "git reset --hard $H" &&
-	for path in file sub/file sub/sub/file sub2/file
-	do
-		echo smudge >>"$path" || return 1
-	done &&
-	git -C sub add -- ":!sub/" &&
-	git diff --name-only --no-renames --cached >actual &&
-	cat >expect <<-\EOF &&
-	file
-	sub/file
-	sub2/file
-	EOF
-	test_cmp expect actual &&
-	git diff --name-only --no-renames >actual &&
-	echo sub/sub/file >expect &&
-	test_cmp expect actual
-
-HEAD is now at ddefea6 sub2/file
-Removing actual
-Removing archive
-Removing expect
-HEAD is now at ddefea6 sub2/file
-ok 23 - add with all negative
-
-expecting success of 6132.24 'add -p with all negative': 
-	H=$(git rev-parse HEAD) &&
-	git reset --hard $H &&
-	git clean -f &&
-	test_when_finished "git reset --hard $H" &&
-	for path in file sub/file sub/sub/file sub2/file
-	do
-		echo smudge >>"$path" || return 1
-	done &&
-	yes | git -C sub add -p -- ":!sub/" &&
-	git diff --name-only --no-renames --cached >actual &&
-	cat >expect <<-\EOF &&
-	file
-	sub/file
-	sub2/file
-	EOF
-	test_cmp expect actual &&
-	git diff --name-only --no-renames >actual &&
-	echo sub/sub/file >expect &&
-	test_cmp expect actual
-
-HEAD is now at ddefea6 sub2/file
-Removing actual
-Removing expect
-diff --git a/file b/file
-index e69de29..15f3720 100644
---- a/file
-+++ b/file
-@@ -0,0 +1 @@
-+smudge
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/sub/file b/sub/file
-index e69de29..15f3720 100644
---- a/sub/file
-+++ b/sub/file
-@@ -0,0 +1 @@
-+smudge
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/sub2/file b/sub2/file
-index e69de29..15f3720 100644
---- a/sub2/file
-+++ b/sub2/file
-@@ -0,0 +1 @@
-+smudge
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-HEAD is now at ddefea6 sub2/file
-ok 24 - add -p with all negative
-
-expecting success of 6132.25 'clean with all negative': 
-	H=$(git rev-parse HEAD) &&
-	git reset --hard $H &&
-	test_when_finished "git reset --hard $H && git clean -f" &&
-	git clean -f &&
-	for path in file9 sub/file9 sub/sub/file9 sub2/file9
-	do
-		echo cruft >"$path" || return 1
-	done &&
-	git -C sub clean -f -- ":!sub" &&
-	test_path_is_file file9 &&
-	test_path_is_missing sub/file9 &&
-	test_path_is_file sub/sub/file9 &&
-	test_path_is_file sub2/file9
-
-HEAD is now at ddefea6 sub2/file
-Removing actual
-Removing expect
-Removing file9
-HEAD is now at ddefea6 sub2/file
-Removing file9
-Removing sub/sub/file9
-Removing sub2/file9
-ok 25 - clean with all negative
-
-expecting success of 6132.26 'commit with all negative': 
-	H=$(git rev-parse HEAD) &&
-	git reset --hard $H &&
-	test_when_finished "git reset --hard $H" &&
-	for path in file sub/file sub/sub/file sub2/file
-	do
-		echo smudge >>"$path" || return 1
-	done &&
-	git -C sub commit -m sample -- ":!sub/" &&
-	git diff --name-only --no-renames HEAD^ HEAD >actual &&
-	cat >expect <<-\EOF &&
-	file
-	sub/file
-	sub2/file
-	EOF
-	test_cmp expect actual &&
-	git diff --name-only --no-renames HEAD >actual &&
-	echo sub/sub/file >expect &&
-	test_cmp expect actual
-
-HEAD is now at ddefea6 sub2/file
-[master cff0290] sample
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-HEAD is now at ddefea6 sub2/file
-ok 26 - commit with all negative
-
-expecting success of 6132.27 'reset with all negative': 
-	H=$(git rev-parse HEAD) &&
-	git reset --hard $H &&
-	test_when_finished "git reset --hard $H" &&
-	for path in file sub/file sub/sub/file sub2/file
-	do
-		echo smudge >>"$path" &&
-		git add "$path" || return 1
-	done &&
-	git -C sub reset --quiet -- ":!sub/" &&
-	git diff --name-only --no-renames --cached >actual &&
-	echo sub/sub/file >expect &&
-	test_cmp expect actual
-
-HEAD is now at ddefea6 sub2/file
-HEAD is now at ddefea6 sub2/file
-ok 27 - reset with all negative
-
-expecting success of 6132.28 'grep with all negative': 
-	H=$(git rev-parse HEAD) &&
-	git reset --hard $H &&
-	test_when_finished "git reset --hard $H" &&
-	for path in file sub/file sub/sub/file sub2/file
-	do
-		echo "needle $path" >>"$path" || return 1
-	done &&
-	git -C sub grep -h needle -- ":!sub/" >actual &&
-	cat >expect <<-\EOF &&
-	needle sub/file
-	EOF
-	test_cmp expect actual
-
-HEAD is now at ddefea6 sub2/file
-HEAD is now at ddefea6 sub2/file
-ok 28 - grep with all negative
-
-expecting success of 6132.29 'ls-files with all negative': 
-	git reset --hard &&
-	git -C sub ls-files -- ":!sub/" >actual &&
-	cat >expect <<-\EOF &&
-	file
-	file2
-	EOF
-	test_cmp expect actual
-
-HEAD is now at ddefea6 sub2/file
-ok 29 - ls-files with all negative
-
-expecting success of 6132.30 'rm with all negative': 
-	git reset --hard &&
-	test_when_finished "git reset --hard" &&
-	git -C sub rm -r --cached -- ":!sub/" >actual &&
-	git diff --name-only --no-renames --diff-filter=D --cached >actual &&
-	cat >expect <<-\EOF &&
-	sub/file
-	sub/file2
-	EOF
-	test_cmp expect actual
-
-HEAD is now at ddefea6 sub2/file
-HEAD is now at ddefea6 sub2/file
-ok 30 - rm with all negative
-
-expecting success of 6132.31 'stash with all negative': 
-	H=$(git rev-parse HEAD) &&
-	git reset --hard $H &&
-	test_when_finished "git reset --hard $H" &&
-	for path in file sub/file sub/sub/file sub2/file
-	do
-		echo smudge >>"$path" || return 1
-	done &&
-	git -C sub stash push -m sample -- ":!sub/" &&
-	git diff --name-only --no-renames HEAD >actual &&
-	echo sub/sub/file >expect &&
-	test_cmp expect actual &&
-	git stash show --name-only >actual &&
-	cat >expect <<-\EOF &&
-	file
-	sub/file
-	sub2/file
-	EOF
-	test_cmp expect actual
-
-HEAD is now at ddefea6 sub2/file
-Saved working directory and index state On master: sample
-HEAD is now at ddefea6 sub2/file
-ok 31 - stash with all negative
-
-# passed all 31 test(s)
-1..31
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6020-bundle-misc.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6020-bundle-misc/.git/
 expecting success of 6020.1 'usage: git bundle create needs an argument': 
@@ -416746,330 +417060,944 @@
 		test_config uploadpack.allowanysha1inwant 1 &&
 		git clone --no-local --filter=$filter --bare "file://$(pwd)" cloned &&
 
-		git init unbundled &&
-		git -C unbundled bundle unbundle ../partial.bdl >ref-list.txt &&
-		ls unbundled/.git/objects/pack/pack-*.promisor >promisor &&
-		test_line_count = 1 promisor &&
+		git init unbundled &&
+		git -C unbundled bundle unbundle ../partial.bdl >ref-list.txt &&
+		ls unbundled/.git/objects/pack/pack-*.promisor >promisor &&
+		test_line_count = 1 promisor &&
+
+		# Count the same number of reachable objects.
+		reflist=$(git for-each-ref --format="%(objectname)") &&
+		git rev-list --objects --filter=$filter --missing=allow-any \
+			$reflist >expect &&
+		for repo in cloned unbundled
+		do
+			git -C $repo rev-list --objects --missing=allow-any \
+				$reflist >actual &&
+			test_cmp expect actual || return 1
+		done
+	
+partial.bdl is okay
+Cloning into bare repository 'cloned'...
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6020-bundle-misc/unbundled/.git/
+ok 22 - filtered bundle: blob:limit=100
+
+expecting success of 6020.23 'cloning from filtered bundle has useful error': 
+	git bundle create partial.bdl \
+		--all \
+		--filter=blob:none &&
+	test_must_fail git clone --bare partial.bdl partial 2>err &&
+	grep "cannot clone from filtered bundle" err
+
+fatal: cannot clone from filtered bundle
+ok 23 - cloning from filtered bundle has useful error
+
+expecting success of 6020.24 'verify catches unreachable, broken prerequisites': 
+	test_when_finished rm -rf clone-from clone-to &&
+	git init clone-from &&
+	(
+		cd clone-from &&
+		git checkout -b base &&
+		test_commit A &&
+		git checkout -b tip &&
+		git commit --allow-empty -m "will drop by shallow" &&
+		git commit --allow-empty -m "will keep by shallow" &&
+		git commit --allow-empty -m "for bundle, not clone" &&
+		git bundle create tip.bundle tip~1..tip &&
+		git reset --hard HEAD~1 &&
+		git checkout base
+	) &&
+	BAD_OID=$(git -C clone-from rev-parse tip~1) &&
+	TIP_OID=$(git -C clone-from rev-parse tip) &&
+	git clone --depth=1 --no-single-branch \
+		"file://$(pwd)/clone-from" clone-to &&
+	(
+		cd clone-to &&
+
+		# Set up broken history by removing shallow markers
+		git update-ref -d refs/remotes/origin/tip &&
+		rm .git/shallow &&
+
+		# Verify should fail
+		test_must_fail git bundle verify \
+			../clone-from/tip.bundle 2>err &&
+		grep "some prerequisite commits .* are not connected" err &&
+		test_line_count = 1 err &&
+
+		# Unbundling should fail
+		test_must_fail git bundle unbundle \
+			../clone-from/tip.bundle 2>err &&
+		grep "some prerequisite commits .* are not connected" err &&
+		test_line_count = 1 err
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6020-bundle-misc/clone-from/.git/
+Switched to a new branch 'base'
+[base (root-commit) 818c4b4] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Switched to a new branch 'tip'
+[tip 55d0edb] will drop by shallow
+ Author: A U Thor <author@example.com>
+[tip 95b68c9] will keep by shallow
+ Author: A U Thor <author@example.com>
+[tip 67095cd] for bundle, not clone
+ Author: A U Thor <author@example.com>
+HEAD is now at 95b68c9 will keep by shallow
+Switched to branch 'base'
+Cloning into 'clone-to'...
+The bundle contains this ref:
+67095cdad769c1047892f03dc8fb54a849281a7c refs/heads/tip
+The bundle requires this ref:
+95b68c91366fa02ea282d8dc3dd5f5acae55d179 
+The bundle uses this hash algorithm: sha1
+error: some prerequisite commits exist in the object store, but are not connected to the repository's history
+error: some prerequisite commits exist in the object store, but are not connected to the repository's history
+ok 24 - verify catches unreachable, broken prerequisites
+
+expecting success of 6020.25 'bundle progress includes write phase': 
+	GIT_PROGRESS_DELAY=0 \
+		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 | 762.00 KiB/s, done.
+ok 25 - bundle progress includes write phase
+
+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 6020.26 'create --quiet disables all bundle progress': 
+	test_terminal env GIT_PROGRESS_DELAY=0 \
+		git bundle create --quiet out.bundle --all 2>err &&
+	test_must_be_empty err
+
+ok 26 - create --quiet disables all bundle progress
+
+expecting success of 6020.27 'bundle progress with --no-quiet': 
+	GIT_PROGRESS_DELAY=0 \
+		git bundle create --no-quiet out.bundle --all 2>err &&
+	grep "%" err
+
+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 | 952.00 KiB/s, done.
+ok 27 - bundle progress with --no-quiet
+
+expecting success of 6020.28 'create bundle with duplicate refnames': 
+	git bundle create out.bdl "main" "main" &&
+
+	git bundle list-heads out.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-P> refs/heads/main
+	EOF
+	test_cmp expect actual
+
+ok 28 - create bundle with duplicate refnames
+
+expecting success of 6020.29 'create bundle with duplicate refnames and --all': 
+	git bundle create out.bdl --all "main" "main" &&
+
+	git bundle list-heads out.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-P> refs/heads/main
+	<COMMIT-N> refs/heads/release
+	<COMMIT-D> refs/heads/topic/1
+	<COMMIT-H> refs/heads/topic/2
+	<COMMIT-D> refs/pull/1/head
+	<COMMIT-G> refs/pull/2/head
+	<TAG-1> refs/tags/v1
+	<TAG-2> refs/tags/v2
+	<TAG-3> refs/tags/v3
+	<COMMIT-P> HEAD
+	EOF
+	test_cmp expect actual
+
+ok 29 - create bundle with duplicate refnames and --all
+
+expecting success of 6020.30 'create bundle with duplicate exlusion refnames': 
+	git bundle create out.bdl "main" "main^!" &&
+
+	git bundle list-heads out.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-P> refs/heads/main
+	EOF
+	test_cmp expect actual
+
+ok 30 - create bundle with duplicate exlusion refnames
+
+expecting success of 6020.31 'create bundle with duplicate refname short-form': 
+	git bundle create out.bdl "main" "main" "refs/heads/main" "refs/heads/main" &&
+
+	git bundle list-heads out.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-P> refs/heads/main
+	EOF
+	test_cmp expect actual
+
+ok 31 - create bundle with duplicate refname short-form
+
+expecting success of 6020.32 'read bundle over stdin': 
+	git bundle create some.bundle HEAD &&
+
+	git bundle verify - <some.bundle 2>err &&
+	grep "<stdin> is okay" err &&
+
+	git bundle list-heads some.bundle >expect &&
+	git bundle list-heads - <some.bundle >actual &&
+	test_cmp expect actual &&
+
+	git bundle unbundle some.bundle >expect &&
+	git bundle unbundle - <some.bundle >actual &&
+	test_cmp expect actual
+
+The bundle contains this ref:
+da43db66582d34cbfc17b239b8fcbf1431323fb5 HEAD
+The bundle records a complete history.
+The bundle uses this hash algorithm: sha1
+<stdin> is okay
+ok 32 - read bundle over stdin
+
+expecting success of 6020.33 'send a bundle to standard output': 
+	git bundle create - --all HEAD >bundle-one &&
+	mkdir -p down &&
+	git -C down bundle create - --all HEAD >bundle-two &&
+	git bundle verify bundle-one &&
+	git bundle verify bundle-two &&
+	git ls-remote bundle-one >expect &&
+	git ls-remote bundle-two >actual &&
+	test_cmp expect actual
+
+bundle-one is okay
+The bundle contains these 10 refs:
+da43db66582d34cbfc17b239b8fcbf1431323fb5 refs/heads/main
+75dc67d2894ccd900ed1f4b992544e0a7df90d3a refs/heads/release
+c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/heads/topic/1
+d1a87a27cb017e8a16a8899db4d52c6adf190756 refs/heads/topic/2
+c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/pull/1/head
+2ead555f48a6ed17cf79c8bce97af0ae7bf686fc refs/pull/2/head
+bb88e543a8e18a6087c5190d3dc2bf22b4a7682e refs/tags/v1
+ed9aedd63f3cc030121642c1c240a9117eb9a121 refs/tags/v2
+64694153379bb61e8d6713ea7273107893c2185c refs/tags/v3
+da43db66582d34cbfc17b239b8fcbf1431323fb5 HEAD
+The bundle records a complete history.
+The bundle uses this hash algorithm: sha1
+bundle-two is okay
+The bundle contains these 10 refs:
+da43db66582d34cbfc17b239b8fcbf1431323fb5 refs/heads/main
+75dc67d2894ccd900ed1f4b992544e0a7df90d3a refs/heads/release
+c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/heads/topic/1
+d1a87a27cb017e8a16a8899db4d52c6adf190756 refs/heads/topic/2
+c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/pull/1/head
+2ead555f48a6ed17cf79c8bce97af0ae7bf686fc refs/pull/2/head
+bb88e543a8e18a6087c5190d3dc2bf22b4a7682e refs/tags/v1
+ed9aedd63f3cc030121642c1c240a9117eb9a121 refs/tags/v2
+64694153379bb61e8d6713ea7273107893c2185c refs/tags/v3
+da43db66582d34cbfc17b239b8fcbf1431323fb5 HEAD
+The bundle records a complete history.
+The bundle uses this hash algorithm: sha1
+ok 33 - send a bundle to standard output
+
+expecting success of 6020.34 'unbundle outside of a repository': 
+	git bundle create some.bundle HEAD &&
+	echo "fatal: Need a repository to unbundle." >expect &&
+	nongit test_must_fail git bundle unbundle "$(pwd)/some.bundle" 2>err &&
+	test_cmp expect err
+
+ok 34 - unbundle outside of a repository
+
+expecting success of 6020.35 'list-heads outside of a repository': 
+	git bundle create some.bundle HEAD &&
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) HEAD
+	EOF
+	nongit git bundle list-heads "$(pwd)/some.bundle" >actual &&
+	test_cmp expect actual
+
+ok 35 - list-heads outside of a repository
+
+expecting success of 6020.36 'list-heads with bundle using sha1': 
+		test_when_finished "rm -rf hash" &&
+		git init --object-format=$hash hash &&
+		test_commit -C hash initial &&
+		git -C hash bundle create hash.bundle HEAD &&
+
+		cat >expect <<-EOF &&
+		$(git -C hash rev-parse HEAD) HEAD
+		EOF
+		git bundle list-heads hash/hash.bundle >actual &&
+		test_cmp expect actual
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6020-bundle-misc/hash/.git/
+[main (root-commit) ee4b540] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 36 - list-heads with bundle using sha1
+
+expecting success of 6020.37 'list-heads with bundle using sha256': 
+		test_when_finished "rm -rf hash" &&
+		git init --object-format=$hash hash &&
+		test_commit -C hash initial &&
+		git -C hash bundle create hash.bundle HEAD &&
+
+		cat >expect <<-EOF &&
+		$(git -C hash rev-parse HEAD) HEAD
+		EOF
+		git bundle list-heads hash/hash.bundle >actual &&
+		test_cmp expect actual
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6020-bundle-misc/hash/.git/
+[main (root-commit) 8b2bc6b] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 37 - list-heads with bundle using sha256
+
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6301-for-each-ref-errors.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6132-pathspec-exclude.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6132-pathspec-exclude/.git/
+expecting success of 6132.1 'setup': 
+	for p in file sub/file sub/sub/file sub/file2 sub/sub/sub/file sub2/file; do
+		if echo $p | grep /; then
+			mkdir -p $(dirname $p)
+		fi &&
+		: >$p &&
+		git add $p &&
+		git commit -m $p || return 1
+	done &&
+	git log --oneline --format=%s >actual &&
+	cat <<EOF >expect &&
+sub2/file
+sub/sub/sub/file
+sub/file2
+sub/sub/file
+sub/file
+file
+EOF
+	test_cmp expect actual
+
+[master (root-commit) 229083b] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+sub/file
+[master dfdea7d] sub/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 sub/file
+sub/sub/file
+[master 37483ca] sub/sub/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 sub/sub/file
+sub/file2
+[master bc3972c] sub/file2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 sub/file2
+sub/sub/sub/file
+[master a62d33f] sub/sub/sub/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 sub/sub/sub/file
+sub2/file
+[master ddefea6] sub2/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 sub2/file
+ok 1 - setup
+
+expecting success of 6132.2 'exclude only pathspec uses default implicit pathspec': 
+	git log --oneline --format=%s -- . ":(exclude)sub" >expect &&
+	git log --oneline --format=%s -- ":(exclude)sub" >actual &&
+	test_cmp expect actual
+
+ok 2 - exclude only pathspec uses default implicit pathspec
+
+expecting success of 6132.3 't_e_i() exclude sub': 
+	git log --oneline --format=%s -- . ":(exclude)sub" >actual &&
+	cat <<EOF >expect &&
+sub2/file
+file
+EOF
+	test_cmp expect actual
+
+ok 3 - t_e_i() exclude sub
+
+expecting success of 6132.4 't_e_i() exclude sub/sub/file': 
+	git log --oneline --format=%s -- . ":(exclude)sub/sub/file" >actual &&
+	cat <<EOF >expect &&
+sub2/file
+sub/sub/sub/file
+sub/file2
+sub/file
+file
+EOF
+	test_cmp expect actual
+
+ok 4 - t_e_i() exclude sub/sub/file
+
+expecting success of 6132.5 't_e_i() exclude sub using mnemonic': 
+	git log --oneline --format=%s -- . ":!sub" >actual &&
+	cat <<EOF >expect &&
+sub2/file
+file
+EOF
+	test_cmp expect actual
+
+ok 5 - t_e_i() exclude sub using mnemonic
+
+expecting success of 6132.6 't_e_i() exclude :(icase)SUB': 
+	git log --oneline --format=%s -- . ":(exclude,icase)SUB" >actual &&
+	cat <<EOF >expect &&
+sub2/file
+file
+EOF
+	test_cmp expect actual
+
+ok 6 - t_e_i() exclude :(icase)SUB
+
+expecting success of 6132.7 't_e_i() exclude sub2 from sub': 
+	(
+	cd sub &&
+	git log --oneline --format=%s -- :/ ":/!sub2" >actual &&
+	cat <<EOF >expect &&
+sub/sub/sub/file
+sub/file2
+sub/sub/file
+sub/file
+file
+EOF
+	test_cmp expect actual
+	)
+
+ok 7 - t_e_i() exclude sub2 from sub
+
+expecting success of 6132.8 't_e_i() exclude sub/*file': 
+	git log --oneline --format=%s -- . ":(exclude)sub/*file" >actual &&
+	cat <<EOF >expect &&
+sub2/file
+sub/file2
+file
+EOF
+	test_cmp expect actual
+
+ok 8 - t_e_i() exclude sub/*file
+
+expecting success of 6132.9 't_e_i() exclude :(glob)sub/*/file': 
+	git log --oneline --format=%s -- . ":(exclude,glob)sub/*/file" >actual &&
+	cat <<EOF >expect &&
+sub2/file
+sub/sub/sub/file
+sub/file2
+sub/file
+file
+EOF
+	test_cmp expect actual
+
+ok 9 - t_e_i() exclude :(glob)sub/*/file
+
+expecting success of 6132.10 'm_p_d() exclude sub': 
+	git ls-files -- . ":(exclude)sub" >actual &&
+	cat <<EOF >expect &&
+file
+sub2/file
+EOF
+	test_cmp expect actual
+
+ok 10 - m_p_d() exclude sub
 
-		# Count the same number of reachable objects.
-		reflist=$(git for-each-ref --format="%(objectname)") &&
-		git rev-list --objects --filter=$filter --missing=allow-any \
-			$reflist >expect &&
-		for repo in cloned unbundled
-		do
-			git -C $repo rev-list --objects --missing=allow-any \
-				$reflist >actual &&
-			test_cmp expect actual || return 1
-		done
-	
-partial.bdl is okay
-Cloning into bare repository 'cloned'...
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6020-bundle-misc/unbundled/.git/
-ok 22 - filtered bundle: blob:limit=100
+expecting success of 6132.11 'm_p_d() exclude sub/sub/file': 
+	git ls-files -- . ":(exclude)sub/sub/file" >actual &&
+	cat <<EOF >expect &&
+file
+sub/file
+sub/file2
+sub/sub/sub/file
+sub2/file
+EOF
+	test_cmp expect actual
 
-expecting success of 6020.23 'cloning from filtered bundle has useful error': 
-	git bundle create partial.bdl \
-		--all \
-		--filter=blob:none &&
-	test_must_fail git clone --bare partial.bdl partial 2>err &&
-	grep "cannot clone from filtered bundle" err
+ok 11 - m_p_d() exclude sub/sub/file
 
-fatal: cannot clone from filtered bundle
-ok 23 - cloning from filtered bundle has useful error
+expecting success of 6132.12 'm_p_d() exclude sub using mnemonic': 
+	git ls-files -- . ":!sub" >actual &&
+	cat <<EOF >expect &&
+file
+sub2/file
+EOF
+	test_cmp expect actual
 
-expecting success of 6020.24 'verify catches unreachable, broken prerequisites': 
-	test_when_finished rm -rf clone-from clone-to &&
-	git init clone-from &&
-	(
-		cd clone-from &&
-		git checkout -b base &&
-		test_commit A &&
-		git checkout -b tip &&
-		git commit --allow-empty -m "will drop by shallow" &&
-		git commit --allow-empty -m "will keep by shallow" &&
-		git commit --allow-empty -m "for bundle, not clone" &&
-		git bundle create tip.bundle tip~1..tip &&
-		git reset --hard HEAD~1 &&
-		git checkout base
-	) &&
-	BAD_OID=$(git -C clone-from rev-parse tip~1) &&
-	TIP_OID=$(git -C clone-from rev-parse tip) &&
-	git clone --depth=1 --no-single-branch \
-		"file://$(pwd)/clone-from" clone-to &&
-	(
-		cd clone-to &&
+ok 12 - m_p_d() exclude sub using mnemonic
 
-		# Set up broken history by removing shallow markers
-		git update-ref -d refs/remotes/origin/tip &&
-		rm .git/shallow &&
+expecting success of 6132.13 'm_p_d() exclude :(icase)SUB': 
+	git ls-files -- . ":(exclude,icase)SUB" >actual &&
+	cat <<EOF >expect &&
+file
+sub2/file
+EOF
+	test_cmp expect actual
 
-		# Verify should fail
-		test_must_fail git bundle verify \
-			../clone-from/tip.bundle 2>err &&
-		grep "some prerequisite commits .* are not connected" err &&
-		test_line_count = 1 err &&
+ok 13 - m_p_d() exclude :(icase)SUB
 
-		# Unbundling should fail
-		test_must_fail git bundle unbundle \
-			../clone-from/tip.bundle 2>err &&
-		grep "some prerequisite commits .* are not connected" err &&
-		test_line_count = 1 err
+expecting success of 6132.14 'm_p_d() exclude sub2 from sub': 
+	(
+	cd sub &&
+	git ls-files -- :/ ":/!sub2" >actual &&
+	cat <<EOF >expect &&
+../file
+file
+file2
+sub/file
+sub/sub/file
+EOF
+	test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6020-bundle-misc/clone-from/.git/
-Switched to a new branch 'base'
-[base (root-commit) 818c4b4] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Switched to a new branch 'tip'
-[tip 55d0edb] will drop by shallow
- Author: A U Thor <author@example.com>
-[tip 95b68c9] will keep by shallow
- Author: A U Thor <author@example.com>
-[tip 67095cd] for bundle, not clone
- Author: A U Thor <author@example.com>
-HEAD is now at 95b68c9 will keep by shallow
-Switched to branch 'base'
-Cloning into 'clone-to'...
-The bundle contains this ref:
-67095cdad769c1047892f03dc8fb54a849281a7c refs/heads/tip
-The bundle requires this ref:
-95b68c91366fa02ea282d8dc3dd5f5acae55d179 
-The bundle uses this hash algorithm: sha1
-error: some prerequisite commits exist in the object store, but are not connected to the repository's history
-error: some prerequisite commits exist in the object store, but are not connected to the repository's history
-ok 24 - verify catches unreachable, broken prerequisites
-
-expecting success of 6020.25 'bundle progress includes write phase': 
-	GIT_PROGRESS_DELAY=0 \
-		git bundle create --progress out.bundle --all 2>err &&
-	grep Writing err
+ok 14 - m_p_d() exclude sub2 from sub
 
-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 | 127.00 KiB/s, done.
-ok 25 - bundle progress includes write phase
+expecting success of 6132.15 'm_p_d() exclude sub/*file': 
+	git ls-files -- . ":(exclude)sub/*file" >actual &&
+	cat <<EOF >expect &&
+file
+sub/file2
+sub2/file
+EOF
+	test_cmp expect actual
 
-checking prerequisite: TTY
+ok 15 - m_p_d() exclude sub/*file
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
+expecting success of 6132.16 'm_p_d() exclude :(glob)sub/*/file': 
+	git ls-files -- . ":(exclude,glob)sub/*/file" >actual &&
+	cat <<EOF >expect &&
+file
+sub/file
+sub/file2
+sub/sub/sub/file
+sub2/file
+EOF
+	test_cmp expect actual
 
-	# 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 &&
+ok 16 - m_p_d() exclude :(glob)sub/*/file
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+expecting success of 6132.17 'multiple exclusions': 
+	git ls-files -- ":^*/file2" ":^sub2" >actual &&
+	cat <<-\EOF >expect &&
+	file
+	sub/file
+	sub/sub/file
+	sub/sub/sub/file
+	EOF
+	test_cmp expect actual
 
-)
-prerequisite TTY ok
-expecting success of 6020.26 'create --quiet disables all bundle progress': 
-	test_terminal env GIT_PROGRESS_DELAY=0 \
-		git bundle create --quiet out.bundle --all 2>err &&
-	test_must_be_empty err
+ok 17 - multiple exclusions
 
-ok 26 - create --quiet disables all bundle progress
+expecting success of 6132.18 't_e_i() exclude case #8': 
+	test_when_finished "rm -fr case8" &&
+	git init case8 &&
+	(
+		cd case8 &&
+		echo file >file1 &&
+		echo file >file2 &&
+		git add file1 file2 &&
+		git commit -m twofiles &&
+		git grep -l file HEAD :^file2 >actual &&
+		echo HEAD:file1 >expected &&
+		test_cmp expected actual &&
+		git grep -l file HEAD :^file1 >actual &&
+		echo HEAD:file2 >expected &&
+		test_cmp expected actual
+	)
 
-expecting success of 6020.27 'bundle progress with --no-quiet': 
-	GIT_PROGRESS_DELAY=0 \
-		git bundle create --no-quiet out.bundle --all 2>err &&
-	grep "%" err
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6132-pathspec-exclude/case8/.git/
+[master (root-commit) e695e35] twofiles
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+ok 18 - t_e_i() exclude case #8
 
-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.
-ok 27 - bundle progress with --no-quiet
+expecting success of 6132.19 'grep --untracked PATTERN': 
+	# This test is not an actual test of exclude patterns, rather it
+	# is here solely to ensure that if any tests are inserted, deleted, or
+	# changed above, that we still have untracked files with the expected
+	# contents for the NEXT two tests.
+	cat <<-\EOF >expect-grep &&
+	actual
+	expect
+	sub/actual
+	sub/expect
+	EOF
+	git grep -l --untracked file -- >actual-grep &&
+	test_cmp expect-grep actual-grep
 
-expecting success of 6020.28 'create bundle with duplicate refnames': 
-	git bundle create out.bdl "main" "main" &&
+ok 19 - grep --untracked PATTERN
 
-	git bundle list-heads out.bdl |
-		make_user_friendly_and_stable_output >actual &&
-	cat >expect <<-\EOF &&
-	<COMMIT-P> refs/heads/main
+expecting success of 6132.20 'grep --untracked PATTERN :(exclude)DIR': 
+	cat <<-\EOF >expect-grep &&
+	actual
+	expect
 	EOF
-	test_cmp expect actual
+	git grep -l --untracked file -- ":(exclude)sub" >actual-grep &&
+	test_cmp expect-grep actual-grep
 
-ok 28 - create bundle with duplicate refnames
+ok 20 - grep --untracked PATTERN :(exclude)DIR
 
-expecting success of 6020.29 'create bundle with duplicate refnames and --all': 
-	git bundle create out.bdl --all "main" "main" &&
+expecting success of 6132.21 'grep --untracked PATTERN :(exclude)*FILE': 
+	cat <<-\EOF >expect-grep &&
+	actual
+	sub/actual
+	EOF
+	git grep -l --untracked file -- ":(exclude)*expect" >actual-grep &&
+	test_cmp expect-grep actual-grep
 
-	git bundle list-heads out.bdl |
-		make_user_friendly_and_stable_output >actual &&
+ok 21 - grep --untracked PATTERN :(exclude)*FILE
+
+expecting success of 6132.22 'archive with all negative': 
+	git reset --hard &&
+	git clean -f &&
+	git -C sub archive --format=tar HEAD -- ":!sub/" >archive &&
+	"$TAR" tf archive >actual &&
 	cat >expect <<-\EOF &&
-	<COMMIT-P> refs/heads/main
-	<COMMIT-N> refs/heads/release
-	<COMMIT-D> refs/heads/topic/1
-	<COMMIT-H> refs/heads/topic/2
-	<COMMIT-D> refs/pull/1/head
-	<COMMIT-G> refs/pull/2/head
-	<TAG-1> refs/tags/v1
-	<TAG-2> refs/tags/v2
-	<TAG-3> refs/tags/v3
-	<COMMIT-P> HEAD
+	file
+	file2
 	EOF
 	test_cmp expect actual
 
-ok 29 - create bundle with duplicate refnames and --all
-
-expecting success of 6020.30 'create bundle with duplicate exlusion refnames': 
-	git bundle create out.bdl "main" "main^!" &&
+HEAD is now at ddefea6 sub2/file
+Removing actual
+Removing actual-grep
+Removing expect
+Removing expect-grep
+Removing sub/actual
+Removing sub/expect
+ok 22 - archive with all negative
 
-	git bundle list-heads out.bdl |
-		make_user_friendly_and_stable_output >actual &&
+expecting success of 6132.23 'add with all negative': 
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	git clean -f &&
+	test_when_finished "git reset --hard $H" &&
+	for path in file sub/file sub/sub/file sub2/file
+	do
+		echo smudge >>"$path" || return 1
+	done &&
+	git -C sub add -- ":!sub/" &&
+	git diff --name-only --no-renames --cached >actual &&
 	cat >expect <<-\EOF &&
-	<COMMIT-P> refs/heads/main
+	file
+	sub/file
+	sub2/file
 	EOF
+	test_cmp expect actual &&
+	git diff --name-only --no-renames >actual &&
+	echo sub/sub/file >expect &&
 	test_cmp expect actual
 
-ok 30 - create bundle with duplicate exlusion refnames
-
-expecting success of 6020.31 'create bundle with duplicate refname short-form': 
-	git bundle create out.bdl "main" "main" "refs/heads/main" "refs/heads/main" &&
+HEAD is now at ddefea6 sub2/file
+Removing actual
+Removing archive
+Removing expect
+HEAD is now at ddefea6 sub2/file
+ok 23 - add with all negative
 
-	git bundle list-heads out.bdl |
-		make_user_friendly_and_stable_output >actual &&
+expecting success of 6132.24 'add -p with all negative': 
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	git clean -f &&
+	test_when_finished "git reset --hard $H" &&
+	for path in file sub/file sub/sub/file sub2/file
+	do
+		echo smudge >>"$path" || return 1
+	done &&
+	yes | git -C sub add -p -- ":!sub/" &&
+	git diff --name-only --no-renames --cached >actual &&
 	cat >expect <<-\EOF &&
-	<COMMIT-P> refs/heads/main
+	file
+	sub/file
+	sub2/file
 	EOF
+	test_cmp expect actual &&
+	git diff --name-only --no-renames >actual &&
+	echo sub/sub/file >expect &&
 	test_cmp expect actual
 
-ok 31 - create bundle with duplicate refname short-form
+HEAD is now at ddefea6 sub2/file
+Removing actual
+Removing expect
+diff --git a/file b/file
+index e69de29..15f3720 100644
+--- a/file
++++ b/file
+@@ -0,0 +1 @@
++smudge
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/sub/file b/sub/file
+index e69de29..15f3720 100644
+--- a/sub/file
++++ b/sub/file
+@@ -0,0 +1 @@
++smudge
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/sub2/file b/sub2/file
+index e69de29..15f3720 100644
+--- a/sub2/file
++++ b/sub2/file
+@@ -0,0 +1 @@
++smudge
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+HEAD is now at ddefea6 sub2/file
+ok 24 - add -p with all negative
 
-expecting success of 6020.32 'read bundle over stdin': 
-	git bundle create some.bundle HEAD &&
+expecting success of 6132.25 'clean with all negative': 
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	test_when_finished "git reset --hard $H && git clean -f" &&
+	git clean -f &&
+	for path in file9 sub/file9 sub/sub/file9 sub2/file9
+	do
+		echo cruft >"$path" || return 1
+	done &&
+	git -C sub clean -f -- ":!sub" &&
+	test_path_is_file file9 &&
+	test_path_is_missing sub/file9 &&
+	test_path_is_file sub/sub/file9 &&
+	test_path_is_file sub2/file9
 
-	git bundle verify - <some.bundle 2>err &&
-	grep "<stdin> is okay" err &&
+HEAD is now at ddefea6 sub2/file
+Removing actual
+Removing expect
+Removing file9
+HEAD is now at ddefea6 sub2/file
+Removing file9
+Removing sub/sub/file9
+Removing sub2/file9
+ok 25 - clean with all negative
 
-	git bundle list-heads some.bundle >expect &&
-	git bundle list-heads - <some.bundle >actual &&
+expecting success of 6132.26 'commit with all negative': 
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	test_when_finished "git reset --hard $H" &&
+	for path in file sub/file sub/sub/file sub2/file
+	do
+		echo smudge >>"$path" || return 1
+	done &&
+	git -C sub commit -m sample -- ":!sub/" &&
+	git diff --name-only --no-renames HEAD^ HEAD >actual &&
+	cat >expect <<-\EOF &&
+	file
+	sub/file
+	sub2/file
+	EOF
 	test_cmp expect actual &&
-
-	git bundle unbundle some.bundle >expect &&
-	git bundle unbundle - <some.bundle >actual &&
+	git diff --name-only --no-renames HEAD >actual &&
+	echo sub/sub/file >expect &&
 	test_cmp expect actual
 
-The bundle contains this ref:
-da43db66582d34cbfc17b239b8fcbf1431323fb5 HEAD
-The bundle records a complete history.
-The bundle uses this hash algorithm: sha1
-<stdin> is okay
-ok 32 - read bundle over stdin
+HEAD is now at ddefea6 sub2/file
+[master cff0290] sample
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+HEAD is now at ddefea6 sub2/file
+ok 26 - commit with all negative
 
-expecting success of 6020.33 'send a bundle to standard output': 
-	git bundle create - --all HEAD >bundle-one &&
-	mkdir -p down &&
-	git -C down bundle create - --all HEAD >bundle-two &&
-	git bundle verify bundle-one &&
-	git bundle verify bundle-two &&
-	git ls-remote bundle-one >expect &&
-	git ls-remote bundle-two >actual &&
+expecting success of 6132.27 'reset with all negative': 
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	test_when_finished "git reset --hard $H" &&
+	for path in file sub/file sub/sub/file sub2/file
+	do
+		echo smudge >>"$path" &&
+		git add "$path" || return 1
+	done &&
+	git -C sub reset --quiet -- ":!sub/" &&
+	git diff --name-only --no-renames --cached >actual &&
+	echo sub/sub/file >expect &&
 	test_cmp expect actual
 
-bundle-one is okay
-The bundle contains these 10 refs:
-da43db66582d34cbfc17b239b8fcbf1431323fb5 refs/heads/main
-75dc67d2894ccd900ed1f4b992544e0a7df90d3a refs/heads/release
-c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/heads/topic/1
-d1a87a27cb017e8a16a8899db4d52c6adf190756 refs/heads/topic/2
-c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/pull/1/head
-2ead555f48a6ed17cf79c8bce97af0ae7bf686fc refs/pull/2/head
-bb88e543a8e18a6087c5190d3dc2bf22b4a7682e refs/tags/v1
-ed9aedd63f3cc030121642c1c240a9117eb9a121 refs/tags/v2
-64694153379bb61e8d6713ea7273107893c2185c refs/tags/v3
-da43db66582d34cbfc17b239b8fcbf1431323fb5 HEAD
-The bundle records a complete history.
-The bundle uses this hash algorithm: sha1
-bundle-two is okay
-The bundle contains these 10 refs:
-da43db66582d34cbfc17b239b8fcbf1431323fb5 refs/heads/main
-75dc67d2894ccd900ed1f4b992544e0a7df90d3a refs/heads/release
-c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/heads/topic/1
-d1a87a27cb017e8a16a8899db4d52c6adf190756 refs/heads/topic/2
-c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/pull/1/head
-2ead555f48a6ed17cf79c8bce97af0ae7bf686fc refs/pull/2/head
-bb88e543a8e18a6087c5190d3dc2bf22b4a7682e refs/tags/v1
-ed9aedd63f3cc030121642c1c240a9117eb9a121 refs/tags/v2
-64694153379bb61e8d6713ea7273107893c2185c refs/tags/v3
-da43db66582d34cbfc17b239b8fcbf1431323fb5 HEAD
-The bundle records a complete history.
-The bundle uses this hash algorithm: sha1
-ok 33 - send a bundle to standard output
+HEAD is now at ddefea6 sub2/file
+HEAD is now at ddefea6 sub2/file
+ok 27 - reset with all negative
 
-expecting success of 6020.34 'unbundle outside of a repository': 
-	git bundle create some.bundle HEAD &&
-	echo "fatal: Need a repository to unbundle." >expect &&
-	nongit test_must_fail git bundle unbundle "$(pwd)/some.bundle" 2>err &&
-	test_cmp expect err
+expecting success of 6132.28 'grep with all negative': 
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	test_when_finished "git reset --hard $H" &&
+	for path in file sub/file sub/sub/file sub2/file
+	do
+		echo "needle $path" >>"$path" || return 1
+	done &&
+	git -C sub grep -h needle -- ":!sub/" >actual &&
+	cat >expect <<-\EOF &&
+	needle sub/file
+	EOF
+	test_cmp expect actual
 
-ok 34 - unbundle outside of a repository
+HEAD is now at ddefea6 sub2/file
+HEAD is now at ddefea6 sub2/file
+ok 28 - grep with all negative
 
-expecting success of 6020.35 'list-heads outside of a repository': 
-	git bundle create some.bundle HEAD &&
-	cat >expect <<-EOF &&
-	$(git rev-parse HEAD) HEAD
+expecting success of 6132.29 'ls-files with all negative': 
+	git reset --hard &&
+	git -C sub ls-files -- ":!sub/" >actual &&
+	cat >expect <<-\EOF &&
+	file
+	file2
 	EOF
-	nongit git bundle list-heads "$(pwd)/some.bundle" >actual &&
 	test_cmp expect actual
 
-ok 35 - list-heads outside of a repository
+HEAD is now at ddefea6 sub2/file
+ok 29 - ls-files with all negative
 
-expecting success of 6020.36 'list-heads with bundle using sha1': 
-		test_when_finished "rm -rf hash" &&
-		git init --object-format=$hash hash &&
-		test_commit -C hash initial &&
-		git -C hash bundle create hash.bundle HEAD &&
+expecting success of 6132.30 'rm with all negative': 
+	git reset --hard &&
+	test_when_finished "git reset --hard" &&
+	git -C sub rm -r --cached -- ":!sub/" >actual &&
+	git diff --name-only --no-renames --diff-filter=D --cached >actual &&
+	cat >expect <<-\EOF &&
+	sub/file
+	sub/file2
+	EOF
+	test_cmp expect actual
 
-		cat >expect <<-EOF &&
-		$(git -C hash rev-parse HEAD) HEAD
-		EOF
-		git bundle list-heads hash/hash.bundle >actual &&
-		test_cmp expect actual
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6020-bundle-misc/hash/.git/
-[main (root-commit) ee4b540] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 36 - list-heads with bundle using sha1
+HEAD is now at ddefea6 sub2/file
+HEAD is now at ddefea6 sub2/file
+ok 30 - rm with all negative
 
-expecting success of 6020.37 'list-heads with bundle using sha256': 
-		test_when_finished "rm -rf hash" &&
-		git init --object-format=$hash hash &&
-		test_commit -C hash initial &&
-		git -C hash bundle create hash.bundle HEAD &&
+expecting success of 6132.31 'stash with all negative': 
+	H=$(git rev-parse HEAD) &&
+	git reset --hard $H &&
+	test_when_finished "git reset --hard $H" &&
+	for path in file sub/file sub/sub/file sub2/file
+	do
+		echo smudge >>"$path" || return 1
+	done &&
+	git -C sub stash push -m sample -- ":!sub/" &&
+	git diff --name-only --no-renames HEAD >actual &&
+	echo sub/sub/file >expect &&
+	test_cmp expect actual &&
+	git stash show --name-only >actual &&
+	cat >expect <<-\EOF &&
+	file
+	sub/file
+	sub2/file
+	EOF
+	test_cmp expect actual
 
-		cat >expect <<-EOF &&
-		$(git -C hash rev-parse HEAD) HEAD
-		EOF
-		git bundle list-heads hash/hash.bundle >actual &&
-		test_cmp expect actual
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6020-bundle-misc/hash/.git/
-[main (root-commit) 8b2bc6b] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 37 - list-heads with bundle using sha256
+HEAD is now at ddefea6 sub2/file
+Saved working directory and index state On master: sample
+HEAD is now at ddefea6 sub2/file
+ok 31 - stash with all negative
 
-# passed all 37 test(s)
-1..37
+# passed all 31 test(s)
+1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6135-pathspec-with-attrs.sh ***
@@ -417656,6 +418584,109 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6401-merge-criss-cross.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6401-merge-criss-cross/.git/
+expecting success of 6401.1 'prepare repository': 
+	test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
+	git add file &&
+	git commit -m "Initial commit" file &&
+
+	git branch A &&
+	git branch B &&
+	git checkout A &&
+
+	test_write_lines 1 2 3 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
+	git commit -m "B8" file &&
+	git checkout B &&
+
+	test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 8 9 >file &&
+	git commit -m "C3" file &&
+	git branch C3 &&
+
+	git merge -m "pre E3 merge" A &&
+
+	test_write_lines 1 2 "3 changed in E3, branch B. New file size" 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
+	git commit -m "E3" file &&
+
+	git checkout A &&
+	git merge -m "pre D8 merge" C3 &&
+	test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 "8 changed in D8, branch A. New file size 2" 9 >file &&
+
+	git commit -m D8 file
+
+[master (root-commit) 40a1fcc] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+)
+ create mode 100644 file
+Switched to branch 'A'
+[A 3e86c96] B8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'B'
+[B 039abf7] C3
+ 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(-)
+[B 4628fbc] E3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'A'
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[A 1f51d3d] D8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - prepare repository
+
+expecting success of 6401.2 'Criss-cross merge': 
+	git merge -m "final merge" B
+
+  From inner merge:  Auto-merging file
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 2 - Criss-cross merge
+
+expecting success of 6401.3 'Criss-cross merge result': 
+	cat <<-\EOF >file-expect &&
+	1
+	2
+	3 changed in E3, branch B. New file size
+	4
+	5
+	6
+	7
+	8 changed in D8, branch A. New file size 2
+	9
+	EOF
+
+	test_cmp file-expect file
+
+ok 3 - Criss-cross merge result
+
+expecting success of 6401.4 'Criss-cross merge fails (-s resolve)': 
+	git reset --hard A^ &&
+	test_must_fail git merge -s resolve -m "final merge" B
+
+HEAD is now at 1f51d3d D8
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Auto-merging file
+ERROR: content conflict in file
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - Criss-cross merge fails (-s resolve)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6137-pathspec-wildcards-literal.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6137-pathspec-wildcards-literal/.git/
 checking prerequisite: FUNNYNAMES
@@ -418201,109 +419232,6 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6401-merge-criss-cross.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6401-merge-criss-cross/.git/
-expecting success of 6401.1 'prepare repository': 
-	test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
-	git add file &&
-	git commit -m "Initial commit" file &&
-
-	git branch A &&
-	git branch B &&
-	git checkout A &&
-
-	test_write_lines 1 2 3 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
-	git commit -m "B8" file &&
-	git checkout B &&
-
-	test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 8 9 >file &&
-	git commit -m "C3" file &&
-	git branch C3 &&
-
-	git merge -m "pre E3 merge" A &&
-
-	test_write_lines 1 2 "3 changed in E3, branch B. New file size" 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
-	git commit -m "E3" file &&
-
-	git checkout A &&
-	git merge -m "pre D8 merge" C3 &&
-	test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 "8 changed in D8, branch A. New file size 2" 9 >file &&
-
-	git commit -m D8 file
-
-[master (root-commit) 40a1fcc] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 file
-Switched to branch 'A'
-[A 3e86c96] B8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'B'
-[B 039abf7] C3
- 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(-)
-[B 4628fbc] E3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'A'
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[A 1f51d3d] D8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - prepare repository
-
-expecting success of 6401.2 'Criss-cross merge': 
-	git merge -m "final merge" B
-
-  From inner merge:  Auto-merging file
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - Criss-cross merge
-
-expecting success of 6401.3 'Criss-cross merge result': 
-	cat <<-\EOF >file-expect &&
-	1
-	2
-	3 changed in E3, branch B. New file size
-	4
-	5
-	6
-	7
-	8 changed in D8, branch A. New file size 2
-	9
-	EOF
-
-	test_cmp file-expect file
-
-ok 3 - Criss-cross merge result
-
-expecting success of 6401.4 'Criss-cross merge fails (-s resolve)': 
-	git reset --hard A^ &&
-	test_must_fail git merge -s resolve -m "final merge" B
-
-HEAD is now at 1f51d3d D8
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Auto-merging file
-ERROR: content conflict in file
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - Criss-cross merge fails (-s resolve)
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6400-merge-df.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6400-merge-df/.git/
 expecting success of 6400.1 'prepare repository': 
@@ -418565,631 +419493,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6403-merge-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6403-merge-file/.git/
-expecting success of 6403.1 'setup': 
-	cat >orig.txt <<-\EOF &&
-	Dominus regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	EOF
-
-	cat >new1.txt <<-\EOF &&
-	Dominus regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam tu mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	EOF
-
-	cat >new2.txt <<-\EOF &&
-	Dominus regit me, et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	EOF
-
-	cat >new3.txt <<-\EOF &&
-	DOMINUS regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	EOF
-
-	cat >new4.txt <<-\EOF &&
-	Dominus regit me, et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	EOF
-
-	printf "propter nomen suum." >>new4.txt &&
-
-	cat >base.c <<-\EOF &&
-	int f(int x, int y)
-	{
-		if (x == 0)
-		{
-			return y;
-		}
-		return x;
-	}
-
-	int g(size_t u)
-	{
-		while (u < 30)
-		{
-			u++;
-		}
-		return u;
-	}
-	EOF
-
-	cat >ours.c <<-\EOF &&
-	int g(size_t u)
-	{
-		while (u < 30)
-		{
-			u++;
-		}
-		return u;
-	}
-
-	int h(int x, int y, int z)
-	{
-		if (z == 0)
-		{
-			return x;
-		}
-		return y;
-	}
-	EOF
-
-	cat >theirs.c <<-\EOF
-	int f(int x, int y)
-	{
-		if (x == 0)
-		{
-			return y;
-		}
-		return x;
-	}
-
-	int g(size_t u)
-	{
-		while (u > 34)
-		{
-			u--;
-		}
-		return u;
-	}
-	EOF
-
-ok 1 - setup
-
-expecting success of 6403.2 'merge with no changes': 
-	cp orig.txt test.txt &&
-	git merge-file test.txt orig.txt orig.txt &&
-	test_cmp test.txt orig.txt
-
-ok 2 - merge with no changes
-
-expecting success of 6403.3 'merge with no changes with --object-id': 
-	git add orig.txt &&
-	git merge-file -p --object-id :orig.txt :orig.txt :orig.txt >actual &&
-	test_cmp actual orig.txt
-
-ok 3 - merge with no changes with --object-id
-
-expecting success of 6403.4 'merge without conflict': 
-	cp new1.txt test.txt &&
-	git merge-file test.txt orig.txt new2.txt
-
-ok 4 - merge without conflict
-
-expecting success of 6403.5 'merge without conflict with --object-id': 
-	git add orig.txt new2.txt &&
-	git merge-file --object-id :orig.txt :orig.txt :new2.txt >actual &&
-	git rev-parse :new2.txt >expected &&
-	test_cmp actual expected
-
-ok 5 - merge without conflict with --object-id
-
-expecting success of 6403.6 'can accept object ID with --object-id': 
-	git merge-file --object-id $(test_oid empty_blob) $(test_oid empty_blob) :new2.txt >actual &&
-	git rev-parse :new2.txt >expected &&
-	test_cmp actual expected
-
-ok 6 - can accept object ID with --object-id
-
-expecting success of 6403.7 'works in subdirectory': 
-	mkdir dir &&
-	cp new1.txt dir/a.txt &&
-	cp orig.txt dir/o.txt &&
-	cp new2.txt dir/b.txt &&
-	( cd dir && git merge-file a.txt o.txt b.txt ) &&
-	test_path_is_missing a.txt
-
-ok 7 - works in subdirectory
-
-expecting success of 6403.8 'merge without conflict (--quiet)': 
-	cp new1.txt test.txt &&
-	git merge-file --quiet test.txt orig.txt new2.txt
-
-ok 8 - merge without conflict (--quiet)
-
-checking known breakage of 6403.9 'merge without conflict (missing LF at EOF)': 
-	cp new1.txt test2.txt &&
-	git merge-file test2.txt orig.txt new4.txt
-
-not ok 9 - merge without conflict (missing LF at EOF) # TODO known breakage
-
-checking known breakage of 6403.10 'merge result added missing LF': 
-	test_cmp test.txt test2.txt
-
---- test.txt	2025-08-27 08:22:16.172167865 +0000
-+++ test2.txt	2025-08-27 08:22:16.184167944 +0000
-@@ -3,7 +3,11 @@
- super aquam refectionis educavit me;
- animam meam convertit,
- deduxit me super semitas jusitiae,
-+<<<<<<< test2.txt
- propter nomen suum.
- Nam et si ambulavero in medio umbrae mortis,
- non timebo mala, quoniam tu mecum es:
- virga tua et baculus tuus ipsa me consolata sunt.
-+=======
-+propter nomen suum.
-+>>>>>>> new4.txt
-not ok 10 - merge result added missing LF # TODO known breakage
-
-expecting success of 6403.11 'merge without conflict (missing LF at EOF, away from change in the other file)': 
-	cp new4.txt test3.txt &&
-	git merge-file --quiet test3.txt new2.txt new3.txt
-
-ok 11 - merge without conflict (missing LF at EOF, away from change in the other file)
-
-expecting success of 6403.12 'merge does not add LF away of change': 
-	cat >expect.txt <<-\EOF &&
-	DOMINUS regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	EOF
-	printf "propter nomen suum." >>expect.txt &&
-
-	test_cmp expect.txt test3.txt
-
-ok 12 - merge does not add LF away of change
-
-expecting success of 6403.13 'merge with conflicts': 
-	cp test.txt backup.txt &&
-	test_must_fail git merge-file test.txt orig.txt new3.txt
-
-ok 13 - merge with conflicts
-
-expecting success of 6403.14 'expected conflict markers': 
-	cat >expect.txt <<-\EOF &&
-	<<<<<<< test.txt
-	Dominus regit me, et nihil mihi deerit.
-	=======
-	DOMINUS regit me,
-	et nihil mihi deerit.
-	>>>>>>> new3.txt
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam tu mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	EOF
-
-	test_cmp expect.txt test.txt
-
-ok 14 - expected conflict markers
-
-expecting success of 6403.15 'merge with conflicts with --object-id': 
-	git add backup.txt orig.txt new3.txt &&
-	test_must_fail git merge-file -p --object-id :backup.txt :orig.txt :new3.txt >actual &&
-	sed -e "s/<< test.txt/<< :backup.txt/" \
-	    -e "s/>> new3.txt/>> :new3.txt/" \
-	    expect.txt >expect &&
-	test_cmp expect actual &&
-	test_must_fail git merge-file --object-id :backup.txt :orig.txt :new3.txt >oid &&
-	git cat-file blob "$(cat oid)" >actual &&
-	test_cmp expect actual
-
-ok 15 - merge with conflicts with --object-id
-
-expecting success of 6403.16 'merge with conflicts with --object-id with labels': 
-	git add backup.txt orig.txt new3.txt &&
-	test_must_fail git merge-file -p --object-id \
-		-L test.txt -L orig.txt -L new3.txt \
-		:backup.txt :orig.txt :new3.txt >actual &&
-	test_cmp expect.txt actual &&
-	test_must_fail git merge-file --object-id \
-		-L test.txt -L orig.txt -L new3.txt \
-		:backup.txt :orig.txt :new3.txt >oid &&
-	git cat-file blob "$(cat oid)" >actual &&
-	test_cmp expect.txt actual
-
-ok 16 - merge with conflicts with --object-id with labels
-
-expecting success of 6403.17 'merge conflicting with --ours': 
-	cp backup.txt test.txt &&
-
-	cat >expect.txt <<-\EOF &&
-	Dominus regit me, et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam tu mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	EOF
-
-	git merge-file --ours test.txt orig.txt new3.txt &&
-	test_cmp expect.txt test.txt
-
-ok 17 - merge conflicting with --ours
-
-expecting success of 6403.18 'merge conflicting with --theirs': 
-	cp backup.txt test.txt &&
-
-	cat >expect.txt <<-\EOF &&
-	DOMINUS regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam tu mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	EOF
-
-	git merge-file --theirs test.txt orig.txt new3.txt &&
-	test_cmp expect.txt test.txt
-
-ok 18 - merge conflicting with --theirs
-
-expecting success of 6403.19 'merge conflicting with --union': 
-	cp backup.txt test.txt &&
-
-	cat >expect.txt <<-\EOF &&
-	Dominus regit me, et nihil mihi deerit.
-	DOMINUS regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam tu mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	EOF
-
-	git merge-file --union test.txt orig.txt new3.txt &&
-	test_cmp expect.txt test.txt
-
-ok 19 - merge conflicting with --union
-
-expecting success of 6403.20 'merge with conflicts, using -L': 
-	cp backup.txt test.txt &&
-
-	test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt
-
-ok 20 - merge with conflicts, using -L
-
-expecting success of 6403.21 'expected conflict markers, with -L': 
-	cat >expect.txt <<-\EOF &&
-	<<<<<<< 1
-	Dominus regit me, et nihil mihi deerit.
-	=======
-	DOMINUS regit me,
-	et nihil mihi deerit.
-	>>>>>>> new3.txt
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam tu mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	EOF
-
-	test_cmp expect.txt test.txt
-
-ok 21 - expected conflict markers, with -L
-
-expecting success of 6403.22 'conflict in removed tail': 
-	sed "s/ tu / TU /" <new1.txt >new5.txt &&
-	test_must_fail git merge-file -p orig.txt new1.txt new5.txt >out
-
-ok 22 - conflict in removed tail
-
-expecting success of 6403.23 'expected conflict markers': 
-	cat >expect <<-\EOF &&
-	Dominus regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	<<<<<<< orig.txt
-	=======
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam TU mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	>>>>>>> new5.txt
-	EOF
-
-	test_cmp expect out
-
-ok 23 - expected conflict markers
-
-expecting success of 6403.24 'binary files cannot be merged': 
-	test_must_fail git merge-file -p \
-		orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err &&
-	grep "Cannot merge binary files" merge.err
-
-error: Cannot merge binary files: /build/reproducible-path/git-2.51.0/t/test-binary-1.png
-ok 24 - binary files cannot be merged
-
-expecting success of 6403.25 'binary files cannot be merged with --object-id': 
-	cp "$TEST_DIRECTORY"/test-binary-1.png . &&
-	git add orig.txt new1.txt test-binary-1.png &&
-	test_must_fail git merge-file --object-id \
-		:orig.txt :test-binary-1.png :new1.txt 2> merge.err &&
-	grep "Cannot merge binary files" merge.err
-
-error: Cannot merge binary files: :test-binary-1.png
-ok 25 - binary files cannot be merged with --object-id
-
-expecting success of 6403.26 'MERGE_ZEALOUS simplifies non-conflicts': 
-	sed -e "s/deerit.\$/deerit;/" -e "s/me;\$/me./" <new5.txt >new6.txt &&
-	sed -e "s/deerit.\$/deerit,/" -e "s/me;\$/me,/" <new5.txt >new7.txt &&
-
-	test_must_fail git merge-file -p new6.txt new5.txt new7.txt > output &&
-	test 1 = $(grep ======= <output | wc -l)
-
-ok 26 - MERGE_ZEALOUS simplifies non-conflicts
-
-expecting success of 6403.27 'ZEALOUS_ALNUM': 
-	sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit;/" <new6.txt | tr % "\012" >new8.txt &&
-	sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit --/" <new7.txt | tr % "\012" >new9.txt &&
-
-	test_must_fail git merge-file -p \
-		new8.txt new5.txt new9.txt >merge.out &&
-	test 1 = $(grep ======= <merge.out | wc -l)
-
-ok 27 - ZEALOUS_ALNUM
-
-expecting success of 6403.28 '"diff3 -m" style output (1)': 
-	cat >expect <<-\EOF &&
-	Dominus regit me,
-	<<<<<<< new8.txt
-	et nihil mihi deerit;
-
-
-
-
-	In loco pascuae ibi me collocavit;
-	super aquam refectionis educavit me.
-	||||||| new5.txt
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	=======
-	et nihil mihi deerit,
-
-
-
-
-	In loco pascuae ibi me collocavit --
-	super aquam refectionis educavit me,
-	>>>>>>> new9.txt
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam TU mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	EOF
-
-	test_must_fail git merge-file -p --diff3 \
-		new8.txt new5.txt new9.txt >actual &&
-	test_cmp expect actual
-
-ok 28 - "diff3 -m" style output (1)
-
-expecting success of 6403.29 '"diff3 -m" style output (2)': 
-	git config merge.conflictstyle diff3 &&
-	test_must_fail git merge-file -p \
-		new8.txt new5.txt new9.txt >actual &&
-	test_cmp expect actual
-
-ok 29 - "diff3 -m" style output (2)
-
-expecting success of 6403.30 'marker size': 
-	cat >expect <<-\EOF &&
-	Dominus regit me,
-	<<<<<<<<<< new8.txt
-	et nihil mihi deerit;
-
-
-
-
-	In loco pascuae ibi me collocavit;
-	super aquam refectionis educavit me.
-	|||||||||| new5.txt
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	==========
-	et nihil mihi deerit,
-
-
-
-
-	In loco pascuae ibi me collocavit --
-	super aquam refectionis educavit me,
-	>>>>>>>>>> new9.txt
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam TU mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	EOF
-
-	test_must_fail git merge-file -p --marker-size=10 \
-		new8.txt new5.txt new9.txt >actual &&
-	test_cmp expect actual
-
-ok 30 - marker size
-
-expecting success of 6403.31 'conflict at EOF without LF resolved by --ours': 
-	printf "line1\nline2\nline3" >nolf-orig.txt &&
-	printf "line1\nline2\nline3x" >nolf-diff1.txt &&
-	printf "line1\nline2\nline3y" >nolf-diff2.txt &&
-
-	git merge-file -p --ours nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
-	printf "line1\nline2\nline3x" >expect.txt &&
-	test_cmp expect.txt output.txt
-
-ok 31 - conflict at EOF without LF resolved by --ours
-
-expecting success of 6403.32 'conflict at EOF without LF resolved by --theirs': 
-	git merge-file -p --theirs nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
-	printf "line1\nline2\nline3y" >expect.txt &&
-	test_cmp expect.txt output.txt
-
-ok 32 - conflict at EOF without LF resolved by --theirs
-
-expecting success of 6403.33 'conflict at EOF without LF resolved by --union': 
-	git merge-file -p --union nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
-	printf "line1\nline2\nline3x\nline3y" >expect.txt &&
-	test_cmp expect.txt output.txt
-
-ok 33 - conflict at EOF without LF resolved by --union
-
-expecting success of 6403.34 'conflict sections match existing line endings': 
-	printf "1\\r\\n2\\r\\n3" >crlf-orig.txt &&
-	printf "1\\r\\n2\\r\\n4" >crlf-diff1.txt &&
-	printf "1\\r\\n2\\r\\n5" >crlf-diff2.txt &&
-	test_must_fail git -c core.eol=crlf merge-file -p \
-		crlf-diff1.txt crlf-orig.txt crlf-diff2.txt >crlf.txt &&
-	test $(tr "\015" Q <crlf.txt | grep "^[<=>].*Q$" | wc -l) = 3 &&
-	test $(tr "\015" Q <crlf.txt | grep "[345]Q$" | wc -l) = 3 &&
-	test_must_fail git -c core.eol=crlf merge-file -p \
-		nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >nolf.txt &&
-	test $(tr "\015" Q <nolf.txt | grep "^[<=>].*Q$" | wc -l) = 0
-
-ok 34 - conflict sections match existing line endings
-
-expecting success of 6403.35 '--object-id fails without repository': 
-	empty="$(test_oid empty_blob)" &&
-	nongit test_must_fail git merge-file --object-id $empty $empty $empty 2>err &&
-	grep "not a git repository" err
-
-fatal: not a git repository (or any of the parent directories): .git
-ok 35 - --object-id fails without repository
-
-expecting success of 6403.36 'merging C files with "myers" diff algorithm creates some spurious conflicts': 
-	cat >expect.c <<-\EOF &&
-	int g(size_t u)
-	{
-		while (u < 30)
-		{
-			u++;
-		}
-		return u;
-	}
-
-	int h(int x, int y, int z)
-	{
-	<<<<<<< ours.c
-		if (z == 0)
-	||||||| base.c
-		while (u < 30)
-	=======
-		while (u > 34)
-	>>>>>>> theirs.c
-		{
-	<<<<<<< ours.c
-			return x;
-	||||||| base.c
-			u++;
-	=======
-			u--;
-	>>>>>>> theirs.c
-		}
-		return y;
-	}
-	EOF
-
-	test_must_fail git merge-file -p --diff3 --diff-algorithm myers ours.c base.c theirs.c >myers_output.c &&
-	test_cmp expect.c myers_output.c
-
-ok 36 - merging C files with "myers" diff algorithm creates some spurious conflicts
-
-expecting success of 6403.37 'merging C files with "histogram" diff algorithm avoids some spurious conflicts': 
-	cat >expect.c <<-\EOF &&
-	int g(size_t u)
-	{
-		while (u > 34)
-		{
-			u--;
-		}
-		return u;
-	}
-
-	int h(int x, int y, int z)
-	{
-		if (z == 0)
-		{
-			return x;
-		}
-		return y;
-	}
-	EOF
-
-	git merge-file -p --diff3 --diff-algorithm histogram ours.c base.c theirs.c >histogram_output.c &&
-	test_cmp expect.c histogram_output.c
-
-ok 37 - merging C files with "histogram" diff algorithm avoids some spurious conflicts
-
-# still have 2 known breakage(s)
-# passed all remaining 35 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6405-merge-symlinks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6405-merge-symlinks/.git/
 expecting success of 6405.1 'setup': 
@@ -420229,6 +420532,631 @@
 1..60
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6403-merge-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6403-merge-file/.git/
+expecting success of 6403.1 'setup': 
+	cat >orig.txt <<-\EOF &&
+	Dominus regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	EOF
+
+	cat >new1.txt <<-\EOF &&
+	Dominus regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	cat >new2.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	EOF
+
+	cat >new3.txt <<-\EOF &&
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	EOF
+
+	cat >new4.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	EOF
+
+	printf "propter nomen suum." >>new4.txt &&
+
+	cat >base.c <<-\EOF &&
+	int f(int x, int y)
+	{
+		if (x == 0)
+		{
+			return y;
+		}
+		return x;
+	}
+
+	int g(size_t u)
+	{
+		while (u < 30)
+		{
+			u++;
+		}
+		return u;
+	}
+	EOF
+
+	cat >ours.c <<-\EOF &&
+	int g(size_t u)
+	{
+		while (u < 30)
+		{
+			u++;
+		}
+		return u;
+	}
+
+	int h(int x, int y, int z)
+	{
+		if (z == 0)
+		{
+			return x;
+		}
+		return y;
+	}
+	EOF
+
+	cat >theirs.c <<-\EOF
+	int f(int x, int y)
+	{
+		if (x == 0)
+		{
+			return y;
+		}
+		return x;
+	}
+
+	int g(size_t u)
+	{
+		while (u > 34)
+		{
+			u--;
+		}
+		return u;
+	}
+	EOF
+
+ok 1 - setup
+
+expecting success of 6403.2 'merge with no changes': 
+	cp orig.txt test.txt &&
+	git merge-file test.txt orig.txt orig.txt &&
+	test_cmp test.txt orig.txt
+
+ok 2 - merge with no changes
+
+expecting success of 6403.3 'merge with no changes with --object-id': 
+	git add orig.txt &&
+	git merge-file -p --object-id :orig.txt :orig.txt :orig.txt >actual &&
+	test_cmp actual orig.txt
+
+ok 3 - merge with no changes with --object-id
+
+expecting success of 6403.4 'merge without conflict': 
+	cp new1.txt test.txt &&
+	git merge-file test.txt orig.txt new2.txt
+
+ok 4 - merge without conflict
+
+expecting success of 6403.5 'merge without conflict with --object-id': 
+	git add orig.txt new2.txt &&
+	git merge-file --object-id :orig.txt :orig.txt :new2.txt >actual &&
+	git rev-parse :new2.txt >expected &&
+	test_cmp actual expected
+
+ok 5 - merge without conflict with --object-id
+
+expecting success of 6403.6 'can accept object ID with --object-id': 
+	git merge-file --object-id $(test_oid empty_blob) $(test_oid empty_blob) :new2.txt >actual &&
+	git rev-parse :new2.txt >expected &&
+	test_cmp actual expected
+
+ok 6 - can accept object ID with --object-id
+
+expecting success of 6403.7 'works in subdirectory': 
+	mkdir dir &&
+	cp new1.txt dir/a.txt &&
+	cp orig.txt dir/o.txt &&
+	cp new2.txt dir/b.txt &&
+	( cd dir && git merge-file a.txt o.txt b.txt ) &&
+	test_path_is_missing a.txt
+
+ok 7 - works in subdirectory
+
+expecting success of 6403.8 'merge without conflict (--quiet)': 
+	cp new1.txt test.txt &&
+	git merge-file --quiet test.txt orig.txt new2.txt
+
+ok 8 - merge without conflict (--quiet)
+
+checking known breakage of 6403.9 'merge without conflict (missing LF at EOF)': 
+	cp new1.txt test2.txt &&
+	git merge-file test2.txt orig.txt new4.txt
+
+not ok 9 - merge without conflict (missing LF at EOF) # TODO known breakage
+
+checking known breakage of 6403.10 'merge result added missing LF': 
+	test_cmp test.txt test2.txt
+
+--- test.txt	2026-09-29 14:53:15.854548970 +0000
++++ test2.txt	2026-09-29 14:53:15.862548970 +0000
+@@ -3,7 +3,11 @@
+ super aquam refectionis educavit me;
+ animam meam convertit,
+ deduxit me super semitas jusitiae,
++<<<<<<< test2.txt
+ propter nomen suum.
+ Nam et si ambulavero in medio umbrae mortis,
+ non timebo mala, quoniam tu mecum es:
+ virga tua et baculus tuus ipsa me consolata sunt.
++=======
++propter nomen suum.
++>>>>>>> new4.txt
+not ok 10 - merge result added missing LF # TODO known breakage
+
+expecting success of 6403.11 'merge without conflict (missing LF at EOF, away from change in the other file)': 
+	cp new4.txt test3.txt &&
+	git merge-file --quiet test3.txt new2.txt new3.txt
+
+ok 11 - merge without conflict (missing LF at EOF, away from change in the other file)
+
+expecting success of 6403.12 'merge does not add LF away of change': 
+	cat >expect.txt <<-\EOF &&
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	EOF
+	printf "propter nomen suum." >>expect.txt &&
+
+	test_cmp expect.txt test3.txt
+
+ok 12 - merge does not add LF away of change
+
+expecting success of 6403.13 'merge with conflicts': 
+	cp test.txt backup.txt &&
+	test_must_fail git merge-file test.txt orig.txt new3.txt
+
+ok 13 - merge with conflicts
+
+expecting success of 6403.14 'expected conflict markers': 
+	cat >expect.txt <<-\EOF &&
+	<<<<<<< test.txt
+	Dominus regit me, et nihil mihi deerit.
+	=======
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	>>>>>>> new3.txt
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	test_cmp expect.txt test.txt
+
+ok 14 - expected conflict markers
+
+expecting success of 6403.15 'merge with conflicts with --object-id': 
+	git add backup.txt orig.txt new3.txt &&
+	test_must_fail git merge-file -p --object-id :backup.txt :orig.txt :new3.txt >actual &&
+	sed -e "s/<< test.txt/<< :backup.txt/" \
+	    -e "s/>> new3.txt/>> :new3.txt/" \
+	    expect.txt >expect &&
+	test_cmp expect actual &&
+	test_must_fail git merge-file --object-id :backup.txt :orig.txt :new3.txt >oid &&
+	git cat-file blob "$(cat oid)" >actual &&
+	test_cmp expect actual
+
+ok 15 - merge with conflicts with --object-id
+
+expecting success of 6403.16 'merge with conflicts with --object-id with labels': 
+	git add backup.txt orig.txt new3.txt &&
+	test_must_fail git merge-file -p --object-id \
+		-L test.txt -L orig.txt -L new3.txt \
+		:backup.txt :orig.txt :new3.txt >actual &&
+	test_cmp expect.txt actual &&
+	test_must_fail git merge-file --object-id \
+		-L test.txt -L orig.txt -L new3.txt \
+		:backup.txt :orig.txt :new3.txt >oid &&
+	git cat-file blob "$(cat oid)" >actual &&
+	test_cmp expect.txt actual
+
+ok 16 - merge with conflicts with --object-id with labels
+
+expecting success of 6403.17 'merge conflicting with --ours': 
+	cp backup.txt test.txt &&
+
+	cat >expect.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	git merge-file --ours test.txt orig.txt new3.txt &&
+	test_cmp expect.txt test.txt
+
+ok 17 - merge conflicting with --ours
+
+expecting success of 6403.18 'merge conflicting with --theirs': 
+	cp backup.txt test.txt &&
+
+	cat >expect.txt <<-\EOF &&
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	git merge-file --theirs test.txt orig.txt new3.txt &&
+	test_cmp expect.txt test.txt
+
+ok 18 - merge conflicting with --theirs
+
+expecting success of 6403.19 'merge conflicting with --union': 
+	cp backup.txt test.txt &&
+
+	cat >expect.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	git merge-file --union test.txt orig.txt new3.txt &&
+	test_cmp expect.txt test.txt
+
+ok 19 - merge conflicting with --union
+
+expecting success of 6403.20 'merge with conflicts, using -L': 
+	cp backup.txt test.txt &&
+
+	test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt
+
+ok 20 - merge with conflicts, using -L
+
+expecting success of 6403.21 'expected conflict markers, with -L': 
+	cat >expect.txt <<-\EOF &&
+	<<<<<<< 1
+	Dominus regit me, et nihil mihi deerit.
+	=======
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	>>>>>>> new3.txt
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	test_cmp expect.txt test.txt
+
+ok 21 - expected conflict markers, with -L
+
+expecting success of 6403.22 'conflict in removed tail': 
+	sed "s/ tu / TU /" <new1.txt >new5.txt &&
+	test_must_fail git merge-file -p orig.txt new1.txt new5.txt >out
+
+ok 22 - conflict in removed tail
+
+expecting success of 6403.23 'expected conflict markers': 
+	cat >expect <<-\EOF &&
+	Dominus regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	<<<<<<< orig.txt
+	=======
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam TU mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	>>>>>>> new5.txt
+	EOF
+
+	test_cmp expect out
+
+ok 23 - expected conflict markers
+
+expecting success of 6403.24 'binary files cannot be merged': 
+	test_must_fail git merge-file -p \
+		orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err &&
+	grep "Cannot merge binary files" merge.err
+
+error: Cannot merge binary files: /build/reproducible-path/git-2.51.0/t/test-binary-1.png
+ok 24 - binary files cannot be merged
+
+expecting success of 6403.25 'binary files cannot be merged with --object-id': 
+	cp "$TEST_DIRECTORY"/test-binary-1.png . &&
+	git add orig.txt new1.txt test-binary-1.png &&
+	test_must_fail git merge-file --object-id \
+		:orig.txt :test-binary-1.png :new1.txt 2> merge.err &&
+	grep "Cannot merge binary files" merge.err
+
+error: Cannot merge binary files: :test-binary-1.png
+ok 25 - binary files cannot be merged with --object-id
+
+expecting success of 6403.26 'MERGE_ZEALOUS simplifies non-conflicts': 
+	sed -e "s/deerit.\$/deerit;/" -e "s/me;\$/me./" <new5.txt >new6.txt &&
+	sed -e "s/deerit.\$/deerit,/" -e "s/me;\$/me,/" <new5.txt >new7.txt &&
+
+	test_must_fail git merge-file -p new6.txt new5.txt new7.txt > output &&
+	test 1 = $(grep ======= <output | wc -l)
+
+ok 26 - MERGE_ZEALOUS simplifies non-conflicts
+
+expecting success of 6403.27 'ZEALOUS_ALNUM': 
+	sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit;/" <new6.txt | tr % "\012" >new8.txt &&
+	sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit --/" <new7.txt | tr % "\012" >new9.txt &&
+
+	test_must_fail git merge-file -p \
+		new8.txt new5.txt new9.txt >merge.out &&
+	test 1 = $(grep ======= <merge.out | wc -l)
+
+ok 27 - ZEALOUS_ALNUM
+
+expecting success of 6403.28 '"diff3 -m" style output (1)': 
+	cat >expect <<-\EOF &&
+	Dominus regit me,
+	<<<<<<< new8.txt
+	et nihil mihi deerit;
+
+
+
+
+	In loco pascuae ibi me collocavit;
+	super aquam refectionis educavit me.
+	||||||| new5.txt
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	=======
+	et nihil mihi deerit,
+
+
+
+
+	In loco pascuae ibi me collocavit --
+	super aquam refectionis educavit me,
+	>>>>>>> new9.txt
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam TU mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	test_must_fail git merge-file -p --diff3 \
+		new8.txt new5.txt new9.txt >actual &&
+	test_cmp expect actual
+
+ok 28 - "diff3 -m" style output (1)
+
+expecting success of 6403.29 '"diff3 -m" style output (2)': 
+	git config merge.conflictstyle diff3 &&
+	test_must_fail git merge-file -p \
+		new8.txt new5.txt new9.txt >actual &&
+	test_cmp expect actual
+
+ok 29 - "diff3 -m" style output (2)
+
+expecting success of 6403.30 'marker size': 
+	cat >expect <<-\EOF &&
+	Dominus regit me,
+	<<<<<<<<<< new8.txt
+	et nihil mihi deerit;
+
+
+
+
+	In loco pascuae ibi me collocavit;
+	super aquam refectionis educavit me.
+	|||||||||| new5.txt
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	==========
+	et nihil mihi deerit,
+
+
+
+
+	In loco pascuae ibi me collocavit --
+	super aquam refectionis educavit me,
+	>>>>>>>>>> new9.txt
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam TU mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	test_must_fail git merge-file -p --marker-size=10 \
+		new8.txt new5.txt new9.txt >actual &&
+	test_cmp expect actual
+
+ok 30 - marker size
+
+expecting success of 6403.31 'conflict at EOF without LF resolved by --ours': 
+	printf "line1\nline2\nline3" >nolf-orig.txt &&
+	printf "line1\nline2\nline3x" >nolf-diff1.txt &&
+	printf "line1\nline2\nline3y" >nolf-diff2.txt &&
+
+	git merge-file -p --ours nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
+	printf "line1\nline2\nline3x" >expect.txt &&
+	test_cmp expect.txt output.txt
+
+ok 31 - conflict at EOF without LF resolved by --ours
+
+expecting success of 6403.32 'conflict at EOF without LF resolved by --theirs': 
+	git merge-file -p --theirs nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
+	printf "line1\nline2\nline3y" >expect.txt &&
+	test_cmp expect.txt output.txt
+
+ok 32 - conflict at EOF without LF resolved by --theirs
+
+expecting success of 6403.33 'conflict at EOF without LF resolved by --union': 
+	git merge-file -p --union nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
+	printf "line1\nline2\nline3x\nline3y" >expect.txt &&
+	test_cmp expect.txt output.txt
+
+ok 33 - conflict at EOF without LF resolved by --union
+
+expecting success of 6403.34 'conflict sections match existing line endings': 
+	printf "1\\r\\n2\\r\\n3" >crlf-orig.txt &&
+	printf "1\\r\\n2\\r\\n4" >crlf-diff1.txt &&
+	printf "1\\r\\n2\\r\\n5" >crlf-diff2.txt &&
+	test_must_fail git -c core.eol=crlf merge-file -p \
+		crlf-diff1.txt crlf-orig.txt crlf-diff2.txt >crlf.txt &&
+	test $(tr "\015" Q <crlf.txt | grep "^[<=>].*Q$" | wc -l) = 3 &&
+	test $(tr "\015" Q <crlf.txt | grep "[345]Q$" | wc -l) = 3 &&
+	test_must_fail git -c core.eol=crlf merge-file -p \
+		nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >nolf.txt &&
+	test $(tr "\015" Q <nolf.txt | grep "^[<=>].*Q$" | wc -l) = 0
+
+ok 34 - conflict sections match existing line endings
+
+expecting success of 6403.35 '--object-id fails without repository': 
+	empty="$(test_oid empty_blob)" &&
+	nongit test_must_fail git merge-file --object-id $empty $empty $empty 2>err &&
+	grep "not a git repository" err
+
+fatal: not a git repository (or any of the parent directories): .git
+ok 35 - --object-id fails without repository
+
+expecting success of 6403.36 'merging C files with "myers" diff algorithm creates some spurious conflicts': 
+	cat >expect.c <<-\EOF &&
+	int g(size_t u)
+	{
+		while (u < 30)
+		{
+			u++;
+		}
+		return u;
+	}
+
+	int h(int x, int y, int z)
+	{
+	<<<<<<< ours.c
+		if (z == 0)
+	||||||| base.c
+		while (u < 30)
+	=======
+		while (u > 34)
+	>>>>>>> theirs.c
+		{
+	<<<<<<< ours.c
+			return x;
+	||||||| base.c
+			u++;
+	=======
+			u--;
+	>>>>>>> theirs.c
+		}
+		return y;
+	}
+	EOF
+
+	test_must_fail git merge-file -p --diff3 --diff-algorithm myers ours.c base.c theirs.c >myers_output.c &&
+	test_cmp expect.c myers_output.c
+
+ok 36 - merging C files with "myers" diff algorithm creates some spurious conflicts
+
+expecting success of 6403.37 'merging C files with "histogram" diff algorithm avoids some spurious conflicts': 
+	cat >expect.c <<-\EOF &&
+	int g(size_t u)
+	{
+		while (u > 34)
+		{
+			u--;
+		}
+		return u;
+	}
+
+	int h(int x, int y, int z)
+	{
+		if (z == 0)
+		{
+			return x;
+		}
+		return y;
+	}
+	EOF
+
+	git merge-file -p --diff3 --diff-algorithm histogram ours.c base.c theirs.c >histogram_output.c &&
+	test_cmp expect.c histogram_output.c
+
+ok 37 - merging C files with "histogram" diff algorithm avoids some spurious conflicts
+
+# still have 2 known breakage(s)
+# passed all remaining 35 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6404-recursive-merge.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6404-recursive-merge/.git/
 expecting success of 6404.1 'setup tests': 
@@ -420429,6 +421357,93 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6407-merge-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6407-merge-binary/.git/
+expecting success of 6407.1 'setup': 
+
+	cat "$TEST_DIRECTORY"/test-binary-1.png >m &&
+	git add m &&
+	git ls-files -s | sed -e "s/ 0	/ 1	/" >E1 &&
+	test_tick &&
+	git commit -m "initial" &&
+
+	git branch side &&
+	echo frotz >a &&
+	git add a &&
+	echo nitfol >>m &&
+	git add a m &&
+	git ls-files -s a >E0 &&
+	git ls-files -s m | sed -e "s/ 0	/ 3	/" >E3 &&
+	test_tick &&
+	git commit -m "main adds some" &&
+
+	git checkout side &&
+	echo rezrov >>m &&
+	git add m &&
+	git ls-files -s m | sed -e "s/ 0	/ 2	/" >E2 &&
+	test_tick &&
+	git commit -m "side modifies" &&
+
+	git tag anchor &&
+
+	cat E0 E1 E2 E3 >expect
+
+[main (root-commit) f315366] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 m
+[main f94be88] main adds some
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 a
+Switched to branch 'side'
+[side 020cbcd] side modifies
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 1 - setup
+
+expecting success of 6407.2 'resolve': 
+
+	rm -f a* m* &&
+	git reset --hard anchor &&
+
+	test_must_fail git merge -s resolve main &&
+	git ls-files -s >current &&
+	test_cmp expect current
+
+HEAD is now at 020cbcd side modifies
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Auto-merging m
+error: Cannot merge binary files: .merge_file_4XLU3W
+ERROR: content conflict in m
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - resolve
+
+expecting success of 6407.3 'recursive': 
+
+	rm -f a* m* &&
+	git reset --hard anchor &&
+
+	test_must_fail git merge -s recursive main &&
+	git ls-files -s >current &&
+	test_cmp expect current
+
+HEAD is now at 020cbcd side modifies
+warning: Cannot merge binary files: m (HEAD vs. main)
+Auto-merging m
+CONFLICT (content): Merge conflict in m
+Automatic merge failed; fix conflicts and then commit the result.
+ok 3 - recursive
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6408-merge-up-to-date.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6408-merge-up-to-date/.git/
 expecting success of 6408.1 'setup': 
@@ -421532,88 +422547,59 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6407-merge-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6407-merge-binary/.git/
-expecting success of 6407.1 'setup': 
-
-	cat "$TEST_DIRECTORY"/test-binary-1.png >m &&
-	git add m &&
-	git ls-files -s | sed -e "s/ 0	/ 1	/" >E1 &&
-	test_tick &&
-	git commit -m "initial" &&
-
+*** t6413-merge-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 frotz >a &&
-	git add a &&
-	echo nitfol >>m &&
-	git add a m &&
-	git ls-files -s a >E0 &&
-	git ls-files -s m | sed -e "s/ 0	/ 3	/" >E3 &&
-	test_tick &&
-	git commit -m "main adds some" &&
-
+	echo line from a | append_cr >file &&
+	git commit -m "add line from a" file &&
+	git tag a &&
 	git checkout side &&
-	echo rezrov >>m &&
-	git add m &&
-	git ls-files -s m | sed -e "s/ 0	/ 2	/" >E2 &&
-	test_tick &&
-	git commit -m "side modifies" &&
-
-	git tag anchor &&
-
-	cat E0 E1 E2 E3 >expect
+	echo line from b | append_cr >file &&
+	git commit -m "add line from b" file &&
+	git tag b &&
+	git checkout main
 
-[main (root-commit) f315366] initial
+[main (root-commit) e0f7379] Initial
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 m
-[main f94be88] main adds some
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 8798c05] add line from a
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 a
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'side'
-[side 020cbcd] side modifies
+[side 5296996] add line from b
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
 ok 1 - setup
 
-expecting success of 6407.2 'resolve': 
-
-	rm -f a* m* &&
-	git reset --hard anchor &&
-
-	test_must_fail git merge -s resolve main &&
-	git ls-files -s >current &&
-	test_cmp expect current
-
-HEAD is now at 020cbcd side modifies
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Auto-merging m
-error: Cannot merge binary files: .merge_file_MT05Nk
-ERROR: content conflict in m
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - resolve
-
-expecting success of 6407.3 'recursive': 
+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
 
-	rm -f a* m* &&
-	git reset --hard anchor &&
+HEAD is now at e0f7379 Initial
+Merge made by the 'ours' strategy.
+ok 2 - Check "ours" is CRLF
 
-	test_must_fail git merge -s recursive main &&
-	git ls-files -s >current &&
-	test_cmp expect current
+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 020cbcd side modifies
-warning: Cannot merge binary files: m (HEAD vs. main)
-Auto-merging m
-CONFLICT (content): Merge conflict in m
+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 - recursive
+ok 3 - Check that conflict file is CRLF
 
 # passed all 3 test(s)
 1..3
@@ -422283,64 +423269,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6413-merge-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6414-merge-rename-nocruft.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6414-merge-rename-nocruft/.git/
 expecting success of 6414.1 'setup': 
@@ -422750,633 +423678,6 @@
 1..0 # SKIP skipping case insensitive tests - case sensitive file system
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6417-merge-ours-theirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6417-merge-ours-theirs/.git/
-expecting success of 6417.1 'setup': 
-	test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
-	git add file &&
-	cp file elif &&
-	git commit -m initial &&
-
-	sed -e "s/1/one/" -e "s/9/nine/" >file <elif &&
-	git commit -a -m ours &&
-
-	git checkout -b side HEAD^ &&
-
-	sed -e "s/9/nueve/" >file <elif &&
-	git commit -a -m theirs &&
-
-	git checkout main^0
-
-[main (root-commit) b1c5b20] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 file
-[main de72ed3] ours
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'side'
-[side 9035321] theirs
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-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 de72ed3 ours
-ok 1 - setup
-
-expecting success of 6417.2 'plain recursive - should conflict': 
-	git reset --hard main &&
-	test_must_fail git merge -s recursive side &&
-	grep nine file &&
-	grep nueve file &&
-	! grep 9 file &&
-	grep one file &&
-	! grep 1 file
-
-HEAD is now at de72ed3 ours
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-nine
-nueve
-one
-ok 2 - plain recursive - should conflict
-
-expecting success of 6417.3 'recursive favouring theirs': 
-	git reset --hard main &&
-	git merge -s recursive -Xtheirs side &&
-	! grep nine file &&
-	grep nueve file &&
-	! grep 9 file &&
-	grep one file &&
-	! grep 1 file
-
-HEAD is now at de72ed3 ours
-Auto-merging file
-Merge made by the 'recursive' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-nueve
-one
-ok 3 - recursive favouring theirs
-
-expecting success of 6417.4 'recursive favouring ours': 
-	git reset --hard main &&
-	git merge -s recursive -X ours side &&
-	grep nine file &&
-	! grep nueve file &&
-	! grep 9 file &&
-	grep one file &&
-	! grep 1 file
-
-HEAD is now at de72ed3 ours
-Auto-merging file
-Merge made by the 'recursive' strategy.
-nine
-one
-ok 4 - recursive favouring ours
-
-expecting success of 6417.5 'binary file with -Xours/-Xtheirs': 
-	echo file binary >.gitattributes &&
-
-	git reset --hard main &&
-	git merge -s recursive -X theirs side &&
-	git diff --exit-code side HEAD -- file &&
-
-	git reset --hard main &&
-	git merge -s recursive -X ours side &&
-	git diff --exit-code main HEAD -- file
-
-HEAD is now at de72ed3 ours
-Auto-merging file
-Merge made by the 'recursive' strategy.
- file | Bin 23 -> 22 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
-HEAD is now at de72ed3 ours
-Auto-merging file
-Merge made by the 'recursive' strategy.
-ok 5 - binary file with -Xours/-Xtheirs
-
-expecting success of 6417.6 'pull passes -X to underlying merge': 
-	git reset --hard main && git pull --no-rebase -s recursive -Xours . side &&
-	git reset --hard main && git pull --no-rebase -s recursive -X ours . side &&
-	git reset --hard main && git pull --no-rebase -s recursive -Xtheirs . side &&
-	git reset --hard main && git pull --no-rebase -s recursive -X theirs . side &&
-	git reset --hard main && test_must_fail git pull --no-rebase -s recursive -X bork . side
-
-HEAD is now at de72ed3 ours
-From .
- * branch            side       -> FETCH_HEAD
-Auto-merging file
-Merge made by the 'recursive' strategy.
-HEAD is now at de72ed3 ours
-From .
- * branch            side       -> FETCH_HEAD
-Auto-merging file
-Merge made by the 'recursive' strategy.
-HEAD is now at de72ed3 ours
-From .
- * branch            side       -> FETCH_HEAD
-Auto-merging file
-Merge made by the 'recursive' strategy.
- file | Bin 23 -> 22 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
-HEAD is now at de72ed3 ours
-From .
- * branch            side       -> FETCH_HEAD
-Auto-merging file
-Merge made by the 'recursive' strategy.
- file | Bin 23 -> 22 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
-HEAD is now at de72ed3 ours
-From .
- * branch            side       -> FETCH_HEAD
-fatal: unknown strategy option: -Xbork
-ok 6 - pull passes -X to underlying merge
-
-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 6417.7 'symlink with -Xours/-Xtheirs': 
-	git reset --hard main &&
-	git checkout -b two main &&
-	ln -s target-zero link &&
-	git add link &&
-	git commit -m "add link pointing to zero" &&
-
-	ln -f -s target-two link &&
-	git commit -m "add link pointing to two" link &&
-
-	git checkout -b one HEAD^ &&
-	ln -f -s target-one link &&
-	git commit -m "add link pointing to one" link &&
-
-	# we expect symbolic links not to resolve automatically, of course
-	git checkout one^0 &&
-	test_must_fail git merge -s recursive two &&
-
-	# favor theirs to resolve to target-two?
-	git reset --hard &&
-	git checkout one^0 &&
-	git merge -s recursive -X theirs two &&
-	git diff --exit-code two HEAD link &&
-
-	# favor ours to resolve to target-one?
-	git reset --hard &&
-	git checkout one^0 &&
-	git merge -s recursive -X ours two &&
-	git diff --exit-code one HEAD link
-
-
-HEAD is now at de72ed3 ours
-Switched to a new branch 'two'
-[two c4561a4] add link pointing to zero
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 link
-[two 6164de8] add link pointing to two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'one'
-[one 4961603] add link pointing to one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: switching to 'one^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 4961603 add link pointing to one
-CONFLICT (content): Merge conflict in link
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 4961603 add link pointing to one
-HEAD is now at 4961603 add link pointing to one
-Merge made by the 'recursive' strategy.
- link | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 6efe9ee Merge branch 'two' into HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  6efe9ee Merge branch 'two' 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> 6efe9ee
-
-HEAD is now at 4961603 add link pointing to one
-Merge made by the 'recursive' strategy.
-ok 7 - symlink with -Xours/-Xtheirs
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6418-merge-text-auto.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6418-merge-text-auto/.git/
-expecting success of 6418.1 'setup': 
-	git config core.autocrlf false &&
-
-	echo first line | append_cr >file &&
-	echo first line >control_file &&
-	echo only line >inert_file &&
-
-	git add file control_file inert_file &&
-	test_tick &&
-	git commit -m "Initial" &&
-	git tag initial &&
-	git branch side &&
-
-	echo "* text=auto" >.gitattributes &&
-	echo first line >file &&
-	git add .gitattributes file &&
-	test_tick &&
-	git commit -m "normalize file" &&
-
-	echo same line | append_cr >>file &&
-	echo same line >>control_file &&
-	git add file control_file &&
-	test_tick &&
-	git commit -m "add line from a" &&
-	git tag a &&
-
-	git rm .gitattributes &&
-	rm file &&
-	git checkout file &&
-	test_tick &&
-	git commit -m "remove .gitattributes" &&
-	git tag c &&
-
-	git checkout side &&
-	echo same line | append_cr >>file &&
-	echo same line >>control_file &&
-	git add file control_file &&
-	test_tick &&
-	git commit -m "add line from b" &&
-	git tag b &&
-
-	git checkout main
-
-[main (root-commit) 1c56df1] Initial
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 control_file
- create mode 100644 file
- create mode 100644 inert_file
-[main 2747e77] normalize file
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 .gitattributes
-warning: in the working copy of 'file', CRLF will be replaced by LF the next time Git touches it
-[main 99f8882] add line from a
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-rm '.gitattributes'
-Updated 1 path from the index
-[main 2f716ad] remove .gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 .gitattributes
-Switched to branch 'side'
-[side 0d9ffb6] add line from b
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 6418.2 'set up fuzz_conflict() helper': 
-	fuzz_conflict() {
-		sed $SED_OPTIONS -e "s/^\([<>=]......\) .*/\1/" "$@"
-	}
-
-ok 2 - set up fuzz_conflict() helper
-
-expecting success of 6418.3 'Merge after setting text=auto': 
-	cat <<-\EOF >expected &&
-	first line
-	same line
-	EOF
-
-	if test_have_prereq NATIVE_CRLF; then
-		append_cr <expected >expected.temp &&
-		mv expected.temp expected
-	fi &&
-	git config merge.renormalize true &&
-	git rm -fr . &&
-	rm -f .gitattributes &&
-	git reset --hard a &&
-	git merge b &&
-	compare_files expected file
-
-rm 'control_file'
-rm 'file'
-rm 'inert_file'
-HEAD is now at 99f8882 add line from a
-Auto-merging file
-Merge made by the 'ort' strategy.
-ok 3 - Merge after setting text=auto
-
-expecting success of 6418.4 'Merge addition of text=auto eol=LF': 
-	git config core.eol lf &&
-	cat <<-\EOF >expected &&
-	first line
-	same line
-	EOF
-
-	git config merge.renormalize true &&
-	git rm -fr . &&
-	rm -f .gitattributes &&
-	git reset --hard b &&
-	git merge a &&
-	compare_files  expected file
-
-rm '.gitattributes'
-rm 'control_file'
-rm 'file'
-rm 'inert_file'
-HEAD is now at 0d9ffb6 add line from b
-Auto-merging file
-Merge made by the 'ort' strategy.
- .gitattributes | 1 +
- file           | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 .gitattributes
-ok 4 - Merge addition of text=auto eol=LF
-
-expecting success of 6418.5 'Merge addition of text=auto eol=CRLF': 
-	git config core.eol crlf &&
-	cat <<-\EOF >expected &&
-	first line
-	same line
-	EOF
-
-	append_cr <expected >expected.temp &&
-	mv expected.temp expected &&
-	git config merge.renormalize true &&
-	git rm -fr . &&
-	rm -f .gitattributes &&
-	git reset --hard b &&
-	echo >&2 "After git reset --hard b" &&
-	git ls-files -s --eol >&2 &&
-	git merge a &&
-	compare_files  expected file
-
-rm '.gitattributes'
-rm 'control_file'
-rm 'file'
-rm 'inert_file'
-HEAD is now at 0d9ffb6 add line from b
-After git reset --hard b
-100644 99b633103c15c20cebebf821133ab526b0ff90b2 0	i/lf    w/lf    attr/                 	control_file
-100644 ad55e240aeb42e0d9a0e18d6d8b02dd82ee3e527 0	i/crlf  w/crlf  attr/                 	file
-100644 1bd3656f87a6720d97252137876e81ee56eef249 0	i/lf    w/lf    attr/                 	inert_file
-Auto-merging file
-Merge made by the 'ort' strategy.
- .gitattributes | 1 +
- file           | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 .gitattributes
-ok 5 - Merge addition of text=auto eol=CRLF
-
-expecting success of 6418.6 'Detect CRLF/LF conflict after setting text=auto': 
-	git config core.eol native &&
-	echo "<<<<<<<" >expected &&
-	echo first line >>expected &&
-	echo same line >>expected &&
-	echo ======= >>expected &&
-	echo first line | append_cr >>expected &&
-	echo same line | append_cr >>expected &&
-	echo ">>>>>>>" >>expected &&
-	git config merge.renormalize false &&
-	rm -f .gitattributes &&
-	git reset --hard a &&
-	test_must_fail git merge b &&
-	fuzz_conflict file >file.fuzzy &&
-	compare_files expected file.fuzzy
-
-HEAD is now at 99f8882 add line from a
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-ok 6 - Detect CRLF/LF conflict after setting text=auto
-
-expecting success of 6418.7 'Detect LF/CRLF conflict from addition of text=auto': 
-	echo "<<<<<<<" >expected &&
-	echo first line | append_cr >>expected &&
-	echo same line | append_cr >>expected &&
-	echo ======= >>expected &&
-	echo first line >>expected &&
-	echo same line >>expected &&
-	echo ">>>>>>>" >>expected &&
-	git config merge.renormalize false &&
-	rm -f .gitattributes &&
-	git reset --hard b &&
-	test_must_fail git merge a &&
-	fuzz_conflict file >file.fuzzy &&
-	compare_files expected file.fuzzy
-
-HEAD is now at 0d9ffb6 add line from b
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-ok 7 - Detect LF/CRLF conflict from addition of text=auto
-
-expecting success of 6418.8 'checkout -m after setting text=auto': 
-	cat <<-\EOF >expected &&
-	first line
-	same line
-	EOF
-
-	git config merge.renormalize true &&
-	git rm -fr . &&
-	rm -f .gitattributes &&
-	git reset --hard initial &&
-	git restore --source=a -- . &&
-	git checkout -m b &&
-	git diff --no-index --ignore-cr-at-eol expected file
-
-rm '.gitattributes'
-rm 'control_file'
-rm 'file'
-rm 'file'
-rm 'file'
-rm 'inert_file'
-HEAD is now at 1c56df1 Initial
-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 0d9ffb6 add line from b
-M	file
-ok 8 - checkout -m after setting text=auto
-
-expecting success of 6418.9 'checkout -m addition of text=auto': 
-	cat <<-\EOF >expected &&
-	first line
-	same line
-	EOF
-
-	git config merge.renormalize true &&
-	git rm -fr . &&
-	rm -f .gitattributes file &&
-	git reset --hard initial &&
-	git restore --source=b -- . &&
-	git checkout -m a &&
-	git diff --no-index --ignore-cr-at-eol expected file
-
-rm 'control_file'
-rm 'file'
-rm 'inert_file'
-HEAD is now at 1c56df1 Initial
-Previous HEAD position was 1c56df1 Initial
-HEAD is now at 99f8882 add line from a
-ok 9 - checkout -m addition of text=auto
-
-expecting success of 6418.10 'Test delete/normalize conflict': 
-	git checkout -f side &&
-	git rm -fr . &&
-	rm -f .gitattributes &&
-	git reset --hard initial &&
-	git rm file &&
-	git commit -m "remove file" &&
-	git checkout main &&
-	git reset --hard a^ &&
-	git merge side &&
-	test_path_is_missing file
-
-Previous HEAD position was 99f8882 add line from a
-Switched to branch 'side'
-rm 'control_file'
-rm 'file'
-rm 'inert_file'
-HEAD is now at 1c56df1 Initial
-rm 'file'
-[side 7dc5d25] remove file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file
-Switched to branch 'main'
-HEAD is now at 2747e77 normalize file
-Merge made by the 'ort' strategy.
- file | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 file
-ok 10 - Test delete/normalize conflict
-
-expecting success of 6418.11 'rename/delete vs. renormalization': 
-	git init subrepo &&
-	(
-		cd subrepo &&
-		echo foo >oldfile &&
-		git add oldfile &&
-		git commit -m original &&
-
-		git branch rename &&
-		git branch nuke &&
-
-		git checkout rename &&
-		git mv oldfile newfile &&
-		git commit -m renamed &&
-
-		git checkout nuke &&
-		git rm oldfile &&
-		git commit -m deleted &&
-
-		git checkout rename^0 &&
-		test_must_fail git -c merge.renormalize=true merge nuke >out &&
-
-		grep "rename/delete" out
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6418-merge-text-auto/subrepo/.git/
-[main (root-commit) 6bccdb0] original
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 oldfile
-Switched to branch 'rename'
-[rename 0094749] renamed
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename oldfile => newfile (100%)
-Switched to branch 'nuke'
-rm 'oldfile'
-[nuke 5c3f422] deleted
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 oldfile
-Note: switching to 'rename^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 0094749 renamed
-CONFLICT (rename/delete): oldfile renamed to newfile in HEAD, but deleted in nuke.
-ok 11 - rename/delete vs. renormalization
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6030-bisect-porcelain.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6030-bisect-porcelain/.git/
 expecting success of 6030.1 'bisect usage': 
@@ -424048,8 +424349,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'
@@ -424088,8 +424389,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'
@@ -426161,46 +426462,631 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6425-merge-rename-delete.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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" &&
+*** t6417-merge-ours-theirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6417-merge-ours-theirs/.git/
+expecting success of 6417.1 'setup': 
+	test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
+	git add file &&
+	cp file elif &&
+	git commit -m initial &&
 
-	git checkout -b rename &&
-	git mv A B &&
-	git commit -m "rename" &&
+	sed -e "s/1/one/" -e "s/9/nine/" >file <elif &&
+	git commit -a -m ours &&
+
+	git checkout -b side HEAD^ &&
+
+	sed -e "s/9/nueve/" >file <elif &&
+	git commit -a -m theirs &&
+
+	git checkout main^0
+
+[main (root-commit) b1c5b20] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+)
+ create mode 100644 file
+[main de72ed3] ours
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'side'
+[side 9035321] theirs
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+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 de72ed3 ours
+ok 1 - setup
+
+expecting success of 6417.2 'plain recursive - should conflict': 
+	git reset --hard main &&
+	test_must_fail git merge -s recursive side &&
+	grep nine file &&
+	grep nueve file &&
+	! grep 9 file &&
+	grep one file &&
+	! grep 1 file
+
+HEAD is now at de72ed3 ours
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+nine
+nueve
+one
+ok 2 - plain recursive - should conflict
+
+expecting success of 6417.3 'recursive favouring theirs': 
+	git reset --hard main &&
+	git merge -s recursive -Xtheirs side &&
+	! grep nine file &&
+	grep nueve file &&
+	! grep 9 file &&
+	grep one file &&
+	! grep 1 file
+
+HEAD is now at de72ed3 ours
+Auto-merging file
+Merge made by the 'recursive' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+nueve
+one
+ok 3 - recursive favouring theirs
+
+expecting success of 6417.4 'recursive favouring ours': 
+	git reset --hard main &&
+	git merge -s recursive -X ours side &&
+	grep nine file &&
+	! grep nueve file &&
+	! grep 9 file &&
+	grep one file &&
+	! grep 1 file
+
+HEAD is now at de72ed3 ours
+Auto-merging file
+Merge made by the 'recursive' strategy.
+nine
+one
+ok 4 - recursive favouring ours
+
+expecting success of 6417.5 'binary file with -Xours/-Xtheirs': 
+	echo file binary >.gitattributes &&
+
+	git reset --hard main &&
+	git merge -s recursive -X theirs side &&
+	git diff --exit-code side HEAD -- file &&
+
+	git reset --hard main &&
+	git merge -s recursive -X ours side &&
+	git diff --exit-code main HEAD -- file
+
+HEAD is now at de72ed3 ours
+Auto-merging file
+Merge made by the 'recursive' strategy.
+ file | Bin 23 -> 22 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+HEAD is now at de72ed3 ours
+Auto-merging file
+Merge made by the 'recursive' strategy.
+ok 5 - binary file with -Xours/-Xtheirs
+
+expecting success of 6417.6 'pull passes -X to underlying merge': 
+	git reset --hard main && git pull --no-rebase -s recursive -Xours . side &&
+	git reset --hard main && git pull --no-rebase -s recursive -X ours . side &&
+	git reset --hard main && git pull --no-rebase -s recursive -Xtheirs . side &&
+	git reset --hard main && git pull --no-rebase -s recursive -X theirs . side &&
+	git reset --hard main && test_must_fail git pull --no-rebase -s recursive -X bork . side
+
+HEAD is now at de72ed3 ours
+From .
+ * branch            side       -> FETCH_HEAD
+Auto-merging file
+Merge made by the 'recursive' strategy.
+HEAD is now at de72ed3 ours
+From .
+ * branch            side       -> FETCH_HEAD
+Auto-merging file
+Merge made by the 'recursive' strategy.
+HEAD is now at de72ed3 ours
+From .
+ * branch            side       -> FETCH_HEAD
+Auto-merging file
+Merge made by the 'recursive' strategy.
+ file | Bin 23 -> 22 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+HEAD is now at de72ed3 ours
+From .
+ * branch            side       -> FETCH_HEAD
+Auto-merging file
+Merge made by the 'recursive' strategy.
+ file | Bin 23 -> 22 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+HEAD is now at de72ed3 ours
+From .
+ * branch            side       -> FETCH_HEAD
+fatal: unknown strategy option: -Xbork
+ok 6 - pull passes -X to underlying merge
+
+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 6417.7 'symlink with -Xours/-Xtheirs': 
+	git reset --hard main &&
+	git checkout -b two main &&
+	ln -s target-zero link &&
+	git add link &&
+	git commit -m "add link pointing to zero" &&
+
+	ln -f -s target-two link &&
+	git commit -m "add link pointing to two" link &&
+
+	git checkout -b one HEAD^ &&
+	ln -f -s target-one link &&
+	git commit -m "add link pointing to one" link &&
+
+	# we expect symbolic links not to resolve automatically, of course
+	git checkout one^0 &&
+	test_must_fail git merge -s recursive two &&
+
+	# favor theirs to resolve to target-two?
+	git reset --hard &&
+	git checkout one^0 &&
+	git merge -s recursive -X theirs two &&
+	git diff --exit-code two HEAD link &&
+
+	# favor ours to resolve to target-one?
+	git reset --hard &&
+	git checkout one^0 &&
+	git merge -s recursive -X ours two &&
+	git diff --exit-code one HEAD link
+
+
+HEAD is now at de72ed3 ours
+Switched to a new branch 'two'
+[two c4561a4] add link pointing to zero
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 link
+[two 6164de8] add link pointing to two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'one'
+[one 4961603] add link pointing to one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: switching to 'one^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 4961603 add link pointing to one
+CONFLICT (content): Merge conflict in link
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 4961603 add link pointing to one
+HEAD is now at 4961603 add link pointing to one
+Merge made by the 'recursive' strategy.
+ link | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 6efe9ee Merge branch 'two' into HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  6efe9ee Merge branch 'two' 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> 6efe9ee
+
+HEAD is now at 4961603 add link pointing to one
+Merge made by the 'recursive' strategy.
+ok 7 - symlink with -Xours/-Xtheirs
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6418-merge-text-auto.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6418-merge-text-auto/.git/
+expecting success of 6418.1 'setup': 
+	git config core.autocrlf false &&
+
+	echo first line | append_cr >file &&
+	echo first line >control_file &&
+	echo only line >inert_file &&
+
+	git add file control_file inert_file &&
+	test_tick &&
+	git commit -m "Initial" &&
+	git tag initial &&
+	git branch side &&
+
+	echo "* text=auto" >.gitattributes &&
+	echo first line >file &&
+	git add .gitattributes file &&
+	test_tick &&
+	git commit -m "normalize file" &&
+
+	echo same line | append_cr >>file &&
+	echo same line >>control_file &&
+	git add file control_file &&
+	test_tick &&
+	git commit -m "add line from a" &&
+	git tag a &&
+
+	git rm .gitattributes &&
+	rm file &&
+	git checkout file &&
+	test_tick &&
+	git commit -m "remove .gitattributes" &&
+	git tag c &&
+
+	git checkout side &&
+	echo same line | append_cr >>file &&
+	echo same line >>control_file &&
+	git add file control_file &&
+	test_tick &&
+	git commit -m "add line from b" &&
+	git tag b &&
+
+	git checkout main
+
+[main (root-commit) 1c56df1] Initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 control_file
+ create mode 100644 file
+ create mode 100644 inert_file
+[main 2747e77] normalize file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 .gitattributes
+warning: in the working copy of 'file', CRLF will be replaced by LF the next time Git touches it
+[main 99f8882] add line from a
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+rm '.gitattributes'
+Updated 1 path from the index
+[main 2f716ad] remove .gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 .gitattributes
+Switched to branch 'side'
+[side 0d9ffb6] add line from b
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 6418.2 'set up fuzz_conflict() helper': 
+	fuzz_conflict() {
+		sed $SED_OPTIONS -e "s/^\([<>=]......\) .*/\1/" "$@"
+	}
+
+ok 2 - set up fuzz_conflict() helper
+
+expecting success of 6418.3 'Merge after setting text=auto': 
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
+
+	if test_have_prereq NATIVE_CRLF; then
+		append_cr <expected >expected.temp &&
+		mv expected.temp expected
+	fi &&
+	git config merge.renormalize true &&
+	git rm -fr . &&
+	rm -f .gitattributes &&
+	git reset --hard a &&
+	git merge b &&
+	compare_files expected file
+
+rm 'control_file'
+rm 'file'
+rm 'inert_file'
+HEAD is now at 99f8882 add line from a
+Auto-merging file
+Merge made by the 'ort' strategy.
+ok 3 - Merge after setting text=auto
+
+expecting success of 6418.4 'Merge addition of text=auto eol=LF': 
+	git config core.eol lf &&
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
+
+	git config merge.renormalize true &&
+	git rm -fr . &&
+	rm -f .gitattributes &&
+	git reset --hard b &&
+	git merge a &&
+	compare_files  expected file
+
+rm '.gitattributes'
+rm 'control_file'
+rm 'file'
+rm 'inert_file'
+HEAD is now at 0d9ffb6 add line from b
+Auto-merging file
+Merge made by the 'ort' strategy.
+ .gitattributes | 1 +
+ file           | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 .gitattributes
+ok 4 - Merge addition of text=auto eol=LF
+
+expecting success of 6418.5 'Merge addition of text=auto eol=CRLF': 
+	git config core.eol crlf &&
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
+
+	append_cr <expected >expected.temp &&
+	mv expected.temp expected &&
+	git config merge.renormalize true &&
+	git rm -fr . &&
+	rm -f .gitattributes &&
+	git reset --hard b &&
+	echo >&2 "After git reset --hard b" &&
+	git ls-files -s --eol >&2 &&
+	git merge a &&
+	compare_files  expected file
+
+rm '.gitattributes'
+rm 'control_file'
+rm 'file'
+rm 'inert_file'
+HEAD is now at 0d9ffb6 add line from b
+After git reset --hard b
+100644 99b633103c15c20cebebf821133ab526b0ff90b2 0	i/lf    w/lf    attr/                 	control_file
+100644 ad55e240aeb42e0d9a0e18d6d8b02dd82ee3e527 0	i/crlf  w/crlf  attr/                 	file
+100644 1bd3656f87a6720d97252137876e81ee56eef249 0	i/lf    w/lf    attr/                 	inert_file
+Auto-merging file
+Merge made by the 'ort' strategy.
+ .gitattributes | 1 +
+ file           | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 .gitattributes
+ok 5 - Merge addition of text=auto eol=CRLF
+
+expecting success of 6418.6 'Detect CRLF/LF conflict after setting text=auto': 
+	git config core.eol native &&
+	echo "<<<<<<<" >expected &&
+	echo first line >>expected &&
+	echo same line >>expected &&
+	echo ======= >>expected &&
+	echo first line | append_cr >>expected &&
+	echo same line | append_cr >>expected &&
+	echo ">>>>>>>" >>expected &&
+	git config merge.renormalize false &&
+	rm -f .gitattributes &&
+	git reset --hard a &&
+	test_must_fail git merge b &&
+	fuzz_conflict file >file.fuzzy &&
+	compare_files expected file.fuzzy
+
+HEAD is now at 99f8882 add line from a
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+ok 6 - Detect CRLF/LF conflict after setting text=auto
+
+expecting success of 6418.7 'Detect LF/CRLF conflict from addition of text=auto': 
+	echo "<<<<<<<" >expected &&
+	echo first line | append_cr >>expected &&
+	echo same line | append_cr >>expected &&
+	echo ======= >>expected &&
+	echo first line >>expected &&
+	echo same line >>expected &&
+	echo ">>>>>>>" >>expected &&
+	git config merge.renormalize false &&
+	rm -f .gitattributes &&
+	git reset --hard b &&
+	test_must_fail git merge a &&
+	fuzz_conflict file >file.fuzzy &&
+	compare_files expected file.fuzzy
+
+HEAD is now at 0d9ffb6 add line from b
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+ok 7 - Detect LF/CRLF conflict from addition of text=auto
+
+expecting success of 6418.8 'checkout -m after setting text=auto': 
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
+
+	git config merge.renormalize true &&
+	git rm -fr . &&
+	rm -f .gitattributes &&
+	git reset --hard initial &&
+	git restore --source=a -- . &&
+	git checkout -m b &&
+	git diff --no-index --ignore-cr-at-eol expected file
+
+rm '.gitattributes'
+rm 'control_file'
+rm 'file'
+rm 'file'
+rm 'file'
+rm 'inert_file'
+HEAD is now at 1c56df1 Initial
+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 0d9ffb6 add line from b
+M	file
+ok 8 - checkout -m after setting text=auto
+
+expecting success of 6418.9 'checkout -m addition of text=auto': 
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
+
+	git config merge.renormalize true &&
+	git rm -fr . &&
+	rm -f .gitattributes file &&
+	git reset --hard initial &&
+	git restore --source=b -- . &&
+	git checkout -m a &&
+	git diff --no-index --ignore-cr-at-eol expected file
 
+rm 'control_file'
+rm 'file'
+rm 'inert_file'
+HEAD is now at 1c56df1 Initial
+Previous HEAD position was 1c56df1 Initial
+HEAD is now at 99f8882 add line from a
+ok 9 - checkout -m addition of text=auto
+
+expecting success of 6418.10 'Test delete/normalize conflict': 
+	git checkout -f side &&
+	git rm -fr . &&
+	rm -f .gitattributes &&
+	git reset --hard initial &&
+	git rm file &&
+	git commit -m "remove file" &&
 	git checkout main &&
-	git rm A &&
-	git commit -m "delete" &&
+	git reset --hard a^ &&
+	git merge side &&
+	test_path_is_missing file
 
-	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
+Previous HEAD position was 99f8882 add line from a
+Switched to branch 'side'
+rm 'control_file'
+rm 'file'
+rm 'inert_file'
+HEAD is now at 1c56df1 Initial
+rm 'file'
+[side 7dc5d25] remove file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file
+Switched to branch 'main'
+HEAD is now at 2747e77 normalize file
+Merge made by the 'ort' strategy.
+ file | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file
+ok 10 - Test delete/normalize conflict
 
-[main (root-commit) 6604e52] initial
+expecting success of 6418.11 'rename/delete vs. renormalization': 
+	git init subrepo &&
+	(
+		cd subrepo &&
+		echo foo >oldfile &&
+		git add oldfile &&
+		git commit -m original &&
+
+		git branch rename &&
+		git branch nuke &&
+
+		git checkout rename &&
+		git mv oldfile newfile &&
+		git commit -m renamed &&
+
+		git checkout nuke &&
+		git rm oldfile &&
+		git commit -m deleted &&
+
+		git checkout rename^0 &&
+		test_must_fail git -c merge.renormalize=true merge nuke >out &&
+
+		grep "rename/delete" out
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6418-merge-text-auto/subrepo/.git/
+[main (root-commit) 6bccdb0] original
  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
+ create mode 100644 oldfile
+Switched to branch 'rename'
+[rename 0094749] renamed
  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
+ rename oldfile => newfile (100%)
+Switched to branch 'nuke'
+rm 'oldfile'
+[nuke 5c3f422] deleted
  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
+ delete mode 100644 oldfile
+Note: switching to 'rename^0'.
 
-# passed all 1 test(s)
-1..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.
+
+If you want to 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 0094749 renamed
+CONFLICT (rename/delete): oldfile renamed to newfile in HEAD, but deleted in nuke.
+ok 11 - rename/delete vs. renormalization
+
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6120-describe.sh ***
@@ -427420,8 +428306,8 @@
 		echo "$expect" >expect &&
 		test_cmp expect actual
 	
---- expect	2025-08-27 08:22:19.160187577 +0000
-+++ actual	2025-08-27 08:22:19.160187577 +0000
+--- expect	2026-09-29 14:53:17.918548970 +0000
++++ actual	2026-09-29 14:53:17.918548970 +0000
 @@ -1 +1 @@
 -A-3-gHASH
 +B-4-gHASH
@@ -427482,8 +428368,8 @@
 		echo "$expect" >expect &&
 		test_cmp expect actual
 	
---- expect	2025-08-27 08:22:19.440189424 +0000
-+++ actual	2025-08-27 08:22:19.436189397 +0000
+--- expect	2026-09-29 14:53:18.070548970 +0000
++++ actual	2026-09-29 14:53:18.070548970 +0000
 @@ -1 +1 @@
 -B-3-gHASH
 +A-5-gHASH
@@ -427796,644 +428682,301 @@
 HEAD is now at deb429a Merge branch 'main' into HEAD
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
-
-  deb429a Merge branch 'main' 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> deb429a
-
-HEAD is now at 1750beb dir to symlink
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Merge made by the 'resolve' strategy.
- a/x | 1 +
- 1 file changed, 1 insertion(+)
-ok 10 - Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)
-
-expecting success of 6415.11 'a/b was resolved as symlink': 
-	test -h a/b
-
-ok 11 - a/b was resolved as symlink
-
-expecting success of 6415.12 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)': 
-	git reset --hard &&
-	git checkout main^0 &&
-	git merge -s recursive baseline^0 &&
-	test_path_is_file a/b-2/c/d
-
-HEAD is now at d961b81 Merge commit 'baseline^0' into HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  d961b81 Merge commit 'baseline^0' 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> d961b81
-
-HEAD is now at 1750beb dir to symlink
-Merge made by the 'recursive' strategy.
- a/x | 1 +
- 1 file changed, 1 insertion(+)
-ok 12 - Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)
-
-expecting success of 6415.13 'a/b was resolved as symlink': 
-	test -h a/b
-
-ok 13 - a/b was resolved as symlink
-
-checking known breakage of 6415.14 'do not lose untracked in merge (resolve)': 
-	git reset --hard &&
-	git checkout baseline^0 &&
-	>a/b/c/e &&
-	test_must_fail git merge -s resolve main &&
-	test_path_is_file a/b/c/e &&
-	test_path_is_file a/b-2/c/d
-
-HEAD is now at d961b81 Merge commit 'baseline^0' into HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  d961b81 Merge commit 'baseline^0' 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> d961b81
-
-HEAD is now at d35741f x
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Adding a/b
-Merge made by the 'resolve' strategy.
- a/b     | 1 +
- a/b/c/d | 0
- 2 files changed, 1 insertion(+)
- create mode 120000 a/b
- delete mode 100644 a/b/c/d
-test_must_fail: command succeeded: git merge -s resolve main
-not ok 14 - do not lose untracked in merge (resolve) # TODO known breakage
-
-expecting success of 6415.15 'do not lose untracked in merge (recursive)': 
-	git reset --hard &&
-	git checkout baseline^0 &&
-	>a/b/c/e &&
-	test_must_fail git merge -s recursive main &&
-	test_path_is_file a/b/c/e &&
-	test_path_is_file a/b-2/c/d
-
-HEAD is now at deb429a Merge branch 'main' into HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  deb429a Merge branch 'main' 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> deb429a
-
-HEAD is now at d35741f x
-error: Updating the following directories would lose untracked files in them:
-	a/b
-
-Aborting
-Merge with strategy recursive failed.
-ok 15 - do not lose untracked in merge (recursive)
-
-expecting success of 6415.16 'do not lose modifications in merge (resolve)': 
-	git reset --hard &&
-	git checkout baseline^0 &&
-	echo more content >>a/b/c/d &&
-	test_must_fail git merge -s resolve main
-
-HEAD is now at d35741f x
-HEAD is now at d35741f x
-error: Entry 'a/b/c/d' not uptodate. Cannot merge.
-Trying really trivial in-index merge...
-Nope.
-error: Entry 'a/b/c/d' not uptodate. Cannot merge.
-Merge with strategy resolve failed.
-ok 16 - do not lose modifications in merge (resolve)
-
-expecting success of 6415.17 'do not lose modifications in merge (recursive)': 
-	git reset --hard &&
-	git checkout baseline^0 &&
-	echo more content >>a/b/c/d &&
-	test_must_fail git merge -s recursive main
-
-HEAD is now at d35741f x
-HEAD is now at d35741f x
-error: Updating the following directories would lose untracked files in them:
-	a/b
-
-Aborting
-Merge with strategy recursive failed.
-ok 17 - do not lose modifications in merge (recursive)
-
-expecting success of 6415.18 'setup a merge where dir a/b-2 changed to symlink': 
-	git reset --hard &&
-	git checkout start^0 &&
-	rm -rf a/b-2 &&
-	git add -A &&
-	test_ln_s_add b a/b-2 &&
-	git commit -m "dir a/b-2 to symlink" &&
-	git tag test2
-
-HEAD is now at d35741f x
-Previous HEAD position was d35741f x
-HEAD is now at d2c335b base
-[detached HEAD 41d1436] dir a/b-2 to symlink
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 120000 a/b-2
- rename a/{b-2/c/d => b/c/e} (100%)
-ok 18 - setup a merge where dir a/b-2 changed to symlink
-
-expecting success of 6415.19 'merge should not have D/F conflicts (resolve)': 
-	git reset --hard &&
-	git checkout baseline^0 &&
-	git merge -s resolve test2 &&
-	test_path_is_file a/b/c/d
-
-HEAD is now at 41d1436 dir a/b-2 to symlink
-Previous HEAD position was 41d1436 dir a/b-2 to symlink
-HEAD is now at d35741f x
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Adding a/b-2
-Merge made by the 'resolve' strategy.
- a/b-2                | 1 +
- a/{b-2/c/d => b/c/e} | 0
- 2 files changed, 1 insertion(+)
- create mode 120000 a/b-2
- rename a/{b-2/c/d => b/c/e} (100%)
-ok 19 - merge should not have D/F conflicts (resolve)
-
-expecting success of 6415.20 'a/b-2 was resolved as symlink': 
-	test -h a/b-2
-
-ok 20 - a/b-2 was resolved as symlink
-
-expecting success of 6415.21 'merge should not have D/F conflicts (recursive)': 
-	git reset --hard &&
-	git checkout baseline^0 &&
-	git merge -s recursive test2 &&
-	test_path_is_file a/b/c/d
-
-HEAD is now at 57dad8a Merge tag 'test2' into HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  57dad8a Merge tag 'test2' 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> 57dad8a
-
-HEAD is now at d35741f x
-Merge made by the 'recursive' strategy.
- a/b-2                | 1 +
- a/{b-2/c/d => b/c/e} | 0
- 2 files changed, 1 insertion(+)
- create mode 120000 a/b-2
- rename a/{b-2/c/d => b/c/e} (100%)
-ok 21 - merge should not have D/F conflicts (recursive)
-
-expecting success of 6415.22 'a/b-2 was resolved as symlink': 
-	test -h a/b-2
-
-ok 22 - a/b-2 was resolved as symlink
-
-expecting success of 6415.23 'merge should not have F/D conflicts (recursive)': 
-	git reset --hard &&
-	git checkout -b foo test2 &&
-	git merge -s recursive baseline^0 &&
-	test_path_is_file a/b/c/d
-
-HEAD is now at 57dad8a Merge tag 'test2' into HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  57dad8a Merge tag 'test2' 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> 57dad8a
-
-Switched to a new branch 'foo'
-Merge made by the 'recursive' strategy.
- a/x | 1 +
- 1 file changed, 1 insertion(+)
-ok 23 - merge should not have F/D conflicts (recursive)
-
-expecting success of 6415.24 'a/b-2 was resolved as symlink': 
-	test -h a/b-2
-
-ok 24 - a/b-2 was resolved as symlink
-
-# still have 1 known breakage(s)
-# passed all remaining 23 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6421-merge-partial-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6421-merge-partial-clone/.git/
-expecting success of 6421.1 'Objects downloaded for single relevant rename': 
-	test_setup_repo &&
-	git clone --sparse --filter=blob:none "file://$(pwd)/server" objects-single &&
-	(
-		cd objects-single &&
-
-		git rev-list --objects --all --missing=print |
-			grep "^?" | sort >missing-objects-before &&
-
-		git checkout -q origin/A &&
-
-		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
-			-c merge.directoryRenames=true merge --no-stat \
-			--no-progress origin/B-single &&
-
-		# Check the number of objects we reported we would fetch
-		cat >expect <<-EOF &&
-		fetch_count:2
-		fetch_count:1
-		EOF
-		grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
-		test_cmp expect actual &&
-
-		# Check the number of fetch commands exec-ed by filtering trace to
-		# child_start events by the top-level program (2nd field == d0)
-		grep " d0 .* child_start .*fetch.negotiationAlgorithm" trace.output >fetches &&
-		test_line_count = 2 fetches &&
-
-		git rev-list --objects --all --missing=print |
-			grep "^?" | sort >missing-objects-after &&
-		comm -2 -3 missing-objects-before missing-objects-after >old &&
-		comm -1 -3 missing-objects-before missing-objects-after >new &&
-		# No new missing objects
-		test_must_be_empty new &&
-		# Fetched 2 + 1 = 3 objects
-		test_line_count = 3 old
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6421-merge-partial-clone/server/.git/
-[master (root-commit) fb87a8e] O
- Author: A U Thor <author@example.com>
- 103 files changed, 150 insertions(+)
- create mode 100644 basename/numbers
- create mode 100644 basename/sequence
- create mode 100644 basename/values
- 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
- create mode 100644 general/leap1
- create mode 100644 general/leap2
-Switched to branch 'A'
-rm 'general/leap1'
-rm 'general/leap2'
-rm 'dir/subdir/tweaked/f'
-[A b0c40f6] A
- Author: A U Thor <author@example.com>
- 105 files changed, 10 insertions(+), 2 deletions(-)
- rename basename/{ => subdir}/numbers (92%)
- rename basename/{ => subdir}/sequence (92%)
- rename basename/{ => subdir}/values (92%)
- delete mode 100644 dir/subdir/e
- delete mode 100644 dir/subdir/tweaked/f
- rename {dir => folder}/subdir/Makefile (87%)
- rename {dir => folder}/subdir/a (100%)
- rename {dir => folder}/subdir/b (100%)
- rename {dir => folder}/subdir/c (100%)
- rename {dir => folder}/subdir/d (100%)
- create mode 100644 folder/subdir/newsubdir/e
- create mode 100644 folder/subdir/newsubdir/newfile.rs
- rename {dir => folder}/subdir/tweaked/Makefile (81%)
- rename {dir => folder}/subdir/tweaked/g (100%)
- 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%)
- rename general/{leap1 => jump1} (88%)
- rename general/{leap2 => jump2} (91%)
-Switched to branch 'B-single'
-[B-single 4be199b] B-single
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 general/newfile.pl
-Switched to branch 'B-dir'
-[B-dir 4ce2107] B-dir
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 dir/subdir/newfile.groovy
- create mode 100644 dir/subdir/newfile.java
- create mode 100644 dir/subdir/newfile.scala
-Switched to branch 'B-many'
-[B-many fa0fa91] B-many
+
+  deb429a Merge branch 'main' 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> deb429a
+
+HEAD is now at 1750beb dir to symlink
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Merge made by the 'resolve' strategy.
+ a/x | 1 +
+ 1 file changed, 1 insertion(+)
+ok 10 - Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)
+
+expecting success of 6415.11 'a/b was resolved as symlink': 
+	test -h a/b
+
+ok 11 - a/b was resolved as symlink
+
+expecting success of 6415.12 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)': 
+	git reset --hard &&
+	git checkout main^0 &&
+	git merge -s recursive baseline^0 &&
+	test_path_is_file a/b-2/c/d
+
+HEAD is now at d961b81 Merge commit 'baseline^0' into HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  d961b81 Merge commit 'baseline^0' 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> d961b81
+
+HEAD is now at 1750beb dir to symlink
+Merge made by the 'recursive' strategy.
+ a/x | 1 +
+ 1 file changed, 1 insertion(+)
+ok 12 - Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)
+
+expecting success of 6415.13 'a/b was resolved as symlink': 
+	test -h a/b
+
+ok 13 - a/b was resolved as symlink
+
+checking known breakage of 6415.14 'do not lose untracked in merge (resolve)': 
+	git reset --hard &&
+	git checkout baseline^0 &&
+	>a/b/c/e &&
+	test_must_fail git merge -s resolve main &&
+	test_path_is_file a/b/c/e &&
+	test_path_is_file a/b-2/c/d
+
+HEAD is now at d961b81 Merge commit 'baseline^0' into HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  d961b81 Merge commit 'baseline^0' 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> d961b81
+
+HEAD is now at d35741f x
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Adding a/b
+Merge made by the 'resolve' strategy.
+ a/b     | 1 +
+ a/b/c/d | 0
+ 2 files changed, 1 insertion(+)
+ create mode 120000 a/b
+ delete mode 100644 a/b/c/d
+test_must_fail: command succeeded: git merge -s resolve main
+not ok 14 - do not lose untracked in merge (resolve) # TODO known breakage
+
+expecting success of 6415.15 'do not lose untracked in merge (recursive)': 
+	git reset --hard &&
+	git checkout baseline^0 &&
+	>a/b/c/e &&
+	test_must_fail git merge -s recursive main &&
+	test_path_is_file a/b/c/e &&
+	test_path_is_file a/b-2/c/d
+
+HEAD is now at deb429a Merge branch 'main' into HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  deb429a Merge branch 'main' 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> deb429a
+
+HEAD is now at d35741f x
+error: Updating the following directories would lose untracked files in them:
+	a/b
+
+Aborting
+Merge with strategy recursive failed.
+ok 15 - do not lose untracked in merge (recursive)
+
+expecting success of 6415.16 'do not lose modifications in merge (resolve)': 
+	git reset --hard &&
+	git checkout baseline^0 &&
+	echo more content >>a/b/c/d &&
+	test_must_fail git merge -s resolve main
+
+HEAD is now at d35741f x
+HEAD is now at d35741f x
+error: Entry 'a/b/c/d' not uptodate. Cannot merge.
+Trying really trivial in-index merge...
+Nope.
+error: Entry 'a/b/c/d' not uptodate. Cannot merge.
+Merge with strategy resolve failed.
+ok 16 - do not lose modifications in merge (resolve)
+
+expecting success of 6415.17 'do not lose modifications in merge (recursive)': 
+	git reset --hard &&
+	git checkout baseline^0 &&
+	echo more content >>a/b/c/d &&
+	test_must_fail git merge -s recursive main
+
+HEAD is now at d35741f x
+HEAD is now at d35741f x
+error: Updating the following directories would lose untracked files in them:
+	a/b
+
+Aborting
+Merge with strategy recursive failed.
+ok 17 - do not lose modifications in merge (recursive)
+
+expecting success of 6415.18 'setup a merge where dir a/b-2 changed to symlink': 
+	git reset --hard &&
+	git checkout start^0 &&
+	rm -rf a/b-2 &&
+	git add -A &&
+	test_ln_s_add b a/b-2 &&
+	git commit -m "dir a/b-2 to symlink" &&
+	git tag test2
+
+HEAD is now at d35741f x
+Previous HEAD position was d35741f x
+HEAD is now at d2c335b base
+[detached HEAD 41d1436] dir a/b-2 to symlink
  Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+)
- rename basename/{ => subdir}/numbers (88%)
- rename basename/{ => subdir}/sequence (89%)
- rename basename/{ => subdir}/values (88%)
- create mode 100644 dir/subdir/newfile.c
- create mode 100644 dir/subdir/newsubdir/newfile.py
-Switched to branch 'A'
-Cloning into 'objects-single'...
-Auto-merging folder/subdir/Makefile
-Merge made by the 'ort' strategy.
-ok 1 - Objects downloaded for single relevant rename
+ 2 files changed, 1 insertion(+)
+ create mode 120000 a/b-2
+ rename a/{b-2/c/d => b/c/e} (100%)
+ok 18 - setup a merge where dir a/b-2 changed to symlink
 
-expecting success of 6421.2 'Objects downloaded when a directory rename triggered': 
-	test_setup_repo &&
-	git clone --sparse --filter=blob:none "file://$(pwd)/server" objects-dir &&
-	(
-		cd objects-dir &&
+expecting success of 6415.19 'merge should not have D/F conflicts (resolve)': 
+	git reset --hard &&
+	git checkout baseline^0 &&
+	git merge -s resolve test2 &&
+	test_path_is_file a/b/c/d
 
-		git rev-list --objects --all --missing=print |
-			grep "^?" | sort >missing-objects-before &&
+HEAD is now at 41d1436 dir a/b-2 to symlink
+Previous HEAD position was 41d1436 dir a/b-2 to symlink
+HEAD is now at d35741f x
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Adding a/b-2
+Merge made by the 'resolve' strategy.
+ a/b-2                | 1 +
+ a/{b-2/c/d => b/c/e} | 0
+ 2 files changed, 1 insertion(+)
+ create mode 120000 a/b-2
+ rename a/{b-2/c/d => b/c/e} (100%)
+ok 19 - merge should not have D/F conflicts (resolve)
 
-		git checkout -q origin/A &&
+expecting success of 6415.20 'a/b-2 was resolved as symlink': 
+	test -h a/b-2
 
-		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
-			-c merge.directoryRenames=true merge --no-stat \
-			--no-progress origin/B-dir &&
+ok 20 - a/b-2 was resolved as symlink
 
-		# Check the number of objects we reported we would fetch
-		cat >expect <<-EOF &&
-		fetch_count:6
-		EOF
-		grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
-		test_cmp expect actual &&
+expecting success of 6415.21 'merge should not have D/F conflicts (recursive)': 
+	git reset --hard &&
+	git checkout baseline^0 &&
+	git merge -s recursive test2 &&
+	test_path_is_file a/b/c/d
 
-		# Check the number of fetch commands exec-ed by filtering trace to
-		# child_start events by the top-level program (2nd field == d0)
-		grep " d0 .* child_start .*fetch.negotiationAlgorithm" trace.output >fetches &&
-		test_line_count = 1 fetches &&
+HEAD is now at 57dad8a Merge tag 'test2' into HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-		git rev-list --objects --all --missing=print |
-			grep "^?" | sort >missing-objects-after &&
-		comm -2 -3 missing-objects-before missing-objects-after >old &&
-		comm -1 -3 missing-objects-before missing-objects-after >new &&
-		# No new missing objects
-		test_must_be_empty new &&
-		# Fetched 6 objects
-		test_line_count = 6 old
-	)
+  57dad8a Merge tag 'test2' into HEAD
 
-Cloning into 'objects-dir'...
-Path updated: dir/subdir/newfile.groovy added in origin/B-dir inside a directory that was renamed in HEAD; moving it to folder/subdir/newfile.groovy.
-Path updated: dir/subdir/newfile.java added in origin/B-dir inside a directory that was renamed in HEAD; moving it to folder/subdir/newfile.java.
-Path updated: dir/subdir/newfile.scala added in origin/B-dir inside a directory that was renamed in HEAD; moving it to folder/subdir/newfile.scala.
-Merge made by the 'ort' strategy.
-ok 2 - Objects downloaded when a directory rename triggered
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 6421.3 'Objects downloaded with lots of renames and modifications': 
-	test_setup_repo &&
-	git clone --sparse --filter=blob:none "file://$(pwd)/server" objects-many &&
-	(
-		cd objects-many &&
+ git branch <new-branch-name> 57dad8a
 
-		git rev-list --objects --all --missing=print |
-			grep "^?" | sort >missing-objects-before &&
+HEAD is now at d35741f x
+Merge made by the 'recursive' strategy.
+ a/b-2                | 1 +
+ a/{b-2/c/d => b/c/e} | 0
+ 2 files changed, 1 insertion(+)
+ create mode 120000 a/b-2
+ rename a/{b-2/c/d => b/c/e} (100%)
+ok 21 - merge should not have D/F conflicts (recursive)
 
-		git checkout -q origin/A &&
+expecting success of 6415.22 'a/b-2 was resolved as symlink': 
+	test -h a/b-2
 
-		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
-			-c merge.directoryRenames=true merge --no-stat \
-			--no-progress origin/B-many &&
+ok 22 - a/b-2 was resolved as symlink
 
-		# Check the number of objects we reported we would fetch
-		cat >expect <<-EOF &&
-		fetch_count:12
-		fetch_count:5
-		fetch_count:3
-		fetch_count:2
-		EOF
-		grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
-		test_cmp expect actual &&
+expecting success of 6415.23 'merge should not have F/D conflicts (recursive)': 
+	git reset --hard &&
+	git checkout -b foo test2 &&
+	git merge -s recursive baseline^0 &&
+	test_path_is_file a/b/c/d
 
-		# Check the number of fetch commands exec-ed by filtering trace to
-		# child_start events by the top-level program (2nd field == d0)
-		grep " d0 .* child_start .*fetch.negotiationAlgorithm" trace.output >fetches &&
-		test_line_count = 4 fetches &&
+HEAD is now at 57dad8a Merge tag 'test2' into HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-		git rev-list --objects --all --missing=print |
-			grep "^?" | sort >missing-objects-after &&
-		comm -2 -3 missing-objects-before missing-objects-after >old &&
-		comm -1 -3 missing-objects-before missing-objects-after >new &&
-		# No new missing objects
-		test_must_be_empty new &&
-		# Fetched 12 + 5 + 3 + 2 = 22 objects
-		test_line_count = 22 old
-	)
+  57dad8a Merge tag 'test2' into HEAD
 
-Cloning into 'objects-many'...
-Auto-merging basename/subdir/numbers
-Auto-merging basename/subdir/sequence
-Auto-merging basename/subdir/values
-Path updated: dir/subdir/newfile.c added in origin/B-many inside a directory that was renamed in HEAD; moving it to folder/subdir/newfile.c.
-Path updated: dir/subdir/newsubdir/newfile.py added in origin/B-many inside a directory that was renamed in HEAD; moving it to folder/subdir/newsubdir/newfile.py.
-Auto-merging general/jump1
-Auto-merging general/jump2
-Merge made by the 'ort' strategy.
-ok 3 - Objects downloaded with lots of renames and modifications
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-# passed all 3 test(s)
-1..3
+ git branch <new-branch-name> 57dad8a
+
+Switched to a new branch 'foo'
+Merge made by the 'recursive' strategy.
+ a/x | 1 +
+ 1 file changed, 1 insertion(+)
+ok 23 - merge should not have F/D conflicts (recursive)
+
+expecting success of 6415.24 'a/b-2 was resolved as symlink': 
+	test -h a/b-2
+
+ok 24 - a/b-2 was resolved as symlink
+
+# still have 1 known breakage(s)
+# passed all remaining 23 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6425-merge-rename-delete.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6041-bisect-submodule.sh ***
@@ -428967,9 +429510,9 @@
 status: waiting for bad commit, 1 good commit known
 Bisecting: 0 revisions left to test after this (roughly 0 steps)
 [e6169bf97522b7a7bdecb08ccbc816ccd15c6742] 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.
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
 ok 12 - git_bisect: modified submodule does not update submodule work tree to invalid commit
 
 expecting success of 6041.13 'git_bisect: modified submodule does not update submodule work tree from invalid commit': 
@@ -429040,6 +429583,391 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6421-merge-partial-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6421-merge-partial-clone/.git/
+expecting success of 6421.1 'Objects downloaded for single relevant rename': 
+	test_setup_repo &&
+	git clone --sparse --filter=blob:none "file://$(pwd)/server" objects-single &&
+	(
+		cd objects-single &&
+
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-before &&
+
+		git checkout -q origin/A &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
+			-c merge.directoryRenames=true merge --no-stat \
+			--no-progress origin/B-single &&
+
+		# Check the number of objects we reported we would fetch
+		cat >expect <<-EOF &&
+		fetch_count:2
+		fetch_count:1
+		EOF
+		grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
+		test_cmp expect actual &&
+
+		# Check the number of fetch commands exec-ed by filtering trace to
+		# child_start events by the top-level program (2nd field == d0)
+		grep " d0 .* child_start .*fetch.negotiationAlgorithm" trace.output >fetches &&
+		test_line_count = 2 fetches &&
+
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-after &&
+		comm -2 -3 missing-objects-before missing-objects-after >old &&
+		comm -1 -3 missing-objects-before missing-objects-after >new &&
+		# No new missing objects
+		test_must_be_empty new &&
+		# Fetched 2 + 1 = 3 objects
+		test_line_count = 3 old
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6421-merge-partial-clone/server/.git/
+[master (root-commit) fb87a8e] O
+ Author: A U Thor <author@example.com>
+ 103 files changed, 150 insertions(+)
+ create mode 100644 basename/numbers
+ create mode 100644 basename/sequence
+ create mode 100644 basename/values
+ 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
+ create mode 100644 general/leap1
+ create mode 100644 general/leap2
+Switched to branch 'A'
+rm 'general/leap1'
+rm 'general/leap2'
+rm 'dir/subdir/tweaked/f'
+[A b0c40f6] A
+ Author: A U Thor <author@example.com>
+ 105 files changed, 10 insertions(+), 2 deletions(-)
+ rename basename/{ => subdir}/numbers (92%)
+ rename basename/{ => subdir}/sequence (92%)
+ rename basename/{ => subdir}/values (92%)
+ delete mode 100644 dir/subdir/e
+ delete mode 100644 dir/subdir/tweaked/f
+ rename {dir => folder}/subdir/Makefile (87%)
+ rename {dir => folder}/subdir/a (100%)
+ rename {dir => folder}/subdir/b (100%)
+ rename {dir => folder}/subdir/c (100%)
+ rename {dir => folder}/subdir/d (100%)
+ create mode 100644 folder/subdir/newsubdir/e
+ create mode 100644 folder/subdir/newsubdir/newfile.rs
+ rename {dir => folder}/subdir/tweaked/Makefile (81%)
+ rename {dir => folder}/subdir/tweaked/g (100%)
+ 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%)
+ rename general/{leap1 => jump1} (88%)
+ rename general/{leap2 => jump2} (91%)
+Switched to branch 'B-single'
+[B-single 4be199b] B-single
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 general/newfile.pl
+Switched to branch 'B-dir'
+[B-dir 4ce2107] B-dir
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 dir/subdir/newfile.groovy
+ create mode 100644 dir/subdir/newfile.java
+ create mode 100644 dir/subdir/newfile.scala
+Switched to branch 'B-many'
+[B-many fa0fa91] B-many
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+)
+ rename basename/{ => subdir}/numbers (88%)
+ rename basename/{ => subdir}/sequence (89%)
+ rename basename/{ => subdir}/values (88%)
+ create mode 100644 dir/subdir/newfile.c
+ create mode 100644 dir/subdir/newsubdir/newfile.py
+Switched to branch 'A'
+Cloning into 'objects-single'...
+Auto-merging folder/subdir/Makefile
+Merge made by the 'ort' strategy.
+ok 1 - Objects downloaded for single relevant rename
+
+expecting success of 6421.2 'Objects downloaded when a directory rename triggered': 
+	test_setup_repo &&
+	git clone --sparse --filter=blob:none "file://$(pwd)/server" objects-dir &&
+	(
+		cd objects-dir &&
+
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-before &&
+
+		git checkout -q origin/A &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
+			-c merge.directoryRenames=true merge --no-stat \
+			--no-progress origin/B-dir &&
+
+		# Check the number of objects we reported we would fetch
+		cat >expect <<-EOF &&
+		fetch_count:6
+		EOF
+		grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
+		test_cmp expect actual &&
+
+		# Check the number of fetch commands exec-ed by filtering trace to
+		# child_start events by the top-level program (2nd field == d0)
+		grep " d0 .* child_start .*fetch.negotiationAlgorithm" trace.output >fetches &&
+		test_line_count = 1 fetches &&
+
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-after &&
+		comm -2 -3 missing-objects-before missing-objects-after >old &&
+		comm -1 -3 missing-objects-before missing-objects-after >new &&
+		# No new missing objects
+		test_must_be_empty new &&
+		# Fetched 6 objects
+		test_line_count = 6 old
+	)
+
+Cloning into 'objects-dir'...
+Path updated: dir/subdir/newfile.groovy added in origin/B-dir inside a directory that was renamed in HEAD; moving it to folder/subdir/newfile.groovy.
+Path updated: dir/subdir/newfile.java added in origin/B-dir inside a directory that was renamed in HEAD; moving it to folder/subdir/newfile.java.
+Path updated: dir/subdir/newfile.scala added in origin/B-dir inside a directory that was renamed in HEAD; moving it to folder/subdir/newfile.scala.
+Merge made by the 'ort' strategy.
+ok 2 - Objects downloaded when a directory rename triggered
+
+expecting success of 6421.3 'Objects downloaded with lots of renames and modifications': 
+	test_setup_repo &&
+	git clone --sparse --filter=blob:none "file://$(pwd)/server" objects-many &&
+	(
+		cd objects-many &&
+
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-before &&
+
+		git checkout -q origin/A &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
+			-c merge.directoryRenames=true merge --no-stat \
+			--no-progress origin/B-many &&
+
+		# Check the number of objects we reported we would fetch
+		cat >expect <<-EOF &&
+		fetch_count:12
+		fetch_count:5
+		fetch_count:3
+		fetch_count:2
+		EOF
+		grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
+		test_cmp expect actual &&
+
+		# Check the number of fetch commands exec-ed by filtering trace to
+		# child_start events by the top-level program (2nd field == d0)
+		grep " d0 .* child_start .*fetch.negotiationAlgorithm" trace.output >fetches &&
+		test_line_count = 4 fetches &&
+
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-after &&
+		comm -2 -3 missing-objects-before missing-objects-after >old &&
+		comm -1 -3 missing-objects-before missing-objects-after >new &&
+		# No new missing objects
+		test_must_be_empty new &&
+		# Fetched 12 + 5 + 3 + 2 = 22 objects
+		test_line_count = 22 old
+	)
+
+Cloning into 'objects-many'...
+Auto-merging basename/subdir/numbers
+Auto-merging basename/subdir/sequence
+Auto-merging basename/subdir/values
+Path updated: dir/subdir/newfile.c added in origin/B-many inside a directory that was renamed in HEAD; moving it to folder/subdir/newfile.c.
+Path updated: dir/subdir/newsubdir/newfile.py added in origin/B-many inside a directory that was renamed in HEAD; moving it to folder/subdir/newsubdir/newfile.py.
+Auto-merging general/jump1
+Auto-merging general/jump2
+Merge made by the 'ort' strategy.
+ok 3 - Objects downloaded with lots of renames and modifications
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6428-merge-conflicts-sparse.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6428-merge-conflicts-sparse/.git/
 expecting success of 6428.1 'conflicting entries written to worktree even if sparse': 
@@ -429188,6 +430116,586 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6427-diff3-conflict-markers.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6427-diff3-conflict-markers/.git/
+expecting success of 6427.1 'setup no merge base': 
+	git init no_merge_base &&
+	(
+		cd no_merge_base &&
+
+		git checkout -b L &&
+		test_commit A content A &&
+
+		git checkout --orphan R &&
+		test_commit B content B
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6427-diff3-conflict-markers/no_merge_base/.git/
+Switched to a new branch 'L'
+[L (root-commit) ccbdd10] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 content
+Switched to a new branch 'R'
+[R (root-commit) 8e39672] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 content
+ok 1 - setup no merge base
+
+expecting success of 6427.2 'check no merge base': 
+	(
+		cd no_merge_base &&
+
+		git checkout L^0 &&
+
+		test_must_fail git -c merge.conflictstyle=diff3 merge --allow-unrelated-histories -s recursive R^0 &&
+
+		grep "|||||| empty tree" content
+	)
+
+Note: switching to 'L^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 ccbdd10 A
+Auto-merging content
+CONFLICT (add/add): Merge conflict in content
+Automatic merge failed; fix conflicts and then commit the result.
+||||||| empty tree
+ok 2 - check no merge base
+
+expecting success of 6427.3 'setup unique merge base': 
+	git init unique_merge_base &&
+	(
+		cd unique_merge_base &&
+
+		test_commit base content "1
+2
+3
+4
+5
+" &&
+
+		git branch L &&
+		git branch R &&
+
+		git checkout L &&
+		test_commit L content "1
+2
+3
+4
+5
+7" &&
+
+		git checkout R &&
+		git rm content &&
+		test_commit R renamed "1
+2
+3
+4
+5
+six"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6427-diff3-conflict-markers/unique_merge_base/.git/
+[main (root-commit) 8b7da6e] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 6 insertions(+)
+ create mode 100644 content
+Switched to branch 'L'
+[L e1c672f] L
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'R'
+rm 'content'
+[R 17f77e6] R
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename content => renamed (71%)
+ok 3 - setup unique merge base
+
+expecting success of 6427.4 'check unique merge base': 
+	(
+		cd unique_merge_base &&
+
+		git checkout L^0 &&
+		MAIN=$(git rev-parse --short main) &&
+
+		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 &&
+
+		grep "|||||| $MAIN:content" renamed
+	)
+
+warning: refname 'L' is ambiguous.
+warning: refname 'L' is ambiguous.
+Note: switching to 'L^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 e1c672f L
+warning: refname 'R' is ambiguous.
+warning: refname 'R' is ambiguous.
+Auto-merging renamed
+CONFLICT (content): Merge conflict in renamed
+Automatic merge failed; fix conflicts and then commit the result.
+||||||| 8b7da6e:content
+ok 4 - check unique merge base
+
+expecting success of 6427.5 'setup multiple merge bases': 
+	git init multiple_merge_bases &&
+	(
+		cd multiple_merge_bases &&
+
+		test_commit initial content "1
+2
+3
+4
+5" &&
+
+		git branch L &&
+		git branch R &&
+
+		# Create L1
+		git checkout L &&
+		test_commit L1 content "0
+1
+2
+3
+4
+5" &&
+
+		# Create R1
+		git checkout R &&
+		test_commit R1 content "1
+2
+3
+4
+5
+6" &&
+
+		# Create L2
+		git checkout L &&
+		git merge R1 &&
+
+		# Create R2
+		git checkout R &&
+		git merge L1 &&
+
+		# Create L3
+		git checkout L &&
+		test_commit L3 content "0
+1
+2
+3
+4
+5
+A" &&
+
+		# Create R3
+		git checkout R &&
+		git rm content &&
+		test_commit R3 renamed "0
+2
+3
+4
+5
+six"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6427-diff3-conflict-markers/multiple_merge_bases/.git/
+[main (root-commit) 79a87bb] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 content
+Switched to branch 'L'
+[L 2e587ed] L1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'R'
+[R 6e9e69f] R1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'L'
+Auto-merging content
+Merge made by the 'ort' strategy.
+ content | 1 +
+ 1 file changed, 1 insertion(+)
+Switched to branch 'R'
+Auto-merging content
+Merge made by the 'ort' strategy.
+ content | 1 +
+ 1 file changed, 1 insertion(+)
+Switched to branch 'L'
+[L 614f030] L3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'R'
+rm 'content'
+[R 8a53b94] R3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ rename content => renamed (71%)
+ok 5 - setup multiple merge bases
+
+expecting success of 6427.6 'check multiple merge bases': 
+	(
+		cd multiple_merge_bases &&
+
+		git checkout L^0 &&
+
+		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 &&
+
+		grep "|||||| merged common ancestors:content" renamed
+	)
+
+Note: switching to 'L^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 614f030 L3
+  From inner merge:  Auto-merging content
+Auto-merging renamed
+CONFLICT (content): Merge conflict in renamed
+Automatic merge failed; fix conflicts and then commit the result.
+||||||| merged common ancestors:content
+ok 6 - check multiple merge bases
+
+expecting success of 6427.7 'rebase --merge describes parent of commit being picked': 
+	git init rebase &&
+	(
+		cd rebase &&
+		test_commit base file &&
+		test_commit main file &&
+		git checkout -b side HEAD^ &&
+		test_commit side file &&
+		test_must_fail git -c merge.conflictstyle=diff3 rebase --merge main &&
+		grep "||||||| parent of" file
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6427-diff3-conflict-markers/rebase/.git/
+[main (root-commit) 215235d] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 9d7b901] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side'
+[side 748f431] side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 748f431... side
+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 748f431... # side
+||||||| parent of 748f431 (side)
+ok 7 - rebase --merge describes parent of commit being picked
+
+expecting success of 6427.8 'rebase --apply describes fake ancestor base': 
+	(
+		cd rebase &&
+		git rebase --abort &&
+		test_must_fail git -c merge.conflictstyle=diff3 rebase --apply main &&
+		grep "||||||| constructed fake ancestor" file
+	)
+
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+First, rewinding head to replay your work on top of it...
+Applying: side
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+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 side
+||||||| constructed fake ancestor
+ok 8 - rebase --apply describes fake ancestor base
+
+expecting success of 6427.9 'check zdiff3 markers': 
+	test_setup_zdiff3 &&
+	(
+		cd zdiff3 &&
+
+		git checkout left^0 &&
+
+		base=$(git rev-parse --short HEAD^1) &&
+		test_must_fail git -c merge.conflictstyle=zdiff3 merge -s recursive right^0 &&
+
+		test_write_lines 1 2 3 4 A \
+				 "<<<<<<< HEAD" B C D \
+				 "||||||| $base" 5 6 \
+				 ======= X C Y \
+				 ">>>>>>> right^0" \
+				 E 7 8 9 \
+				 >expect &&
+		test_cmp expect basic &&
+
+		test_write_lines 1 2 3 \
+				 "<<<<<<< HEAD" CC \
+				 "||||||| $base" AA \
+				 ======= EE \
+				 ">>>>>>> right^0" \
+				 4 5 \
+				 "<<<<<<< HEAD" DD \
+				 "||||||| $base" BB \
+				 ======= FF \
+				 ">>>>>>> right^0" \
+				 6 7 8 \
+				 >expect &&
+		test_cmp expect middle-common &&
+
+		test_write_lines 1 2 3 4 A B C \
+				 "<<<<<<< HEAD" D E F \
+				 "||||||| $base" 5 6 \
+				 ======= 5 6 \
+				 ">>>>>>> right^0" \
+				 G H I J 7 8 9 \
+				 >expect &&
+		test_cmp expect interesting &&
+
+		# Not passing this one yet; the common "B C" lines is still
+		# being left in the conflict blocks on the left and right
+		# sides.
+		test_write_lines 1 2 3 4 \
+				 "<<<<<<< HEAD" X A \
+				 "||||||| $base" 5 6 \
+				 ======= Y A B C \
+				 ">>>>>>> right^0" \
+				 B C 7 8 9 \
+				 >expect &&
+		test_cmp expect evil
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6427-diff3-conflict-markers/zdiff3/.git/
+[main (root-commit) 682cee2] base
+ Author: A U Thor <author@example.com>
+ 4 files changed, 37 insertions(+)
+ create mode 100644 basic
+ create mode 100644 evil
+ create mode 100644 interesting
+ create mode 100644 middle-common
+Switched to branch 'left'
+[left 8ffb720] letters
+ Author: A U Thor <author@example.com>
+ 4 files changed, 21 insertions(+), 8 deletions(-)
+Switched to branch 'right'
+[right 11127f3] permuted
+ Author: A U Thor <author@example.com>
+ 4 files changed, 20 insertions(+), 6 deletions(-)
+Note: switching to 'left^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 8ffb720 letters
+Auto-merging basic
+CONFLICT (content): Merge conflict in basic
+Auto-merging evil
+CONFLICT (content): Merge conflict in evil
+Auto-merging interesting
+CONFLICT (content): Merge conflict in interesting
+Auto-merging middle-common
+CONFLICT (content): Merge conflict in middle-common
+Automatic merge failed; fix conflicts and then commit the result.
+ok 9 - check zdiff3 markers
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6431-merge-criscross.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6431-merge-criscross/.git/
+expecting success of 6431.1 'setup repo with criss-cross history': 
+	mkdir data &&
+
+	# create a bunch of files
+	n=1 &&
+	while test $n -le 10
+	do
+		echo $n > data/$n &&
+		n=$(($n+1)) ||
+		return 1
+	done &&
+
+	# check them in
+	git add data &&
+	git commit -m A &&
+	git branch A &&
+
+	# a file in one branch
+	git checkout -b B A &&
+	git rm data/9 &&
+	git add data &&
+	git commit -m B &&
+
+	# with a branch off of it
+	git branch D &&
+
+	# put some commits on D
+	git checkout D &&
+	echo testD > data/testD &&
+	git add data &&
+	git commit -m D &&
+
+	# back up to the top, create another branch and cause
+	# a rename conflict with the file we deleted earlier
+	git checkout -b C A &&
+	git mv data/9 data/new-9 &&
+	git add data &&
+	git commit -m C &&
+
+	# with a branch off of it
+	git branch E &&
+
+	# put a commit on E
+	git checkout E &&
+	echo testE > data/testE &&
+	git add data &&
+	git commit -m E &&
+
+	# now, merge E into B
+	git checkout B &&
+	test_must_fail git merge E &&
+	# force-resolve
+	git add data &&
+	git commit -m F &&
+	git branch F &&
+
+	# and merge D into C
+	git checkout C &&
+	test_must_fail git merge D &&
+	# force-resolve
+	git add data &&
+	git commit -m G &&
+	git branch G
+
+[master (root-commit) 7287aa7] A
+ Author: A U Thor <author@example.com>
+ 10 files changed, 10 insertions(+)
+ create mode 100644 data/1
+ create mode 100644 data/10
+ create mode 100644 data/2
+ create mode 100644 data/3
+ create mode 100644 data/4
+ create mode 100644 data/5
+ create mode 100644 data/6
+ create mode 100644 data/7
+ create mode 100644 data/8
+ create mode 100644 data/9
+Switched to a new branch 'B'
+rm 'data/9'
+[B 53e80c3] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 data/9
+Switched to branch 'D'
+[D c132a69] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 data/testD
+Switched to a new branch 'C'
+[C e11feee] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename data/{9 => new-9} (100%)
+Switched to branch 'E'
+[E da98b4a] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 data/testE
+Switched to branch 'B'
+CONFLICT (rename/delete): data/9 renamed to data/new-9 in E, but deleted in HEAD.
+Automatic merge failed; fix conflicts and then commit the result.
+[B 9eb2311] F
+ Author: A U Thor <author@example.com>
+Switched to branch 'C'
+CONFLICT (rename/delete): data/9 renamed to data/new-9 in HEAD, but deleted in D.
+Automatic merge failed; fix conflicts and then commit the result.
+[C dc9a020] G
+ Author: A U Thor <author@example.com>
+ok 1 - setup repo with criss-cross history
+
+expecting success of 6431.2 'recursive merge between F and G does not cause segfault': 
+	git merge F
+
+  From inner merge:  CONFLICT (rename/delete): data/9 renamed to data/new-9 in Temporary merge branch 1, but deleted in Temporary merge branch 2.
+Merge made by the 'ort' strategy.
+ data/testE | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 data/testE
+ok 2 - recursive merge between F and G does not cause segfault
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6402-merge-rename.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6402-merge-rename/.git/
 expecting success of 6402.1 'setup': 
@@ -430776,586 +432284,6 @@
 1..46
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6427-diff3-conflict-markers.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6427-diff3-conflict-markers/.git/
-expecting success of 6427.1 'setup no merge base': 
-	git init no_merge_base &&
-	(
-		cd no_merge_base &&
-
-		git checkout -b L &&
-		test_commit A content A &&
-
-		git checkout --orphan R &&
-		test_commit B content B
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6427-diff3-conflict-markers/no_merge_base/.git/
-Switched to a new branch 'L'
-[L (root-commit) ccbdd10] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 content
-Switched to a new branch 'R'
-[R (root-commit) 8e39672] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 content
-ok 1 - setup no merge base
-
-expecting success of 6427.2 'check no merge base': 
-	(
-		cd no_merge_base &&
-
-		git checkout L^0 &&
-
-		test_must_fail git -c merge.conflictstyle=diff3 merge --allow-unrelated-histories -s recursive R^0 &&
-
-		grep "|||||| empty tree" content
-	)
-
-Note: switching to 'L^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 ccbdd10 A
-Auto-merging content
-CONFLICT (add/add): Merge conflict in content
-Automatic merge failed; fix conflicts and then commit the result.
-||||||| empty tree
-ok 2 - check no merge base
-
-expecting success of 6427.3 'setup unique merge base': 
-	git init unique_merge_base &&
-	(
-		cd unique_merge_base &&
-
-		test_commit base content "1
-2
-3
-4
-5
-" &&
-
-		git branch L &&
-		git branch R &&
-
-		git checkout L &&
-		test_commit L content "1
-2
-3
-4
-5
-7" &&
-
-		git checkout R &&
-		git rm content &&
-		test_commit R renamed "1
-2
-3
-4
-5
-six"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6427-diff3-conflict-markers/unique_merge_base/.git/
-[main (root-commit) 8b7da6e] base
- Author: A U Thor <author@example.com>
- 1 file changed, 6 insertions(+)
- create mode 100644 content
-Switched to branch 'L'
-[L e1c672f] L
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'R'
-rm 'content'
-[R 17f77e6] R
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename content => renamed (71%)
-ok 3 - setup unique merge base
-
-expecting success of 6427.4 'check unique merge base': 
-	(
-		cd unique_merge_base &&
-
-		git checkout L^0 &&
-		MAIN=$(git rev-parse --short main) &&
-
-		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 &&
-
-		grep "|||||| $MAIN:content" renamed
-	)
-
-warning: refname 'L' is ambiguous.
-warning: refname 'L' is ambiguous.
-Note: switching to 'L^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 e1c672f L
-warning: refname 'R' is ambiguous.
-warning: refname 'R' is ambiguous.
-Auto-merging renamed
-CONFLICT (content): Merge conflict in renamed
-Automatic merge failed; fix conflicts and then commit the result.
-||||||| 8b7da6e:content
-ok 4 - check unique merge base
-
-expecting success of 6427.5 'setup multiple merge bases': 
-	git init multiple_merge_bases &&
-	(
-		cd multiple_merge_bases &&
-
-		test_commit initial content "1
-2
-3
-4
-5" &&
-
-		git branch L &&
-		git branch R &&
-
-		# Create L1
-		git checkout L &&
-		test_commit L1 content "0
-1
-2
-3
-4
-5" &&
-
-		# Create R1
-		git checkout R &&
-		test_commit R1 content "1
-2
-3
-4
-5
-6" &&
-
-		# Create L2
-		git checkout L &&
-		git merge R1 &&
-
-		# Create R2
-		git checkout R &&
-		git merge L1 &&
-
-		# Create L3
-		git checkout L &&
-		test_commit L3 content "0
-1
-2
-3
-4
-5
-A" &&
-
-		# Create R3
-		git checkout R &&
-		git rm content &&
-		test_commit R3 renamed "0
-2
-3
-4
-5
-six"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6427-diff3-conflict-markers/multiple_merge_bases/.git/
-[main (root-commit) 79a87bb] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 content
-Switched to branch 'L'
-[L 2e587ed] L1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'R'
-[R 6e9e69f] R1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'L'
-Auto-merging content
-Merge made by the 'ort' strategy.
- content | 1 +
- 1 file changed, 1 insertion(+)
-Switched to branch 'R'
-Auto-merging content
-Merge made by the 'ort' strategy.
- content | 1 +
- 1 file changed, 1 insertion(+)
-Switched to branch 'L'
-[L 614f030] L3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'R'
-rm 'content'
-[R 8a53b94] R3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
- rename content => renamed (71%)
-ok 5 - setup multiple merge bases
-
-expecting success of 6427.6 'check multiple merge bases': 
-	(
-		cd multiple_merge_bases &&
-
-		git checkout L^0 &&
-
-		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 &&
-
-		grep "|||||| merged common ancestors:content" renamed
-	)
-
-Note: switching to 'L^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 614f030 L3
-  From inner merge:  Auto-merging content
-Auto-merging renamed
-CONFLICT (content): Merge conflict in renamed
-Automatic merge failed; fix conflicts and then commit the result.
-||||||| merged common ancestors:content
-ok 6 - check multiple merge bases
-
-expecting success of 6427.7 'rebase --merge describes parent of commit being picked': 
-	git init rebase &&
-	(
-		cd rebase &&
-		test_commit base file &&
-		test_commit main file &&
-		git checkout -b side HEAD^ &&
-		test_commit side file &&
-		test_must_fail git -c merge.conflictstyle=diff3 rebase --merge main &&
-		grep "||||||| parent of" file
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6427-diff3-conflict-markers/rebase/.git/
-[main (root-commit) 215235d] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 9d7b901] main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side'
-[side 748f431] side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 748f431... side
-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 748f431... # side
-||||||| parent of 748f431 (side)
-ok 7 - rebase --merge describes parent of commit being picked
-
-expecting success of 6427.8 'rebase --apply describes fake ancestor base': 
-	(
-		cd rebase &&
-		git rebase --abort &&
-		test_must_fail git -c merge.conflictstyle=diff3 rebase --apply main &&
-		grep "||||||| constructed fake ancestor" file
-	)
-
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-First, rewinding head to replay your work on top of it...
-Applying: side
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-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 side
-||||||| constructed fake ancestor
-ok 8 - rebase --apply describes fake ancestor base
-
-expecting success of 6427.9 'check zdiff3 markers': 
-	test_setup_zdiff3 &&
-	(
-		cd zdiff3 &&
-
-		git checkout left^0 &&
-
-		base=$(git rev-parse --short HEAD^1) &&
-		test_must_fail git -c merge.conflictstyle=zdiff3 merge -s recursive right^0 &&
-
-		test_write_lines 1 2 3 4 A \
-				 "<<<<<<< HEAD" B C D \
-				 "||||||| $base" 5 6 \
-				 ======= X C Y \
-				 ">>>>>>> right^0" \
-				 E 7 8 9 \
-				 >expect &&
-		test_cmp expect basic &&
-
-		test_write_lines 1 2 3 \
-				 "<<<<<<< HEAD" CC \
-				 "||||||| $base" AA \
-				 ======= EE \
-				 ">>>>>>> right^0" \
-				 4 5 \
-				 "<<<<<<< HEAD" DD \
-				 "||||||| $base" BB \
-				 ======= FF \
-				 ">>>>>>> right^0" \
-				 6 7 8 \
-				 >expect &&
-		test_cmp expect middle-common &&
-
-		test_write_lines 1 2 3 4 A B C \
-				 "<<<<<<< HEAD" D E F \
-				 "||||||| $base" 5 6 \
-				 ======= 5 6 \
-				 ">>>>>>> right^0" \
-				 G H I J 7 8 9 \
-				 >expect &&
-		test_cmp expect interesting &&
-
-		# Not passing this one yet; the common "B C" lines is still
-		# being left in the conflict blocks on the left and right
-		# sides.
-		test_write_lines 1 2 3 4 \
-				 "<<<<<<< HEAD" X A \
-				 "||||||| $base" 5 6 \
-				 ======= Y A B C \
-				 ">>>>>>> right^0" \
-				 B C 7 8 9 \
-				 >expect &&
-		test_cmp expect evil
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6427-diff3-conflict-markers/zdiff3/.git/
-[main (root-commit) 682cee2] base
- Author: A U Thor <author@example.com>
- 4 files changed, 37 insertions(+)
- create mode 100644 basic
- create mode 100644 evil
- create mode 100644 interesting
- create mode 100644 middle-common
-Switched to branch 'left'
-[left 8ffb720] letters
- Author: A U Thor <author@example.com>
- 4 files changed, 21 insertions(+), 8 deletions(-)
-Switched to branch 'right'
-[right 11127f3] permuted
- Author: A U Thor <author@example.com>
- 4 files changed, 20 insertions(+), 6 deletions(-)
-Note: switching to 'left^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 8ffb720 letters
-Auto-merging basic
-CONFLICT (content): Merge conflict in basic
-Auto-merging evil
-CONFLICT (content): Merge conflict in evil
-Auto-merging interesting
-CONFLICT (content): Merge conflict in interesting
-Auto-merging middle-common
-CONFLICT (content): Merge conflict in middle-common
-Automatic merge failed; fix conflicts and then commit the result.
-ok 9 - check zdiff3 markers
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6431-merge-criscross.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6431-merge-criscross/.git/
-expecting success of 6431.1 'setup repo with criss-cross history': 
-	mkdir data &&
-
-	# create a bunch of files
-	n=1 &&
-	while test $n -le 10
-	do
-		echo $n > data/$n &&
-		n=$(($n+1)) ||
-		return 1
-	done &&
-
-	# check them in
-	git add data &&
-	git commit -m A &&
-	git branch A &&
-
-	# a file in one branch
-	git checkout -b B A &&
-	git rm data/9 &&
-	git add data &&
-	git commit -m B &&
-
-	# with a branch off of it
-	git branch D &&
-
-	# put some commits on D
-	git checkout D &&
-	echo testD > data/testD &&
-	git add data &&
-	git commit -m D &&
-
-	# back up to the top, create another branch and cause
-	# a rename conflict with the file we deleted earlier
-	git checkout -b C A &&
-	git mv data/9 data/new-9 &&
-	git add data &&
-	git commit -m C &&
-
-	# with a branch off of it
-	git branch E &&
-
-	# put a commit on E
-	git checkout E &&
-	echo testE > data/testE &&
-	git add data &&
-	git commit -m E &&
-
-	# now, merge E into B
-	git checkout B &&
-	test_must_fail git merge E &&
-	# force-resolve
-	git add data &&
-	git commit -m F &&
-	git branch F &&
-
-	# and merge D into C
-	git checkout C &&
-	test_must_fail git merge D &&
-	# force-resolve
-	git add data &&
-	git commit -m G &&
-	git branch G
-
-[master (root-commit) 7287aa7] A
- Author: A U Thor <author@example.com>
- 10 files changed, 10 insertions(+)
- create mode 100644 data/1
- create mode 100644 data/10
- create mode 100644 data/2
- create mode 100644 data/3
- create mode 100644 data/4
- create mode 100644 data/5
- create mode 100644 data/6
- create mode 100644 data/7
- create mode 100644 data/8
- create mode 100644 data/9
-Switched to a new branch 'B'
-rm 'data/9'
-[B 53e80c3] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 data/9
-Switched to branch 'D'
-[D c132a69] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 data/testD
-Switched to a new branch 'C'
-[C e11feee] C
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename data/{9 => new-9} (100%)
-Switched to branch 'E'
-[E da98b4a] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 data/testE
-Switched to branch 'B'
-CONFLICT (rename/delete): data/9 renamed to data/new-9 in E, but deleted in HEAD.
-Automatic merge failed; fix conflicts and then commit the result.
-[B 9eb2311] F
- Author: A U Thor <author@example.com>
-Switched to branch 'C'
-CONFLICT (rename/delete): data/9 renamed to data/new-9 in HEAD, but deleted in D.
-Automatic merge failed; fix conflicts and then commit the result.
-[C dc9a020] G
- Author: A U Thor <author@example.com>
-ok 1 - setup repo with criss-cross history
-
-expecting success of 6431.2 'recursive merge between F and G does not cause segfault': 
-	git merge F
-
-  From inner merge:  CONFLICT (rename/delete): data/9 renamed to data/new-9 in Temporary merge branch 1, but deleted in Temporary merge branch 2.
-Merge made by the 'ort' strategy.
- data/testE | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 data/testE
-ok 2 - recursive merge between F and G does not cause segfault
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6432-merge-recursive-space-options.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6432-merge-recursive-space-options/.git/
 expecting success of 6432.1 'setup': 
@@ -432913,6 +433841,883 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6426-merge-skip-unneeded-updates.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/.git/
+expecting success of 6426.1 '1a-L: Modify(A)/Modify(B), change on B subset of A': 
+	test_setup_1a L &&
+	(
+		cd 1a_L &&
+
+		git checkout A^0 &&
+
+		test-tool chmtime --get -3600 b >old-mtime &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		# Make sure b was NOT updated
+		test-tool chmtime --get b >new-mtime &&
+		test_cmp old-mtime new-mtime &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual HEAD:b &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
+
+		git hash-object b   >actual &&
+		git rev-parse   A:b >expect &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/1a_L/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A 14800cf] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'B'
+[B dfd7e13] 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 14800cf A
+ok 1 - 1a-L: Modify(A)/Modify(B), change on B subset of A
+
+expecting success of 6426.2 '1a-R: Modify(A)/Modify(B), change on B subset of A': 
+	test_setup_1a R &&
+	(
+		cd 1a_R &&
+
+		git checkout B^0 &&
+
+		test-tool chmtime --get -3600 b >old-mtime &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+
+		# Make sure b WAS updated
+		test-tool chmtime --get b >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime) &&
+
+		test_must_be_empty err &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual HEAD:b &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
+
+		git hash-object b   >actual &&
+		git rev-parse   A:b >expect &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/1a_R/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A 14800cf] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'B'
+[B dfd7e13] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+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 dfd7e13 B
+ok 2 - 1a-R: Modify(A)/Modify(B), change on B subset of A
+
+expecting success of 6426.3 '2a-L: Modify/rename, merge into modify side': 
+	test_setup_2a L &&
+	(
+		cd 2a_L &&
+
+		git checkout A^0 &&
+
+		test_path_is_missing c &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_path_is_file c &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual HEAD:c &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
+
+		git hash-object c   >actual &&
+		git rev-parse   A:b >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/2a_L/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A c2d59c7] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 6283fcf] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename b => 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 c2d59c7 A
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 3 - 2a-L: Modify/rename, merge into modify side
+
+expecting success of 6426.4 '2a-R: Modify/rename, merge into rename side': 
+	test_setup_2a R &&
+	(
+		cd 2a_R &&
+
+		git checkout B^0 &&
+
+		test-tool chmtime --get -3600 c >old-mtime &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+
+		# Make sure c WAS updated
+		test-tool chmtime --get c >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime) &&
+
+		test_must_be_empty err &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual HEAD:c &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
+
+		git hash-object c   >actual &&
+		git rev-parse   A:b >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/2a_R/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A c2d59c7] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 6283fcf] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename b => c (100%)
+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 6283fcf B
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 4 - 2a-R: Modify/rename, merge into rename side
+
+expecting success of 6426.5 '2b-L: Rename+Mod(A)/Mod(B), B mods subset of A': 
+	test_setup_2b L &&
+	(
+		cd 2b_L &&
+
+		git checkout A^0 &&
+
+		test-tool chmtime --get -3600 c >old-mtime &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		# Make sure c WAS updated
+		test-tool chmtime --get c >new-mtime &&
+		test_cmp old-mtime new-mtime &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual HEAD:c &&
+		git rev-parse >expect A:c &&
+		test_cmp expect actual &&
+
+		git hash-object c   >actual &&
+		git rev-parse   A:c >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/2b_L/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A fed518a] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename b => c (70%)
+Switched to branch 'B'
+[B dfd7e13] 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 fed518a A
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 5 - 2b-L: Rename+Mod(A)/Mod(B), B mods subset of A
+
+expecting success of 6426.6 '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A': 
+	test_setup_2b R &&
+	(
+		cd 2b_R &&
+
+		git checkout B^0 &&
+
+		test_path_is_missing c &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+
+		# Make sure c now present (and thus was updated)
+		test_path_is_file c &&
+
+		test_must_be_empty err &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual HEAD:c &&
+		git rev-parse >expect A:c &&
+		test_cmp expect actual &&
+
+		git hash-object c   >actual &&
+		git rev-parse   A:c >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/2b_R/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A fed518a] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename b => c (70%)
+Switched to branch 'B'
+[B dfd7e13] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+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 dfd7e13 B
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 6 - 2b-R: Rename+Mod(A)/Mod(B), B mods subset of A
+
+expecting success of 6426.7 '2c: Modify b & add c VS rename b->c': 
+	test_setup_2c &&
+	(
+		cd 2c &&
+
+		git checkout A^0 &&
+
+		test-tool chmtime --get -3600 c >old-mtime &&
+		GIT_MERGE_VERBOSITY=3 &&
+		export GIT_MERGE_VERBOSITY &&
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+
+		test_grep "CONFLICT (.*/add):" out &&
+		test_must_be_empty err &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
+
+		# Ensure b was removed
+		test_path_is_missing b &&
+
+		# Make sure c WAS updated...
+		test-tool chmtime --get c >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime) &&
+
+		# ...and has correct index entries and working tree contents
+		git rev-parse >actual :2:c :3:c &&
+		git rev-parse >expect A:c  A:b  &&
+		test_cmp expect actual &&
+
+		git cat-file -p A:b >>merge-me &&
+		git cat-file -p A:c >>merged &&
+		>empty &&
+		test_must_fail git merge-file \
+			-L "HEAD" \
+			-L "" \
+			-L "B^0" \
+			merged empty merge-me &&
+		test_cmp merged c
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/2c/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A edf631f] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 c
+Switched to branch 'B'
+[B 6283fcf] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename b => 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 edf631f A
+CONFLICT (add/add): Merge conflict in c
+ok 7 - 2c: Modify b & add c VS rename b->c
+
+expecting success of 6426.8 '3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
+	test_setup_3a L &&
+	(
+		cd 3a_L &&
+
+		git checkout A^0 &&
+
+		test_path_is_missing bar/bq &&
+		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		test_path_is_file bar/bq &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
+
+		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
+		git rev-parse >expect A:foo/bq    A:foo/whatever &&
+		test_cmp expect actual &&
+
+		git hash-object bar/bq   bar/whatever   >actual &&
+		git rev-parse   A:foo/bq A:foo/whatever >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
+		test_path_is_missing bq &&
+		test_path_is_missing foo/bq &&
+		test_path_is_missing foo/whatever
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/3a_L/.git/
+[master (root-commit) 1e2aa57] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 21 insertions(+)
+ create mode 100644 bq
+ create mode 100644 foo/whatever
+Switched to branch 'A'
+[A 5576138] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename bq => foo/bq (87%)
+Switched to branch 'B'
+[B 69c0854] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {foo => bar}/whatever (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 5576138 A
+fatal: path 'bq' does not exist in 'HEAD'
+HEAD:bq
+ok 8 - 3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
+
+expecting success of 6426.9 '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
+	test_setup_3a R &&
+	(
+		cd 3a_R &&
+
+		git checkout B^0 &&
+
+		test_path_is_missing bar/bq &&
+		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		test_path_is_file bar/bq &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
+
+		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
+		git rev-parse >expect A:foo/bq    A:foo/whatever &&
+		test_cmp expect actual &&
+
+		git hash-object bar/bq   bar/whatever   >actual &&
+		git rev-parse   A:foo/bq A:foo/whatever >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
+		test_path_is_missing bq &&
+		test_path_is_missing foo/bq &&
+		test_path_is_missing foo/whatever
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/3a_R/.git/
+[master (root-commit) 1e2aa57] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 21 insertions(+)
+ create mode 100644 bq
+ create mode 100644 foo/whatever
+Switched to branch 'A'
+[A 5576138] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename bq => foo/bq (87%)
+Switched to branch 'B'
+[B 69c0854] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {foo => bar}/whatever (100%)
+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 69c0854 B
+fatal: path 'bq' does not exist in 'HEAD'
+HEAD:bq
+ok 9 - 3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
+
+expecting success of 6426.10 '3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
+	test_setup_3b L &&
+	(
+		cd 3b_L &&
+
+		git checkout A^0 &&
+
+		test_path_is_missing bar/bq &&
+		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		test_path_is_file bar/bq &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
+
+		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
+		git rev-parse >expect B:bq        A:foo/whatever &&
+		test_cmp expect actual &&
+
+		git hash-object bar/bq bar/whatever   >actual &&
+		git rev-parse   B:bq   A:foo/whatever >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
+		test_path_is_missing bq &&
+		test_path_is_missing foo/bq &&
+		test_path_is_missing foo/whatever
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/3b_L/.git/
+[master (root-commit) 1e2aa57] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 21 insertions(+)
+ create mode 100644 bq
+ create mode 100644 foo/whatever
+Switched to branch 'A'
+[A d02b71c] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename bq => foo/bq (100%)
+Switched to branch 'B'
+[B 2f47892] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename {foo => bar}/whatever (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 d02b71c A
+fatal: path 'bq' does not exist in 'HEAD'
+HEAD:bq
+ok 10 - 3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
+
+expecting success of 6426.11 '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
+	test_setup_3b R &&
+	(
+		cd 3b_R &&
+
+		git checkout B^0 &&
+
+		test_path_is_missing bar/bq &&
+		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		test_path_is_file bar/bq &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
+
+		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
+		git rev-parse >expect B:bq        A:foo/whatever &&
+		test_cmp expect actual &&
+
+		git hash-object bar/bq bar/whatever   >actual &&
+		git rev-parse   B:bq   A:foo/whatever >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
+		test_path_is_missing bq &&
+		test_path_is_missing foo/bq &&
+		test_path_is_missing foo/whatever
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/3b_R/.git/
+[master (root-commit) 1e2aa57] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 21 insertions(+)
+ create mode 100644 bq
+ create mode 100644 foo/whatever
+Switched to branch 'A'
+[A d02b71c] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename bq => foo/bq (100%)
+Switched to branch 'B'
+[B 2f47892] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename {foo => bar}/whatever (100%)
+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 2f47892 B
+fatal: path 'bq' does not exist in 'HEAD'
+HEAD:bq
+ok 11 - 3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
+
+expecting success of 6426.12 '4a: Change on A, change on B subset of A, dirty mods present': 
+	test_setup_4a &&
+	(
+		cd 4a &&
+
+		git checkout A^0 &&
+		echo "File rewritten" >b &&
+
+		test-tool chmtime --get -3600 b >old-mtime &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		# Make sure b was NOT updated
+		test-tool chmtime --get b >new-mtime &&
+		test_cmp old-mtime new-mtime &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual :0:b &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
+
+		git hash-object b >actual &&
+		echo "File rewritten" | git hash-object --stdin >expect &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/4a/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A 14800cf] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'B'
+[B dfd7e13] 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 14800cf A
+ok 12 - 4a: Change on A, change on B subset of A, dirty mods present
+
+expecting success of 6426.13 '4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present': 
+	test_setup_4b &&
+	(
+		cd 4b &&
+
+		git checkout A^0 &&
+		echo "File rewritten" >c &&
+
+		test-tool chmtime --get -3600 c >old-mtime &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		# Make sure c was NOT updated
+		test-tool chmtime --get c >new-mtime &&
+		test_cmp old-mtime new-mtime &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual :0:c &&
+		git rev-parse >expect A:c &&
+		test_cmp expect actual &&
+
+		git hash-object c >actual &&
+		echo "File rewritten" | git hash-object --stdin >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/4b/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A fed518a] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename b => c (70%)
+Switched to branch 'B'
+[B dfd7e13] 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 fed518a A
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 13 - 4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6430-merge-recursive.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6430-merge-recursive/.git/
 expecting success of 6430.1 'setup 1': 
@@ -433864,7 +435669,7 @@
 hint:
 hint: See "git help submodule" for more information.
 hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[topic c301505] base
+[topic 2977a97] base
  Author: A U Thor <author@example.com>
  20 files changed, 38 insertions(+), 4 deletions(-)
  delete mode 120000 a
@@ -433888,12 +435693,12 @@
  create mode 100644 theirs-has-rename-index
  rename {d => theirs-has-rename-work}/e (100%)
 Switched to a new branch 'other'
-[other 67786a3] changesimplefile
+[other 3e5250d] changesimplefile
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'topic'
 rm 'sub1'
-[topic a7e2ed7] changefiletodir
+[topic 4477634] changefiletodir
  Author: A U Thor <author@example.com>
  4 files changed, 1 deletion(-)
  delete mode 100644 sub1
@@ -433954,18 +435759,18 @@
 
 	git merge $B
 
-HEAD is now at da4a87b Merge branch 'other' into topic
-[topic 1770303] O0
+HEAD is now at 996ac26 Merge branch 'other' into topic
+[topic 151a3af] O0
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
-[topic d43c51c] O1
+[topic 54f3c15] O1
  Author: A U Thor <author@example.com>
-HEAD is now at 1770303 O0
-[topic 00091e7] O2
+HEAD is now at 151a3af O0
+[topic 401e2ac] O2
  Author: A U Thor <author@example.com>
 Merge made by the 'ours' strategy.
-HEAD is now at d43c51c O1
+HEAD is now at 54f3c15 O1
 Merge made by the 'ours' strategy.
 Merge made by the 'ort' strategy.
 ok 36 - merge-recursive internal merge resolves to the sameness
@@ -433974,307 +435779,216 @@
 1..36
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6426-merge-skip-unneeded-updates.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/.git/
-expecting success of 6426.1 '1a-L: Modify(A)/Modify(B), change on B subset of A': 
-	test_setup_1a L &&
-	(
-		cd 1a_L &&
-
-		git checkout A^0 &&
-
-		test-tool chmtime --get -3600 b >old-mtime &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
-
-		test_must_be_empty err &&
-
-		# Make sure b was NOT updated
-		test-tool chmtime --get b >new-mtime &&
-		test_cmp old-mtime new-mtime &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+*** t6439-merge-co-error-msgs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6439-merge-co-error-msgs/.git/
+expecting success of 6439.1 'setup': 
+	echo one >one &&
+	git add one &&
+	git commit -a -m First &&
 
-		git rev-parse >actual HEAD:b &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
+	git checkout -b branch &&
+	echo two >two &&
+	echo three >three &&
+	echo four >four &&
+	echo five >five &&
+	git add two three four five &&
+	git commit -m Second &&
 
-		git hash-object b   >actual &&
-		git rev-parse   A:b >expect &&
-		test_cmp expect actual
-	)
+	git checkout main &&
+	echo other >two &&
+	echo other >three &&
+	echo other >four &&
+	echo other >five
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/1a_L/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A 14800cf] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'B'
-[B dfd7e13] B
+[main (root-commit) 3083e2d] First
  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 14800cf A
-ok 1 - 1a-L: Modify(A)/Modify(B), change on B subset of A
+ create mode 100644 one
+Switched to a new branch 'branch'
+[branch c53906c] Second
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 five
+ create mode 100644 four
+ create mode 100644 three
+ create mode 100644 two
+Switched to branch 'main'
+ok 1 - setup
 
-expecting success of 6426.2 '1a-R: Modify(A)/Modify(B), change on B subset of A': 
-	test_setup_1a R &&
+expecting success of 6439.2 'untracked files overwritten by merge (fast and non-fast forward)': 
+	test_must_fail git merge branch 2>out &&
+	test_cmp out expect &&
+	git commit --allow-empty -m empty &&
 	(
-		cd 1a_R &&
-
-		git checkout B^0 &&
-
-		test-tool chmtime --get -3600 b >old-mtime &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
-
-		# Make sure b WAS updated
-		test-tool chmtime --get b >new-mtime &&
-		test $(cat old-mtime) -lt $(cat new-mtime) &&
-
-		test_must_be_empty err &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
-
-		git rev-parse >actual HEAD:b &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
-
-		git hash-object b   >actual &&
-		git rev-parse   A:b >expect &&
-		test_cmp expect actual
-	)
+		GIT_MERGE_VERBOSITY=0 &&
+		export GIT_MERGE_VERBOSITY &&
+		test_must_fail git merge branch 2>out2
+	) &&
+	echo "Merge with strategy ort failed." >>expect &&
+	test_cmp out2 expect &&
+	git reset --hard HEAD^
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/1a_R/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A 14800cf] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'B'
-[B dfd7e13] B
+Updating 3083e2d..c53906c
+[main 47a855e] empty
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-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 3083e2d First
+ok 2 - untracked files overwritten by merge (fast and non-fast forward)
 
-HEAD is now at dfd7e13 B
-ok 2 - 1a-R: Modify(A)/Modify(B), change on B subset of A
+expecting success of 6439.3 'untracked files or local changes overwritten by merge': 
+	git add two &&
+	git add three &&
+	git add four &&
+	test_must_fail git merge branch 2>out &&
+	test_cmp out expect
 
-expecting success of 6426.3 '2a-L: Modify/rename, merge into modify side': 
-	test_setup_2a L &&
-	(
-		cd 2a_L &&
+Updating 3083e2d..c53906c
+ok 3 - untracked files or local changes overwritten by merge
 
-		git checkout A^0 &&
+expecting success of 6439.4 'cannot switch branches because of local changes': 
+	git add five &&
+	mkdir rep &&
+	echo one >rep/one &&
+	echo two >rep/two &&
+	git add rep/one rep/two &&
+	git commit -m Fourth &&
+	git checkout main &&
+	echo uno >rep/one &&
+	echo dos >rep/two &&
+	test_must_fail git checkout branch 2>out &&
+	test_cmp out expect
 
-		test_path_is_missing c &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+[main d37de72] Fourth
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+)
+ create mode 100644 five
+ create mode 100644 four
+ create mode 100644 rep/one
+ create mode 100644 rep/two
+ create mode 100644 three
+ create mode 100644 two
+Already on 'main'
+ok 4 - cannot switch branches because of local changes
 
-		test_path_is_file c &&
+expecting success of 6439.5 'not uptodate file porcelain checkout error': 
+	git add rep/one rep/two &&
+	test_must_fail git checkout branch 2>out &&
+	test_cmp out expect
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+ok 5 - not uptodate file porcelain checkout error
 
-		git rev-parse >actual HEAD:c &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
+expecting success of 6439.6 'not_uptodate_dir porcelain checkout error': 
+	git init uptodate &&
+	cd uptodate &&
+	mkdir rep &&
+	mkdir rep2 &&
+	touch rep/foo &&
+	touch rep2/foo &&
+	git add rep/foo rep2/foo &&
+	git commit -m init &&
+	git checkout -b branch &&
+	git rm rep -r &&
+	git rm rep2 -r &&
+	>rep &&
+	>rep2 &&
+	git add rep rep2 &&
+	git commit -m "added test as a file" &&
+	git checkout main &&
+	>rep/untracked-file &&
+	>rep2/untracked-file &&
+	test_must_fail git checkout branch 2>out &&
+	test_cmp out ../expect
 
-		git hash-object c   >actual &&
-		git rev-parse   A:b >expect &&
-		test_cmp expect actual &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6439-merge-co-error-msgs/uptodate/.git/
+[main (root-commit) 12cbe1c] init
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 rep/foo
+ create mode 100644 rep2/foo
+Switched to a new branch 'branch'
+rm 'rep/foo'
+rm 'rep2/foo'
+[branch 5db55b7] added test as a file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename rep/foo => rep (100%)
+ rename rep2/foo => rep2 (100%)
+Switched to branch 'main'
+ok 6 - not_uptodate_dir porcelain checkout error
 
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6436-merge-overwrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/2a_L/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A c2d59c7] A
+[main (root-commit) 934056f] c0
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to branch 'B'
-[B 6283fcf] B
+ create mode 100644 c0.c
+[main 7b51d7c] c1
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename b => 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 c2d59c7 A
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 3 - 2a-L: Modify/rename, merge into modify side
-
-expecting success of 6426.4 '2a-R: Modify/rename, merge into rename side': 
-	test_setup_2a R &&
-	(
-		cd 2a_R &&
-
-		git checkout B^0 &&
-
-		test-tool chmtime --get -3600 c >old-mtime &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
-
-		# Make sure c WAS updated
-		test-tool chmtime --get c >new-mtime &&
-		test $(cat old-mtime) -lt $(cat new-mtime) &&
-
-		test_must_be_empty err &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
-
-		git rev-parse >actual HEAD:c &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
-
-		git hash-object c   >actual &&
-		git rev-parse   A:b >expect &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/2a_R/.git/
-[master (root-commit) 105387b] O
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+[main 4e7fedb] c1a
  Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A c2d59c7] A
+ 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(+)
-Switched to branch 'B'
-[B 6283fcf] B
+ create mode 100644 c2.c
+HEAD is now at 934056f c0
+[main 55608b7] sub
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename b => c (100%)
-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 6283fcf B
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 4 - 2a-R: Modify/rename, merge into rename side
-
-expecting success of 6426.5 '2b-L: Rename+Mod(A)/Mod(B), B mods subset of A': 
-	test_setup_2b L &&
-	(
-		cd 2b_L &&
-
-		git checkout A^0 &&
-
-		test-tool chmtime --get -3600 c >old-mtime &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
-
-		test_must_be_empty err &&
-
-		# Make sure c WAS updated
-		test-tool chmtime --get c >new-mtime &&
-		test_cmp old-mtime new-mtime &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+ 2 files changed, 2 insertions(+)
+ create mode 100644 sub/f
+ create mode 100644 sub2/f
+ok 1 - setup
 
-		git rev-parse >actual HEAD:c &&
-		git rev-parse >expect A:c &&
-		test_cmp expect actual &&
+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
 
-		git hash-object c   >actual &&
-		git rev-parse   A:c >expect &&
-		test_cmp expect actual &&
+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
 
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/2b_L/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A fed518a] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- rename b => c (70%)
-Switched to branch 'B'
-[B dfd7e13] B
+HEAD is now at 7b51d7c c1
+[main b7e8e56] important
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
+ 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
@@ -434291,564 +436005,993 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at fed518a A
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 5 - 2b-L: Rename+Mod(A)/Mod(B), B mods subset of A
-
-expecting success of 6426.6 '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A': 
-	test_setup_2b R &&
-	(
-		cd 2b_R &&
-
-		git checkout B^0 &&
-
-		test_path_is_missing c &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
-
-		# Make sure c now present (and thus was updated)
-		test_path_is_file c &&
+HEAD is now at 48f99e1 c2
+ok 3 - will overwrite tracked file
 
-		test_must_be_empty err &&
+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
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+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
 
-		git rev-parse >actual HEAD:c &&
-		git rev-parse >expect A:c &&
-		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
 
-		git hash-object c   >actual &&
-		git rev-parse   A:c >expect &&
-		test_cmp expect actual &&
+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
 
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/2b_R/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A fed518a] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- rename b => c (70%)
-Switched to branch 'B'
-[B dfd7e13] B
+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 insertion(+)
-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 dfd7e13 B
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 6 - 2b-R: Rename+Mod(A)/Mod(B), B mods subset of A
-
-expecting success of 6426.7 '2c: Modify b & add c VS rename b->c': 
-	test_setup_2c &&
-	(
-		cd 2c &&
-
-		git checkout A^0 &&
-
-		test-tool chmtime --get -3600 c >old-mtime &&
-		GIT_MERGE_VERBOSITY=3 &&
-		export GIT_MERGE_VERBOSITY &&
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-
-		test_grep "CONFLICT (.*/add):" out &&
-		test_must_be_empty err &&
+ 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
 
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
+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
 
-		# Ensure b was removed
-		test_path_is_missing b &&
+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
 
-		# Make sure c WAS updated...
-		test-tool chmtime --get c >new-mtime &&
-		test $(cat old-mtime) -lt $(cat new-mtime) &&
+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
 
-		# ...and has correct index entries and working tree contents
-		git rev-parse >actual :2:c :3:c &&
-		git rev-parse >expect A:c  A:b  &&
-		test_cmp expect actual &&
+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
 
-		git cat-file -p A:b >>merge-me &&
-		git cat-file -p A:c >>merged &&
-		>empty &&
-		test_must_fail git merge-file \
-			-L "HEAD" \
-			-L "" \
-			-L "B^0" \
-			merged empty merge-me &&
-		test_cmp merged c
-	)
+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 &&
+	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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/2c/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A edf631f] A
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 c
-Switched to branch 'B'
-[B 6283fcf] B
+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 b => 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
+ 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
 
-HEAD is now at edf631f A
-CONFLICT (add/add): Merge conflict in c
-ok 7 - 2c: Modify b & add c VS rename b->c
+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
 
-expecting success of 6426.8 '3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
-	test_setup_3a L &&
-	(
-		cd 3a_L &&
+HEAD is now at 934056f c0
+error: Updating the following directories would lose untracked files in them:
+	sub/f
 
-		git checkout A^0 &&
+Aborting
+Updating 934056f..55608b7
+ok 10 - will not overwrite untracked subtree
 
-		test_path_is_missing bar/bq &&
-		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+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
 
-		test_must_be_empty err &&
+HEAD is now at 934056f c0
+Updating 934056f..55608b7
+ok 11 - will not overwrite untracked file in leading path
 
-		test_path_is_file bar/bq &&
+checking prerequisite: SYMLINKS
 
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
+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 rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
-		git rev-parse >expect A:foo/bq    A:foo/whatever &&
-		test_cmp expect actual &&
+)
+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 hash-object bar/bq   bar/whatever   >actual &&
-		git rev-parse   A:foo/bq A:foo/whatever >expect &&
-		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
 
-		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq &&
-		test_path_is_missing foo/bq &&
-		test_path_is_missing foo/whatever
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/3a_L/.git/
-[master (root-commit) 1e2aa57] O
- Author: A U Thor <author@example.com>
- 2 files changed, 21 insertions(+)
- create mode 100644 bq
- create mode 100644 foo/whatever
-Switched to branch 'A'
-[A 5576138] A
+HEAD is now at 934056f c0
+[detached HEAD 6d387d8] ln
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- rename bq => foo/bq (87%)
-Switched to branch 'B'
-[B 69c0854] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {foo => bar}/whatever (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.
+ create mode 120000 sub
+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:
+  6d387d8 ln
 
-  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> 6d387d8
 
-  git switch -
+HEAD is now at 55608b7 sub
+ok 13 - will not be confused by symlink in leading path
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 5576138 A
-fatal: path 'bq' does not exist in 'HEAD'
-HEAD:bq
-ok 8 - 3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
+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 6426.9 '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
-	test_setup_3a R &&
-	(
-		cd 3a_R &&
+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
 
-		git checkout B^0 &&
+ok 15 - will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.
 
-		test_path_is_missing bar/bq &&
-		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
+expecting success of 6436.16 'failed merge leaves unborn branch in the womb': 
+	test_must_fail git rev-parse --verify HEAD
 
-		test_must_be_empty err &&
+fatal: Needed a single revision
+ok 16 - failed merge leaves unborn branch in the womb
 
-		test_path_is_file bar/bq &&
+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 ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
+ok 17 - set up unborn branch and content
 
-		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
-		git rev-parse >expect A:foo/bq    A:foo/whatever &&
-		test_cmp expect actual &&
+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
 
-		git hash-object bar/bq   bar/whatever   >actual &&
-		git rev-parse   A:foo/bq A:foo/whatever >expect &&
-		test_cmp expect actual &&
+foo
+foo
+bar
+ok 18 - will not clobber WT/index when merging into unborn
 
-		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq &&
-		test_path_is_missing foo/bq &&
-		test_path_is_missing foo/whatever
-	)
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6434-merge-recursive-rename-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6434-merge-recursive-rename-options/.git/
+expecting success of 6434.1 'setup repo': 
+	cat <<-\EOF >3-old &&
+	33a
+	33b
+	33c
+	33d
+	EOF
+	sed s/33/22/ <3-old >2-old &&
+	sed s/33/11/ <3-old >1-old &&
+	sed s/33/00/ <3-old >0-old &&
+	git add [0-3]-old &&
+	git commit -m base &&
+	git rm [0-3]-old &&
+	git commit -m delete &&
+	git checkout -b rename HEAD^ &&
+	cp 3-old 3-new &&
+	sed 1,1s/./x/ <2-old >2-new &&
+	sed 1,2s/./x/ <1-old >1-new &&
+	sed 1,3s/./x/ <0-old >0-new &&
+	git add [0-3]-new &&
+	git rm [0-3]-old &&
+	git commit -m rename &&
+	get_expected_stages 0 &&
+	get_expected_stages 1 &&
+	get_expected_stages 2 &&
+	get_expected_stages 3 &&
+	check_50="false" &&
+	tail="HEAD^ -- HEAD main"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/3a_R/.git/
-[master (root-commit) 1e2aa57] O
+[main (root-commit) f9f9b59] base
  Author: A U Thor <author@example.com>
- 2 files changed, 21 insertions(+)
- create mode 100644 bq
- create mode 100644 foo/whatever
-Switched to branch 'A'
-[A 5576138] A
+ 4 files changed, 16 insertions(+)
+ create mode 100644 0-old
+ create mode 100644 1-old
+ create mode 100644 2-old
+ create mode 100644 3-old
+rm '0-old'
+rm '1-old'
+rm '2-old'
+rm '3-old'
+[main f3f4da2] delete
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename bq => foo/bq (87%)
-Switched to branch 'B'
-[B 69c0854] B
+ 4 files changed, 16 deletions(-)
+ delete mode 100644 0-old
+ delete mode 100644 1-old
+ delete mode 100644 2-old
+ delete mode 100644 3-old
+Switched to a new branch 'rename'
+rm '0-old'
+rm '1-old'
+rm '2-old'
+rm '3-old'
+[rename 056f2c0] rename
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {foo => bar}/whatever (100%)
-Note: switching to 'B^0'.
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+ create mode 100644 0-new
+ delete mode 100644 0-old
+ rename 1-old => 1-new (50%)
+ rename 2-old => 2-new (75%)
+ rename 3-old => 3-new (100%)
+ok 1 - setup 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.
+expecting success of 6434.2 'setup thresholds': 
+	git diff --name-status -M01 HEAD^ HEAD >diff-output &&
+	test_debug "cat diff-output" &&
+	test_line_count = 4 diff-output &&
+	grep "R[0-9][0-9][0-9]	\([0-3]\)-old	\1-new" diff-output \
+		>grep-output &&
+	test_cmp diff-output grep-output &&
+	th0=$(sed -n "s/R\(...\)	0-old	0-new/\1/p" <diff-output) &&
+	th1=$(sed -n "s/R\(...\)	1-old	1-new/\1/p" <diff-output) &&
+	th2=$(sed -n "s/R\(...\)	2-old	2-new/\1/p" <diff-output) &&
+	th3=$(sed -n "s/R\(...\)	3-old	3-new/\1/p" <diff-output) &&
+	test "$th0" -lt "$th1" &&
+	test "$th1" -lt "$th2" &&
+	test "$th2" -lt "$th3" &&
+	test "$th3" = 100 &&
+	if test 50 -le "$th0"
+	then
+		check_50=check_threshold_0
+	elif test 50 -le "$th1"
+	then
+		check_50=check_threshold_1
+	elif test 50 -le "$th2"
+	then
+		check_50=check_threshold_2
+	fi &&
+	th0="$th0%" &&
+	th1="$th1%" &&
+	th2="$th2%" &&
+	th3="$th3%"
 
-If you want to 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 thresholds
 
-  git switch -c <new-branch-name>
+expecting success of 6434.3 'assumption for tests: rename detection with diff': 
+	git diff --name-status -M$th0 --diff-filter=R HEAD^ HEAD \
+		>diff-output-0 &&
+	git diff --name-status -M$th1 --diff-filter=R HEAD^ HEAD \
+		>diff-output-1 &&
+	git diff --name-status -M$th2 --diff-filter=R HEAD^ HEAD \
+		>diff-output-2 &&
+	git diff --name-status -M100% --diff-filter=R HEAD^ HEAD \
+		>diff-output-3 &&
+	test_line_count = 4 diff-output-0 &&
+	test_line_count = 3 diff-output-1 &&
+	test_line_count = 2 diff-output-2 &&
+	test_line_count = 1 diff-output-3
 
-Or undo this operation with:
+ok 3 - assumption for tests: rename detection with diff
 
-  git switch -
+expecting success of 6434.4 'default similarity threshold is 50%': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive $tail &&
+	$check_50
 
-Turn off this advice by setting config variable advice.detachedHead to false
+Merging HEAD with main
+CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 4 - default similarity threshold is 50%
 
-HEAD is now at 69c0854 B
-fatal: path 'bq' does not exist in 'HEAD'
-HEAD:bq
-ok 9 - 3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
+expecting success of 6434.5 'low rename threshold': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=$th0 $tail &&
+	check_threshold_0
 
-expecting success of 6426.10 '3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
-	test_setup_3b L &&
-	(
-		cd 3b_L &&
+Merging HEAD with main
+CONFLICT (rename/delete): 0-old renamed to 0-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 0-new deleted in main and modified in HEAD.  Version HEAD of 0-new left in tree.
+CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 5 - low rename threshold
 
-		git checkout A^0 &&
+expecting success of 6434.6 'medium rename threshold': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=$th1 $tail &&
+	check_threshold_1
 
-		test_path_is_missing bar/bq &&
-		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+Merging HEAD with main
+CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 6 - medium rename threshold
 
-		test_must_be_empty err &&
+expecting success of 6434.7 'high rename threshold': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=$th2 $tail &&
+	check_threshold_2
 
-		test_path_is_file bar/bq &&
+Merging HEAD with main
+CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 7 - high rename threshold
 
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
+expecting success of 6434.8 'exact renames only': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=100% $tail &&
+	check_exact_renames
 
-		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
-		git rev-parse >expect B:bq        A:foo/whatever &&
-		test_cmp expect actual &&
+Merging HEAD with main
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 8 - exact renames only
 
-		git hash-object bar/bq bar/whatever   >actual &&
-		git rev-parse   B:bq   A:foo/whatever >expect &&
-		test_cmp expect actual &&
+expecting success of 6434.9 'rename threshold is truncated': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=200% $tail &&
+	check_exact_renames
 
-		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq &&
-		test_path_is_missing foo/bq &&
-		test_path_is_missing foo/whatever
-	)
+Merging HEAD with main
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 9 - rename threshold is truncated
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/3b_L/.git/
-[master (root-commit) 1e2aa57] O
- Author: A U Thor <author@example.com>
- 2 files changed, 21 insertions(+)
- create mode 100644 bq
- create mode 100644 foo/whatever
-Switched to branch 'A'
-[A d02b71c] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename bq => foo/bq (100%)
-Switched to branch 'B'
-[B 2f47892] B
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename {foo => bar}/whatever (100%)
-Note: switching to 'A^0'.
+expecting success of 6434.10 'disabled rename detection': 
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --no-renames $tail &&
+	check_no_renames
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+Merging HEAD with main
+ok 10 - disabled rename detection
 
-If you want to 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 6434.11 'last wins in --find-renames=<m> --find-renames=<n>': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive \
+		--find-renames=$th0 --find-renames=$th2 $tail &&
+	check_threshold_2
 
-  git switch -c <new-branch-name>
+Merging HEAD with main
+CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 11 - last wins in --find-renames=<m> --find-renames=<n>
 
-Or undo this operation with:
+expecting success of 6434.12 '--find-renames resets threshold': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive \
+		--find-renames=$th0 --find-renames $tail &&
+	$check_50
 
-  git switch -
+Merging HEAD with main
+CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 12 - --find-renames resets threshold
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 6434.13 'last wins in --no-renames --find-renames': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --no-renames --find-renames $tail &&
+	$check_50
 
-HEAD is now at d02b71c A
-fatal: path 'bq' does not exist in 'HEAD'
-HEAD:bq
-ok 10 - 3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
+Merging HEAD with main
+CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 13 - last wins in --no-renames --find-renames
 
-expecting success of 6426.11 '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
-	test_setup_3b R &&
-	(
-		cd 3b_R &&
+expecting success of 6434.14 'last wins in --find-renames --no-renames': 
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --find-renames --no-renames $tail &&
+	check_no_renames
 
-		git checkout B^0 &&
+Merging HEAD with main
+ok 14 - last wins in --find-renames --no-renames
 
-		test_path_is_missing bar/bq &&
-		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
+expecting success of 6434.15 'assumption for further tests: trivial merge succeeds': 
+	git read-tree --reset -u HEAD &&
+	git merge-recursive HEAD -- HEAD HEAD &&
+	git diff --quiet --cached &&
+	git merge-recursive --find-renames=$th0 HEAD -- HEAD HEAD &&
+	git diff --quiet --cached &&
+	git merge-recursive --find-renames=$th2 HEAD -- HEAD HEAD &&
+	git diff --quiet --cached &&
+	git merge-recursive --find-renames=100% HEAD -- HEAD HEAD &&
+	git diff --quiet --cached &&
+	git merge-recursive --no-renames HEAD -- HEAD HEAD &&
+	git diff --quiet --cached
 
-		test_must_be_empty err &&
+Merging HEAD with HEAD
+Merging HEAD with HEAD
+Merging HEAD with HEAD
+Merging HEAD with HEAD
+Merging HEAD with HEAD
+ok 15 - assumption for further tests: trivial merge succeeds
 
-		test_path_is_file bar/bq &&
+expecting success of 6434.16 '--find-renames rejects negative argument': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=-25 \
+		HEAD -- HEAD HEAD &&
+	git diff --quiet --cached
 
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
+fatal: unknown option --find-renames=-25
+ok 16 - --find-renames rejects negative argument
 
-		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
-		git rev-parse >expect B:bq        A:foo/whatever &&
-		test_cmp expect actual &&
+expecting success of 6434.17 '--find-renames rejects non-numbers': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=0xf \
+		HEAD -- HEAD HEAD &&
+	git diff --quiet --cached
 
-		git hash-object bar/bq bar/whatever   >actual &&
-		git rev-parse   B:bq   A:foo/whatever >expect &&
-		test_cmp expect actual &&
+fatal: unknown option --find-renames=0xf
+ok 17 - --find-renames rejects non-numbers
 
-		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq &&
-		test_path_is_missing foo/bq &&
-		test_path_is_missing foo/whatever
-	)
+expecting success of 6434.18 'rename-threshold=<n> is a synonym for find-renames=<n>': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --rename-threshold=$th0 $tail &&
+	check_threshold_0
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/3b_R/.git/
-[master (root-commit) 1e2aa57] O
- Author: A U Thor <author@example.com>
- 2 files changed, 21 insertions(+)
- create mode 100644 bq
- create mode 100644 foo/whatever
-Switched to branch 'A'
-[A d02b71c] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename bq => foo/bq (100%)
-Switched to branch 'B'
-[B 2f47892] B
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename {foo => bar}/whatever (100%)
-Note: switching to 'B^0'.
+Merging HEAD with main
+CONFLICT (rename/delete): 0-old renamed to 0-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 0-new deleted in main and modified in HEAD.  Version HEAD of 0-new left in tree.
+CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 18 - rename-threshold=<n> is a synonym for find-renames=<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.
+expecting success of 6434.19 'last wins in --no-renames --rename-threshold=<n>': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --no-renames --rename-threshold=$th0 $tail &&
+	check_threshold_0
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+Merging HEAD with main
+CONFLICT (rename/delete): 0-old renamed to 0-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 0-new deleted in main and modified in HEAD.  Version HEAD of 0-new left in tree.
+CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 19 - last wins in --no-renames --rename-threshold=<n>
 
-  git switch -c <new-branch-name>
+expecting success of 6434.20 'last wins in --rename-threshold=<n> --no-renames': 
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --rename-threshold=$th0 --no-renames $tail &&
+	check_no_renames
 
-Or undo this operation with:
+Merging HEAD with main
+ok 20 - last wins in --rename-threshold=<n> --no-renames
 
-  git switch -
+expecting success of 6434.21 '--rename-threshold=<n> rejects negative argument': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --rename-threshold=-25 \
+		HEAD -- HEAD HEAD &&
+	git diff --quiet --cached
 
-Turn off this advice by setting config variable advice.detachedHead to false
+fatal: unknown option --rename-threshold=-25
+ok 21 - --rename-threshold=<n> rejects negative argument
 
-HEAD is now at 2f47892 B
-fatal: path 'bq' does not exist in 'HEAD'
-HEAD:bq
-ok 11 - 3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
+expecting success of 6434.22 '--rename-threshold=<n> rejects non-numbers': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --rename-threshold=0xf \
+		HEAD -- HEAD HEAD &&
+	git diff --quiet --cached
 
-expecting success of 6426.12 '4a: Change on A, change on B subset of A, dirty mods present': 
-	test_setup_4a &&
-	(
-		cd 4a &&
+fatal: unknown option --rename-threshold=0xf
+ok 22 - --rename-threshold=<n> rejects non-numbers
 
-		git checkout A^0 &&
-		echo "File rewritten" >b &&
+expecting success of 6434.23 'last wins in --rename-threshold=<m> --find-renames=<n>': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive \
+		--rename-threshold=$th0 --find-renames=$th2 $tail &&
+	check_threshold_2
+
+Merging HEAD with main
+CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 23 - last wins in --rename-threshold=<m> --find-renames=<n>
+
+expecting success of 6434.24 'last wins in --find-renames=<m> --rename-threshold=<n>': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive \
+		--find-renames=$th2 --rename-threshold=$th0 $tail &&
+	check_threshold_0
+
+Merging HEAD with main
+CONFLICT (rename/delete): 0-old renamed to 0-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 0-new deleted in main and modified in HEAD.  Version HEAD of 0-new left in tree.
+CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 24 - last wins in --find-renames=<m> --rename-threshold=<n>
 
-		test-tool chmtime --get -3600 b >old-mtime &&
+expecting success of 6434.25 'merge.renames disables rename detection': 
+	git read-tree --reset -u HEAD &&
+	git -c merge.renames=false merge-recursive $tail &&
+	check_no_renames
 
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+Merging HEAD with main
+ok 25 - merge.renames disables rename detection
 
-		test_must_be_empty err &&
+expecting success of 6434.26 'merge.renames defaults to diff.renames': 
+	git read-tree --reset -u HEAD &&
+	git -c diff.renames=false merge-recursive $tail &&
+	check_no_renames
 
-		# Make sure b was NOT updated
-		test-tool chmtime --get b >new-mtime &&
-		test_cmp old-mtime new-mtime &&
+Merging HEAD with main
+ok 26 - merge.renames defaults to diff.renames
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+expecting success of 6434.27 'merge.renames overrides diff.renames': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git -c diff.renames=false -c merge.renames=true merge-recursive $tail &&
+	$check_50
 
-		git rev-parse >actual :0:b &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
+Merging HEAD with main
+CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
+CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
+ok 27 - merge.renames overrides diff.renames
 
-		git hash-object b >actual &&
-		echo "File rewritten" | git hash-object --stdin >expect &&
-		test_cmp expect actual
-	)
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6433-merge-toplevel.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/4a/.git/
-[master (root-commit) 105387b] O
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A 14800cf] A
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 139b20d] two
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'B'
-[B dfd7e13] B
+ 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(+)
-Note: switching to 'A^0'.
+ 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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 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
 
-If you want to 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'
+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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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)
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 14800cf A
-ok 12 - 4a: Change on A, change on B subset of A, dirty mods present
+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 6426.13 '4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present': 
-	test_setup_4b &&
-	(
-		cd 4b &&
+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)
 
-		git checkout A^0 &&
-		echo "File rewritten" >c &&
+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
 
-		test-tool chmtime --get -3600 c >old-mtime &&
+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
 
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+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
 
-		test_must_be_empty err &&
+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
 
-		# Make sure c was NOT updated
-		test-tool chmtime --get c >new-mtime &&
-		test_cmp old-mtime new-mtime &&
+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
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+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)
 
-		git rev-parse >actual :0:c &&
-		git rev-parse >expect A:c &&
-		test_cmp expect actual &&
+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
 
-		git hash-object c >actual &&
-		echo "File rewritten" | git hash-object --stdin >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)
 
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6426-merge-skip-unneeded-updates/4b/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A fed518a] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- rename b => c (70%)
-Switched to branch 'B'
-[B dfd7e13] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
+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)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 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
 
-If you want to 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'
+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
 
-  git switch -c <new-branch-name>
+expecting success of 6433.12 'refuse two-project merge by default': 
+	t3033_reset &&
+	git reset --hard four &&
+	test_must_fail git merge five
 
-Or undo this operation with:
+Reset branch 'main'
+HEAD is now at bd0edcc four
+fatal: refusing to merge unrelated histories
+ok 12 - refuse two-project merge by default
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+Reset branch 'main'
+HEAD is now at bd0edcc four
+ok 13 - refuse two-project merge by default, quit before --autostash happens
 
-HEAD is now at fed518a A
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 13 - 4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present
+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
 
-# passed all 13 test(s)
-1..13
+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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6300-for-each-ref.sh ***
@@ -436218,7 +438361,7 @@
 	git for-each-ref --format="%(authordate:rfc2822)" refs/heads
 
 Tue Jul 4 01:18:44 2006 +0200
-19 years ago
+20 years ago
 2006-07-04
 Mon Jul 3 23:18:44 2006
 2006-07-04 01:18:44 +0200
@@ -438407,1341 +440550,6 @@
 1..428
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6436-merge-overwrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
-	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
-
-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 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
-
-HEAD is now at 934056f c0
-error: Updating the following directories would lose untracked files in them:
-	sub/f
-
-Aborting
-Updating 934056f..55608b7
-ok 10 - will not overwrite untracked subtree
-
-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
-
-HEAD is now at 934056f c0
-Updating 934056f..55608b7
-ok 11 - will not overwrite untracked file in leading 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 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
-
-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
-
-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 934056f c0
-[detached HEAD 6d387d8] ln
- Author: A U Thor <author@example.com>
- 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
-
-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
-
-foo
-foo
-bar
-ok 18 - will not clobber WT/index when merging into unborn
-
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6439-merge-co-error-msgs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6439-merge-co-error-msgs/.git/
-expecting success of 6439.1 'setup': 
-	echo one >one &&
-	git add one &&
-	git commit -a -m First &&
-
-	git checkout -b branch &&
-	echo two >two &&
-	echo three >three &&
-	echo four >four &&
-	echo five >five &&
-	git add two three four five &&
-	git commit -m Second &&
-
-	git checkout main &&
-	echo other >two &&
-	echo other >three &&
-	echo other >four &&
-	echo other >five
-
-[main (root-commit) 3083e2d] First
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-Switched to a new branch 'branch'
-[branch c53906c] Second
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 five
- create mode 100644 four
- create mode 100644 three
- create mode 100644 two
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 6439.2 'untracked files overwritten by merge (fast and non-fast forward)': 
-	test_must_fail git merge branch 2>out &&
-	test_cmp out expect &&
-	git commit --allow-empty -m empty &&
-	(
-		GIT_MERGE_VERBOSITY=0 &&
-		export GIT_MERGE_VERBOSITY &&
-		test_must_fail git merge branch 2>out2
-	) &&
-	echo "Merge with strategy ort failed." >>expect &&
-	test_cmp out2 expect &&
-	git reset --hard HEAD^
-
-Updating 3083e2d..c53906c
-[main 47a855e] empty
- Author: A U Thor <author@example.com>
-HEAD is now at 3083e2d First
-ok 2 - untracked files overwritten by merge (fast and non-fast forward)
-
-expecting success of 6439.3 'untracked files or local changes overwritten by merge': 
-	git add two &&
-	git add three &&
-	git add four &&
-	test_must_fail git merge branch 2>out &&
-	test_cmp out expect
-
-Updating 3083e2d..c53906c
-ok 3 - untracked files or local changes overwritten by merge
-
-expecting success of 6439.4 'cannot switch branches because of local changes': 
-	git add five &&
-	mkdir rep &&
-	echo one >rep/one &&
-	echo two >rep/two &&
-	git add rep/one rep/two &&
-	git commit -m Fourth &&
-	git checkout main &&
-	echo uno >rep/one &&
-	echo dos >rep/two &&
-	test_must_fail git checkout branch 2>out &&
-	test_cmp out expect
-
-[main d37de72] Fourth
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 five
- create mode 100644 four
- create mode 100644 rep/one
- create mode 100644 rep/two
- create mode 100644 three
- create mode 100644 two
-Already on 'main'
-ok 4 - cannot switch branches because of local changes
-
-expecting success of 6439.5 'not uptodate file porcelain checkout error': 
-	git add rep/one rep/two &&
-	test_must_fail git checkout branch 2>out &&
-	test_cmp out expect
-
-ok 5 - not uptodate file porcelain checkout error
-
-expecting success of 6439.6 'not_uptodate_dir porcelain checkout error': 
-	git init uptodate &&
-	cd uptodate &&
-	mkdir rep &&
-	mkdir rep2 &&
-	touch rep/foo &&
-	touch rep2/foo &&
-	git add rep/foo rep2/foo &&
-	git commit -m init &&
-	git checkout -b branch &&
-	git rm rep -r &&
-	git rm rep2 -r &&
-	>rep &&
-	>rep2 &&
-	git add rep rep2 &&
-	git commit -m "added test as a file" &&
-	git checkout main &&
-	>rep/untracked-file &&
-	>rep2/untracked-file &&
-	test_must_fail git checkout branch 2>out &&
-	test_cmp out ../expect
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6439-merge-co-error-msgs/uptodate/.git/
-[main (root-commit) 12cbe1c] init
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 rep/foo
- create mode 100644 rep2/foo
-Switched to a new branch 'branch'
-rm 'rep/foo'
-rm 'rep2/foo'
-[branch 5db55b7] added test as a file
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename rep/foo => rep (100%)
- rename rep2/foo => rep2 (100%)
-Switched to branch 'main'
-ok 6 - not_uptodate_dir porcelain checkout error
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6434-merge-recursive-rename-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6434-merge-recursive-rename-options/.git/
-expecting success of 6434.1 'setup repo': 
-	cat <<-\EOF >3-old &&
-	33a
-	33b
-	33c
-	33d
-	EOF
-	sed s/33/22/ <3-old >2-old &&
-	sed s/33/11/ <3-old >1-old &&
-	sed s/33/00/ <3-old >0-old &&
-	git add [0-3]-old &&
-	git commit -m base &&
-	git rm [0-3]-old &&
-	git commit -m delete &&
-	git checkout -b rename HEAD^ &&
-	cp 3-old 3-new &&
-	sed 1,1s/./x/ <2-old >2-new &&
-	sed 1,2s/./x/ <1-old >1-new &&
-	sed 1,3s/./x/ <0-old >0-new &&
-	git add [0-3]-new &&
-	git rm [0-3]-old &&
-	git commit -m rename &&
-	get_expected_stages 0 &&
-	get_expected_stages 1 &&
-	get_expected_stages 2 &&
-	get_expected_stages 3 &&
-	check_50="false" &&
-	tail="HEAD^ -- HEAD main"
-
-[main (root-commit) f9f9b59] base
- Author: A U Thor <author@example.com>
- 4 files changed, 16 insertions(+)
- create mode 100644 0-old
- create mode 100644 1-old
- create mode 100644 2-old
- create mode 100644 3-old
-rm '0-old'
-rm '1-old'
-rm '2-old'
-rm '3-old'
-[main f3f4da2] delete
- Author: A U Thor <author@example.com>
- 4 files changed, 16 deletions(-)
- delete mode 100644 0-old
- delete mode 100644 1-old
- delete mode 100644 2-old
- delete mode 100644 3-old
-Switched to a new branch 'rename'
-rm '0-old'
-rm '1-old'
-rm '2-old'
-rm '3-old'
-[rename 056f2c0] rename
- Author: A U Thor <author@example.com>
- 5 files changed, 7 insertions(+), 7 deletions(-)
- create mode 100644 0-new
- delete mode 100644 0-old
- rename 1-old => 1-new (50%)
- rename 2-old => 2-new (75%)
- rename 3-old => 3-new (100%)
-ok 1 - setup repo
-
-expecting success of 6434.2 'setup thresholds': 
-	git diff --name-status -M01 HEAD^ HEAD >diff-output &&
-	test_debug "cat diff-output" &&
-	test_line_count = 4 diff-output &&
-	grep "R[0-9][0-9][0-9]	\([0-3]\)-old	\1-new" diff-output \
-		>grep-output &&
-	test_cmp diff-output grep-output &&
-	th0=$(sed -n "s/R\(...\)	0-old	0-new/\1/p" <diff-output) &&
-	th1=$(sed -n "s/R\(...\)	1-old	1-new/\1/p" <diff-output) &&
-	th2=$(sed -n "s/R\(...\)	2-old	2-new/\1/p" <diff-output) &&
-	th3=$(sed -n "s/R\(...\)	3-old	3-new/\1/p" <diff-output) &&
-	test "$th0" -lt "$th1" &&
-	test "$th1" -lt "$th2" &&
-	test "$th2" -lt "$th3" &&
-	test "$th3" = 100 &&
-	if test 50 -le "$th0"
-	then
-		check_50=check_threshold_0
-	elif test 50 -le "$th1"
-	then
-		check_50=check_threshold_1
-	elif test 50 -le "$th2"
-	then
-		check_50=check_threshold_2
-	fi &&
-	th0="$th0%" &&
-	th1="$th1%" &&
-	th2="$th2%" &&
-	th3="$th3%"
-
-ok 2 - setup thresholds
-
-expecting success of 6434.3 'assumption for tests: rename detection with diff': 
-	git diff --name-status -M$th0 --diff-filter=R HEAD^ HEAD \
-		>diff-output-0 &&
-	git diff --name-status -M$th1 --diff-filter=R HEAD^ HEAD \
-		>diff-output-1 &&
-	git diff --name-status -M$th2 --diff-filter=R HEAD^ HEAD \
-		>diff-output-2 &&
-	git diff --name-status -M100% --diff-filter=R HEAD^ HEAD \
-		>diff-output-3 &&
-	test_line_count = 4 diff-output-0 &&
-	test_line_count = 3 diff-output-1 &&
-	test_line_count = 2 diff-output-2 &&
-	test_line_count = 1 diff-output-3
-
-ok 3 - assumption for tests: rename detection with diff
-
-expecting success of 6434.4 'default similarity threshold is 50%': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive $tail &&
-	$check_50
-
-Merging HEAD with main
-CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 4 - default similarity threshold is 50%
-
-expecting success of 6434.5 'low rename threshold': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=$th0 $tail &&
-	check_threshold_0
-
-Merging HEAD with main
-CONFLICT (rename/delete): 0-old renamed to 0-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 0-new deleted in main and modified in HEAD.  Version HEAD of 0-new left in tree.
-CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 5 - low rename threshold
-
-expecting success of 6434.6 'medium rename threshold': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=$th1 $tail &&
-	check_threshold_1
-
-Merging HEAD with main
-CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 6 - medium rename threshold
-
-expecting success of 6434.7 'high rename threshold': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=$th2 $tail &&
-	check_threshold_2
-
-Merging HEAD with main
-CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 7 - high rename threshold
-
-expecting success of 6434.8 'exact renames only': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=100% $tail &&
-	check_exact_renames
-
-Merging HEAD with main
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 8 - exact renames only
-
-expecting success of 6434.9 'rename threshold is truncated': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=200% $tail &&
-	check_exact_renames
-
-Merging HEAD with main
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 9 - rename threshold is truncated
-
-expecting success of 6434.10 'disabled rename detection': 
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --no-renames $tail &&
-	check_no_renames
-
-Merging HEAD with main
-ok 10 - disabled rename detection
-
-expecting success of 6434.11 'last wins in --find-renames=<m> --find-renames=<n>': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive \
-		--find-renames=$th0 --find-renames=$th2 $tail &&
-	check_threshold_2
-
-Merging HEAD with main
-CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 11 - last wins in --find-renames=<m> --find-renames=<n>
-
-expecting success of 6434.12 '--find-renames resets threshold': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive \
-		--find-renames=$th0 --find-renames $tail &&
-	$check_50
-
-Merging HEAD with main
-CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 12 - --find-renames resets threshold
-
-expecting success of 6434.13 'last wins in --no-renames --find-renames': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --no-renames --find-renames $tail &&
-	$check_50
-
-Merging HEAD with main
-CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 13 - last wins in --no-renames --find-renames
-
-expecting success of 6434.14 'last wins in --find-renames --no-renames': 
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --find-renames --no-renames $tail &&
-	check_no_renames
-
-Merging HEAD with main
-ok 14 - last wins in --find-renames --no-renames
-
-expecting success of 6434.15 'assumption for further tests: trivial merge succeeds': 
-	git read-tree --reset -u HEAD &&
-	git merge-recursive HEAD -- HEAD HEAD &&
-	git diff --quiet --cached &&
-	git merge-recursive --find-renames=$th0 HEAD -- HEAD HEAD &&
-	git diff --quiet --cached &&
-	git merge-recursive --find-renames=$th2 HEAD -- HEAD HEAD &&
-	git diff --quiet --cached &&
-	git merge-recursive --find-renames=100% HEAD -- HEAD HEAD &&
-	git diff --quiet --cached &&
-	git merge-recursive --no-renames HEAD -- HEAD HEAD &&
-	git diff --quiet --cached
-
-Merging HEAD with HEAD
-Merging HEAD with HEAD
-Merging HEAD with HEAD
-Merging HEAD with HEAD
-Merging HEAD with HEAD
-ok 15 - assumption for further tests: trivial merge succeeds
-
-expecting success of 6434.16 '--find-renames rejects negative argument': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=-25 \
-		HEAD -- HEAD HEAD &&
-	git diff --quiet --cached
-
-fatal: unknown option --find-renames=-25
-ok 16 - --find-renames rejects negative argument
-
-expecting success of 6434.17 '--find-renames rejects non-numbers': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=0xf \
-		HEAD -- HEAD HEAD &&
-	git diff --quiet --cached
-
-fatal: unknown option --find-renames=0xf
-ok 17 - --find-renames rejects non-numbers
-
-expecting success of 6434.18 'rename-threshold=<n> is a synonym for find-renames=<n>': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --rename-threshold=$th0 $tail &&
-	check_threshold_0
-
-Merging HEAD with main
-CONFLICT (rename/delete): 0-old renamed to 0-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 0-new deleted in main and modified in HEAD.  Version HEAD of 0-new left in tree.
-CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 18 - rename-threshold=<n> is a synonym for find-renames=<n>
-
-expecting success of 6434.19 'last wins in --no-renames --rename-threshold=<n>': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --no-renames --rename-threshold=$th0 $tail &&
-	check_threshold_0
-
-Merging HEAD with main
-CONFLICT (rename/delete): 0-old renamed to 0-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 0-new deleted in main and modified in HEAD.  Version HEAD of 0-new left in tree.
-CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 19 - last wins in --no-renames --rename-threshold=<n>
-
-expecting success of 6434.20 'last wins in --rename-threshold=<n> --no-renames': 
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --rename-threshold=$th0 --no-renames $tail &&
-	check_no_renames
-
-Merging HEAD with main
-ok 20 - last wins in --rename-threshold=<n> --no-renames
-
-expecting success of 6434.21 '--rename-threshold=<n> rejects negative argument': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --rename-threshold=-25 \
-		HEAD -- HEAD HEAD &&
-	git diff --quiet --cached
-
-fatal: unknown option --rename-threshold=-25
-ok 21 - --rename-threshold=<n> rejects negative argument
-
-expecting success of 6434.22 '--rename-threshold=<n> rejects non-numbers': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --rename-threshold=0xf \
-		HEAD -- HEAD HEAD &&
-	git diff --quiet --cached
-
-fatal: unknown option --rename-threshold=0xf
-ok 22 - --rename-threshold=<n> rejects non-numbers
-
-expecting success of 6434.23 'last wins in --rename-threshold=<m> --find-renames=<n>': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive \
-		--rename-threshold=$th0 --find-renames=$th2 $tail &&
-	check_threshold_2
-
-Merging HEAD with main
-CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 23 - last wins in --rename-threshold=<m> --find-renames=<n>
-
-expecting success of 6434.24 'last wins in --find-renames=<m> --rename-threshold=<n>': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive \
-		--find-renames=$th2 --rename-threshold=$th0 $tail &&
-	check_threshold_0
-
-Merging HEAD with main
-CONFLICT (rename/delete): 0-old renamed to 0-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 0-new deleted in main and modified in HEAD.  Version HEAD of 0-new left in tree.
-CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 24 - last wins in --find-renames=<m> --rename-threshold=<n>
-
-expecting success of 6434.25 'merge.renames disables rename detection': 
-	git read-tree --reset -u HEAD &&
-	git -c merge.renames=false merge-recursive $tail &&
-	check_no_renames
-
-Merging HEAD with main
-ok 25 - merge.renames disables rename detection
-
-expecting success of 6434.26 'merge.renames defaults to diff.renames': 
-	git read-tree --reset -u HEAD &&
-	git -c diff.renames=false merge-recursive $tail &&
-	check_no_renames
-
-Merging HEAD with main
-ok 26 - merge.renames defaults to diff.renames
-
-expecting success of 6434.27 'merge.renames overrides diff.renames': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git -c diff.renames=false -c merge.renames=true merge-recursive $tail &&
-	$check_50
-
-Merging HEAD with main
-CONFLICT (rename/delete): 1-old renamed to 1-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 1-new deleted in main and modified in HEAD.  Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 2-old renamed to 2-new in HEAD, but deleted in main.
-CONFLICT (modify/delete): 2-new deleted in main and modified in HEAD.  Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 3-old renamed to 3-new in HEAD, but deleted in main.
-ok 27 - merge.renames overrides diff.renames
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6433-merge-toplevel.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6700-tree-depth.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6501-freshen-objects.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6501-freshen-objects/.git/
 expecting success of 6501.1 'make repo completely empty (loose)': 
@@ -439785,12 +440593,12 @@
 expecting success of 6501.5 'simulate time passing (loose)': 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1756196543
-1756196543
-1756196543
-1756196543
-1756196543
-1756196543
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
 ok 5 - simulate time passing (loose)
 
 expecting success of 6501.6 'start writing new commit with old blob (loose)': 
@@ -439826,15 +440634,15 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at 8539479 base
-1756196544
-1756196543
-1756196543
-1756196543
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
 ok 10 - abandon objects again (loose)
 
 expecting success of 6501.11 'start writing new commit with same tree (loose)': 
@@ -439901,10 +440709,10 @@
 expecting success of 6501.18 'simulate time passing (repack)': 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1756196544
-1756196544
-1756196544
-1756196544
+1790607201
+1790607201
+1790607201
+1790607201
 ok 18 - simulate time passing (repack)
 
 expecting success of 6501.19 'start writing new commit with old blob (repack)': 
@@ -439941,17 +440749,17 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at aa8ecd7 base
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
+1790607201
 ok 23 - abandon objects again (repack)
 
 expecting success of 6501.24 'start writing new commit with same tree (repack)': 
@@ -440018,11 +440826,11 @@
 expecting success of 6501.31 'simulate time passing (bitmap)': 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
+1790607202
+1790607201
+1790607202
+1790607201
+1790607201
 ok 31 - simulate time passing (bitmap)
 
 expecting success of 6501.32 'start writing new commit with old blob (bitmap)': 
@@ -440059,17 +440867,17 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at 41163df base
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
-1756196544
+1790607202
+1790607202
+1790607202
+1790607202
+1790607202
+1790607202
+1790607202
+1790607202
+1790607202
+1790607202
+1790607202
 ok 36 - abandon objects again (bitmap)
 
 expecting success of 6501.37 'start writing new commit with same tree (bitmap)': 
@@ -441928,2318 +442736,124 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6416-recursive-corner-cases.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/.git/
-expecting success of 6416.1 'setup basic criss-cross + rename with no modifications': 
-	git init basic-rename &&
-	(
-		cd basic-rename &&
-
-		ten="0 1 2 3 4 5 6 7 8 9" &&
-		printf "line %d in a sample file\n" $ten >one &&
-		printf "line %d in another sample file\n" $ten >two &&
-		git add one two &&
-		test_tick && git commit -m initial &&
-
-		git branch L1 &&
-		git checkout -b R1 &&
-		git mv one three &&
-		test_tick && git commit -m R1 &&
-
-		git checkout L1 &&
-		git mv two three &&
-		test_tick && git commit -m L1 &&
-
-		git checkout L1^0 &&
-		test_tick && git merge -s ours R1 &&
-		git tag L2 &&
-
-		git checkout R1^0 &&
-		test_tick && git merge -s ours L1 &&
-		git tag R2
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/basic-rename/.git/
-[main (root-commit) 4871052] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 20 insertions(+)
- create mode 100644 one
- create mode 100644 two
-Switched to a new branch 'R1'
-[R1 6592516] R1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename one => three (100%)
-Switched to branch 'L1'
-[L1 bd99445] L1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename two => three (100%)
-Note: switching to 'L1^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 bd99445 L1
-Merge made by the 'ours' strategy.
-Previous HEAD position was d46c613 Merge branch 'R1' into HEAD
-HEAD is now at 6592516 R1
-Merge made by the 'ours' strategy.
-ok 1 - setup basic criss-cross + rename with no modifications
-
-expecting success of 6416.2 'merge simple rename+criss-cross with no modifications': 
-	(
-		cd basic-rename &&
-
-		git reset --hard &&
-		git checkout L2^0 &&
-
-		test_must_fail git merge -s recursive R2^0 &&
-
-		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 >expect       \
-			L2:three   R2:three &&
-		git rev-parse   >actual     \
-			:2:three   :3:three &&
-		test_cmp expect actual
-	)
-
-HEAD is now at 01e4222 Merge branch 'L1' into HEAD
-Previous HEAD position was 01e4222 Merge branch 'L1' into HEAD
-HEAD is now at d46c613 Merge branch 'R1' into HEAD
-  From inner merge:  Auto-merging three
-  From inner merge:  CONFLICT (add/add): Merge conflict in three
-Auto-merging three
-CONFLICT (content): Merge conflict in three
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - merge simple rename+criss-cross with no modifications
-
-expecting success of 6416.3 'setup criss-cross + rename merges with basic modification': 
-	git init rename-modify &&
-	(
-		cd rename-modify &&
-
-		ten="0 1 2 3 4 5 6 7 8 9" &&
-		printf "line %d in a sample file\n" $ten >one &&
-		printf "line %d in another sample file\n" $ten >two &&
-		git add one two &&
-		test_tick && git commit -m initial &&
-
-		git branch L1 &&
-		git checkout -b R1 &&
-		git mv one three &&
-		echo more >>two &&
-		git add two &&
-		test_tick && git commit -m R1 &&
-
-		git checkout L1 &&
-		git mv two three &&
-		test_tick && git commit -m L1 &&
-
-		git checkout L1^0 &&
-		test_tick && git merge -s ours R1 &&
-		git tag L2 &&
-
-		git checkout R1^0 &&
-		test_tick && git merge -s ours L1 &&
-		git tag R2
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/rename-modify/.git/
-[main (root-commit) 4871052] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 20 insertions(+)
- create mode 100644 one
- create mode 100644 two
-Switched to a new branch 'R1'
-[R1 edf7b54] R1
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename one => three (100%)
-Switched to branch 'L1'
-[L1 bd99445] L1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename two => three (100%)
-Note: switching to 'L1^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 bd99445 L1
-Merge made by the 'ours' strategy.
-Previous HEAD position was fb0e0c9 Merge branch 'R1' into HEAD
-HEAD is now at edf7b54 R1
-Merge made by the 'ours' strategy.
-ok 3 - setup criss-cross + rename merges with basic modification
-
-expecting success of 6416.4 'merge criss-cross + rename merges with basic modification': 
-	(
-		cd rename-modify &&
-
-		git checkout L2^0 &&
-
-		test_must_fail git merge -s recursive R2^0 &&
-
-		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 >expect       \
-			L2:three   R2:three &&
-		git rev-parse   >actual     \
-			:2:three   :3:three &&
-		test_cmp expect actual
-	)
-
-Previous HEAD position was c7add50 Merge branch 'L1' into HEAD
-HEAD is now at fb0e0c9 Merge branch 'R1' into HEAD
-  From inner merge:  Auto-merging three
-  From inner merge:  CONFLICT (add/add): Merge conflict in three
-Auto-merging three
-CONFLICT (content): Merge conflict in three
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - merge criss-cross + rename merges with basic modification
-
-expecting success of 6416.5 'setup differently handled merges of rename/add conflict': 
-	git init rename-add &&
-	(
-		cd rename-add &&
-
-		printf "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n" >a &&
-		git add a &&
-		test_tick && git commit -m A &&
-
-		git branch B &&
-		git checkout -b C &&
-		echo 10 >>a &&
-		test_write_lines 0 1 2 3 4 5 6 7 foobar >new_a &&
-		git add a new_a &&
-		test_tick && git commit -m C &&
-
-		git checkout B &&
-		git mv a new_a &&
-		test_tick && git commit -m B &&
-
-		git checkout B^0 &&
-		test_must_fail git merge C &&
-		git show :2:new_a >new_a &&
-		git add new_a &&
-		test_tick && git commit -m D &&
-		git tag D &&
-
-		git checkout C^0 &&
-		test_must_fail git merge B &&
-		test_write_lines 0 1 2 3 4 5 6 7 bad_merge >new_a &&
-		git add -u &&
-		test_tick && git commit -m E &&
-		git tag E
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/rename-add/.git/
-[main (root-commit) 1b84f42] A
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 a
-Switched to a new branch 'C'
-[C f1f358b] C
- Author: A U Thor <author@example.com>
- 2 files changed, 10 insertions(+)
- create mode 100644 new_a
-Switched to branch 'B'
-[B 0496200] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a => new_a (100%)
-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 0496200 B
-Auto-merging new_a
-CONFLICT (add/add): Merge conflict in new_a
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD fc47f4b] D
- Author: A U Thor <author@example.com>
-Previous HEAD position was fc47f4b D
-HEAD is now at f1f358b C
-Auto-merging new_a
-CONFLICT (add/add): Merge conflict in new_a
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD 1e98639] E
- Author: A U Thor <author@example.com>
-ok 5 - setup differently handled merges of rename/add conflict
-
-expecting success of 6416.6 'git detects differently handled merges conflict': 
-	(
-		cd rename-add &&
-
-		git checkout D^0 &&
-
-		test_must_fail git merge -s recursive E^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git cat-file -p C:new_a >ours &&
-		git cat-file -p C:a >theirs &&
-		>empty &&
-		test_must_fail git merge-file \
-			-L "Temporary merge branch 1" \
-			-L "" \
-			-L "Temporary merge branch 2" \
-			ours empty theirs &&
-		sed -e "s/^\([<=>]\)/\1\1\1/" ours >ours-tweaked &&
-		git hash-object ours-tweaked >expect &&
-		git rev-parse >>expect      \
-				  D:new_a  E:new_a &&
-		git rev-parse   >actual     \
-			:1:new_a :2:new_a :3:new_a &&
-		test_cmp expect actual &&
-
-		# Test that the two-way merge in new_a is as expected
-		git cat-file -p D:new_a >ours &&
-		git cat-file -p E:new_a >theirs &&
-		>empty &&
-		test_must_fail git merge-file \
-			-L "HEAD" \
-			-L "" \
-			-L "E^0" \
-			ours empty theirs &&
-		sed -e "s/^\([<=>]\)/\1\1\1/" ours >expect &&
-		git hash-object new_a >actual &&
-		git hash-object ours  >expect &&
-		test_cmp expect actual
-	)
-
-Previous HEAD position was 1e98639 E
-HEAD is now at fc47f4b D
-  From inner merge:  Auto-merging new_a
-  From inner merge:  CONFLICT (add/add): Merge conflict in new_a
-Auto-merging new_a
-CONFLICT (content): Merge conflict in new_a
-Automatic merge failed; fix conflicts and then commit the result.
-ok 6 - git detects differently handled merges conflict
-
-expecting success of 6416.7 'git detects differently handled merges conflict, swapped': 
-	(
-		cd rename-add &&
-
-		# Difference #1: Do cleanup from previous testrun
-		git reset --hard &&
-		git clean -fdqx &&
-
-		# Difference #2: Change commit timestamps
-		btime=$(git log --no-walk --date=raw --format=%cd B | awk "{print \$1}") &&
-		ctime=$(git log --no-walk --date=raw --format=%cd C | awk "{print \$1}") &&
-		newctime=$(($btime+1)) &&
-		git fast-export --no-data --all | sed -e s/$ctime/$newctime/ | git fast-import --force --quiet &&
-		# End of most differences; rest is copy-paste of last test,
-		# other than swapping C:a and C:new_a due to order switch
-
-		git checkout D^0 &&
-		test_must_fail git merge -s recursive E^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git cat-file -p C:a >ours &&
-		git cat-file -p C:new_a >theirs &&
-		>empty &&
-		test_must_fail git merge-file \
-			-L "Temporary merge branch 1" \
-			-L "" \
-			-L "Temporary merge branch 2" \
-			ours empty theirs &&
-		sed -e "s/^\([<=>]\)/\1\1\1/" ours >ours-tweaked &&
-		git hash-object ours-tweaked >expect &&
-		git rev-parse >>expect      \
-				  D:new_a  E:new_a &&
-		git rev-parse   >actual     \
-			:1:new_a :2:new_a :3:new_a &&
-		test_cmp expect actual &&
-
-		# Test that the two-way merge in new_a is as expected
-		git cat-file -p D:new_a >ours &&
-		git cat-file -p E:new_a >theirs &&
-		>empty &&
-		test_must_fail git merge-file \
-			-L "HEAD" \
-			-L "" \
-			-L "E^0" \
-			ours empty theirs &&
-		sed -e "s/^\([<=>]\)/\1\1\1/" ours >expect &&
-		git hash-object new_a >actual &&
-		git hash-object ours  >expect &&
-		test_cmp expect actual
-	)
-
-HEAD is now at fc47f4b D
-HEAD is now at 23cad11 D
-  From inner merge:  Auto-merging new_a
-  From inner merge:  CONFLICT (add/add): Merge conflict in new_a
-Auto-merging new_a
-CONFLICT (content): Merge conflict in new_a
-Automatic merge failed; fix conflicts and then commit the result.
-ok 7 - git detects differently handled merges conflict, swapped
-
-expecting success of 6416.8 'setup criss-cross + modify/delete resolved differently': 
-	git init modify-delete &&
-	(
-		cd modify-delete &&
-
-		echo A >file &&
-		git add file &&
-		test_tick &&
-		git commit -m A &&
-
-		git branch B &&
-		git checkout -b C &&
-		git rm file &&
-		test_tick &&
-		git commit -m C &&
-
-		git checkout B &&
-		echo B >file &&
-		git add file &&
-		test_tick &&
-		git commit -m B &&
-
-		git checkout B^0 &&
-		test_must_fail git merge C &&
-		echo B >file &&
-		git add file &&
-		test_tick &&
-		git commit -m D &&
-		git tag D &&
-
-		git checkout C^0 &&
-		test_must_fail git merge B &&
-		git rm file &&
-		test_tick &&
-		git commit -m E &&
-		git tag E
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/modify-delete/.git/
-[main (root-commit) 518fc48] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Switched to a new branch 'C'
-rm 'file'
-[C cfc4799] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file
-Switched to branch 'B'
-[B 96c9208] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-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 96c9208 B
-CONFLICT (modify/delete): file deleted in C and modified in HEAD.  Version HEAD of file left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD 84ce14b] D
- Author: A U Thor <author@example.com>
-Previous HEAD position was 84ce14b D
-HEAD is now at cfc4799 C
-CONFLICT (modify/delete): file deleted in HEAD and modified in B.  Version B of file left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-rm 'file'
-[detached HEAD 75a2416] E
- Author: A U Thor <author@example.com>
-ok 8 - setup criss-cross + modify/delete resolved differently
-
-expecting success of 6416.9 'git detects conflict merging criss-cross+modify/delete': 
-	(
-		cd modify-delete &&
-
-		git checkout D^0 &&
-
-		test_must_fail git merge -s recursive E^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-
-		git rev-parse >expect       \
-			main:file    B:file &&
-		git rev-parse   >actual      \
-			:1:file      :2:file &&
-		test_cmp expect actual
-	)
-
-Previous HEAD position was 75a2416 E
-HEAD is now at 84ce14b D
-  From inner merge:  CONFLICT (modify/delete): file deleted in Temporary merge branch 1 and modified in Temporary merge branch 2.  Version Temporary merge branch 2 of file left in tree.
-CONFLICT (modify/delete): file deleted in E^0 and modified in HEAD.  Version HEAD of file left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 9 - git detects conflict merging criss-cross+modify/delete
-
-expecting success of 6416.10 'git detects conflict merging criss-cross+modify/delete, reverse direction': 
-	(
-		cd modify-delete &&
-
-		git reset --hard &&
-		git checkout E^0 &&
-
-		test_must_fail git merge -s recursive D^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-
-		git rev-parse >expect       \
-			main:file    B:file &&
-		git rev-parse   >actual      \
-			:1:file      :3:file &&
-		test_cmp expect actual
-	)
-
-HEAD is now at 84ce14b D
-Previous HEAD position was 84ce14b D
-HEAD is now at 75a2416 E
-  From inner merge:  CONFLICT (modify/delete): file deleted in Temporary merge branch 1 and modified in Temporary merge branch 2.  Version Temporary merge branch 2 of file left in tree.
-CONFLICT (modify/delete): file deleted in HEAD and modified in D^0.  Version D^0 of file left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 10 - git detects conflict merging criss-cross+modify/delete, reverse direction
-
-expecting success of 6416.11 'setup differently handled merges of directory/file conflict': 
-	git init directory-file &&
-	(
-		cd directory-file &&
-
-		>ignore-me &&
-		git add ignore-me &&
-		test_tick &&
-		git commit -m A &&
-		git tag A &&
-
-		git branch B &&
-		git checkout -b C &&
-		mkdir a &&
-		test_write_lines a b c d e f g >a/file &&
-		git add a/file &&
-		test_tick &&
-		git commit -m C &&
-
-		git checkout B &&
-		test_write_lines 1 2 3 4 5 6 7 >a &&
-		git add a &&
-		test_tick &&
-		git commit -m B &&
-
-		git checkout B^0 &&
-		git merge -s ours -m D1 C^0 &&
-		git tag D1 &&
-
-		git checkout B^0 &&
-		test_must_fail git merge C^0 &&
-		git rm -rf a/ &&
-		git rm a~HEAD &&
-		git cat-file -p B:a >a2 &&
-		git add a2 &&
-		git commit -m D2 &&
-		git tag D2 &&
-
-		git checkout C^0 &&
-		git merge -s ours -m E1 B^0 &&
-		git tag E1 &&
-
-		git checkout C^0 &&
-		git merge -s ours -m E2 B^0 &&
-		test_write_lines a b c d e f g h >a/file &&
-		git add a/file &&
-		git commit --amend -C HEAD &&
-		git tag E2 &&
-
-		git checkout C^0 &&
-		test_must_fail git merge B^0 &&
-		git rm a~B^0 &&
-		git rm -rf a/ &&
-		test_write_lines 1 2 3 4 5 6 7 8 >a &&
-		git add a &&
-		git commit -m E3 &&
-		git tag E3 &&
-
-		git checkout C^0 &&
-		test_must_fail git merge B^0 &&
-		git rm -rf a/ &&
-		git rm a~B^0 &&
-		test_write_lines 1 2 3 4 5 6 7 8 >a2 &&
-		git add a2 &&
-		git commit -m E4 &&
-		git tag E4
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/directory-file/.git/
-[main (root-commit) a08e4c1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 ignore-me
-Switched to a new branch 'C'
-[C 4d18708] C
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
- create mode 100644 a/file
-Switched to branch 'B'
-[B fda518b] B
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
- create mode 100644 a
-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 fda518b B
-Merge made by the 'ours' strategy.
-Previous HEAD position was c17d257 D1
-HEAD is now at fda518b B
-CONFLICT (file/directory): directory in the way of a from HEAD; moving it to a~HEAD instead.
-Automatic merge failed; fix conflicts and then commit the result.
-rm 'a/file'
-rm 'a~HEAD'
-[detached HEAD 53fb160] D2
- Author: A U Thor <author@example.com>
-Previous HEAD position was 53fb160 D2
-HEAD is now at 4d18708 C
-Merge made by the 'ours' strategy.
-Previous HEAD position was 4e0c96b E1
-HEAD is now at 4d18708 C
-Merge made by the 'ours' strategy.
-[detached HEAD 56cb482] E2
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
-Previous HEAD position was 56cb482 E2
-HEAD is now at 4d18708 C
-CONFLICT (file/directory): directory in the way of a from B^0; moving it to a~B^0 instead.
-Automatic merge failed; fix conflicts and then commit the result.
-rm 'a~B^0'
-rm 'a/file'
-[detached HEAD e07b76f] E3
- Author: A U Thor <author@example.com>
-Previous HEAD position was e07b76f E3
-HEAD is now at 4d18708 C
-CONFLICT (file/directory): directory in the way of a from B^0; moving it to a~B^0 instead.
-Automatic merge failed; fix conflicts and then commit the result.
-rm 'a/file'
-rm 'a~B^0'
-[detached HEAD f0b11dd] E4
- Author: A U Thor <author@example.com>
-ok 11 - setup differently handled merges of directory/file conflict
-
-expecting success of 6416.12 'merge of D1 & E1 fails but has appropriate contents': 
-	test_when_finished "git -C directory-file reset --hard" &&
-	test_when_finished "git -C directory-file clean -fdqx" &&
-	(
-		cd directory-file &&
-
-		git checkout D1^0 &&
-
-		test_must_fail git merge -s recursive E1^0 &&
-
-		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 >expect    A:ignore-me  B:a D1:a &&
-		git rev-parse >actual   :0:ignore-me :1:a :2:a &&
-		test_cmp expect actual
-	)
-
-Previous HEAD position was f0b11dd E4
-HEAD is now at c17d257 D1
-CONFLICT (rename/delete): a~Temporary merge branch 2 renamed to a in HEAD, but deleted in E1^0.
-  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at c17d257 D1
-ok 12 - merge of D1 & E1 fails but has appropriate contents
-
-expecting success of 6416.13 'merge of E1 & D1 fails but has appropriate contents': 
-	test_when_finished "git -C directory-file reset --hard" &&
-	test_when_finished "git -C directory-file clean -fdqx" &&
-	(
-		cd directory-file &&
-
-		git checkout E1^0 &&
-
-		test_must_fail git merge -s recursive D1^0 &&
-
-		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 >expect    \
-			A:ignore-me  B:a  D1:a &&
-		git rev-parse   >actual   \
-			:0:ignore-me :1:a :3:a &&
-		test_cmp expect actual
-	)
-
-Previous HEAD position was c17d257 D1
-HEAD is now at 4e0c96b E1
-CONFLICT (rename/delete): a~Temporary merge branch 2 renamed to a in D1^0, but deleted in HEAD.
-  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 4e0c96b E1
-ok 13 - merge of E1 & D1 fails but has appropriate contents
-
-expecting success of 6416.14 'merge of D1 & E2 fails but has appropriate contents': 
-	test_when_finished "git -C directory-file reset --hard" &&
-	test_when_finished "git -C directory-file clean -fdqx" &&
-	(
-		cd directory-file &&
-
-		git checkout D1^0 &&
-
-		test_must_fail git merge -s recursive E2^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 4 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >expect    \
-			B:a       D1:a      E2:a/file  C:a/file   A:ignore-me &&
-		git rev-parse   >actual   \
-			:1:a~HEAD :2:a~HEAD :3:a/file  :1:a/file  :0:ignore-me &&
-		test_cmp expect actual &&
-
-		test_path_is_file a~HEAD
-	)
-
-Previous HEAD position was 4e0c96b E1
-HEAD is now at c17d257 D1
-CONFLICT (rename/delete): a~Temporary merge branch 2 renamed to a in HEAD, but deleted in E2^0.
-CONFLICT (modify/delete): a/file deleted in HEAD and modified in E2^0.  Version E2^0 of a/file left in tree.
-CONFLICT (file/directory): directory in the way of a from HEAD; moving it to a~HEAD instead.
-  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at c17d257 D1
-ok 14 - merge of D1 & E2 fails but has appropriate contents
-
-expecting success of 6416.15 'merge of E2 & D1 fails but has appropriate contents': 
-	test_when_finished "git -C directory-file reset --hard" &&
-	test_when_finished "git -C directory-file clean -fdqx" &&
-	(
-		cd directory-file &&
-
-		git checkout E2^0 &&
-
-		test_must_fail git merge -s recursive D1^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 4 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >expect    \
-			B:a       D1:a      E2:a/file  C:a/file   A:ignore-me &&
-		git rev-parse   >actual   \
-			:1:a~D1^0 :3:a~D1^0 :2:a/file  :1:a/file  :0:ignore-me &&
-		test_cmp expect actual &&
-
-		test_path_is_file a~D1^0
-	)
-
-Previous HEAD position was c17d257 D1
-HEAD is now at 56cb482 E2
-CONFLICT (rename/delete): a~Temporary merge branch 2 renamed to a in D1^0, but deleted in HEAD.
-CONFLICT (modify/delete): a/file deleted in D1^0 and modified in HEAD.  Version HEAD of a/file left in tree.
-CONFLICT (file/directory): directory in the way of a from D1^0; moving it to a~D1^0 instead.
-  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 56cb482 E2
-ok 15 - merge of E2 & D1 fails but has appropriate contents
-
-expecting success of 6416.16 'merge of D1 & E3 succeeds': 
-	test_when_finished "git -C directory-file reset --hard" &&
-	test_when_finished "git -C directory-file clean -fdqx" &&
-	(
-		cd directory-file &&
-
-		git checkout D1^0 &&
-
-		git merge -s recursive E3^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >expect    \
-			A:ignore-me  E3:a &&
-		git rev-parse   >actual   \
-			:0:ignore-me :0:a &&
-		test_cmp expect actual
-	)
-
-Previous HEAD position was 56cb482 E2
-HEAD is now at c17d257 D1
-  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
-Merge made by the 'recursive' strategy.
- a | 1 +
- 1 file changed, 1 insertion(+)
-HEAD is now at 51bbc83 Merge commit 'E3^0' into HEAD
-ok 16 - merge of D1 & E3 succeeds
-
-expecting success of 6416.17 'merge of D1 & E4 puts merge of a and a2 in both a and a2': 
-	test_when_finished "git -C directory-file reset --hard" &&
-	test_when_finished "git -C directory-file clean -fdqx" &&
-	(
-		cd directory-file &&
-
-		git checkout D1^0 &&
-
-		test_must_fail git merge -s recursive E4^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >expect                  \
-			A:ignore-me  B:a   E4:a2  E4:a2 &&
-		git rev-parse   >actual                \
-			:0:ignore-me :1:a~Temporary\ merge\ branch\ 2  :2:a  :3:a2 &&
-		test_cmp expect actual
-	)
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  51bbc83 Merge commit 'E3^0' 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> 51bbc83
-
-HEAD is now at c17d257 D1
-  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
-CONFLICT (rename/rename): a~Temporary merge branch 2 renamed to a in HEAD and to a2 in E4^0.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at c17d257 D1
-ok 17 - merge of D1 & E4 puts merge of a and a2 in both a and a2
-
-checking known breakage of 6416.18 'merge of D2 & E4 merges a2s & reports conflict for a/file': 
-	test_when_finished "git -C directory-file reset --hard" &&
-	test_when_finished "git -C directory-file clean -fdqx" &&
-	(
-		cd directory-file &&
-
-		git checkout D2^0 &&
-
-		test_must_fail git merge -s recursive E4^0 &&
-
-		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 >expect                 \
-			A:ignore-me  E4:a2  D2:a/file &&
-		git rev-parse   >actual               \
-			:0:ignore-me :0:a2  :2:a/file &&
-		test_cmp expect actual
-	)
-
-Previous HEAD position was c17d257 D1
-HEAD is now at 53fb160 D2
-  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
-Merge made by the 'recursive' strategy.
- a2 | 1 +
- 1 file changed, 1 insertion(+)
-test_must_fail: command succeeded: git merge -s recursive E4^0
-HEAD is now at 82b63e2 Merge commit 'E4^0' into HEAD
-not ok 18 - merge of D2 & E4 merges a2s & reports conflict for a/file # TODO known breakage
-
-expecting success of 6416.19 'setup rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify': 
-	git init rename-squared-squared &&
-	(
-		cd rename-squared-squared &&
-
-		printf "1\n2\n3\n4\n5\n6\n" >a &&
-		git add a &&
-		git commit -m A &&
-		git tag A &&
-
-		git checkout -b B A &&
-		git mv a b &&
-		echo 7 >>b &&
-		git add -u &&
-		git commit -m B &&
-
-		git checkout -b C A &&
-		git mv a c &&
-		git commit -m C &&
-
-		git checkout -q B^0 &&
-		git merge --no-commit -s ours C^0 &&
-		git mv b newname &&
-		git commit -m "Merge commit C^0 into HEAD" &&
-		git tag D &&
-
-		git checkout -q C^0 &&
-		git merge --no-commit -s ours B^0 &&
-		git mv c newname &&
-		printf "7\n8\n" >>newname &&
-		git add -u &&
-		git commit -m "Merge commit B^0 into HEAD" &&
-		git tag E
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/rename-squared-squared/.git/
-[main (root-commit) 295973b] A
- Author: A U Thor <author@example.com>
- 1 file changed, 6 insertions(+)
- create mode 100644 a
-Switched to a new branch 'B'
-[B f21786f] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename a => b (85%)
-Switched to a new branch 'C'
-[C 4ba638b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a => c (100%)
-Automatic merge went well; stopped before committing as requested
-[detached HEAD f6e3f71] Merge commit C^0 into HEAD
- Author: A U Thor <author@example.com>
-Automatic merge went well; stopped before committing as requested
-[detached HEAD 9f79f94] Merge commit B^0 into HEAD
- Author: A U Thor <author@example.com>
-ok 19 - setup rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify
-
-expecting success of 6416.20 'handle rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify': 
-	(
-		cd rename-squared-squared &&
-
-		git checkout D^0 &&
-
-		git merge -s recursive E^0 &&
-
-		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 = 1 out &&
-
-		test $(git rev-parse HEAD:newname) = $(git rev-parse E:newname)
-	)
-
-Previous HEAD position was 9f79f94 Merge commit B^0 into HEAD
-HEAD is now at f6e3f71 Merge commit C^0 into HEAD
-  From inner merge:  CONFLICT (rename/rename): a renamed to c in Temporary merge branch 1 and to b in Temporary merge branch 2.
-Merge made by the 'recursive' strategy.
- newname | 1 +
- 1 file changed, 1 insertion(+)
-ok 20 - handle rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify
-
-expecting success of 6416.21 'setup criss-cross + rename/rename/add-source + modify/modify': 
-	git init rename-rename-add-source &&
-	(
-		cd rename-rename-add-source &&
-
-		printf "lots\nof\nwords\nand\ncontent\n" >a &&
-		git add a &&
-		git commit -m A &&
-		git tag A &&
-
-		git checkout -b B A &&
-		git mv a b &&
-		git commit -m B &&
-
-		git checkout -b C A &&
-		git mv a c &&
-		printf "2\n3\n4\n5\n6\n7\n" >a &&
-		git add a &&
-		git commit -m C &&
-
-		git checkout B^0 &&
-		git merge --no-commit -s ours C^0 &&
-		git checkout C -- a c &&
-		mv a old_a &&
-		echo 1 >a &&
-		cat old_a >>a &&
-		rm old_a &&
-		git add -u &&
-		git commit -m "Merge commit C^0 into HEAD" &&
-		git tag D &&
-
-		git checkout C^0 &&
-		git merge --no-commit -s ours B^0 &&
-		git checkout B -- b &&
-		echo 8 >>a &&
-		git add -u &&
-		git commit -m "Merge commit B^0 into HEAD" &&
-		git tag E
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/rename-rename-add-source/.git/
-[main (root-commit) b781d1e] A
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 a
-Switched to a new branch 'B'
-[B 03ced07] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a => b (100%)
-Switched to a new branch 'C'
-[C 3f5d572] C
- Author: A U Thor <author@example.com>
- 2 files changed, 11 insertions(+), 5 deletions(-)
- create mode 100644 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 03ced07 B
-Automatic merge went well; stopped before committing as requested
-[detached HEAD 9c83147] Merge commit C^0 into HEAD
- Author: A U Thor <author@example.com>
-Previous HEAD position was 9c83147 Merge commit C^0 into HEAD
-HEAD is now at 3f5d572 C
-Automatic merge went well; stopped before committing as requested
-[detached HEAD d777135] Merge commit B^0 into HEAD
- Author: A U Thor <author@example.com>
-ok 21 - setup criss-cross + rename/rename/add-source + modify/modify
-
-checking known breakage of 6416.22 'detect rename/rename/add-source for virtual merge-base': 
-	(
-		cd rename-rename-add-source &&
-
-		git checkout D^0 &&
-
-		git merge -s recursive E^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 &&
-
-		printf "1\n2\n3\n4\n5\n6\n7\n8\n" >correct &&
-		git rev-parse >expect \
-			A:a   A:a     \
-			correct       &&
-		git rev-parse   >actual  \
-			:0:b  :0:c       &&
-		git hash-object >>actual \
-			a                &&
-		test_cmp expect actual
-	)
-
-Previous HEAD position was d777135 Merge commit B^0 into HEAD
-HEAD is now at 9c83147 Merge commit C^0 into HEAD
-Auto-merging a
-CONFLICT (add/add): Merge conflict in a
-Automatic merge failed; fix conflicts and then commit the result.
-not ok 22 - detect rename/rename/add-source for virtual merge-base # TODO known breakage
-
-expecting success of 6416.23 'setup criss-cross+rename/rename/add-dest + simple modify': 
-	git init rename-rename-add-dest &&
-	(
-		cd rename-rename-add-dest &&
-
-		>a &&
-		git add a &&
-		git commit -m A &&
-		git tag A &&
-
-		git checkout -b B A &&
-		git mv a b &&
-		printf "1\n2\n3\n4\n5\n6\n7\n" >c &&
-		git add c &&
-		git commit -m B &&
-
-		git checkout -b C A &&
-		git mv a c &&
-		git commit -m C &&
-
-		git checkout B^0 &&
-		git merge --no-commit -s ours C^0 &&
-		git mv b a &&
-		git commit -m "D is like B but renames b back to a" &&
-		git tag D &&
-
-		git checkout B^0 &&
-		git merge --no-commit -s ours C^0 &&
-		git mv b a &&
-		echo 8 >>c &&
-		git add c &&
-		git commit -m "E like D but has mod in c" &&
-		git tag E
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/rename-rename-add-dest/.git/
-[main (root-commit) b21de87] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-Switched to a new branch 'B'
-[B 47afb4b] B
- Author: A U Thor <author@example.com>
- 2 files changed, 7 insertions(+)
- rename a => b (100%)
- create mode 100644 c
-Switched to a new branch 'C'
-[C 81b2b2a] C
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a => c (100%)
-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 47afb4b B
-Automatic merge went well; stopped before committing as requested
-[detached HEAD f5a14fe] D is like B but renames b back to a
- Author: A U Thor <author@example.com>
-Previous HEAD position was f5a14fe D is like B but renames b back to a
-HEAD is now at 47afb4b B
-Automatic merge went well; stopped before committing as requested
-[detached HEAD 5bb242a] E like D but has mod in c
- Author: A U Thor <author@example.com>
-ok 23 - setup criss-cross+rename/rename/add-dest + simple modify
-
-expecting success of 6416.24 'virtual merge base handles rename/rename(1to2)/add-dest': 
-	(
-		cd rename-rename-add-dest &&
-
-		git checkout D^0 &&
-
-		git merge -s recursive E^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >expect \
-			A:a   E:c     &&
-		git rev-parse   >actual \
-			:0:a  :0:c      &&
-		test_cmp expect actual
-	)
-
-Previous HEAD position was 5bb242a E like D but has mod in c
-HEAD is now at f5a14fe D is like B but renames b back to a
-  From inner merge:  Auto-merging c
-Merge made by the 'recursive' strategy.
- c | 1 +
- 1 file changed, 1 insertion(+)
-ok 24 - virtual merge base handles rename/rename(1to2)/add-dest
-
-expecting success of 6416.25 'setup symlink modify/modify': 
-	git init symlink-modify-modify &&
-	(
-		cd symlink-modify-modify &&
-
-		test_ln_s_add lagoon fickle &&
-		git commit -m A &&
-		git tag A &&
-
-		git checkout -b B A &&
-		git rm fickle &&
-		test_ln_s_add disneyland fickle &&
-		git commit -m B &&
-
-		git checkout -b C A &&
-		git rm fickle &&
-		test_ln_s_add home fickle &&
-		git add fickle &&
-		git commit -m C &&
-
-		git checkout -q B^0 &&
-		git merge -s ours -m D C^0 &&
-		git tag D &&
-
-		git checkout -q C^0 &&
-		git merge -s ours -m E B^0 &&
-		git tag E
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/symlink-modify-modify/.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
-[main (root-commit) a3b1e24] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 fickle
-Switched to a new branch 'B'
-rm 'fickle'
-[B c99a710] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'C'
-rm 'fickle'
-[C 755f8fe] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Merge made by the 'ours' strategy.
-Merge made by the 'ours' strategy.
-ok 25 - setup symlink modify/modify
-
-expecting success of 6416.26 'check symlink modify/modify': 
-	(
-		cd symlink-modify-modify &&
-
-		git checkout D^0 &&
-
-		test_must_fail git merge -s recursive E^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out
-	)
-
-Previous HEAD position was 2ddfe8a E
-HEAD is now at e208a3f D
-  From inner merge:  CONFLICT (content): Merge conflict in fickle
-CONFLICT (content): Merge conflict in fickle
-Automatic merge failed; fix conflicts and then commit the result.
-ok 26 - check symlink modify/modify
-
-expecting success of 6416.27 'setup symlink add/add': 
-	git init symlink-add-add &&
-	(
-		cd symlink-add-add &&
-
-		touch ignoreme &&
-		git add ignoreme &&
-		git commit -m A &&
-		git tag A &&
-
-		git checkout -b B A &&
-		test_ln_s_add disneyland fickle &&
-		git commit -m B &&
-
-		git checkout -b C A &&
-		test_ln_s_add home fickle &&
-		git add fickle &&
-		git commit -m C &&
-
-		git checkout -q B^0 &&
-		git merge -s ours -m D C^0 &&
-		git tag D &&
-
-		git checkout -q C^0 &&
-		git merge -s ours -m E B^0 &&
-		git tag E
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/symlink-add-add/.git/
-[main (root-commit) c21c0cc] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 ignoreme
-Switched to a new branch 'B'
-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
-[B ff19417] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 fickle
-Switched to a new branch 'C'
-[C a2b9cba] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 fickle
-Merge made by the 'ours' strategy.
-Merge made by the 'ours' strategy.
-ok 27 - setup symlink add/add
-
-expecting success of 6416.28 'check symlink add/add': 
-	(
-		cd symlink-add-add &&
-
-		git checkout D^0 &&
-
-		test_must_fail git merge -s recursive E^0 &&
-
-		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
-	)
-
-Previous HEAD position was b8a9b65 E
-HEAD is now at 34200e3 D
-  From inner merge:  CONFLICT (add/add): Merge conflict in fickle
-CONFLICT (add/add): Merge conflict in fickle
-Automatic merge failed; fix conflicts and then commit the result.
-ok 28 - check symlink add/add
-
-expecting success of 6416.29 'setup submodule modify/modify': 
-	git init submodule-modify-modify &&
-	(
-		cd submodule-modify-modify &&
-
-		git init submod &&
-		(
-			cd submod &&
-			touch file-A &&
-			git add file-A &&
-			git commit -m A &&
-			git tag A &&
-
-			git checkout -b B A &&
-			touch file-B &&
-			git add file-B &&
-			git commit -m B &&
-			git tag B &&
-
-			git checkout -b C A &&
-			touch file-C &&
-			git add file-C &&
-			git commit -m C &&
-			git tag C
-		) &&
-
-		git -C submod reset --hard A &&
-		git add submod &&
-		git commit -m A &&
-		git tag A &&
-
-		git checkout -b B A &&
-		git -C submod reset --hard B &&
-		git add submod &&
-		git commit -m B &&
-
-		git checkout -b C A &&
-		git -C submod reset --hard C &&
-		git add submod &&
-		git commit -m C &&
-
-		git checkout -q B^0 &&
-		git merge -s ours -m D C^0 &&
-		git tag D &&
-
-		git checkout -q C^0 &&
-		git merge -s ours -m E B^0 &&
-		git tag E
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/submodule-modify-modify/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/submodule-modify-modify/submod/.git/
-[main (root-commit) 0b2025d] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file-A
-Switched to a new branch 'B'
-[B c896f52] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file-B
-Switched to a new branch 'C'
-[C a2c92fc] C
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file-C
-HEAD is now at 0b2025d A
-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"
-[main (root-commit) f4d8475] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 submod
-Switched to a new branch 'B'
-warning: refname 'B' is ambiguous.
-warning: refname 'B' is ambiguous.
-HEAD is now at c896f52 B
-[B 104442b] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'C'
-M	submod
-warning: refname 'C' is ambiguous.
-warning: refname 'C' is ambiguous.
-HEAD is now at a2c92fc C
-[C a2bce14] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Merge made by the 'ours' strategy.
-Merge made by the 'ours' strategy.
-ok 29 - setup submodule modify/modify
-
-expecting success of 6416.30 'check submodule modify/modify': 
-	(
-		cd submodule-modify-modify &&
-
-		git checkout D^0 &&
-
-		test_must_fail git merge -s recursive E^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out
-	)
-
-Previous HEAD position was 1c9f70b E
-HEAD is now at ce72099 D
-M	submod
-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 (submod), and either merge commit a2c92fc
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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 submod
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-ok 30 - check submodule modify/modify
-
-expecting success of 6416.31 'setup submodule add/add': 
-	git init submodule-add-add &&
-	(
-		cd submodule-add-add &&
-
-		git init submod &&
-		(
-			cd submod &&
-			touch file-A &&
-			git add file-A &&
-			git commit -m A &&
-			git tag A &&
-
-			git checkout -b B A &&
-			touch file-B &&
-			git add file-B &&
-			git commit -m B &&
-			git tag B &&
-
-			git checkout -b C A &&
-			touch file-C &&
-			git add file-C &&
-			git commit -m C &&
-			git tag C
-		) &&
-
-		touch irrelevant-file &&
-		git add irrelevant-file &&
-		git commit -m A &&
-		git tag A &&
-
-		git checkout -b B A &&
-		git -C submod reset --hard B &&
-		git add submod &&
-		git commit -m B &&
-
-		git checkout -b C A &&
-		git -C submod reset --hard C &&
-		git add submod &&
-		git commit -m C &&
-
-		git checkout -q B^0 &&
-		git merge -s ours -m D C^0 &&
-		git tag D &&
-
-		git checkout -q C^0 &&
-		git merge -s ours -m E B^0 &&
-		git tag E
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/submodule-add-add/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/submodule-add-add/submod/.git/
-[main (root-commit) 0b2025d] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file-A
-Switched to a new branch 'B'
-[B c896f52] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file-B
-Switched to a new branch 'C'
-[C a2c92fc] C
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file-C
-[main (root-commit) ffa7695] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 irrelevant-file
-Switched to a new branch 'B'
-warning: refname 'B' is ambiguous.
-warning: refname 'B' is ambiguous.
-HEAD is now at c896f52 B
-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"
-[B b3ca9b5] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 submod
-warning: unable to rmdir 'submod': Directory not empty
-Switched to a new branch 'C'
-warning: refname 'C' is ambiguous.
-warning: refname 'C' is ambiguous.
-HEAD is now at a2c92fc C
-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"
-[C 5df2365] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 submod
-Merge made by the 'ours' strategy.
-Merge made by the 'ours' strategy.
-ok 31 - setup submodule add/add
-
-expecting success of 6416.32 'check submodule add/add': 
-	(
-		cd submodule-add-add &&
-
-		git checkout D^0 &&
-
-		test_must_fail git merge -s recursive E^0 &&
-
-		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
-	)
-
-Previous HEAD position was 0141fc3 E
-HEAD is now at 3e5a324 D
-M	submod
-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 (submod), and either merge commit a2c92fc
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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:  Failed to merge submodule submod (no merge base)
-  From inner merge:  CONFLICT (add/add): Merge conflict in submod
-Failed to merge submodule submod (no merge base)
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-ok 32 - check submodule add/add
-
-expecting success of 6416.33 'setup conflicting entry types (submodule vs symlink)': 
-	git init submodule-symlink-add-add &&
-	(
-		cd submodule-symlink-add-add &&
-
-		git init path &&
-		(
-			cd path &&
-			touch file-B &&
-			git add file-B &&
-			git commit -m B &&
-			git tag B
-		) &&
-
-		touch irrelevant-file &&
-		git add irrelevant-file &&
-		git commit -m A &&
-		git tag A &&
-
-		git checkout -b B A &&
-		git -C path reset --hard B &&
-		git add path &&
-		git commit -m B &&
-
-		git checkout -b C A &&
-		rm -rf path/ &&
-		test_ln_s_add irrelevant-file path &&
-		git commit -m C &&
-
-		git checkout -q B^0 &&
-		git merge -s ours -m D C^0 &&
-		git tag D &&
-
-		git checkout -q C^0 &&
-		git merge -s ours -m E B^0 &&
-		git tag E
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/submodule-symlink-add-add/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/submodule-symlink-add-add/path/.git/
-[main (root-commit) f80342e] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file-B
-[main (root-commit) ffa7695] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 irrelevant-file
-Switched to a new branch 'B'
-HEAD is now at f80342e B
-warning: adding embedded git repository: path
-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> path
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached path
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[B 83ada27] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 path
-warning: unable to rmdir 'path': Directory not empty
-Switched to a new branch 'C'
-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
-[C 7d3c6ec] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 path
-Merge made by the 'ours' strategy.
-Merge made by the 'ours' strategy.
-ok 33 - setup conflicting entry types (submodule vs symlink)
-
-expecting success of 6416.34 'check conflicting entry types (submodule vs symlink)': 
-	(
-		cd submodule-symlink-add-add &&
-
-		git checkout D^0 &&
-
-		test_must_fail git merge -s recursive E^0 &&
-
-		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
-	)
-
-Previous HEAD position was d862885 E
-HEAD is now at cc49267 D
-CONFLICT (distinct types): path had different types on each side; renamed both of them so each can be recorded somewhere.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 34 - check conflicting entry types (submodule vs symlink)
-
-expecting success of 6416.35 'setup conflicting modes for regular file': 
-	git init regular-file-mode-conflict &&
-	(
-		cd regular-file-mode-conflict &&
-
-		touch irrelevant-file &&
-		git add irrelevant-file &&
-		git commit -m A &&
-		git tag A &&
-
-		git checkout -b B A &&
-		echo "command_to_run" >source_me.bash &&
-		git add source_me.bash &&
-		git commit -m B &&
-
-		git checkout -b C A &&
-		echo "command_to_run" >source_me.bash &&
-		git add source_me.bash &&
-		test_chmod +x source_me.bash &&
-		git commit -m C &&
-
-		git checkout -q B^0 &&
-		git merge -s ours -m D C^0 &&
-		git tag D &&
-
-		git checkout -q C^0 &&
-		git merge -s ours -m E B^0 &&
-		git tag E
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/regular-file-mode-conflict/.git/
-[main (root-commit) ffa7695] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 irrelevant-file
-Switched to a new branch 'B'
-[B b8c132e] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 source_me.bash
-Switched to a new branch 'C'
-[C 53e08af] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100755 source_me.bash
-Merge made by the 'ours' strategy.
-Merge made by the 'ours' strategy.
-ok 35 - setup conflicting modes for regular file
-
-checking known breakage of 6416.36 'check conflicting modes for regular file': 
-	(
-		cd regular-file-mode-conflict &&
-
-		git checkout D^0 &&
-
-		test_must_fail git merge -s recursive E^0 &&
-
-		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
-	)
-
-Previous HEAD position was 0f3ce8e E
-HEAD is now at a770888 D
-  From inner merge:  CONFLICT (add/add): Merge conflict in source_me.bash
-Merge made by the 'recursive' strategy.
-test_must_fail: command succeeded: git merge -s recursive E^0
-not ok 36 - check conflicting modes for regular file # TODO known breakage
-
-expecting success of 6416.37 'setup nested conflicts': 
-	git init nested_conflicts &&
-	(
-		cd nested_conflicts &&
-
-		# Create some related files now
-		printf "Random base content line %d\n" $(test_seq 1 10) >initial &&
-
-		cp initial b_L1 &&
-		cp initial b_R1 &&
-		cp initial b_L2 &&
-		cp initial b_R2 &&
-		cp initial a_L1 &&
-		cp initial a_R1 &&
-		cp initial a_L2 &&
-		cp initial a_R2 &&
-
-		test_write_lines b b_L1 >>b_L1 &&
-		test_write_lines b b_R1 >>b_R1 &&
-		test_write_lines b b_L2 >>b_L2 &&
-		test_write_lines b b_R2 >>b_R2 &&
-		test_write_lines a a_L1 >>a_L1 &&
-		test_write_lines a a_R1 >>a_R1 &&
-		test_write_lines a a_L2 >>a_L2 &&
-		test_write_lines a a_R2 >>a_R2 &&
-
-		# Setup original commit (or merge-base), consisting of
-		# files named "b" and "a"
-		cp initial b &&
-		cp initial a &&
-		echo b >>b &&
-		echo a >>a &&
-		git add b a &&
-		test_tick && git commit -m initial &&
-
-		git branch L &&
-		git branch R &&
-
-		# Handle the left side
-		git checkout L &&
-		mv -f b_L1 b &&
-		mv -f a_L1 a &&
-		git add b a &&
-		test_tick && git commit -m "version L1 of files" &&
-		git tag L1 &&
-
-		# Handle the right side
-		git checkout R &&
-		mv -f b_R1 b &&
-		mv -f a_R1 a &&
-		git add b a &&
-		test_tick && git commit -m "version R1 of files" &&
-		git tag R1 &&
-
-		# Create first merge on left side
-		git checkout L &&
-		test_must_fail git merge R1 &&
-		mv -f b_L2 b &&
-		mv -f a_L2 a &&
-		git add b a &&
-		git mv b m &&
-		test_tick && git commit -m "left merge, rename b->m" &&
-		git tag L2 &&
-
-		# Create first merge on right side
-		git checkout R &&
-		test_must_fail git merge L1 &&
-		mv -f b_R2 b &&
-		mv -f a_R2 a &&
-		git add b a &&
-		git mv a m &&
-		test_tick && git commit -m "right merge, rename a->m" &&
-		git tag R2
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/nested_conflicts/.git/
-[main (root-commit) 64965f6] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 22 insertions(+)
- create mode 100644 a
- create mode 100644 b
-Switched to branch 'L'
-[L e512e8b] version L1 of files
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-Switched to branch 'R'
-[R ff2c09e] version R1 of files
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-Switched to branch 'L'
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Automatic merge failed; fix conflicts and then commit the result.
-[L 4085c94] left merge, rename b->m
- Author: A U Thor <author@example.com>
-Switched to branch 'R'
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Automatic merge failed; fix conflicts and then commit the result.
-[R 6322e9f] right merge, rename a->m
- Author: A U Thor <author@example.com>
-ok 37 - setup nested conflicts
-
-expecting success of 6416.38 'check nested conflicts': 
-	(
-		cd nested_conflicts &&
-
-		git clean -f &&
-		MAIN=$(git rev-parse --short main) &&
-		git checkout L2^0 &&
-
-		# Merge must fail; there is a conflict
-		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R2^0 &&
-
-		# Make sure the index has the right number of entries
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		# Ensure we have the correct number of untracked files
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		# Create a and b from virtual merge base X
-		git cat-file -p main:a >base &&
-		git cat-file -p L1:a >ours &&
-		git cat-file -p R1:a >theirs &&
-		test_must_fail git merge-file --diff3 \
-			-L "Temporary merge branch 1" \
-			-L "$MAIN"  \
-			-L "Temporary merge branch 2" \
-			ours  \
-			base  \
-			theirs &&
-		sed -e "s/^\([<|=>]\)/\1\1/" ours >vmb_a &&
-
-		git cat-file -p main:b >base &&
-		git cat-file -p L1:b >ours &&
-		git cat-file -p R1:b >theirs &&
-		test_must_fail git merge-file --diff3 \
-			-L "Temporary merge branch 1" \
-			-L "$MAIN"  \
-			-L "Temporary merge branch 2" \
-			ours  \
-			base  \
-			theirs &&
-		sed -e "s/^\([<|=>]\)/\1\1/" ours >vmb_b &&
-
-		# Compare :2:m to expected values
-		git cat-file -p L2:m >ours &&
-		git cat-file -p R2:b >theirs &&
-		test_must_fail git merge-file --diff3  \
-			-L "HEAD:m"                    \
-			-L "merged common ancestors:b" \
-			-L "R2^0:b"                    \
-			ours                           \
-			vmb_b                          \
-			theirs                         &&
-		sed -e "s/^\([<|=>]\)/\1\1/" ours >m_stage_2 &&
-		git cat-file -p :2:m >actual &&
-		test_cmp m_stage_2 actual &&
-
-		# Compare :3:m to expected values
-		git cat-file -p L2:a >ours &&
-		git cat-file -p R2:m >theirs &&
-		test_must_fail git merge-file --diff3  \
-			-L "HEAD:a"                    \
-			-L "merged common ancestors:a" \
-			-L "R2^0:m"                    \
-			ours                           \
-			vmb_a                          \
-			theirs                         &&
-		sed -e "s/^\([<|=>]\)/\1\1/" ours >m_stage_3 &&
-		git cat-file -p :3:m >actual &&
-		test_cmp m_stage_3 actual &&
-
-		# Compare m to expected contents
-		>empty &&
-		cp m_stage_2 expected_final_m &&
-		test_must_fail git merge-file --diff3 \
-			-L "HEAD"                     \
-			-L "merged common ancestors"  \
-			-L "R2^0"                     \
-			expected_final_m              \
-			empty                         \
-			m_stage_3                     &&
-		test_cmp expected_final_m m
-	)
-
-Removing initial
-Note: switching to 'L2^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 4085c94 left merge, rename b->m
-  From inner merge:  Auto-merging a
-  From inner merge:  CONFLICT (content): Merge conflict in a
-Auto-merging a
-  From inner merge:  Auto-merging b
-  From inner merge:  CONFLICT (content): Merge conflict in b
-Auto-merging b
-CONFLICT (rename involved in collision): rename of a -> m has content conflicts AND collides with another path; this may result in nested conflict markers.
-CONFLICT (rename involved in collision): rename of b -> m has content conflicts AND collides with another path; this may result in nested conflict markers.
-Auto-merging m
-CONFLICT (add/add): Merge conflict in m
-Automatic merge failed; fix conflicts and then commit the result.
-ok 38 - check nested conflicts
-
-expecting success of 6416.39 'setup virtual merge base with nested conflicts': 
-	git init virtual_merge_base_has_nested_conflicts &&
-	(
-		cd virtual_merge_base_has_nested_conflicts &&
-
-		# Create some related files now
-		printf "Random base content line %d\n" $(test_seq 1 10) >content &&
-
-		# Setup original commit
-		git add content &&
-		test_tick && git commit -m initial &&
-
-		git branch L &&
-		git branch R &&
-
-		# Create L1
-		git checkout L &&
-		echo left >>content &&
-		git add content &&
-		test_tick && git commit -m "version L1 of content" &&
-		git tag L1 &&
-
-		# Create R1
-		git checkout R &&
-		echo right >>content &&
-		git add content &&
-		test_tick && git commit -m "version R1 of content" &&
-		git tag R1 &&
-
-		# Create L2
-		git checkout L &&
-		test_must_fail git -c merge.conflictstyle=diff3 merge R1 &&
-		git checkout L1 content &&
-		test_tick && git commit -m "version L2 of content" &&
-		git tag L2 &&
+*** t6700-tree-depth.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6700-tree-depth/.git/
+expecting success of 6700.1 'create small tree': 
+	mkdeep small $small_depth
 
-		# Create R2
-		git checkout R &&
-		test_must_fail git -c merge.conflictstyle=diff3 merge L1 &&
-		git checkout R1 content &&
-		test_tick && git commit -m "version R2 of content" &&
-		git tag R2 &&
+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
+---------------------------------------------------------------------
 
-		# Create L3
-		git checkout L &&
-		test_must_fail git -c merge.conflictstyle=diff3 merge R2 &&
-		git checkout L1 content &&
-		test_tick && git commit -m "version L3 of content" &&
-		git tag L3 &&
+ok 1 - create small tree
 
-		# Create R3
-		git checkout R &&
-		test_must_fail git -c merge.conflictstyle=diff3 merge L2 &&
-		git checkout R1 content &&
-		test_tick && git commit -m "version R3 of content" &&
-		git tag R3
-	)
+expecting success of 6700.2 'create big tree': 
+	mkdeep big $big_depth
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/virtual_merge_base_has_nested_conflicts/.git/
-[main (root-commit) 0e6d233] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 content
-Switched to branch 'L'
-[L 80f6449] version L1 of content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'R'
-[R 49ac0f6] version R1 of content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'L'
-Auto-merging content
-CONFLICT (content): Merge conflict in content
-Automatic merge failed; fix conflicts and then commit the result.
-Updated 1 path from 42730fb
-[L b5f1211] version L2 of content
- Author: A U Thor <author@example.com>
-Switched to branch 'R'
-Auto-merging content
-CONFLICT (content): Merge conflict in content
-Automatic merge failed; fix conflicts and then commit the result.
-Updated 1 path from 5ac3d63
-[R d9b26ef] version R2 of content
- Author: A U Thor <author@example.com>
-Switched to branch 'L'
-  From inner merge:  Auto-merging content
-  From inner merge:  CONFLICT (content): Merge conflict in content
-Auto-merging content
-CONFLICT (content): Merge conflict in content
-Automatic merge failed; fix conflicts and then commit the result.
-Updated 1 path from 42730fb
-[L 747e690] version L3 of content
- Author: A U Thor <author@example.com>
-Switched to branch 'R'
-  From inner merge:  Auto-merging content
-  From inner merge:  CONFLICT (content): Merge conflict in content
-Auto-merging content
-CONFLICT (content): Merge conflict in content
-Automatic merge failed; fix conflicts and then commit the result.
-Updated 1 path from 5ac3d63
-[R 1e5e557] version R3 of content
- Author: A U Thor <author@example.com>
-ok 39 - setup virtual merge base with nested conflicts
+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
+---------------------------------------------------------------------
 
-expecting success of 6416.40 'check virtual merge base with nested conflicts': 
-	(
-		cd virtual_merge_base_has_nested_conflicts &&
+ok 2 - create big tree
 
-		MAIN=$(git rev-parse --short main) &&
-		git checkout L3^0 &&
+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
 
-		# Merge must fail; there is a conflict
-		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R3^0 &&
+error: exceeded maximum allowed tree depth
+fatal: failed to unpack tree object 89dec2e140b538c88e6d3990453ffc27adfa7fc1
+ok 3 - limit recursion of git-archive
 
-		# Make sure the index has the right number of entries
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		# Ensure we have the correct number of untracked files
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success of 6700.4 'default limit for git-archive fails gracefully': 
+	test_must_fail git archive big >/dev/null
 
-		# Compare :[23]:content to expected values
-		git rev-parse L1:content R1:content >expect &&
-		git rev-parse :2:content :3:content >actual &&
-		test_cmp expect actual &&
+error: exceeded maximum allowed tree depth
+fatal: failed to unpack tree object e0fe3d6d3d70bfe6a08264a50dd1a104cd787427
+ok 4 - default limit for git-archive fails gracefully
 
-		# Imitate X1 merge base, except without long enough conflict
-		# markers because a subsequent sed will modify them.  Put
-		# result into vmb.
-		git cat-file -p main:content >base &&
-		git cat-file -p L:content >left &&
-		git cat-file -p R:content >right &&
-		cp left merged-once &&
-		test_must_fail git merge-file --diff3 \
-			-L "Temporary merge branch 1" \
-			-L "$MAIN"  \
-			-L "Temporary merge branch 2" \
-			merged-once \
-			base        \
-			right       &&
-		sed -e "s/^\([<|=>]\)/\1\1\1/" merged-once >vmb &&
+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
 
-		# Imitate X2 merge base, overwriting vmb.  Note that we
-		# extend both sets of conflict markers to make them longer
-		# with the sed command.
-		cp left merged-twice &&
-		test_must_fail git merge-file --diff3 \
-			-L "Temporary merge branch 1" \
-			-L "merged common ancestors"  \
-			-L "Temporary merge branch 2" \
-			merged-twice \
-			vmb          \
-			right        &&
-		sed -e "s/^\([<|=>]\)/\1\1\1/" merged-twice >vmb &&
+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
 
-		# Compare :1:content to expected value
-		git cat-file -p :1:content >actual &&
-		test_cmp vmb actual &&
+expecting success of 6700.6 'default limit for ls-tree fails gracefully': 
+	test_must_fail git ls-tree -r big >/dev/null
 
-		# Determine expected content in final outer merge, compare to
-		# what the merge generated.
-		cp -f left expect &&
-		test_must_fail git merge-file --diff3                      \
-			-L "HEAD"  -L "merged common ancestors"  -L "R3^0" \
-			expect     vmb                           right     &&
-		test_cmp expect content
-	)
+error: exceeded maximum allowed tree depth
+ok 6 - default limit for ls-tree fails gracefully
 
-Note: switching to 'L3^0'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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: exceeded maximum allowed tree depth
+ok 7 - limit recursion of rev-list --objects
 
-If you want to 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.8 'default limit for rev-list fails gracefully': 
+	test_must_fail git rev-list --objects big >/dev/null
 
-  git switch -c <new-branch-name>
+fatal: exceeded maximum allowed tree depth
+ok 8 - default limit for rev-list fails gracefully
 
-Or undo this operation with:
+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
 
-  git switch -
+: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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 6700.10 'default limit for diff-tree fails gracefully': 
+	test_must_fail git diff-tree -r $EMPTY_TREE big
 
-HEAD is now at 747e690 version L3 of content
-  From inner merge:    Auto-merging content
-  From inner merge:    CONFLICT (content): Merge conflict in content
-  From inner merge:  Auto-merging content
-  From inner merge:  CONFLICT (content): Merge conflict in content
-Auto-merging content
-CONFLICT (content): Merge conflict in content
-Automatic merge failed; fix conflicts and then commit the result.
-ok 40 - check virtual merge base with nested conflicts
+fatal: exceeded maximum allowed tree depth
+ok 10 - default limit for diff-tree fails gracefully
 
-# still have 3 known breakage(s)
-# passed all remaining 37 test(s)
-1..40
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6437-submodule-merge.sh ***
@@ -445004,7 +443618,7 @@
 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 Aug 27 08:22 path/file
+-rw-r--r-- 1 pbuilder2 pbuilder2 9 Sep 29 14:53 path/file
 HEAD is now at 90b0bac A
 not ok 18 - directory/submodule conflict; keep submodule clean # TODO known breakage
 
@@ -445164,700 +443778,6 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t6601-path-walk.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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" &&
-
-	rm -fr child file file2 &&
-
-	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 &&
-
-	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 &&
-
-	# 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 topic HEAD~1 &&
-	echo cc >right/c &&
-	git commit -a -m "topic" &&
-	git tag -a -m "fourth" fourth
-
-Switched to a new branch 'base'
-[base (root-commit) 8a1cb1c] will abandon
- Author: A U Thor <author@example.com>
- 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
-[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(+)
- 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 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
-
-	test_cmp_sorted expect out
-
-ok 13 - topic, not base, boundary with pruning
-
-expecting success of 6601.14 'topic, not base, --edge-aggressive with pruning': 
-	test-tool path-walk --prune --edge-aggressive -- topic --not base >out &&
-
-	cat >expect <<-EOF &&
-	0:commit::$(git rev-parse topic)
-	1:tree::$(git rev-parse topic^{tree})
-	1:tree::$(git rev-parse base^{tree}):UNINTERESTING
-	2:tree:right/:$(git rev-parse topic:right)
-	2:tree:right/:$(git rev-parse base:right):UNINTERESTING
-	3:blob:right/c:$(git rev-parse base:right/c):UNINTERESTING
-	3:blob:right/c:$(git rev-parse topic:right/c)
-	blobs:2
-	commits:1
-	tags:0
-	trees:4
-	EOF
-
-	test_cmp_sorted expect out
-
-ok 14 - topic, not base, --edge-aggressive with pruning
-
-expecting success of 6601.15 '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.51.0/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(+)
- 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, 0 insertions(+), 0 deletions(-)
- rename initial/file.t => file.t (100%)
-ok 15 - trees are reported exactly once
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7005-editor.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
- 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
- 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
- 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
- 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
- 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
-
-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 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
-
-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 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)
-
-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)
-
-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)
-
-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)"
-
-
-[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
-
-expecting success of 7005.16 'core.editor with a space': 
-
-	git config core.editor \"./e\ space.sh\" &&
-	git commit --amend &&
-	test space = "$(git show -s --pretty=format:%s)"
-
-
-[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 16 - core.editor with a space
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t5572-pull-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/.git/
 expecting success of 5572.1 'git_pull: added submodule creates empty directory': 
@@ -446855,9 +444775,9 @@
 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.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
 ok 26 - git_pull_ff: modified submodule does not update submodule work tree to invalid commit
 
 expecting success of 5572.27 'git_pull_ff: modified submodule does not update submodule work tree from invalid commit': 
@@ -447325,8 +445245,8 @@
 branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
 Updating 09bcf53..e6169bf
 Fast-forward
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
 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_pull_ff_only: modified submodule does not update submodule work tree to invalid commit
 
@@ -448039,323 +445959,3524 @@
 	# Check that the submodule worktree did not update
 	test_path_is_missing super/sub/merge_strategy_5.t
 
-[master d4ae3d3] merge_strategy_5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 merge_strategy_5.t
-Fetching submodule sub
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/child
-   c05caa7..d4ae3d3  master           -> origin/master
- * [new tag]         merge_strategy_5 -> merge_strategy_5
-Already up to date.
-ok 62 - fetch.recurseSubmodules option triggers recursive fetch (but not recursive update)
+[master d4ae3d3] merge_strategy_5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 merge_strategy_5.t
+Fetching submodule sub
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/child
+   c05caa7..d4ae3d3  master           -> origin/master
+ * [new tag]         merge_strategy_5 -> merge_strategy_5
+Already up to date.
+ok 62 - fetch.recurseSubmodules option triggers recursive fetch (but not recursive update)
+
+expecting success of 5572.63 'fetch.recurseSubmodules takes precedence over submodule.recurse': 
+	test_commit -C child merge_strategy_6 &&
+	# Omit the parent commit, otherwise this passes with the
+	# default "pull" behavior.
+
+	git -C super -c submodule.recurse=false -c fetch.recursesubmodules=true pull --no-rebase &&
+	# Check that the submodule commit was fetched
+	sub_oid=$(git -C child rev-parse HEAD) &&
+	git -C super/sub cat-file -e $sub_oid &&
+	# Check that the submodule worktree did not update
+	test_path_is_missing super/sub/merge_strategy_6.t
+
+[master 1f3a5c4] merge_strategy_6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 merge_strategy_6.t
+Fetching submodule sub
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/child
+   d4ae3d3..1f3a5c4  master           -> origin/master
+ * [new tag]         merge_strategy_6 -> merge_strategy_6
+Already up to date.
+ok 63 - fetch.recurseSubmodules takes precedence over submodule.recurse
+
+expecting success of 5572.64 'pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)': 
+	# This tests the following scenario :
+	# - local submodule has new commits
+	# - local superproject does not have new commits
+	# - upstream superproject has new commits that change the submodule pointer
+
+	# change upstream
+	test_commit -C child rebase_strategy &&
+	git -C parent submodule update --remote &&
+	git -C parent add sub &&
+	git -C parent commit -m "update submodule" &&
+
+	# also have local commits
+	test_commit -C super/sub local_stuff &&
+
+	git -C super pull --rebase --recurse-submodules &&
+	test_path_is_file super/sub/rebase_strategy.t &&
+	test_path_is_file super/sub/local_stuff.t
+
+[master 4391f12] rebase_strategy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 rebase_strategy.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/child
+   c05caa7..4391f12  master          -> origin/master
+ * [new tag]         rebase_strategy -> rebase_strategy
+ * [new tag]         merge_strategy_5 -> merge_strategy_5
+ * [new tag]         merge_strategy_6 -> merge_strategy_6
+Submodule path 'sub': checked out '4391f120cab920b6a92bfc8c3d1803d384f7c2ab'
+[master 7a9de42] update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD a12280c] local_stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 local_stuff.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/parent
+   ab7e8d7..7a9de42  master     -> origin/master
+Fetching submodule sub
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/child
+   1f3a5c4..4391f12  master          -> origin/master
+ * [new tag]         rebase_strategy -> rebase_strategy
+Updating ab7e8d7..7a9de42
+Fast-forward
+ sub | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+Submodule path 'sub': rebased into '4391f120cab920b6a92bfc8c3d1803d384f7c2ab'
+ok 64 - pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)
+
+expecting success of 5572.65 'pull --rebase --recurse-submodules fails if both sides record submodule changes': 
+	# This tests the following scenario :
+	# - local superproject has new commits that change the submodule pointer
+	# - upstream superproject has new commits that change the submodule pointer
+
+	# local changes in submodule recorded in superproject:
+	test_commit -C super/sub local_stuff_2 &&
+	git -C super add sub &&
+	git -C super commit -m "local update submodule" &&
+
+	# and in the remote as well:
+	test_commit -C child important_upstream_work &&
+	git -C parent submodule update --remote &&
+	git -C parent add sub &&
+	git -C parent commit -m "remote update submodule" &&
+
+	# Unfortunately we fail here, despite no conflict in the
+	# submodule itself, but the merge strategy in submodules
+	# does not support rebase:
+	test_must_fail git -C super pull --rebase --recurse-submodules 2>err &&
+	test_grep "locally recorded submodule modifications" err
+
+[detached HEAD 759ac20] local_stuff_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 local_stuff_2.t
+[master 9fde00a] local update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master d4f9c29] important_upstream_work
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 important_upstream_work.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/child
+   4391f12..d4f9c29  master                  -> origin/master
+ * [new tag]         important_upstream_work -> important_upstream_work
+Submodule path 'sub': checked out 'd4f9c29a61c7ee3ad315fbd2b54c0e503fbceb51'
+[master 1555229] remote update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: cannot rebase with locally recorded submodule modifications
+ok 65 - pull --rebase --recurse-submodules fails if both sides record submodule changes
+
+expecting success of 5572.66 'pull --rebase --recurse-submodules (no submodule changes, no fork-point)': 
+	# This tests the following scenario :
+	# - local submodule does not have new commits
+	# - local superproject has new commits that *do not* change the submodule pointer
+	# - upstream superproject has new commits that *do not* change the submodule pointer
+	# - local superproject branch has no fork-point with its remote-tracking counter-part
+
+	# create upstream superproject
+	test_create_repo submodule &&
+	test_commit -C submodule first_in_sub &&
+
+	test_create_repo superprojet &&
+	test_commit -C superprojet first_in_super &&
+	git -C superprojet submodule add ../submodule &&
+	git -C superprojet commit -m "add submodule" &&
+	test_commit -C superprojet third_in_super &&
+
+	# clone superproject
+	git clone --recurse-submodules superprojet superclone &&
+
+	# add commits upstream
+	test_commit -C superprojet fourth_in_super &&
+
+	# create topic branch in clone, not based on any remote-tracking branch
+	git -C superclone checkout -b feat HEAD~1 &&
+	test_commit -C superclone first_on_feat &&
+	git -C superclone pull --rebase --recurse-submodules origin HEAD
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/submodule/.git/
+[master (root-commit) 49dad2b] first_in_sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first_in_sub.t
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/superprojet/.git/
+[master (root-commit) 71f9db3] first_in_super
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first_in_super.t
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/superprojet/submodule'...
+done.
+[master ef8874e] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+[master b90c0e9] third_in_super
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 third_in_super.t
+Cloning into 'superclone'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/superclone/submodule'...
+done.
+Submodule path 'submodule': checked out '49dad2bf2d37043f968daefcc5bfbeb341965350'
+[master b1f89fe] fourth_in_super
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fourth_in_super.t
+Switched to a new branch 'feat'
+[feat 81a2d37] first_on_feat
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first_on_feat.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/superprojet
+ * branch            HEAD       -> FETCH_HEAD
+Fetching submodule submodule
+Rebasing (1/1)
Successfully rebased and updated refs/heads/feat.
+ok 66 - pull --rebase --recurse-submodules (no submodule changes, no fork-point)
+
+expecting success of 5572.67 'branch has no merge base with remote-tracking counterpart': 
+	rm -rf parent child &&
+
+	test_create_repo a-submodule &&
+	test_commit -C a-submodule foo &&
+	test_commit -C a-submodule bar &&
+
+	test_create_repo parent &&
+	git -C parent submodule add "$(pwd)/a-submodule" &&
+	git -C parent commit -m foo &&
+
+	git clone parent child &&
+
+	# Reset the current branch so that it has no merge base with
+	# the remote-tracking branch.
+	OTHER=$(git -C child commit-tree -m bar \
+		$(git -C child rev-parse HEAD^{tree})) &&
+	git -C child reset --hard "$OTHER" &&
+
+	git -C child pull --recurse-submodules --rebase
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/a-submodule/.git/
+[master (root-commit) a4efc16] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master b3b6050] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/parent/.git/
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/parent/a-submodule'...
+done.
+[master (root-commit) baab669] foo
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 a-submodule
+Cloning into 'child'...
+done.
+HEAD is now at aa8b49b bar
+warning: skipped previously applied commit aa8b49b
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Successfully rebased and updated refs/heads/master.
+ok 67 - branch has no merge base with remote-tracking counterpart
+
+expecting success of 5572.68 'fetch submodule remote of different name from superproject': 
+	git -C child remote rename origin o1 &&
+	git -C child submodule update --init &&
+
+	# Needs to create unreachable commit from current master branch.
+	git -C a-submodule checkout -b newmain HEAD^ &&
+	test_commit -C a-submodule echo &&
+	test_commit -C a-submodule moreecho &&
+	subc=$(git -C a-submodule rev-parse --short HEAD) &&
+
+	git -C parent/a-submodule fetch &&
+	git -C parent/a-submodule checkout "$subc" &&
+	git -C parent commit -m "update submodule" a-submodule &&
+	git -C a-submodule reset --hard HEAD^^ &&
+
+	git -C child pull --no-recurse-submodules &&
+	git -C child submodule update
+
+Submodule 'a-submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/a-submodule) registered for path 'a-submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/child/a-submodule'...
+done.
+Submodule path 'a-submodule': checked out 'b3b6050676a5798a4107f8ec799fe53b4ecd55b1'
+Switched to a new branch 'newmain'
+[newmain b5e3d30] echo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 echo.t
+[newmain ae49081] moreecho
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 moreecho.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/a-submodule
+ * [new branch]      newmain    -> origin/newmain
+ * [new tag]         moreecho   -> moreecho
+ * [new tag]         echo       -> echo
+Note: switching to 'ae49081'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 ae49081 moreecho
+[master f2af131] update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at a4efc16 foo
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/parent
+   baab669..f2af131  master     -> o1/master
+Updating baab669..f2af131
+Fast-forward
+ a-submodule | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/a-submodule
+ * [new branch]      newmain    -> origin/newmain
+From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/a-submodule
+ * branch            ae490814337f45b47e3ec1120741f91696469ba8 -> FETCH_HEAD
+Submodule path 'a-submodule': checked out 'ae490814337f45b47e3ec1120741f91696469ba8'
+ok 68 - fetch submodule remote of different name from superproject
+
+# still have 8 known breakage(s)
+# passed all remaining 60 test(s)
+1..68
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6416-recursive-corner-cases.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/.git/
+expecting success of 6416.1 'setup basic criss-cross + rename with no modifications': 
+	git init basic-rename &&
+	(
+		cd basic-rename &&
+
+		ten="0 1 2 3 4 5 6 7 8 9" &&
+		printf "line %d in a sample file\n" $ten >one &&
+		printf "line %d in another sample file\n" $ten >two &&
+		git add one two &&
+		test_tick && git commit -m initial &&
+
+		git branch L1 &&
+		git checkout -b R1 &&
+		git mv one three &&
+		test_tick && git commit -m R1 &&
+
+		git checkout L1 &&
+		git mv two three &&
+		test_tick && git commit -m L1 &&
+
+		git checkout L1^0 &&
+		test_tick && git merge -s ours R1 &&
+		git tag L2 &&
+
+		git checkout R1^0 &&
+		test_tick && git merge -s ours L1 &&
+		git tag R2
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/basic-rename/.git/
+[main (root-commit) 4871052] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 20 insertions(+)
+ create mode 100644 one
+ create mode 100644 two
+Switched to a new branch 'R1'
+[R1 6592516] R1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename one => three (100%)
+Switched to branch 'L1'
+[L1 bd99445] L1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename two => three (100%)
+Note: switching to 'L1^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 bd99445 L1
+Merge made by the 'ours' strategy.
+Previous HEAD position was d46c613 Merge branch 'R1' into HEAD
+HEAD is now at 6592516 R1
+Merge made by the 'ours' strategy.
+ok 1 - setup basic criss-cross + rename with no modifications
+
+expecting success of 6416.2 'merge simple rename+criss-cross with no modifications': 
+	(
+		cd basic-rename &&
+
+		git reset --hard &&
+		git checkout L2^0 &&
+
+		test_must_fail git merge -s recursive R2^0 &&
+
+		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 >expect       \
+			L2:three   R2:three &&
+		git rev-parse   >actual     \
+			:2:three   :3:three &&
+		test_cmp expect actual
+	)
+
+HEAD is now at 01e4222 Merge branch 'L1' into HEAD
+Previous HEAD position was 01e4222 Merge branch 'L1' into HEAD
+HEAD is now at d46c613 Merge branch 'R1' into HEAD
+  From inner merge:  Auto-merging three
+  From inner merge:  CONFLICT (add/add): Merge conflict in three
+Auto-merging three
+CONFLICT (content): Merge conflict in three
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - merge simple rename+criss-cross with no modifications
+
+expecting success of 6416.3 'setup criss-cross + rename merges with basic modification': 
+	git init rename-modify &&
+	(
+		cd rename-modify &&
+
+		ten="0 1 2 3 4 5 6 7 8 9" &&
+		printf "line %d in a sample file\n" $ten >one &&
+		printf "line %d in another sample file\n" $ten >two &&
+		git add one two &&
+		test_tick && git commit -m initial &&
+
+		git branch L1 &&
+		git checkout -b R1 &&
+		git mv one three &&
+		echo more >>two &&
+		git add two &&
+		test_tick && git commit -m R1 &&
+
+		git checkout L1 &&
+		git mv two three &&
+		test_tick && git commit -m L1 &&
+
+		git checkout L1^0 &&
+		test_tick && git merge -s ours R1 &&
+		git tag L2 &&
+
+		git checkout R1^0 &&
+		test_tick && git merge -s ours L1 &&
+		git tag R2
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/rename-modify/.git/
+[main (root-commit) 4871052] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 20 insertions(+)
+ create mode 100644 one
+ create mode 100644 two
+Switched to a new branch 'R1'
+[R1 edf7b54] R1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename one => three (100%)
+Switched to branch 'L1'
+[L1 bd99445] L1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename two => three (100%)
+Note: switching to 'L1^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 bd99445 L1
+Merge made by the 'ours' strategy.
+Previous HEAD position was fb0e0c9 Merge branch 'R1' into HEAD
+HEAD is now at edf7b54 R1
+Merge made by the 'ours' strategy.
+ok 3 - setup criss-cross + rename merges with basic modification
+
+expecting success of 6416.4 'merge criss-cross + rename merges with basic modification': 
+	(
+		cd rename-modify &&
+
+		git checkout L2^0 &&
+
+		test_must_fail git merge -s recursive R2^0 &&
+
+		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 >expect       \
+			L2:three   R2:three &&
+		git rev-parse   >actual     \
+			:2:three   :3:three &&
+		test_cmp expect actual
+	)
+
+Previous HEAD position was c7add50 Merge branch 'L1' into HEAD
+HEAD is now at fb0e0c9 Merge branch 'R1' into HEAD
+  From inner merge:  Auto-merging three
+  From inner merge:  CONFLICT (add/add): Merge conflict in three
+Auto-merging three
+CONFLICT (content): Merge conflict in three
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - merge criss-cross + rename merges with basic modification
+
+expecting success of 6416.5 'setup differently handled merges of rename/add conflict': 
+	git init rename-add &&
+	(
+		cd rename-add &&
+
+		printf "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n" >a &&
+		git add a &&
+		test_tick && git commit -m A &&
+
+		git branch B &&
+		git checkout -b C &&
+		echo 10 >>a &&
+		test_write_lines 0 1 2 3 4 5 6 7 foobar >new_a &&
+		git add a new_a &&
+		test_tick && git commit -m C &&
+
+		git checkout B &&
+		git mv a new_a &&
+		test_tick && git commit -m B &&
+
+		git checkout B^0 &&
+		test_must_fail git merge C &&
+		git show :2:new_a >new_a &&
+		git add new_a &&
+		test_tick && git commit -m D &&
+		git tag D &&
+
+		git checkout C^0 &&
+		test_must_fail git merge B &&
+		test_write_lines 0 1 2 3 4 5 6 7 bad_merge >new_a &&
+		git add -u &&
+		test_tick && git commit -m E &&
+		git tag E
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/rename-add/.git/
+[main (root-commit) 1b84f42] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 a
+Switched to a new branch 'C'
+[C f1f358b] C
+ Author: A U Thor <author@example.com>
+ 2 files changed, 10 insertions(+)
+ create mode 100644 new_a
+Switched to branch 'B'
+[B 0496200] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a => new_a (100%)
+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 0496200 B
+Auto-merging new_a
+CONFLICT (add/add): Merge conflict in new_a
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD fc47f4b] D
+ Author: A U Thor <author@example.com>
+Previous HEAD position was fc47f4b D
+HEAD is now at f1f358b C
+Auto-merging new_a
+CONFLICT (add/add): Merge conflict in new_a
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 1e98639] E
+ Author: A U Thor <author@example.com>
+ok 5 - setup differently handled merges of rename/add conflict
+
+expecting success of 6416.6 'git detects differently handled merges conflict': 
+	(
+		cd rename-add &&
+
+		git checkout D^0 &&
+
+		test_must_fail git merge -s recursive E^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git cat-file -p C:new_a >ours &&
+		git cat-file -p C:a >theirs &&
+		>empty &&
+		test_must_fail git merge-file \
+			-L "Temporary merge branch 1" \
+			-L "" \
+			-L "Temporary merge branch 2" \
+			ours empty theirs &&
+		sed -e "s/^\([<=>]\)/\1\1\1/" ours >ours-tweaked &&
+		git hash-object ours-tweaked >expect &&
+		git rev-parse >>expect      \
+				  D:new_a  E:new_a &&
+		git rev-parse   >actual     \
+			:1:new_a :2:new_a :3:new_a &&
+		test_cmp expect actual &&
+
+		# Test that the two-way merge in new_a is as expected
+		git cat-file -p D:new_a >ours &&
+		git cat-file -p E:new_a >theirs &&
+		>empty &&
+		test_must_fail git merge-file \
+			-L "HEAD" \
+			-L "" \
+			-L "E^0" \
+			ours empty theirs &&
+		sed -e "s/^\([<=>]\)/\1\1\1/" ours >expect &&
+		git hash-object new_a >actual &&
+		git hash-object ours  >expect &&
+		test_cmp expect actual
+	)
+
+Previous HEAD position was 1e98639 E
+HEAD is now at fc47f4b D
+  From inner merge:  Auto-merging new_a
+  From inner merge:  CONFLICT (add/add): Merge conflict in new_a
+Auto-merging new_a
+CONFLICT (content): Merge conflict in new_a
+Automatic merge failed; fix conflicts and then commit the result.
+ok 6 - git detects differently handled merges conflict
+
+expecting success of 6416.7 'git detects differently handled merges conflict, swapped': 
+	(
+		cd rename-add &&
+
+		# Difference #1: Do cleanup from previous testrun
+		git reset --hard &&
+		git clean -fdqx &&
+
+		# Difference #2: Change commit timestamps
+		btime=$(git log --no-walk --date=raw --format=%cd B | awk "{print \$1}") &&
+		ctime=$(git log --no-walk --date=raw --format=%cd C | awk "{print \$1}") &&
+		newctime=$(($btime+1)) &&
+		git fast-export --no-data --all | sed -e s/$ctime/$newctime/ | git fast-import --force --quiet &&
+		# End of most differences; rest is copy-paste of last test,
+		# other than swapping C:a and C:new_a due to order switch
+
+		git checkout D^0 &&
+		test_must_fail git merge -s recursive E^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git cat-file -p C:a >ours &&
+		git cat-file -p C:new_a >theirs &&
+		>empty &&
+		test_must_fail git merge-file \
+			-L "Temporary merge branch 1" \
+			-L "" \
+			-L "Temporary merge branch 2" \
+			ours empty theirs &&
+		sed -e "s/^\([<=>]\)/\1\1\1/" ours >ours-tweaked &&
+		git hash-object ours-tweaked >expect &&
+		git rev-parse >>expect      \
+				  D:new_a  E:new_a &&
+		git rev-parse   >actual     \
+			:1:new_a :2:new_a :3:new_a &&
+		test_cmp expect actual &&
+
+		# Test that the two-way merge in new_a is as expected
+		git cat-file -p D:new_a >ours &&
+		git cat-file -p E:new_a >theirs &&
+		>empty &&
+		test_must_fail git merge-file \
+			-L "HEAD" \
+			-L "" \
+			-L "E^0" \
+			ours empty theirs &&
+		sed -e "s/^\([<=>]\)/\1\1\1/" ours >expect &&
+		git hash-object new_a >actual &&
+		git hash-object ours  >expect &&
+		test_cmp expect actual
+	)
+
+HEAD is now at fc47f4b D
+HEAD is now at 23cad11 D
+  From inner merge:  Auto-merging new_a
+  From inner merge:  CONFLICT (add/add): Merge conflict in new_a
+Auto-merging new_a
+CONFLICT (content): Merge conflict in new_a
+Automatic merge failed; fix conflicts and then commit the result.
+ok 7 - git detects differently handled merges conflict, swapped
+
+expecting success of 6416.8 'setup criss-cross + modify/delete resolved differently': 
+	git init modify-delete &&
+	(
+		cd modify-delete &&
+
+		echo A >file &&
+		git add file &&
+		test_tick &&
+		git commit -m A &&
+
+		git branch B &&
+		git checkout -b C &&
+		git rm file &&
+		test_tick &&
+		git commit -m C &&
+
+		git checkout B &&
+		echo B >file &&
+		git add file &&
+		test_tick &&
+		git commit -m B &&
+
+		git checkout B^0 &&
+		test_must_fail git merge C &&
+		echo B >file &&
+		git add file &&
+		test_tick &&
+		git commit -m D &&
+		git tag D &&
+
+		git checkout C^0 &&
+		test_must_fail git merge B &&
+		git rm file &&
+		test_tick &&
+		git commit -m E &&
+		git tag E
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/modify-delete/.git/
+[main (root-commit) 518fc48] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'C'
+rm 'file'
+[C cfc4799] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file
+Switched to branch 'B'
+[B 96c9208] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+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 96c9208 B
+CONFLICT (modify/delete): file deleted in C and modified in HEAD.  Version HEAD of file left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 84ce14b] D
+ Author: A U Thor <author@example.com>
+Previous HEAD position was 84ce14b D
+HEAD is now at cfc4799 C
+CONFLICT (modify/delete): file deleted in HEAD and modified in B.  Version B of file left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'file'
+[detached HEAD 75a2416] E
+ Author: A U Thor <author@example.com>
+ok 8 - setup criss-cross + modify/delete resolved differently
+
+expecting success of 6416.9 'git detects conflict merging criss-cross+modify/delete': 
+	(
+		cd modify-delete &&
+
+		git checkout D^0 &&
+
+		test_must_fail git merge -s recursive E^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >expect       \
+			main:file    B:file &&
+		git rev-parse   >actual      \
+			:1:file      :2:file &&
+		test_cmp expect actual
+	)
+
+Previous HEAD position was 75a2416 E
+HEAD is now at 84ce14b D
+  From inner merge:  CONFLICT (modify/delete): file deleted in Temporary merge branch 1 and modified in Temporary merge branch 2.  Version Temporary merge branch 2 of file left in tree.
+CONFLICT (modify/delete): file deleted in E^0 and modified in HEAD.  Version HEAD of file left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 9 - git detects conflict merging criss-cross+modify/delete
+
+expecting success of 6416.10 'git detects conflict merging criss-cross+modify/delete, reverse direction': 
+	(
+		cd modify-delete &&
+
+		git reset --hard &&
+		git checkout E^0 &&
+
+		test_must_fail git merge -s recursive D^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >expect       \
+			main:file    B:file &&
+		git rev-parse   >actual      \
+			:1:file      :3:file &&
+		test_cmp expect actual
+	)
+
+HEAD is now at 84ce14b D
+Previous HEAD position was 84ce14b D
+HEAD is now at 75a2416 E
+  From inner merge:  CONFLICT (modify/delete): file deleted in Temporary merge branch 1 and modified in Temporary merge branch 2.  Version Temporary merge branch 2 of file left in tree.
+CONFLICT (modify/delete): file deleted in HEAD and modified in D^0.  Version D^0 of file left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 10 - git detects conflict merging criss-cross+modify/delete, reverse direction
+
+expecting success of 6416.11 'setup differently handled merges of directory/file conflict': 
+	git init directory-file &&
+	(
+		cd directory-file &&
+
+		>ignore-me &&
+		git add ignore-me &&
+		test_tick &&
+		git commit -m A &&
+		git tag A &&
+
+		git branch B &&
+		git checkout -b C &&
+		mkdir a &&
+		test_write_lines a b c d e f g >a/file &&
+		git add a/file &&
+		test_tick &&
+		git commit -m C &&
+
+		git checkout B &&
+		test_write_lines 1 2 3 4 5 6 7 >a &&
+		git add a &&
+		test_tick &&
+		git commit -m B &&
+
+		git checkout B^0 &&
+		git merge -s ours -m D1 C^0 &&
+		git tag D1 &&
+
+		git checkout B^0 &&
+		test_must_fail git merge C^0 &&
+		git rm -rf a/ &&
+		git rm a~HEAD &&
+		git cat-file -p B:a >a2 &&
+		git add a2 &&
+		git commit -m D2 &&
+		git tag D2 &&
+
+		git checkout C^0 &&
+		git merge -s ours -m E1 B^0 &&
+		git tag E1 &&
+
+		git checkout C^0 &&
+		git merge -s ours -m E2 B^0 &&
+		test_write_lines a b c d e f g h >a/file &&
+		git add a/file &&
+		git commit --amend -C HEAD &&
+		git tag E2 &&
+
+		git checkout C^0 &&
+		test_must_fail git merge B^0 &&
+		git rm a~B^0 &&
+		git rm -rf a/ &&
+		test_write_lines 1 2 3 4 5 6 7 8 >a &&
+		git add a &&
+		git commit -m E3 &&
+		git tag E3 &&
+
+		git checkout C^0 &&
+		test_must_fail git merge B^0 &&
+		git rm -rf a/ &&
+		git rm a~B^0 &&
+		test_write_lines 1 2 3 4 5 6 7 8 >a2 &&
+		git add a2 &&
+		git commit -m E4 &&
+		git tag E4
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/directory-file/.git/
+[main (root-commit) a08e4c1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 ignore-me
+Switched to a new branch 'C'
+[C 4d18708] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+)
+ create mode 100644 a/file
+Switched to branch 'B'
+[B fda518b] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+)
+ create mode 100644 a
+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 fda518b B
+Merge made by the 'ours' strategy.
+Previous HEAD position was c17d257 D1
+HEAD is now at fda518b B
+CONFLICT (file/directory): directory in the way of a from HEAD; moving it to a~HEAD instead.
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'a/file'
+rm 'a~HEAD'
+[detached HEAD 53fb160] D2
+ Author: A U Thor <author@example.com>
+Previous HEAD position was 53fb160 D2
+HEAD is now at 4d18708 C
+Merge made by the 'ours' strategy.
+Previous HEAD position was 4e0c96b E1
+HEAD is now at 4d18708 C
+Merge made by the 'ours' strategy.
+[detached HEAD 56cb482] E2
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+Previous HEAD position was 56cb482 E2
+HEAD is now at 4d18708 C
+CONFLICT (file/directory): directory in the way of a from B^0; moving it to a~B^0 instead.
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'a~B^0'
+rm 'a/file'
+[detached HEAD e07b76f] E3
+ Author: A U Thor <author@example.com>
+Previous HEAD position was e07b76f E3
+HEAD is now at 4d18708 C
+CONFLICT (file/directory): directory in the way of a from B^0; moving it to a~B^0 instead.
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'a/file'
+rm 'a~B^0'
+[detached HEAD f0b11dd] E4
+ Author: A U Thor <author@example.com>
+ok 11 - setup differently handled merges of directory/file conflict
+
+expecting success of 6416.12 'merge of D1 & E1 fails but has appropriate contents': 
+	test_when_finished "git -C directory-file reset --hard" &&
+	test_when_finished "git -C directory-file clean -fdqx" &&
+	(
+		cd directory-file &&
+
+		git checkout D1^0 &&
+
+		test_must_fail git merge -s recursive E1^0 &&
+
+		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 >expect    A:ignore-me  B:a D1:a &&
+		git rev-parse >actual   :0:ignore-me :1:a :2:a &&
+		test_cmp expect actual
+	)
+
+Previous HEAD position was f0b11dd E4
+HEAD is now at c17d257 D1
+CONFLICT (rename/delete): a~Temporary merge branch 2 renamed to a in HEAD, but deleted in E1^0.
+  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at c17d257 D1
+ok 12 - merge of D1 & E1 fails but has appropriate contents
+
+expecting success of 6416.13 'merge of E1 & D1 fails but has appropriate contents': 
+	test_when_finished "git -C directory-file reset --hard" &&
+	test_when_finished "git -C directory-file clean -fdqx" &&
+	(
+		cd directory-file &&
+
+		git checkout E1^0 &&
+
+		test_must_fail git merge -s recursive D1^0 &&
+
+		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 >expect    \
+			A:ignore-me  B:a  D1:a &&
+		git rev-parse   >actual   \
+			:0:ignore-me :1:a :3:a &&
+		test_cmp expect actual
+	)
+
+Previous HEAD position was c17d257 D1
+HEAD is now at 4e0c96b E1
+CONFLICT (rename/delete): a~Temporary merge branch 2 renamed to a in D1^0, but deleted in HEAD.
+  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 4e0c96b E1
+ok 13 - merge of E1 & D1 fails but has appropriate contents
+
+expecting success of 6416.14 'merge of D1 & E2 fails but has appropriate contents': 
+	test_when_finished "git -C directory-file reset --hard" &&
+	test_when_finished "git -C directory-file clean -fdqx" &&
+	(
+		cd directory-file &&
+
+		git checkout D1^0 &&
+
+		test_must_fail git merge -s recursive E2^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 4 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >expect    \
+			B:a       D1:a      E2:a/file  C:a/file   A:ignore-me &&
+		git rev-parse   >actual   \
+			:1:a~HEAD :2:a~HEAD :3:a/file  :1:a/file  :0:ignore-me &&
+		test_cmp expect actual &&
+
+		test_path_is_file a~HEAD
+	)
+
+Previous HEAD position was 4e0c96b E1
+HEAD is now at c17d257 D1
+CONFLICT (rename/delete): a~Temporary merge branch 2 renamed to a in HEAD, but deleted in E2^0.
+CONFLICT (modify/delete): a/file deleted in HEAD and modified in E2^0.  Version E2^0 of a/file left in tree.
+CONFLICT (file/directory): directory in the way of a from HEAD; moving it to a~HEAD instead.
+  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at c17d257 D1
+ok 14 - merge of D1 & E2 fails but has appropriate contents
+
+expecting success of 6416.15 'merge of E2 & D1 fails but has appropriate contents': 
+	test_when_finished "git -C directory-file reset --hard" &&
+	test_when_finished "git -C directory-file clean -fdqx" &&
+	(
+		cd directory-file &&
+
+		git checkout E2^0 &&
+
+		test_must_fail git merge -s recursive D1^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 4 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >expect    \
+			B:a       D1:a      E2:a/file  C:a/file   A:ignore-me &&
+		git rev-parse   >actual   \
+			:1:a~D1^0 :3:a~D1^0 :2:a/file  :1:a/file  :0:ignore-me &&
+		test_cmp expect actual &&
+
+		test_path_is_file a~D1^0
+	)
+
+Previous HEAD position was c17d257 D1
+HEAD is now at 56cb482 E2
+CONFLICT (rename/delete): a~Temporary merge branch 2 renamed to a in D1^0, but deleted in HEAD.
+CONFLICT (modify/delete): a/file deleted in D1^0 and modified in HEAD.  Version HEAD of a/file left in tree.
+CONFLICT (file/directory): directory in the way of a from D1^0; moving it to a~D1^0 instead.
+  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 56cb482 E2
+ok 15 - merge of E2 & D1 fails but has appropriate contents
+
+expecting success of 6416.16 'merge of D1 & E3 succeeds': 
+	test_when_finished "git -C directory-file reset --hard" &&
+	test_when_finished "git -C directory-file clean -fdqx" &&
+	(
+		cd directory-file &&
+
+		git checkout D1^0 &&
+
+		git merge -s recursive E3^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >expect    \
+			A:ignore-me  E3:a &&
+		git rev-parse   >actual   \
+			:0:ignore-me :0:a &&
+		test_cmp expect actual
+	)
+
+Previous HEAD position was 56cb482 E2
+HEAD is now at c17d257 D1
+  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
+Merge made by the 'recursive' strategy.
+ a | 1 +
+ 1 file changed, 1 insertion(+)
+HEAD is now at 51bbc83 Merge commit 'E3^0' into HEAD
+ok 16 - merge of D1 & E3 succeeds
+
+expecting success of 6416.17 'merge of D1 & E4 puts merge of a and a2 in both a and a2': 
+	test_when_finished "git -C directory-file reset --hard" &&
+	test_when_finished "git -C directory-file clean -fdqx" &&
+	(
+		cd directory-file &&
+
+		git checkout D1^0 &&
+
+		test_must_fail git merge -s recursive E4^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >expect                  \
+			A:ignore-me  B:a   E4:a2  E4:a2 &&
+		git rev-parse   >actual                \
+			:0:ignore-me :1:a~Temporary\ merge\ branch\ 2  :2:a  :3:a2 &&
+		test_cmp expect actual
+	)
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  51bbc83 Merge commit 'E3^0' 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> 51bbc83
+
+HEAD is now at c17d257 D1
+  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
+CONFLICT (rename/rename): a~Temporary merge branch 2 renamed to a in HEAD and to a2 in E4^0.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at c17d257 D1
+ok 17 - merge of D1 & E4 puts merge of a and a2 in both a and a2
+
+checking known breakage of 6416.18 'merge of D2 & E4 merges a2s & reports conflict for a/file': 
+	test_when_finished "git -C directory-file reset --hard" &&
+	test_when_finished "git -C directory-file clean -fdqx" &&
+	(
+		cd directory-file &&
+
+		git checkout D2^0 &&
+
+		test_must_fail git merge -s recursive E4^0 &&
+
+		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 >expect                 \
+			A:ignore-me  E4:a2  D2:a/file &&
+		git rev-parse   >actual               \
+			:0:ignore-me :0:a2  :2:a/file &&
+		test_cmp expect actual
+	)
+
+Previous HEAD position was c17d257 D1
+HEAD is now at 53fb160 D2
+  From inner merge:  CONFLICT (file/directory): directory in the way of a from Temporary merge branch 2; moving it to a~Temporary merge branch 2 instead.
+Merge made by the 'recursive' strategy.
+ a2 | 1 +
+ 1 file changed, 1 insertion(+)
+test_must_fail: command succeeded: git merge -s recursive E4^0
+HEAD is now at 82b63e2 Merge commit 'E4^0' into HEAD
+not ok 18 - merge of D2 & E4 merges a2s & reports conflict for a/file # TODO known breakage
+
+expecting success of 6416.19 'setup rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify': 
+	git init rename-squared-squared &&
+	(
+		cd rename-squared-squared &&
+
+		printf "1\n2\n3\n4\n5\n6\n" >a &&
+		git add a &&
+		git commit -m A &&
+		git tag A &&
+
+		git checkout -b B A &&
+		git mv a b &&
+		echo 7 >>b &&
+		git add -u &&
+		git commit -m B &&
+
+		git checkout -b C A &&
+		git mv a c &&
+		git commit -m C &&
+
+		git checkout -q B^0 &&
+		git merge --no-commit -s ours C^0 &&
+		git mv b newname &&
+		git commit -m "Merge commit C^0 into HEAD" &&
+		git tag D &&
+
+		git checkout -q C^0 &&
+		git merge --no-commit -s ours B^0 &&
+		git mv c newname &&
+		printf "7\n8\n" >>newname &&
+		git add -u &&
+		git commit -m "Merge commit B^0 into HEAD" &&
+		git tag E
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/rename-squared-squared/.git/
+[main (root-commit) 295973b] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 6 insertions(+)
+ create mode 100644 a
+Switched to a new branch 'B'
+[B f21786f] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename a => b (85%)
+Switched to a new branch 'C'
+[C 4ba638b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a => c (100%)
+Automatic merge went well; stopped before committing as requested
+[detached HEAD f6e3f71] Merge commit C^0 into HEAD
+ Author: A U Thor <author@example.com>
+Automatic merge went well; stopped before committing as requested
+[detached HEAD 9f79f94] Merge commit B^0 into HEAD
+ Author: A U Thor <author@example.com>
+ok 19 - setup rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify
+
+expecting success of 6416.20 'handle rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify': 
+	(
+		cd rename-squared-squared &&
+
+		git checkout D^0 &&
+
+		git merge -s recursive E^0 &&
+
+		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 = 1 out &&
+
+		test $(git rev-parse HEAD:newname) = $(git rev-parse E:newname)
+	)
+
+Previous HEAD position was 9f79f94 Merge commit B^0 into HEAD
+HEAD is now at f6e3f71 Merge commit C^0 into HEAD
+  From inner merge:  CONFLICT (rename/rename): a renamed to c in Temporary merge branch 1 and to b in Temporary merge branch 2.
+Merge made by the 'recursive' strategy.
+ newname | 1 +
+ 1 file changed, 1 insertion(+)
+ok 20 - handle rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify
+
+expecting success of 6416.21 'setup criss-cross + rename/rename/add-source + modify/modify': 
+	git init rename-rename-add-source &&
+	(
+		cd rename-rename-add-source &&
+
+		printf "lots\nof\nwords\nand\ncontent\n" >a &&
+		git add a &&
+		git commit -m A &&
+		git tag A &&
+
+		git checkout -b B A &&
+		git mv a b &&
+		git commit -m B &&
+
+		git checkout -b C A &&
+		git mv a c &&
+		printf "2\n3\n4\n5\n6\n7\n" >a &&
+		git add a &&
+		git commit -m C &&
+
+		git checkout B^0 &&
+		git merge --no-commit -s ours C^0 &&
+		git checkout C -- a c &&
+		mv a old_a &&
+		echo 1 >a &&
+		cat old_a >>a &&
+		rm old_a &&
+		git add -u &&
+		git commit -m "Merge commit C^0 into HEAD" &&
+		git tag D &&
+
+		git checkout C^0 &&
+		git merge --no-commit -s ours B^0 &&
+		git checkout B -- b &&
+		echo 8 >>a &&
+		git add -u &&
+		git commit -m "Merge commit B^0 into HEAD" &&
+		git tag E
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/rename-rename-add-source/.git/
+[main (root-commit) b781d1e] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 a
+Switched to a new branch 'B'
+[B 03ced07] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a => b (100%)
+Switched to a new branch 'C'
+[C 3f5d572] C
+ Author: A U Thor <author@example.com>
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+ create mode 100644 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 03ced07 B
+Automatic merge went well; stopped before committing as requested
+[detached HEAD 9c83147] Merge commit C^0 into HEAD
+ Author: A U Thor <author@example.com>
+Previous HEAD position was 9c83147 Merge commit C^0 into HEAD
+HEAD is now at 3f5d572 C
+Automatic merge went well; stopped before committing as requested
+[detached HEAD d777135] Merge commit B^0 into HEAD
+ Author: A U Thor <author@example.com>
+ok 21 - setup criss-cross + rename/rename/add-source + modify/modify
+
+checking known breakage of 6416.22 'detect rename/rename/add-source for virtual merge-base': 
+	(
+		cd rename-rename-add-source &&
+
+		git checkout D^0 &&
+
+		git merge -s recursive E^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 &&
+
+		printf "1\n2\n3\n4\n5\n6\n7\n8\n" >correct &&
+		git rev-parse >expect \
+			A:a   A:a     \
+			correct       &&
+		git rev-parse   >actual  \
+			:0:b  :0:c       &&
+		git hash-object >>actual \
+			a                &&
+		test_cmp expect actual
+	)
+
+Previous HEAD position was d777135 Merge commit B^0 into HEAD
+HEAD is now at 9c83147 Merge commit C^0 into HEAD
+Auto-merging a
+CONFLICT (add/add): Merge conflict in a
+Automatic merge failed; fix conflicts and then commit the result.
+not ok 22 - detect rename/rename/add-source for virtual merge-base # TODO known breakage
+
+expecting success of 6416.23 'setup criss-cross+rename/rename/add-dest + simple modify': 
+	git init rename-rename-add-dest &&
+	(
+		cd rename-rename-add-dest &&
+
+		>a &&
+		git add a &&
+		git commit -m A &&
+		git tag A &&
+
+		git checkout -b B A &&
+		git mv a b &&
+		printf "1\n2\n3\n4\n5\n6\n7\n" >c &&
+		git add c &&
+		git commit -m B &&
+
+		git checkout -b C A &&
+		git mv a c &&
+		git commit -m C &&
+
+		git checkout B^0 &&
+		git merge --no-commit -s ours C^0 &&
+		git mv b a &&
+		git commit -m "D is like B but renames b back to a" &&
+		git tag D &&
+
+		git checkout B^0 &&
+		git merge --no-commit -s ours C^0 &&
+		git mv b a &&
+		echo 8 >>c &&
+		git add c &&
+		git commit -m "E like D but has mod in c" &&
+		git tag E
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/rename-rename-add-dest/.git/
+[main (root-commit) b21de87] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+Switched to a new branch 'B'
+[B 47afb4b] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 7 insertions(+)
+ rename a => b (100%)
+ create mode 100644 c
+Switched to a new branch 'C'
+[C 81b2b2a] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a => c (100%)
+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 47afb4b B
+Automatic merge went well; stopped before committing as requested
+[detached HEAD f5a14fe] D is like B but renames b back to a
+ Author: A U Thor <author@example.com>
+Previous HEAD position was f5a14fe D is like B but renames b back to a
+HEAD is now at 47afb4b B
+Automatic merge went well; stopped before committing as requested
+[detached HEAD 5bb242a] E like D but has mod in c
+ Author: A U Thor <author@example.com>
+ok 23 - setup criss-cross+rename/rename/add-dest + simple modify
+
+expecting success of 6416.24 'virtual merge base handles rename/rename(1to2)/add-dest': 
+	(
+		cd rename-rename-add-dest &&
+
+		git checkout D^0 &&
+
+		git merge -s recursive E^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >expect \
+			A:a   E:c     &&
+		git rev-parse   >actual \
+			:0:a  :0:c      &&
+		test_cmp expect actual
+	)
+
+Previous HEAD position was 5bb242a E like D but has mod in c
+HEAD is now at f5a14fe D is like B but renames b back to a
+  From inner merge:  Auto-merging c
+Merge made by the 'recursive' strategy.
+ c | 1 +
+ 1 file changed, 1 insertion(+)
+ok 24 - virtual merge base handles rename/rename(1to2)/add-dest
+
+expecting success of 6416.25 'setup symlink modify/modify': 
+	git init symlink-modify-modify &&
+	(
+		cd symlink-modify-modify &&
+
+		test_ln_s_add lagoon fickle &&
+		git commit -m A &&
+		git tag A &&
+
+		git checkout -b B A &&
+		git rm fickle &&
+		test_ln_s_add disneyland fickle &&
+		git commit -m B &&
+
+		git checkout -b C A &&
+		git rm fickle &&
+		test_ln_s_add home fickle &&
+		git add fickle &&
+		git commit -m C &&
+
+		git checkout -q B^0 &&
+		git merge -s ours -m D C^0 &&
+		git tag D &&
+
+		git checkout -q C^0 &&
+		git merge -s ours -m E B^0 &&
+		git tag E
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/symlink-modify-modify/.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
+[main (root-commit) a3b1e24] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 fickle
+Switched to a new branch 'B'
+rm 'fickle'
+[B c99a710] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'C'
+rm 'fickle'
+[C 755f8fe] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merge made by the 'ours' strategy.
+Merge made by the 'ours' strategy.
+ok 25 - setup symlink modify/modify
+
+expecting success of 6416.26 'check symlink modify/modify': 
+	(
+		cd symlink-modify-modify &&
+
+		git checkout D^0 &&
+
+		test_must_fail git merge -s recursive E^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out
+	)
+
+Previous HEAD position was 2ddfe8a E
+HEAD is now at e208a3f D
+  From inner merge:  CONFLICT (content): Merge conflict in fickle
+CONFLICT (content): Merge conflict in fickle
+Automatic merge failed; fix conflicts and then commit the result.
+ok 26 - check symlink modify/modify
+
+expecting success of 6416.27 'setup symlink add/add': 
+	git init symlink-add-add &&
+	(
+		cd symlink-add-add &&
+
+		touch ignoreme &&
+		git add ignoreme &&
+		git commit -m A &&
+		git tag A &&
+
+		git checkout -b B A &&
+		test_ln_s_add disneyland fickle &&
+		git commit -m B &&
+
+		git checkout -b C A &&
+		test_ln_s_add home fickle &&
+		git add fickle &&
+		git commit -m C &&
+
+		git checkout -q B^0 &&
+		git merge -s ours -m D C^0 &&
+		git tag D &&
+
+		git checkout -q C^0 &&
+		git merge -s ours -m E B^0 &&
+		git tag E
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/symlink-add-add/.git/
+[main (root-commit) c21c0cc] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 ignoreme
+Switched to a new branch 'B'
+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
+[B ff19417] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 fickle
+Switched to a new branch 'C'
+[C a2b9cba] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 fickle
+Merge made by the 'ours' strategy.
+Merge made by the 'ours' strategy.
+ok 27 - setup symlink add/add
+
+expecting success of 6416.28 'check symlink add/add': 
+	(
+		cd symlink-add-add &&
+
+		git checkout D^0 &&
+
+		test_must_fail git merge -s recursive E^0 &&
+
+		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
+	)
+
+Previous HEAD position was b8a9b65 E
+HEAD is now at 34200e3 D
+  From inner merge:  CONFLICT (add/add): Merge conflict in fickle
+CONFLICT (add/add): Merge conflict in fickle
+Automatic merge failed; fix conflicts and then commit the result.
+ok 28 - check symlink add/add
+
+expecting success of 6416.29 'setup submodule modify/modify': 
+	git init submodule-modify-modify &&
+	(
+		cd submodule-modify-modify &&
+
+		git init submod &&
+		(
+			cd submod &&
+			touch file-A &&
+			git add file-A &&
+			git commit -m A &&
+			git tag A &&
+
+			git checkout -b B A &&
+			touch file-B &&
+			git add file-B &&
+			git commit -m B &&
+			git tag B &&
+
+			git checkout -b C A &&
+			touch file-C &&
+			git add file-C &&
+			git commit -m C &&
+			git tag C
+		) &&
+
+		git -C submod reset --hard A &&
+		git add submod &&
+		git commit -m A &&
+		git tag A &&
+
+		git checkout -b B A &&
+		git -C submod reset --hard B &&
+		git add submod &&
+		git commit -m B &&
+
+		git checkout -b C A &&
+		git -C submod reset --hard C &&
+		git add submod &&
+		git commit -m C &&
+
+		git checkout -q B^0 &&
+		git merge -s ours -m D C^0 &&
+		git tag D &&
+
+		git checkout -q C^0 &&
+		git merge -s ours -m E B^0 &&
+		git tag E
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/submodule-modify-modify/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/submodule-modify-modify/submod/.git/
+[main (root-commit) 0b2025d] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file-A
+Switched to a new branch 'B'
+[B c896f52] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file-B
+Switched to a new branch 'C'
+[C a2c92fc] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file-C
+HEAD is now at 0b2025d A
+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"
+[main (root-commit) f4d8475] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 submod
+Switched to a new branch 'B'
+warning: refname 'B' is ambiguous.
+warning: refname 'B' is ambiguous.
+HEAD is now at c896f52 B
+[B 104442b] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'C'
+M	submod
+warning: refname 'C' is ambiguous.
+warning: refname 'C' is ambiguous.
+HEAD is now at a2c92fc C
+[C a2bce14] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merge made by the 'ours' strategy.
+Merge made by the 'ours' strategy.
+ok 29 - setup submodule modify/modify
+
+expecting success of 6416.30 'check submodule modify/modify': 
+	(
+		cd submodule-modify-modify &&
+
+		git checkout D^0 &&
+
+		test_must_fail git merge -s recursive E^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out
+	)
+
+Previous HEAD position was 1c9f70b E
+HEAD is now at ce72099 D
+M	submod
+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 (submod), and either merge commit a2c92fc
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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 submod
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+ok 30 - check submodule modify/modify
+
+expecting success of 6416.31 'setup submodule add/add': 
+	git init submodule-add-add &&
+	(
+		cd submodule-add-add &&
+
+		git init submod &&
+		(
+			cd submod &&
+			touch file-A &&
+			git add file-A &&
+			git commit -m A &&
+			git tag A &&
+
+			git checkout -b B A &&
+			touch file-B &&
+			git add file-B &&
+			git commit -m B &&
+			git tag B &&
+
+			git checkout -b C A &&
+			touch file-C &&
+			git add file-C &&
+			git commit -m C &&
+			git tag C
+		) &&
+
+		touch irrelevant-file &&
+		git add irrelevant-file &&
+		git commit -m A &&
+		git tag A &&
+
+		git checkout -b B A &&
+		git -C submod reset --hard B &&
+		git add submod &&
+		git commit -m B &&
+
+		git checkout -b C A &&
+		git -C submod reset --hard C &&
+		git add submod &&
+		git commit -m C &&
+
+		git checkout -q B^0 &&
+		git merge -s ours -m D C^0 &&
+		git tag D &&
+
+		git checkout -q C^0 &&
+		git merge -s ours -m E B^0 &&
+		git tag E
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/submodule-add-add/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/submodule-add-add/submod/.git/
+[main (root-commit) 0b2025d] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file-A
+Switched to a new branch 'B'
+[B c896f52] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file-B
+Switched to a new branch 'C'
+[C a2c92fc] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file-C
+[main (root-commit) ffa7695] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 irrelevant-file
+Switched to a new branch 'B'
+warning: refname 'B' is ambiguous.
+warning: refname 'B' is ambiguous.
+HEAD is now at c896f52 B
+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"
+[B b3ca9b5] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 submod
+warning: unable to rmdir 'submod': Directory not empty
+Switched to a new branch 'C'
+warning: refname 'C' is ambiguous.
+warning: refname 'C' is ambiguous.
+HEAD is now at a2c92fc C
+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"
+[C 5df2365] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 submod
+Merge made by the 'ours' strategy.
+Merge made by the 'ours' strategy.
+ok 31 - setup submodule add/add
+
+expecting success of 6416.32 'check submodule add/add': 
+	(
+		cd submodule-add-add &&
+
+		git checkout D^0 &&
+
+		test_must_fail git merge -s recursive E^0 &&
+
+		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
+	)
+
+Previous HEAD position was 0141fc3 E
+HEAD is now at 3e5a324 D
+M	submod
+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 (submod), and either merge commit a2c92fc
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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:  Failed to merge submodule submod (no merge base)
+  From inner merge:  CONFLICT (add/add): Merge conflict in submod
+Failed to merge submodule submod (no merge base)
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+ok 32 - check submodule add/add
+
+expecting success of 6416.33 'setup conflicting entry types (submodule vs symlink)': 
+	git init submodule-symlink-add-add &&
+	(
+		cd submodule-symlink-add-add &&
+
+		git init path &&
+		(
+			cd path &&
+			touch file-B &&
+			git add file-B &&
+			git commit -m B &&
+			git tag B
+		) &&
+
+		touch irrelevant-file &&
+		git add irrelevant-file &&
+		git commit -m A &&
+		git tag A &&
+
+		git checkout -b B A &&
+		git -C path reset --hard B &&
+		git add path &&
+		git commit -m B &&
+
+		git checkout -b C A &&
+		rm -rf path/ &&
+		test_ln_s_add irrelevant-file path &&
+		git commit -m C &&
+
+		git checkout -q B^0 &&
+		git merge -s ours -m D C^0 &&
+		git tag D &&
+
+		git checkout -q C^0 &&
+		git merge -s ours -m E B^0 &&
+		git tag E
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/submodule-symlink-add-add/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/submodule-symlink-add-add/path/.git/
+[main (root-commit) f80342e] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file-B
+[main (root-commit) ffa7695] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 irrelevant-file
+Switched to a new branch 'B'
+HEAD is now at f80342e B
+warning: adding embedded git repository: path
+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> path
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached path
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[B 83ada27] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 path
+warning: unable to rmdir 'path': Directory not empty
+Switched to a new branch 'C'
+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
+[C 7d3c6ec] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 path
+Merge made by the 'ours' strategy.
+Merge made by the 'ours' strategy.
+ok 33 - setup conflicting entry types (submodule vs symlink)
+
+expecting success of 6416.34 'check conflicting entry types (submodule vs symlink)': 
+	(
+		cd submodule-symlink-add-add &&
+
+		git checkout D^0 &&
+
+		test_must_fail git merge -s recursive E^0 &&
+
+		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
+	)
+
+Previous HEAD position was d862885 E
+HEAD is now at cc49267 D
+CONFLICT (distinct types): path had different types on each side; renamed both of them so each can be recorded somewhere.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 34 - check conflicting entry types (submodule vs symlink)
+
+expecting success of 6416.35 'setup conflicting modes for regular file': 
+	git init regular-file-mode-conflict &&
+	(
+		cd regular-file-mode-conflict &&
+
+		touch irrelevant-file &&
+		git add irrelevant-file &&
+		git commit -m A &&
+		git tag A &&
+
+		git checkout -b B A &&
+		echo "command_to_run" >source_me.bash &&
+		git add source_me.bash &&
+		git commit -m B &&
+
+		git checkout -b C A &&
+		echo "command_to_run" >source_me.bash &&
+		git add source_me.bash &&
+		test_chmod +x source_me.bash &&
+		git commit -m C &&
+
+		git checkout -q B^0 &&
+		git merge -s ours -m D C^0 &&
+		git tag D &&
+
+		git checkout -q C^0 &&
+		git merge -s ours -m E B^0 &&
+		git tag E
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/regular-file-mode-conflict/.git/
+[main (root-commit) ffa7695] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 irrelevant-file
+Switched to a new branch 'B'
+[B b8c132e] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 source_me.bash
+Switched to a new branch 'C'
+[C 53e08af] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100755 source_me.bash
+Merge made by the 'ours' strategy.
+Merge made by the 'ours' strategy.
+ok 35 - setup conflicting modes for regular file
+
+checking known breakage of 6416.36 'check conflicting modes for regular file': 
+	(
+		cd regular-file-mode-conflict &&
+
+		git checkout D^0 &&
+
+		test_must_fail git merge -s recursive E^0 &&
+
+		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
+	)
+
+Previous HEAD position was 0f3ce8e E
+HEAD is now at a770888 D
+  From inner merge:  CONFLICT (add/add): Merge conflict in source_me.bash
+Merge made by the 'recursive' strategy.
+test_must_fail: command succeeded: git merge -s recursive E^0
+not ok 36 - check conflicting modes for regular file # TODO known breakage
+
+expecting success of 6416.37 'setup nested conflicts': 
+	git init nested_conflicts &&
+	(
+		cd nested_conflicts &&
+
+		# Create some related files now
+		printf "Random base content line %d\n" $(test_seq 1 10) >initial &&
+
+		cp initial b_L1 &&
+		cp initial b_R1 &&
+		cp initial b_L2 &&
+		cp initial b_R2 &&
+		cp initial a_L1 &&
+		cp initial a_R1 &&
+		cp initial a_L2 &&
+		cp initial a_R2 &&
+
+		test_write_lines b b_L1 >>b_L1 &&
+		test_write_lines b b_R1 >>b_R1 &&
+		test_write_lines b b_L2 >>b_L2 &&
+		test_write_lines b b_R2 >>b_R2 &&
+		test_write_lines a a_L1 >>a_L1 &&
+		test_write_lines a a_R1 >>a_R1 &&
+		test_write_lines a a_L2 >>a_L2 &&
+		test_write_lines a a_R2 >>a_R2 &&
+
+		# Setup original commit (or merge-base), consisting of
+		# files named "b" and "a"
+		cp initial b &&
+		cp initial a &&
+		echo b >>b &&
+		echo a >>a &&
+		git add b a &&
+		test_tick && git commit -m initial &&
+
+		git branch L &&
+		git branch R &&
+
+		# Handle the left side
+		git checkout L &&
+		mv -f b_L1 b &&
+		mv -f a_L1 a &&
+		git add b a &&
+		test_tick && git commit -m "version L1 of files" &&
+		git tag L1 &&
+
+		# Handle the right side
+		git checkout R &&
+		mv -f b_R1 b &&
+		mv -f a_R1 a &&
+		git add b a &&
+		test_tick && git commit -m "version R1 of files" &&
+		git tag R1 &&
+
+		# Create first merge on left side
+		git checkout L &&
+		test_must_fail git merge R1 &&
+		mv -f b_L2 b &&
+		mv -f a_L2 a &&
+		git add b a &&
+		git mv b m &&
+		test_tick && git commit -m "left merge, rename b->m" &&
+		git tag L2 &&
+
+		# Create first merge on right side
+		git checkout R &&
+		test_must_fail git merge L1 &&
+		mv -f b_R2 b &&
+		mv -f a_R2 a &&
+		git add b a &&
+		git mv a m &&
+		test_tick && git commit -m "right merge, rename a->m" &&
+		git tag R2
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/nested_conflicts/.git/
+[main (root-commit) 64965f6] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 22 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+Switched to branch 'L'
+[L e512e8b] version L1 of files
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+Switched to branch 'R'
+[R ff2c09e] version R1 of files
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+Switched to branch 'L'
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+Auto-merging b
+CONFLICT (content): Merge conflict in b
+Automatic merge failed; fix conflicts and then commit the result.
+[L 4085c94] left merge, rename b->m
+ Author: A U Thor <author@example.com>
+Switched to branch 'R'
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+Auto-merging b
+CONFLICT (content): Merge conflict in b
+Automatic merge failed; fix conflicts and then commit the result.
+[R 6322e9f] right merge, rename a->m
+ Author: A U Thor <author@example.com>
+ok 37 - setup nested conflicts
+
+expecting success of 6416.38 'check nested conflicts': 
+	(
+		cd nested_conflicts &&
+
+		git clean -f &&
+		MAIN=$(git rev-parse --short main) &&
+		git checkout L2^0 &&
+
+		# Merge must fail; there is a conflict
+		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R2^0 &&
+
+		# Make sure the index has the right number of entries
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		# Ensure we have the correct number of untracked files
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		# Create a and b from virtual merge base X
+		git cat-file -p main:a >base &&
+		git cat-file -p L1:a >ours &&
+		git cat-file -p R1:a >theirs &&
+		test_must_fail git merge-file --diff3 \
+			-L "Temporary merge branch 1" \
+			-L "$MAIN"  \
+			-L "Temporary merge branch 2" \
+			ours  \
+			base  \
+			theirs &&
+		sed -e "s/^\([<|=>]\)/\1\1/" ours >vmb_a &&
+
+		git cat-file -p main:b >base &&
+		git cat-file -p L1:b >ours &&
+		git cat-file -p R1:b >theirs &&
+		test_must_fail git merge-file --diff3 \
+			-L "Temporary merge branch 1" \
+			-L "$MAIN"  \
+			-L "Temporary merge branch 2" \
+			ours  \
+			base  \
+			theirs &&
+		sed -e "s/^\([<|=>]\)/\1\1/" ours >vmb_b &&
+
+		# Compare :2:m to expected values
+		git cat-file -p L2:m >ours &&
+		git cat-file -p R2:b >theirs &&
+		test_must_fail git merge-file --diff3  \
+			-L "HEAD:m"                    \
+			-L "merged common ancestors:b" \
+			-L "R2^0:b"                    \
+			ours                           \
+			vmb_b                          \
+			theirs                         &&
+		sed -e "s/^\([<|=>]\)/\1\1/" ours >m_stage_2 &&
+		git cat-file -p :2:m >actual &&
+		test_cmp m_stage_2 actual &&
+
+		# Compare :3:m to expected values
+		git cat-file -p L2:a >ours &&
+		git cat-file -p R2:m >theirs &&
+		test_must_fail git merge-file --diff3  \
+			-L "HEAD:a"                    \
+			-L "merged common ancestors:a" \
+			-L "R2^0:m"                    \
+			ours                           \
+			vmb_a                          \
+			theirs                         &&
+		sed -e "s/^\([<|=>]\)/\1\1/" ours >m_stage_3 &&
+		git cat-file -p :3:m >actual &&
+		test_cmp m_stage_3 actual &&
+
+		# Compare m to expected contents
+		>empty &&
+		cp m_stage_2 expected_final_m &&
+		test_must_fail git merge-file --diff3 \
+			-L "HEAD"                     \
+			-L "merged common ancestors"  \
+			-L "R2^0"                     \
+			expected_final_m              \
+			empty                         \
+			m_stage_3                     &&
+		test_cmp expected_final_m m
+	)
+
+Removing initial
+Note: switching to 'L2^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 4085c94 left merge, rename b->m
+  From inner merge:  Auto-merging a
+  From inner merge:  CONFLICT (content): Merge conflict in a
+Auto-merging a
+  From inner merge:  Auto-merging b
+  From inner merge:  CONFLICT (content): Merge conflict in b
+Auto-merging b
+CONFLICT (rename involved in collision): rename of a -> m has content conflicts AND collides with another path; this may result in nested conflict markers.
+CONFLICT (rename involved in collision): rename of b -> m has content conflicts AND collides with another path; this may result in nested conflict markers.
+Auto-merging m
+CONFLICT (add/add): Merge conflict in m
+Automatic merge failed; fix conflicts and then commit the result.
+ok 38 - check nested conflicts
+
+expecting success of 6416.39 'setup virtual merge base with nested conflicts': 
+	git init virtual_merge_base_has_nested_conflicts &&
+	(
+		cd virtual_merge_base_has_nested_conflicts &&
+
+		# Create some related files now
+		printf "Random base content line %d\n" $(test_seq 1 10) >content &&
+
+		# Setup original commit
+		git add content &&
+		test_tick && git commit -m initial &&
+
+		git branch L &&
+		git branch R &&
+
+		# Create L1
+		git checkout L &&
+		echo left >>content &&
+		git add content &&
+		test_tick && git commit -m "version L1 of content" &&
+		git tag L1 &&
+
+		# Create R1
+		git checkout R &&
+		echo right >>content &&
+		git add content &&
+		test_tick && git commit -m "version R1 of content" &&
+		git tag R1 &&
+
+		# Create L2
+		git checkout L &&
+		test_must_fail git -c merge.conflictstyle=diff3 merge R1 &&
+		git checkout L1 content &&
+		test_tick && git commit -m "version L2 of content" &&
+		git tag L2 &&
+
+		# Create R2
+		git checkout R &&
+		test_must_fail git -c merge.conflictstyle=diff3 merge L1 &&
+		git checkout R1 content &&
+		test_tick && git commit -m "version R2 of content" &&
+		git tag R2 &&
+
+		# Create L3
+		git checkout L &&
+		test_must_fail git -c merge.conflictstyle=diff3 merge R2 &&
+		git checkout L1 content &&
+		test_tick && git commit -m "version L3 of content" &&
+		git tag L3 &&
+
+		# Create R3
+		git checkout R &&
+		test_must_fail git -c merge.conflictstyle=diff3 merge L2 &&
+		git checkout R1 content &&
+		test_tick && git commit -m "version R3 of content" &&
+		git tag R3
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6416-recursive-corner-cases/virtual_merge_base_has_nested_conflicts/.git/
+[main (root-commit) 0e6d233] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 content
+Switched to branch 'L'
+[L 80f6449] version L1 of content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'R'
+[R 49ac0f6] version R1 of content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'L'
+Auto-merging content
+CONFLICT (content): Merge conflict in content
+Automatic merge failed; fix conflicts and then commit the result.
+Updated 1 path from 42730fb
+[L b5f1211] version L2 of content
+ Author: A U Thor <author@example.com>
+Switched to branch 'R'
+Auto-merging content
+CONFLICT (content): Merge conflict in content
+Automatic merge failed; fix conflicts and then commit the result.
+Updated 1 path from 5ac3d63
+[R d9b26ef] version R2 of content
+ Author: A U Thor <author@example.com>
+Switched to branch 'L'
+  From inner merge:  Auto-merging content
+  From inner merge:  CONFLICT (content): Merge conflict in content
+Auto-merging content
+CONFLICT (content): Merge conflict in content
+Automatic merge failed; fix conflicts and then commit the result.
+Updated 1 path from 42730fb
+[L 747e690] version L3 of content
+ Author: A U Thor <author@example.com>
+Switched to branch 'R'
+  From inner merge:  Auto-merging content
+  From inner merge:  CONFLICT (content): Merge conflict in content
+Auto-merging content
+CONFLICT (content): Merge conflict in content
+Automatic merge failed; fix conflicts and then commit the result.
+Updated 1 path from 5ac3d63
+[R 1e5e557] version R3 of content
+ Author: A U Thor <author@example.com>
+ok 39 - setup virtual merge base with nested conflicts
+
+expecting success of 6416.40 'check virtual merge base with nested conflicts': 
+	(
+		cd virtual_merge_base_has_nested_conflicts &&
+
+		MAIN=$(git rev-parse --short main) &&
+		git checkout L3^0 &&
+
+		# Merge must fail; there is a conflict
+		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R3^0 &&
+
+		# Make sure the index has the right number of entries
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		# Ensure we have the correct number of untracked files
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		# Compare :[23]:content to expected values
+		git rev-parse L1:content R1:content >expect &&
+		git rev-parse :2:content :3:content >actual &&
+		test_cmp expect actual &&
+
+		# Imitate X1 merge base, except without long enough conflict
+		# markers because a subsequent sed will modify them.  Put
+		# result into vmb.
+		git cat-file -p main:content >base &&
+		git cat-file -p L:content >left &&
+		git cat-file -p R:content >right &&
+		cp left merged-once &&
+		test_must_fail git merge-file --diff3 \
+			-L "Temporary merge branch 1" \
+			-L "$MAIN"  \
+			-L "Temporary merge branch 2" \
+			merged-once \
+			base        \
+			right       &&
+		sed -e "s/^\([<|=>]\)/\1\1\1/" merged-once >vmb &&
+
+		# Imitate X2 merge base, overwriting vmb.  Note that we
+		# extend both sets of conflict markers to make them longer
+		# with the sed command.
+		cp left merged-twice &&
+		test_must_fail git merge-file --diff3 \
+			-L "Temporary merge branch 1" \
+			-L "merged common ancestors"  \
+			-L "Temporary merge branch 2" \
+			merged-twice \
+			vmb          \
+			right        &&
+		sed -e "s/^\([<|=>]\)/\1\1\1/" merged-twice >vmb &&
+
+		# Compare :1:content to expected value
+		git cat-file -p :1:content >actual &&
+		test_cmp vmb actual &&
+
+		# Determine expected content in final outer merge, compare to
+		# what the merge generated.
+		cp -f left expect &&
+		test_must_fail git merge-file --diff3                      \
+			-L "HEAD"  -L "merged common ancestors"  -L "R3^0" \
+			expect     vmb                           right     &&
+		test_cmp expect content
+	)
+
+Note: switching to 'L3^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 747e690 version L3 of content
+  From inner merge:    Auto-merging content
+  From inner merge:    CONFLICT (content): Merge conflict in content
+  From inner merge:  Auto-merging content
+  From inner merge:  CONFLICT (content): Merge conflict in content
+Auto-merging content
+CONFLICT (content): Merge conflict in content
+Automatic merge failed; fix conflicts and then commit the result.
+ok 40 - check virtual merge base with nested conflicts
+
+# still have 3 known breakage(s)
+# passed all remaining 37 test(s)
+1..40
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t6601-path-walk.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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" &&
+
+	rm -fr child file file2 &&
+
+	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 &&
+
+	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 &&
+
+	# 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 topic HEAD~1 &&
+	echo cc >right/c &&
+	git commit -a -m "topic" &&
+	git tag -a -m "fourth" fourth
+
+Switched to a new branch 'base'
+[base (root-commit) 8a1cb1c] will abandon
+ Author: A U Thor <author@example.com>
+ 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
+[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(+)
+ 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 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
+
+	test_cmp_sorted expect out
+
+ok 13 - topic, not base, boundary with pruning
+
+expecting success of 6601.14 'topic, not base, --edge-aggressive with pruning': 
+	test-tool path-walk --prune --edge-aggressive -- topic --not base >out &&
+
+	cat >expect <<-EOF &&
+	0:commit::$(git rev-parse topic)
+	1:tree::$(git rev-parse topic^{tree})
+	1:tree::$(git rev-parse base^{tree}):UNINTERESTING
+	2:tree:right/:$(git rev-parse topic:right)
+	2:tree:right/:$(git rev-parse base:right):UNINTERESTING
+	3:blob:right/c:$(git rev-parse base:right/c):UNINTERESTING
+	3:blob:right/c:$(git rev-parse topic:right/c)
+	blobs:2
+	commits:1
+	tags:0
+	trees:4
+	EOF
+
+	test_cmp_sorted expect out
+
+ok 14 - topic, not base, --edge-aggressive with pruning
+
+expecting success of 6601.15 '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.51.0/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(+)
+ 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, 0 insertions(+), 0 deletions(-)
+ rename initial/file.t => file.t (100%)
+ok 15 - trees are reported exactly once
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7005-editor.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+ 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
+ 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
+ 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
+ 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
+ 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
+
+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 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
+
+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 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)
+
+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)
+
+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)
+
+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)"
+
+
+[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
+
+expecting success of 7005.16 'core.editor with a space': 
+
+	git config core.editor \"./e\ space.sh\" &&
+	git commit --amend &&
+	test space = "$(git show -s --pretty=format:%s)"
+
+
+[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 16 - core.editor with a space
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7010-setup.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/.git/
+expecting success of 7010.1 'setup': 
+
+	mkdir -p a/b/c a/e &&
+	D=$(pwd) &&
+	>a/b/c/d &&
+	>a/e/f
+
+
+ok 1 - setup
+
+expecting success of 7010.2 'git add (absolute)': 
+
+	git add "$D/a/b/c/d" &&
+	git ls-files >current &&
+	echo a/b/c/d >expect &&
+	test_cmp expect current
 
-expecting success of 5572.63 'fetch.recurseSubmodules takes precedence over submodule.recurse': 
-	test_commit -C child merge_strategy_6 &&
-	# Omit the parent commit, otherwise this passes with the
-	# default "pull" behavior.
 
-	git -C super -c submodule.recurse=false -c fetch.recursesubmodules=true pull --no-rebase &&
-	# Check that the submodule commit was fetched
-	sub_oid=$(git -C child rev-parse HEAD) &&
-	git -C super/sub cat-file -e $sub_oid &&
-	# Check that the submodule worktree did not update
-	test_path_is_missing super/sub/merge_strategy_6.t
+ok 2 - git add (absolute)
 
-[master 1f3a5c4] merge_strategy_6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 merge_strategy_6.t
-Fetching submodule sub
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/child
-   d4ae3d3..1f3a5c4  master           -> origin/master
- * [new tag]         merge_strategy_6 -> merge_strategy_6
-Already up to date.
-ok 63 - fetch.recurseSubmodules takes precedence over submodule.recurse
+expecting success of 7010.3 'git add (funny relative)': 
 
-expecting success of 5572.64 'pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)': 
-	# This tests the following scenario :
-	# - local submodule has new commits
-	# - local superproject does not have new commits
-	# - upstream superproject has new commits that change the submodule pointer
+	rm -f .git/index &&
+	(
+		cd a/b &&
+		git add "../e/./f"
+	) &&
+	git ls-files >current &&
+	echo a/e/f >expect &&
+	test_cmp expect current
 
-	# change upstream
-	test_commit -C child rebase_strategy &&
-	git -C parent submodule update --remote &&
-	git -C parent add sub &&
-	git -C parent commit -m "update submodule" &&
 
-	# also have local commits
-	test_commit -C super/sub local_stuff &&
+ok 3 - git add (funny relative)
 
-	git -C super pull --rebase --recurse-submodules &&
-	test_path_is_file super/sub/rebase_strategy.t &&
-	test_path_is_file super/sub/local_stuff.t
+expecting success of 7010.4 'git rm (absolute)': 
 
-[master 4391f12] rebase_strategy
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 rebase_strategy.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/child
-   c05caa7..4391f12  master          -> origin/master
- * [new tag]         rebase_strategy -> rebase_strategy
- * [new tag]         merge_strategy_5 -> merge_strategy_5
- * [new tag]         merge_strategy_6 -> merge_strategy_6
-Submodule path 'sub': checked out '4391f120cab920b6a92bfc8c3d1803d384f7c2ab'
-[master 7a9de42] update submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD a12280c] local_stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 local_stuff.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/parent
-   ab7e8d7..7a9de42  master     -> origin/master
-Fetching submodule sub
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/child
-   1f3a5c4..4391f12  master          -> origin/master
- * [new tag]         rebase_strategy -> rebase_strategy
-Updating ab7e8d7..7a9de42
-Fast-forward
- sub | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-Submodule path 'sub': rebased into '4391f120cab920b6a92bfc8c3d1803d384f7c2ab'
-ok 64 - pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)
+	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 5572.65 'pull --rebase --recurse-submodules fails if both sides record submodule changes': 
-	# This tests the following scenario :
-	# - local superproject has new commits that change the submodule pointer
-	# - upstream superproject has new commits that change the submodule pointer
 
-	# local changes in submodule recorded in superproject:
-	test_commit -C super/sub local_stuff_2 &&
-	git -C super add sub &&
-	git -C super commit -m "local update submodule" &&
+rm 'a/b/c/d'
+ok 4 - git rm (absolute)
 
-	# and in the remote as well:
-	test_commit -C child important_upstream_work &&
-	git -C parent submodule update --remote &&
-	git -C parent add sub &&
-	git -C parent commit -m "remote update submodule" &&
+expecting success of 7010.5 'git rm (funny relative)': 
 
-	# Unfortunately we fail here, despite no conflict in the
-	# submodule itself, but the merge strategy in submodules
-	# does not support rebase:
-	test_must_fail git -C super pull --rebase --recurse-submodules 2>err &&
-	test_grep "locally recorded submodule modifications" err
+	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
 
-[detached HEAD 759ac20] local_stuff_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 local_stuff_2.t
-[master 9fde00a] local update submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master d4f9c29] important_upstream_work
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 important_upstream_work.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/child
-   4391f12..d4f9c29  master                  -> origin/master
- * [new tag]         important_upstream_work -> important_upstream_work
-Submodule path 'sub': checked out 'd4f9c29a61c7ee3ad315fbd2b54c0e503fbceb51'
-[master 1555229] remote update submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: cannot rebase with locally recorded submodule modifications
-ok 65 - pull --rebase --recurse-submodules fails if both sides record submodule changes
 
-expecting success of 5572.66 'pull --rebase --recurse-submodules (no submodule changes, no fork-point)': 
-	# This tests the following scenario :
-	# - local submodule does not have new commits
-	# - local superproject has new commits that *do not* change the submodule pointer
-	# - upstream superproject has new commits that *do not* change the submodule pointer
-	# - local superproject branch has no fork-point with its remote-tracking counter-part
+rm 'a/e/f'
+ok 5 - git rm (funny relative)
 
-	# create upstream superproject
-	test_create_repo submodule &&
-	test_commit -C submodule first_in_sub &&
+expecting success of 7010.6 'git ls-files (absolute)': 
 
-	test_create_repo superprojet &&
-	test_commit -C superprojet first_in_super &&
-	git -C superprojet submodule add ../submodule &&
-	git -C superprojet commit -m "add submodule" &&
-	test_commit -C superprojet third_in_super &&
+	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
 
-	# clone superproject
-	git clone --recurse-submodules superprojet superclone &&
 
-	# add commits upstream
-	test_commit -C superprojet fourth_in_super &&
+ok 6 - git ls-files (absolute)
 
-	# create topic branch in clone, not based on any remote-tracking branch
-	git -C superclone checkout -b feat HEAD~1 &&
-	test_commit -C superclone first_on_feat &&
-	git -C superclone pull --rebase --recurse-submodules origin HEAD
+expecting success of 7010.7 'git ls-files (relative #1)': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/submodule/.git/
-[master (root-commit) 49dad2b] first_in_sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first_in_sub.t
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/superprojet/.git/
-[master (root-commit) 71f9db3] first_in_super
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first_in_super.t
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/superprojet/submodule'...
-done.
-[master ef8874e] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-[master b90c0e9] third_in_super
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 third_in_super.t
-Cloning into 'superclone'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/superclone/submodule'...
-done.
-Submodule path 'submodule': checked out '49dad2bf2d37043f968daefcc5bfbeb341965350'
-[master b1f89fe] fourth_in_super
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fourth_in_super.t
-Switched to a new branch 'feat'
-[feat 81a2d37] first_on_feat
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first_on_feat.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/superprojet
- * branch            HEAD       -> FETCH_HEAD
-Fetching submodule submodule
-Rebasing (1/1)
Successfully rebased and updated refs/heads/feat.
-ok 66 - pull --rebase --recurse-submodules (no submodule changes, no fork-point)
+	rm -f .git/index &&
+	git add a &&
+	(
+		cd a/b &&
+		git ls-files "../b/c"
+	)  >current &&
+	echo c/d >expect &&
+	test_cmp expect current
 
-expecting success of 5572.67 'branch has no merge base with remote-tracking counterpart': 
-	rm -rf parent child &&
 
-	test_create_repo a-submodule &&
-	test_commit -C a-submodule foo &&
-	test_commit -C a-submodule bar &&
+ok 7 - git ls-files (relative #1)
 
-	test_create_repo parent &&
-	git -C parent submodule add "$(pwd)/a-submodule" &&
-	git -C parent commit -m foo &&
+expecting success of 7010.8 'git ls-files (relative #2)': 
 
-	git clone parent child &&
+	rm -f .git/index &&
+	git add a &&
+	(
+		cd a/b &&
+		git ls-files --full-name "../e/f"
+	)  >current &&
+	echo a/e/f >expect &&
+	test_cmp expect current
 
-	# Reset the current branch so that it has no merge base with
-	# the remote-tracking branch.
-	OTHER=$(git -C child commit-tree -m bar \
-		$(git -C child rev-parse HEAD^{tree})) &&
-	git -C child reset --hard "$OTHER" &&
 
-	git -C child pull --recurse-submodules --rebase
+ok 8 - git ls-files (relative #2)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/a-submodule/.git/
-[master (root-commit) a4efc16] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master b3b6050] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/parent/.git/
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/parent/a-submodule'...
-done.
-[master (root-commit) baab669] foo
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 a-submodule
-Cloning into 'child'...
-done.
-HEAD is now at aa8b49b bar
-warning: skipped previously applied commit aa8b49b
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Successfully rebased and updated refs/heads/master.
-ok 67 - branch has no merge base with remote-tracking counterpart
+expecting success of 7010.9 'git ls-files (relative #3)': 
 
-expecting success of 5572.68 'fetch submodule remote of different name from superproject': 
-	git -C child remote rename origin o1 &&
-	git -C child submodule update --init &&
+	rm -f .git/index &&
+	git add a &&
+	(
+		cd a/b &&
+		git ls-files "../e/f"
+	)  >current &&
+	echo ../e/f >expect &&
+	test_cmp expect current
 
-	# Needs to create unreachable commit from current master branch.
-	git -C a-submodule checkout -b newmain HEAD^ &&
-	test_commit -C a-submodule echo &&
-	test_commit -C a-submodule moreecho &&
-	subc=$(git -C a-submodule rev-parse --short HEAD) &&
 
-	git -C parent/a-submodule fetch &&
-	git -C parent/a-submodule checkout "$subc" &&
-	git -C parent commit -m "update submodule" a-submodule &&
-	git -C a-submodule reset --hard HEAD^^ &&
+ok 9 - git ls-files (relative #3)
 
-	git -C child pull --no-recurse-submodules &&
-	git -C child submodule update
+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"
 
-Submodule 'a-submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/a-submodule) registered for path 'a-submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/child/a-submodule'...
-done.
-Submodule path 'a-submodule': checked out 'b3b6050676a5798a4107f8ec799fe53b4ecd55b1'
-Switched to a new branch 'newmain'
-[newmain b5e3d30] echo
+[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(+)
- create mode 100644 echo.t
-[newmain ae49081] moreecho
+ok 10 - commit using absolute path names
+
+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" &&
+
+	git log a/b/c/d >f1.txt &&
+	git log "$(pwd)/a/b/c/d" >f2.txt &&
+	test_cmp f1.txt f2.txt
+
+[master 8d92247] bb
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 moreecho.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/a-submodule
- * [new branch]      newmain    -> origin/newmain
- * [new tag]         moreecho   -> moreecho
- * [new tag]         echo       -> echo
-Note: switching to 'ae49081'.
+ok 11 - log using absolute path names
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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 12 - blame using absolute path names
 
-  git switch -c <new-branch-name>
+expecting success of 7010.13 'setup deeper work tree': 
+	test_create_repo tester
 
-Or undo this operation with:
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/tester/.git/
+ok 13 - setup deeper work tree
 
-  git switch -
+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.51.0/t/trash directory.t7010-setup: '/build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup' is outside repository at '/build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/tester'
+ok 14 - add a directory outside the work tree
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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.51.0/t/trash directory.t7010-setup/testerx
+fatal: /build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/testerx: '/build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/testerx' is outside repository at '/build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/tester'
+ok 15 - add a file outside the work tree, nasty case 1
 
-HEAD is now at ae49081 moreecho
-[master f2af131] update submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at a4efc16 foo
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/parent
-   baab669..f2af131  master     -> o1/master
-Updating baab669..f2af131
-Fast-forward
- a-submodule | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/a-submodule
- * [new branch]      newmain    -> origin/newmain
-From /build/reproducible-path/git-2.51.0/t/trash directory.t5572-pull-submodule/a-submodule
- * branch            ae490814337f45b47e3ec1120741f91696469ba8 -> FETCH_HEAD
-Submodule path 'a-submodule': checked out 'ae490814337f45b47e3ec1120741f91696469ba8'
-ok 68 - fetch submodule remote of different name from superproject
+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.51.0/t/trash directory.t7010-setup/testex
+fatal: /build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/testex: '/build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/testex' is outside repository at '/build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/tester'
+ok 16 - add a file outside the work tree, nasty case 2
 
-# still have 8 known breakage(s)
-# passed all remaining 60 test(s)
-1..68
+# passed all 16 test(s)
+1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7007-show.sh ***
@@ -449249,199 +450370,6 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7010-setup.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/.git/
-expecting success of 7010.1 'setup': 
-
-	mkdir -p a/b/c a/e &&
-	D=$(pwd) &&
-	>a/b/c/d &&
-	>a/e/f
-
-
-ok 1 - setup
-
-expecting success of 7010.2 'git add (absolute)': 
-
-	git add "$D/a/b/c/d" &&
-	git ls-files >current &&
-	echo a/b/c/d >expect &&
-	test_cmp expect current
-
-
-ok 2 - git add (absolute)
-
-expecting success of 7010.3 'git add (funny relative)': 
-
-	rm -f .git/index &&
-	(
-		cd a/b &&
-		git add "../e/./f"
-	) &&
-	git ls-files >current &&
-	echo a/e/f >expect &&
-	test_cmp expect current
-
-
-ok 3 - git add (funny relative)
-
-expecting success of 7010.4 'git rm (absolute)': 
-
-	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
-
-
-rm 'a/b/c/d'
-ok 4 - git rm (absolute)
-
-expecting success of 7010.5 'git rm (funny relative)': 
-
-	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
-
-
-rm 'a/e/f'
-ok 5 - git rm (funny relative)
-
-expecting success of 7010.6 'git ls-files (absolute)': 
-
-	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
-
-
-ok 6 - git ls-files (absolute)
-
-expecting success of 7010.7 'git ls-files (relative #1)': 
-
-	rm -f .git/index &&
-	git add a &&
-	(
-		cd a/b &&
-		git ls-files "../b/c"
-	)  >current &&
-	echo c/d >expect &&
-	test_cmp expect current
-
-
-ok 7 - git ls-files (relative #1)
-
-expecting success of 7010.8 'git ls-files (relative #2)': 
-
-	rm -f .git/index &&
-	git add a &&
-	(
-		cd a/b &&
-		git ls-files --full-name "../e/f"
-	)  >current &&
-	echo a/e/f >expect &&
-	test_cmp expect current
-
-
-ok 8 - git ls-files (relative #2)
-
-expecting success of 7010.9 'git ls-files (relative #3)': 
-
-	rm -f .git/index &&
-	git add a &&
-	(
-		cd a/b &&
-		git ls-files "../e/f"
-	)  >current &&
-	echo ../e/f >expect &&
-	test_cmp expect current
-
-
-ok 9 - git ls-files (relative #3)
-
-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"
-
-[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 7010.11 'log using absolute path names': 
-	echo bb >>a/b/c/d &&
-	git commit -m "bb" "$(pwd)/a/b/c/d" &&
-
-	git log a/b/c/d >f1.txt &&
-	git log "$(pwd)/a/b/c/d" >f2.txt &&
-	test_cmp f1.txt f2.txt
-
-[master 8d92247] bb
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 11 - log using absolute path names
-
-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
-
-ok 12 - blame using absolute path names
-
-expecting success of 7010.13 'setup deeper work tree': 
-	test_create_repo tester
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/tester/.git/
-ok 13 - setup deeper work tree
-
-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.51.0/t/trash directory.t7010-setup: '/build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup' is outside repository at '/build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/tester'
-ok 14 - add a directory outside the work tree
-
-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.51.0/t/trash directory.t7010-setup/testerx
-fatal: /build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/testerx: '/build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/testerx' is outside repository at '/build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/tester'
-ok 15 - add a file outside the work tree, nasty case 1
-
-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.51.0/t/trash directory.t7010-setup/testex
-fatal: /build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/testex: '/build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/testex' is outside repository at '/build/reproducible-path/git-2.51.0/t/trash directory.t7010-setup/tester'
-ok 16 - add a file outside the work tree, nasty case 2
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7030-verify-tag.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7030-verify-tag/.git/
 checking prerequisite: GPG
@@ -449563,143 +450491,92 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7011-skip-worktree-reading.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t7008-filter-branch-null-sha1.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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) 2519212] init
+[master (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 init.t
-ok 1 - setup
-
-expecting success of 7011.2 'update-index': 
-	setup_absent &&
-	git update-index 1 &&
-	test_absent
-
-ok 2 - update-index
-
-expecting success of 7011.3 'update-index': 
-	setup_dirty &&
-	git update-index 1 &&
-	test_dirty
-
-ok 3 - update-index
-
-expecting success of 7011.4 'update-index --remove': 
-	setup_absent &&
-	git update-index --remove 1 &&
-	test -z "$(git ls-files 1)" &&
-	test ! -f 1
-
-ok 4 - update-index --remove
-
-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
-
-ok 5 - update-index --remove
-
-expecting success of 7011.6 'ls-files --deleted': 
-	setup_absent &&
-	test -z "$(git ls-files -d)"
-
-ok 6 - ls-files --deleted
-
-expecting success of 7011.7 'ls-files --deleted': 
-	setup_dirty &&
-	test -z "$(git ls-files -d)"
-
-ok 7 - ls-files --deleted
-
-expecting success of 7011.8 'ls-files --modified': 
-	setup_absent &&
-	test -z "$(git ls-files -m)"
-
-ok 8 - ls-files --modified
-
-expecting success of 7011.9 'ls-files --modified': 
-	setup_dirty &&
-	test -z "$(git ls-files -m)"
-
-ok 9 - ls-files --modified
-
-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
-
-ok 10 - diff-index does not examine skip-worktree absent entries
-
-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
+ 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
+ok 1 - setup: base commits
 
-ok 11 - diff-index does not examine skip-worktree dirty entries
+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 &&
 
-expecting success of 7011.12 'diff-files does not examine skip-worktree absent entries': 
-	setup_absent &&
-	test -z "$(git diff-files -- one)"
+	tree=$(git mktree <broken-tree) &&
+	test_tick &&
+	commit=$(git commit-tree $tree -p HEAD <msg) &&
+	git update-ref HEAD "$commit"
 
-ok 12 - diff-files does not examine skip-worktree absent entries
+ok 2 - setup: a commit with a bogus null sha1 in the tree
 
-expecting success of 7011.13 'diff-files does not examine skip-worktree dirty entries': 
-	setup_dirty &&
-	test -z "$(git diff-files -- one)"
+expecting success of 7008.3 'setup: bring HEAD and index in sync': 
+	test_tick &&
+	git commit -a -m "back to normal"
 
-ok 13 - diff-files does not examine skip-worktree dirty entries
+[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
 
-expecting success of 7011.14 'commit on skip-worktree absent entries': 
-	git reset &&
-	setup_absent &&
-	test_must_fail git commit -m null 1
+expecting success of 7008.4 'noop filter-branch complains': 
+	test_must_fail git filter-branch \
+		--force --prune-empty \
+		--index-filter "true"
 
-On branch master
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	2
-	expect.full
-	expect.skip
-	expected
-	result
-	sub/
+
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
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 14 - commit on skip-worktree absent entries
+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"
 
-expecting success of 7011.15 'commit on skip-worktree dirty entries': 
-	git reset &&
-	setup_dirty &&
-	test_must_fail git commit -m null 1
+
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
 
-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/
+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
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 15 - commit on skip-worktree dirty entries
+
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
+rm 'broken'
+
Rewrite 6fc1982a7cbeec7380180353ef341fd996ac21f7 (5/5) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/master' was rewritten
+ok 6 - removing the broken entry works
 
-# passed all 15 test(s)
-1..15
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7031-verify-tag-signed-ssh.sh ***
@@ -450052,337 +450929,143 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7008-filter-branch-null-sha1.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t7011-skip-worktree-reading.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-[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
+[master (root-commit) 2519212] init
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 1 - setup: base commits
-
-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 &&
-
-	tree=$(git mktree <broken-tree) &&
-	test_tick &&
-	commit=$(git commit-tree $tree -p HEAD <msg) &&
-	git update-ref HEAD "$commit"
-
-ok 2 - setup: a commit with a bogus null sha1 in the tree
-
-expecting success of 7008.3 'setup: bring HEAD and index in sync': 
-	test_tick &&
-	git commit -a -m "back to normal"
-
-[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
-
-expecting success of 7008.4 'noop filter-branch complains': 
-	test_must_fail git filter-branch \
-		--force --prune-empty \
-		--index-filter "true"
-
-
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 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"
-
-
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
-
-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
-
-
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
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7062-wtstatus-ignorecase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-	new file:   V/XQANY/test
-
-ok 1 - status with hash collisions
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7061-wtstatus-ignore.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-
-ok 1 - status untracked directory with --ignored
-
-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
-
-ok 2 - same with gitignore starting with BOM
-
-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
-
-ok 3 - status untracked files --ignored with pathspec (no match)
-
-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
-
-ok 4 - status untracked files --ignored with pathspec (literal match)
-
-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
-
-ok 5 - status untracked files --ignored with pathspec (glob match)
-
-expecting success of 7061.6 'status untracked directory with --ignored -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
-
-ok 6 - status untracked directory with --ignored -u
-
-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 status --porcelain --ignored untracked/ >actual &&
-	test_cmp expected actual
-
-ok 7 - status of untracked directory with --ignored works with or without prefix
-
-expecting success of 7061.8 'status prefixed untracked sub-directory with --ignored -u': 
-	git status --porcelain --ignored -u untracked/ >actual &&
-	test_cmp expected actual
-
-ok 8 - status prefixed untracked sub-directory with --ignored -u
-
-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
-
-ok 9 - status ignored directory with --ignore
-
-expecting success of 7061.10 'status ignored directory with --ignore -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
-
-ok 10 - status ignored directory with --ignore -u
+ create mode 100644 init.t
+ok 1 - setup
 
-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
+expecting success of 7011.2 'update-index': 
+	setup_absent &&
+	git update-index 1 &&
+	test_absent
 
-ok 11 - status empty untracked directory with --ignore
+ok 2 - update-index
 
-expecting success of 7061.12 'status empty untracked directory with --ignore -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
+expecting success of 7011.3 'update-index': 
+	setup_dirty &&
+	git update-index 1 &&
+	test_dirty
 
-ok 12 - status empty untracked directory with --ignore -u
+ok 3 - update-index
 
-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
+expecting success of 7011.4 'update-index --remove': 
+	setup_absent &&
+	git update-index --remove 1 &&
+	test -z "$(git ls-files 1)" &&
+	test ! -f 1
 
-ok 13 - status untracked directory with ignored files with --ignore
+ok 4 - update-index --remove
 
-expecting success of 7061.14 'status untracked directory with ignored files with --ignore -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
+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
 
-ok 14 - status untracked directory with ignored files with --ignore -u
+ok 5 - update-index --remove
 
-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
+expecting success of 7011.6 'ls-files --deleted': 
+	setup_absent &&
+	test -z "$(git ls-files -d)"
 
-[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
+ok 6 - ls-files --deleted
 
-expecting success of 7061.16 'status ignored tracked directory with --ignore -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
+expecting success of 7011.7 'ls-files --deleted': 
+	setup_dirty &&
+	test -z "$(git ls-files -d)"
 
-ok 16 - status ignored tracked directory with --ignore -u
+ok 7 - ls-files --deleted
 
-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
+expecting success of 7011.8 'ls-files --modified': 
+	setup_absent &&
+	test -z "$(git ls-files -m)"
 
-ok 17 - status ignored tracked directory and ignored file with --ignore
+ok 8 - ls-files --modified
 
-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
+expecting success of 7011.9 'ls-files --modified': 
+	setup_dirty &&
+	test -z "$(git ls-files -m)"
 
-ok 18 - status ignored tracked directory and ignored file with --ignore -u
+ok 9 - ls-files --modified
 
-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 7011.10 'diff-index does not examine skip-worktree absent entries': 
+	setup_absent &&
+	git diff-index HEAD -- 1 >result &&
+	test_cmp expected result
 
-ok 19 - status ignored tracked directory and uncommitted file with --ignore
+ok 10 - diff-index does not examine skip-worktree absent entries
 
-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
+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
 
-ok 20 - status ignored tracked directory and uncommitted file with --ignore -u
+ok 11 - diff-index does not examine skip-worktree dirty entries
 
-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
+expecting success of 7011.12 'diff-files does not examine skip-worktree absent entries': 
+	setup_absent &&
+	test -z "$(git diff-files -- one)"
 
-ok 21 - status ignored tracked directory with uncommitted file in untracked subdir with --ignore
+ok 12 - diff-files does not examine skip-worktree absent entries
 
-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 7011.13 'diff-files does not examine skip-worktree dirty entries': 
+	setup_dirty &&
+	test -z "$(git diff-files -- one)"
 
-ok 22 - status ignored tracked directory with uncommitted file in untracked subdir with --ignore -u
+ok 13 - diff-files does not examine skip-worktree dirty entries
 
-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
+expecting success of 7011.14 'commit on skip-worktree absent entries': 
+	git reset &&
+	setup_absent &&
+	test_must_fail git commit -m null 1
 
-[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
+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 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
+nothing added to commit but untracked files present (use "git add" to track)
+ok 14 - commit on skip-worktree absent entries
 
-ok 24 - status ignored tracked directory with uncommitted file in tracked subdir with --ignore -u
+expecting success of 7011.15 'commit on skip-worktree dirty entries': 
+	git reset &&
+	setup_dirty &&
+	test_must_fail git commit -m null 1
 
-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
+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/
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+nothing added to commit but untracked files present (use "git add" to track)
+ok 15 - commit on skip-worktree dirty entries
 
-# passed all 25 test(s)
-1..25
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6500-gc.sh ***
@@ -450996,7 +451679,7 @@
 		gc --cruft --max-cruft-size=1M &&
 	test_subcommand $cruft_max_size_opts --max-cruft-size=1048576 <trace2.txt
 
-{"event":"child_start","sid":"20250827T082227.623517Z-Hcf858c9d-P000bb4b5","thread":"main","time":"2025-08-27T08:22:27.640687Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=1048576"]}
+{"event":"child_start","sid":"20260929T145323.644678Z-H5c947e1c-P0024d78a","thread":"main","time":"2026-09-29T14:53:23.653432Z","file":"run-command.c","line":740,"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 6500.27 'gc.maxCruftSize sets appropriate repack options': 
@@ -451009,8 +451692,8 @@
 		--max-cruft-size=3M &&
 	test_subcommand $cruft_max_size_opts --max-cruft-size=3145728 <trace2.txt
 
-{"event":"child_start","sid":"20250827T082227.707407Z-Hcf858c9d-P000bb589","thread":"main","time":"2025-08-27T08:22:27.720721Z","file":"run-command.c","line":740,"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":"20250827T082227.802411Z-Hcf858c9d-P000bb64b","thread":"main","time":"2025-08-27T08:22:27.827043Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=3145728"]}
+{"event":"child_start","sid":"20260929T145323.703977Z-H5c947e1c-P0024d835","thread":"main","time":"2026-09-29T14:53:23.714604Z","file":"run-command.c","line":740,"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":"20260929T145323.763268Z-H5c947e1c-P0024d8da","thread":"main","time":"2026-09-29T14:53:23.776379Z","file":"run-command.c","line":740,"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
 
 expecting success of 6500.28 '--expire-to sets repack --expire-to': 
@@ -451020,7 +451703,7 @@
 	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
 
-{"event":"child_start","sid":"20250827T082227.904408Z-Hcf858c9d-P000bb732","thread":"main","time":"2025-08-27T08:22:27.920157Z","file":"run-command.c","line":740,"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.51.0/t/trash directory.t6500-gc/expired/pack"]}
+{"event":"child_start","sid":"20260929T145323.831062Z-H5c947e1c-P0024d9a8","thread":"main","time":"2026-09-29T14:53:23.842034Z","file":"run-command.c","line":740,"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.51.0/t/trash directory.t6500-gc/expired/pack"]}
 ok 28 - --expire-to sets repack --expire-to
 
 expecting success of 6500.29 '--expire-to with --prune=now sets repack --expire-to': 
@@ -451030,7 +451713,7 @@
 	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
 
-{"event":"child_start","sid":"20250827T082228.046656Z-Hcf858c9d-P000bb870","thread":"main","time":"2025-08-27T08:22:28.067887Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=now","--expire-to=/build/reproducible-path/git-2.51.0/t/trash directory.t6500-gc/expired/pack"]}
+{"event":"child_start","sid":"20260929T145323.898456Z-H5c947e1c-P0024daaa","thread":"main","time":"2026-09-29T14:53:23.907509Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=now","--expire-to=/build/reproducible-path/git-2.51.0/t/trash directory.t6500-gc/expired/pack"]}
 ok 29 - --expire-to with --prune=now sets repack --expire-to
 
 expecting success of 6500.30 '--expire-to with --no-cruft sets repack -A': 
@@ -451040,7 +451723,7 @@
 	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
 
-{"event":"child_start","sid":"20250827T082228.193501Z-Hcf858c9d-P000bb99e","thread":"main","time":"2025-08-27T08:22:28.217799Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","-A","--unpack-unreachable=2.weeks.ago"]}
+{"event":"child_start","sid":"20260929T145323.976577Z-H5c947e1c-P0024dbe3","thread":"main","time":"2026-09-29T14:53:23.983397Z","file":"run-command.c","line":740,"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
 
 expecting success of 6500.31 '--expire-to with --no-cruft sets repack -a': 
@@ -451050,7 +451733,7 @@
 	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
 
-{"event":"child_start","sid":"20250827T082228.310696Z-Hcf858c9d-P000bbaca","thread":"main","time":"2025-08-27T08:22:28.338313Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","-a"]}
+{"event":"child_start","sid":"20260929T145324.027565Z-H5c947e1c-P0024dc96","thread":"main","time":"2026-09-29T14:53:24.033552Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","-a"]}
 ok 31 - --expire-to with --no-cruft sets repack -a
 
 expecting success of 6500.32 'background auto gc does not run if gc.log is present and recent but does if it is old': 
@@ -451194,6 +451877,34 @@
 1..35
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7062-wtstatus-ignorecase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+	new file:   V/XQANY/test
+
+ok 1 - status with hash collisions
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7101-reset-empty-subdirs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7101-reset-empty-subdirs/.git/
 expecting success of 7101.1 'creating initial files': 
@@ -451276,6 +451987,223 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7061-wtstatus-ignore.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+
+ok 1 - status untracked directory with --ignored
+
+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
+
+ok 2 - same with gitignore starting with BOM
+
+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
+
+ok 3 - status untracked files --ignored with pathspec (no match)
+
+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
+
+ok 4 - status untracked files --ignored with pathspec (literal match)
+
+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
+
+ok 5 - status untracked files --ignored with pathspec (glob match)
+
+expecting success of 7061.6 'status untracked directory with --ignored -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
+
+ok 6 - status untracked directory with --ignored -u
+
+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 status --porcelain --ignored untracked/ >actual &&
+	test_cmp expected actual
+
+ok 7 - status of untracked directory with --ignored works with or without prefix
+
+expecting success of 7061.8 'status prefixed untracked sub-directory with --ignored -u': 
+	git status --porcelain --ignored -u untracked/ >actual &&
+	test_cmp expected actual
+
+ok 8 - status prefixed untracked sub-directory with --ignored -u
+
+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
+
+ok 9 - status ignored directory with --ignore
+
+expecting success of 7061.10 'status ignored directory with --ignore -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
+
+ok 10 - status ignored directory with --ignore -u
+
+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
+
+ok 11 - status empty untracked directory with --ignore
+
+expecting success of 7061.12 'status empty untracked directory with --ignore -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
+
+ok 12 - status empty untracked directory with --ignore -u
+
+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
+
+ok 13 - status untracked directory with ignored files with --ignore
+
+expecting success of 7061.14 'status untracked directory with ignored files with --ignore -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
+
+ok 14 - status untracked directory with ignored files with --ignore -u
+
+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
+
+[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
+
+expecting success of 7061.16 'status ignored tracked directory with --ignore -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
+
+ok 16 - status ignored tracked directory with --ignore -u
+
+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
+
+ok 17 - status ignored tracked directory and ignored file with --ignore
+
+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
+
+ok 18 - status ignored tracked directory and ignored file with --ignore -u
+
+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
+
+ok 19 - status ignored tracked directory and uncommitted file with --ignore
+
+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
+
+ok 20 - status ignored tracked directory and uncommitted file with --ignore -u
+
+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
+
+ok 21 - status ignored tracked directory with uncommitted file in untracked subdir with --ignore
+
+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
+
+ok 22 - status ignored tracked directory with uncommitted file in untracked subdir with --ignore -u
+
+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
+
+[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
+
+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
+
+ok 24 - status ignored tracked directory with uncommitted file in tracked subdir with --ignore -u
+
+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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7060-wtstatus.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7060-wtstatus/.git/
 expecting success of 7060.1 'setup': 
@@ -451680,6 +452608,247 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7103-reset-bare.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 2f98c16] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup non-bare
+
+expecting success of 7103.2 '"hard" reset requires a worktree': 
+	(cd .git &&
+	 test_must_fail git reset --hard)
+
+fatal: this operation must be run in a work tree
+ok 2 - "hard" reset requires a worktree
+
+expecting success of 7103.3 '"merge" reset requires a worktree': 
+	(cd .git &&
+	 test_must_fail git reset --merge)
+
+fatal: this operation must be run in a work tree
+ok 3 - "merge" reset requires a worktree
+
+expecting success of 7103.4 '"keep" reset requires a worktree': 
+	(cd .git &&
+	 test_must_fail git reset --keep)
+
+fatal: this operation must be run in a work tree
+ok 4 - "keep" reset requires a worktree
+
+expecting success of 7103.5 '"mixed" reset is ok': 
+	(cd .git && git reset)
+
+ok 5 - "mixed" reset is ok
+
+expecting success of 7103.6 '"soft" reset is ok': 
+	(cd .git && git reset --soft)
+
+ok 6 - "soft" reset is ok
+
+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
+
+HEAD is now at 2f98c16 two
+ok 7 - hard reset works with GIT_WORK_TREE
+
+expecting success of 7103.8 'setup bare': 
+	git clone --bare . bare.git &&
+	cd bare.git
+
+Cloning into bare repository 'bare.git'...
+done.
+ok 8 - setup bare
+
+expecting success of 7103.9 '"hard" reset is not allowed in bare': 
+	test_must_fail git reset --hard HEAD^
+
+fatal: this operation must be run in a work tree
+ok 9 - "hard" reset is not allowed in bare
+
+expecting success of 7103.10 '"merge" reset is not allowed in bare': 
+	test_must_fail git reset --merge HEAD^
+
+fatal: this operation must be run in a work tree
+ok 10 - "merge" reset is not allowed in bare
+
+expecting success of 7103.11 '"keep" reset is not allowed in bare': 
+	test_must_fail git reset --keep HEAD^
+
+fatal: this operation must be run in a work tree
+ok 11 - "keep" reset is not allowed in bare
+
+expecting success of 7103.12 '"mixed" reset is not allowed in bare': 
+	test_must_fail git reset --mixed HEAD^
+
+fatal: mixed reset is not allowed in a bare repository
+ok 12 - "mixed" reset is not allowed in bare
+
+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
+
+ok 13 - "soft" reset is allowed in bare
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7104-reset-hard.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7104-reset-hard/.git/
+expecting success of 7104.1 'setup': 
+
+	mkdir before later &&
+	>before/1 &&
+	>before/2 &&
+	>hello &&
+	>later/3 &&
+	git add before hello later &&
+	git commit -m world &&
+
+	H=$(git rev-parse :hello) &&
+	git rm --cached hello &&
+	echo "100644 $H 2	hello" | git update-index --index-info &&
+
+	rm -f hello &&
+	mkdir -p hello &&
+	>hello/world &&
+	test "$(git ls-files -o)" = hello/world
+
+
+[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
+
+expecting success of 7104.2 'reset --hard should restore unmerged ones': 
+
+	git reset --hard &&
+	git ls-files --error-unmatch before/1 before/2 hello later/3 &&
+	test -f hello
+
+
+HEAD is now at 53313cc world
+before/1
+before/2
+hello
+later/3
+ok 2 - reset --hard should restore unmerged ones
+
+expecting success of 7104.3 'reset --hard did not corrupt index or cache-tree': 
+
+	T=$(git write-tree) &&
+	rm -f .git/index &&
+	git add before hello later &&
+	U=$(git write-tree) &&
+	test "$T" = "$U"
+
+
+ok 3 - reset --hard did not corrupt index or cache-tree
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7106-reset-unborn-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7106-reset-unborn-branch/.git/
+expecting success of 7106.1 'setup': 
+	echo a >a &&
+	echo b >b
+
+ok 1 - setup
+
+expecting success of 7106.2 'reset': 
+	git add a b &&
+	git reset &&
+
+	git ls-files >actual &&
+	test_must_be_empty actual
+
+ok 2 - reset
+
+expecting success of 7106.3 'reset HEAD': 
+	rm .git/index &&
+	git add a b &&
+	test_must_fail git reset HEAD
+
+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 7106.4 'reset $file': 
+	rm .git/index &&
+	git add a b &&
+	git reset a &&
+
+	echo b >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual
+
+ok 4 - reset $file
+
+expecting success of 7106.5 'reset -p': 
+	rm .git/index &&
+	git add a &&
+	echo y >yes &&
+	git reset -p <yes >output &&
+
+	git ls-files >actual &&
+	test_must_be_empty actual &&
+	test_grep "Unstage" output
+
+(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
+ok 5 - reset -p
+
+expecting success of 7106.6 'reset --soft is a no-op': 
+	rm .git/index &&
+	git add a &&
+	git reset --soft &&
+
+	echo a >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual
+
+ok 6 - reset --soft is a no-op
+
+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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7001-mv.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7001-mv/.git/
 expecting success of 7001.1 'mv -f refreshes updated index entry': 
@@ -451955,7 +453124,7 @@
 	git mv ab a
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7001-mv/.git/
-[master (root-commit) 27a570f] initial
+[master (root-commit) 4a62032] initial
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 ab.c
@@ -452516,247 +453685,6 @@
 1..54
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7103-reset-bare.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 2f98c16] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup non-bare
-
-expecting success of 7103.2 '"hard" reset requires a worktree': 
-	(cd .git &&
-	 test_must_fail git reset --hard)
-
-fatal: this operation must be run in a work tree
-ok 2 - "hard" reset requires a worktree
-
-expecting success of 7103.3 '"merge" reset requires a worktree': 
-	(cd .git &&
-	 test_must_fail git reset --merge)
-
-fatal: this operation must be run in a work tree
-ok 3 - "merge" reset requires a worktree
-
-expecting success of 7103.4 '"keep" reset requires a worktree': 
-	(cd .git &&
-	 test_must_fail git reset --keep)
-
-fatal: this operation must be run in a work tree
-ok 4 - "keep" reset requires a worktree
-
-expecting success of 7103.5 '"mixed" reset is ok': 
-	(cd .git && git reset)
-
-ok 5 - "mixed" reset is ok
-
-expecting success of 7103.6 '"soft" reset is ok': 
-	(cd .git && git reset --soft)
-
-ok 6 - "soft" reset is ok
-
-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
-
-HEAD is now at 2f98c16 two
-ok 7 - hard reset works with GIT_WORK_TREE
-
-expecting success of 7103.8 'setup bare': 
-	git clone --bare . bare.git &&
-	cd bare.git
-
-Cloning into bare repository 'bare.git'...
-done.
-ok 8 - setup bare
-
-expecting success of 7103.9 '"hard" reset is not allowed in bare': 
-	test_must_fail git reset --hard HEAD^
-
-fatal: this operation must be run in a work tree
-ok 9 - "hard" reset is not allowed in bare
-
-expecting success of 7103.10 '"merge" reset is not allowed in bare': 
-	test_must_fail git reset --merge HEAD^
-
-fatal: this operation must be run in a work tree
-ok 10 - "merge" reset is not allowed in bare
-
-expecting success of 7103.11 '"keep" reset is not allowed in bare': 
-	test_must_fail git reset --keep HEAD^
-
-fatal: this operation must be run in a work tree
-ok 11 - "keep" reset is not allowed in bare
-
-expecting success of 7103.12 '"mixed" reset is not allowed in bare': 
-	test_must_fail git reset --mixed HEAD^
-
-fatal: mixed reset is not allowed in a bare repository
-ok 12 - "mixed" reset is not allowed in bare
-
-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
-
-ok 13 - "soft" reset is allowed in bare
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7104-reset-hard.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7104-reset-hard/.git/
-expecting success of 7104.1 'setup': 
-
-	mkdir before later &&
-	>before/1 &&
-	>before/2 &&
-	>hello &&
-	>later/3 &&
-	git add before hello later &&
-	git commit -m world &&
-
-	H=$(git rev-parse :hello) &&
-	git rm --cached hello &&
-	echo "100644 $H 2	hello" | git update-index --index-info &&
-
-	rm -f hello &&
-	mkdir -p hello &&
-	>hello/world &&
-	test "$(git ls-files -o)" = hello/world
-
-
-[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
-
-expecting success of 7104.2 'reset --hard should restore unmerged ones': 
-
-	git reset --hard &&
-	git ls-files --error-unmatch before/1 before/2 hello later/3 &&
-	test -f hello
-
-
-HEAD is now at 53313cc world
-before/1
-before/2
-hello
-later/3
-ok 2 - reset --hard should restore unmerged ones
-
-expecting success of 7104.3 'reset --hard did not corrupt index or cache-tree': 
-
-	T=$(git write-tree) &&
-	rm -f .git/index &&
-	git add before hello later &&
-	U=$(git write-tree) &&
-	test "$T" = "$U"
-
-
-ok 3 - reset --hard did not corrupt index or cache-tree
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7106-reset-unborn-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7106-reset-unborn-branch/.git/
-expecting success of 7106.1 'setup': 
-	echo a >a &&
-	echo b >b
-
-ok 1 - setup
-
-expecting success of 7106.2 'reset': 
-	git add a b &&
-	git reset &&
-
-	git ls-files >actual &&
-	test_must_be_empty actual
-
-ok 2 - reset
-
-expecting success of 7106.3 'reset HEAD': 
-	rm .git/index &&
-	git add a b &&
-	test_must_fail git reset HEAD
-
-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 7106.4 'reset $file': 
-	rm .git/index &&
-	git add a b &&
-	git reset a &&
-
-	echo b >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual
-
-ok 4 - reset $file
-
-expecting success of 7106.5 'reset -p': 
-	rm .git/index &&
-	git add a &&
-	echo y >yes &&
-	git reset -p <yes >output &&
-
-	git ls-files >actual &&
-	test_must_be_empty actual &&
-	test_grep "Unstage" output
-
-(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
-ok 5 - reset -p
-
-expecting success of 7106.6 'reset --soft is a no-op': 
-	rm .git/index &&
-	git add a &&
-	git reset --soft &&
-
-	echo a >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual
-
-ok 6 - reset --soft is a no-op
-
-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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7064-wtstatus-pv2.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7064-wtstatus-pv2/.git/
 expecting success of 7064.1 'setup': 
@@ -453569,6 +454497,180 @@
 1..28
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7105-reset-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+
+[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
+
+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
+
+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
+
+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
+
+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 @
+
+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 
+
+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
+
+(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^
+
+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
+
+(1/1) Apply deletion to index [y,n,q,a,d,p,?]? 
+ok 7 - git reset -p HEAD^^{tree}
+
+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
+
+fatal: Could not parse object 'HEAD^:dir/foo'.
+ok 8 - git reset -p HEAD^:dir/foo (blob fails)
+
+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
+
+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)
+
+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
+
+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 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
+
+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)
+
+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
+
+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
+
+expecting success of 7105.13 'none of this moved HEAD': 
+	verify_saved_head
+
+ok 13 - none of this moved HEAD
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7107-reset-pathspec-file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7107-reset-pathspec-file/.git/
 expecting success of 7107.1 'setup': 
@@ -453741,8 +454843,8 @@
 	verify_expect !
 
 HEAD is now at 4b301d4 Commit
---- expect	2025-08-27 08:22:31.196266977 +0000
-+++ actual	2025-08-27 08:22:31.196266977 +0000
+--- expect	2026-09-29 14:53:26.202548970 +0000
++++ actual	2026-09-29 14:53:26.202548970 +0000
 @@ -1 +0,0 @@
 - D fileA.t
 ok 9 - quotes not compatible with --pathspec-file-nul
@@ -453804,180 +454906,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7105-reset-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-
-[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
-
-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
-
-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
-
-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
-
-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 @
-
-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 
-
-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
-
-(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^
-
-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
-
-(1/1) Apply deletion to index [y,n,q,a,d,p,?]? 
-ok 7 - git reset -p HEAD^^{tree}
-
-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
-
-fatal: Could not parse object 'HEAD^:dir/foo'.
-ok 8 - git reset -p HEAD^:dir/foo (blob fails)
-
-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
-
-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)
-
-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
-
-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 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
-
-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)
-
-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
-
-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
-
-expecting success of 7105.13 'none of this moved HEAD': 
-	verify_saved_head
-
-ok 13 - none of this moved HEAD
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7113-post-index-change-hook.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7113-post-index-change-hook/.git/
 expecting success of 7113.1 'setup': 
@@ -456668,6 +457596,856 @@
 1..45
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7301-clean-interactive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7301-clean-interactive/.git/
+expecting success of 7301.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 7301.2 'git clean -i (c: clean hotkey)': 
+
+	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
+
+
+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)
+
+expecting success of 7301.3 'git clean -i (cl: clean prefix)': 
+
+	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
+
+
+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)
+
+expecting success of 7301.4 'git clean -i (quit)': 
+
+	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
+
+
+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)
+
+expecting success of 7301.5 'git clean -i (Ctrl+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 &&
+	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
+
+
+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)
+
+expecting success of 7301.6 'git clean -id (filter all)': 
+
+	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
+
+
+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 7301.7 'git clean -id (filter patterns)': 
+
+	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
+
+
+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 7301.8 'git clean -id (filter patterns 2)': 
+
+	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
+
+
+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)
+
+expecting success of 7301.9 'git clean -id (select - all)': 
+
+	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
+
+
+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)
+
+expecting success of 7301.10 'git clean -id (select - none)': 
+
+	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
+
+
+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)
+
+expecting success of 7301.11 'git clean -id (select - number)': 
+
+	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
+
+
+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 7301.12 'git clean -id (select - number 2)': 
+
+	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
+
+
+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 7301.13 'git clean -id (select - number 3)': 
+
+	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
+
+
+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)
+
+expecting success of 7301.14 'git clean -id (select - filenames)': 
+
+	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
+
+
+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)
+
+expecting success of 7301.15 'git clean -id (select - range)': 
+
+	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
+
+
+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)
+
+expecting success of 7301.16 'git clean -id (select - range 2)': 
+
+	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
+
+
+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)
+
+expecting success of 7301.17 'git clean -id (inverse select)': 
+
+	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
+
+
+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)
+
+expecting success of 7301.18 'git clean -id (ask)': 
+
+	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
+
+
+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)
+
+expecting success of 7301.19 'git clean -id (ask - Ctrl+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 &&
+	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
+
+
+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)
+
+expecting success of 7301.20 'git clean -id with prefix and path (filter)': 
+
+	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
+
+
+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)
+
+expecting success of 7301.21 'git clean -id with prefix and path (select by 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 &&
+	(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
+
+
+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)
+
+expecting success of 7301.22 'git clean -id with prefix and path (ask)': 
+
+	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
+
+
+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)
+
+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 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
+
+<BOLD>Would remove the following items:
+ok 23 - git clean -i paints the header in HEADER color
+
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7111-reset-table.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7111-reset-table/.git/
 expecting success of 7111.1 'creating initial commits': 
@@ -457801,856 +459579,6 @@
 1..42
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7301-clean-interactive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7301-clean-interactive/.git/
-expecting success of 7301.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 7301.2 'git clean -i (c: clean hotkey)': 
-
-	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
-
-
-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)
-
-expecting success of 7301.3 'git clean -i (cl: clean prefix)': 
-
-	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
-
-
-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)
-
-expecting success of 7301.4 'git clean -i (quit)': 
-
-	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
-
-
-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)
-
-expecting success of 7301.5 'git clean -i (Ctrl+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 &&
-	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
-
-
-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 7301.6 'git clean -id (filter all)': 
-
-	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
-
-
-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 7301.7 'git clean -id (filter patterns)': 
-
-	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
-
-
-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 7301.8 'git clean -id (filter patterns 2)': 
-
-	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
-
-
-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)
-
-expecting success of 7301.9 'git clean -id (select - all)': 
-
-	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
-
-
-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)
-
-expecting success of 7301.10 'git clean -id (select - none)': 
-
-	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
-
-
-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)
-
-expecting success of 7301.11 'git clean -id (select - number)': 
-
-	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
-
-
-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 7301.12 'git clean -id (select - number 2)': 
-
-	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
-
-
-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 7301.13 'git clean -id (select - number 3)': 
-
-	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
-
-
-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)
-
-expecting success of 7301.14 'git clean -id (select - filenames)': 
-
-	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
-
-
-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)
-
-expecting success of 7301.15 'git clean -id (select - range)': 
-
-	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
-
-
-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)
-
-expecting success of 7301.16 'git clean -id (select - range 2)': 
-
-	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
-
-
-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)
-
-expecting success of 7301.17 'git clean -id (inverse select)': 
-
-	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
-
-
-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)
-
-expecting success of 7301.18 'git clean -id (ask)': 
-
-	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
-
-
-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)
-
-expecting success of 7301.19 'git clean -id (ask - Ctrl+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 &&
-	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
-
-
-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)
-
-expecting success of 7301.20 'git clean -id with prefix and path (filter)': 
-
-	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
-
-
-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)
-
-expecting success of 7301.21 'git clean -id with prefix and path (select by 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 &&
-	(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
-
-
-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)
-
-expecting success of 7301.22 'git clean -id with prefix and path (ask)': 
-
-	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
-
-
-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)
-
-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 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
-
-<BOLD>Would remove the following items:
-ok 23 - git clean -i paints the header in HEADER color
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7004-tag.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7004-tag/.git/
 expecting success of 7004.1 'setup': 
@@ -462983,7 +463911,7 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7300-clean/strange_bare/.git/
 Skipping repository baz/boo
 Path exists:
-drwxr-xr-x 3 pbuilder1 pbuilder1 60 Aug 27 08:22 strange_bare
+drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 29 14:53 strange_bare
 not ok 36 - nested (empty) bare repositories should be cleaned even when in .git # TODO known breakage
 
 checking known breakage of 7300.37 'nested (non-empty) bare repositories should be cleaned even when in .git': 
@@ -462997,7 +463925,7 @@
 done.
 Skipping repository baz/boo
 Path exists:
-drwxr-xr-x 3 pbuilder1 pbuilder1 60 Aug 27 08:22 strange_bare
+drwxr-xr-x 3 pbuilder2 pbuilder2 60 Sep 29 14:53 strange_bare
 not ok 37 - nested (non-empty) bare repositories should be cleaned even when in .git # TODO known breakage
 
 expecting success of 7300.38 'giving path in nested git work tree will NOT remove it': 
@@ -464712,170 +465640,37 @@
 	EOF
 	test_cmp expected actual
 
-ok 22 - given commit
-
-expecting success of 7401.23 '--for-status': 
-	git submodule summary --for-status HEAD^ >actual &&
-	test_cmp - actual <<-EOF
-	* sm1 6858906...0000000:
-
-	* sm2 0000000...fa9eeaf (2):
-	  > Add foo9
-
-	EOF
-
-ok 23 - --for-status
-
-expecting success of 7401.24 '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 24 - fail when using --files together with --cached
-
-expecting success of 7401.25 '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.51.0/t/trash directory.t7401-submodule-summary/xyzzy/.git/
-ok 25 - should not fail in an empty repo
-
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7409-submodule-detached-work-tree.sh ***
-expecting success of 7409.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
-
-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
-		)
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7409-submodule-detached-work-tree/remote/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t7409-submodule-detached-work-tree/home2/../bundle1) registered for path '.vim/bundle/sogood'
-Cloning into '/build/reproducible-path/git-2.51.0/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 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
-	)
+ok 22 - given commit
 
-Cloning into bare repository '/build/reproducible-path/git-2.51.0/t/trash directory.t7409-submodule-detached-work-tree/home3/.dotfiles'...
-done.
-Already on 'main'
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7409-submodule-detached-work-tree/home3/../remote
-   2f89248..e996493  main -> main
-From /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7409-submodule-detached-work-tree/home/../bundle1) registered for path '.vim/bundle/dupe'
-Cloning into '/build/reproducible-path/git-2.51.0/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
+expecting success of 7401.23 '--for-status': 
+	git submodule summary --for-status HEAD^ >actual &&
+	test_cmp - actual <<-EOF
+	* sm1 6858906...0000000:
 
-# passed all 3 test(s)
-1..3
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
+
+	EOF
+
+ok 23 - --for-status
+
+expecting success of 7401.24 '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 24 - fail when using --files together with --cached
+
+expecting success of 7401.25 '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.51.0/t/trash directory.t7401-submodule-summary/xyzzy/.git/
+ok 25 - should not fail in an empty repo
+
+# passed all 25 test(s)
+1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7006-pager.sh ***
@@ -464955,8 +465750,8 @@
 	test_cmp expected actual
 
 ls: cannot access 'subdir/paginated.out': No such file or directory
---- expected	2025-08-27 08:22:26.252234362 +0000
-+++ actual	2025-08-27 08:22:26.352235021 +0000
+--- expected	2026-09-29 14:53:23.170548970 +0000
++++ actual	2026-09-29 14:53:23.222548970 +0000
 @@ -1 +1 @@
 -subdir/paginated.out
 +paginated.out
@@ -465827,7 +466622,7 @@
 		test_path_is_missing GIT_PAGER_used
 	
 Path exists:
--rw-r--r-- 1 pbuilder1 pbuilder1 24 Aug 27 08:22 GIT_PAGER_used
+-rw-r--r-- 1 pbuilder2 pbuilder2 24 Sep 29 14:53 GIT_PAGER_used
 not ok 81 - no pager for 'git -p nonsense' # TODO known breakage
 
 expecting success of 7006.82 'git shortlog - default pager is used by default': 
@@ -466135,7 +466930,7 @@
 	test_path_is_file pager-used
 
 died of signal 13 at /build/reproducible-path/git-2.51.0/t/test-terminal.perl line 33.
-child_exit[0] pid:790103 code:0 elapsed:0.011958
+child_exit[0] pid:2436860 code:0 elapsed:0.005339
 ok 104 - git returns SIGPIPE on early pager exit
 
 expecting success of 7006.105 'git returns SIGPIPE on early pager non-zero exit': 
@@ -466159,7 +466954,7 @@
 	test_path_is_file pager-used
 
 died of signal 13 at /build/reproducible-path/git-2.51.0/t/test-terminal.perl line 33.
-child_exit[0] pid:790460 code:1 elapsed:0.005198
+child_exit[0] pid:2437281 code:1 elapsed:0.006413
 ok 105 - git returns SIGPIPE on early pager non-zero exit
 
 expecting success of 7006.106 'git discards pager non-zero exit without SIGPIPE': 
@@ -466176,7 +466971,7 @@
 	grep " code:1 " child-exits &&
 	test_path_is_file pager-used
 
-child_exit[0] pid:790850 code:1 elapsed:0.024426
+child_exit[0] pid:2437645 code:1 elapsed:0.013942
 ok 106 - git discards pager non-zero exit without SIGPIPE
 
 expecting success of 7006.107 'git errors when asked to execute nonexisting pager': 
@@ -466209,7 +467004,7 @@
 	test_path_is_file pager-used
 
 died of signal 13 at /build/reproducible-path/git-2.51.0/t/test-terminal.perl line 33.
-child_exit[0] pid:791588 code:143 elapsed:0.013517
+child_exit[0] pid:2438461 code:143 elapsed:0.007674
 ok 108 - git returns SIGPIPE on propagated signals from pager
 
 expecting success of 7006.109 'non-existent pager doesnt cause crash': 
@@ -466225,6 +467020,1520 @@
 1..109
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7403-submodule-sync.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/.git/
+expecting success of 7403.1 'setup': 
+	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 &&
+	(
+		cd submodule &&
+		git submodule add ../submodule sub-submodule &&
+		test_tick &&
+		git commit -m "sub-submodule"
+	) &&
+	(
+		cd super &&
+		git submodule add ../submodule submodule &&
+		test_tick &&
+		git commit -m "submodule"
+	) &&
+	git clone super super-clone &&
+	(
+		cd super-clone &&
+		git submodule update --init --recursive
+	) &&
+	git clone super empty-clone &&
+	(
+		cd empty-clone &&
+		git submodule init
+	) &&
+	git clone super top-only-clone &&
+	git clone super relative-clone &&
+	(
+		cd relative-clone &&
+		git submodule update --init --recursive
+	) &&
+	git clone super recursive-clone &&
+	(
+		cd recursive-clone &&
+		git submodule update --init --recursive
+	)
+
+[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 '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule/sub-submodule'...
+done.
+[main 5a446ba] sub-submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub-submodule
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/super/submodule'...
+done.
+[main 78df3af] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+Cloning into 'super-clone'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/super-clone/submodule'...
+done.
+Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
+Submodule 'sub-submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/super-clone/submodule/sub-submodule'...
+done.
+Submodule path 'submodule/sub-submodule': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Cloning into 'empty-clone'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into 'top-only-clone'...
+done.
+Cloning into 'relative-clone'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/relative-clone/submodule'...
+done.
+Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
+Submodule 'sub-submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/relative-clone/submodule/sub-submodule'...
+done.
+Submodule path 'submodule/sub-submodule': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Cloning into 'recursive-clone'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/recursive-clone/submodule'...
+done.
+Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
+Submodule 'sub-submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/recursive-clone/submodule/sub-submodule'...
+done.
+Submodule path 'submodule/sub-submodule': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+ok 1 - setup
+
+expecting success of 7403.2 'change submodule': 
+	(
+		cd submodule &&
+		echo second line >>file &&
+		test_tick &&
+		git commit -a -m "change submodule"
+	)
+
+[main c61fc01] change submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 2 - change submodule
+
+expecting success of 7403.3 'change submodule url': 
+	(
+		cd super &&
+		cd submodule &&
+		git checkout main &&
+		git pull
+	) &&
+	mv submodule moved-submodule &&
+	(
+		cd moved-submodule &&
+		git config -f .gitmodules submodule.sub-submodule.url ../moved-submodule &&
+		test_tick &&
+		git commit -a -m moved-sub-submodule
+	) &&
+	(
+		cd super &&
+		git config -f .gitmodules submodule.submodule.url ../moved-submodule &&
+		test_tick &&
+		git commit -a -m moved-submodule
+	)
+
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule
+   5a446ba..c61fc01  main       -> origin/main
+Updating 5a446ba..c61fc01
+Fast-forward
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+[main 9f583c0] moved-sub-submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main f2e88dd] moved-submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 3 - change submodule url
+
+expecting success of 7403.4 '"git submodule sync" should update submodule URLs': 
+	(
+		cd super-clone &&
+		git pull --no-recurse-submodules &&
+		git submodule sync
+	) &&
+	test -d "$(
+		cd super-clone/submodule &&
+		git config remote.origin.url
+	)" &&
+	test ! -d "$(
+		cd super-clone/submodule/sub-submodule &&
+		git config remote.origin.url
+	)" &&
+	(
+		cd super-clone/submodule &&
+		git checkout main &&
+		git pull
+	) &&
+	(
+		cd super-clone &&
+		test -d "$(git config submodule.submodule.url)"
+	)
+
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/super
+   78df3af..f2e88dd  main       -> origin/main
+Updating 78df3af..f2e88dd
+Fast-forward
+ .gitmodules | 2 +-
+ submodule   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Synchronizing submodule url for 'submodule'
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/moved-submodule
+   5a446ba..9f583c0  main       -> origin/main
+Updating 5a446ba..9f583c0
+Fast-forward
+ .gitmodules | 2 +-
+ file        | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ok 4 - "git submodule sync" should update submodule URLs
+
+expecting success of 7403.5 '"git submodule sync --recursive" should update all submodule URLs': 
+	(
+		cd super-clone &&
+		(
+			cd submodule &&
+			git pull --no-recurse-submodules
+		) &&
+		git submodule sync --recursive
+	) &&
+	test -d "$(
+		cd super-clone/submodule &&
+		git config remote.origin.url
+	)" &&
+	test -d "$(
+		cd super-clone/submodule/sub-submodule &&
+		git config remote.origin.url
+	)" &&
+	(
+		cd super-clone/submodule/sub-submodule &&
+		git checkout main &&
+		git pull
+	)
+
+Already up to date.
+Synchronizing submodule url for 'submodule'
+Synchronizing submodule url for 'submodule/sub-submodule'
+Previous HEAD position was 0c90624 upstream
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/moved-submodule
+   5a446ba..9f583c0  main       -> origin/main
+Updating 5a446ba..9f583c0
+Fast-forward
+ .gitmodules | 2 +-
+ file        | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ok 5 - "git submodule sync --recursive" should update all submodule URLs
+
+expecting success of 7403.6 'reset submodule URLs': 
+	reset_submodule_urls super-clone
+
+ok 6 - reset submodule URLs
+
+expecting success of 7403.7 '"git submodule sync" should update submodule URLs - subdirectory': 
+	(
+		cd super-clone &&
+		git pull --no-recurse-submodules &&
+		mkdir -p sub &&
+		cd sub &&
+		git submodule sync >../../output
+	) &&
+	test_grep "\\.\\./submodule" output &&
+	test -d "$(
+		cd super-clone/submodule &&
+		git config remote.origin.url
+	)" &&
+	test ! -d "$(
+		cd super-clone/submodule/sub-submodule &&
+		git config remote.origin.url
+	)" &&
+	(
+		cd super-clone/submodule &&
+		git checkout main &&
+		git pull
+	) &&
+	(
+		cd super-clone &&
+		test -d "$(git config submodule.submodule.url)"
+	)
+
+Already up to date.
+Synchronizing submodule url for '../submodule'
+Already on 'main'
+M	sub-submodule
+Your branch is up to date with 'origin/main'.
+Already up to date.
+ok 7 - "git submodule sync" should update submodule URLs - subdirectory
+
+expecting success of 7403.8 '"git submodule sync --recursive" should update all submodule URLs - subdirectory': 
+	(
+		cd super-clone &&
+		(
+			cd submodule &&
+			git pull --no-recurse-submodules
+		) &&
+		mkdir -p sub &&
+		cd sub &&
+		git submodule sync --recursive >../../output
+	) &&
+	test_grep "\\.\\./submodule/sub-submodule" output &&
+	test -d "$(
+		cd super-clone/submodule &&
+		git config remote.origin.url
+	)" &&
+	test -d "$(
+		cd super-clone/submodule/sub-submodule &&
+		git config remote.origin.url
+	)" &&
+	(
+		cd super-clone/submodule/sub-submodule &&
+		git checkout main &&
+		git pull
+	)
+
+Already up to date.
+Synchronizing submodule url for '../submodule/sub-submodule'
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+Already up to date.
+ok 8 - "git submodule sync --recursive" should update all submodule URLs - subdirectory
+
+expecting success of 7403.9 '"git submodule sync" should update known submodule URLs': 
+	(
+		cd empty-clone &&
+		git pull &&
+		git submodule sync &&
+		test -d "$(git config submodule.submodule.url)"
+	)
+
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/super
+   78df3af..f2e88dd  main       -> origin/main
+Could not access submodule 'submodule' at commit f2e88dd
+Updating 78df3af..f2e88dd
+Fast-forward
+ .gitmodules | 2 +-
+ submodule   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Synchronizing submodule url for 'submodule'
+ok 9 - "git submodule sync" should update known submodule URLs
+
+expecting success of 7403.10 '"git submodule sync" should not vivify uninteresting submodule': 
+	(
+		cd top-only-clone &&
+		git pull &&
+		git submodule sync &&
+		test -z "$(git config submodule.submodule.url)" &&
+		git submodule sync submodule &&
+		test -z "$(git config submodule.submodule.url)"
+	)
+
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/super
+   78df3af..f2e88dd  main       -> origin/main
+Updating 78df3af..f2e88dd
+Fast-forward
+ .gitmodules | 2 +-
+ submodule   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 10 - "git submodule sync" should not vivify uninteresting submodule
+
+expecting success of 7403.11 '"git submodule sync" handles origin URL of the form foo': 
+	(
+		cd relative-clone &&
+		git remote set-url origin foo &&
+		git submodule sync &&
+		(
+			cd submodule &&
+			#actual fails with: "cannot strip off url foo
+			test "$(git config remote.origin.url)" = "../submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+ok 11 - "git submodule sync" handles origin URL of the form foo
+
+expecting success of 7403.12 '"git submodule sync" handles origin URL of the form foo/bar': 
+	(
+		cd relative-clone &&
+		git remote set-url origin foo/bar &&
+		git submodule sync &&
+		(
+			cd submodule &&
+			#actual foo/submodule
+			test "$(git config remote.origin.url)" = "../foo/submodule"
+		) &&
+		(
+			cd submodule/sub-submodule &&
+			test "$(git config remote.origin.url)" != "../../foo/submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+ok 12 - "git submodule sync" handles origin URL of the form foo/bar
+
+expecting success of 7403.13 '"git submodule sync --recursive" propagates changes in origin': 
+	(
+		cd recursive-clone &&
+		git remote set-url origin foo/bar &&
+		git submodule sync --recursive &&
+		(
+			cd submodule &&
+			#actual foo/submodule
+			test "$(git config remote.origin.url)" = "../foo/submodule"
+		) &&
+		(
+			cd submodule/sub-submodule &&
+			test "$(git config remote.origin.url)" = "../../foo/submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+Synchronizing submodule url for 'submodule/sub-submodule'
+ok 13 - "git submodule sync --recursive" propagates changes in origin
+
+expecting success of 7403.14 '"git submodule sync" handles origin URL of the form ./foo': 
+	(
+		cd relative-clone &&
+		git remote set-url origin ./foo &&
+		git submodule sync &&
+		(
+			cd submodule &&
+			#actual ./submodule
+			test "$(git config remote.origin.url)" = "../submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+ok 14 - "git submodule sync" handles origin URL of the form ./foo
+
+expecting success of 7403.15 '"git submodule sync" handles origin URL of the form ./foo/bar': 
+	(
+		cd relative-clone &&
+		git remote set-url origin ./foo/bar &&
+		git submodule sync &&
+		(
+			cd submodule &&
+			#actual ./foo/submodule
+			test "$(git config remote.origin.url)" = "../foo/submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+ok 15 - "git submodule sync" handles origin URL of the form ./foo/bar
+
+expecting success of 7403.16 '"git submodule sync" handles origin URL of the form ../foo': 
+	(
+		cd relative-clone &&
+		git remote set-url origin ../foo &&
+		git submodule sync &&
+		(
+			cd submodule &&
+			#actual ../submodule
+			test "$(git config remote.origin.url)" = "../../submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+ok 16 - "git submodule sync" handles origin URL of the form ../foo
+
+expecting success of 7403.17 '"git submodule sync" handles origin URL of the form ../foo/bar': 
+	(
+		cd relative-clone &&
+		git remote set-url origin ../foo/bar &&
+		git submodule sync &&
+		(
+			cd submodule &&
+			#actual ../foo/submodule
+			test "$(git config remote.origin.url)" = "../../foo/submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+ok 17 - "git submodule sync" handles origin URL of the form ../foo/bar
+
+expecting success of 7403.18 '"git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule': 
+	(
+		cd relative-clone &&
+		git remote set-url origin ../foo/bar &&
+		mkdir -p a/b/c &&
+		(
+			cd a/b/c &&
+			git init &&
+			>.gitignore &&
+			git add .gitignore &&
+			test_tick &&
+			git commit -m "initial commit"
+		) &&
+		git submodule add ../bar/a/b/c ./a/b/c &&
+		git submodule sync &&
+		(
+			cd a/b/c &&
+			#actual ../foo/bar/a/b/c
+			test "$(git config remote.origin.url)" = "../../../../foo/bar/a/b/c"
+		)
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/relative-clone/a/b/c/.git/
+[main (root-commit) 1f9e67a] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 .gitignore
+Adding existing repo at 'a/b/c' to the index
+Synchronizing submodule url for 'a/b/c'
+Synchronizing submodule url for 'submodule'
+ok 18 - "git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7409-submodule-detached-work-tree.sh ***
+expecting success of 7409.1 'setup': 
+	git config --global protocol.file.allow always
+
+ok 1 - setup
+
+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
+		)
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7409-submodule-detached-work-tree/remote/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t7409-submodule-detached-work-tree/home2/../bundle1) registered for path '.vim/bundle/sogood'
+Cloning into '/build/reproducible-path/git-2.51.0/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 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
+	)
+
+Cloning into bare repository '/build/reproducible-path/git-2.51.0/t/trash directory.t7409-submodule-detached-work-tree/home3/.dotfiles'...
+done.
+Already on 'main'
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7409-submodule-detached-work-tree/home3/../remote
+   2f89248..e996493  main -> main
+From /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7409-submodule-detached-work-tree/home/../bundle1) registered for path '.vim/bundle/dupe'
+Cloning into '/build/reproducible-path/git-2.51.0/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
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7411-submodule-config.sh ***
+expecting success of 7411.1 'setup': 
+	git config --global protocol.file.allow always
+
+ok 1 - setup
+
+expecting success of 7411.2 'submodule config cache setup': 
+	mkdir submodule &&
+	(cd submodule &&
+		git init &&
+		echo a >a &&
+		git add . &&
+		git commit -ma
+	) &&
+	mkdir super &&
+	(cd super &&
+		git init &&
+		git submodule add ../submodule &&
+		git submodule add ../submodule a &&
+		git commit -m "add as submodule and as a" &&
+		git mv a b &&
+		git commit -m "move a to b"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/submodule/.git/
+[master (root-commit) 7bdc13c] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/super/.git/
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/super/submodule'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/super/a'...
+done.
+[master (root-commit) 27cd28d] add as submodule and as a
+ Author: A U Thor <author@example.com>
+ 3 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 a
+ create mode 160000 submodule
+[master c15eddb] move a to b
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename a => b (100%)
+ok 2 - submodule config cache setup
+
+expecting success of 7411.3 'configuration parsing with error': 
+	test_when_finished "rm -rf repo" &&
+	test_create_repo repo &&
+	cat >repo/.gitmodules <<-\EOF &&
+	[submodule "s"]
+		path
+		ignore
+	EOF
+	(
+		cd repo &&
+		test_must_fail test-tool submodule-config "" s 2>actual &&
+		test_grep "bad config" actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/repo/.git/
+fatal: bad config line 2 in file /build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/repo/.gitmodules
+ok 3 - configuration parsing with error
+
+expecting success of 7411.4 'test parsing and lookup of submodule config by path': 
+	(cd super &&
+		test-tool submodule-config \
+			HEAD^ a \
+			HEAD b \
+			HEAD^ submodule \
+			HEAD submodule \
+				>actual &&
+		test_cmp expect actual
+	)
+
+ok 4 - test parsing and lookup of submodule config by path
+
+expecting success of 7411.5 'test parsing and lookup of submodule config by name': 
+	(cd super &&
+		test-tool submodule-config --name \
+			HEAD^ a \
+			HEAD a \
+			HEAD^ submodule \
+			HEAD submodule \
+				>actual &&
+		test_cmp expect actual
+	)
+
+ok 5 - test parsing and lookup of submodule config by name
+
+expecting success of 7411.6 'error in history of one submodule config lets continue, stderr message contains blob ref': 
+	ORIG=$(git -C super rev-parse HEAD) &&
+	test_when_finished "git -C super reset --hard $ORIG" &&
+	(cd super &&
+		cp .gitmodules .gitmodules.bak &&
+		echo "	value = \"" >>.gitmodules &&
+		git add .gitmodules &&
+		mv .gitmodules.bak .gitmodules &&
+		git commit -m "add error" &&
+		sha1=$(git rev-parse HEAD) &&
+		test-tool submodule-config \
+			HEAD b \
+			HEAD submodule \
+				>actual \
+				2>actual_stderr &&
+		test_cmp expect_error actual &&
+		test_grep "submodule-blob $sha1:.gitmodules" actual_stderr >/dev/null
+	)
+
+[master a5e5db0] add error
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+HEAD is now at c15eddb move a to b
+ok 6 - error in history of one submodule config lets continue, stderr message contains blob ref
+
+expecting success of 7411.7 'using different treeishs works': 
+	(
+		cd super &&
+		git tag new_tag &&
+		tree=$(git rev-parse HEAD^{tree}) &&
+		commit=$(git rev-parse HEAD^{commit}) &&
+		test-tool submodule-config $commit b >expect &&
+		test-tool submodule-config $tree b >actual.1 &&
+		test-tool submodule-config new_tag b >actual.2 &&
+		test_cmp expect actual.1 &&
+		test_cmp expect actual.2
+	)
+
+ok 7 - using different treeishs works
+
+expecting success of 7411.8 'error in history in fetchrecursesubmodule lets continue': 
+	ORIG=$(git -C super rev-parse HEAD) &&
+	test_when_finished "git -C super reset --hard $ORIG" &&
+	(cd super &&
+		git config -f .gitmodules \
+			submodule.submodule.fetchrecursesubmodules blabla &&
+		git add .gitmodules &&
+		git config --unset -f .gitmodules \
+			submodule.submodule.fetchrecursesubmodules &&
+		git commit -m "add error in fetchrecursesubmodules" &&
+		test-tool submodule-config \
+			HEAD b \
+			HEAD submodule \
+				>actual &&
+		test_cmp expect_error actual
+	)
+
+[master ea57126] add error in fetchrecursesubmodules
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+HEAD is now at c15eddb move a to b
+ok 8 - error in history in fetchrecursesubmodule lets continue
+
+expecting success of 7411.9 'reading submodules config from the working tree': 
+	(cd super &&
+		echo "../submodule" >expect &&
+		test-tool submodule config-list submodule.submodule.url >actual &&
+		test_cmp expect actual
+	)
+
+ok 9 - reading submodules config from the working tree
+
+expecting success of 7411.10 'unsetting submodules config from the working tree': 
+	(cd super &&
+		test-tool submodule config-unset submodule.submodule.url &&
+		test-tool submodule config-list submodule.submodule.url >actual &&
+		test_must_be_empty actual
+	)
+
+ok 10 - unsetting submodules config from the working tree
+
+expecting success of 7411.11 'writing submodules config': 
+	(cd super &&
+		echo "new_url" >expect &&
+		test-tool submodule config-set submodule.submodule.url "new_url" &&
+		test-tool submodule config-list submodule.submodule.url >actual &&
+		test_cmp expect actual
+	)
+
+ok 11 - writing submodules config
+
+expecting success of 7411.12 'overwriting unstaged submodules config': 
+	test_when_finished "git -C super checkout .gitmodules" &&
+	(cd super &&
+		echo "newer_url" >expect &&
+		test-tool submodule config-set submodule.submodule.url "newer_url" &&
+		test-tool submodule config-list submodule.submodule.url >actual &&
+		test_cmp expect actual
+	)
+
+Updated 1 path from the index
+ok 12 - overwriting unstaged submodules config
+
+expecting success of 7411.13 'writeable .gitmodules when it is in the working tree': 
+	test-tool -C super submodule config-writeable
+
+ok 13 - writeable .gitmodules when it is in the working tree
+
+expecting success of 7411.14 'writeable .gitmodules when it is nowhere in the repository': 
+	ORIG=$(git -C super rev-parse HEAD) &&
+	test_when_finished "git -C super reset --hard $ORIG" &&
+	(cd super &&
+		git rm .gitmodules &&
+		git commit -m "remove .gitmodules from the current branch" &&
+		test-tool submodule config-writeable
+	)
+
+rm '.gitmodules'
+[master d504b72] remove .gitmodules from the current branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 6 deletions(-)
+ delete mode 100644 .gitmodules
+HEAD is now at c15eddb move a to b
+ok 14 - writeable .gitmodules when it is nowhere in the repository
+
+expecting success of 7411.15 'non-writeable .gitmodules when it is in the index but not in the working tree': 
+	test_when_finished "git -C super checkout .gitmodules" &&
+	(cd super &&
+		rm -f .gitmodules &&
+		test_must_fail test-tool submodule config-writeable
+	)
+
+Updated 1 path from the index
+ok 15 - non-writeable .gitmodules when it is in the index but not in the working tree
+
+expecting success of 7411.16 'non-writeable .gitmodules when it is in the current branch but not in the index': 
+	ORIG=$(git -C super rev-parse HEAD) &&
+	test_when_finished "git -C super reset --hard $ORIG" &&
+	(cd super &&
+		git rm .gitmodules &&
+		test_must_fail test-tool submodule config-writeable
+	)
+
+rm '.gitmodules'
+HEAD is now at c15eddb move a to b
+ok 16 - non-writeable .gitmodules when it is in the current branch but not in the index
+
+expecting success of 7411.17 'reading submodules config from the index when .gitmodules is not in the working tree': 
+	ORIG=$(git -C super rev-parse HEAD) &&
+	test_when_finished "git -C super reset --hard $ORIG" &&
+	(cd super &&
+		test-tool submodule config-set submodule.submodule.url "staged_url" &&
+		git add .gitmodules &&
+		rm -f .gitmodules &&
+		echo "staged_url" >expect &&
+		test-tool submodule config-list submodule.submodule.url >actual &&
+		test_cmp expect actual
+	)
+
+HEAD is now at c15eddb move a to b
+ok 17 - reading submodules config from the index when .gitmodules is not in the working tree
+
+expecting success of 7411.18 'reading submodules config from the current branch when .gitmodules is not in the index': 
+	ORIG=$(git -C super rev-parse HEAD) &&
+	test_when_finished "git -C super reset --hard $ORIG" &&
+	(cd super &&
+		git rm .gitmodules &&
+		echo "../submodule" >expect &&
+		test-tool submodule config-list submodule.submodule.url >actual &&
+		test_cmp expect actual
+	)
+
+rm '.gitmodules'
+HEAD is now at c15eddb move a to b
+ok 18 - reading submodules config from the current branch when .gitmodules is not in the index
+
+expecting success of 7411.19 'reading nested submodules config': 
+	(cd super &&
+		git init submodule/nested_submodule &&
+		echo "a" >submodule/nested_submodule/a &&
+		git -C submodule/nested_submodule add a &&
+		git -C submodule/nested_submodule commit -m "add a" &&
+		git -C submodule submodule add ./nested_submodule &&
+		git -C submodule add nested_submodule &&
+		git -C submodule commit -m "added nested_submodule" &&
+		git add submodule &&
+		git commit -m "updated submodule" &&
+		echo "./nested_submodule" >expect &&
+		test-tool submodule-nested-repo-config \
+			submodule submodule.nested_submodule.url >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/super/submodule/nested_submodule/.git/
+[master (root-commit) 925677c] add a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+Adding existing repo at 'nested_submodule' to the index
+[master 62f7fd8] added nested_submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 nested_submodule
+[master c00b231] updated submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 19 - reading nested submodules config
+
+expecting success of 7411.20 'reading nested submodules config when .gitmodules is not in the working tree': 
+	test_when_finished "git -C super/submodule checkout .gitmodules" &&
+	(cd super &&
+		echo "./nested_submodule" >expect &&
+		rm submodule/.gitmodules &&
+		test-tool submodule-nested-repo-config \
+			submodule submodule.nested_submodule.url >actual 2>warning &&
+		test_must_be_empty warning &&
+		test_cmp expect actual
+	)
+
+Updated 1 path from the index
+ok 20 - reading nested submodules config when .gitmodules is not in the working tree
+
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7408-submodule-reference.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/.git/
+expecting success of 7408.1 'setup': 
+	git config --global protocol.file.allow always
+
+ok 1 - setup
+
+expecting success of 7408.2 'preparing first repository': 
+	test_create_repo A &&
+	(
+		cd A &&
+		echo first >file1 &&
+		git add file1 &&
+		git commit -m A-initial
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A/.git/
+[master (root-commit) 3f492fa] A-initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+ok 2 - preparing first repository
+
+expecting success of 7408.3 'preparing second repository': 
+	git clone A B &&
+	(
+		cd B &&
+		echo second >file2 &&
+		git add file2 &&
+		git commit -m B-addition &&
+		git repack -a -d &&
+		git prune
+	)
+
+Cloning into 'B'...
+done.
+[master c9a83e7] B-addition
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+ok 3 - preparing second repository
+
+expecting success of 7408.4 'preparing superproject': 
+	test_create_repo super &&
+	(
+		cd super &&
+		echo file >file &&
+		git add file &&
+		git commit -m B-super-initial
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super/.git/
+[master (root-commit) 0776138] B-super-initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 4 - preparing superproject
+
+expecting success of 7408.5 'submodule add --reference uses alternates': 
+	(
+		cd super &&
+		git submodule add --reference ../B "file://$base_dir/A" sub &&
+		git commit -m B-super-added &&
+		git repack -ad
+	) &&
+	test_alternate_is_used super/.git/modules/sub/objects/info/alternates super/sub
+
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super/sub'...
+[master 31bbe3e] B-super-added
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 5 - submodule add --reference uses alternates
+
+expecting success of 7408.6 'submodule add --reference with --dissociate does not use alternates': 
+	(
+		cd super &&
+		git submodule add --reference ../B --dissociate "file://$base_dir/A" sub-dissociate &&
+		git commit -m B-super-added &&
+		git repack -ad
+	) &&
+	test_path_is_missing super/.git/modules/sub-dissociate/objects/info/alternates
+
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super/sub-dissociate'...
+[master 4c47568] B-super-added
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 sub-dissociate
+ok 6 - submodule add --reference with --dissociate does not use alternates
+
+expecting success of 7408.7 'that reference gets used with add': 
+	(
+		cd super/sub &&
+		echo "0 objects, 0 kilobytes" >expected &&
+		git count-objects >current &&
+		diff expected current
+	)
+
+ok 7 - that reference gets used with add
+
+expecting success of 7408.8 'updating superproject keeps alternates': 
+	test_when_finished "rm -rf super-clone" &&
+	git clone super super-clone &&
+	git -C super-clone submodule update --init --reference ../B &&
+	test_alternate_is_used super-clone/.git/modules/sub/objects/info/alternates super-clone/sub
+
+Cloning into 'super-clone'...
+done.
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
+Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+ok 8 - updating superproject keeps alternates
+
+expecting success of 7408.9 'updating superproject with --dissociate does not keep alternates': 
+	test_when_finished "rm -rf super-clone" &&
+	git clone super super-clone &&
+	git -C super-clone submodule update --init --reference ../B --dissociate &&
+	test_path_is_missing super-clone/.git/modules/sub/objects/info/alternates
+
+Cloning into 'super-clone'...
+done.
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
+Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+ok 9 - updating superproject with --dissociate does not keep alternates
+
+expecting success of 7408.10 'submodules use alternates when cloning a superproject': 
+	test_when_finished "rm -rf super-clone" &&
+	git clone --reference super --recursive super super-clone &&
+	(
+		cd super-clone &&
+		# test superproject has alternates setup correctly
+		test_alternate_is_used .git/objects/info/alternates . &&
+		# test submodule has correct setup
+		test_alternate_is_used .git/modules/sub/objects/info/alternates sub
+	)
+
+Cloning into 'super-clone'...
+done.
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
+Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+ok 10 - submodules use alternates when cloning a superproject
+
+expecting success of 7408.11 'missing submodule alternate fails clone and submodule update': 
+	test_when_finished "rm -rf super-clone" &&
+	git clone super super2 &&
+	test_must_fail git clone --recursive --reference super2 super2 super-clone &&
+	(
+		cd super-clone &&
+		# test superproject has alternates setup correctly
+		test_alternate_is_used .git/objects/info/alternates . &&
+		# update of the submodule succeeds
+		test_must_fail git submodule update --init &&
+		# and we have no alternates:
+		test_path_is_missing .git/modules/sub/objects/info/alternates &&
+		test_path_is_missing sub/file1
+	)
+
+Cloning into 'super2'...
+done.
+Cloning into 'super-clone'...
+done.
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Failed to clone 'sub'. Retry scheduled
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
+Failed to clone 'sub-dissociate'. Retry scheduled
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Failed to clone 'sub' a second time, aborting
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Failed to clone 'sub'. Retry scheduled
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
+Failed to clone 'sub-dissociate'. Retry scheduled
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Failed to clone 'sub' a second time, aborting
+ok 11 - missing submodule alternate fails clone and submodule update
+
+expecting success of 7408.12 'ignoring missing submodule alternates passes clone and submodule update': 
+	test_when_finished "rm -rf super-clone" &&
+	git clone --reference-if-able super2 --recursive super2 super-clone &&
+	(
+		cd super-clone &&
+		# test superproject has alternates setup correctly
+		test_alternate_is_used .git/objects/info/alternates . &&
+		# update of the submodule succeeds
+		git submodule update --init &&
+		# and we have no alternates:
+		test_path_is_missing .git/modules/sub/objects/info/alternates &&
+		test_path_is_file sub/file1
+	)
+
+Cloning into 'super-clone'...
+done.
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub'...
+submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
+Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+ok 12 - ignoring missing submodule alternates passes clone and submodule update
+
+expecting success of 7408.13 'preparing second superproject with a nested submodule plus partial clone': 
+	test_create_repo supersuper &&
+	(
+		cd supersuper &&
+		echo "I am super super." >file &&
+		git add file &&
+		git commit -m B-super-super-initial &&
+		git submodule add "file://$base_dir/super" subwithsub &&
+		git commit -m B-super-super-added &&
+		git submodule update --init --recursive &&
+		git repack -ad
+	) &&
+	git clone supersuper supersuper2 &&
+	(
+		cd supersuper2 &&
+		git submodule update --init
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper/.git/
+[master (root-commit) c928525] B-super-super-initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper/subwithsub'...
+[master f2e98ca] B-super-super-added
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subwithsub
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper/subwithsub/sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper/subwithsub/sub-dissociate'...
+Submodule path 'subwithsub/sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'subwithsub/sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Cloning into 'supersuper2'...
+done.
+Submodule 'subwithsub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper2/subwithsub'...
+Submodule path 'subwithsub': checked out '4c47568e781c1989adcf9971f2d77e21198845d9'
+ok 13 - preparing second superproject with a nested submodule plus partial clone
+
+expecting success of 7408.14 'nested submodule alternate in works and is actually used': 
+	test_when_finished "rm -rf supersuper-clone" &&
+	git clone --recursive --reference supersuper supersuper supersuper-clone &&
+	(
+		cd supersuper-clone &&
+		# test superproject has alternates setup correctly
+		test_alternate_is_used .git/objects/info/alternates . &&
+		# immediate submodule has alternate:
+		test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub &&
+		# nested submodule also has alternate:
+		test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub
+	)
+
+Cloning into 'supersuper-clone'...
+done.
+Submodule 'subwithsub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
+Submodule path 'subwithsub': checked out '4c47568e781c1989adcf9971f2d77e21198845d9'
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub-dissociate'...
+Submodule path 'subwithsub/sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'subwithsub/sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+ok 14 - nested submodule alternate in works and is actually used
+
+expecting success of 7408.15 'missing nested submodule alternate fails clone and submodule update': 
+	test_when_finished "rm -rf supersuper-clone" &&
+	test_must_fail git clone --recursive --reference supersuper2 supersuper2 supersuper-clone &&
+	(
+		cd supersuper-clone &&
+		check_that_two_of_three_alternates_are_used &&
+		# update of the submodule fails
+		cat >expect <<-\EOF &&
+		fatal: submodule 'sub' cannot add alternate: path ... does not exist
+		Failed to clone 'sub'. Retry scheduled
+		fatal: submodule 'sub-dissociate' cannot add alternate: path ... does not exist
+		Failed to clone 'sub-dissociate'. Retry scheduled
+		fatal: submodule 'sub' cannot add alternate: path ... does not exist
+		Failed to clone 'sub' a second time, aborting
+		fatal: Failed to recurse into submodule path ...
+		EOF
+		test_must_fail git submodule update --init --recursive 2>err &&
+		grep -e fatal: -e ^Failed err >actual.raw &&
+		sed -e "s/path $SQ[^$SQ]*$SQ/path .../" <actual.raw >actual &&
+		test_cmp expect actual
+	)
+
+Cloning into 'supersuper-clone'...
+done.
+Submodule 'subwithsub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
+Submodule path 'subwithsub': checked out '4c47568e781c1989adcf9971f2d77e21198845d9'
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
+Failed to clone 'sub'. Retry scheduled
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
+Failed to clone 'sub-dissociate'. Retry scheduled
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
+Failed to clone 'sub' a second time, aborting
+fatal: Failed to recurse into submodule path 'subwithsub'
+ok 15 - missing nested submodule alternate fails clone and submodule update
+
+expecting success of 7408.16 'missing nested submodule alternate in --reference-if-able mode': 
+	test_when_finished "rm -rf supersuper-clone" &&
+	git clone --recursive --reference-if-able supersuper2 supersuper2 supersuper-clone &&
+	(
+		cd supersuper-clone &&
+		check_that_two_of_three_alternates_are_used &&
+		# update of the submodule succeeds
+		git submodule update --init --recursive
+	)
+
+Cloning into 'supersuper-clone'...
+done.
+Submodule 'subwithsub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
+Submodule path 'subwithsub': checked out '4c47568e781c1989adcf9971f2d77e21198845d9'
+Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
+submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub'...
+submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub-dissociate'...
+Submodule path 'subwithsub/sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'subwithsub/sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+ok 16 - missing nested submodule alternate in --reference-if-able mode
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7413-submodule-is-active.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t7413-submodule-is-active/super/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t/trash directory.t7413-submodule-is-active/super2/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7413-submodule-is-active/super2/mod'...
+done.
+true
+ok 9 - is-active, submodule.active and submodule add
+
+expecting success of 7413.10 'submodule add skips redundant active entry': 
+	git init repo &&
+	(
+		cd repo &&
+		git config submodule.active "lib/*" &&
+		git commit --allow-empty -m init &&
+
+		git init ../lib-origin &&
+		git -C ../lib-origin commit --allow-empty -m init &&
+
+		git submodule add ../lib-origin lib/foo &&
+		test_must_fail git config --get submodule.lib/foo.active
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7413-submodule-is-active/repo/.git/
+[master (root-commit) edb5fba] init
+ Author: A U Thor <author@example.com>
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7413-submodule-is-active/lib-origin/.git/
+[master (root-commit) edb5fba] init
+ Author: A U Thor <author@example.com>
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7413-submodule-is-active/repo/lib/foo'...
+done.
+ok 10 - submodule add skips redundant active entry
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6423-merge-rename-directories.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6423-merge-rename-directories/.git/
 expecting success of 6423.1 '1a: Simple directory rename detection': 
@@ -471784,502 +474093,6 @@
 1..77
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7403-submodule-sync.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/.git/
-expecting success of 7403.1 'setup': 
-	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 &&
-	(
-		cd submodule &&
-		git submodule add ../submodule sub-submodule &&
-		test_tick &&
-		git commit -m "sub-submodule"
-	) &&
-	(
-		cd super &&
-		git submodule add ../submodule submodule &&
-		test_tick &&
-		git commit -m "submodule"
-	) &&
-	git clone super super-clone &&
-	(
-		cd super-clone &&
-		git submodule update --init --recursive
-	) &&
-	git clone super empty-clone &&
-	(
-		cd empty-clone &&
-		git submodule init
-	) &&
-	git clone super top-only-clone &&
-	git clone super relative-clone &&
-	(
-		cd relative-clone &&
-		git submodule update --init --recursive
-	) &&
-	git clone super recursive-clone &&
-	(
-		cd recursive-clone &&
-		git submodule update --init --recursive
-	)
-
-[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 '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule/sub-submodule'...
-done.
-[main 5a446ba] sub-submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub-submodule
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/super/submodule'...
-done.
-[main 78df3af] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-Cloning into 'super-clone'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/super-clone/submodule'...
-done.
-Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
-Submodule 'sub-submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/super-clone/submodule/sub-submodule'...
-done.
-Submodule path 'submodule/sub-submodule': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Cloning into 'empty-clone'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into 'top-only-clone'...
-done.
-Cloning into 'relative-clone'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/relative-clone/submodule'...
-done.
-Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
-Submodule 'sub-submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/relative-clone/submodule/sub-submodule'...
-done.
-Submodule path 'submodule/sub-submodule': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Cloning into 'recursive-clone'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/recursive-clone/submodule'...
-done.
-Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
-Submodule 'sub-submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/recursive-clone/submodule/sub-submodule'...
-done.
-Submodule path 'submodule/sub-submodule': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-ok 1 - setup
-
-expecting success of 7403.2 'change submodule': 
-	(
-		cd submodule &&
-		echo second line >>file &&
-		test_tick &&
-		git commit -a -m "change submodule"
-	)
-
-[main c61fc01] change submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 2 - change submodule
-
-expecting success of 7403.3 'change submodule url': 
-	(
-		cd super &&
-		cd submodule &&
-		git checkout main &&
-		git pull
-	) &&
-	mv submodule moved-submodule &&
-	(
-		cd moved-submodule &&
-		git config -f .gitmodules submodule.sub-submodule.url ../moved-submodule &&
-		test_tick &&
-		git commit -a -m moved-sub-submodule
-	) &&
-	(
-		cd super &&
-		git config -f .gitmodules submodule.submodule.url ../moved-submodule &&
-		test_tick &&
-		git commit -a -m moved-submodule
-	)
-
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/submodule
-   5a446ba..c61fc01  main       -> origin/main
-Updating 5a446ba..c61fc01
-Fast-forward
- file | 1 +
- 1 file changed, 1 insertion(+)
-[main 9f583c0] moved-sub-submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main f2e88dd] moved-submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 3 - change submodule url
-
-expecting success of 7403.4 '"git submodule sync" should update submodule URLs': 
-	(
-		cd super-clone &&
-		git pull --no-recurse-submodules &&
-		git submodule sync
-	) &&
-	test -d "$(
-		cd super-clone/submodule &&
-		git config remote.origin.url
-	)" &&
-	test ! -d "$(
-		cd super-clone/submodule/sub-submodule &&
-		git config remote.origin.url
-	)" &&
-	(
-		cd super-clone/submodule &&
-		git checkout main &&
-		git pull
-	) &&
-	(
-		cd super-clone &&
-		test -d "$(git config submodule.submodule.url)"
-	)
-
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/super
-   78df3af..f2e88dd  main       -> origin/main
-Updating 78df3af..f2e88dd
-Fast-forward
- .gitmodules | 2 +-
- submodule   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Synchronizing submodule url for 'submodule'
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/moved-submodule
-   5a446ba..9f583c0  main       -> origin/main
-Updating 5a446ba..9f583c0
-Fast-forward
- .gitmodules | 2 +-
- file        | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-ok 4 - "git submodule sync" should update submodule URLs
-
-expecting success of 7403.5 '"git submodule sync --recursive" should update all submodule URLs': 
-	(
-		cd super-clone &&
-		(
-			cd submodule &&
-			git pull --no-recurse-submodules
-		) &&
-		git submodule sync --recursive
-	) &&
-	test -d "$(
-		cd super-clone/submodule &&
-		git config remote.origin.url
-	)" &&
-	test -d "$(
-		cd super-clone/submodule/sub-submodule &&
-		git config remote.origin.url
-	)" &&
-	(
-		cd super-clone/submodule/sub-submodule &&
-		git checkout main &&
-		git pull
-	)
-
-Already up to date.
-Synchronizing submodule url for 'submodule'
-Synchronizing submodule url for 'submodule/sub-submodule'
-Previous HEAD position was 0c90624 upstream
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/moved-submodule
-   5a446ba..9f583c0  main       -> origin/main
-Updating 5a446ba..9f583c0
-Fast-forward
- .gitmodules | 2 +-
- file        | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-ok 5 - "git submodule sync --recursive" should update all submodule URLs
-
-expecting success of 7403.6 'reset submodule URLs': 
-	reset_submodule_urls super-clone
-
-ok 6 - reset submodule URLs
-
-expecting success of 7403.7 '"git submodule sync" should update submodule URLs - subdirectory': 
-	(
-		cd super-clone &&
-		git pull --no-recurse-submodules &&
-		mkdir -p sub &&
-		cd sub &&
-		git submodule sync >../../output
-	) &&
-	test_grep "\\.\\./submodule" output &&
-	test -d "$(
-		cd super-clone/submodule &&
-		git config remote.origin.url
-	)" &&
-	test ! -d "$(
-		cd super-clone/submodule/sub-submodule &&
-		git config remote.origin.url
-	)" &&
-	(
-		cd super-clone/submodule &&
-		git checkout main &&
-		git pull
-	) &&
-	(
-		cd super-clone &&
-		test -d "$(git config submodule.submodule.url)"
-	)
-
-Already up to date.
-Synchronizing submodule url for '../submodule'
-Already on 'main'
-M	sub-submodule
-Your branch is up to date with 'origin/main'.
-Already up to date.
-ok 7 - "git submodule sync" should update submodule URLs - subdirectory
-
-expecting success of 7403.8 '"git submodule sync --recursive" should update all submodule URLs - subdirectory': 
-	(
-		cd super-clone &&
-		(
-			cd submodule &&
-			git pull --no-recurse-submodules
-		) &&
-		mkdir -p sub &&
-		cd sub &&
-		git submodule sync --recursive >../../output
-	) &&
-	test_grep "\\.\\./submodule/sub-submodule" output &&
-	test -d "$(
-		cd super-clone/submodule &&
-		git config remote.origin.url
-	)" &&
-	test -d "$(
-		cd super-clone/submodule/sub-submodule &&
-		git config remote.origin.url
-	)" &&
-	(
-		cd super-clone/submodule/sub-submodule &&
-		git checkout main &&
-		git pull
-	)
-
-Already up to date.
-Synchronizing submodule url for '../submodule/sub-submodule'
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-Already up to date.
-ok 8 - "git submodule sync --recursive" should update all submodule URLs - subdirectory
-
-expecting success of 7403.9 '"git submodule sync" should update known submodule URLs': 
-	(
-		cd empty-clone &&
-		git pull &&
-		git submodule sync &&
-		test -d "$(git config submodule.submodule.url)"
-	)
-
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/super
-   78df3af..f2e88dd  main       -> origin/main
-Could not access submodule 'submodule' at commit f2e88dd
-Updating 78df3af..f2e88dd
-Fast-forward
- .gitmodules | 2 +-
- submodule   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Synchronizing submodule url for 'submodule'
-ok 9 - "git submodule sync" should update known submodule URLs
-
-expecting success of 7403.10 '"git submodule sync" should not vivify uninteresting submodule': 
-	(
-		cd top-only-clone &&
-		git pull &&
-		git submodule sync &&
-		test -z "$(git config submodule.submodule.url)" &&
-		git submodule sync submodule &&
-		test -z "$(git config submodule.submodule.url)"
-	)
-
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/super
-   78df3af..f2e88dd  main       -> origin/main
-Updating 78df3af..f2e88dd
-Fast-forward
- .gitmodules | 2 +-
- submodule   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 10 - "git submodule sync" should not vivify uninteresting submodule
-
-expecting success of 7403.11 '"git submodule sync" handles origin URL of the form foo': 
-	(
-		cd relative-clone &&
-		git remote set-url origin foo &&
-		git submodule sync &&
-		(
-			cd submodule &&
-			#actual fails with: "cannot strip off url foo
-			test "$(git config remote.origin.url)" = "../submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-ok 11 - "git submodule sync" handles origin URL of the form foo
-
-expecting success of 7403.12 '"git submodule sync" handles origin URL of the form foo/bar': 
-	(
-		cd relative-clone &&
-		git remote set-url origin foo/bar &&
-		git submodule sync &&
-		(
-			cd submodule &&
-			#actual foo/submodule
-			test "$(git config remote.origin.url)" = "../foo/submodule"
-		) &&
-		(
-			cd submodule/sub-submodule &&
-			test "$(git config remote.origin.url)" != "../../foo/submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-ok 12 - "git submodule sync" handles origin URL of the form foo/bar
-
-expecting success of 7403.13 '"git submodule sync --recursive" propagates changes in origin': 
-	(
-		cd recursive-clone &&
-		git remote set-url origin foo/bar &&
-		git submodule sync --recursive &&
-		(
-			cd submodule &&
-			#actual foo/submodule
-			test "$(git config remote.origin.url)" = "../foo/submodule"
-		) &&
-		(
-			cd submodule/sub-submodule &&
-			test "$(git config remote.origin.url)" = "../../foo/submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-Synchronizing submodule url for 'submodule/sub-submodule'
-ok 13 - "git submodule sync --recursive" propagates changes in origin
-
-expecting success of 7403.14 '"git submodule sync" handles origin URL of the form ./foo': 
-	(
-		cd relative-clone &&
-		git remote set-url origin ./foo &&
-		git submodule sync &&
-		(
-			cd submodule &&
-			#actual ./submodule
-			test "$(git config remote.origin.url)" = "../submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-ok 14 - "git submodule sync" handles origin URL of the form ./foo
-
-expecting success of 7403.15 '"git submodule sync" handles origin URL of the form ./foo/bar': 
-	(
-		cd relative-clone &&
-		git remote set-url origin ./foo/bar &&
-		git submodule sync &&
-		(
-			cd submodule &&
-			#actual ./foo/submodule
-			test "$(git config remote.origin.url)" = "../foo/submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-ok 15 - "git submodule sync" handles origin URL of the form ./foo/bar
-
-expecting success of 7403.16 '"git submodule sync" handles origin URL of the form ../foo': 
-	(
-		cd relative-clone &&
-		git remote set-url origin ../foo &&
-		git submodule sync &&
-		(
-			cd submodule &&
-			#actual ../submodule
-			test "$(git config remote.origin.url)" = "../../submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-ok 16 - "git submodule sync" handles origin URL of the form ../foo
-
-expecting success of 7403.17 '"git submodule sync" handles origin URL of the form ../foo/bar': 
-	(
-		cd relative-clone &&
-		git remote set-url origin ../foo/bar &&
-		git submodule sync &&
-		(
-			cd submodule &&
-			#actual ../foo/submodule
-			test "$(git config remote.origin.url)" = "../../foo/submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-ok 17 - "git submodule sync" handles origin URL of the form ../foo/bar
-
-expecting success of 7403.18 '"git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule': 
-	(
-		cd relative-clone &&
-		git remote set-url origin ../foo/bar &&
-		mkdir -p a/b/c &&
-		(
-			cd a/b/c &&
-			git init &&
-			>.gitignore &&
-			git add .gitignore &&
-			test_tick &&
-			git commit -m "initial commit"
-		) &&
-		git submodule add ../bar/a/b/c ./a/b/c &&
-		git submodule sync &&
-		(
-			cd a/b/c &&
-			#actual ../foo/bar/a/b/c
-			test "$(git config remote.origin.url)" = "../../../../foo/bar/a/b/c"
-		)
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7403-submodule-sync/relative-clone/a/b/c/.git/
-[main (root-commit) 1f9e67a] initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 .gitignore
-Adding existing repo at 'a/b/c' to the index
-Synchronizing submodule url for 'a/b/c'
-Synchronizing submodule url for 'submodule'
-ok 18 - "git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule
-
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7414-submodule-mistakes.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7414-submodule-mistakes/.git/
 expecting success of 7414.1 'create embedded repository': 
@@ -472351,891 +474164,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7411-submodule-config.sh ***
-expecting success of 7411.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
-
-expecting success of 7411.2 'submodule config cache setup': 
-	mkdir submodule &&
-	(cd submodule &&
-		git init &&
-		echo a >a &&
-		git add . &&
-		git commit -ma
-	) &&
-	mkdir super &&
-	(cd super &&
-		git init &&
-		git submodule add ../submodule &&
-		git submodule add ../submodule a &&
-		git commit -m "add as submodule and as a" &&
-		git mv a b &&
-		git commit -m "move a to b"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/submodule/.git/
-[master (root-commit) 7bdc13c] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/super/.git/
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/super/submodule'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/super/a'...
-done.
-[master (root-commit) 27cd28d] add as submodule and as a
- Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 a
- create mode 160000 submodule
-[master c15eddb] move a to b
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename a => b (100%)
-ok 2 - submodule config cache setup
-
-expecting success of 7411.3 'configuration parsing with error': 
-	test_when_finished "rm -rf repo" &&
-	test_create_repo repo &&
-	cat >repo/.gitmodules <<-\EOF &&
-	[submodule "s"]
-		path
-		ignore
-	EOF
-	(
-		cd repo &&
-		test_must_fail test-tool submodule-config "" s 2>actual &&
-		test_grep "bad config" actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/repo/.git/
-fatal: bad config line 2 in file /build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/repo/.gitmodules
-ok 3 - configuration parsing with error
-
-expecting success of 7411.4 'test parsing and lookup of submodule config by path': 
-	(cd super &&
-		test-tool submodule-config \
-			HEAD^ a \
-			HEAD b \
-			HEAD^ submodule \
-			HEAD submodule \
-				>actual &&
-		test_cmp expect actual
-	)
-
-ok 4 - test parsing and lookup of submodule config by path
-
-expecting success of 7411.5 'test parsing and lookup of submodule config by name': 
-	(cd super &&
-		test-tool submodule-config --name \
-			HEAD^ a \
-			HEAD a \
-			HEAD^ submodule \
-			HEAD submodule \
-				>actual &&
-		test_cmp expect actual
-	)
-
-ok 5 - test parsing and lookup of submodule config by name
-
-expecting success of 7411.6 'error in history of one submodule config lets continue, stderr message contains blob ref': 
-	ORIG=$(git -C super rev-parse HEAD) &&
-	test_when_finished "git -C super reset --hard $ORIG" &&
-	(cd super &&
-		cp .gitmodules .gitmodules.bak &&
-		echo "	value = \"" >>.gitmodules &&
-		git add .gitmodules &&
-		mv .gitmodules.bak .gitmodules &&
-		git commit -m "add error" &&
-		sha1=$(git rev-parse HEAD) &&
-		test-tool submodule-config \
-			HEAD b \
-			HEAD submodule \
-				>actual \
-				2>actual_stderr &&
-		test_cmp expect_error actual &&
-		test_grep "submodule-blob $sha1:.gitmodules" actual_stderr >/dev/null
-	)
-
-[master a5e5db0] add error
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-HEAD is now at c15eddb move a to b
-ok 6 - error in history of one submodule config lets continue, stderr message contains blob ref
-
-expecting success of 7411.7 'using different treeishs works': 
-	(
-		cd super &&
-		git tag new_tag &&
-		tree=$(git rev-parse HEAD^{tree}) &&
-		commit=$(git rev-parse HEAD^{commit}) &&
-		test-tool submodule-config $commit b >expect &&
-		test-tool submodule-config $tree b >actual.1 &&
-		test-tool submodule-config new_tag b >actual.2 &&
-		test_cmp expect actual.1 &&
-		test_cmp expect actual.2
-	)
-
-ok 7 - using different treeishs works
-
-expecting success of 7411.8 'error in history in fetchrecursesubmodule lets continue': 
-	ORIG=$(git -C super rev-parse HEAD) &&
-	test_when_finished "git -C super reset --hard $ORIG" &&
-	(cd super &&
-		git config -f .gitmodules \
-			submodule.submodule.fetchrecursesubmodules blabla &&
-		git add .gitmodules &&
-		git config --unset -f .gitmodules \
-			submodule.submodule.fetchrecursesubmodules &&
-		git commit -m "add error in fetchrecursesubmodules" &&
-		test-tool submodule-config \
-			HEAD b \
-			HEAD submodule \
-				>actual &&
-		test_cmp expect_error actual
-	)
-
-[master ea57126] add error in fetchrecursesubmodules
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-HEAD is now at c15eddb move a to b
-ok 8 - error in history in fetchrecursesubmodule lets continue
-
-expecting success of 7411.9 'reading submodules config from the working tree': 
-	(cd super &&
-		echo "../submodule" >expect &&
-		test-tool submodule config-list submodule.submodule.url >actual &&
-		test_cmp expect actual
-	)
-
-ok 9 - reading submodules config from the working tree
-
-expecting success of 7411.10 'unsetting submodules config from the working tree': 
-	(cd super &&
-		test-tool submodule config-unset submodule.submodule.url &&
-		test-tool submodule config-list submodule.submodule.url >actual &&
-		test_must_be_empty actual
-	)
-
-ok 10 - unsetting submodules config from the working tree
-
-expecting success of 7411.11 'writing submodules config': 
-	(cd super &&
-		echo "new_url" >expect &&
-		test-tool submodule config-set submodule.submodule.url "new_url" &&
-		test-tool submodule config-list submodule.submodule.url >actual &&
-		test_cmp expect actual
-	)
-
-ok 11 - writing submodules config
-
-expecting success of 7411.12 'overwriting unstaged submodules config': 
-	test_when_finished "git -C super checkout .gitmodules" &&
-	(cd super &&
-		echo "newer_url" >expect &&
-		test-tool submodule config-set submodule.submodule.url "newer_url" &&
-		test-tool submodule config-list submodule.submodule.url >actual &&
-		test_cmp expect actual
-	)
-
-Updated 1 path from the index
-ok 12 - overwriting unstaged submodules config
-
-expecting success of 7411.13 'writeable .gitmodules when it is in the working tree': 
-	test-tool -C super submodule config-writeable
-
-ok 13 - writeable .gitmodules when it is in the working tree
-
-expecting success of 7411.14 'writeable .gitmodules when it is nowhere in the repository': 
-	ORIG=$(git -C super rev-parse HEAD) &&
-	test_when_finished "git -C super reset --hard $ORIG" &&
-	(cd super &&
-		git rm .gitmodules &&
-		git commit -m "remove .gitmodules from the current branch" &&
-		test-tool submodule config-writeable
-	)
-
-rm '.gitmodules'
-[master d504b72] remove .gitmodules from the current branch
- Author: A U Thor <author@example.com>
- 1 file changed, 6 deletions(-)
- delete mode 100644 .gitmodules
-HEAD is now at c15eddb move a to b
-ok 14 - writeable .gitmodules when it is nowhere in the repository
-
-expecting success of 7411.15 'non-writeable .gitmodules when it is in the index but not in the working tree': 
-	test_when_finished "git -C super checkout .gitmodules" &&
-	(cd super &&
-		rm -f .gitmodules &&
-		test_must_fail test-tool submodule config-writeable
-	)
-
-Updated 1 path from the index
-ok 15 - non-writeable .gitmodules when it is in the index but not in the working tree
-
-expecting success of 7411.16 'non-writeable .gitmodules when it is in the current branch but not in the index': 
-	ORIG=$(git -C super rev-parse HEAD) &&
-	test_when_finished "git -C super reset --hard $ORIG" &&
-	(cd super &&
-		git rm .gitmodules &&
-		test_must_fail test-tool submodule config-writeable
-	)
-
-rm '.gitmodules'
-HEAD is now at c15eddb move a to b
-ok 16 - non-writeable .gitmodules when it is in the current branch but not in the index
-
-expecting success of 7411.17 'reading submodules config from the index when .gitmodules is not in the working tree': 
-	ORIG=$(git -C super rev-parse HEAD) &&
-	test_when_finished "git -C super reset --hard $ORIG" &&
-	(cd super &&
-		test-tool submodule config-set submodule.submodule.url "staged_url" &&
-		git add .gitmodules &&
-		rm -f .gitmodules &&
-		echo "staged_url" >expect &&
-		test-tool submodule config-list submodule.submodule.url >actual &&
-		test_cmp expect actual
-	)
-
-HEAD is now at c15eddb move a to b
-ok 17 - reading submodules config from the index when .gitmodules is not in the working tree
-
-expecting success of 7411.18 'reading submodules config from the current branch when .gitmodules is not in the index': 
-	ORIG=$(git -C super rev-parse HEAD) &&
-	test_when_finished "git -C super reset --hard $ORIG" &&
-	(cd super &&
-		git rm .gitmodules &&
-		echo "../submodule" >expect &&
-		test-tool submodule config-list submodule.submodule.url >actual &&
-		test_cmp expect actual
-	)
-
-rm '.gitmodules'
-HEAD is now at c15eddb move a to b
-ok 18 - reading submodules config from the current branch when .gitmodules is not in the index
-
-expecting success of 7411.19 'reading nested submodules config': 
-	(cd super &&
-		git init submodule/nested_submodule &&
-		echo "a" >submodule/nested_submodule/a &&
-		git -C submodule/nested_submodule add a &&
-		git -C submodule/nested_submodule commit -m "add a" &&
-		git -C submodule submodule add ./nested_submodule &&
-		git -C submodule add nested_submodule &&
-		git -C submodule commit -m "added nested_submodule" &&
-		git add submodule &&
-		git commit -m "updated submodule" &&
-		echo "./nested_submodule" >expect &&
-		test-tool submodule-nested-repo-config \
-			submodule submodule.nested_submodule.url >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7411-submodule-config/super/submodule/nested_submodule/.git/
-[master (root-commit) 925677c] add a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-Adding existing repo at 'nested_submodule' to the index
-[master 62f7fd8] added nested_submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 nested_submodule
-[master c00b231] updated submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 19 - reading nested submodules config
-
-expecting success of 7411.20 'reading nested submodules config when .gitmodules is not in the working tree': 
-	test_when_finished "git -C super/submodule checkout .gitmodules" &&
-	(cd super &&
-		echo "./nested_submodule" >expect &&
-		rm submodule/.gitmodules &&
-		test-tool submodule-nested-repo-config \
-			submodule submodule.nested_submodule.url >actual 2>warning &&
-		test_must_be_empty warning &&
-		test_cmp expect actual
-	)
-
-Updated 1 path from the index
-ok 20 - reading nested submodules config when .gitmodules is not in the working tree
-
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7408-submodule-reference.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/.git/
-expecting success of 7408.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
-
-expecting success of 7408.2 'preparing first repository': 
-	test_create_repo A &&
-	(
-		cd A &&
-		echo first >file1 &&
-		git add file1 &&
-		git commit -m A-initial
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A/.git/
-[master (root-commit) 3f492fa] A-initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 2 - preparing first repository
-
-expecting success of 7408.3 'preparing second repository': 
-	git clone A B &&
-	(
-		cd B &&
-		echo second >file2 &&
-		git add file2 &&
-		git commit -m B-addition &&
-		git repack -a -d &&
-		git prune
-	)
-
-Cloning into 'B'...
-done.
-[master c9a83e7] B-addition
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 3 - preparing second repository
-
-expecting success of 7408.4 'preparing superproject': 
-	test_create_repo super &&
-	(
-		cd super &&
-		echo file >file &&
-		git add file &&
-		git commit -m B-super-initial
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super/.git/
-[master (root-commit) 0776138] B-super-initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 4 - preparing superproject
-
-expecting success of 7408.5 'submodule add --reference uses alternates': 
-	(
-		cd super &&
-		git submodule add --reference ../B "file://$base_dir/A" sub &&
-		git commit -m B-super-added &&
-		git repack -ad
-	) &&
-	test_alternate_is_used super/.git/modules/sub/objects/info/alternates super/sub
-
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super/sub'...
-[master 31bbe3e] B-super-added
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 5 - submodule add --reference uses alternates
-
-expecting success of 7408.6 'submodule add --reference with --dissociate does not use alternates': 
-	(
-		cd super &&
-		git submodule add --reference ../B --dissociate "file://$base_dir/A" sub-dissociate &&
-		git commit -m B-super-added &&
-		git repack -ad
-	) &&
-	test_path_is_missing super/.git/modules/sub-dissociate/objects/info/alternates
-
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super/sub-dissociate'...
-[master 4c47568] B-super-added
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 sub-dissociate
-ok 6 - submodule add --reference with --dissociate does not use alternates
-
-expecting success of 7408.7 'that reference gets used with add': 
-	(
-		cd super/sub &&
-		echo "0 objects, 0 kilobytes" >expected &&
-		git count-objects >current &&
-		diff expected current
-	)
-
-ok 7 - that reference gets used with add
-
-expecting success of 7408.8 'updating superproject keeps alternates': 
-	test_when_finished "rm -rf super-clone" &&
-	git clone super super-clone &&
-	git -C super-clone submodule update --init --reference ../B &&
-	test_alternate_is_used super-clone/.git/modules/sub/objects/info/alternates super-clone/sub
-
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
-Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-ok 8 - updating superproject keeps alternates
-
-expecting success of 7408.9 'updating superproject with --dissociate does not keep alternates': 
-	test_when_finished "rm -rf super-clone" &&
-	git clone super super-clone &&
-	git -C super-clone submodule update --init --reference ../B --dissociate &&
-	test_path_is_missing super-clone/.git/modules/sub/objects/info/alternates
-
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
-Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-ok 9 - updating superproject with --dissociate does not keep alternates
-
-expecting success of 7408.10 'submodules use alternates when cloning a superproject': 
-	test_when_finished "rm -rf super-clone" &&
-	git clone --reference super --recursive super super-clone &&
-	(
-		cd super-clone &&
-		# test superproject has alternates setup correctly
-		test_alternate_is_used .git/objects/info/alternates . &&
-		# test submodule has correct setup
-		test_alternate_is_used .git/modules/sub/objects/info/alternates sub
-	)
-
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
-Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-ok 10 - submodules use alternates when cloning a superproject
-
-expecting success of 7408.11 'missing submodule alternate fails clone and submodule update': 
-	test_when_finished "rm -rf super-clone" &&
-	git clone super super2 &&
-	test_must_fail git clone --recursive --reference super2 super2 super-clone &&
-	(
-		cd super-clone &&
-		# test superproject has alternates setup correctly
-		test_alternate_is_used .git/objects/info/alternates . &&
-		# update of the submodule succeeds
-		test_must_fail git submodule update --init &&
-		# and we have no alternates:
-		test_path_is_missing .git/modules/sub/objects/info/alternates &&
-		test_path_is_missing sub/file1
-	)
-
-Cloning into 'super2'...
-done.
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Failed to clone 'sub'. Retry scheduled
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
-Failed to clone 'sub-dissociate'. Retry scheduled
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Failed to clone 'sub' a second time, aborting
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Failed to clone 'sub'. Retry scheduled
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
-Failed to clone 'sub-dissociate'. Retry scheduled
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Failed to clone 'sub' a second time, aborting
-ok 11 - missing submodule alternate fails clone and submodule update
-
-expecting success of 7408.12 'ignoring missing submodule alternates passes clone and submodule update': 
-	test_when_finished "rm -rf super-clone" &&
-	git clone --reference-if-able super2 --recursive super2 super-clone &&
-	(
-		cd super-clone &&
-		# test superproject has alternates setup correctly
-		test_alternate_is_used .git/objects/info/alternates . &&
-		# update of the submodule succeeds
-		git submodule update --init &&
-		# and we have no alternates:
-		test_path_is_missing .git/modules/sub/objects/info/alternates &&
-		test_path_is_file sub/file1
-	)
-
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub'...
-submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
-Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-ok 12 - ignoring missing submodule alternates passes clone and submodule update
-
-expecting success of 7408.13 'preparing second superproject with a nested submodule plus partial clone': 
-	test_create_repo supersuper &&
-	(
-		cd supersuper &&
-		echo "I am super super." >file &&
-		git add file &&
-		git commit -m B-super-super-initial &&
-		git submodule add "file://$base_dir/super" subwithsub &&
-		git commit -m B-super-super-added &&
-		git submodule update --init --recursive &&
-		git repack -ad
-	) &&
-	git clone supersuper supersuper2 &&
-	(
-		cd supersuper2 &&
-		git submodule update --init
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper/.git/
-[master (root-commit) c928525] B-super-super-initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper/subwithsub'...
-[master f2e98ca] B-super-super-added
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 subwithsub
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper/subwithsub/sub'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper/subwithsub/sub-dissociate'...
-Submodule path 'subwithsub/sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'subwithsub/sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Cloning into 'supersuper2'...
-done.
-Submodule 'subwithsub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper2/subwithsub'...
-Submodule path 'subwithsub': checked out '4c47568e781c1989adcf9971f2d77e21198845d9'
-ok 13 - preparing second superproject with a nested submodule plus partial clone
-
-expecting success of 7408.14 'nested submodule alternate in works and is actually used': 
-	test_when_finished "rm -rf supersuper-clone" &&
-	git clone --recursive --reference supersuper supersuper supersuper-clone &&
-	(
-		cd supersuper-clone &&
-		# test superproject has alternates setup correctly
-		test_alternate_is_used .git/objects/info/alternates . &&
-		# immediate submodule has alternate:
-		test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub &&
-		# nested submodule also has alternate:
-		test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub
-	)
-
-Cloning into 'supersuper-clone'...
-done.
-Submodule 'subwithsub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
-Submodule path 'subwithsub': checked out '4c47568e781c1989adcf9971f2d77e21198845d9'
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub-dissociate'...
-Submodule path 'subwithsub/sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'subwithsub/sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-ok 14 - nested submodule alternate in works and is actually used
-
-expecting success of 7408.15 'missing nested submodule alternate fails clone and submodule update': 
-	test_when_finished "rm -rf supersuper-clone" &&
-	test_must_fail git clone --recursive --reference supersuper2 supersuper2 supersuper-clone &&
-	(
-		cd supersuper-clone &&
-		check_that_two_of_three_alternates_are_used &&
-		# update of the submodule fails
-		cat >expect <<-\EOF &&
-		fatal: submodule 'sub' cannot add alternate: path ... does not exist
-		Failed to clone 'sub'. Retry scheduled
-		fatal: submodule 'sub-dissociate' cannot add alternate: path ... does not exist
-		Failed to clone 'sub-dissociate'. Retry scheduled
-		fatal: submodule 'sub' cannot add alternate: path ... does not exist
-		Failed to clone 'sub' a second time, aborting
-		fatal: Failed to recurse into submodule path ...
-		EOF
-		test_must_fail git submodule update --init --recursive 2>err &&
-		grep -e fatal: -e ^Failed err >actual.raw &&
-		sed -e "s/path $SQ[^$SQ]*$SQ/path .../" <actual.raw >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into 'supersuper-clone'...
-done.
-Submodule 'subwithsub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
-Submodule path 'subwithsub': checked out '4c47568e781c1989adcf9971f2d77e21198845d9'
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
-Failed to clone 'sub'. Retry scheduled
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
-Failed to clone 'sub-dissociate'. Retry scheduled
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
-Failed to clone 'sub' a second time, aborting
-fatal: Failed to recurse into submodule path 'subwithsub'
-ok 15 - missing nested submodule alternate fails clone and submodule update
-
-expecting success of 7408.16 'missing nested submodule alternate in --reference-if-able mode': 
-	test_when_finished "rm -rf supersuper-clone" &&
-	git clone --recursive --reference-if-able supersuper2 supersuper2 supersuper-clone &&
-	(
-		cd supersuper-clone &&
-		check_that_two_of_three_alternates_are_used &&
-		# update of the submodule succeeds
-		git submodule update --init --recursive
-	)
-
-Cloning into 'supersuper-clone'...
-done.
-Submodule 'subwithsub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
-Submodule path 'subwithsub': checked out '4c47568e781c1989adcf9971f2d77e21198845d9'
-Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
-submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub'...
-submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub-dissociate'...
-Submodule path 'subwithsub/sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'subwithsub/sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-ok 16 - missing nested submodule alternate in --reference-if-able mode
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7413-submodule-is-active.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t7413-submodule-is-active/super/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t/trash directory.t7413-submodule-is-active/super2/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7413-submodule-is-active/super2/mod'...
-done.
-true
-ok 9 - is-active, submodule.active and submodule add
-
-expecting success of 7413.10 'submodule add skips redundant active entry': 
-	git init repo &&
-	(
-		cd repo &&
-		git config submodule.active "lib/*" &&
-		git commit --allow-empty -m init &&
-
-		git init ../lib-origin &&
-		git -C ../lib-origin commit --allow-empty -m init &&
-
-		git submodule add ../lib-origin lib/foo &&
-		test_must_fail git config --get submodule.lib/foo.active
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7413-submodule-is-active/repo/.git/
-[master (root-commit) edb5fba] init
- Author: A U Thor <author@example.com>
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7413-submodule-is-active/lib-origin/.git/
-[master (root-commit) edb5fba] init
- Author: A U Thor <author@example.com>
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7413-submodule-is-active/repo/lib/foo'...
-done.
-ok 10 - submodule add skips redundant active entry
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7417-submodule-path-url.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7417-submodule-path-url/.git/
 expecting success of 7417.1 'setup': 
@@ -473452,1399 +474380,411 @@
 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.51.0/t/trash directory.t7412-submodule-absorbgitdirs/./sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t7420-submodule-set-url/super/.git/
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7420-submodule-set-url/super/submodule'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7063-status-untracked-cache.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7063-status-untracked-cache/.git/
-checking prerequisite: UNTRACKED_CACHE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
-	{ git update-index --test-untracked-cache; ret=$?; } &&
-	test $ret -ne 1
-
-)
-Testing mtime in '/build/reproducible-path/git-2.51.0/t/trash directory.t7063-status-untracked-cache' ...... OK
-prerequisite UNTRACKED_CACHE ok
-expecting success of 7063.1 'core.untrackedCache is unset': 
-	test_must_fail git config --get core.untrackedCache
-
-ok 1 - core.untrackedCache is unset
-
-expecting success of 7063.2 'setup': 
-	git init --template= worktree &&
-	cd worktree &&
-	mkdir done dtwo dthree &&
-	touch one two three done/one dtwo/two dthree/three &&
-	test-tool chmtime =-300 one two three done/one dtwo/two dthree/three &&
-	test-tool chmtime =-300 done dtwo dthree &&
-	test-tool chmtime =-300 . &&
-	git add one two done/one &&
-	mkdir .git/info &&
-	: >.git/info/exclude &&
-	git update-index --untracked-cache &&
-	test_oid_cache <<-EOF
-	root sha1:e6fcc8f2ee31bae321d66afd183fcb7237afae6e
-	root sha256:b90c672088c015b9c83876e919da311bad4cd39639fb139f988af6a11493b974
-
-	exclude sha1:13263c0978fb9fad16b2d580fb800b6d811c3ff0
-	exclude sha256:fe4aaa1bbbbce4cb8f73426748a14c5ad6026b26f90505a0bf2494b165a5b76c
-
-	done sha1:1946f0437f90c5005533cbe1736a6451ca301714
-	done sha256:7f079501d79f665b3acc50f5e0e9e94509084d5032ac20113a37dd5029b757cc
-	EOF
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7063-status-untracked-cache/worktree/.git/
-ok 2 - setup
-
-expecting success of 7063.3 'untracked cache is empty': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect-empty <<EOF &&
-info/exclude $ZERO_OID
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-EOF
-	test_cmp ../expect-empty ../actual
-
-ok 3 - untracked cache is empty
-
-expecting success of 7063.4 'status first time (empty cache)': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:3
- ....gitignore-invalidation:1
- ....directory-invalidation:0
- ....opendir:4
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 4 - status first time (empty cache)
-
-expecting success of 7063.5 'untracked cache after first status': 
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../dump.expect ../actual
-
-ok 5 - untracked cache after first status
-
-expecting success of 7063.6 'status second time (fully populated cache)': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:0
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 6 - status second time (fully populated cache)
-
-expecting success of 7063.7 'untracked cache after second status': 
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../dump.expect ../actual
-
-ok 7 - untracked cache after second status
-
-expecting success of 7063.8 'untracked cache is bypassed with -uall': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status -uall --porcelain >../actual &&
-	iuc status -uall --porcelain >../status.iuc &&
-	test_cmp ../status_uall.expect ../status.iuc &&
-	test_cmp ../status_uall.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 8 - untracked cache is bypassed with -uall
-
-expecting success of 7063.9 'untracked cache remains after bypass': 
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../dump.expect ../actual
-
-ok 9 - untracked cache remains after bypass
-
-expecting success of 7063.10 'if -uall is configured, untracked cache gets populated by default': 
-	test_config status.showuntrackedfiles all &&
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	test_cmp ../status_uall.expect ../status.iuc &&
-	test_cmp ../status_uall.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:3
- ....gitignore-invalidation:1
- ....directory-invalidation:0
- ....opendir:4
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 10 - if -uall is configured, untracked cache gets populated by default
-
-expecting success of 7063.11 'if -uall was configured, untracked cache is populated': 
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../dump_uall.expect ../actual
-
-ok 11 - if -uall was configured, untracked cache is populated
-
-expecting success of 7063.12 'if -uall is configured, untracked cache is used by default': 
-	test_config status.showuntrackedfiles all &&
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	test_cmp ../status_uall.expect ../status.iuc &&
-	test_cmp ../status_uall.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:0
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 12 - if -uall is configured, untracked cache is used by default
-
-expecting success of 7063.13 'if -uall is configured, untracked cache is bypassed with -unormal': 
-	test_config status.showuntrackedfiles all &&
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status -unormal --porcelain >../actual &&
-	iuc status -unormal --porcelain >../status.iuc &&
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 13 - if -uall is configured, untracked cache is bypassed with -unormal
-
-expecting success of 7063.14 'repopulate untracked cache for -unormal': 
-	git status --porcelain
-
-A  done/one
-A  one
-A  two
-?? dthree/
-?? dtwo/
-?? three
-ok 14 - repopulate untracked cache for -unormal
-
-expecting success of 7063.15 'modify in root directory, one dir invalidation': 
-	: >four &&
-	test-tool chmtime =-240 four &&
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
-A  done/one
-A  one
-A  two
-?? dthree/
-?? dtwo/
-?? four
-?? three
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:1
- ....opendir:1
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-
-ok 15 - modify in root directory, one dir invalidation
-
-expecting success of 7063.16 'verify untracked cache dump': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $EMPTY_BLOB
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $ZERO_OID recurse valid
-dthree/
-dtwo/
-four
-three
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-three
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 16 - verify untracked cache dump
-
-expecting success of 7063.17 'new .gitignore invalidates recursively': 
-	echo four >.gitignore &&
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
-A  done/one
-A  one
-A  two
-?? .gitignore
-?? dthree/
-?? dtwo/
-?? three
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:1
- ....directory-invalidation:1
- ....opendir:4
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-
-ok 17 - new .gitignore invalidates recursively
-
-expecting success of 7063.18 'verify untracked cache dump': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $EMPTY_BLOB
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dthree/
-dtwo/
-three
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-three
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 18 - verify untracked cache dump
-
-expecting success of 7063.19 'new info/exclude invalidates everything': 
-	echo three >>.git/info/exclude &&
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
-A  done/one
-A  one
-A  two
-?? .gitignore
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:1
- ....directory-invalidation:0
- ....opendir:4
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 19 - new info/exclude invalidates everything
-
-expecting success of 7063.20 'verify untracked cache dump': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 20 - verify untracked cache dump
-
-expecting success of 7063.21 'move two from tracked to untracked': 
-	git rm --cached two &&
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-rm 'two'
-ok 21 - move two from tracked to untracked
-
-expecting success of 7063.22 'status after the move': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
-A  done/one
-A  one
-?? .gitignore
-?? dtwo/
-?? two
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:1
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 22 - status after the move
-
-expecting success of 7063.23 'verify untracked cache dump': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-two
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 23 - verify untracked cache dump
-
-expecting success of 7063.24 'move two from untracked to tracked': 
-	git add two &&
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 24 - move two from untracked to tracked
-
-expecting success of 7063.25 'status after the move': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
-A  done/one
-A  one
-A  two
-?? .gitignore
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:1
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 25 - status after the move
-
-expecting success of 7063.26 'verify untracked cache dump': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 26 - verify untracked cache dump
-
-expecting success of 7063.27 'set up for sparse checkout testing': 
-	echo two >done/.gitignore &&
-	echo three >>done/.gitignore &&
-	echo two >done/two &&
-	git add -f done/two done/.gitignore &&
-	git commit -m "first commit"
-
-[main (root-commit) 2d55d32] first commit
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+)
- create mode 100644 done/.gitignore
- create mode 100644 done/one
- create mode 100644 done/two
- create mode 100644 one
- create mode 100644 two
-ok 27 - set up for sparse checkout testing
-
-expecting success of 7063.28 'status after commit': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
-?? .gitignore
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:2
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 28 - status after commit
-
-expecting success of 7063.29 'untracked cache correct after commit': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 29 - untracked cache correct after commit
-
-expecting success of 7063.30 'set up sparse checkout': 
-	echo "done/[a-z]*" >.git/info/sparse-checkout &&
-	test_config core.sparsecheckout true &&
-	git checkout main &&
-	git update-index --force-untracked-cache &&
-	git status --porcelain >/dev/null && # prime the cache
-	test_path_is_missing done/.gitignore &&
-	test_path_is_file done/one
-
-Already on 'main'
-ok 30 - set up sparse checkout
-
-expecting success of 7063.31 'create/modify files, some of which are gitignored': 
-	echo two bis >done/two &&
-	echo three >done/three && # three is gitignored
-	echo four >done/four && # four is gitignored at a higher level
-	echo five >done/five && # five is not gitignored
-	test-tool chmtime =-180 done/two done/three done/four done/five done &&
-	# we need to ensure that the root dir is touched (in the past);
-	test-tool chmtime =-180 . &&
-	sync_mtime
-
-ok 31 - create/modify files, some of which are gitignored
-
-expecting success of 7063.32 'test sparse status with untracked cache': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-?? .gitignore
-?? done/five
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:1
- ....directory-invalidation:2
- ....opendir:2
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 32 - test sparse status with untracked cache
-
-expecting success of 7063.33 'untracked cache correct after status': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-/done/ $(test_oid done) recurse valid
-five
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 33 - untracked cache correct after status
-
-expecting success of 7063.34 'test sparse status again with untracked cache': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-?? .gitignore
-?? done/five
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:0
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 34 - test sparse status again with untracked cache
-
-expecting success of 7063.35 'set up for test of subdir and sparse checkouts': 
-	mkdir done/sub &&
-	mkdir done/sub/sub &&
-	echo "sub" > done/sub/sub/file &&
-	test-tool chmtime =-120 done/sub/sub/file done/sub/sub done/sub done
-
-ok 35 - set up for test of subdir and sparse checkouts
-
-expecting success of 7063.36 'test sparse status with untracked cache and subdir': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-?? .gitignore
-?? done/five
-?? done/sub/
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:2
- ....gitignore-invalidation:0
- ....directory-invalidation:1
- ....opendir:3
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 36 - test sparse status with untracked cache and subdir
-
-expecting success of 7063.37 'verify untracked cache dump (sparse/subdirs)': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect-from-test-dump <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-/done/ $(test_oid done) recurse valid
-five
-sub/
-/done/sub/ $ZERO_OID recurse check_only valid
-sub/
-/done/sub/sub/ $ZERO_OID recurse check_only valid
-file
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect-from-test-dump ../actual
-
-ok 37 - verify untracked cache dump (sparse/subdirs)
-
-expecting success of 7063.38 'test sparse status again with untracked cache and subdir': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:0
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 38 - test sparse status again with untracked cache and subdir
-
-expecting success of 7063.39 'move entry in subdir from untracked to cached': 
-	git add dtwo/two &&
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-A  dtwo/two
-?? .gitignore
-?? done/five
-?? done/sub/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual
-
-ok 39 - move entry in subdir from untracked to cached
-
-expecting success of 7063.40 'move entry in subdir from cached to untracked': 
-	git rm --cached dtwo/two &&
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-?? .gitignore
-?? done/five
-?? done/sub/
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual
-
-rm 'dtwo/two'
-ok 40 - move entry in subdir from cached to untracked
-
-expecting success of 7063.41 '--no-untracked-cache removes the cache': 
-	git update-index --no-untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	echo "no untracked cache" >../expect-no-uc &&
-	test_cmp ../expect-no-uc ../actual
-
-ok 41 - --no-untracked-cache removes the cache
-
-expecting success of 7063.42 'git status does not change anything': 
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual
-
-On branch main
-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:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 42 - git status does not change anything
-
-expecting success of 7063.43 'setting core.untrackedCache to true and using git status creates the cache': 
-	git config core.untrackedCache true &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual &&
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-from-test-dump ../actual
-
-On branch main
-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:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 43 - setting core.untrackedCache to true and using git status creates the cache
-
-expecting success of 7063.44 'using --no-untracked-cache does not fail when core.untrackedCache is true': 
-	git update-index --no-untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual &&
-	git update-index --untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual
-
-warning: core.untrackedCache is set to true; remove or change it, if you really want to disable the untracked cache
-ok 44 - using --no-untracked-cache does not fail when core.untrackedCache is true
-
-expecting success of 7063.45 'setting core.untrackedCache to false and using git status removes the cache': 
-	git config core.untrackedCache false &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual &&
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual
-
-On branch main
-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:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 45 - setting core.untrackedCache to false and using git status removes the cache
-
-expecting success of 7063.46 'using --untracked-cache does not fail when core.untrackedCache is false': 
-	git update-index --untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual
-
-warning: core.untrackedCache is set to false; remove or change it, if you really want to enable the untracked cache
-ok 46 - using --untracked-cache does not fail when core.untrackedCache is false
-
-expecting success of 7063.47 'setting core.untrackedCache to keep': 
-	git config core.untrackedCache keep &&
-	git update-index --untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual &&
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-from-test-dump ../actual &&
-	git update-index --no-untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual &&
-	git update-index --force-untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual &&
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-from-test-dump ../actual
-
-On branch main
-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:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-On branch main
-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:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 47 - setting core.untrackedCache to keep
-
-expecting success of 7063.48 'test ident field is working': 
-	mkdir ../other_worktree &&
-	cp -R done dthree dtwo four three ../other_worktree &&
-	GIT_WORK_TREE=../other_worktree git status 2>../err &&
-	echo "warning: untracked cache is disabled on this system or location" >../expect &&
-	test_cmp ../expect ../err
-
-On branch main
-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:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	done/five
-	done/four
-	done/sub/
-	dtwo/
-	four
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 48 - test ident field is working
+	test_when_finished "rm -rf repo-wt" &&
+	git -C repo-bare.git worktree add ../repo-wt &&
 
-expecting success of 7063.49 'untracked cache survives a checkout': 
-	git commit --allow-empty -m empty &&
-	test-tool dump-untracked-cache >../before &&
-	test_when_finished  "git checkout main" &&
-	git checkout -b other_branch &&
-	test-tool dump-untracked-cache >../after &&
-	test_cmp ../before ../after &&
-	test_commit test &&
-	test-tool dump-untracked-cache >../before &&
-	git checkout main &&
-	test-tool dump-untracked-cache >../after &&
-	test_cmp ../before ../after
+	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
 
-[main 9462075] empty
- Author: A U Thor <author@example.com>
-Switched to a new branch 'other_branch'
-[other_branch b773b8a] test
+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.51.0/t/trash directory.t7412-submodule-absorbgitdirs/./sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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 test.t
-Switched to branch 'main'
-M	done/two
-Already on 'main'
-M	done/two
-ok 49 - untracked cache survives a checkout
+ 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 7063.50 'untracked cache survives a commit': 
-	test-tool dump-untracked-cache >../before &&
-	git add done/two &&
-	git commit -m commit &&
-	test-tool dump-untracked-cache >../after &&
-	test_cmp ../before ../after
+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
 
-[main 527fa0b] commit
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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(+), 1 deletion(-)
-ok 50 - untracked cache survives a commit
-
-expecting success of 7063.51 'teardown worktree': 
-	cd ..
-
-ok 51 - teardown worktree
+ 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
 
-checking prerequisite: SYMLINKS
+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
 
-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 10 - absorbing the git dir fails for incomplete submodules
 
-)
-prerequisite SYMLINKS ok
-expecting success of 7063.52 'setup worktree for symlink test': 
-	git init worktree-symlink &&
-	cd worktree-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 &&
-	ln -s two one &&
-	git add one &&
-	git commit -m"second commit"
+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.51.0/t/trash directory.t7063-status-untracked-cache/worktree-symlink/.git/
-[main (root-commit) 294fddc] first commit
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7412-submodule-absorbgitdirs/sub3/.git/
+[master (root-commit) dbecd43] first
  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 b7cd1f6] second commit
+ 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, 1 insertion(+)
- create mode 120000 one
- delete mode 100644 one/file
-ok 52 - setup worktree for symlink test
-
-expecting success of 7063.53 '"status" after symlink replacement should be clean with UC=true': 
-	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.
+ 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
 
-If you want to 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 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
 
-  git switch -c <new-branch-name>
+ok 12 - absorbing fails for a submodule with multiple worktrees
 
-Or undo this operation with:
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7418-submodule-sparse-gitmodules.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/.git/
+expecting success of 7418.1 'setup': 
+	git config --global protocol.file.allow always
 
-  git switch -
+ok 1 - setup
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7418.2 'sparse checkout setup which hides .gitmodules': 
+	git init upstream &&
+	git init submodule &&
+	(cd submodule &&
+		echo file >file &&
+		git add file &&
+		test_tick &&
+		git commit -m "Add file"
+	) &&
+	(cd upstream &&
+		git submodule add ../submodule &&
+		test_tick &&
+		git commit -m "Add submodule"
+	) &&
+	git clone --template= upstream super &&
+	(cd super &&
+		mkdir .git/info &&
+		cat >.git/info/sparse-checkout <<-\EOF &&
+		/*
+		!/.gitmodules
+		EOF
+		git config core.sparsecheckout true &&
+		git read-tree -m -u HEAD &&
+		test_path_is_missing .gitmodules
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/submodule/.git/
+[master (root-commit) a939200] 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.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/submodule'...
+done.
+[master (root-commit) caa93e1] Add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+Cloning into 'super'...
+done.
+ok 2 - sparse checkout setup which hides .gitmodules
 
-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 7418.3 'reading gitmodules config file when it is not checked out': 
+	echo "../submodule" >expect &&
+	test-tool -C super submodule config-list submodule.submodule.url >actual &&
+	test_cmp expect actual
 
-Note: switching to 'HEAD~'.
+ok 3 - reading gitmodules config file when it is not checked 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.
+expecting success of 7418.4 'not writing gitmodules config file when it is not checked out': 
+	test_must_fail test-tool -C super submodule config-set submodule.submodule.url newurl &&
+	test_path_is_missing super/.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:
+fatal: please make sure that the .gitmodules file is in the working tree
+ok 4 - not writing gitmodules config file when it is not checked out
 
-  git switch -c <new-branch-name>
+expecting success of 7418.5 'initialising submodule when the gitmodules config is not checked out': 
+	test_must_fail git -C super config submodule.submodule.url &&
+	git -C super submodule init &&
+	git -C super config submodule.submodule.url >actual &&
+	echo "$(pwd)/submodule" >expect &&
+	test_cmp expect actual
 
-Or undo this operation with:
+Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/submodule) registered for path 'submodule'
+ok 5 - initialising submodule when the gitmodules config is not checked out
 
-  git switch -
+expecting success of 7418.6 'updating submodule when the gitmodules config is not checked out': 
+	test_path_is_missing super/submodule/file &&
+	git -C super submodule update &&
+	test_cmp submodule/file super/submodule/file
 
-Turn off this advice by setting config variable advice.detachedHead to false
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/super/submodule'...
+done.
+Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
+ok 6 - updating submodule when the gitmodules config is not checked out
 
-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 7418.7 're-updating submodule when the gitmodules config is not checked out': 
+	test_when_finished "git -C submodule reset --hard $ORIG_SUBMODULE;
+			    git -C upstream reset --hard $ORIG_UPSTREAM;
+			    git -C super reset --hard $ORIG_SUPER;
+			    git -C upstream submodule update --remote;
+			    git -C super pull;
+			    git -C super submodule update --remote" &&
+	(cd submodule &&
+		echo file2 >file2 &&
+		git add file2 &&
+		test_tick &&
+		git commit -m "Add file2 to submodule"
+	) &&
+	(cd upstream &&
+		git submodule update --remote &&
+		git add submodule &&
+		test_tick &&
+		git commit -m "Update submodule"
+	) &&
+	git -C super pull &&
+	# The --for-status options reads the gitmodules config
+	git -C super submodule summary --for-status >actual &&
+	rev1=$(git -C submodule rev-parse --short HEAD) &&
+	rev2=$(git -C submodule rev-parse --short HEAD^) &&
+	cat >expect <<-EOF &&
+	* submodule ${rev1}...${rev2} (1):
+	  < Add file2 to submodule
 
-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"
+	EOF
+	test_cmp expect actual &&
+	# Test that the update actually succeeds
+	test_path_is_missing super/submodule/file2 &&
+	git -C super submodule update &&
+	test_cmp submodule/file2 super/submodule/file2 &&
+	git -C super status --short >output &&
+	test_must_be_empty output
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7063-status-untracked-cache/worktree-symlink/worktree-non-symlink/.git/
-[main (root-commit) 294fddc] first commit
+[master 83d36b8] Add file2 to submodule
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
+   a939200..83d36b8  master     -> origin/master
+Submodule path 'submodule': checked out '83d36b861ad581dea26a4034aeffa2f715923589'
+[master 5ae4276] Update submodule
  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 -
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
+   caa93e1..5ae4276  master     -> origin/master
+Fetching submodule submodule
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
+   a939200..83d36b8  master     -> origin/master
+Updating caa93e1..5ae4276
+Fast-forward
+ submodule | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Submodule path 'submodule': checked out '83d36b861ad581dea26a4034aeffa2f715923589'
+HEAD is now at a939200 Add file
+HEAD is now at caa93e1 Add submodule
+HEAD is now at caa93e1 Add submodule
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
+ + 83d36b8...a939200 master     -> origin/master  (forced update)
+Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
+ + 5ae4276...caa93e1 master     -> origin/master  (forced update)
+Already up to date.
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
+ + 83d36b8...a939200 master     -> origin/master  (forced update)
+Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
+ok 7 - re-updating submodule when the gitmodules config is not checked out
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7418.8 'not adding submodules when the gitmodules config is not checked out': 
+	git clone submodule new_submodule &&
+	test_must_fail git -C super submodule add ../new_submodule &&
+	test_path_is_missing .gitmodules
 
-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
+Cloning into 'new_submodule'...
+done.
+fatal: please make sure that the .gitmodules file is in the working tree
+ok 8 - not adding submodules when the gitmodules config is not checked out
 
-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
+expecting success of 7418.9 'init submodule still works even after the previous add failed': 
+	git -C super submodule init
 
-Note: switching to 'HEAD~'.
+ok 9 - init submodule still works even after the previous add failed
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7420-submodule-set-url.sh ***
+expecting success of 7420.1 'setup': 
+	git config --global protocol.file.allow always
 
-If you want to 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 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"
+	)
 
-Or undo this operation with:
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t/trash directory.t7420-submodule-set-url/super/.git/
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7420-submodule-set-url/super/submodule'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/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
 
-  git switch -
+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 &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	(
+		cd namedsubmodule &&
+		echo 2 >>file &&
+		git add file &&
+		git commit -m2
+	) &&
+	mv namedsubmodule newnamedsubmodule &&
 
-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
+	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
 
-expecting success of 7063.58 'empty repo (no index) and core.untrackedCache': 
-	git init emptyrepo &&
-	git -C emptyrepo -c core.untrackedCache=true write-tree
+[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.51.0/t/trash directory.t7420-submodule-set-url/submodule' does not appear to be a git repository
+fatal: Could not read from remote repository.
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7063-status-untracked-cache/worktree-symlink/worktree-non-symlink/emptyrepo/.git/
-4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 58 - empty repo (no index) and core.untrackedCache
+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.51.0/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.51.0/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 58 test(s)
-1..58
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7416-submodule-dash-url.sh ***
@@ -475216,288 +475156,105 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7418-submodule-sparse-gitmodules.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/.git/
-expecting success of 7418.1 'setup': 
+*** t7421-submodule-summary-add.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 7418.2 'sparse checkout setup which hides .gitmodules': 
-	git init upstream &&
-	git init submodule &&
-	(cd submodule &&
-		echo file >file &&
-		git add file &&
-		test_tick &&
-		git commit -m "Add file"
-	) &&
-	(cd upstream &&
-		git submodule add ../submodule &&
-		test_tick &&
-		git commit -m "Add submodule"
-	) &&
-	git clone --template= upstream super &&
-	(cd super &&
-		mkdir .git/info &&
-		cat >.git/info/sparse-checkout <<-\EOF &&
-		/*
-		!/.gitmodules
-		EOF
-		git config core.sparsecheckout true &&
-		git read-tree -m -u HEAD &&
-		test_path_is_missing .gitmodules
-	)
+expecting success of 7421.2 'summary test environment setup': 
+	git init sm &&
+	test_commit -C sm "add file" file file-content file-tag &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/submodule/.git/
-[master (root-commit) a939200] Add file
+	git submodule add ./sm my-subm &&
+	test_tick &&
+	git commit -m "add submodule"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/submodule'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7421-submodule-summary-add/my-subm'...
 done.
-[master (root-commit) caa93e1] Add submodule
+[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 submodule
-Cloning into 'super'...
-done.
-ok 2 - sparse checkout setup which hides .gitmodules
-
-expecting success of 7418.3 'reading gitmodules config file when it is not checked out': 
-	echo "../submodule" >expect &&
-	test-tool -C super submodule config-list submodule.submodule.url >actual &&
-	test_cmp expect actual
-
-ok 3 - reading gitmodules config file when it is not checked out
-
-expecting success of 7418.4 'not writing gitmodules config file when it is not checked out': 
-	test_must_fail test-tool -C super submodule config-set submodule.submodule.url newurl &&
-	test_path_is_missing super/.gitmodules
-
-fatal: please make sure that the .gitmodules file is in the working tree
-ok 4 - not writing gitmodules config file when it is not checked out
-
-expecting success of 7418.5 'initialising submodule when the gitmodules config is not checked out': 
-	test_must_fail git -C super config submodule.submodule.url &&
-	git -C super submodule init &&
-	git -C super config submodule.submodule.url >actual &&
-	echo "$(pwd)/submodule" >expect &&
-	test_cmp expect actual
-
-Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/submodule) registered for path 'submodule'
-ok 5 - initialising submodule when the gitmodules config is not checked out
-
-expecting success of 7418.6 'updating submodule when the gitmodules config is not checked out': 
-	test_path_is_missing super/submodule/file &&
-	git -C super submodule update &&
-	test_cmp submodule/file super/submodule/file
-
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/super/submodule'...
-done.
-Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
-ok 6 - updating submodule when the gitmodules config is not checked out
+ create mode 160000 my-subm
+ok 2 - summary test environment setup
 
-expecting success of 7418.7 're-updating submodule when the gitmodules config is not checked out': 
-	test_when_finished "git -C submodule reset --hard $ORIG_SUBMODULE;
-			    git -C upstream reset --hard $ORIG_UPSTREAM;
-			    git -C super reset --hard $ORIG_SUPER;
-			    git -C upstream submodule update --remote;
-			    git -C super pull;
-			    git -C super submodule update --remote" &&
-	(cd submodule &&
-		echo file2 >file2 &&
-		git add file2 &&
-		test_tick &&
-		git commit -m "Add file2 to submodule"
-	) &&
-	(cd upstream &&
-		git submodule update --remote &&
-		git add submodule &&
-		test_tick &&
-		git commit -m "Update submodule"
-	) &&
-	git -C super pull &&
-	# The --for-status options reads the gitmodules config
-	git -C super submodule summary --for-status >actual &&
-	rev1=$(git -C submodule rev-parse --short HEAD) &&
-	rev2=$(git -C submodule rev-parse --short HEAD^) &&
-	cat >expect <<-EOF &&
-	* submodule ${rev1}...${rev2} (1):
-	  < Add file2 to submodule
+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 expect actual &&
-	# Test that the update actually succeeds
-	test_path_is_missing super/submodule/file2 &&
-	git -C super submodule update &&
-	test_cmp submodule/file2 super/submodule/file2 &&
-	git -C super status --short >output &&
-	test_must_be_empty output
+	test_cmp expected actual
 
-[master 83d36b8] Add file2 to submodule
+[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.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
-   a939200..83d36b8  master     -> origin/master
-Submodule path 'submodule': checked out '83d36b861ad581dea26a4034aeffa2f715923589'
-[master 5ae4276] Update submodule
+From /build/reproducible-path/git-2.51.0/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(-)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
-   caa93e1..5ae4276  master     -> origin/master
-Fetching submodule submodule
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
-   a939200..83d36b8  master     -> origin/master
-Updating caa93e1..5ae4276
-Fast-forward
- submodule | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Submodule path 'submodule': checked out '83d36b861ad581dea26a4034aeffa2f715923589'
-HEAD is now at a939200 Add file
-HEAD is now at caa93e1 Add submodule
-HEAD is now at caa93e1 Add submodule
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
- + 83d36b8...a939200 master     -> origin/master  (forced update)
-Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
- + 5ae4276...caa93e1 master     -> origin/master  (forced update)
-Already up to date.
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
- + 83d36b8...a939200 master     -> origin/master  (forced update)
-Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
-ok 7 - re-updating submodule when the gitmodules config is not checked out
+ok 3 - submodule summary output for initialized submodule
 
-expecting success of 7418.8 'not adding submodules when the gitmodules config is not checked out': 
-	git clone submodule new_submodule &&
-	test_must_fail git -C super submodule add ../new_submodule &&
-	test_path_is_missing .gitmodules
+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
 
-Cloning into 'new_submodule'...
-done.
-fatal: please make sure that the .gitmodules file is in the working tree
-ok 8 - not adding submodules when the gitmodules config is not checked out
+	EOF
+	test_cmp expected actual
 
-expecting success of 7418.9 'init submodule still works even after the previous add failed': 
-	git -C super submodule init
+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.51.0/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
 
-ok 9 - init submodule still works even after the previous add failed
+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:
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7423-submodule-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7423-submodule-symlinks/.git/
-expecting success of 7423.1 'prepare': 
-	git config --global protocol.file.allow always &&
-	test_commit initial &&
-	git init upstream &&
-	test_commit -C upstream upstream submodule_file &&
-	git submodule add ./upstream a/sm &&
-	test_tick &&
-	git commit -m submodule
+	EOF
+	test_cmp expected actual
 
-[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.51.0/t/trash directory.t7423-submodule-symlinks/upstream/.git/
-[master (root-commit) 8435948] upstream
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 submodule_file
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7423-submodule-symlinks/a/sm'...
-done.
-[master e6b5e91] submodule
+[master 02e2066] change submodule path
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 a/sm
-ok 1 - prepare
-
-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 7423.2 'git submodule update must not create submodule behind symlink': 
-	rm -rf a b &&
-	mkdir b &&
-	ln -s b a &&
-	test_path_is_missing b/sm &&
-	test_must_fail git submodule update &&
-	test_path_is_missing b/sm
-
-error: expected 'a' in submodule path 'a/sm' not to be a symbolic link
-Failed to clone 'a/sm'. Retry scheduled
-error: expected 'a' in submodule path 'a/sm' not to be a symbolic link
-Failed to clone 'a/sm' a second time, aborting
-ok 2 - git submodule update must not create submodule behind symlink
-
-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 3 # skip git submodule update must not create submodule behind symlink on case insensitive fs (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
-
-expecting success of 7423.4 'git restore --recurse-submodules must not be confused by a symlink': 
-	prepare_symlink_to_repo &&
-	test_must_fail git restore --recurse-submodules a/sm &&
-	test_path_is_missing a/sm/submodule_file &&
-	test_path_is_dir a/target/.git &&
-	test_path_is_missing a/target/submodule_file
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7423-submodule-symlinks/a/target/.git/
-From ../../upstream
- * branch            HEAD       -> FETCH_HEAD
-error: expected submodule path 'a/sm' not to be a symbolic link
-ok 4 - git restore --recurse-submodules must not be confused by a symlink
-
-expecting success of 7423.5 'git restore --recurse-submodules must not migrate git dir of symlinked repo': 
-	prepare_symlink_to_repo &&
-	rm -rf .git/modules &&
-	test_must_fail git restore --recurse-submodules a/sm &&
-	test_path_is_dir a/target/.git &&
-	test_path_is_missing .git/modules/a/sm &&
-	test_path_is_missing a/target/submodule_file
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7423-submodule-symlinks/a/target/.git/
-From ../../upstream
- * branch            HEAD       -> FETCH_HEAD
-error: expected submodule path 'a/sm' not to be a symbolic link
-ok 5 - git restore --recurse-submodules must not migrate git dir of symlinked repo
-
-expecting success of 7423.6 'git checkout -f --recurse-submodules must not migrate git dir of symlinked repo when removing submodule': 
-	prepare_symlink_to_repo &&
-	rm -rf .git/modules &&
-	test_must_fail git checkout -f --recurse-submodules initial &&
-	test_path_is_dir a/target/.git &&
-	test_path_is_missing .git/modules/a/sm
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7423-submodule-symlinks/a/target/.git/
-From ../../upstream
- * branch            HEAD       -> FETCH_HEAD
-error: expected submodule path 'a/sm' not to be a symbolic link
-ok 6 - git checkout -f --recurse-submodules must not migrate git dir of symlinked repo when removing submodule
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename my-subm => subm (100%)
+ok 5 - submodule summary output for submodules with changed paths
 
-# passed all 6 test(s)
-1..6
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7419-submodule-set-branch.sh ***
@@ -475652,105 +475409,114 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7421-submodule-summary-add.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
+*** t7423-submodule-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7423-submodule-symlinks/.git/
+expecting success of 7423.1 'prepare': 
+	git config --global protocol.file.allow always &&
+	test_commit initial &&
+	git init upstream &&
+	test_commit -C upstream upstream submodule_file &&
+	git submodule add ./upstream a/sm &&
 	test_tick &&
-	git commit -m "add submodule"
+	git commit -m submodule
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7421-submodule-summary-add/sm/.git/
-[master (root-commit) 35b40f1] add file
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7421-submodule-summary-add/my-subm'...
+ create mode 100644 initial.t
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7423-submodule-symlinks/upstream/.git/
+[master (root-commit) 8435948] upstream
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 submodule_file
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7423-submodule-symlinks/a/sm'...
 done.
-[master (root-commit) 0d0296a] add submodule
+[master e6b5e91] 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
+ create mode 160000 a/sm
+ok 1 - prepare
 
-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
+checking prerequisite: SYMLINKS
 
-	EOF
-	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
 
-[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.51.0/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
+)
+prerequisite SYMLINKS ok
+expecting success of 7423.2 'git submodule update must not create submodule behind symlink': 
+	rm -rf a b &&
+	mkdir b &&
+	ln -s b a &&
+	test_path_is_missing b/sm &&
+	test_must_fail git submodule update &&
+	test_path_is_missing b/sm
 
-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
+error: expected 'a' in submodule path 'a/sm' not to be a symbolic link
+Failed to clone 'a/sm'. Retry scheduled
+error: expected 'a' in submodule path 'a/sm' not to be a symbolic link
+Failed to clone 'a/sm' a second time, aborting
+ok 2 - git submodule update must not create submodule behind symlink
 
-	EOF
-	test_cmp expected actual
+checking prerequisite: CASE_INSENSITIVE_FS
 
-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.51.0/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
+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 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:
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+ok 3 # skip git submodule update must not create submodule behind symlink on case insensitive fs (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
 
-	EOF
-	test_cmp expected actual
+expecting success of 7423.4 'git restore --recurse-submodules must not be confused by a symlink': 
+	prepare_symlink_to_repo &&
+	test_must_fail git restore --recurse-submodules a/sm &&
+	test_path_is_missing a/sm/submodule_file &&
+	test_path_is_dir a/target/.git &&
+	test_path_is_missing a/target/submodule_file
 
-[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
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7423-submodule-symlinks/a/target/.git/
+From ../../upstream
+ * branch            HEAD       -> FETCH_HEAD
+error: expected submodule path 'a/sm' not to be a symbolic link
+ok 4 - git restore --recurse-submodules must not be confused by a symlink
 
-# passed all 5 test(s)
-1..5
+expecting success of 7423.5 'git restore --recurse-submodules must not migrate git dir of symlinked repo': 
+	prepare_symlink_to_repo &&
+	rm -rf .git/modules &&
+	test_must_fail git restore --recurse-submodules a/sm &&
+	test_path_is_dir a/target/.git &&
+	test_path_is_missing .git/modules/a/sm &&
+	test_path_is_missing a/target/submodule_file
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7423-submodule-symlinks/a/target/.git/
+From ../../upstream
+ * branch            HEAD       -> FETCH_HEAD
+error: expected submodule path 'a/sm' not to be a symbolic link
+ok 5 - git restore --recurse-submodules must not migrate git dir of symlinked repo
+
+expecting success of 7423.6 'git checkout -f --recurse-submodules must not migrate git dir of symlinked repo when removing submodule': 
+	prepare_symlink_to_repo &&
+	rm -rf .git/modules &&
+	test_must_fail git checkout -f --recurse-submodules initial &&
+	test_path_is_dir a/target/.git &&
+	test_path_is_missing .git/modules/a/sm
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7423-submodule-symlinks/a/target/.git/
+From ../../upstream
+ * branch            HEAD       -> FETCH_HEAD
+error: expected submodule path 'a/sm' not to be a symbolic link
+ok 6 - git checkout -f --recurse-submodules must not migrate git dir of symlinked repo when removing submodule
+
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7407-submodule-foreach.sh ***
@@ -476651,1862 +476417,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7450-bad-git-dotfiles.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/.git/
-expecting success of 7450.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
-
-expecting success of 7450.2 'check names': 
-	cat >expect <<-\EOF &&
-	valid
-	valid/with/paths
-	EOF
-
-	test-tool submodule check-name >actual <<-\EOF &&
-	valid
-	valid/with/paths
-
-	../foo
-	/../foo
-	..\foo
-	\..\foo
-	foo/..
-	foo/../
-	foo\..
-	foo\..\
-	foo/../bar
-	EOF
-
-	test_cmp expect actual
-
-ok 2 - check names
-
-expecting success of 7450.3 'check urls': 
-	cat >expect <<-\EOF &&
-	./bar/baz/foo.git
-	https://example.com/foo.git
-	http://example.com:80/deeper/foo.git
-	EOF
-
-	test-tool submodule check-url >actual <<-\EOF &&
-	./bar/baz/foo.git
-	https://example.com/foo.git
-	http://example.com:80/deeper/foo.git
-	-a./foo
-	../../..//test/foo.git
-	../../../../../:localhost:8080/foo.git
-	..\../.\../:example.com/foo.git
-	./%0ahost=example.com/foo.git
-	https://one.example.com/evil?%0ahost=two.example.com
-	https:///example.com/foo.git
-	http://example.com:test/foo.git
-	https::example.com/foo.git
-	http:::example.com/foo.git
-	EOF
-
-	test_cmp expect actual
-
-ok 3 - check urls
-
-expecting success of 7450.4 'create innocent subrepo': 
-	git init innocent &&
-	git -C innocent commit --allow-empty -m foo
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/innocent/.git/
-[master (root-commit) 2093db0] foo
- Author: A U Thor <author@example.com>
-ok 4 - create innocent subrepo
-
-expecting success of 7450.5 'submodule add refuses invalid names': 
-	test_must_fail \
-		git submodule add --name ../../modules/evil "$PWD/innocent" evil
-
-fatal: '../../modules/evil' is not a valid submodule name
-ok 5 - submodule add refuses invalid names
-
-expecting success of 7450.6 'add evil submodule': 
-	git submodule add "$PWD/innocent" evil &&
-
-	mkdir modules &&
-	cp -r .git/modules/evil modules &&
-	write_script modules/evil/hooks/post-checkout <<-\EOF &&
-	echo >&2 "RUNNING POST CHECKOUT"
-	EOF
-
-	git config -f .gitmodules submodule.evil.update checkout &&
-	git config -f .gitmodules --rename-section \
-		submodule.evil submodule.../../modules/evil &&
-	git add modules &&
-	git commit -am evil
-
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/evil'...
-done.
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-[master (root-commit) a4e446b] evil
- Author: A U Thor <author@example.com>
- 30 files changed, 902 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 evil
- create mode 100644 modules/evil/HEAD
- create mode 100644 modules/evil/config
- create mode 100644 modules/evil/description
- create mode 100755 modules/evil/hooks/applypatch-msg.sample
- create mode 100755 modules/evil/hooks/commit-msg.sample
- create mode 100755 modules/evil/hooks/fsmonitor-watchman.sample
- create mode 100755 modules/evil/hooks/post-checkout
- create mode 100755 modules/evil/hooks/post-update.sample
- create mode 100755 modules/evil/hooks/pre-applypatch.sample
- create mode 100755 modules/evil/hooks/pre-commit.sample
- create mode 100755 modules/evil/hooks/pre-merge-commit.sample
- create mode 100755 modules/evil/hooks/pre-push.sample
- create mode 100755 modules/evil/hooks/pre-rebase.sample
- create mode 100755 modules/evil/hooks/pre-receive.sample
- create mode 100755 modules/evil/hooks/prepare-commit-msg.sample
- create mode 100755 modules/evil/hooks/push-to-checkout.sample
- create mode 100755 modules/evil/hooks/sendemail-validate.sample
- create mode 100755 modules/evil/hooks/update.sample
- create mode 100644 modules/evil/index
- create mode 100644 modules/evil/info/exclude
- create mode 100644 modules/evil/logs/HEAD
- create mode 100644 modules/evil/logs/refs/heads/master
- create mode 100644 modules/evil/logs/refs/remotes/origin/HEAD
- create mode 100644 modules/evil/objects/20/93db06f424f426e05da2ca90f40d2663e89387
- create mode 100644 modules/evil/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904
- create mode 100644 modules/evil/packed-refs
- create mode 100644 modules/evil/refs/heads/master
- create mode 100644 modules/evil/refs/remotes/origin/HEAD
-ok 6 - add evil submodule
-
-expecting success of 7450.7 'add other submodule': 
-	git submodule add "$PWD/innocent" another-module &&
-	git add another-module &&
-	git commit -am another
-
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/another-module'...
-done.
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-[master 28f5b75] another
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 another-module
-ok 7 - add other submodule
-
-expecting success of 7450.8 'clone evil superproject': 
-	git clone --recurse-submodules . victim >output 2>&1 &&
-	! grep "RUNNING POST CHECKOUT" output
-
-ok 8 - clone evil superproject
-
-expecting success of 7450.9 'fsck detects evil superproject': 
-	test_must_fail git fsck
-
-error in blob 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
-error in blob 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
-error in blob 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
-error in blob a17bebcf8cf0fbcf9beb8eae8f728fbca1543a61: gitmodulesName: disallowed submodule name: ../../modules/evil
-error in blob a17bebcf8cf0fbcf9beb8eae8f728fbca1543a61: gitmodulesName: disallowed submodule name: ../../modules/evil
-error in blob a17bebcf8cf0fbcf9beb8eae8f728fbca1543a61: gitmodulesName: disallowed submodule name: ../../modules/evil
-dangling blob 0c526c7700944035a7ab3fcd79e3c615d6780544
-ok 9 - fsck detects evil superproject
-
-expecting success of 7450.10 'transfer.fsckObjects detects evil superproject (unpack)': 
-	rm -rf dst.git &&
-	git init --bare dst.git &&
-	git -C dst.git config transfer.fsckObjects true &&
-	test_must_fail git push dst.git HEAD
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/dst.git/
-remote: error: object a17bebcf8cf0fbcf9beb8eae8f728fbca1543a61: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object a17bebcf8cf0fbcf9beb8eae8f728fbca1543a61: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object a17bebcf8cf0fbcf9beb8eae8f728fbca1543a61: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: fatal: fsck error in pack objects        
-error: remote unpack failed: unpack-objects abnormal exit
-To dst.git
- ! [remote rejected] HEAD -> master (unpacker error)
-error: failed to push some refs to 'dst.git'
-ok 10 - transfer.fsckObjects detects evil superproject (unpack)
-
-expecting success of 7450.11 'transfer.fsckObjects detects evil superproject (index)': 
-	rm -rf dst.git &&
-	git init --bare dst.git &&
-	git -C dst.git config transfer.fsckObjects true &&
-	git -C dst.git config transfer.unpackLimit 1 &&
-	test_must_fail git push dst.git HEAD
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/dst.git/
-remote: error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: index-pack abnormal exit
-To dst.git
- ! [remote rejected] HEAD -> master (unpacker error)
-error: failed to push some refs to 'dst.git'
-ok 11 - transfer.fsckObjects detects evil superproject (index)
-
-expecting success of 7450.12 'create oddly ordered pack': 
-	git checkout --orphan odd &&
-	git rm -rf --cached . &&
-	git add .gitmodules &&
-	git commit -m odd &&
-	{
-		pack_header 3 &&
-		pack_obj $(git rev-parse HEAD:.gitmodules) &&
-		pack_obj $(git rev-parse HEAD^{tree}) &&
-		pack_obj $(git rev-parse HEAD)
-	} >odd.pack &&
-	pack_trailer odd.pack
-
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-Switched to a new branch 'odd'
-rm '.gitmodules'
-rm 'another-module'
-rm 'evil'
-rm 'modules/evil/HEAD'
-rm 'modules/evil/config'
-rm 'modules/evil/description'
-rm 'modules/evil/hooks/applypatch-msg.sample'
-rm 'modules/evil/hooks/commit-msg.sample'
-rm 'modules/evil/hooks/fsmonitor-watchman.sample'
-rm 'modules/evil/hooks/post-checkout'
-rm 'modules/evil/hooks/post-update.sample'
-rm 'modules/evil/hooks/pre-applypatch.sample'
-rm 'modules/evil/hooks/pre-commit.sample'
-rm 'modules/evil/hooks/pre-merge-commit.sample'
-rm 'modules/evil/hooks/pre-push.sample'
-rm 'modules/evil/hooks/pre-rebase.sample'
-rm 'modules/evil/hooks/pre-receive.sample'
-rm 'modules/evil/hooks/prepare-commit-msg.sample'
-rm 'modules/evil/hooks/push-to-checkout.sample'
-rm 'modules/evil/hooks/sendemail-validate.sample'
-rm 'modules/evil/hooks/update.sample'
-rm 'modules/evil/index'
-rm 'modules/evil/info/exclude'
-rm 'modules/evil/logs/HEAD'
-rm 'modules/evil/logs/refs/heads/master'
-rm 'modules/evil/logs/refs/remotes/origin/HEAD'
-rm 'modules/evil/objects/20/93db06f424f426e05da2ca90f40d2663e89387'
-rm 'modules/evil/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904'
-rm 'modules/evil/packed-refs'
-rm 'modules/evil/refs/heads/master'
-rm 'modules/evil/refs/remotes/origin/HEAD'
-[odd (root-commit) abf84d8] odd
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-157+0 records in
-157+0 records out
-157 bytes copied, 0.000137601 s, 1.1 MB/s
-49+0 records in
-49+0 records out
-49 bytes copied, 5.9881e-05 s, 818 kB/s
-127+0 records in
-127+0 records out
-127 bytes copied, 0.000117641 s, 1.1 MB/s
-ok 12 - create oddly ordered pack
-
-expecting success of 7450.13 'transfer.fsckObjects handles odd pack (unpack)': 
-	rm -rf dst.git &&
-	git init --bare dst.git &&
-	test_must_fail git -C dst.git unpack-objects --strict <odd.pack
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/dst.git/
-error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
-error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
-error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
-fatal: fsck error in pack objects
-ok 13 - transfer.fsckObjects handles odd pack (unpack)
-
-expecting success of 7450.14 'transfer.fsckObjects handles odd pack (index)': 
-	rm -rf dst.git &&
-	git init --bare dst.git &&
-	test_must_fail git -C dst.git index-pack --strict --stdin <odd.pack
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/dst.git/
-pack	e55f466b5e23bc925833084626ca4757050c9af1
-error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
-error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
-error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
-fatal: fsck error in pack objects
-ok 14 - transfer.fsckObjects handles odd pack (index)
-
-expecting success of 7450.15 'index-pack --strict works for non-repo pack': 
-	rm -rf dst.git &&
-	git init --bare dst.git &&
-	cp odd.pack dst.git &&
-	test_must_fail git -C dst.git index-pack --strict odd.pack 2>output &&
-	# Make sure we fail due to bad gitmodules content, not because we
-	# could not read the blob in the first place.
-	grep gitmodulesName output
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/dst.git/
-e55f466b5e23bc925833084626ca4757050c9af1
-error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
-error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
-error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
-ok 15 - index-pack --strict works for non-repo pack
-
-expecting success of 7450.16 'set up repo with symlinked gitmodules (vanilla)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitmodules-vanilla/.git/
-ok 16 - set up repo with symlinked gitmodules (vanilla)
-
-expecting success of 7450.17 'fsck detects symlinked gitmodules (vanilla)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree 1de43f6689a4fb8a4ead3d7e0778f3e3b1567cd2
-error in tree 1de43f6689a4fb8a4ead3d7e0778f3e3b1567cd2: gitmodulesSymlink: .gitmodules is a symbolic link
-ok 17 - fsck detects symlinked gitmodules (vanilla)
-
-expecting success of 7450.18 'refuse to load symlinked gitmodules into index (vanilla)': 
-		test_must_fail \
-			git -C $dir \
-			    -c core.protectntfs \
-			    -c core.protecthfs \
-			    read-tree $tree 2>err &&
-		grep "invalid path.*$name" err &&
-		git -C $dir ls-files -s >out &&
-		test_must_be_empty out
-	
-error: invalid path '.gitmodules'
-ok 18 - refuse to load symlinked gitmodules into index (vanilla)
-
-expecting success of 7450.19 'set up repo with symlinked gitmodules (ntfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitmodules-ntfs/.git/
-ok 19 - set up repo with symlinked gitmodules (ntfs)
-
-expecting success of 7450.20 'fsck detects symlinked gitmodules (ntfs)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree 5a7b45b9745abfb24f7b781e26941eef28efd87b
-error in tree 5a7b45b9745abfb24f7b781e26941eef28efd87b: gitmodulesSymlink: .gitmodules is a symbolic link
-ok 20 - fsck detects symlinked gitmodules (ntfs)
-
-expecting success of 7450.21 'refuse to load symlinked gitmodules into index (ntfs)': 
-		test_must_fail \
-			git -C $dir \
-			    -c core.protectntfs \
-			    -c core.protecthfs \
-			    read-tree $tree 2>err &&
-		grep "invalid path.*$name" err &&
-		git -C $dir ls-files -s >out &&
-		test_must_be_empty out
-	
-error: invalid path '.gitmodules .'
-ok 21 - refuse to load symlinked gitmodules into index (ntfs)
-
-expecting success of 7450.22 'set up repo with symlinked gitmodules (hfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitmodules-hfs/.git/
-ok 22 - set up repo with symlinked gitmodules (hfs)
-
-expecting success of 7450.23 'fsck detects symlinked gitmodules (hfs)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree d491ec508aba148c1fbbc6617e78c926e667f481
-error in tree d491ec508aba148c1fbbc6617e78c926e667f481: gitmodulesSymlink: .gitmodules is a symbolic link
-ok 23 - fsck detects symlinked gitmodules (hfs)
-
-expecting success of 7450.24 'refuse to load symlinked gitmodules into index (hfs)': 
-		test_must_fail \
-			git -C $dir \
-			    -c core.protectntfs \
-			    -c core.protecthfs \
-			    read-tree $tree 2>err &&
-		grep "invalid path.*$name" err &&
-		git -C $dir ls-files -s >out &&
-		test_must_be_empty out
-	
-error: invalid path '.‌gitmodules'
-ok 24 - refuse to load symlinked gitmodules into index (hfs)
-
-expecting success of 7450.25 'set up repo with symlinked gitattributes (vanilla)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitattributes-vanilla/.git/
-ok 25 - set up repo with symlinked gitattributes (vanilla)
-
-expecting success of 7450.26 'fsck detects symlinked gitattributes (vanilla)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree ab8d3f6e600df522f80181bff8dd4db0e3b12b83
-warning in tree ab8d3f6e600df522f80181bff8dd4db0e3b12b83: gitattributesSymlink: .gitattributes is a symlink
-ok 26 - fsck detects symlinked gitattributes (vanilla)
-
-expecting success of 7450.27 'set up repo with symlinked gitattributes (ntfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitattributes-ntfs/.git/
-ok 27 - set up repo with symlinked gitattributes (ntfs)
-
-expecting success of 7450.28 'fsck detects symlinked gitattributes (ntfs)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree de4f54e780a6973bcf5ba53cafe70c0bb4be2f77
-warning in tree de4f54e780a6973bcf5ba53cafe70c0bb4be2f77: gitattributesSymlink: .gitattributes is a symlink
-ok 28 - fsck detects symlinked gitattributes (ntfs)
-
-expecting success of 7450.29 'set up repo with symlinked gitattributes (hfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitattributes-hfs/.git/
-ok 29 - set up repo with symlinked gitattributes (hfs)
-
-expecting success of 7450.30 'fsck detects symlinked gitattributes (hfs)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree 72c8ad9e99ffabc21c6ba035456b2634e7892acd
-warning in tree 72c8ad9e99ffabc21c6ba035456b2634e7892acd: gitattributesSymlink: .gitattributes is a symlink
-ok 30 - fsck detects symlinked gitattributes (hfs)
-
-expecting success of 7450.31 'set up repo with symlinked gitignore (vanilla)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitignore-vanilla/.git/
-ok 31 - set up repo with symlinked gitignore (vanilla)
-
-expecting success of 7450.32 'fsck detects symlinked gitignore (vanilla)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree c7a01622c2dc3f1d258c576db3f940864561682e
-warning in tree c7a01622c2dc3f1d258c576db3f940864561682e: gitignoreSymlink: .gitignore is a symlink
-ok 32 - fsck detects symlinked gitignore (vanilla)
-
-expecting success of 7450.33 'set up repo with symlinked gitignore (ntfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitignore-ntfs/.git/
-ok 33 - set up repo with symlinked gitignore (ntfs)
-
-expecting success of 7450.34 'fsck detects symlinked gitignore (ntfs)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree aea07d4d9a9ba4de470f64bf729b7c3f6688b4f2
-warning in tree aea07d4d9a9ba4de470f64bf729b7c3f6688b4f2: gitignoreSymlink: .gitignore is a symlink
-ok 34 - fsck detects symlinked gitignore (ntfs)
-
-expecting success of 7450.35 'set up repo with symlinked gitignore (hfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitignore-hfs/.git/
-ok 35 - set up repo with symlinked gitignore (hfs)
-
-expecting success of 7450.36 'fsck detects symlinked gitignore (hfs)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree d0e9256045455231ad11c143fe3e9e8875bb72e2
-warning in tree d0e9256045455231ad11c143fe3e9e8875bb72e2: gitignoreSymlink: .gitignore is a symlink
-ok 36 - fsck detects symlinked gitignore (hfs)
-
-expecting success of 7450.37 'set up repo with symlinked mailmap (vanilla)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-mailmap-vanilla/.git/
-ok 37 - set up repo with symlinked mailmap (vanilla)
-
-expecting success of 7450.38 'fsck detects symlinked mailmap (vanilla)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree 72925bd65d77c963914799387cc5b0097f512589
-warning in tree 72925bd65d77c963914799387cc5b0097f512589: mailmapSymlink: .mailmap is a symlink
-ok 38 - fsck detects symlinked mailmap (vanilla)
-
-expecting success of 7450.39 'set up repo with symlinked mailmap (ntfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-mailmap-ntfs/.git/
-ok 39 - set up repo with symlinked mailmap (ntfs)
-
-expecting success of 7450.40 'fsck detects symlinked mailmap (ntfs)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree 71113f7eb27bdce0e7f3c424a418ea84b7366b8e
-warning in tree 71113f7eb27bdce0e7f3c424a418ea84b7366b8e: mailmapSymlink: .mailmap is a symlink
-ok 40 - fsck detects symlinked mailmap (ntfs)
-
-expecting success of 7450.41 'set up repo with symlinked mailmap (hfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-mailmap-hfs/.git/
-ok 41 - set up repo with symlinked mailmap (hfs)
-
-expecting success of 7450.42 'fsck detects symlinked mailmap (hfs)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree 78e28f1c8c8a238149d76c95ad5af4e25c21c734
-warning in tree 78e28f1c8c8a238149d76c95ad5af4e25c21c734: mailmapSymlink: .mailmap is a symlink
-ok 42 - fsck detects symlinked mailmap (hfs)
-
-expecting success of 7450.43 'fsck detects non-blob .gitmodules': 
-	git init non-blob &&
-	(
-		cd non-blob &&
-
-		# As above, make the funny tree directly to avoid index
-		# restrictions.
-		mkdir subdir &&
-		cp ../.gitmodules subdir/file &&
-		git add subdir/file &&
-		git commit -m ok &&
-		git ls-tree HEAD | sed s/subdir/.gitmodules/ | git mktree &&
-
-		test_must_fail git fsck 2>output &&
-		test_grep gitmodulesBlob output
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/non-blob/.git/
-[master (root-commit) 9f6a675] ok
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
- create mode 100644 subdir/file
-4b2d50c3ea71a20915c30f189057ff36e32f65e0
-dangling tree 4b2d50c3ea71a20915c30f189057ff36e32f65e0
-error in tree 22b9058c44ece9ca06021f29a94fc5726f4b8413: gitmodulesBlob: non-blob found at .gitmodules
-ok 43 - fsck detects non-blob .gitmodules
-
-expecting success of 7450.44 'fsck detects corrupt .gitmodules': 
-	git init corrupt &&
-	(
-		cd corrupt &&
-
-		echo "[broken" >.gitmodules &&
-		git add .gitmodules &&
-		git commit -m "broken gitmodules" &&
-
-		git fsck 2>output &&
-		test_grep gitmodulesParse output &&
-		test_grep ! "bad config" output
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/corrupt/.git/
-[master (root-commit) 3fe1e33] broken gitmodules
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 .gitmodules
-warning in blob e39defa11acf1626d747f0b70076b6be5c0fd4c9: gitmodulesParse: could not parse gitmodules blob
-ok 44 - fsck detects corrupt .gitmodules
-
-ok 45 # skip prevent git~1 squatting on Windows (missing WINDOWS)
-
-expecting success of 7450.46 'setup submodules with nested git dirs': 
-	git init nested &&
-	test_commit -C nested nested &&
-	(
-		cd nested &&
-		cat >.gitmodules <<-EOF &&
-		[submodule "hippo"]
-			url = .
-			path = thing1
-		[submodule "hippo/hooks"]
-			url = .
-			path = thing2
-		EOF
-		git clone . thing1 &&
-		git clone . thing2 &&
-		git add .gitmodules thing1 thing2 &&
-		test_tick &&
-		git commit -m nested
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/nested/.git/
-[master (root-commit) 111f058] nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 nested.t
-Cloning into 'thing1'...
-done.
-Cloning into 'thing2'...
-done.
-warning: adding embedded git repository: thing1
-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> thing1
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached thing1
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-warning: adding embedded git repository: thing2
-[master f2f7cbd] nested
- Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 thing1
- create mode 160000 thing2
-ok 46 - setup submodules with nested git dirs
-
-expecting success of 7450.47 'git dirs of sibling submodules must not be nested': 
-	test_must_fail git clone --recurse-submodules nested clone 2>err &&
-	test_grep "is inside git dir" err
-
-error: submodule git dir '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo'
-error: submodule git dir '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo'
-ok 47 - git dirs of sibling submodules must not be nested
-
-expecting success of 7450.48 'submodule git dir nesting detection must work with parallel cloning': 
-	test_must_fail git clone --recurse-submodules --jobs=2 nested clone_parallel 2>err &&
-	cat err &&
-	grep -E "(already exists|is inside git dir|not a git repository)" err &&
-	{
-		test_path_is_missing .git/modules/hippo/HEAD ||
-		test_path_is_missing .git/modules/hippo/hooks/HEAD
-	}
-
-Cloning into 'clone_parallel'...
-done.
-Submodule 'hippo' (.) registered for path 'thing1'
-Submodule 'hippo/hooks' (.) registered for path 'thing2'
-fatal: repository path '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo' already exists and is not an empty directory.
-fatal: clone of '.' into submodule path '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1' failed
-Failed to clone 'thing1'. Retry scheduled
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing2'...
-done.
-fatal: not a git repository: /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1/../.git/modules/hippo
-Failed to clone 'thing1' a second time, aborting
-fatal: repository path '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo' already exists and is not an empty directory.
-fatal: not a git repository: /build/reproducible-path/git-2.51.0/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': 
-	git clone nested nested_checkout &&
-	(
-		cd nested_checkout &&
-		git submodule init &&
-		git submodule update thing1 &&
-		mkdir -p .git/modules/hippo/hooks/refs &&
-		mkdir -p .git/modules/hippo/hooks/objects/info &&
-		echo "../../../../objects" >.git/modules/hippo/hooks/objects/info/alternates &&
-		echo "ref: refs/heads/master" >.git/modules/hippo/hooks/HEAD
-	) &&
-	test_must_fail git -C nested_checkout checkout -f --recurse-submodules HEAD 2>err &&
-	cat err &&
-	grep "is inside git dir" err &&
-	test_path_is_missing nested_checkout/thing2/.git
-
-Cloning into 'nested_checkout'...
-done.
-Submodule 'hippo' (.) registered for path 'thing1'
-Submodule 'hippo/hooks' (.) registered for path 'thing2'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/nested_checkout/thing1'...
-done.
-Submodule path 'thing1': checked out '111f05809ae4bf877fb5852d7d418815278831e3'
-error: submodule git dir '.git/modules/hippo/hooks' is inside git dir '.git/modules/hippo'
-fatal: refusing to create/use '.git/modules/hippo/hooks' in another submodule's git dir
-error: submodule git dir '.git/modules/hippo/hooks' is inside git dir '.git/modules/hippo'
-ok 49 - checkout -f --recurse-submodules must not use a nested gitdir
-
-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 7450.50 'submodule must not checkout into different directory': 
-	test_when_finished "rm -rf sub repo bad-clone" &&
-
-	git init sub &&
-	write_script sub/post-checkout <<-\EOF &&
-	touch "$PWD/foo"
-	EOF
-	git -C sub add post-checkout &&
-	git -C sub commit -m hook &&
-
-	git init repo &&
-	git -C repo -c protocol.file.allow=always submodule add "$PWD/sub" sub &&
-	git -C repo mv sub $(printf "sub\r") &&
-
-	# Ensure config values containing CR are wrapped in quotes.
-	git config unset -f repo/.gitmodules submodule.sub.path &&
-	printf "\tpath = \"sub\r\"\n" >>repo/.gitmodules &&
-
-	git config unset -f repo/.git/modules/sub/config core.worktree &&
-	{
-		printf "[core]\n" &&
-		printf "\tworktree = \"../../../sub\r\"\n"
-	} >>repo/.git/modules/sub/config &&
-
-	ln -s .git/modules/sub/hooks repo/sub &&
-	git -C repo add -A &&
-	git -C repo commit -m submodule &&
-
-	git -c protocol.file.allow=always clone --recurse-submodules repo bad-clone &&
-	! test -f "$PWD/bad-clone/sub/foo" &&
-	test -f $(printf "bad-clone/sub\r/post-checkout")
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/sub/.git/
-[master (root-commit) 5f02a29] hook
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100755 post-checkout
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/repo/.git/
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/repo/sub'...
-done.
-[master (root-commit) 57a6b8d] submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 120000 sub
- create mode 160000 "sub\r"
-Cloning into 'bad-clone'...
-done.
-Submodule 'sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/sub) registered for path 'sub
'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/bad-clone/sub
'...
-done.
-Submodule path 'sub
': checked out '5f02a29dd48fb677069320bbc6d60730514e1ced'
-ok 50 - submodule must not checkout into different directory
-
-# passed all 50 test(s)
-1..50
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7500-commit-template-squash-signoff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7500-commit-template-squash-signoff/.git/
-expecting success of 7500.1 'a basic commit in an empty tree should succeed': 
-	echo content > foo &&
-	git add foo &&
-	git commit -m "initial commit"
-
-[master (root-commit) 02efb91] initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-ok 1 - a basic commit in an empty tree should succeed
-
-expecting success of 7500.2 'nonexistent template file should return error': 
-	echo changes >> foo &&
-	git add foo &&
-	(
-		GIT_EDITOR="echo hello >\"\$1\"" &&
-		export GIT_EDITOR &&
-		test_must_fail git commit --template "$PWD"/notexist
-	)
-
-fatal: could not read '/build/reproducible-path/git-2.51.0/t/trash directory.t7500-commit-template-squash-signoff/notexist': No such file or directory
-ok 2 - nonexistent template file should return error
-
-expecting success of 7500.3 'nonexistent template file in config should return error': 
-	test_config commit.template "$PWD"/notexist &&
-	(
-		GIT_EDITOR="echo hello >\"\$1\"" &&
-		export GIT_EDITOR &&
-		test_must_fail git commit
-	)
-
-fatal: could not read '/build/reproducible-path/git-2.51.0/t/trash directory.t7500-commit-template-squash-signoff/notexist': No such file or directory
-ok 3 - nonexistent template file in config should return error
-
-expecting success of 7500.4 'unedited template should not commit': 
-	echo "template line" > "$TEMPLATE" &&
-	test_must_fail git commit --template "$TEMPLATE"
-
-Aborting commit; you did not edit the message.
-ok 4 - unedited template should not commit
-
-expecting success of 7500.5 'unedited template with comments should not commit': 
-	echo "# comment in template" >> "$TEMPLATE" &&
-	test_must_fail git commit --template "$TEMPLATE"
-
-Aborting commit; you did not edit the message.
-ok 5 - unedited template with comments should not commit
-
-expecting success of 7500.6 'a Signed-off-by line by itself should not commit': 
-	(
-		test_set_editor "$TEST_DIRECTORY"/t7500/add-signed-off &&
-		test_must_fail git commit --template "$TEMPLATE"
-	)
-
-Aborting commit; you did not edit the message.
-ok 6 - a Signed-off-by line by itself should not commit
-
-expecting success of 7500.7 'adding comments to a template should not commit': 
-	(
-		test_set_editor "$TEST_DIRECTORY"/t7500/add-comments &&
-		test_must_fail git commit --template "$TEMPLATE"
-	)
-
-Aborting commit; you did not edit the message.
-ok 7 - adding comments to a template should not commit
-
-expecting success of 7500.8 'adding real content to a template should commit': 
-	(
-		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
-		git commit --template "$TEMPLATE"
-	) &&
-	commit_msg_is "template linecommit message"
-
-[master 0439be9] template line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 8 - adding real content to a template should commit
-
-expecting success of 7500.9 '-t option should be short for --template': 
-	echo "short template" > "$TEMPLATE" &&
-	echo "new content" >> foo &&
-	git add foo &&
-	(
-		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
-		git commit -t "$TEMPLATE"
-	) &&
-	commit_msg_is "short templatecommit message"
-
-[master e42593e] short template
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 9 - -t option should be short for --template
-
-expecting success of 7500.10 'config-specified template should commit': 
-	echo "new template" > "$TEMPLATE" &&
-	test_config commit.template "$TEMPLATE" &&
-	echo "more content" >> foo &&
-	git add foo &&
-	(
-		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
-		git commit
-	) &&
-	commit_msg_is "new templatecommit message"
-
-[master 811561e] new template
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 10 - config-specified template should commit
-
-expecting success of 7500.11 'explicit commit message should override template': 
-	echo "still more content" >> foo &&
-	git add foo &&
-	GIT_EDITOR="$TEST_DIRECTORY"/t7500/add-content git commit --template "$TEMPLATE" \
-		-m "command line msg" &&
-	commit_msg_is "command line msg"
-
-[master d8cbf96] command line msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 11 - explicit commit message should override template
-
-expecting success of 7500.12 'commit message from file should override template': 
-	echo "content galore" >> foo &&
-	git add foo &&
-	echo "standard input msg" |
-	(
-		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
-		git commit --template "$TEMPLATE" --file -
-	) &&
-	commit_msg_is "standard input msg"
-
-[master 65e5eb1] standard input msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 12 - commit message from file should override template
-
-expecting success of 7500.13 'commit message from template with whitespace issue': 
-	echo "content galore" >>foo &&
-	git add foo &&
-	GIT_EDITOR=\""$TEST_DIRECTORY"\"/t7500/add-whitespaced-content \
-	git commit --template "$TEMPLATE" &&
-	commit_msg_is "commit message"
-
-[master 5e66887] commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 13 - commit message from template with whitespace issue
-
-expecting success of 7500.14 'using alternate GIT_INDEX_FILE (1)': 
-
-	cp .git/index saved-index &&
-	(
-		echo some new content >file &&
-	        GIT_INDEX_FILE=.git/another_index &&
-		export GIT_INDEX_FILE &&
-		git add file &&
-		git commit -m "commit using another index" &&
-		git diff-index --exit-code HEAD &&
-		git diff-files --exit-code
-	) &&
-	cmp .git/index saved-index >/dev/null
-
-
-[master 7c961fb] commit using another index
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 7 deletions(-)
- create mode 100644 file
- delete mode 100644 foo
-ok 14 - using alternate GIT_INDEX_FILE (1)
-
-expecting success of 7500.15 'using alternate GIT_INDEX_FILE (2)': 
-
-	cp .git/index saved-index &&
-	(
-		rm -f .git/no-such-index &&
-		GIT_INDEX_FILE=.git/no-such-index &&
-		export GIT_INDEX_FILE &&
-		git commit -m "commit using nonexistent index" &&
-		test -z "$(git ls-files)" &&
-		test -z "$(git ls-tree HEAD)"
-
-	) &&
-	cmp .git/index saved-index >/dev/null
-
-[master 4e95e06] commit using nonexistent index
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file
-ok 15 - using alternate GIT_INDEX_FILE (2)
-
-expecting success of 7500.16 '--signoff': 
-	echo "yet another content *narf*" >> foo &&
-	echo "zort" | git commit -s -F - foo &&
-	git cat-file commit HEAD | sed "1,/^\$/d" > output &&
-	test_cmp expect output
-
-[master 5b1a0f3] zort
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 foo
-ok 16 - --signoff
-
-expecting success of 7500.17 'commit message from file (1)': 
-	mkdir subdir &&
-	echo "Log in top directory" >log &&
-	echo "Log in sub directory" >subdir/log &&
-	(
-		cd subdir &&
-		git commit --allow-empty -F log
-	) &&
-	commit_msg_is "Log in sub directory"
-
-[master 101c1bd] Log in sub directory
- Author: A U Thor <author@example.com>
-ok 17 - commit message from file (1)
-
-expecting success of 7500.18 'commit message from file (2)': 
-	rm -f log &&
-	echo "Log in sub directory" >subdir/log &&
-	(
-		cd subdir &&
-		git commit --allow-empty -F log
-	) &&
-	commit_msg_is "Log in sub directory"
-
-[master 83046dc] Log in sub directory
- Author: A U Thor <author@example.com>
-ok 18 - commit message from file (2)
-
-expecting success of 7500.19 'commit message from stdin': 
-	(
-		cd subdir &&
-		echo "Log with foo word" | git commit --allow-empty -F -
-	) &&
-	commit_msg_is "Log with foo word"
-
-[master 2f170f9] Log with foo word
- Author: A U Thor <author@example.com>
-ok 19 - commit message from stdin
-
-expecting success of 7500.20 'commit -F overrides -t': 
-	(
-		cd subdir &&
-		echo "-F log" > f.log &&
-		echo "-t template" > t.template &&
-		git commit --allow-empty -F f.log -t t.template
-	) &&
-	commit_msg_is "-F log"
-
-[master df55417] -F log
- Author: A U Thor <author@example.com>
-ok 20 - commit -F overrides -t
-
-expecting success of 7500.21 'Commit without message is allowed with --allow-empty-message': 
-	echo "more content" >>foo &&
-	git add foo &&
-	>empty &&
-	git commit --allow-empty-message <empty &&
-	commit_msg_is "" &&
-	git tag empty-message-commit
-
-[master 5cf7fec] 
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 21 - Commit without message is allowed with --allow-empty-message
-
-expecting success of 7500.22 'Commit without message is no-no without --allow-empty-message': 
-	echo "more content" >>foo &&
-	git add foo &&
-	>empty &&
-	test_must_fail git commit <empty
-
-Aborting commit due to empty commit message.
-ok 22 - Commit without message is no-no without --allow-empty-message
-
-expecting success of 7500.23 'Commit a message with --allow-empty-message': 
-	echo "even more content" >>foo &&
-	git add foo &&
-	git commit --allow-empty-message -m"hello there" &&
-	commit_msg_is "hello there"
-
-[master 1a05b50] hello there
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 23 - Commit a message with --allow-empty-message
-
-expecting success of 7500.24 'commit -C empty respects --allow-empty-message': 
-	echo more >>foo &&
-	git add foo &&
-	test_must_fail git commit -C empty-message-commit &&
-	git commit -C empty-message-commit --allow-empty-message &&
-	commit_msg_is ""
-
-Aborting commit due to empty commit message.
-[master 7c3a153] 
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-ok 24 - commit -C empty respects --allow-empty-message
-
-expecting success of 7500.25 'commit --fixup provides correct one-line commit message': 
-	commit_for_rebase_autosquash_setup &&
-	EDITOR="echo ignored >>" git commit --fixup HEAD~1 &&
-	commit_msg_is "fixup! target message subject line"
-
-[master 9b5b399] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 5b2adcc] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 77c550c] fixup! target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 25 - commit --fixup provides correct one-line commit message
-
-expecting success of 7500.26 'commit --fixup -m"something" -m"extra"': 
-	commit_for_rebase_autosquash_setup &&
-	git commit --fixup HEAD~1 -m"something" -m"extra" &&
-	commit_msg_is "fixup! target message subject linesomething
-
-extra"
-
-[master d870198] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 4134eb8] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master d256be7] fixup! target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 26 - commit --fixup -m"something" -m"extra"
-
-expecting success of 7500.27 'commit --fixup --edit': 
-	commit_for_rebase_autosquash_setup &&
-	EDITOR="printf \"something\nextra\" >>" git commit --fixup HEAD~1 --edit &&
-	commit_msg_is "fixup! target message subject linesomething
-extra"
-
-[master 68474d9] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master d9cd24a] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b813bdf] fixup! target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 27 - commit --fixup --edit
-
-expecting success of 7500.28 'commit --fixup=amend: creates amend! commit': 
-	commit_for_rebase_autosquash_setup &&
-	cat >expected <<-EOF &&
-	amend! $(git log -1 --format=%s HEAD~)
-
-	$(get_commit_msg HEAD~)
-
-	edited
-	EOF
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="edited" \
-			git commit --fixup=amend:HEAD~
-	) &&
-	get_commit_msg HEAD >actual &&
-	test_cmp expected actual
-
-[master 25d4b87] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 49d2e45] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 6a95a22] amend! target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 28 - commit --fixup=amend: creates amend! commit
-
-expecting success of 7500.29 '--fixup=amend: --only ignores staged changes': 
-	commit_for_rebase_autosquash_setup &&
-	cat >expected <<-EOF &&
-	amend! $(git log -1 --format=%s HEAD~)
-
-	$(get_commit_msg HEAD~)
-
-	edited
-	EOF
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="edited" \
-			git commit --fixup=amend:HEAD~ --only
-	) &&
-	get_commit_msg HEAD >actual &&
-	test_cmp expected actual &&
-	test_cmp_rev HEAD@{1}^{tree} HEAD^{tree} &&
-	test_cmp_rev HEAD@{1} HEAD^ &&
-	test_expect_code 1 git diff --cached --exit-code &&
-	git cat-file blob :foo >actual &&
-	test_cmp foo actual
-
-[master 495438c] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master edaae07] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 948c995] amend! target message subject line
- Author: A U Thor <author@example.com>
-diff --git a/foo b/foo
-index 42c2cbb..b6c6366 100644
---- a/foo
-+++ b/foo
-@@ -24,3 +24,4 @@ second content line
- third content line
- first content line
- second content line
-+third content line
-ok 29 - --fixup=amend: --only ignores staged changes
-
-expecting success of 7500.30 '--fixup=reword: ignores staged changes': 
-	commit_for_rebase_autosquash_setup &&
-	cat >expected <<-EOF &&
-	amend! $(git log -1 --format=%s HEAD~)
-
-	$(get_commit_msg HEAD~)
-
-	edited
-	EOF
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="edited" \
-			git commit --fixup=reword:HEAD~
-	) &&
-	get_commit_msg HEAD >actual &&
-	test_cmp expected actual &&
-	test_cmp_rev HEAD@{1}^{tree} HEAD^{tree} &&
-	test_cmp_rev HEAD@{1} HEAD^ &&
-	test_expect_code 1 git diff --cached --exit-code &&
-	git cat-file blob :foo >actual &&
-	test_cmp foo actual
-
-[master ed4d665] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 218b136] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master ee78bdc] amend! target message subject line
- Author: A U Thor <author@example.com>
-diff --git a/foo b/foo
-index 0b75f14..a67f15d 100644
---- a/foo
-+++ b/foo
-@@ -27,3 +27,4 @@ second content line
- third content line
- first content line
- second content line
-+third content line
-ok 30 - --fixup=reword: ignores staged changes
-
-expecting success of 7500.31 '--fixup=reword: error out with -m option': 
-	commit_for_rebase_autosquash_setup &&
-	echo "fatal: options '-m' and '--fixup:reword' cannot be used together" >expect &&
-	test_must_fail git commit --fixup=reword:HEAD~ -m "reword commit message" 2>actual &&
-	test_cmp expect actual
-
-[master 9d96c85] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 5b2f7bf] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 31 - --fixup=reword: error out with -m option
-
-expecting success of 7500.32 '--fixup=amend: error out with -m option': 
-	commit_for_rebase_autosquash_setup &&
-	echo "fatal: options '-m' and '--fixup:amend' cannot be used together" >expect &&
-	test_must_fail git commit --fixup=amend:HEAD~ -m "amend commit message" 2>actual &&
-	test_cmp expect actual
-
-[master a94321d] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 7600d55] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 32 - --fixup=amend: error out with -m option
-
-expecting success of 7500.33 'consecutive amend! commits remove amend! line from commit msg body': 
-	commit_for_rebase_autosquash_setup &&
-	cat >expected <<-EOF &&
-	amend! amend! $(git log -1 --format=%s HEAD~)
-
-	$(get_commit_msg HEAD~)
-
-	edited 1
-
-	edited 2
-	EOF
-	echo "reword new commit message" >actual &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="edited 1" \
-			git commit --fixup=reword:HEAD~ &&
-		FAKE_COMMIT_AMEND="edited 2" \
-			git commit --fixup=reword:HEAD
-	) &&
-	get_commit_msg HEAD >actual &&
-	test_cmp expected actual
-
-[master 2a99715] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 550158e] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 38fd587] amend! target message subject line
- Author: A U Thor <author@example.com>
-[master 1a502bb] amend! amend! target message subject line
- Author: A U Thor <author@example.com>
-ok 33 - consecutive amend! commits remove amend! line from commit msg body
-
-expecting success of 7500.34 'deny to create amend! commit if its commit msg body is empty': 
-	commit_for_rebase_autosquash_setup &&
-	echo "Aborting commit due to empty commit message body." >expected &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_COMMIT_MESSAGE="amend! target message subject line" \
-			git commit --fixup=amend:HEAD~ 2>actual
-	) &&
-	test_cmp expected actual
-
-[master c428437] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master ac86728] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 34 - deny to create amend! commit if its commit msg body is empty
-
-expecting success of 7500.35 'amend! commit allows empty commit msg body with --allow-empty-message': 
-	commit_for_rebase_autosquash_setup &&
-	cat >expected <<-EOF &&
-	amend! $(git log -1 --format=%s HEAD~)
-	EOF
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_MESSAGE="amend! target message subject line" \
-			git commit --fixup=amend:HEAD~ --allow-empty-message &&
-		get_commit_msg HEAD >actual
-	) &&
-	test_cmp expected actual
-
-[master d75d1dc] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 95b8327] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master a8cf642] amend! target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 35 - amend! commit allows empty commit msg body with --allow-empty-message
-
-expecting success of 7500.36 '--fixup=reword: incompatible with --all': 
-		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
-		test_must_fail git commit --fixup=reword:HEAD~ --all 2>actual &&
-		test_cmp expect actual
-	
-ok 36 - --fixup=reword: incompatible with --all
-
-expecting success of 7500.37 '--fixup=reword: incompatible with --include': 
-		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
-		test_must_fail git commit --fixup=reword:HEAD~ --include 2>actual &&
-		test_cmp expect actual
-	
-ok 37 - --fixup=reword: incompatible with --include
-
-expecting success of 7500.38 '--fixup=reword: incompatible with --only': 
-		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
-		test_must_fail git commit --fixup=reword:HEAD~ --only 2>actual &&
-		test_cmp expect actual
-	
-ok 38 - --fixup=reword: incompatible with --only
-
-expecting success of 7500.39 '--fixup=reword: incompatible with --interactive': 
-		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
-		test_must_fail git commit --fixup=reword:HEAD~ --interactive 2>actual &&
-		test_cmp expect actual
-	
-ok 39 - --fixup=reword: incompatible with --interactive
-
-expecting success of 7500.40 '--fixup=reword: incompatible with --patch': 
-		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
-		test_must_fail git commit --fixup=reword:HEAD~ --patch 2>actual &&
-		test_cmp expect actual
-	
-ok 40 - --fixup=reword: incompatible with --patch
-
-expecting success of 7500.41 '--fixup=reword: give error with pathsec': 
-	commit_for_rebase_autosquash_setup &&
-	echo "fatal: reword option of '--fixup' and path 'foo' cannot be used together" >expect &&
-	test_must_fail git commit --fixup=reword:HEAD~ -- foo 2>actual &&
-	test_cmp expect actual
-
-[master c3507b6] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master f054bdc] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 41 - --fixup=reword: give error with pathsec
-
-expecting success of 7500.42 '--fixup=reword: -F give error message': 
-	echo "fatal: options '-F' and '--fixup' cannot be used together" >expect &&
-	test_must_fail git commit --fixup=reword:HEAD~ -F msg  2>actual &&
-	test_cmp expect actual
-
-ok 42 - --fixup=reword: -F give error message
-
-expecting success of 7500.43 'commit --squash works with -F': 
-	commit_for_rebase_autosquash_setup &&
-	echo "log message from file" >msgfile &&
-	git commit --squash HEAD~1 -F msgfile  &&
-	commit_msg_is "squash! target message subject linelog message from file"
-
-[master 21cad69] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 2bfb665] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master bc37c4c] squash! target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 43 - commit --squash works with -F
-
-expecting success of 7500.44 'commit --squash works with -m': 
-	commit_for_rebase_autosquash_setup &&
-	git commit --squash HEAD~1 -m "foo bar\nbaz" &&
-	commit_msg_is "squash! target message subject linefoo bar\nbaz"
-
-[master 34d018d] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 9280558] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 74b4402] squash! target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 44 - commit --squash works with -m
-
-expecting success of 7500.45 'commit --squash works with -C': 
-	commit_for_rebase_autosquash_setup &&
-	git commit --squash HEAD~1 -C HEAD &&
-	commit_msg_is "squash! target message subject lineintermediate commit"
-
-[master 6ba9d60] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master a1fa052] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 3059308] squash! target message subject line
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-ok 45 - commit --squash works with -C
-
-expecting success of 7500.46 'commit --squash works with -c': 
-	commit_for_rebase_autosquash_setup &&
-	test_set_editor "$TEST_DIRECTORY"/t7500/edit-content &&
-	git commit --squash HEAD~1 -c HEAD &&
-	commit_msg_is "squash! target message subject lineedited commit"
-
-[master 2cb0c38] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 81a0468] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 9792f72] squash! target message subject line
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-ok 46 - commit --squash works with -c
-
-expecting success of 7500.47 'commit --squash works with -C for same commit': 
-	commit_for_rebase_autosquash_setup &&
-	git commit --squash HEAD -C HEAD &&
-	commit_msg_is "squash! intermediate commit"
-
-[master fcc9597] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 3fba3a1] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b6827cd] squash! intermediate commit
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-ok 47 - commit --squash works with -C for same commit
-
-expecting success of 7500.48 'commit --squash works with -c for same commit': 
-	commit_for_rebase_autosquash_setup &&
-	test_set_editor "$TEST_DIRECTORY"/t7500/edit-content &&
-	git commit --squash HEAD -c HEAD &&
-	commit_msg_is "squash! edited commit"
-
-[master 35e184e] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 328d91f] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master d7c0314] squash! edited commit
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-ok 48 - commit --squash works with -c for same commit
-
-expecting success of 7500.49 'commit --squash works with editor': 
-	commit_for_rebase_autosquash_setup &&
-	test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
-	git commit --squash HEAD~1 &&
-	commit_msg_is "squash! target message subject linecommit message"
-
-[master acfdcf4] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 5a82cf8] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 8042530] squash! target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 49 - commit --squash works with editor
-
-expecting success of 7500.50 'invalid message options when using --fixup': 
-	echo changes >>foo &&
-	echo "message" >log &&
-	git add foo &&
-	test_must_fail git commit --fixup HEAD~1 --squash HEAD~2 &&
-	test_must_fail git commit --fixup HEAD~1 -C HEAD~2 &&
-	test_must_fail git commit --fixup HEAD~1 -c HEAD~2 &&
-	test_must_fail git commit --fixup HEAD~1 -F log
-
-fatal: options '--squash' and '--fixup' cannot be used together
-fatal: options '-C' and '--fixup' cannot be used together
-fatal: options '-c' and '--fixup' cannot be used together
-fatal: options '-F' and '--fixup' cannot be used together
-ok 50 - invalid message options when using --fixup
-
-expecting success of 7500.51 'new line found before status message in commit template': 
-	git checkout -b commit-template-check &&
-	git reset --hard HEAD &&
-	touch commit-template-check &&
-	git add commit-template-check &&
-	GIT_EDITOR="cat >editor-input" git commit --untracked-files=no --allow-empty-message &&
-	test_cmp expected-template editor-input
-
-Switched to a new branch 'commit-template-check'
-HEAD is now at 8042530 squash! target message subject line
-[commit-template-check c1e58ac] 
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 commit-template-check
-ok 51 - new line found before status message in commit template
-
-expecting success of 7500.52 'setup empty commit with unstaged rename and copy': 
-	test_create_repo unstaged_rename_and_copy &&
-	(
-		cd unstaged_rename_and_copy &&
-
-		echo content >orig &&
-		git add orig &&
-		test_commit orig &&
-
-		cp orig new_copy &&
-		mv orig new_rename &&
-		git add -N new_copy new_rename
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7500-commit-template-squash-signoff/unstaged_rename_and_copy/.git/
-[master (root-commit) bac0952] orig
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 orig
- create mode 100644 orig.t
-ok 52 - setup empty commit with unstaged rename and copy
-
-expecting success of 7500.53 'check commit with unstaged rename and copy': 
-	(
-		cd unstaged_rename_and_copy &&
-
-		test_must_fail git -c diff.renames=copy commit
-	)
-
-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)
-	copied:     orig -> new_copy
-	renamed:    orig -> new_rename
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 53 - check commit with unstaged rename and copy
-
-expecting success of 7500.54 'commit without staging files fails and displays hints': 
-	echo "initial" >file &&
-	git add file &&
-	git commit -m initial &&
-	echo "changes" >>file &&
-	test_must_fail git commit -m update >actual &&
-	test_grep "no changes added to commit (use \"git add\" and/or \"git commit -a\")" actual
-
-[commit-template-check cfa8638] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 54 - commit without staging files fails and displays hints
-
-# passed all 54 test(s)
-1..54
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t6438-submodule-directory-file-conflicts.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t6438-submodule-directory-file-conflicts/.git/
 expecting success of 6438.1 'git_test_func: added submodule creates empty directory': 
@@ -479854,9 +477764,9 @@
 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.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
 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': 
@@ -480336,424 +478246,1034 @@
 1..56
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7504-commit-msg-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7504-commit-msg-hook/.git/
-expecting success of 7504.1 'with no hook': 
+*** t7450-bad-git-dotfiles.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/.git/
+expecting success of 7450.1 'setup': 
+	git config --global protocol.file.allow always
 
-	echo "foo" > file &&
-	git add file &&
-	git commit -m "first"
+ok 1 - setup
 
+expecting success of 7450.2 'check names': 
+	cat >expect <<-\EOF &&
+	valid
+	valid/with/paths
+	EOF
 
-[main (root-commit) d6ab80b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - with no hook
+	test-tool submodule check-name >actual <<-\EOF &&
+	valid
+	valid/with/paths
 
-expecting success of 7504.2 'with no hook (editor)': 
+	../foo
+	/../foo
+	..\foo
+	\..\foo
+	foo/..
+	foo/../
+	foo\..
+	foo\..\
+	foo/../bar
+	EOF
 
-	echo "more foo" >> file &&
-	git add file &&
-	echo "more foo" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
+	test_cmp expect actual
 
+ok 2 - check names
 
-[main 8164a21] more foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 2 - with no hook (editor)
+expecting success of 7450.3 'check urls': 
+	cat >expect <<-\EOF &&
+	./bar/baz/foo.git
+	https://example.com/foo.git
+	http://example.com:80/deeper/foo.git
+	EOF
 
-expecting success of 7504.3 '--no-verify with no hook': 
+	test-tool submodule check-url >actual <<-\EOF &&
+	./bar/baz/foo.git
+	https://example.com/foo.git
+	http://example.com:80/deeper/foo.git
+	-a./foo
+	../../..//test/foo.git
+	../../../../../:localhost:8080/foo.git
+	..\../.\../:example.com/foo.git
+	./%0ahost=example.com/foo.git
+	https://one.example.com/evil?%0ahost=two.example.com
+	https:///example.com/foo.git
+	http://example.com:test/foo.git
+	https::example.com/foo.git
+	http:::example.com/foo.git
+	EOF
 
-	echo "bar" > file &&
-	git add file &&
-	git commit --no-verify -m "bar"
+	test_cmp expect actual
 
+ok 3 - check urls
 
-[main 854c7e2] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-ok 3 - --no-verify with no hook
+expecting success of 7450.4 'create innocent subrepo': 
+	git init innocent &&
+	git -C innocent commit --allow-empty -m foo
 
-expecting success of 7504.4 '--no-verify with no hook (editor)': 
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/innocent/.git/
+[master (root-commit) 2093db0] foo
+ Author: A U Thor <author@example.com>
+ok 4 - create innocent subrepo
 
-	echo "more bar" > file &&
-	git add file &&
-	echo "more bar" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
+expecting success of 7450.5 'submodule add refuses invalid names': 
+	test_must_fail \
+		git submodule add --name ../../modules/evil "$PWD/innocent" evil
 
+fatal: '../../modules/evil' is not a valid submodule name
+ok 5 - submodule add refuses invalid names
 
-[main 0b79d34] more bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - --no-verify with no hook (editor)
+expecting success of 7450.6 'add evil submodule': 
+	git submodule add "$PWD/innocent" evil &&
 
-expecting success of 7504.5 'setup: commit-msg hook that always succeeds': 
-	test_hook --setup commit-msg <<-\EOF
-	exit 0
+	mkdir modules &&
+	cp -r .git/modules/evil modules &&
+	write_script modules/evil/hooks/post-checkout <<-\EOF &&
+	echo >&2 "RUNNING POST CHECKOUT"
 	EOF
 
-ok 5 - setup: commit-msg hook that always succeeds
-
-expecting success of 7504.6 'with succeeding hook': 
+	git config -f .gitmodules submodule.evil.update checkout &&
+	git config -f .gitmodules --rename-section \
+		submodule.evil submodule.../../modules/evil &&
+	git add modules &&
+	git commit -am evil
 
-	echo "more" >> file &&
-	git add file &&
-	git commit -m "more"
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/evil'...
+done.
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+[master (root-commit) a4e446b] evil
+ Author: A U Thor <author@example.com>
+ 30 files changed, 902 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 evil
+ create mode 100644 modules/evil/HEAD
+ create mode 100644 modules/evil/config
+ create mode 100644 modules/evil/description
+ create mode 100755 modules/evil/hooks/applypatch-msg.sample
+ create mode 100755 modules/evil/hooks/commit-msg.sample
+ create mode 100755 modules/evil/hooks/fsmonitor-watchman.sample
+ create mode 100755 modules/evil/hooks/post-checkout
+ create mode 100755 modules/evil/hooks/post-update.sample
+ create mode 100755 modules/evil/hooks/pre-applypatch.sample
+ create mode 100755 modules/evil/hooks/pre-commit.sample
+ create mode 100755 modules/evil/hooks/pre-merge-commit.sample
+ create mode 100755 modules/evil/hooks/pre-push.sample
+ create mode 100755 modules/evil/hooks/pre-rebase.sample
+ create mode 100755 modules/evil/hooks/pre-receive.sample
+ create mode 100755 modules/evil/hooks/prepare-commit-msg.sample
+ create mode 100755 modules/evil/hooks/push-to-checkout.sample
+ create mode 100755 modules/evil/hooks/sendemail-validate.sample
+ create mode 100755 modules/evil/hooks/update.sample
+ create mode 100644 modules/evil/index
+ create mode 100644 modules/evil/info/exclude
+ create mode 100644 modules/evil/logs/HEAD
+ create mode 100644 modules/evil/logs/refs/heads/master
+ create mode 100644 modules/evil/logs/refs/remotes/origin/HEAD
+ create mode 100644 modules/evil/objects/20/93db06f424f426e05da2ca90f40d2663e89387
+ create mode 100644 modules/evil/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904
+ create mode 100644 modules/evil/packed-refs
+ create mode 100644 modules/evil/refs/heads/master
+ create mode 100644 modules/evil/refs/remotes/origin/HEAD
+ok 6 - add evil submodule
 
+expecting success of 7450.7 'add other submodule': 
+	git submodule add "$PWD/innocent" another-module &&
+	git add another-module &&
+	git commit -am another
 
-[main 329307f] more
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/another-module'...
+done.
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+[master 28f5b75] another
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 6 - with succeeding hook
+ 2 files changed, 4 insertions(+)
+ create mode 160000 another-module
+ok 7 - add other submodule
 
-expecting success of 7504.7 'with succeeding hook (editor)': 
+expecting success of 7450.8 'clone evil superproject': 
+	git clone --recurse-submodules . victim >output 2>&1 &&
+	! grep "RUNNING POST CHECKOUT" output
 
-	echo "more more" >> file &&
-	git add file &&
-	echo "more more" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
+ok 8 - clone evil superproject
 
+expecting success of 7450.9 'fsck detects evil superproject': 
+	test_must_fail git fsck
 
-[main 1c57244] more more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 7 - with succeeding hook (editor)
+error in blob 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
+error in blob 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
+error in blob 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
+error in blob a17bebcf8cf0fbcf9beb8eae8f728fbca1543a61: gitmodulesName: disallowed submodule name: ../../modules/evil
+error in blob a17bebcf8cf0fbcf9beb8eae8f728fbca1543a61: gitmodulesName: disallowed submodule name: ../../modules/evil
+error in blob a17bebcf8cf0fbcf9beb8eae8f728fbca1543a61: gitmodulesName: disallowed submodule name: ../../modules/evil
+dangling blob 0c526c7700944035a7ab3fcd79e3c615d6780544
+ok 9 - fsck detects evil superproject
 
-expecting success of 7504.8 '--no-verify with succeeding hook': 
+expecting success of 7450.10 'transfer.fsckObjects detects evil superproject (unpack)': 
+	rm -rf dst.git &&
+	git init --bare dst.git &&
+	git -C dst.git config transfer.fsckObjects true &&
+	test_must_fail git push dst.git HEAD
 
-	echo "even more" >> file &&
-	git add file &&
-	git commit --no-verify -m "even more"
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/dst.git/
+remote: error: object a17bebcf8cf0fbcf9beb8eae8f728fbca1543a61: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object a17bebcf8cf0fbcf9beb8eae8f728fbca1543a61: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object a17bebcf8cf0fbcf9beb8eae8f728fbca1543a61: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: fatal: fsck error in pack objects        
+error: remote unpack failed: unpack-objects abnormal exit
+To dst.git
+ ! [remote rejected] HEAD -> master (unpacker error)
+error: failed to push some refs to 'dst.git'
+ok 10 - transfer.fsckObjects detects evil superproject (unpack)
+
+expecting success of 7450.11 'transfer.fsckObjects detects evil superproject (index)': 
+	rm -rf dst.git &&
+	git init --bare dst.git &&
+	git -C dst.git config transfer.fsckObjects true &&
+	git -C dst.git config transfer.unpackLimit 1 &&
+	test_must_fail git push dst.git HEAD
 
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/dst.git/
+remote: error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: index-pack abnormal exit
+To dst.git
+ ! [remote rejected] HEAD -> master (unpacker error)
+error: failed to push some refs to 'dst.git'
+ok 11 - transfer.fsckObjects detects evil superproject (index)
 
-[main f6c9c8b] even more
+expecting success of 7450.12 'create oddly ordered pack': 
+	git checkout --orphan odd &&
+	git rm -rf --cached . &&
+	git add .gitmodules &&
+	git commit -m odd &&
+	{
+		pack_header 3 &&
+		pack_obj $(git rev-parse HEAD:.gitmodules) &&
+		pack_obj $(git rev-parse HEAD^{tree}) &&
+		pack_obj $(git rev-parse HEAD)
+	} >odd.pack &&
+	pack_trailer odd.pack
+
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+Switched to a new branch 'odd'
+rm '.gitmodules'
+rm 'another-module'
+rm 'evil'
+rm 'modules/evil/HEAD'
+rm 'modules/evil/config'
+rm 'modules/evil/description'
+rm 'modules/evil/hooks/applypatch-msg.sample'
+rm 'modules/evil/hooks/commit-msg.sample'
+rm 'modules/evil/hooks/fsmonitor-watchman.sample'
+rm 'modules/evil/hooks/post-checkout'
+rm 'modules/evil/hooks/post-update.sample'
+rm 'modules/evil/hooks/pre-applypatch.sample'
+rm 'modules/evil/hooks/pre-commit.sample'
+rm 'modules/evil/hooks/pre-merge-commit.sample'
+rm 'modules/evil/hooks/pre-push.sample'
+rm 'modules/evil/hooks/pre-rebase.sample'
+rm 'modules/evil/hooks/pre-receive.sample'
+rm 'modules/evil/hooks/prepare-commit-msg.sample'
+rm 'modules/evil/hooks/push-to-checkout.sample'
+rm 'modules/evil/hooks/sendemail-validate.sample'
+rm 'modules/evil/hooks/update.sample'
+rm 'modules/evil/index'
+rm 'modules/evil/info/exclude'
+rm 'modules/evil/logs/HEAD'
+rm 'modules/evil/logs/refs/heads/master'
+rm 'modules/evil/logs/refs/remotes/origin/HEAD'
+rm 'modules/evil/objects/20/93db06f424f426e05da2ca90f40d2663e89387'
+rm 'modules/evil/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904'
+rm 'modules/evil/packed-refs'
+rm 'modules/evil/refs/heads/master'
+rm 'modules/evil/refs/remotes/origin/HEAD'
+[odd (root-commit) abf84d8] odd
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 8 - --no-verify with succeeding hook
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+157+0 records in
+157+0 records out
+157 bytes copied, 0.00014044 s, 1.1 MB/s
+49+0 records in
+49+0 records out
+49 bytes copied, 6.232e-05 s, 786 kB/s
+127+0 records in
+127+0 records out
+127 bytes copied, 0.00011952 s, 1.1 MB/s
+ok 12 - create oddly ordered pack
 
-expecting success of 7504.9 '--no-verify with succeeding hook (editor)': 
+expecting success of 7450.13 'transfer.fsckObjects handles odd pack (unpack)': 
+	rm -rf dst.git &&
+	git init --bare dst.git &&
+	test_must_fail git -C dst.git unpack-objects --strict <odd.pack
 
-	echo "even more more" >> file &&
-	git add file &&
-	echo "even more more" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/dst.git/
+error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
+error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
+error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
+fatal: fsck error in pack objects
+ok 13 - transfer.fsckObjects handles odd pack (unpack)
 
+expecting success of 7450.14 'transfer.fsckObjects handles odd pack (index)': 
+	rm -rf dst.git &&
+	git init --bare dst.git &&
+	test_must_fail git -C dst.git index-pack --strict --stdin <odd.pack
 
-[main 64f8392] even more more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 9 - --no-verify with succeeding hook (editor)
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/dst.git/
+pack	e55f466b5e23bc925833084626ca4757050c9af1
+error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
+error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
+error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
+fatal: fsck error in pack objects
+ok 14 - transfer.fsckObjects handles odd pack (index)
 
-expecting success of 7504.10 'setup: commit-msg hook that always fails': 
-	test_hook --clobber commit-msg <<-\EOF
-	exit 1
-	EOF
+expecting success of 7450.15 'index-pack --strict works for non-repo pack': 
+	rm -rf dst.git &&
+	git init --bare dst.git &&
+	cp odd.pack dst.git &&
+	test_must_fail git -C dst.git index-pack --strict odd.pack 2>output &&
+	# Make sure we fail due to bad gitmodules content, not because we
+	# could not read the blob in the first place.
+	grep gitmodulesName output
 
-ok 10 - setup: commit-msg hook that always fails
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/dst.git/
+e55f466b5e23bc925833084626ca4757050c9af1
+error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
+error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
+error: object 8782b267ff5816646753e845745b7bfd242e6f40: gitmodulesName: disallowed submodule name: ../../modules/evil
+ok 15 - index-pack --strict works for non-repo pack
 
-expecting success of 7504.11 'with failing hook': 
+expecting success of 7450.16 'set up repo with symlinked gitmodules (vanilla)': 
+		git init $dir &&
+		(
+			cd $dir &&
 
-	echo "another" >> file &&
-	git add file &&
-	test_must_fail git commit -m "another"
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitmodules-vanilla/.git/
+ok 16 - set up repo with symlinked gitmodules (vanilla)
 
+expecting success of 7450.17 'fsck detects symlinked gitmodules (vanilla)': 
+		(
+			cd $dir &&
 
-ok 11 - with failing hook
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree 1de43f6689a4fb8a4ead3d7e0778f3e3b1567cd2
+error in tree 1de43f6689a4fb8a4ead3d7e0778f3e3b1567cd2: gitmodulesSymlink: .gitmodules is a symbolic link
+ok 17 - fsck detects symlinked gitmodules (vanilla)
 
-expecting success of 7504.12 'with failing hook (editor)': 
+expecting success of 7450.18 'refuse to load symlinked gitmodules into index (vanilla)': 
+		test_must_fail \
+			git -C $dir \
+			    -c core.protectntfs \
+			    -c core.protecthfs \
+			    read-tree $tree 2>err &&
+		grep "invalid path.*$name" err &&
+		git -C $dir ls-files -s >out &&
+		test_must_be_empty out
+	
+error: invalid path '.gitmodules'
+ok 18 - refuse to load symlinked gitmodules into index (vanilla)
 
-	echo "more another" >> file &&
-	git add file &&
-	echo "more another" > FAKE_MSG &&
-	! (GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit)
+expecting success of 7450.19 'set up repo with symlinked gitmodules (ntfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
 
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitmodules-ntfs/.git/
+ok 19 - set up repo with symlinked gitmodules (ntfs)
 
-ok 12 - with failing hook (editor)
+expecting success of 7450.20 'fsck detects symlinked gitmodules (ntfs)': 
+		(
+			cd $dir &&
 
-expecting success of 7504.13 '--no-verify with failing hook': 
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree 5a7b45b9745abfb24f7b781e26941eef28efd87b
+error in tree 5a7b45b9745abfb24f7b781e26941eef28efd87b: gitmodulesSymlink: .gitmodules is a symbolic link
+ok 20 - fsck detects symlinked gitmodules (ntfs)
 
-	echo "stuff" >> file &&
-	git add file &&
-	git commit --no-verify -m "stuff"
+expecting success of 7450.21 'refuse to load symlinked gitmodules into index (ntfs)': 
+		test_must_fail \
+			git -C $dir \
+			    -c core.protectntfs \
+			    -c core.protecthfs \
+			    read-tree $tree 2>err &&
+		grep "invalid path.*$name" err &&
+		git -C $dir ls-files -s >out &&
+		test_must_be_empty out
+	
+error: invalid path '.gitmodules .'
+ok 21 - refuse to load symlinked gitmodules into index (ntfs)
 
+expecting success of 7450.22 'set up repo with symlinked gitmodules (hfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
 
-[main 95dce17] stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
-ok 13 - --no-verify with failing hook
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitmodules-hfs/.git/
+ok 22 - set up repo with symlinked gitmodules (hfs)
 
-expecting success of 7504.14 '-n followed by --verify with failing hook': 
+expecting success of 7450.23 'fsck detects symlinked gitmodules (hfs)': 
+		(
+			cd $dir &&
 
-	echo "even more" >> file &&
-	git add file &&
-	test_must_fail git commit -n --verify -m "even more"
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree d491ec508aba148c1fbbc6617e78c926e667f481
+error in tree d491ec508aba148c1fbbc6617e78c926e667f481: gitmodulesSymlink: .gitmodules is a symbolic link
+ok 23 - fsck detects symlinked gitmodules (hfs)
 
+expecting success of 7450.24 'refuse to load symlinked gitmodules into index (hfs)': 
+		test_must_fail \
+			git -C $dir \
+			    -c core.protectntfs \
+			    -c core.protecthfs \
+			    read-tree $tree 2>err &&
+		grep "invalid path.*$name" err &&
+		git -C $dir ls-files -s >out &&
+		test_must_be_empty out
+	
+error: invalid path '.‌gitmodules'
+ok 24 - refuse to load symlinked gitmodules into index (hfs)
 
-ok 14 - -n followed by --verify with failing hook
+expecting success of 7450.25 'set up repo with symlinked gitattributes (vanilla)': 
+		git init $dir &&
+		(
+			cd $dir &&
 
-expecting success of 7504.15 '--no-verify with failing hook (editor)': 
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitattributes-vanilla/.git/
+ok 25 - set up repo with symlinked gitattributes (vanilla)
 
-	echo "more stuff" >> file &&
-	git add file &&
-	echo "more stuff" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
+expecting success of 7450.26 'fsck detects symlinked gitattributes (vanilla)': 
+		(
+			cd $dir &&
 
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree ab8d3f6e600df522f80181bff8dd4db0e3b12b83
+warning in tree ab8d3f6e600df522f80181bff8dd4db0e3b12b83: gitattributesSymlink: .gitattributes is a symlink
+ok 26 - fsck detects symlinked gitattributes (vanilla)
 
-[main 254c35b] more stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 15 - --no-verify with failing hook (editor)
+expecting success of 7450.27 'set up repo with symlinked gitattributes (ntfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
 
-expecting success of 7504.16 'merge fails with failing hook': 
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitattributes-ntfs/.git/
+ok 27 - set up repo with symlinked gitattributes (ntfs)
 
-	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f main" &&
-	git checkout --orphan newbranch &&
-	: >file2 &&
-	git add file2 &&
-	git commit --no-verify file2 -m in-side-branch &&
-	test_must_fail git merge --allow-unrelated-histories main &&
-	commit_msg_is "in-side-branch" # HEAD before merge
+expecting success of 7450.28 'fsck detects symlinked gitattributes (ntfs)': 
+		(
+			cd $dir &&
 
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree de4f54e780a6973bcf5ba53cafe70c0bb4be2f77
+warning in tree de4f54e780a6973bcf5ba53cafe70c0bb4be2f77: gitattributesSymlink: .gitattributes is a symlink
+ok 28 - fsck detects symlinked gitattributes (ntfs)
 
-Switched to a new branch 'newbranch'
-[newbranch (root-commit) 73906b9] in-side-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-error: Your local changes to the following files would be overwritten by merge:
-  file
-Merge with strategy ort failed.
-Switched to branch 'main'
-Deleted branch newbranch (was 73906b9).
-ok 16 - merge fails with failing hook
+expecting success of 7450.29 'set up repo with symlinked gitattributes (hfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
 
-expecting success of 7504.17 'merge bypasses failing hook with --no-verify': 
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitattributes-hfs/.git/
+ok 29 - set up repo with symlinked gitattributes (hfs)
 
-	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f main" &&
-	git checkout --orphan newbranch &&
-	git rm -f file &&
-	: >file2 &&
-	git add file2 &&
-	git commit --no-verify file2 -m in-side-branch &&
-	git merge --no-verify --allow-unrelated-histories main &&
-	commit_msg_is "Merge branch 'main' into newbranch"
+expecting success of 7450.30 'fsck detects symlinked gitattributes (hfs)': 
+		(
+			cd $dir &&
 
-Switched to a new branch 'newbranch'
-rm 'file'
-[newbranch (root-commit) 73906b9] in-side-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-Merge made by the 'ort' strategy.
- file | 10 ++++++++++
- 1 file changed, 10 insertions(+)
- create mode 100644 file
-Switched to branch 'main'
-Deleted branch newbranch (was d8333d0).
-ok 17 - merge bypasses failing hook with --no-verify
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree 72c8ad9e99ffabc21c6ba035456b2634e7892acd
+warning in tree 72c8ad9e99ffabc21c6ba035456b2634e7892acd: gitattributesSymlink: .gitattributes is a symlink
+ok 30 - fsck detects symlinked gitattributes (hfs)
 
-expecting success of 7504.18 'setup: commit-msg hook made non-executable': 
-	git_dir="$(git rev-parse --git-dir)" &&
-	chmod -x "$git_dir/hooks/commit-msg"
+expecting success of 7450.31 'set up repo with symlinked gitignore (vanilla)': 
+		git init $dir &&
+		(
+			cd $dir &&
 
-ok 18 - setup: commit-msg hook made non-executable
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitignore-vanilla/.git/
+ok 31 - set up repo with symlinked gitignore (vanilla)
 
-expecting success of 7504.19 'with non-executable hook': 
+expecting success of 7450.32 'fsck detects symlinked gitignore (vanilla)': 
+		(
+			cd $dir &&
 
-	echo "content" >file &&
-	git add file &&
-	git commit -m "content"
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree c7a01622c2dc3f1d258c576db3f940864561682e
+warning in tree c7a01622c2dc3f1d258c576db3f940864561682e: gitignoreSymlink: .gitignore is a symlink
+ok 32 - fsck detects symlinked gitignore (vanilla)
 
+expecting success of 7450.33 'set up repo with symlinked gitignore (ntfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
 
-hint: The '.git/hooks/commit-msg' hook was ignored because it's not set as executable.
-hint: You can disable this warning with `git config set advice.ignoredHook false`.
-[main 89fb8ae] content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 10 deletions(-)
-ok 19 - with non-executable hook
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitignore-ntfs/.git/
+ok 33 - set up repo with symlinked gitignore (ntfs)
 
-expecting success of 7504.20 'with non-executable hook (editor)': 
+expecting success of 7450.34 'fsck detects symlinked gitignore (ntfs)': 
+		(
+			cd $dir &&
 
-	echo "content again" >> file &&
-	git add file &&
-	echo "content again" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -m "content again"
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree aea07d4d9a9ba4de470f64bf729b7c3f6688b4f2
+warning in tree aea07d4d9a9ba4de470f64bf729b7c3f6688b4f2: gitignoreSymlink: .gitignore is a symlink
+ok 34 - fsck detects symlinked gitignore (ntfs)
 
+expecting success of 7450.35 'set up repo with symlinked gitignore (hfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
 
-hint: The '.git/hooks/commit-msg' hook was ignored because it's not set as executable.
-hint: You can disable this warning with `git config set advice.ignoredHook false`.
-[main 888e6c6] content again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 20 - with non-executable hook (editor)
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-gitignore-hfs/.git/
+ok 35 - set up repo with symlinked gitignore (hfs)
 
-expecting success of 7504.21 '--no-verify with non-executable hook': 
+expecting success of 7450.36 'fsck detects symlinked gitignore (hfs)': 
+		(
+			cd $dir &&
 
-	echo "more content" >> file &&
-	git add file &&
-	git commit --no-verify -m "more content"
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree d0e9256045455231ad11c143fe3e9e8875bb72e2
+warning in tree d0e9256045455231ad11c143fe3e9e8875bb72e2: gitignoreSymlink: .gitignore is a symlink
+ok 36 - fsck detects symlinked gitignore (hfs)
 
+expecting success of 7450.37 'set up repo with symlinked mailmap (vanilla)': 
+		git init $dir &&
+		(
+			cd $dir &&
 
-[main 7569859] more content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 21 - --no-verify with non-executable hook
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-mailmap-vanilla/.git/
+ok 37 - set up repo with symlinked mailmap (vanilla)
 
-expecting success of 7504.22 '--no-verify with non-executable hook (editor)': 
+expecting success of 7450.38 'fsck detects symlinked mailmap (vanilla)': 
+		(
+			cd $dir &&
 
-	echo "even more content" >> file &&
-	git add file &&
-	echo "even more content" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree 72925bd65d77c963914799387cc5b0097f512589
+warning in tree 72925bd65d77c963914799387cc5b0097f512589: mailmapSymlink: .mailmap is a symlink
+ok 38 - fsck detects symlinked mailmap (vanilla)
 
+expecting success of 7450.39 'set up repo with symlinked mailmap (ntfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
 
-[main 275f9c1] even more content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 22 - --no-verify with non-executable hook (editor)
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-mailmap-ntfs/.git/
+ok 39 - set up repo with symlinked mailmap (ntfs)
 
-expecting success of 7504.23 'setup: commit-msg hook that edits the commit message': 
-	test_hook --clobber commit-msg <<-\EOF
-	echo "new message" >"$1"
-	exit 0
-	EOF
+expecting success of 7450.40 'fsck detects symlinked mailmap (ntfs)': 
+		(
+			cd $dir &&
 
-ok 23 - setup: commit-msg hook that edits the commit message
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree 71113f7eb27bdce0e7f3c424a418ea84b7366b8e
+warning in tree 71113f7eb27bdce0e7f3c424a418ea84b7366b8e: mailmapSymlink: .mailmap is a symlink
+ok 40 - fsck detects symlinked mailmap (ntfs)
 
-expecting success of 7504.24 'hook edits commit message': 
+expecting success of 7450.41 'set up repo with symlinked mailmap (hfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
 
-	echo "additional" >> file &&
-	git add file &&
-	git commit -m "additional" &&
-	commit_msg_is "new message"
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/symlink-mailmap-hfs/.git/
+ok 41 - set up repo with symlinked mailmap (hfs)
 
+expecting success of 7450.42 'fsck detects symlinked mailmap (hfs)': 
+		(
+			cd $dir &&
 
-[main fe8ba48] new message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 24 - hook edits commit message
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree 78e28f1c8c8a238149d76c95ad5af4e25c21c734
+warning in tree 78e28f1c8c8a238149d76c95ad5af4e25c21c734: mailmapSymlink: .mailmap is a symlink
+ok 42 - fsck detects symlinked mailmap (hfs)
 
-expecting success of 7504.25 'hook edits commit message (editor)': 
+expecting success of 7450.43 'fsck detects non-blob .gitmodules': 
+	git init non-blob &&
+	(
+		cd non-blob &&
 
-	echo "additional content" >> file &&
-	git add file &&
-	echo "additional content" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit &&
-	commit_msg_is "new message"
+		# As above, make the funny tree directly to avoid index
+		# restrictions.
+		mkdir subdir &&
+		cp ../.gitmodules subdir/file &&
+		git add subdir/file &&
+		git commit -m ok &&
+		git ls-tree HEAD | sed s/subdir/.gitmodules/ | git mktree &&
 
+		test_must_fail git fsck 2>output &&
+		test_grep gitmodulesBlob output
+	)
 
-[main 01f87e3] new message
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/non-blob/.git/
+[master (root-commit) 9f6a675] ok
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 25 - hook edits commit message (editor)
+ 1 file changed, 7 insertions(+)
+ create mode 100644 subdir/file
+4b2d50c3ea71a20915c30f189057ff36e32f65e0
+dangling tree 4b2d50c3ea71a20915c30f189057ff36e32f65e0
+error in tree 22b9058c44ece9ca06021f29a94fc5726f4b8413: gitmodulesBlob: non-blob found at .gitmodules
+ok 43 - fsck detects non-blob .gitmodules
 
-expecting success of 7504.26 'hook doesn't edit commit message': 
+expecting success of 7450.44 'fsck detects corrupt .gitmodules': 
+	git init corrupt &&
+	(
+		cd corrupt &&
 
-	echo "plus" >> file &&
-	git add file &&
-	git commit --no-verify -m "plus" &&
-	commit_msg_is "plus"
+		echo "[broken" >.gitmodules &&
+		git add .gitmodules &&
+		git commit -m "broken gitmodules" &&
 
+		git fsck 2>output &&
+		test_grep gitmodulesParse output &&
+		test_grep ! "bad config" output
+	)
 
-[main b89da1b] plus
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/corrupt/.git/
+[master (root-commit) 3fe1e33] broken gitmodules
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 26 - hook doesn't edit commit message
+ create mode 100644 .gitmodules
+warning in blob e39defa11acf1626d747f0b70076b6be5c0fd4c9: gitmodulesParse: could not parse gitmodules blob
+ok 44 - fsck detects corrupt .gitmodules
 
-expecting success of 7504.27 'hook doesn't edit commit message (editor)': 
+ok 45 # skip prevent git~1 squatting on Windows (missing WINDOWS)
 
-	echo "more plus" >> file &&
-	git add file &&
-	echo "more plus" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
-	commit_msg_is "more plus"
+expecting success of 7450.46 'setup submodules with nested git dirs': 
+	git init nested &&
+	test_commit -C nested nested &&
+	(
+		cd nested &&
+		cat >.gitmodules <<-EOF &&
+		[submodule "hippo"]
+			url = .
+			path = thing1
+		[submodule "hippo/hooks"]
+			url = .
+			path = thing2
+		EOF
+		git clone . thing1 &&
+		git clone . thing2 &&
+		git add .gitmodules thing1 thing2 &&
+		test_tick &&
+		git commit -m nested
+	)
 
-[main f4fdd67] more plus
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/nested/.git/
+[master (root-commit) 111f058] nested
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 27 - hook doesn't edit commit message (editor)
+ create mode 100644 nested.t
+Cloning into 'thing1'...
+done.
+Cloning into 'thing2'...
+done.
+warning: adding embedded git repository: thing1
+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> thing1
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached thing1
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+warning: adding embedded git repository: thing2
+[master f2f7cbd] nested
+ Author: A U Thor <author@example.com>
+ 3 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 thing1
+ create mode 160000 thing2
+ok 46 - setup submodules with nested git dirs
 
-expecting success of 7504.28 'hook called in git-merge picks up commit message': 
-	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f main" &&
-	git checkout --orphan newbranch &&
-	git rm -f file &&
-	: >file2 &&
-	git add file2 &&
-	git commit --no-verify file2 -m in-side-branch &&
-	git merge --allow-unrelated-histories main &&
-	commit_msg_is "new message"
+expecting success of 7450.47 'git dirs of sibling submodules must not be nested': 
+	test_must_fail git clone --recurse-submodules nested clone 2>err &&
+	test_grep "is inside git dir" err
 
-Switched to a new branch 'newbranch'
-rm 'file'
-[newbranch (root-commit) 73906b9] in-side-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-Merge made by the 'ort' strategy.
- file | 8 ++++++++
- 1 file changed, 8 insertions(+)
- create mode 100644 file
-Switched to branch 'main'
-Deleted branch newbranch (was 8eb8126).
-ok 28 - hook called in git-merge picks up commit message
+error: submodule git dir '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo'
+error: submodule git dir '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo'
+ok 47 - git dirs of sibling submodules must not be nested
 
-checking known breakage of 7504.29 'merge --continue remembers --no-verify': 
-	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f main" &&
-	git checkout main &&
-	echo a >file2 &&
-	git add file2 &&
-	git commit --no-verify -m "add file2 to main" &&
-	git checkout -b newbranch main^ &&
-	echo b >file2 &&
-	git add file2 &&
-	git commit --no-verify file2 -m in-side-branch &&
-	git merge --no-verify -m not-rewritten-by-hook main &&
-	# resolve conflict:
-	echo c >file2 &&
-	git add file2 &&
-	git merge --continue &&
-	commit_msg_is not-rewritten-by-hook
+expecting success of 7450.48 'submodule git dir nesting detection must work with parallel cloning': 
+	test_must_fail git clone --recurse-submodules --jobs=2 nested clone_parallel 2>err &&
+	cat err &&
+	grep -E "(already exists|is inside git dir|not a git repository)" err &&
+	{
+		test_path_is_missing .git/modules/hippo/HEAD ||
+		test_path_is_missing .git/modules/hippo/hooks/HEAD
+	}
 
-Already on 'main'
-[main 4c03054] add file2 to main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Switched to a new branch 'newbranch'
-[newbranch 7295afc] in-side-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Automatic merge failed; fix conflicts and then commit the result.
-Switched to branch 'main'
-Deleted branch newbranch (was 7295afc).
-not ok 29 - merge --continue remembers --no-verify # TODO known breakage
+Cloning into 'clone_parallel'...
+done.
+Submodule 'hippo' (.) registered for path 'thing1'
+Submodule 'hippo/hooks' (.) registered for path 'thing2'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1'...
+fatal: /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1' failed
+Failed to clone 'thing1'. Retry scheduled
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing2'...
+error: could not lock config file /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks/config: No such file or directory
+error: could not lock config file /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks/config: No such file or directory
+error: could not lock config file /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks/config: No such file or directory
+fatal: could not set 'core.repositoryformatversion' to '0'
+fatal: clone of '.' into submodule path '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing2' failed
+Failed to clone 'thing2'. Retry scheduled
+fatal: not a git repository: /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo already exists
+fatal: not a git repository: /build/reproducible-path/git-2.51.0/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 7504.30 'hook is called for reword during `rebase -i`': 
+expecting success of 7450.49 'checkout -f --recurse-submodules must not use a nested gitdir': 
+	git clone nested nested_checkout &&
+	(
+		cd nested_checkout &&
+		git submodule init &&
+		git submodule update thing1 &&
+		mkdir -p .git/modules/hippo/hooks/refs &&
+		mkdir -p .git/modules/hippo/hooks/objects/info &&
+		echo "../../../../objects" >.git/modules/hippo/hooks/objects/info/alternates &&
+		echo "ref: refs/heads/master" >.git/modules/hippo/hooks/HEAD
+	) &&
+	test_must_fail git -C nested_checkout checkout -f --recurse-submodules HEAD 2>err &&
+	cat err &&
+	grep "is inside git dir" err &&
+	test_path_is_missing nested_checkout/thing2/.git
 
-	GIT_SEQUENCE_EDITOR="\"$REWORD_EDITOR\"" git rebase -i HEAD^ &&
-	commit_msg_is "new message"
+Cloning into 'nested_checkout'...
+done.
+Submodule 'hippo' (.) registered for path 'thing1'
+Submodule 'hippo/hooks' (.) registered for path 'thing2'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/nested_checkout/thing1'...
+done.
+Submodule path 'thing1': checked out '111f05809ae4bf877fb5852d7d418815278831e3'
+error: submodule git dir '.git/modules/hippo/hooks' is inside git dir '.git/modules/hippo'
+fatal: refusing to create/use '.git/modules/hippo/hooks' in another submodule's git dir
+error: submodule git dir '.git/modules/hippo/hooks' is inside git dir '.git/modules/hippo'
+ok 49 - checkout -f --recurse-submodules must not use a nested gitdir
 
+checking prerequisite: SYMLINKS
 
-Rebasing (1/1)
[detached HEAD 7d30ea0] new message
+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 7450.50 'submodule must not checkout into different directory': 
+	test_when_finished "rm -rf sub repo bad-clone" &&
+
+	git init sub &&
+	write_script sub/post-checkout <<-\EOF &&
+	touch "$PWD/foo"
+	EOF
+	git -C sub add post-checkout &&
+	git -C sub commit -m hook &&
+
+	git init repo &&
+	git -C repo -c protocol.file.allow=always submodule add "$PWD/sub" sub &&
+	git -C repo mv sub $(printf "sub\r") &&
+
+	# Ensure config values containing CR are wrapped in quotes.
+	git config unset -f repo/.gitmodules submodule.sub.path &&
+	printf "\tpath = \"sub\r\"\n" >>repo/.gitmodules &&
+
+	git config unset -f repo/.git/modules/sub/config core.worktree &&
+	{
+		printf "[core]\n" &&
+		printf "\tworktree = \"../../../sub\r\"\n"
+	} >>repo/.git/modules/sub/config &&
+
+	ln -s .git/modules/sub/hooks repo/sub &&
+	git -C repo add -A &&
+	git -C repo commit -m submodule &&
+
+	git -c protocol.file.allow=always clone --recurse-submodules repo bad-clone &&
+	! test -f "$PWD/bad-clone/sub/foo" &&
+	test -f $(printf "bad-clone/sub\r/post-checkout")
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/sub/.git/
+[master (root-commit) 5f02a29] hook
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Successfully rebased and updated refs/heads/main.
-ok 30 - hook is called for reword during `rebase -i`
+ 1 file changed, 2 insertions(+)
+ create mode 100755 post-checkout
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/repo/.git/
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/repo/sub'...
+done.
+[master (root-commit) 57a6b8d] submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 120000 sub
+ create mode 160000 "sub\r"
+Cloning into 'bad-clone'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/sub) registered for path 'sub
'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7450-bad-git-dotfiles/bad-clone/sub
'...
+done.
+Submodule path 'sub
': checked out '5f02a29dd48fb677069320bbc6d60730514e1ced'
+ok 50 - submodule must not checkout into different directory
 
-# still have 1 known breakage(s)
-# passed all remaining 29 test(s)
-1..30
+# passed all 50 test(s)
+1..50
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7422-submodule-output.sh ***
@@ -481110,6 +479630,838 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7500-commit-template-squash-signoff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7500-commit-template-squash-signoff/.git/
+expecting success of 7500.1 'a basic commit in an empty tree should succeed': 
+	echo content > foo &&
+	git add foo &&
+	git commit -m "initial commit"
+
+[master (root-commit) 02efb91] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+ok 1 - a basic commit in an empty tree should succeed
+
+expecting success of 7500.2 'nonexistent template file should return error': 
+	echo changes >> foo &&
+	git add foo &&
+	(
+		GIT_EDITOR="echo hello >\"\$1\"" &&
+		export GIT_EDITOR &&
+		test_must_fail git commit --template "$PWD"/notexist
+	)
+
+fatal: could not read '/build/reproducible-path/git-2.51.0/t/trash directory.t7500-commit-template-squash-signoff/notexist': No such file or directory
+ok 2 - nonexistent template file should return error
+
+expecting success of 7500.3 'nonexistent template file in config should return error': 
+	test_config commit.template "$PWD"/notexist &&
+	(
+		GIT_EDITOR="echo hello >\"\$1\"" &&
+		export GIT_EDITOR &&
+		test_must_fail git commit
+	)
+
+fatal: could not read '/build/reproducible-path/git-2.51.0/t/trash directory.t7500-commit-template-squash-signoff/notexist': No such file or directory
+ok 3 - nonexistent template file in config should return error
+
+expecting success of 7500.4 'unedited template should not commit': 
+	echo "template line" > "$TEMPLATE" &&
+	test_must_fail git commit --template "$TEMPLATE"
+
+Aborting commit; you did not edit the message.
+ok 4 - unedited template should not commit
+
+expecting success of 7500.5 'unedited template with comments should not commit': 
+	echo "# comment in template" >> "$TEMPLATE" &&
+	test_must_fail git commit --template "$TEMPLATE"
+
+Aborting commit; you did not edit the message.
+ok 5 - unedited template with comments should not commit
+
+expecting success of 7500.6 'a Signed-off-by line by itself should not commit': 
+	(
+		test_set_editor "$TEST_DIRECTORY"/t7500/add-signed-off &&
+		test_must_fail git commit --template "$TEMPLATE"
+	)
+
+Aborting commit; you did not edit the message.
+ok 6 - a Signed-off-by line by itself should not commit
+
+expecting success of 7500.7 'adding comments to a template should not commit': 
+	(
+		test_set_editor "$TEST_DIRECTORY"/t7500/add-comments &&
+		test_must_fail git commit --template "$TEMPLATE"
+	)
+
+Aborting commit; you did not edit the message.
+ok 7 - adding comments to a template should not commit
+
+expecting success of 7500.8 'adding real content to a template should commit': 
+	(
+		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
+		git commit --template "$TEMPLATE"
+	) &&
+	commit_msg_is "template linecommit message"
+
+[master 0439be9] template line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 8 - adding real content to a template should commit
+
+expecting success of 7500.9 '-t option should be short for --template': 
+	echo "short template" > "$TEMPLATE" &&
+	echo "new content" >> foo &&
+	git add foo &&
+	(
+		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
+		git commit -t "$TEMPLATE"
+	) &&
+	commit_msg_is "short templatecommit message"
+
+[master e42593e] short template
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 9 - -t option should be short for --template
+
+expecting success of 7500.10 'config-specified template should commit': 
+	echo "new template" > "$TEMPLATE" &&
+	test_config commit.template "$TEMPLATE" &&
+	echo "more content" >> foo &&
+	git add foo &&
+	(
+		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
+		git commit
+	) &&
+	commit_msg_is "new templatecommit message"
+
+[master 811561e] new template
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 10 - config-specified template should commit
+
+expecting success of 7500.11 'explicit commit message should override template': 
+	echo "still more content" >> foo &&
+	git add foo &&
+	GIT_EDITOR="$TEST_DIRECTORY"/t7500/add-content git commit --template "$TEMPLATE" \
+		-m "command line msg" &&
+	commit_msg_is "command line msg"
+
+[master d8cbf96] command line msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 11 - explicit commit message should override template
+
+expecting success of 7500.12 'commit message from file should override template': 
+	echo "content galore" >> foo &&
+	git add foo &&
+	echo "standard input msg" |
+	(
+		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
+		git commit --template "$TEMPLATE" --file -
+	) &&
+	commit_msg_is "standard input msg"
+
+[master 65e5eb1] standard input msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 12 - commit message from file should override template
+
+expecting success of 7500.13 'commit message from template with whitespace issue': 
+	echo "content galore" >>foo &&
+	git add foo &&
+	GIT_EDITOR=\""$TEST_DIRECTORY"\"/t7500/add-whitespaced-content \
+	git commit --template "$TEMPLATE" &&
+	commit_msg_is "commit message"
+
+[master 5e66887] commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 13 - commit message from template with whitespace issue
+
+expecting success of 7500.14 'using alternate GIT_INDEX_FILE (1)': 
+
+	cp .git/index saved-index &&
+	(
+		echo some new content >file &&
+	        GIT_INDEX_FILE=.git/another_index &&
+		export GIT_INDEX_FILE &&
+		git add file &&
+		git commit -m "commit using another index" &&
+		git diff-index --exit-code HEAD &&
+		git diff-files --exit-code
+	) &&
+	cmp .git/index saved-index >/dev/null
+
+
+[master 7c961fb] commit using another index
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 7 deletions(-)
+ create mode 100644 file
+ delete mode 100644 foo
+ok 14 - using alternate GIT_INDEX_FILE (1)
+
+expecting success of 7500.15 'using alternate GIT_INDEX_FILE (2)': 
+
+	cp .git/index saved-index &&
+	(
+		rm -f .git/no-such-index &&
+		GIT_INDEX_FILE=.git/no-such-index &&
+		export GIT_INDEX_FILE &&
+		git commit -m "commit using nonexistent index" &&
+		test -z "$(git ls-files)" &&
+		test -z "$(git ls-tree HEAD)"
+
+	) &&
+	cmp .git/index saved-index >/dev/null
+
+[master 4e95e06] commit using nonexistent index
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file
+ok 15 - using alternate GIT_INDEX_FILE (2)
+
+expecting success of 7500.16 '--signoff': 
+	echo "yet another content *narf*" >> foo &&
+	echo "zort" | git commit -s -F - foo &&
+	git cat-file commit HEAD | sed "1,/^\$/d" > output &&
+	test_cmp expect output
+
+[master 5b1a0f3] zort
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 foo
+ok 16 - --signoff
+
+expecting success of 7500.17 'commit message from file (1)': 
+	mkdir subdir &&
+	echo "Log in top directory" >log &&
+	echo "Log in sub directory" >subdir/log &&
+	(
+		cd subdir &&
+		git commit --allow-empty -F log
+	) &&
+	commit_msg_is "Log in sub directory"
+
+[master 101c1bd] Log in sub directory
+ Author: A U Thor <author@example.com>
+ok 17 - commit message from file (1)
+
+expecting success of 7500.18 'commit message from file (2)': 
+	rm -f log &&
+	echo "Log in sub directory" >subdir/log &&
+	(
+		cd subdir &&
+		git commit --allow-empty -F log
+	) &&
+	commit_msg_is "Log in sub directory"
+
+[master 83046dc] Log in sub directory
+ Author: A U Thor <author@example.com>
+ok 18 - commit message from file (2)
+
+expecting success of 7500.19 'commit message from stdin': 
+	(
+		cd subdir &&
+		echo "Log with foo word" | git commit --allow-empty -F -
+	) &&
+	commit_msg_is "Log with foo word"
+
+[master 2f170f9] Log with foo word
+ Author: A U Thor <author@example.com>
+ok 19 - commit message from stdin
+
+expecting success of 7500.20 'commit -F overrides -t': 
+	(
+		cd subdir &&
+		echo "-F log" > f.log &&
+		echo "-t template" > t.template &&
+		git commit --allow-empty -F f.log -t t.template
+	) &&
+	commit_msg_is "-F log"
+
+[master df55417] -F log
+ Author: A U Thor <author@example.com>
+ok 20 - commit -F overrides -t
+
+expecting success of 7500.21 'Commit without message is allowed with --allow-empty-message': 
+	echo "more content" >>foo &&
+	git add foo &&
+	>empty &&
+	git commit --allow-empty-message <empty &&
+	commit_msg_is "" &&
+	git tag empty-message-commit
+
+[master 5cf7fec] 
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 21 - Commit without message is allowed with --allow-empty-message
+
+expecting success of 7500.22 'Commit without message is no-no without --allow-empty-message': 
+	echo "more content" >>foo &&
+	git add foo &&
+	>empty &&
+	test_must_fail git commit <empty
+
+Aborting commit due to empty commit message.
+ok 22 - Commit without message is no-no without --allow-empty-message
+
+expecting success of 7500.23 'Commit a message with --allow-empty-message': 
+	echo "even more content" >>foo &&
+	git add foo &&
+	git commit --allow-empty-message -m"hello there" &&
+	commit_msg_is "hello there"
+
+[master 1a05b50] hello there
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ok 23 - Commit a message with --allow-empty-message
+
+expecting success of 7500.24 'commit -C empty respects --allow-empty-message': 
+	echo more >>foo &&
+	git add foo &&
+	test_must_fail git commit -C empty-message-commit &&
+	git commit -C empty-message-commit --allow-empty-message &&
+	commit_msg_is ""
+
+Aborting commit due to empty commit message.
+[master 7c3a153] 
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 24 - commit -C empty respects --allow-empty-message
+
+expecting success of 7500.25 'commit --fixup provides correct one-line commit message': 
+	commit_for_rebase_autosquash_setup &&
+	EDITOR="echo ignored >>" git commit --fixup HEAD~1 &&
+	commit_msg_is "fixup! target message subject line"
+
+[master 9b5b399] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 5b2adcc] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 77c550c] fixup! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 25 - commit --fixup provides correct one-line commit message
+
+expecting success of 7500.26 'commit --fixup -m"something" -m"extra"': 
+	commit_for_rebase_autosquash_setup &&
+	git commit --fixup HEAD~1 -m"something" -m"extra" &&
+	commit_msg_is "fixup! target message subject linesomething
+
+extra"
+
+[master d870198] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 4134eb8] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master d256be7] fixup! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 26 - commit --fixup -m"something" -m"extra"
+
+expecting success of 7500.27 'commit --fixup --edit': 
+	commit_for_rebase_autosquash_setup &&
+	EDITOR="printf \"something\nextra\" >>" git commit --fixup HEAD~1 --edit &&
+	commit_msg_is "fixup! target message subject linesomething
+extra"
+
+[master 68474d9] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master d9cd24a] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b813bdf] fixup! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 27 - commit --fixup --edit
+
+expecting success of 7500.28 'commit --fixup=amend: creates amend! commit': 
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
+
+	$(get_commit_msg HEAD~)
+
+	edited
+	EOF
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="edited" \
+			git commit --fixup=amend:HEAD~
+	) &&
+	get_commit_msg HEAD >actual &&
+	test_cmp expected actual
+
+[master 25d4b87] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 49d2e45] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 6a95a22] amend! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 28 - commit --fixup=amend: creates amend! commit
+
+expecting success of 7500.29 '--fixup=amend: --only ignores staged changes': 
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
+
+	$(get_commit_msg HEAD~)
+
+	edited
+	EOF
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="edited" \
+			git commit --fixup=amend:HEAD~ --only
+	) &&
+	get_commit_msg HEAD >actual &&
+	test_cmp expected actual &&
+	test_cmp_rev HEAD@{1}^{tree} HEAD^{tree} &&
+	test_cmp_rev HEAD@{1} HEAD^ &&
+	test_expect_code 1 git diff --cached --exit-code &&
+	git cat-file blob :foo >actual &&
+	test_cmp foo actual
+
+[master 495438c] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master edaae07] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 948c995] amend! target message subject line
+ Author: A U Thor <author@example.com>
+diff --git a/foo b/foo
+index 42c2cbb..b6c6366 100644
+--- a/foo
++++ b/foo
+@@ -24,3 +24,4 @@ second content line
+ third content line
+ first content line
+ second content line
++third content line
+ok 29 - --fixup=amend: --only ignores staged changes
+
+expecting success of 7500.30 '--fixup=reword: ignores staged changes': 
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
+
+	$(get_commit_msg HEAD~)
+
+	edited
+	EOF
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="edited" \
+			git commit --fixup=reword:HEAD~
+	) &&
+	get_commit_msg HEAD >actual &&
+	test_cmp expected actual &&
+	test_cmp_rev HEAD@{1}^{tree} HEAD^{tree} &&
+	test_cmp_rev HEAD@{1} HEAD^ &&
+	test_expect_code 1 git diff --cached --exit-code &&
+	git cat-file blob :foo >actual &&
+	test_cmp foo actual
+
+[master ed4d665] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master 218b136] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master ee78bdc] amend! target message subject line
+ Author: A U Thor <author@example.com>
+diff --git a/foo b/foo
+index 0b75f14..a67f15d 100644
+--- a/foo
++++ b/foo
+@@ -27,3 +27,4 @@ second content line
+ third content line
+ first content line
+ second content line
++third content line
+ok 30 - --fixup=reword: ignores staged changes
+
+expecting success of 7500.31 '--fixup=reword: error out with -m option': 
+	commit_for_rebase_autosquash_setup &&
+	echo "fatal: options '-m' and '--fixup:reword' cannot be used together" >expect &&
+	test_must_fail git commit --fixup=reword:HEAD~ -m "reword commit message" 2>actual &&
+	test_cmp expect actual
+
+[master 9d96c85] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master 5b2f7bf] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 31 - --fixup=reword: error out with -m option
+
+expecting success of 7500.32 '--fixup=amend: error out with -m option': 
+	commit_for_rebase_autosquash_setup &&
+	echo "fatal: options '-m' and '--fixup:amend' cannot be used together" >expect &&
+	test_must_fail git commit --fixup=amend:HEAD~ -m "amend commit message" 2>actual &&
+	test_cmp expect actual
+
+[master a94321d] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master 7600d55] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 32 - --fixup=amend: error out with -m option
+
+expecting success of 7500.33 'consecutive amend! commits remove amend! line from commit msg body': 
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! amend! $(git log -1 --format=%s HEAD~)
+
+	$(get_commit_msg HEAD~)
+
+	edited 1
+
+	edited 2
+	EOF
+	echo "reword new commit message" >actual &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="edited 1" \
+			git commit --fixup=reword:HEAD~ &&
+		FAKE_COMMIT_AMEND="edited 2" \
+			git commit --fixup=reword:HEAD
+	) &&
+	get_commit_msg HEAD >actual &&
+	test_cmp expected actual
+
+[master 2a99715] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master 550158e] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 38fd587] amend! target message subject line
+ Author: A U Thor <author@example.com>
+[master 1a502bb] amend! amend! target message subject line
+ Author: A U Thor <author@example.com>
+ok 33 - consecutive amend! commits remove amend! line from commit msg body
+
+expecting success of 7500.34 'deny to create amend! commit if its commit msg body is empty': 
+	commit_for_rebase_autosquash_setup &&
+	echo "Aborting commit due to empty commit message body." >expected &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_COMMIT_MESSAGE="amend! target message subject line" \
+			git commit --fixup=amend:HEAD~ 2>actual
+	) &&
+	test_cmp expected actual
+
+[master c428437] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master ac86728] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 34 - deny to create amend! commit if its commit msg body is empty
+
+expecting success of 7500.35 'amend! commit allows empty commit msg body with --allow-empty-message': 
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
+	EOF
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE="amend! target message subject line" \
+			git commit --fixup=amend:HEAD~ --allow-empty-message &&
+		get_commit_msg HEAD >actual
+	) &&
+	test_cmp expected actual
+
+[master d75d1dc] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master 95b8327] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master a8cf642] amend! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 35 - amend! commit allows empty commit msg body with --allow-empty-message
+
+expecting success of 7500.36 '--fixup=reword: incompatible with --all': 
+		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
+		test_must_fail git commit --fixup=reword:HEAD~ --all 2>actual &&
+		test_cmp expect actual
+	
+ok 36 - --fixup=reword: incompatible with --all
+
+expecting success of 7500.37 '--fixup=reword: incompatible with --include': 
+		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
+		test_must_fail git commit --fixup=reword:HEAD~ --include 2>actual &&
+		test_cmp expect actual
+	
+ok 37 - --fixup=reword: incompatible with --include
+
+expecting success of 7500.38 '--fixup=reword: incompatible with --only': 
+		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
+		test_must_fail git commit --fixup=reword:HEAD~ --only 2>actual &&
+		test_cmp expect actual
+	
+ok 38 - --fixup=reword: incompatible with --only
+
+expecting success of 7500.39 '--fixup=reword: incompatible with --interactive': 
+		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
+		test_must_fail git commit --fixup=reword:HEAD~ --interactive 2>actual &&
+		test_cmp expect actual
+	
+ok 39 - --fixup=reword: incompatible with --interactive
+
+expecting success of 7500.40 '--fixup=reword: incompatible with --patch': 
+		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
+		test_must_fail git commit --fixup=reword:HEAD~ --patch 2>actual &&
+		test_cmp expect actual
+	
+ok 40 - --fixup=reword: incompatible with --patch
+
+expecting success of 7500.41 '--fixup=reword: give error with pathsec': 
+	commit_for_rebase_autosquash_setup &&
+	echo "fatal: reword option of '--fixup' and path 'foo' cannot be used together" >expect &&
+	test_must_fail git commit --fixup=reword:HEAD~ -- foo 2>actual &&
+	test_cmp expect actual
+
+[master c3507b6] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master f054bdc] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 41 - --fixup=reword: give error with pathsec
+
+expecting success of 7500.42 '--fixup=reword: -F give error message': 
+	echo "fatal: options '-F' and '--fixup' cannot be used together" >expect &&
+	test_must_fail git commit --fixup=reword:HEAD~ -F msg  2>actual &&
+	test_cmp expect actual
+
+ok 42 - --fixup=reword: -F give error message
+
+expecting success of 7500.43 'commit --squash works with -F': 
+	commit_for_rebase_autosquash_setup &&
+	echo "log message from file" >msgfile &&
+	git commit --squash HEAD~1 -F msgfile  &&
+	commit_msg_is "squash! target message subject linelog message from file"
+
+[master 21cad69] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master 2bfb665] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master bc37c4c] squash! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 43 - commit --squash works with -F
+
+expecting success of 7500.44 'commit --squash works with -m': 
+	commit_for_rebase_autosquash_setup &&
+	git commit --squash HEAD~1 -m "foo bar\nbaz" &&
+	commit_msg_is "squash! target message subject linefoo bar\nbaz"
+
+[master 34d018d] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 9280558] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 74b4402] squash! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 44 - commit --squash works with -m
+
+expecting success of 7500.45 'commit --squash works with -C': 
+	commit_for_rebase_autosquash_setup &&
+	git commit --squash HEAD~1 -C HEAD &&
+	commit_msg_is "squash! target message subject lineintermediate commit"
+
+[master 6ba9d60] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master a1fa052] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 3059308] squash! target message subject line
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 45 - commit --squash works with -C
+
+expecting success of 7500.46 'commit --squash works with -c': 
+	commit_for_rebase_autosquash_setup &&
+	test_set_editor "$TEST_DIRECTORY"/t7500/edit-content &&
+	git commit --squash HEAD~1 -c HEAD &&
+	commit_msg_is "squash! target message subject lineedited commit"
+
+[master 2cb0c38] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 81a0468] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 9792f72] squash! target message subject line
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 46 - commit --squash works with -c
+
+expecting success of 7500.47 'commit --squash works with -C for same commit': 
+	commit_for_rebase_autosquash_setup &&
+	git commit --squash HEAD -C HEAD &&
+	commit_msg_is "squash! intermediate commit"
+
+[master fcc9597] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 3fba3a1] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b6827cd] squash! intermediate commit
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 47 - commit --squash works with -C for same commit
+
+expecting success of 7500.48 'commit --squash works with -c for same commit': 
+	commit_for_rebase_autosquash_setup &&
+	test_set_editor "$TEST_DIRECTORY"/t7500/edit-content &&
+	git commit --squash HEAD -c HEAD &&
+	commit_msg_is "squash! edited commit"
+
+[master 35e184e] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 328d91f] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master d7c0314] squash! edited commit
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 48 - commit --squash works with -c for same commit
+
+expecting success of 7500.49 'commit --squash works with editor': 
+	commit_for_rebase_autosquash_setup &&
+	test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
+	git commit --squash HEAD~1 &&
+	commit_msg_is "squash! target message subject linecommit message"
+
+[master acfdcf4] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 5a82cf8] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 8042530] squash! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 49 - commit --squash works with editor
+
+expecting success of 7500.50 'invalid message options when using --fixup': 
+	echo changes >>foo &&
+	echo "message" >log &&
+	git add foo &&
+	test_must_fail git commit --fixup HEAD~1 --squash HEAD~2 &&
+	test_must_fail git commit --fixup HEAD~1 -C HEAD~2 &&
+	test_must_fail git commit --fixup HEAD~1 -c HEAD~2 &&
+	test_must_fail git commit --fixup HEAD~1 -F log
+
+fatal: options '--squash' and '--fixup' cannot be used together
+fatal: options '-C' and '--fixup' cannot be used together
+fatal: options '-c' and '--fixup' cannot be used together
+fatal: options '-F' and '--fixup' cannot be used together
+ok 50 - invalid message options when using --fixup
+
+expecting success of 7500.51 'new line found before status message in commit template': 
+	git checkout -b commit-template-check &&
+	git reset --hard HEAD &&
+	touch commit-template-check &&
+	git add commit-template-check &&
+	GIT_EDITOR="cat >editor-input" git commit --untracked-files=no --allow-empty-message &&
+	test_cmp expected-template editor-input
+
+Switched to a new branch 'commit-template-check'
+HEAD is now at 8042530 squash! target message subject line
+[commit-template-check c1e58ac] 
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 commit-template-check
+ok 51 - new line found before status message in commit template
+
+expecting success of 7500.52 'setup empty commit with unstaged rename and copy': 
+	test_create_repo unstaged_rename_and_copy &&
+	(
+		cd unstaged_rename_and_copy &&
+
+		echo content >orig &&
+		git add orig &&
+		test_commit orig &&
+
+		cp orig new_copy &&
+		mv orig new_rename &&
+		git add -N new_copy new_rename
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7500-commit-template-squash-signoff/unstaged_rename_and_copy/.git/
+[master (root-commit) bac0952] orig
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 orig
+ create mode 100644 orig.t
+ok 52 - setup empty commit with unstaged rename and copy
+
+expecting success of 7500.53 'check commit with unstaged rename and copy': 
+	(
+		cd unstaged_rename_and_copy &&
+
+		test_must_fail git -c diff.renames=copy commit
+	)
+
+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)
+	copied:     orig -> new_copy
+	renamed:    orig -> new_rename
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 53 - check commit with unstaged rename and copy
+
+expecting success of 7500.54 'commit without staging files fails and displays hints': 
+	echo "initial" >file &&
+	git add file &&
+	git commit -m initial &&
+	echo "changes" >>file &&
+	test_must_fail git commit -m update >actual &&
+	test_grep "no changes added to commit (use \"git add\" and/or \"git commit -a\")" actual
+
+[commit-template-check cfa8638] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 54 - commit without staging files fails and displays hints
+
+# passed all 54 test(s)
+1..54
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7501-commit-basic-functionality.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7501-commit-basic-functionality/.git/
 expecting success of 7501.1 'initial status': 
@@ -482799,6 +482151,1588 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7063-status-untracked-cache.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7063-status-untracked-cache/.git/
+checking prerequisite: UNTRACKED_CACHE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
+	{ git update-index --test-untracked-cache; ret=$?; } &&
+	test $ret -ne 1
+
+)
+Testing mtime in '/build/reproducible-path/git-2.51.0/t/trash directory.t7063-status-untracked-cache' ...... OK
+prerequisite UNTRACKED_CACHE ok
+expecting success of 7063.1 'core.untrackedCache is unset': 
+	test_must_fail git config --get core.untrackedCache
+
+ok 1 - core.untrackedCache is unset
+
+expecting success of 7063.2 'setup': 
+	git init --template= worktree &&
+	cd worktree &&
+	mkdir done dtwo dthree &&
+	touch one two three done/one dtwo/two dthree/three &&
+	test-tool chmtime =-300 one two three done/one dtwo/two dthree/three &&
+	test-tool chmtime =-300 done dtwo dthree &&
+	test-tool chmtime =-300 . &&
+	git add one two done/one &&
+	mkdir .git/info &&
+	: >.git/info/exclude &&
+	git update-index --untracked-cache &&
+	test_oid_cache <<-EOF
+	root sha1:e6fcc8f2ee31bae321d66afd183fcb7237afae6e
+	root sha256:b90c672088c015b9c83876e919da311bad4cd39639fb139f988af6a11493b974
+
+	exclude sha1:13263c0978fb9fad16b2d580fb800b6d811c3ff0
+	exclude sha256:fe4aaa1bbbbce4cb8f73426748a14c5ad6026b26f90505a0bf2494b165a5b76c
+
+	done sha1:1946f0437f90c5005533cbe1736a6451ca301714
+	done sha256:7f079501d79f665b3acc50f5e0e9e94509084d5032ac20113a37dd5029b757cc
+	EOF
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7063-status-untracked-cache/worktree/.git/
+ok 2 - setup
+
+expecting success of 7063.3 'untracked cache is empty': 
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect-empty <<EOF &&
+info/exclude $ZERO_OID
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+EOF
+	test_cmp ../expect-empty ../actual
+
+ok 3 - untracked cache is empty
+
+expecting success of 7063.4 'status first time (empty cache)': 
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:3
+ ....gitignore-invalidation:1
+ ....directory-invalidation:0
+ ....opendir:4
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 4 - status first time (empty cache)
+
+expecting success of 7063.5 'untracked cache after first status': 
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../dump.expect ../actual
+
+ok 5 - untracked cache after first status
+
+expecting success of 7063.6 'status second time (fully populated cache)': 
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:0
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 6 - status second time (fully populated cache)
+
+expecting success of 7063.7 'untracked cache after second status': 
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../dump.expect ../actual
+
+ok 7 - untracked cache after second status
+
+expecting success of 7063.8 'untracked cache is bypassed with -uall': 
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status -uall --porcelain >../actual &&
+	iuc status -uall --porcelain >../status.iuc &&
+	test_cmp ../status_uall.expect ../status.iuc &&
+	test_cmp ../status_uall.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 8 - untracked cache is bypassed with -uall
+
+expecting success of 7063.9 'untracked cache remains after bypass': 
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../dump.expect ../actual
+
+ok 9 - untracked cache remains after bypass
+
+expecting success of 7063.10 'if -uall is configured, untracked cache gets populated by default': 
+	test_config status.showuntrackedfiles all &&
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	test_cmp ../status_uall.expect ../status.iuc &&
+	test_cmp ../status_uall.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:3
+ ....gitignore-invalidation:1
+ ....directory-invalidation:0
+ ....opendir:4
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 10 - if -uall is configured, untracked cache gets populated by default
+
+expecting success of 7063.11 'if -uall was configured, untracked cache is populated': 
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../dump_uall.expect ../actual
+
+ok 11 - if -uall was configured, untracked cache is populated
+
+expecting success of 7063.12 'if -uall is configured, untracked cache is used by default': 
+	test_config status.showuntrackedfiles all &&
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	test_cmp ../status_uall.expect ../status.iuc &&
+	test_cmp ../status_uall.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:0
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 12 - if -uall is configured, untracked cache is used by default
+
+expecting success of 7063.13 'if -uall is configured, untracked cache is bypassed with -unormal': 
+	test_config status.showuntrackedfiles all &&
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status -unormal --porcelain >../actual &&
+	iuc status -unormal --porcelain >../status.iuc &&
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 13 - if -uall is configured, untracked cache is bypassed with -unormal
+
+expecting success of 7063.14 'repopulate untracked cache for -unormal': 
+	git status --porcelain
+
+A  done/one
+A  one
+A  two
+?? dthree/
+?? dtwo/
+?? three
+ok 14 - repopulate untracked cache for -unormal
+
+expecting success of 7063.15 'modify in root directory, one dir invalidation': 
+	: >four &&
+	test-tool chmtime =-240 four &&
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+A  done/one
+A  one
+A  two
+?? dthree/
+?? dtwo/
+?? four
+?? three
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:1
+ ....opendir:1
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+
+ok 15 - modify in root directory, one dir invalidation
+
+expecting success of 7063.16 'verify untracked cache dump': 
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $EMPTY_BLOB
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $ZERO_OID recurse valid
+dthree/
+dtwo/
+four
+three
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+three
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+ok 16 - verify untracked cache dump
+
+expecting success of 7063.17 'new .gitignore invalidates recursively': 
+	echo four >.gitignore &&
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+A  done/one
+A  one
+A  two
+?? .gitignore
+?? dthree/
+?? dtwo/
+?? three
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:1
+ ....directory-invalidation:1
+ ....opendir:4
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+
+ok 17 - new .gitignore invalidates recursively
+
+expecting success of 7063.18 'verify untracked cache dump': 
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $EMPTY_BLOB
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse valid
+.gitignore
+dthree/
+dtwo/
+three
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+three
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+ok 18 - verify untracked cache dump
+
+expecting success of 7063.19 'new info/exclude invalidates everything': 
+	echo three >>.git/info/exclude &&
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+A  done/one
+A  one
+A  two
+?? .gitignore
+?? dtwo/
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:1
+ ....directory-invalidation:0
+ ....opendir:4
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 19 - new info/exclude invalidates everything
+
+expecting success of 7063.20 'verify untracked cache dump': 
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse valid
+.gitignore
+dtwo/
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+ok 20 - verify untracked cache dump
+
+expecting success of 7063.21 'move two from tracked to untracked': 
+	git rm --cached two &&
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+rm 'two'
+ok 21 - move two from tracked to untracked
+
+expecting success of 7063.22 'status after the move': 
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+A  done/one
+A  one
+?? .gitignore
+?? dtwo/
+?? two
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:1
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 22 - status after the move
+
+expecting success of 7063.23 'verify untracked cache dump': 
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse valid
+.gitignore
+dtwo/
+two
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+ok 23 - verify untracked cache dump
+
+expecting success of 7063.24 'move two from untracked to tracked': 
+	git add two &&
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+ok 24 - move two from untracked to tracked
+
+expecting success of 7063.25 'status after the move': 
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+A  done/one
+A  one
+A  two
+?? .gitignore
+?? dtwo/
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:1
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 25 - status after the move
+
+expecting success of 7063.26 'verify untracked cache dump': 
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse valid
+.gitignore
+dtwo/
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+ok 26 - verify untracked cache dump
+
+expecting success of 7063.27 'set up for sparse checkout testing': 
+	echo two >done/.gitignore &&
+	echo three >>done/.gitignore &&
+	echo two >done/two &&
+	git add -f done/two done/.gitignore &&
+	git commit -m "first commit"
+
+[main (root-commit) 2d55d32] first commit
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+)
+ create mode 100644 done/.gitignore
+ create mode 100644 done/one
+ create mode 100644 done/two
+ create mode 100644 one
+ create mode 100644 two
+ok 27 - set up for sparse checkout testing
+
+expecting success of 7063.28 'status after commit': 
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+?? .gitignore
+?? dtwo/
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:2
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 28 - status after commit
+
+expecting success of 7063.29 'untracked cache correct after commit': 
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse valid
+.gitignore
+dtwo/
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+ok 29 - untracked cache correct after commit
+
+expecting success of 7063.30 'set up sparse checkout': 
+	echo "done/[a-z]*" >.git/info/sparse-checkout &&
+	test_config core.sparsecheckout true &&
+	git checkout main &&
+	git update-index --force-untracked-cache &&
+	git status --porcelain >/dev/null && # prime the cache
+	test_path_is_missing done/.gitignore &&
+	test_path_is_file done/one
+
+Already on 'main'
+ok 30 - set up sparse checkout
+
+expecting success of 7063.31 'create/modify files, some of which are gitignored': 
+	echo two bis >done/two &&
+	echo three >done/three && # three is gitignored
+	echo four >done/four && # four is gitignored at a higher level
+	echo five >done/five && # five is not gitignored
+	test-tool chmtime =-180 done/two done/three done/four done/five done &&
+	# we need to ensure that the root dir is touched (in the past);
+	test-tool chmtime =-180 . &&
+	sync_mtime
+
+ok 31 - create/modify files, some of which are gitignored
+
+expecting success of 7063.32 'test sparse status with untracked cache': 
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../status.actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+ M done/two
+?? .gitignore
+?? done/five
+?? dtwo/
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../status.actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:1
+ ....directory-invalidation:2
+ ....opendir:2
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 32 - test sparse status with untracked cache
+
+expecting success of 7063.33 'untracked cache correct after status': 
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse valid
+.gitignore
+dtwo/
+/done/ $(test_oid done) recurse valid
+five
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+ok 33 - untracked cache correct after status
+
+expecting success of 7063.34 'test sparse status again with untracked cache': 
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../status.actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+ M done/two
+?? .gitignore
+?? done/five
+?? dtwo/
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../status.actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:0
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 34 - test sparse status again with untracked cache
+
+expecting success of 7063.35 'set up for test of subdir and sparse checkouts': 
+	mkdir done/sub &&
+	mkdir done/sub/sub &&
+	echo "sub" > done/sub/sub/file &&
+	test-tool chmtime =-120 done/sub/sub/file done/sub/sub done/sub done
+
+ok 35 - set up for test of subdir and sparse checkouts
+
+expecting success of 7063.36 'test sparse status with untracked cache and subdir': 
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../status.actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+ M done/two
+?? .gitignore
+?? done/five
+?? done/sub/
+?? dtwo/
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../status.actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:2
+ ....gitignore-invalidation:0
+ ....directory-invalidation:1
+ ....opendir:3
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 36 - test sparse status with untracked cache and subdir
+
+expecting success of 7063.37 'verify untracked cache dump (sparse/subdirs)': 
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect-from-test-dump <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse valid
+.gitignore
+dtwo/
+/done/ $(test_oid done) recurse valid
+five
+sub/
+/done/sub/ $ZERO_OID recurse check_only valid
+sub/
+/done/sub/sub/ $ZERO_OID recurse check_only valid
+file
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect-from-test-dump ../actual
+
+ok 37 - verify untracked cache dump (sparse/subdirs)
+
+expecting success of 7063.38 'test sparse status again with untracked cache and subdir': 
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../status.actual &&
+	iuc status --porcelain >../status.iuc &&
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../status.actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:0
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 38 - test sparse status again with untracked cache and subdir
+
+expecting success of 7063.39 'move entry in subdir from untracked to cached': 
+	git add dtwo/two &&
+	git status --porcelain >../status.actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+ M done/two
+A  dtwo/two
+?? .gitignore
+?? done/five
+?? done/sub/
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../status.actual
+
+ok 39 - move entry in subdir from untracked to cached
+
+expecting success of 7063.40 'move entry in subdir from cached to untracked': 
+	git rm --cached dtwo/two &&
+	git status --porcelain >../status.actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+ M done/two
+?? .gitignore
+?? done/five
+?? done/sub/
+?? dtwo/
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../status.actual
+
+rm 'dtwo/two'
+ok 40 - move entry in subdir from cached to untracked
+
+expecting success of 7063.41 '--no-untracked-cache removes the cache': 
+	git update-index --no-untracked-cache &&
+	test-tool dump-untracked-cache >../actual &&
+	echo "no untracked cache" >../expect-no-uc &&
+	test_cmp ../expect-no-uc ../actual
+
+ok 41 - --no-untracked-cache removes the cache
+
+expecting success of 7063.42 'git status does not change anything': 
+	git status &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-no-uc ../actual
+
+On branch main
+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:   done/two
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 42 - git status does not change anything
+
+expecting success of 7063.43 'setting core.untrackedCache to true and using git status creates the cache': 
+	git config core.untrackedCache true &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-no-uc ../actual &&
+	git status &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-from-test-dump ../actual
+
+On branch main
+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:   done/two
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 43 - setting core.untrackedCache to true and using git status creates the cache
+
+expecting success of 7063.44 'using --no-untracked-cache does not fail when core.untrackedCache is true': 
+	git update-index --no-untracked-cache &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-no-uc ../actual &&
+	git update-index --untracked-cache &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-empty ../actual
+
+warning: core.untrackedCache is set to true; remove or change it, if you really want to disable the untracked cache
+ok 44 - using --no-untracked-cache does not fail when core.untrackedCache is true
+
+expecting success of 7063.45 'setting core.untrackedCache to false and using git status removes the cache': 
+	git config core.untrackedCache false &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-empty ../actual &&
+	git status &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-no-uc ../actual
+
+On branch main
+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:   done/two
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 45 - setting core.untrackedCache to false and using git status removes the cache
+
+expecting success of 7063.46 'using --untracked-cache does not fail when core.untrackedCache is false': 
+	git update-index --untracked-cache &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-empty ../actual
+
+warning: core.untrackedCache is set to false; remove or change it, if you really want to enable the untracked cache
+ok 46 - using --untracked-cache does not fail when core.untrackedCache is false
+
+expecting success of 7063.47 'setting core.untrackedCache to keep': 
+	git config core.untrackedCache keep &&
+	git update-index --untracked-cache &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-empty ../actual &&
+	git status &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-from-test-dump ../actual &&
+	git update-index --no-untracked-cache &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-no-uc ../actual &&
+	git update-index --force-untracked-cache &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-empty ../actual &&
+	git status &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-from-test-dump ../actual
+
+On branch main
+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:   done/two
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+On branch main
+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:   done/two
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 47 - setting core.untrackedCache to keep
+
+expecting success of 7063.48 'test ident field is working': 
+	mkdir ../other_worktree &&
+	cp -R done dthree dtwo four three ../other_worktree &&
+	GIT_WORK_TREE=../other_worktree git status 2>../err &&
+	echo "warning: untracked cache is disabled on this system or location" >../expect &&
+	test_cmp ../expect ../err
+
+On branch main
+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:   done/two
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	done/five
+	done/four
+	done/sub/
+	dtwo/
+	four
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 48 - test ident field is working
+
+expecting success of 7063.49 'untracked cache survives a checkout': 
+	git commit --allow-empty -m empty &&
+	test-tool dump-untracked-cache >../before &&
+	test_when_finished  "git checkout main" &&
+	git checkout -b other_branch &&
+	test-tool dump-untracked-cache >../after &&
+	test_cmp ../before ../after &&
+	test_commit test &&
+	test-tool dump-untracked-cache >../before &&
+	git checkout main &&
+	test-tool dump-untracked-cache >../after &&
+	test_cmp ../before ../after
+
+[main 9462075] empty
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'other_branch'
+[other_branch b773b8a] test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.t
+Switched to branch 'main'
+M	done/two
+Already on 'main'
+M	done/two
+ok 49 - untracked cache survives a checkout
+
+expecting success of 7063.50 'untracked cache survives a commit': 
+	test-tool dump-untracked-cache >../before &&
+	git add done/two &&
+	git commit -m commit &&
+	test-tool dump-untracked-cache >../after &&
+	test_cmp ../before ../after
+
+[main 527fa0b] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 50 - untracked cache survives a commit
+
+expecting success of 7063.51 'teardown worktree': 
+	cd ..
+
+ok 51 - teardown worktree
+
+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 7063.52 'setup worktree for symlink test': 
+	git init worktree-symlink &&
+	cd worktree-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 &&
+	ln -s two one &&
+	git add one &&
+	git commit -m"second commit"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7063-status-untracked-cache/worktree-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 b7cd1f6] second commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 120000 one
+ delete mode 100644 one/file
+ok 52 - setup worktree for symlink test
+
+expecting success of 7063.53 '"status" after symlink replacement should be clean with UC=true': 
+	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 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.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7504-commit-msg-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7504-commit-msg-hook/.git/
+expecting success of 7504.1 'with no hook': 
+
+	echo "foo" > file &&
+	git add file &&
+	git commit -m "first"
+
+
+[main (root-commit) d6ab80b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - with no hook
+
+expecting success of 7504.2 'with no hook (editor)': 
+
+	echo "more foo" >> file &&
+	git add file &&
+	echo "more foo" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
+
+
+[main 8164a21] more foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 2 - with no hook (editor)
+
+expecting success of 7504.3 '--no-verify with no hook': 
+
+	echo "bar" > file &&
+	git add file &&
+	git commit --no-verify -m "bar"
+
+
+[main 854c7e2] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ok 3 - --no-verify with no hook
+
+expecting success of 7504.4 '--no-verify with no hook (editor)': 
+
+	echo "more bar" > file &&
+	git add file &&
+	echo "more bar" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
+
+
+[main 0b79d34] more bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - --no-verify with no hook (editor)
+
+expecting success of 7504.5 'setup: commit-msg hook that always succeeds': 
+	test_hook --setup commit-msg <<-\EOF
+	exit 0
+	EOF
+
+ok 5 - setup: commit-msg hook that always succeeds
+
+expecting success of 7504.6 'with succeeding hook': 
+
+	echo "more" >> file &&
+	git add file &&
+	git commit -m "more"
+
+
+[main 329307f] more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 6 - with succeeding hook
+
+expecting success of 7504.7 'with succeeding hook (editor)': 
+
+	echo "more more" >> file &&
+	git add file &&
+	echo "more more" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
+
+
+[main 1c57244] more more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 7 - with succeeding hook (editor)
+
+expecting success of 7504.8 '--no-verify with succeeding hook': 
+
+	echo "even more" >> file &&
+	git add file &&
+	git commit --no-verify -m "even more"
+
+
+[main f6c9c8b] even more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 8 - --no-verify with succeeding hook
+
+expecting success of 7504.9 '--no-verify with succeeding hook (editor)': 
+
+	echo "even more more" >> file &&
+	git add file &&
+	echo "even more more" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
+
+
+[main 64f8392] even more more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 9 - --no-verify with succeeding hook (editor)
+
+expecting success of 7504.10 'setup: commit-msg hook that always fails': 
+	test_hook --clobber commit-msg <<-\EOF
+	exit 1
+	EOF
+
+ok 10 - setup: commit-msg hook that always fails
+
+expecting success of 7504.11 'with failing hook': 
+
+	echo "another" >> file &&
+	git add file &&
+	test_must_fail git commit -m "another"
+
+
+ok 11 - with failing hook
+
+expecting success of 7504.12 'with failing hook (editor)': 
+
+	echo "more another" >> file &&
+	git add file &&
+	echo "more another" > FAKE_MSG &&
+	! (GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit)
+
+
+ok 12 - with failing hook (editor)
+
+expecting success of 7504.13 '--no-verify with failing hook': 
+
+	echo "stuff" >> file &&
+	git add file &&
+	git commit --no-verify -m "stuff"
+
+
+[main 95dce17] stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ok 13 - --no-verify with failing hook
+
+expecting success of 7504.14 '-n followed by --verify with failing hook': 
+
+	echo "even more" >> file &&
+	git add file &&
+	test_must_fail git commit -n --verify -m "even more"
+
+
+ok 14 - -n followed by --verify with failing hook
+
+expecting success of 7504.15 '--no-verify with failing hook (editor)': 
+
+	echo "more stuff" >> file &&
+	git add file &&
+	echo "more stuff" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
+
+
+[main 254c35b] more stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ok 15 - --no-verify with failing hook (editor)
+
+expecting success of 7504.16 'merge fails with failing hook': 
+
+	test_when_finished "git branch -D newbranch" &&
+	test_when_finished "git checkout -f main" &&
+	git checkout --orphan newbranch &&
+	: >file2 &&
+	git add file2 &&
+	git commit --no-verify file2 -m in-side-branch &&
+	test_must_fail git merge --allow-unrelated-histories main &&
+	commit_msg_is "in-side-branch" # HEAD before merge
+
+
+Switched to a new branch 'newbranch'
+[newbranch (root-commit) 73906b9] in-side-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file2
+error: Your local changes to the following files would be overwritten by merge:
+  file
+Merge with strategy ort failed.
+Switched to branch 'main'
+Deleted branch newbranch (was 73906b9).
+ok 16 - merge fails with failing hook
+
+expecting success of 7504.17 'merge bypasses failing hook with --no-verify': 
+
+	test_when_finished "git branch -D newbranch" &&
+	test_when_finished "git checkout -f main" &&
+	git checkout --orphan newbranch &&
+	git rm -f file &&
+	: >file2 &&
+	git add file2 &&
+	git commit --no-verify file2 -m in-side-branch &&
+	git merge --no-verify --allow-unrelated-histories main &&
+	commit_msg_is "Merge branch 'main' into newbranch"
+
+Switched to a new branch 'newbranch'
+rm 'file'
+[newbranch (root-commit) 73906b9] in-side-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file2
+Merge made by the 'ort' strategy.
+ file | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+ create mode 100644 file
+Switched to branch 'main'
+Deleted branch newbranch (was d8333d0).
+ok 17 - merge bypasses failing hook with --no-verify
+
+expecting success of 7504.18 'setup: commit-msg hook made non-executable': 
+	git_dir="$(git rev-parse --git-dir)" &&
+	chmod -x "$git_dir/hooks/commit-msg"
+
+ok 18 - setup: commit-msg hook made non-executable
+
+expecting success of 7504.19 'with non-executable hook': 
+
+	echo "content" >file &&
+	git add file &&
+	git commit -m "content"
+
+
+hint: The '.git/hooks/commit-msg' hook was ignored because it's not set as executable.
+hint: You can disable this warning with `git config set advice.ignoredHook false`.
+[main 89fb8ae] content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+ok 19 - with non-executable hook
+
+expecting success of 7504.20 'with non-executable hook (editor)': 
+
+	echo "content again" >> file &&
+	git add file &&
+	echo "content again" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -m "content again"
+
+
+hint: The '.git/hooks/commit-msg' hook was ignored because it's not set as executable.
+hint: You can disable this warning with `git config set advice.ignoredHook false`.
+[main 888e6c6] content again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 20 - with non-executable hook (editor)
+
+expecting success of 7504.21 '--no-verify with non-executable hook': 
+
+	echo "more content" >> file &&
+	git add file &&
+	git commit --no-verify -m "more content"
+
+
+[main 7569859] more content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 21 - --no-verify with non-executable hook
+
+expecting success of 7504.22 '--no-verify with non-executable hook (editor)': 
+
+	echo "even more content" >> file &&
+	git add file &&
+	echo "even more content" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
+
+
+[main 275f9c1] even more content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 22 - --no-verify with non-executable hook (editor)
+
+expecting success of 7504.23 'setup: commit-msg hook that edits the commit message': 
+	test_hook --clobber commit-msg <<-\EOF
+	echo "new message" >"$1"
+	exit 0
+	EOF
+
+ok 23 - setup: commit-msg hook that edits the commit message
+
+expecting success of 7504.24 'hook edits commit message': 
+
+	echo "additional" >> file &&
+	git add file &&
+	git commit -m "additional" &&
+	commit_msg_is "new message"
+
+
+[main fe8ba48] new message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 24 - hook edits commit message
+
+expecting success of 7504.25 'hook edits commit message (editor)': 
+
+	echo "additional content" >> file &&
+	git add file &&
+	echo "additional content" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit &&
+	commit_msg_is "new message"
+
+
+[main 01f87e3] new message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 25 - hook edits commit message (editor)
+
+expecting success of 7504.26 'hook doesn't edit commit message': 
+
+	echo "plus" >> file &&
+	git add file &&
+	git commit --no-verify -m "plus" &&
+	commit_msg_is "plus"
+
+
+[main b89da1b] plus
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 26 - hook doesn't edit commit message
+
+expecting success of 7504.27 'hook doesn't edit commit message (editor)': 
+
+	echo "more plus" >> file &&
+	git add file &&
+	echo "more plus" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
+	commit_msg_is "more plus"
+
+[main f4fdd67] more plus
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 27 - hook doesn't edit commit message (editor)
+
+expecting success of 7504.28 'hook called in git-merge picks up commit message': 
+	test_when_finished "git branch -D newbranch" &&
+	test_when_finished "git checkout -f main" &&
+	git checkout --orphan newbranch &&
+	git rm -f file &&
+	: >file2 &&
+	git add file2 &&
+	git commit --no-verify file2 -m in-side-branch &&
+	git merge --allow-unrelated-histories main &&
+	commit_msg_is "new message"
+
+Switched to a new branch 'newbranch'
+rm 'file'
+[newbranch (root-commit) 73906b9] in-side-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file2
+Merge made by the 'ort' strategy.
+ file | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+ create mode 100644 file
+Switched to branch 'main'
+Deleted branch newbranch (was 8eb8126).
+ok 28 - hook called in git-merge picks up commit message
+
+checking known breakage of 7504.29 'merge --continue remembers --no-verify': 
+	test_when_finished "git branch -D newbranch" &&
+	test_when_finished "git checkout -f main" &&
+	git checkout main &&
+	echo a >file2 &&
+	git add file2 &&
+	git commit --no-verify -m "add file2 to main" &&
+	git checkout -b newbranch main^ &&
+	echo b >file2 &&
+	git add file2 &&
+	git commit --no-verify file2 -m in-side-branch &&
+	git merge --no-verify -m not-rewritten-by-hook main &&
+	# resolve conflict:
+	echo c >file2 &&
+	git add file2 &&
+	git merge --continue &&
+	commit_msg_is not-rewritten-by-hook
+
+Already on 'main'
+[main 4c03054] add file2 to main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+Switched to a new branch 'newbranch'
+[newbranch 7295afc] in-side-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Automatic merge failed; fix conflicts and then commit the result.
+Switched to branch 'main'
+Deleted branch newbranch (was 7295afc).
+not ok 29 - merge --continue remembers --no-verify # TODO known breakage
+
+expecting success of 7504.30 'hook is called for reword during `rebase -i`': 
+
+	GIT_SEQUENCE_EDITOR="\"$REWORD_EDITOR\"" git rebase -i HEAD^ &&
+	commit_msg_is "new message"
+
+
+Rebasing (1/1)
[detached HEAD 7d30ea0] new message
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+Successfully rebased and updated refs/heads/main.
+ok 30 - hook is called for reword during `rebase -i`
+
+# still have 1 known breakage(s)
+# passed all remaining 29 test(s)
+1..30
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7510-signed-commit.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7510-signed-commit/.git/
 checking prerequisite: GPG
@@ -484459,6 +485393,656 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7514-commit-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7507-commit-verbose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7507-commit-verbose/.git/
+expecting success of 7507.1 'setup': 
+	echo content >file &&
+	git add file &&
+	git commit -F message
+
+[master (root-commit) 5621fbe] subject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup
+
+expecting success of 7507.2 'initial commit shows verbose diff': 
+	git commit --amend -v &&
+	test_line_count = 1 out
+
+[master 5621fbe] subject
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 2 - initial commit shows verbose diff
+
+expecting success of 7507.3 'second commit': 
+	echo content modified >file &&
+	git add file &&
+	git commit -F message
+
+[master aa8777f] subject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - second commit
+
+expecting success of 7507.4 'verbose diff is stripped out': 
+	git commit --amend -v &&
+	check_message message &&
+	test_line_count = 1 out
+
+[master aa8777f] subject
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - verbose diff is stripped out
+
+expecting success of 7507.5 'verbose diff is stripped out (mnemonicprefix)': 
+	git config diff.mnemonicprefix true &&
+	git commit --amend -v &&
+	check_message message &&
+	test_line_count = 1 out
+
+[master aa8777f] subject
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 5 - verbose diff is stripped out (mnemonicprefix)
+
+expecting success of 7507.6 'diff in message is retained without -v': 
+	git commit --amend -F diff &&
+	check_message diff
+
+[master 5165ef5] This is an example commit message that contains a diff.
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - diff in message is retained without -v
+
+expecting success of 7507.7 'diff in message is retained with -v': 
+	git commit --amend -F diff -v &&
+	check_message diff
+
+[master 5165ef5] This is an example commit message that contains a diff.
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 7 - diff in message is retained with -v
+
+expecting success of 7507.8 'submodule log is stripped out too with -v': 
+	git config diff.submodule log &&
+	test_config_global protocol.file.allow always &&
+	git submodule add ./. sub &&
+	git commit -m "sub added" &&
+	(
+		cd sub &&
+		echo "more" >>file &&
+		git commit -a -m "submodule commit"
+	) &&
+	(
+		GIT_EDITOR=cat &&
+		export GIT_EDITOR &&
+		test_must_fail git commit -a -v 2>err
+	) &&
+	test_grep "Aborting commit due to empty commit message." err
+
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7507-commit-verbose/sub'...
+done.
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+[master 2b9398c] submodule commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# Author:    A U Thor <author@example.com>
+#
+# On branch master
+# Changes to be committed:
+#	modified:   sub
+#
+# Untracked files:
+#	.gitconfig
+#	actual
+#	check-for-diff
+#	diff
+#	err
+#	message
+#	out
+#
+# ------------------------ >8 ------------------------
+# Do not modify or remove the line above.
+# Everything below it will be ignored.
+Submodule sub 5165ef5..2b9398c:
+  > submodule commit
+Aborting commit due to empty commit message.
+ok 8 - submodule log is stripped out too with -v
+
+expecting success of 7507.9 'verbose diff is stripped out with set core.commentChar': 
+	(
+		GIT_EDITOR=cat &&
+		export GIT_EDITOR &&
+		test_must_fail git -c core.commentchar=";" commit -a -v 2>err
+	) &&
+	test_grep "Aborting commit due to empty commit message." err
+
+
+; Please enter the commit message for your changes. Lines starting
+; with ';' will be ignored, and an empty message aborts the commit.
+;
+; Author:    A U Thor <author@example.com>
+;
+; On branch master
+; Changes to be committed:
+;	modified:   sub
+;
+; Untracked files:
+;	.gitconfig
+;	actual
+;	check-for-diff
+;	diff
+;	err
+;	message
+;	out
+;
+; ------------------------ >8 ------------------------
+; Do not modify or remove the line above.
+; Everything below it will be ignored.
+Submodule sub 5165ef5..2b9398c:
+  > submodule commit
+Aborting commit due to empty commit message.
+ok 9 - verbose diff is stripped out with set core.commentChar
+
+expecting success of 7507.10 'verbose diff is stripped with multi-byte comment char': 
+	(
+		GIT_EDITOR=cat &&
+		export GIT_EDITOR &&
+		test_must_fail git -c core.commentchar="foo>" commit -a -v >out 2>err
+	) &&
+	grep "^foo> " out &&
+	test_grep "Aborting commit due to empty commit message." err
+
+foo> Please enter the commit message for your changes. Lines starting
+foo> with 'foo>' will be ignored, and an empty message aborts the commit.
+foo> Author:    A U Thor <author@example.com>
+foo> On branch master
+foo> Changes to be committed:
+foo> Untracked files:
+foo> ------------------------ >8 ------------------------
+foo> Do not modify or remove the line above.
+foo> Everything below it will be ignored.
+Aborting commit due to empty commit message.
+ok 10 - verbose diff is stripped with multi-byte comment char
+
+expecting success of 7507.11 'status does not verbose without --verbose': 
+	git status >actual &&
+	! grep "^diff --git" actual
+
+ok 11 - status does not verbose without --verbose
+
+expecting success of 7507.12 'setup -v -v': 
+	echo dirty >file
+
+ok 12 - setup -v -v
+
+expecting success of 7507.13 'commit.verbose=true and --verbose omitted': 
+		git -c commit.verbose=true commit --amend &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 13 - commit.verbose=true and --verbose omitted
+
+expecting success of 7507.14 'commit.verbose=1 and --verbose omitted': 
+		git -c commit.verbose=1 commit --amend &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 14 - commit.verbose=1 and --verbose omitted
+
+expecting success of 7507.15 'commit.verbose=false and --verbose omitted': 
+		git -c commit.verbose=false commit --amend &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 15 - commit.verbose=false and --verbose omitted
+
+expecting success of 7507.16 'commit.verbose=-2 and --verbose omitted': 
+		git -c commit.verbose=-2 commit --amend &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 16 - commit.verbose=-2 and --verbose omitted
+
+expecting success of 7507.17 'commit.verbose=-1 and --verbose omitted': 
+		git -c commit.verbose=-1 commit --amend &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 17 - commit.verbose=-1 and --verbose omitted
+
+expecting success of 7507.18 'commit.verbose=0 and --verbose omitted': 
+		git -c commit.verbose=0 commit --amend &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 18 - commit.verbose=0 and --verbose omitted
+
+expecting success of 7507.19 'commit.verbose=2 and --verbose omitted': 
+		git -c commit.verbose=2 commit --amend &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 19 - commit.verbose=2 and --verbose omitted
+
+expecting success of 7507.20 'commit.verbose=3 and --verbose omitted': 
+		git -c commit.verbose=3 commit --amend &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 20 - commit.verbose=3 and --verbose omitted
+
+expecting success of 7507.21 'commit.verbose=true and --verbose': 
+		git -c commit.verbose=true commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 21 - commit.verbose=true and --verbose
+
+expecting success of 7507.22 'commit.verbose=true and --no-verbose': 
+		git -c commit.verbose=true commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 22 - commit.verbose=true and --no-verbose
+
+expecting success of 7507.23 'commit.verbose=true and -v -v': 
+		git -c commit.verbose=true commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 23 - commit.verbose=true and -v -v
+
+expecting success of 7507.24 'commit.verbose=false and --verbose': 
+		git -c commit.verbose=false commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 24 - commit.verbose=false and --verbose
+
+expecting success of 7507.25 'commit.verbose=false and --no-verbose': 
+		git -c commit.verbose=false commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 25 - commit.verbose=false and --no-verbose
+
+expecting success of 7507.26 'commit.verbose=false and -v -v': 
+		git -c commit.verbose=false commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 26 - commit.verbose=false and -v -v
+
+expecting success of 7507.27 'commit.verbose=-2 and --verbose': 
+		git -c commit.verbose=-2 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 27 - commit.verbose=-2 and --verbose
+
+expecting success of 7507.28 'commit.verbose=-2 and --no-verbose': 
+		git -c commit.verbose=-2 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 28 - commit.verbose=-2 and --no-verbose
+
+expecting success of 7507.29 'commit.verbose=-2 and -v -v': 
+		git -c commit.verbose=-2 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 29 - commit.verbose=-2 and -v -v
+
+expecting success of 7507.30 'commit.verbose=-1 and --verbose': 
+		git -c commit.verbose=-1 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 30 - commit.verbose=-1 and --verbose
+
+expecting success of 7507.31 'commit.verbose=-1 and --no-verbose': 
+		git -c commit.verbose=-1 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 31 - commit.verbose=-1 and --no-verbose
+
+expecting success of 7507.32 'commit.verbose=-1 and -v -v': 
+		git -c commit.verbose=-1 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 32 - commit.verbose=-1 and -v -v
+
+expecting success of 7507.33 'commit.verbose=0 and --verbose': 
+		git -c commit.verbose=0 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 33 - commit.verbose=0 and --verbose
+
+expecting success of 7507.34 'commit.verbose=0 and --no-verbose': 
+		git -c commit.verbose=0 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 34 - commit.verbose=0 and --no-verbose
+
+expecting success of 7507.35 'commit.verbose=0 and -v -v': 
+		git -c commit.verbose=0 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 35 - commit.verbose=0 and -v -v
+
+expecting success of 7507.36 'commit.verbose=1 and --verbose': 
+		git -c commit.verbose=1 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 36 - commit.verbose=1 and --verbose
+
+expecting success of 7507.37 'commit.verbose=1 and --no-verbose': 
+		git -c commit.verbose=1 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 37 - commit.verbose=1 and --no-verbose
+
+expecting success of 7507.38 'commit.verbose=1 and -v -v': 
+		git -c commit.verbose=1 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 38 - commit.verbose=1 and -v -v
+
+expecting success of 7507.39 'commit.verbose=2 and --verbose': 
+		git -c commit.verbose=2 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 39 - commit.verbose=2 and --verbose
+
+expecting success of 7507.40 'commit.verbose=2 and --no-verbose': 
+		git -c commit.verbose=2 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 40 - commit.verbose=2 and --no-verbose
+
+expecting success of 7507.41 'commit.verbose=2 and -v -v': 
+		git -c commit.verbose=2 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 41 - commit.verbose=2 and -v -v
+
+expecting success of 7507.42 'commit.verbose=3 and --verbose': 
+		git -c commit.verbose=3 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 42 - commit.verbose=3 and --verbose
+
+expecting success of 7507.43 'commit.verbose=3 and --no-verbose': 
+		git -c commit.verbose=3 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 43 - commit.verbose=3 and --no-verbose
+
+expecting success of 7507.44 'commit.verbose=3 and -v -v': 
+		git -c commit.verbose=3 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 44 - commit.verbose=3 and -v -v
+
+expecting success of 7507.45 'status ignores commit.verbose=true': 
+	git -c commit.verbose=true status >actual &&
+	! grep "^diff --git actual"
+
+ok 45 - status ignores commit.verbose=true
+
+# passed all 45 test(s)
+1..45
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7502-commit-porcelain.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7502-commit-porcelain/.git/
 expecting success of 7502.1 'output summary format': 
@@ -485399,21 +486983,38 @@
 	git var GIT_AUTHOR_IDENT
 
 )
-Author identity unknown
+second user <pbuilder2@codethink03-arm64.debian.net> 1112912533 -0700
+prerequisite AUTOIDENT ok
+expecting success of 7502.52 'message shows committer when it is automatic': 
 
-*** Please tell me who you are.
+	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
 
-Run
+[main 0675a12] sample
+ Author: A U Thor <author@example.com>
+ Committer: second user <pbuilder2@codethink03-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 user.email "you@example.com"
-  git config --global user.name "Your Name"
+    git config --global --edit
 
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
+After doing this, you may fix the identity used for this commit with:
+
+    git commit --amend --reset-author
 
-fatal: empty ident name (for <pbuilder1@codethink04-arm64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-ok 52 # skip message shows committer when it is automatic (missing AUTOIDENT)
+ 1 file changed, 1 insertion(+)
+# Committer: second user <pbuilder2@codethink03-arm64.debian.net>
+ok 52 - message shows committer when it is automatic
 
 checking prerequisite: FAIL_PREREQS
 
@@ -485424,33 +487025,7 @@
 	
 )
 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@codethink04-arm64.debian.net>) not allowed
-ok 53 - do not fire editor when committer is bogus
+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 &&
@@ -485459,7 +487034,7 @@
 	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" git commit -m tick) &&
 	test "$(cat .git/result)" = "editor not started"
 
-[main d97654e] tick
+[main 03c9a0d] 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
@@ -485472,7 +487047,7 @@
 	 git commit -m "" --allow-empty-message) &&
 	test "$(cat .git/result)" = "editor not started"
 
-[main 84f6bcc] 
+[main 21c3a22] 
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 55 - do not fire editor if -m "" was given
@@ -485516,22 +487091,21 @@
 Removing msg
 Removing raw
 Removing text
-[main 133e0fd] add g
+[main a5d128b] 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
+[main ea8832a] 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
+[second d528946] 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
+error: could not apply ea8832a... 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"
@@ -485568,8 +487142,8 @@
 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
+Updated 1 path from b907ba1
+[second 2468f01] Merge branch 'main' into second
  Author: A U Thor <author@example.com>
 ok 58 - Hand committing of a redundant merge removes dups
 
@@ -485582,8 +487156,8 @@
 	test_line_count = 3 actual
 
 
-HEAD is now at 287266c Merge branch 'main' into second
-[second 8c7277e] hello: kitty
+HEAD is now at 2468f01 Merge branch 'main' into second
+[second df053ce] hello: kitty
  Author: A U Thor <author@example.com>
 ok 59 - A single-liner subject with a token plus colon is not a footer
 
@@ -485598,7 +487172,7 @@
 	sed -e "/^#/d" -e "s/^:.*//" .git/COMMIT_EDITMSG >actual &&
 	test_cmp expect actual
 
-[second 56e2ef7] Signed-off-by: C O Mitter <committer@example.com>
+[second f9d121f] 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
 
@@ -485606,8 +487180,8 @@
 		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
+HEAD is now at f9d121f Signed-off-by: C O Mitter <committer@example.com>
+[second 3813bc4] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 # Changes to be committed:
@@ -485617,8 +487191,8 @@
 		try_commit --status &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 7d4c5ba message
-[second 24b9005] message
+HEAD is now at 3813bc4 message
+[second e6a02f5] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 # Changes to be committed:
@@ -485628,8 +487202,8 @@
 		try_commit --no-status &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 24b9005 message
-[second 6f35a31] message
+HEAD is now at e6a02f5 message
+[second 16d518b] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 63 - commit --no-status
@@ -485639,8 +487213,8 @@
 		try_commit "" &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 6f35a31 message
-[second fb0e1b7] message
+HEAD is now at 16d518b message
+[second 2d4249b] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 # Changes to be committed:
@@ -485651,8 +487225,8 @@
 		try_commit "" &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at fb0e1b7 message
-[second 19f43d6] message
+HEAD is now at 2d4249b message
+[second 12cf520] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 65 - commit with commit.status = no
@@ -485662,8 +487236,8 @@
 		try_commit --status &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 19f43d6 message
-[second a6956b4] message
+HEAD is now at 12cf520 message
+[second c57db69] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 # Changes to be committed:
@@ -485674,8 +487248,8 @@
 		try_commit --no-status &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at a6956b4 message
-[second 3388dc5] message
+HEAD is now at c57db69 message
+[second 3ecb9d5] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 67 - commit --no-status with commit.status = yes
@@ -485685,8 +487259,8 @@
 		try_commit --status &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 3388dc5 message
-[second 517e0b4] message
+HEAD is now at 3ecb9d5 message
+[second 657ba0f] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 # Changes to be committed:
@@ -485697,8 +487271,8 @@
 		try_commit --no-status &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 517e0b4 message
-[second 2ee1433] message
+HEAD is now at 657ba0f message
+[second 4461cef] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 69 - commit --no-status with commit.status = no
@@ -485707,8 +487281,8 @@
 		try_commit "" &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 2ee1433 message
-[second 2e8ac9b] message
+HEAD is now at 4461cef message
+[second d9b12a7] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -485719,8 +487293,8 @@
 		try_commit --status &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 2e8ac9b message
-[second baeb21a] message
+HEAD is now at d9b12a7 message
+[second da08401] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -485731,8 +487305,8 @@
 		try_commit --no-status &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at baeb21a message
-[second c2fe270] message
+HEAD is now at da08401 message
+[second 087323d] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -485743,8 +487317,8 @@
 		try_commit "" &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at c2fe270 message
-[second 34e9ff1] message
+HEAD is now at 087323d message
+[second c3c4df0] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -485756,8 +487330,8 @@
 		try_commit "" &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 34e9ff1 message
-[second 76b6c0d] message
+HEAD is now at c3c4df0 message
+[second e4faddd] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -485768,8 +487342,8 @@
 		try_commit --status &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 76b6c0d message
-[second f761932] message
+HEAD is now at e4faddd message
+[second 6983ae0] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -485781,8 +487355,8 @@
 		try_commit --no-status &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at f761932 message
-[second 69efec9] message
+HEAD is now at 6983ae0 message
+[second 8edccfa] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -485793,8 +487367,8 @@
 		try_commit --status &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 69efec9 message
-[second 8d9fa13] message
+HEAD is now at 8edccfa message
+[second 4885316] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -485806,8 +487380,8 @@
 		try_commit --no-status &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 8d9fa13 message
-[second 32b4909] message
+HEAD is now at 4885316 message
+[second 66dc741] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -485818,8 +487392,8 @@
 	try_commit --status &&
 	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
 
-HEAD is now at 32b4909 message
-[second 8e6fd00] message ## Custom template
+HEAD is now at 66dc741 message
+[second cc9232a] message ## Custom template
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -485831,11 +487405,11 @@
 	GIT_EDITOR=.git/FAKE_EDITOR git -c core.commentChar=auto commit --amend &&
 	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
 
-[second 0f719bb] #foo
+[second 97b4720] #foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
-[second e03ca23] message #foo
+[second 25ccda4] message #foo
  Author: A U Thor <author@example.com>
  Date: Thu Apr 7 15:23:13 2005 -0700
  1 file changed, 1 insertion(+)
@@ -485862,7 +487436,7 @@
 		test_must_fail git -c core.commentChar=auto commit --amend
 	)
 
-[second cbf85e8] # 1 ; 2 @ 3 ! 4 $ 5 % 6 ^ 7 & 8 | 9 : 10
+[second 9e9febc] # 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(+)
@@ -485875,64 +487449,6 @@
 1..81
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7514-commit-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7515-status-symlinks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7515-status-symlinks/.git/
 expecting success of 7515.1 'setup': 
@@ -486043,659 +487559,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7507-commit-verbose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7507-commit-verbose/.git/
-expecting success of 7507.1 'setup': 
-	echo content >file &&
-	git add file &&
-	git commit -F message
-
-[master (root-commit) 5621fbe] subject
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup
-
-expecting success of 7507.2 'initial commit shows verbose diff': 
-	git commit --amend -v &&
-	test_line_count = 1 out
-
-[master 5621fbe] subject
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 2 - initial commit shows verbose diff
-
-expecting success of 7507.3 'second commit': 
-	echo content modified >file &&
-	git add file &&
-	git commit -F message
-
-[master aa8777f] subject
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - second commit
-
-expecting success of 7507.4 'verbose diff is stripped out': 
-	git commit --amend -v &&
-	check_message message &&
-	test_line_count = 1 out
-
-[master aa8777f] subject
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - verbose diff is stripped out
-
-expecting success of 7507.5 'verbose diff is stripped out (mnemonicprefix)': 
-	git config diff.mnemonicprefix true &&
-	git commit --amend -v &&
-	check_message message &&
-	test_line_count = 1 out
-
-[master aa8777f] subject
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - verbose diff is stripped out (mnemonicprefix)
-
-expecting success of 7507.6 'diff in message is retained without -v': 
-	git commit --amend -F diff &&
-	check_message diff
-
-[master 5165ef5] This is an example commit message that contains a diff.
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - diff in message is retained without -v
-
-expecting success of 7507.7 'diff in message is retained with -v': 
-	git commit --amend -F diff -v &&
-	check_message diff
-
-[master 5165ef5] This is an example commit message that contains a diff.
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - diff in message is retained with -v
-
-expecting success of 7507.8 'submodule log is stripped out too with -v': 
-	git config diff.submodule log &&
-	test_config_global protocol.file.allow always &&
-	git submodule add ./. sub &&
-	git commit -m "sub added" &&
-	(
-		cd sub &&
-		echo "more" >>file &&
-		git commit -a -m "submodule commit"
-	) &&
-	(
-		GIT_EDITOR=cat &&
-		export GIT_EDITOR &&
-		test_must_fail git commit -a -v 2>err
-	) &&
-	test_grep "Aborting commit due to empty commit message." err
-
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7507-commit-verbose/sub'...
-done.
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-[master 2b9398c] submodule commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-#
-# Author:    A U Thor <author@example.com>
-#
-# On branch master
-# Changes to be committed:
-#	modified:   sub
-#
-# Untracked files:
-#	.gitconfig
-#	actual
-#	check-for-diff
-#	diff
-#	err
-#	message
-#	out
-#
-# ------------------------ >8 ------------------------
-# Do not modify or remove the line above.
-# Everything below it will be ignored.
-Submodule sub 5165ef5..2b9398c:
-  > submodule commit
-Aborting commit due to empty commit message.
-ok 8 - submodule log is stripped out too with -v
-
-expecting success of 7507.9 'verbose diff is stripped out with set core.commentChar': 
-	(
-		GIT_EDITOR=cat &&
-		export GIT_EDITOR &&
-		test_must_fail git -c core.commentchar=";" commit -a -v 2>err
-	) &&
-	test_grep "Aborting commit due to empty commit message." err
-
-
-; Please enter the commit message for your changes. Lines starting
-; with ';' will be ignored, and an empty message aborts the commit.
-;
-; Author:    A U Thor <author@example.com>
-;
-; On branch master
-; Changes to be committed:
-;	modified:   sub
-;
-; Untracked files:
-;	.gitconfig
-;	actual
-;	check-for-diff
-;	diff
-;	err
-;	message
-;	out
-;
-; ------------------------ >8 ------------------------
-; Do not modify or remove the line above.
-; Everything below it will be ignored.
-Submodule sub 5165ef5..2b9398c:
-  > submodule commit
-Aborting commit due to empty commit message.
-ok 9 - verbose diff is stripped out with set core.commentChar
-
-expecting success of 7507.10 'verbose diff is stripped with multi-byte comment char': 
-	(
-		GIT_EDITOR=cat &&
-		export GIT_EDITOR &&
-		test_must_fail git -c core.commentchar="foo>" commit -a -v >out 2>err
-	) &&
-	grep "^foo> " out &&
-	test_grep "Aborting commit due to empty commit message." err
-
-foo> Please enter the commit message for your changes. Lines starting
-foo> with 'foo>' will be ignored, and an empty message aborts the commit.
-foo> Author:    A U Thor <author@example.com>
-foo> On branch master
-foo> Changes to be committed:
-foo> Untracked files:
-foo> ------------------------ >8 ------------------------
-foo> Do not modify or remove the line above.
-foo> Everything below it will be ignored.
-Aborting commit due to empty commit message.
-ok 10 - verbose diff is stripped with multi-byte comment char
-
-expecting success of 7507.11 'status does not verbose without --verbose': 
-	git status >actual &&
-	! grep "^diff --git" actual
-
-ok 11 - status does not verbose without --verbose
-
-expecting success of 7507.12 'setup -v -v': 
-	echo dirty >file
-
-ok 12 - setup -v -v
-
-expecting success of 7507.13 'commit.verbose=true and --verbose omitted': 
-		git -c commit.verbose=true commit --amend &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 13 - commit.verbose=true and --verbose omitted
-
-expecting success of 7507.14 'commit.verbose=1 and --verbose omitted': 
-		git -c commit.verbose=1 commit --amend &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 14 - commit.verbose=1 and --verbose omitted
-
-expecting success of 7507.15 'commit.verbose=false and --verbose omitted': 
-		git -c commit.verbose=false commit --amend &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 15 - commit.verbose=false and --verbose omitted
-
-expecting success of 7507.16 'commit.verbose=-2 and --verbose omitted': 
-		git -c commit.verbose=-2 commit --amend &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 16 - commit.verbose=-2 and --verbose omitted
-
-expecting success of 7507.17 'commit.verbose=-1 and --verbose omitted': 
-		git -c commit.verbose=-1 commit --amend &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 17 - commit.verbose=-1 and --verbose omitted
-
-expecting success of 7507.18 'commit.verbose=0 and --verbose omitted': 
-		git -c commit.verbose=0 commit --amend &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 18 - commit.verbose=0 and --verbose omitted
-
-expecting success of 7507.19 'commit.verbose=2 and --verbose omitted': 
-		git -c commit.verbose=2 commit --amend &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 19 - commit.verbose=2 and --verbose omitted
-
-expecting success of 7507.20 'commit.verbose=3 and --verbose omitted': 
-		git -c commit.verbose=3 commit --amend &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 20 - commit.verbose=3 and --verbose omitted
-
-expecting success of 7507.21 'commit.verbose=true and --verbose': 
-		git -c commit.verbose=true commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 21 - commit.verbose=true and --verbose
-
-expecting success of 7507.22 'commit.verbose=true and --no-verbose': 
-		git -c commit.verbose=true commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 22 - commit.verbose=true and --no-verbose
-
-expecting success of 7507.23 'commit.verbose=true and -v -v': 
-		git -c commit.verbose=true commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 23 - commit.verbose=true and -v -v
-
-expecting success of 7507.24 'commit.verbose=false and --verbose': 
-		git -c commit.verbose=false commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 24 - commit.verbose=false and --verbose
-
-expecting success of 7507.25 'commit.verbose=false and --no-verbose': 
-		git -c commit.verbose=false commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 25 - commit.verbose=false and --no-verbose
-
-expecting success of 7507.26 'commit.verbose=false and -v -v': 
-		git -c commit.verbose=false commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 26 - commit.verbose=false and -v -v
-
-expecting success of 7507.27 'commit.verbose=-2 and --verbose': 
-		git -c commit.verbose=-2 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 27 - commit.verbose=-2 and --verbose
-
-expecting success of 7507.28 'commit.verbose=-2 and --no-verbose': 
-		git -c commit.verbose=-2 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 28 - commit.verbose=-2 and --no-verbose
-
-expecting success of 7507.29 'commit.verbose=-2 and -v -v': 
-		git -c commit.verbose=-2 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 29 - commit.verbose=-2 and -v -v
-
-expecting success of 7507.30 'commit.verbose=-1 and --verbose': 
-		git -c commit.verbose=-1 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 30 - commit.verbose=-1 and --verbose
-
-expecting success of 7507.31 'commit.verbose=-1 and --no-verbose': 
-		git -c commit.verbose=-1 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 31 - commit.verbose=-1 and --no-verbose
-
-expecting success of 7507.32 'commit.verbose=-1 and -v -v': 
-		git -c commit.verbose=-1 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 32 - commit.verbose=-1 and -v -v
-
-expecting success of 7507.33 'commit.verbose=0 and --verbose': 
-		git -c commit.verbose=0 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 33 - commit.verbose=0 and --verbose
-
-expecting success of 7507.34 'commit.verbose=0 and --no-verbose': 
-		git -c commit.verbose=0 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 34 - commit.verbose=0 and --no-verbose
-
-expecting success of 7507.35 'commit.verbose=0 and -v -v': 
-		git -c commit.verbose=0 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 35 - commit.verbose=0 and -v -v
-
-expecting success of 7507.36 'commit.verbose=1 and --verbose': 
-		git -c commit.verbose=1 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 36 - commit.verbose=1 and --verbose
-
-expecting success of 7507.37 'commit.verbose=1 and --no-verbose': 
-		git -c commit.verbose=1 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 37 - commit.verbose=1 and --no-verbose
-
-expecting success of 7507.38 'commit.verbose=1 and -v -v': 
-		git -c commit.verbose=1 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 38 - commit.verbose=1 and -v -v
-
-expecting success of 7507.39 'commit.verbose=2 and --verbose': 
-		git -c commit.verbose=2 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 39 - commit.verbose=2 and --verbose
-
-expecting success of 7507.40 'commit.verbose=2 and --no-verbose': 
-		git -c commit.verbose=2 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 40 - commit.verbose=2 and --no-verbose
-
-expecting success of 7507.41 'commit.verbose=2 and -v -v': 
-		git -c commit.verbose=2 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 41 - commit.verbose=2 and -v -v
-
-expecting success of 7507.42 'commit.verbose=3 and --verbose': 
-		git -c commit.verbose=3 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 42 - commit.verbose=3 and --verbose
-
-expecting success of 7507.43 'commit.verbose=3 and --no-verbose': 
-		git -c commit.verbose=3 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 43 - commit.verbose=3 and --no-verbose
-
-expecting success of 7507.44 'commit.verbose=3 and -v -v': 
-		git -c commit.verbose=3 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 44 - commit.verbose=3 and -v -v
-
-expecting success of 7507.45 'status ignores commit.verbose=true': 
-	git -c commit.verbose=true status >actual &&
-	! grep "^diff --git actual"
-
-ok 45 - status ignores commit.verbose=true
-
-# passed all 45 test(s)
-1..45
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7518-ident-corner-cases.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7518-ident-corner-cases/.git/
-expecting success of 7518.1 'empty name and missing email': 
-	(
-		sane_unset GIT_AUTHOR_EMAIL &&
-		GIT_AUTHOR_NAME= &&
-		test_must_fail git commit --allow-empty -m foo 2>err &&
-		test_grep ! "(null)" err
-	)
-
-ok 1 - empty name and missing email
-
-expecting success of 7518.2 'commit rejects all-crud name': 
-	test_must_fail env GIT_AUTHOR_NAME=" ,;<>" \
-		git commit --allow-empty -m foo
-
-fatal: name consists only of disallowed characters:  ,;<>
-ok 2 - commit rejects all-crud name
-
-expecting success of 7518.3 'commit does not strip trailing dot': 
-	author_name="Pat Doe Jr." &&
-	env GIT_AUTHOR_NAME="$author_name" \
-		git commit --allow-empty -m foo &&
-	git log -1 --format=%an >actual &&
-	echo "$author_name" >expected &&
-	test_cmp actual expected
-
-[master (root-commit) 51fedaa] foo
- Author: Pat Doe Jr. <author@example.com>
-ok 3 - commit does not strip trailing dot
-
-expecting success of 7518.4 'empty configured name does not auto-detect': 
-	(
-		sane_unset GIT_AUTHOR_NAME &&
-		test_must_fail \
-			git -c user.name= commit --allow-empty -m foo 2>err &&
-		test_grep "empty ident name" err &&
-		test_grep "Author identity unknown" err
-	)
-
-fatal: empty ident name (for <author@example.com>) not allowed
-Author identity unknown
-ok 4 - empty configured name does not auto-detect
-
-expecting success of 7518.5 'empty configured name does not auto-detect for committer': 
-	(
-		sane_unset GIT_COMMITTER_NAME &&
-		test_must_fail \
-			git -c user.name= commit --allow-empty -m foo 2>err &&
-		test_grep "empty ident name" err &&
-		test_grep "Committer identity unknown" err
-	)
-
-fatal: empty ident name (for <committer@example.com>) not allowed
-Committer identity unknown
-ok 5 - empty configured name does not auto-detect for committer
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7505-prepare-commit-msg-hook.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7505-prepare-commit-msg-hook/.git/
 expecting success of 7505.1 'set up commits for rebasing': 
@@ -487741,348 +488604,155 @@
 1..40
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7520-ignored-hook-warning.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7520-ignored-hook-warning/.git/
-expecting success of 7520.1 'setup': 
-	test_hook --setup pre-commit <<-\EOF
-	exit 0
-	EOF
+*** t7518-ident-corner-cases.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7518-ident-corner-cases/.git/
+expecting success of 7518.1 'empty name and missing email': 
+	(
+		sane_unset GIT_AUTHOR_EMAIL &&
+		GIT_AUTHOR_NAME= &&
+		test_must_fail git commit --allow-empty -m foo 2>err &&
+		test_grep ! "(null)" err
+	)
 
-ok 1 - setup
+ok 1 - empty name and missing email
 
-expecting success of 7520.2 'no warning if hook is not ignored': 
-	git commit --allow-empty -m "more" 2>message &&
-	test_grep ! -e "hook was ignored" message
+expecting success of 7518.2 'commit rejects all-crud name': 
+	test_must_fail env GIT_AUTHOR_NAME=" ,;<>" \
+		git commit --allow-empty -m foo
 
-[master (root-commit) 4140ed5] more
- Author: A U Thor <author@example.com>
-ok 2 - no warning if hook is not ignored
+fatal: name consists only of disallowed characters:  ,;<>
+ok 2 - commit rejects all-crud name
 
-expecting success of 7520.3 'warning if hook is ignored': 
-	test_hook --disable pre-commit &&
-	git commit --allow-empty -m "even more" 2>message &&
-	test_grep -e "hook was ignored" message
+expecting success of 7518.3 'commit does not strip trailing dot': 
+	author_name="Pat Doe Jr." &&
+	env GIT_AUTHOR_NAME="$author_name" \
+		git commit --allow-empty -m foo &&
+	git log -1 --format=%an >actual &&
+	echo "$author_name" >expected &&
+	test_cmp actual expected
 
-[master d262933] even more
- Author: A U Thor <author@example.com>
-hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.
-ok 3 - warning if hook is ignored
+[master (root-commit) 51fedaa] foo
+ Author: Pat Doe Jr. <author@example.com>
+ok 3 - commit does not strip trailing dot
 
-expecting success of 7520.4 'no warning if advice.ignoredHook set to false': 
-	test_config advice.ignoredHook false &&
-	test_hook --disable pre-commit &&
-	git commit --allow-empty -m "even more" 2>message &&
-	test_grep ! -e "hook was ignored" message
+expecting success of 7518.4 'empty configured name does not auto-detect': 
+	(
+		sane_unset GIT_AUTHOR_NAME &&
+		test_must_fail \
+			git -c user.name= commit --allow-empty -m foo 2>err &&
+		test_grep "empty ident name" err &&
+		test_grep "Author identity unknown" err
+	)
 
-[master 9fbd7b1] even more
- Author: A U Thor <author@example.com>
-ok 4 - no warning if advice.ignoredHook set to false
+fatal: empty ident name (for <author@example.com>) not allowed
+Author identity unknown
+ok 4 - empty configured name does not auto-detect
 
-expecting success of 7520.5 'no warning if unset advice.ignoredHook and hook removed': 
-	test_hook --remove pre-commit &&
-	test_unconfig advice.ignoredHook &&
-	git commit --allow-empty -m "even more" 2>message &&
-	test_grep ! -e "hook was ignored" message
+expecting success of 7518.5 'empty configured name does not auto-detect for committer': 
+	(
+		sane_unset GIT_COMMITTER_NAME &&
+		test_must_fail \
+			git -c user.name= commit --allow-empty -m foo 2>err &&
+		test_grep "empty ident name" err &&
+		test_grep "Committer identity unknown" err
+	)
 
-[master f4891a6] even more
- Author: A U Thor <author@example.com>
-ok 5 - no warning if unset advice.ignoredHook and hook removed
+fatal: empty ident name (for <committer@example.com>) not allowed
+Committer identity unknown
+ok 5 - empty configured name does not auto-detect for committer
 
 # passed all 5 test(s)
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7524-commit-summary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7524-commit-summary/.git/
-expecting success of 7524.1 'setup': 
-	test_seq 101 200 >file &&
-	git add file &&
-	git commit -m initial &&
-	git tag initial
+*** t7520-ignored-hook-warning.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7520-ignored-hook-warning/.git/
+expecting success of 7520.1 'setup': 
+	test_hook --setup pre-commit <<-\EOF
+	exit 0
+	EOF
 
-[master (root-commit) 12dd244] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 100 insertions(+)
- create mode 100644 file
 ok 1 - setup
 
-expecting success of 7524.2 'commit summary ignores rewrites': 
-	git reset --hard initial &&
-	test_seq 200 300 >file &&
-
-	git diff --stat >diffstat &&
-	git diff --stat --break-rewrites >diffstatrewrite &&
-
-	# make sure this scenario is a detectable rewrite
-	! test_cmp_bin diffstat diffstatrewrite &&
-
-	git add file &&
-	git commit -m second >actual &&
-
-	grep "1 file" <actual >actual.total &&
-	grep "1 file" <diffstat >diffstat.total &&
-	test_cmp diffstat.total actual.total
-
-HEAD is now at 12dd244 initial
-diffstat diffstatrewrite differ: char 9, line 1
-ok 2 - commit summary ignores rewrites
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7517-per-repo-email.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+expecting success of 7520.2 'no warning if hook is not ignored': 
+	git commit --allow-empty -m "more" 2>message &&
+	test_grep ! -e "hook was ignored" message
 
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
+[master (root-commit) 4140ed5] more
+ Author: A U Thor <author@example.com>
+ok 2 - no warning if hook is not ignored
 
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
+expecting success of 7520.3 'warning if hook is ignored': 
+	test_hook --disable pre-commit &&
+	git commit --allow-empty -m "even more" 2>message &&
+	test_grep -e "hook was ignored" message
 
-fatal: no email was given and auto-detection is disabled
-ok 10 - non-fast-forward rebase refuses to write commits (interactive)
+[master d262933] even more
+ Author: A U Thor <author@example.com>
+hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.
+ok 3 - warning if hook is ignored
 
-expecting success of 7517.11 'noop interactive rebase does not care about ident': 
-	git checkout -B tmp side-with-commit &&
-	git rebase -i HEAD^
+expecting success of 7520.4 'no warning if advice.ignoredHook set to false': 
+	test_config advice.ignoredHook false &&
+	test_hook --disable pre-commit &&
+	git commit --allow-empty -m "even more" 2>message &&
+	test_grep ! -e "hook was ignored" message
 
-Reset branch 'tmp'
-Successfully rebased and updated refs/heads/tmp.
-ok 11 - noop interactive rebase does not care about ident
+[master 9fbd7b1] even more
+ Author: A U Thor <author@example.com>
+ok 4 - no warning if advice.ignoredHook set to false
 
-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
+expecting success of 7520.5 'no warning if unset advice.ignoredHook and hook removed': 
+	test_hook --remove pre-commit &&
+	test_unconfig advice.ignoredHook &&
+	git commit --allow-empty -m "even more" 2>message &&
+	test_grep ! -e "hook was ignored" message
 
-[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
+[master f4891a6] even more
+ Author: A U Thor <author@example.com>
+ok 5 - no warning if unset advice.ignoredHook and hook removed
 
-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
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7524-commit-summary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7524-commit-summary/.git/
+expecting success of 7524.1 'setup': 
+	test_seq 101 200 >file &&
+	git add file &&
+	git commit -m initial &&
+	git tag initial
 
-[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
+[master (root-commit) 12dd244] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 100 insertions(+)
+ create mode 100644 file
+ok 1 - setup
 
-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
+expecting success of 7524.2 'commit summary ignores rewrites': 
+	git reset --hard initial &&
+	test_seq 200 300 >file &&
 
-[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
+	git diff --stat >diffstat &&
+	git diff --stat --break-rewrites >diffstatrewrite &&
 
-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
+	# make sure this scenario is a detectable rewrite
+	! test_cmp_bin diffstat diffstatrewrite &&
 
-[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
+	git add file &&
+	git commit -m second >actual &&
 
-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
+	grep "1 file" <actual >actual.total &&
+	grep "1 file" <diffstat >diffstat.total &&
+	test_cmp diffstat.total actual.total
 
-[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
+HEAD is now at 12dd244 initial
+diffstat diffstatrewrite differ: char 9, line 1
+ok 2 - commit summary ignores rewrites
 
-# passed all 16 test(s)
-1..16
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7521-ignored-mode.sh ***
@@ -488402,6 +489072,260 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7517-per-repo-email.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7525-status-rename.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7525-status-rename/.git/
 expecting success of 7525.1 'setup': 
@@ -488560,374 +489484,6 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7527-builtin-fsmonitor.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7527-builtin-fsmonitor/.git/
-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
-1..0 # SKIP fsmonitor--daemon is not supported on this platform
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7528-signed-commit-ssh.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7528-signed-commit-ssh/.git/
-checking prerequisite: GPGSSH
-
-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;
-
-	# 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 &&
-
-	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
-
-	# 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
-
-)
-prerequisite GPGSSH not satisfied
-ok 1 # skip create signed commits (missing GPGSSH)
-
-ok 2 # skip sign commits using literal public keys with ssh-agent (missing GPGSSH)
-
-checking prerequisite: GPGSSH_VERIFYTIME
-
-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\"" &&
-
-	# 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") &&
-
-	# 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 &&
-
-	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
-
-	# 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)
-
-)
-prerequisite GPGSSH_VERIFYTIME not satisfied
-ok 3 # skip create signed commits with keys having defined lifetimes (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 4 # skip verify and show signatures (missing GPGSSH)
-
-ok 5 # skip verify-commit exits failure on untrusted signature (missing GPGSSH)
-
-ok 6 # skip verify-commit exits failure on expired signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 7 # skip verify-commit exits failure on not yet valid signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 8 # skip verify-commit succeeds with commit date and key validity matching (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 9 # skip verify-commit exits failure with commit date outside of key validity (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 10 # skip verify-commit exits success with matching minTrustLevel (missing GPGSSH)
-
-ok 11 # skip verify-commit exits success with low minTrustLevel (missing GPGSSH)
-
-ok 12 # skip verify-commit exits failure with high minTrustLevel (missing GPGSSH)
-
-ok 13 # skip verify signatures with --raw (missing GPGSSH)
-
-ok 14 # skip proper header is used for hash algorithm (missing GPGSSH)
-
-ok 15 # skip show signed commit with signature (missing GPGSSH)
-
-ok 16 # skip detect fudged signature (missing GPGSSH)
-
-ok 17 # skip detect fudged signature with NUL (missing GPGSSH)
-
-ok 18 # skip amending already signed commit (missing GPGSSH)
-
-ok 19 # skip show good signature with custom format (missing GPGSSH)
-
-ok 20 # skip show bad signature with custom format (missing GPGSSH)
-
-ok 21 # skip show untrusted signature with custom format (missing GPGSSH)
-
-ok 22 # skip show untrusted signature with undefined trust level (missing GPGSSH)
-
-ok 23 # skip show untrusted signature with ultimate trust level (missing GPGSSH)
-
-ok 24 # skip show lack of signature with custom format (missing GPGSSH)
-
-ok 25 # skip log.showsignature behaves like --show-signature (missing GPGSSH)
-
-ok 26 # skip check config gpg.format values (missing GPGSSH)
-
-ok 27 # skip detect fudged commit with double signature (TODO) (missing GPGSSH)
-
-ok 28 # skip show double signature with custom format (TODO) (missing GPGSSH)
-
-ok 29 # skip verify-commit verifies multiply signed commits (TODO) (missing GPGSSH)
-
-# passed all 29 test(s)
-1..29
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7526-commit-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7526-commit-pathspec-file/.git/
-expecting success of 7526.1 'setup': 
-	test_commit file0 &&
-	git tag checkpoint &&
-
-	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
-
-[master (root-commit) ad2e047] file0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file0.t
-ok 1 - setup
-
-expecting success of 7526.2 '--pathspec-from-file from stdin': 
-	restore_checkpoint &&
-
-	echo fileA.t | git commit --pathspec-from-file=- -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	EOF
-	verify_expect
-
-[master 95e22e1] Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileA.t
-ok 2 - --pathspec-from-file from stdin
-
-expecting success of 7526.3 '--pathspec-from-file from file': 
-	restore_checkpoint &&
-
-	echo fileA.t >list &&
-	git commit --pathspec-from-file=list -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	EOF
-	verify_expect
-
-[master 95e22e1] Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileA.t
-ok 3 - --pathspec-from-file from file
-
-expecting success of 7526.4 'NUL delimiters': 
-	restore_checkpoint &&
-
-	printf "fileA.t\0fileB.t\0" | git commit --pathspec-from-file=- --pathspec-file-nul -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	A	fileB.t
-	EOF
-	verify_expect
-
-[master ebcb447] Commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileA.t
- create mode 100644 fileB.t
-ok 4 - NUL delimiters
-
-expecting success of 7526.5 'LF delimiters': 
-	restore_checkpoint &&
-
-	printf "fileA.t\nfileB.t\n" | git commit --pathspec-from-file=- -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	A	fileB.t
-	EOF
-	verify_expect
-
-[master ebcb447] Commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileA.t
- create mode 100644 fileB.t
-ok 5 - LF delimiters
-
-expecting success of 7526.6 'no trailing delimiter': 
-	restore_checkpoint &&
-
-	printf "fileA.t\nfileB.t" | git commit --pathspec-from-file=- -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	A	fileB.t
-	EOF
-	verify_expect
-
-[master ebcb447] Commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileA.t
- create mode 100644 fileB.t
-ok 6 - no trailing delimiter
-
-expecting success of 7526.7 'CRLF delimiters': 
-	restore_checkpoint &&
-
-	printf "fileA.t\r\nfileB.t\r\n" | git commit --pathspec-from-file=- -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	A	fileB.t
-	EOF
-	verify_expect
-
-[master ebcb447] Commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileA.t
- create mode 100644 fileB.t
-ok 7 - CRLF delimiters
-
-expecting success of 7526.8 'quotes': 
-	restore_checkpoint &&
-
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
-
-	git commit --pathspec-from-file=list -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	EOF
-	verify_expect expect
-
-[master 95e22e1] Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileA.t
-ok 8 - quotes
-
-expecting success of 7526.9 'quotes not compatible with --pathspec-file-nul': 
-	restore_checkpoint &&
-
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
-
-	test_must_fail git commit --pathspec-from-file=list --pathspec-file-nul -m "Commit"
-
-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 7526.10 'only touches what was listed': 
-	restore_checkpoint &&
-
-	printf "fileB.t\nfileC.t\n" | git commit --pathspec-from-file=- -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileB.t
-	A	fileC.t
-	EOF
-	verify_expect
-
-[master 6ba5a83] Commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileB.t
- create mode 100644 fileC.t
-ok 10 - only touches what was listed
-
-expecting success of 7526.11 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
-	>empty_list &&
-
-	test_must_fail git commit --pathspec-from-file=list --interactive -m "Commit" 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
-
-	test_must_fail git commit --pathspec-from-file=list --patch -m "Commit" 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
-
-	test_must_fail git commit --pathspec-from-file=list --all -m "Commit" 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .-a. cannot be used together" err &&
-
-	test_must_fail git commit --pathspec-from-file=list -m "Commit" -- fileA.t 2>err &&
-	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
-
-	test_must_fail git commit --pathspec-file-nul -m "Commit" 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
-
-	test_must_fail git commit --pathspec-from-file=empty_list --include -m "Commit" 2>err &&
-	test_grep -e "No paths with --include/--only does not make sense." err &&
-
-	test_must_fail git commit --pathspec-from-file=empty_list --only -m "Commit" 2>err &&
-	test_grep -e "No paths with --include/--only does not make sense." err
-
-fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
-fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
-fatal: options '--pathspec-from-file' and '-a' 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: No paths with --include/--only does not make sense.
-fatal: No paths with --include/--only does not make sense.
-ok 11 - error conditions
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7003-filter-branch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7003-filter-branch/.git/
 expecting success of 7003.1 'setup': 
@@ -489066,7 +489622,7 @@
 
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) (0 seconds passed, remaining 0 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
-
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (7/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (7/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (7/9) (1 seconds passed, remaining 0 predicted)    
+
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (7/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (8/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (9/9) (0 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 9 - rewrite, renaming a specific file
 
@@ -489084,8 +489640,8 @@
 
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
 
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
 
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 28e3b83a5f2c2b87fa77b674df1529da9f4a66b4 (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite b0e1a7fc77c44f8710a324ce0cdaa5f0e3f41f41 (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (1 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 284d35b48d5c7cf8f258f9d25690e5c3c38bb8c3 (6/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 8d77ce9a0f051fe4d6b311099cfc061fc8fa238e (6/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3623c2fd76a1257ce6cfb529b64aa3e51d851ffd (6/9) (1 seconds passed, remaining 0 predicted)    
+
Rewrite 28e3b83a5f2c2b87fa77b674df1529da9f4a66b4 (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite b0e1a7fc77c44f8710a324ce0cdaa5f0e3f41f41 (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
+
Rewrite 284d35b48d5c7cf8f258f9d25690e5c3c38bb8c3 (7/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 8d77ce9a0f051fe4d6b311099cfc061fc8fa238e (8/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3623c2fd76a1257ce6cfb529b64aa3e51d851ffd (9/9) (0 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 11 - rewrite, renaming a specific directory
 
@@ -489103,7 +489659,7 @@
 	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) (1 seconds passed, remaining 1 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/9) (1 seconds passed, remaining 0 predicted)    
+
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) (1 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (7/9) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 Saving rewrite state to state
 ok 13 - populate --state-branch
@@ -489116,7 +489672,7 @@
 
 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) (1 seconds passed, remaining 0 predicted)    
+
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
@@ -489232,7 +489788,7 @@
 		  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) (0 seconds passed, remaining 0 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (4/16) (1 seconds passed, remaining 3 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (4/16) (1 seconds passed, remaining 3 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (4/16) (1 seconds passed, remaining 3 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/16) (1 seconds passed, remaining 3 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (4/16) (1 seconds passed, remaining 3 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (9/16) (1 seconds passed, remaining 0 predicted)    
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/16) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/16) (0 seconds passed, remaining 0 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (4/16) (0 seconds passed, remaining 0 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (5/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (6/16) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/16) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (8/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (9/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (10/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (11/16) (0 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (12/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (13/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (14/16) (0 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (15/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (16/16) (0 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/directorymoved' was rewritten
 ok 20 - use index-filter to move into a subdirectory
 
@@ -489263,7 +489819,7 @@
  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) (0 seconds passed, remaining 0 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (5/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (6/17) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/17) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (8/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (9/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (10/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (11/17) (0 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (12/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (13/17) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (13/17) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/17) (1 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (13/17) (1 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (13/17) (1 seconds passed, remaining 0 predicted)    
+
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) (0 seconds passed, remaining 0 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (5/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (6/17) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/17) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (8/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (9/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (10/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (11/17) (0 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (12/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (13/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (14/17) (0 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (15/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (16/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (17/17) (0 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/preserved-author' was rewritten
 ok 22 - author information is preserved
 
@@ -489288,7 +489844,7 @@
 [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) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/18) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (8/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (9/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (10/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (11/18) (1 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (11/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/18) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (11/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (11/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (11/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (11/18) (1 seconds passed, remaining 0 predicted)    
+
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) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/18) (1 seconds passed, remaining 1 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (7/18) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/18) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/18) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (7/18) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (7/18) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (7/18) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (7/18) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (15/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (15/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (15/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (15/18) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/removed-author' was rewritten
 ok 23 - remove a certain author's commits
 
@@ -489390,7 +489946,7 @@
 	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) (1 seconds passed, remaining 0 predicted)    
+
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
@@ -489404,7 +489960,7 @@
 	git cat-file tag S > 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)    
+
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
@@ -489547,7 +490103,7 @@
  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) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/14) (0 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (10/14) (1 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (10/14) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (10/14) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (10/14) (1 seconds passed, remaining 0 predicted)    
Rewrite 219a992bdcfa9f21a6ac93c218579aed7936acdd (10/14) (1 seconds passed, remaining 0 predicted)    
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (1 seconds passed, remaining 3 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (3/14) (1 seconds passed, remaining 3 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (3/14) (1 seconds passed, remaining 3 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/14) (1 seconds passed, remaining 3 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 219a992bdcfa9f21a6ac93c218579aed7936acdd (7/14) (1 seconds passed, remaining 1 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 33 - Prune empty commits
 
@@ -489570,7 +490126,7 @@
  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) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite cb86908a399a1a40c4270055e48259f9034a5458 (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 61efb63b91ac2be151fa30bc4f43e001cd3b8c86 (15/15) (1 seconds passed, remaining 0 predicted)    
+
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) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite cb86908a399a1a40c4270055e48259f9034a5458 (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite 61efb63b91ac2be151fa30bc4f43e001cd3b8c86 (8/15) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 34 - prune empty collapsed merges
 
@@ -489583,7 +490139,7 @@
 
 [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) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/14) (0 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (10/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (12/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 5b6cb848f343668f1f75c3258a59d12c1680d67f (14/14) (0 seconds passed, remaining 0 predicted)    
+
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) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/14) (0 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (10/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (12/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 5b6cb848f343668f1f75c3258a59d12c1680d67f (14/14) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 35 - prune empty works even without index/tree filters
 
@@ -489741,7 +490297,7 @@
 					 } || :" HEAD &&
 	test $orig_head != $(git show-ref --hash --head HEAD)
 
-
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bdfcb9a1655745adff9f9a258bd5828c4f9d730 (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 1d0b09b2e1ca171de816f05076db07c634f81b05 (3/4) (0 seconds passed, remaining 0 predicted)    
Rewrite e4188a0171d63302557f0f4348433a11fddd49be (4/4) (1 seconds passed, remaining 0 predicted)    
+
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bdfcb9a1655745adff9f9a258bd5828c4f9d730 (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 1d0b09b2e1ca171de816f05076db07c634f81b05 (3/4) (0 seconds passed, remaining 0 predicted)    
Rewrite e4188a0171d63302557f0f4348433a11fddd49be (4/4) (0 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
@@ -489876,6 +490432,374 @@
 1..48
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7527-builtin-fsmonitor.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7527-builtin-fsmonitor/.git/
+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
+1..0 # SKIP fsmonitor--daemon is not supported on this platform
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7526-commit-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7526-commit-pathspec-file/.git/
+expecting success of 7526.1 'setup': 
+	test_commit file0 &&
+	git tag checkpoint &&
+
+	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
+
+[master (root-commit) ad2e047] file0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file0.t
+ok 1 - setup
+
+expecting success of 7526.2 '--pathspec-from-file from stdin': 
+	restore_checkpoint &&
+
+	echo fileA.t | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	EOF
+	verify_expect
+
+[master 95e22e1] Commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileA.t
+ok 2 - --pathspec-from-file from stdin
+
+expecting success of 7526.3 '--pathspec-from-file from file': 
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git commit --pathspec-from-file=list -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	EOF
+	verify_expect
+
+[master 95e22e1] Commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileA.t
+ok 3 - --pathspec-from-file from file
+
+expecting success of 7526.4 'NUL delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git commit --pathspec-from-file=- --pathspec-file-nul -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
+
+[master ebcb447] Commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ok 4 - NUL delimiters
+
+expecting success of 7526.5 'LF delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
+
+[master ebcb447] Commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ok 5 - LF delimiters
+
+expecting success of 7526.6 'no trailing delimiter': 
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
+
+[master ebcb447] Commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ok 6 - no trailing delimiter
+
+expecting success of 7526.7 'CRLF delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
+
+[master ebcb447] Commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ok 7 - CRLF delimiters
+
+expecting success of 7526.8 'quotes': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git commit --pathspec-from-file=list -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	EOF
+	verify_expect expect
+
+[master 95e22e1] Commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileA.t
+ok 8 - quotes
+
+expecting success of 7526.9 'quotes not compatible with --pathspec-file-nul': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git commit --pathspec-from-file=list --pathspec-file-nul -m "Commit"
+
+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 7526.10 'only touches what was listed': 
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileB.t
+	A	fileC.t
+	EOF
+	verify_expect
+
+[master 6ba5a83] Commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileB.t
+ create mode 100644 fileC.t
+ok 10 - only touches what was listed
+
+expecting success of 7526.11 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>empty_list &&
+
+	test_must_fail git commit --pathspec-from-file=list --interactive -m "Commit" 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
+
+	test_must_fail git commit --pathspec-from-file=list --patch -m "Commit" 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
+
+	test_must_fail git commit --pathspec-from-file=list --all -m "Commit" 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .-a. cannot be used together" err &&
+
+	test_must_fail git commit --pathspec-from-file=list -m "Commit" -- fileA.t 2>err &&
+	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+
+	test_must_fail git commit --pathspec-file-nul -m "Commit" 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+
+	test_must_fail git commit --pathspec-from-file=empty_list --include -m "Commit" 2>err &&
+	test_grep -e "No paths with --include/--only does not make sense." err &&
+
+	test_must_fail git commit --pathspec-from-file=empty_list --only -m "Commit" 2>err &&
+	test_grep -e "No paths with --include/--only does not make sense." err
+
+fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
+fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
+fatal: options '--pathspec-from-file' and '-a' 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: No paths with --include/--only does not make sense.
+fatal: No paths with --include/--only does not make sense.
+ok 11 - error conditions
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7528-signed-commit-ssh.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7528-signed-commit-ssh/.git/
+checking prerequisite: GPGSSH
+
+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;
+
+	# 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 &&
+
+	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
+
+	# 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
+
+)
+prerequisite GPGSSH not satisfied
+ok 1 # skip create signed commits (missing GPGSSH)
+
+ok 2 # skip sign commits using literal public keys with ssh-agent (missing GPGSSH)
+
+checking prerequisite: GPGSSH_VERIFYTIME
+
+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\"" &&
+
+	# 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") &&
+
+	# 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 &&
+
+	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
+
+	# 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)
+
+)
+prerequisite GPGSSH_VERIFYTIME not satisfied
+ok 3 # skip create signed commits with keys having defined lifetimes (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+
+ok 4 # skip verify and show signatures (missing GPGSSH)
+
+ok 5 # skip verify-commit exits failure on untrusted signature (missing GPGSSH)
+
+ok 6 # skip verify-commit exits failure on expired signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+
+ok 7 # skip verify-commit exits failure on not yet valid signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+
+ok 8 # skip verify-commit succeeds with commit date and key validity matching (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+
+ok 9 # skip verify-commit exits failure with commit date outside of key validity (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+
+ok 10 # skip verify-commit exits success with matching minTrustLevel (missing GPGSSH)
+
+ok 11 # skip verify-commit exits success with low minTrustLevel (missing GPGSSH)
+
+ok 12 # skip verify-commit exits failure with high minTrustLevel (missing GPGSSH)
+
+ok 13 # skip verify signatures with --raw (missing GPGSSH)
+
+ok 14 # skip proper header is used for hash algorithm (missing GPGSSH)
+
+ok 15 # skip show signed commit with signature (missing GPGSSH)
+
+ok 16 # skip detect fudged signature (missing GPGSSH)
+
+ok 17 # skip detect fudged signature with NUL (missing GPGSSH)
+
+ok 18 # skip amending already signed commit (missing GPGSSH)
+
+ok 19 # skip show good signature with custom format (missing GPGSSH)
+
+ok 20 # skip show bad signature with custom format (missing GPGSSH)
+
+ok 21 # skip show untrusted signature with custom format (missing GPGSSH)
+
+ok 22 # skip show untrusted signature with undefined trust level (missing GPGSSH)
+
+ok 23 # skip show untrusted signature with ultimate trust level (missing GPGSSH)
+
+ok 24 # skip show lack of signature with custom format (missing GPGSSH)
+
+ok 25 # skip log.showsignature behaves like --show-signature (missing GPGSSH)
+
+ok 26 # skip check config gpg.format values (missing GPGSSH)
+
+ok 27 # skip detect fudged commit with double signature (TODO) (missing GPGSSH)
+
+ok 28 # skip show double signature with custom format (TODO) (missing GPGSSH)
+
+ok 29 # skip verify-commit verifies multiply signed commits (TODO) (missing GPGSSH)
+
+# passed all 29 test(s)
+1..29
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7604-merge-custom-message.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7604-merge-custom-message/.git/
 expecting success of 7604.1 'setup': 
@@ -490024,6 +490948,114 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7605-merge-resolve.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7603-merge-reduce-heads.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7603-merge-reduce-heads/.git/
 expecting success of 7603.1 'setup': 
@@ -490347,114 +491379,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7605-merge-resolve.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7606-merge-custom.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7606-merge-custom/.git/
 expecting success of 7606.1 'set up custom strategy': 
@@ -490529,8 +491453,8 @@
  c2.c | 1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
  create mode 100644 c2.c
---- head.old	2025-08-27 08:22:52.112404962 +0000
-+++ head.new	2025-08-27 08:22:52.168405332 +0000
+--- head.old	2026-09-29 14:53:40.950548970 +0000
++++ head.new	2026-09-29 14:53:41.006548970 +0000
 @@ -1 +1 @@
 -7b51d7cdbd54b8c470d864639e1136d88ce718ef
 +5127482d58f03334905cdbe3564c8d092aa56dbe
@@ -490569,8 +491493,8 @@
  2 files changed, 1 insertion(+), 1 deletion(-)
  delete mode 100644 c1.c
  create mode 100644 c3.c
---- head.old	2025-08-27 08:22:52.240405807 +0000
-+++ head.new	2025-08-27 08:22:52.284406097 +0000
+--- head.old	2026-09-29 14:53:41.066548970 +0000
++++ head.new	2026-09-29 14:53:41.114548970 +0000
 @@ -1 +1 @@
 -7b51d7cdbd54b8c470d864639e1136d88ce718ef
 +f5f2abda42595469639ae786a37808202e35dcf0
@@ -490580,6 +491504,55 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7607-merge-state.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7512-status-help.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7512-status-help/.git/
 expecting success of 7512.1 'prepare for conflicts': 
@@ -492436,513 +493409,3052 @@
 1..46
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7607-merge-state.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 &&
+*** t7608-merge-messages.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7608-merge-messages/.git/
+expecting success of 7608.1 'merge local branch': 
+	test_commit main-1 &&
+	git checkout -b local-branch &&
+	test_commit branch-1 &&
+	git checkout main &&
+	test_commit main-2 &&
+	git merge local-branch &&
+	check_oneline "Merge branch Qlocal-branchQ"
 
-	for b in branch1 branch2 branch3
+[main (root-commit) 8ad97f7] main-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-1.t
+Switched to a new branch 'local-branch'
+[local-branch 7bd44c4] branch-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch-1.t
+Switched to branch 'main'
+[main 9b0bdc1] main-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-2.t
+Merge made by the 'ort' strategy.
+ branch-1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch-1.t
+ok 1 - merge local branch
+
+expecting success of 7608.2 'merge octopus branches': 
+	git checkout -b octopus-a main &&
+	test_commit octopus-1 &&
+	git checkout -b octopus-b main &&
+	test_commit octopus-2 &&
+	git checkout main &&
+	git merge octopus-a octopus-b &&
+	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ"
+
+Switched to a new branch 'octopus-a'
+[octopus-a d4e293f] octopus-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 octopus-1.t
+Switched to a new branch 'octopus-b'
+[octopus-b fd085cf] octopus-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 octopus-2.t
+Switched to branch 'main'
+Fast-forwarding to: octopus-a
+Trying simple merge with octopus-b
+Merge made by the 'octopus' strategy.
+ octopus-1.t | 1 +
+ octopus-2.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 octopus-1.t
+ create mode 100644 octopus-2.t
+ok 2 - merge octopus branches
+
+expecting success of 7608.3 'merge tag': 
+	git checkout -b tag-branch main &&
+	test_commit tag-1 &&
+	git checkout main &&
+	test_commit main-3 &&
+	git merge tag-1 &&
+	check_oneline "Merge tag Qtag-1Q"
+
+Switched to a new branch 'tag-branch'
+[tag-branch 6757378] tag-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tag-1.t
+Switched to branch 'main'
+[main a5de04f] main-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-3.t
+Merge made by the 'ort' strategy.
+ tag-1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tag-1.t
+ok 3 - merge tag
+
+expecting success of 7608.4 'ambiguous tag': 
+	git checkout -b ambiguous main &&
+	test_commit ambiguous &&
+	git checkout main &&
+	test_commit main-4 &&
+	git merge ambiguous &&
+	check_oneline "Merge tag QambiguousQ"
+
+Switched to a new branch 'ambiguous'
+[ambiguous ab5df7f] ambiguous
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ambiguous.t
+Switched to branch 'main'
+[main f5d97b7] main-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-4.t
+warning: refname 'ambiguous' is ambiguous.
+warning: refname 'ambiguous' is ambiguous.
+Merge made by the 'ort' strategy.
+ ambiguous.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ambiguous.t
+ok 4 - ambiguous tag
+
+expecting success of 7608.5 'remote-tracking branch': 
+	git checkout -b remote main &&
+	test_commit remote-1 &&
+	git update-ref refs/remotes/origin/main remote &&
+	git checkout main &&
+	test_commit main-5 &&
+	git merge origin/main &&
+	check_oneline "Merge remote-tracking branch Qorigin/mainQ"
+
+Switched to a new branch 'remote'
+[remote 52036b0] remote-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 remote-1.t
+Switched to branch 'main'
+[main 25894a3] main-5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-5.t
+Merge made by the 'ort' strategy.
+ remote-1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 remote-1.t
+ok 5 - remote-tracking branch
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7602-merge-octopus-many.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7602-merge-octopus-many/.git/
+expecting success of 7602.1 'setup': 
+	echo c0 > c0.c &&
+	git add c0.c &&
+	git commit -m c0 &&
+	git tag c0 &&
+	i=1 &&
+	while test $i -le 30
 	do
-		git checkout -b $b main &&
-		test_commit --no-tag "Change on $b" base $b || return 1
+		git reset --hard c0 &&
+		echo c$i > c$i.c &&
+		git add c$i.c &&
+		git commit -m c$i &&
+		git tag c$i &&
+		i=$(expr $i + 1) || return 1
+	done
+
+[master (root-commit) e4f5a3c] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+HEAD is now at e4f5a3c c0
+[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 c0f42ec] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c3.c
+HEAD is now at e4f5a3c c0
+[master b7e05d5] c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c4.c
+HEAD is now at e4f5a3c c0
+[master c488b09] c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c5.c
+HEAD is now at e4f5a3c c0
+[master ec4097b] c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c6.c
+HEAD is now at e4f5a3c c0
+[master 0ce0f8d] c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c7.c
+HEAD is now at e4f5a3c c0
+[master ff3d47c] c8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c8.c
+HEAD is now at e4f5a3c c0
+[master 7461614] c9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c9.c
+HEAD is now at e4f5a3c c0
+[master 1afdb59] c10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c10.c
+HEAD is now at e4f5a3c c0
+[master 0afbd17] c11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c11.c
+HEAD is now at e4f5a3c c0
+[master 15bc59a] c12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c12.c
+HEAD is now at e4f5a3c c0
+[master f06f676] c13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c13.c
+HEAD is now at e4f5a3c c0
+[master a776bd6] c14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c14.c
+HEAD is now at e4f5a3c c0
+[master 0d31625] c15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c15.c
+HEAD is now at e4f5a3c c0
+[master 51ac193] c16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c16.c
+HEAD is now at e4f5a3c c0
+[master 60d6a53] c17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c17.c
+HEAD is now at e4f5a3c c0
+[master 3ce5753] c18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c18.c
+HEAD is now at e4f5a3c c0
+[master 7a37c76] c19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c19.c
+HEAD is now at e4f5a3c c0
+[master 4125031] c20
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c20.c
+HEAD is now at e4f5a3c c0
+[master f295446] c21
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c21.c
+HEAD is now at e4f5a3c c0
+[master aefb514] c22
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c22.c
+HEAD is now at e4f5a3c c0
+[master 6d1037c] c23
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c23.c
+HEAD is now at e4f5a3c c0
+[master 43701ce] c24
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c24.c
+HEAD is now at e4f5a3c c0
+[master 19740f9] c25
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c25.c
+HEAD is now at e4f5a3c c0
+[master bef4659] c26
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c26.c
+HEAD is now at e4f5a3c c0
+[master 5d3dacb] c27
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c27.c
+HEAD is now at e4f5a3c c0
+[master e1b2fdb] c28
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c28.c
+HEAD is now at e4f5a3c c0
+[master 2088804] c29
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c29.c
+HEAD is now at e4f5a3c c0
+[master fb57d80] c30
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c30.c
+ok 1 - setup
+
+expecting success of 7602.2 'merge c1 with c2, c3, c4, ... c29': 
+	git reset --hard c1 &&
+	i=2 &&
+	refs="" &&
+	while test $i -le 30
+	do
+		refs="$refs c$i" &&
+		i=$(expr $i + 1) || return 1
+	done &&
+	git merge $refs &&
+	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
+	i=1 &&
+	while test $i -le 30
+	do
+		test "$(git rev-parse c$i)" = "$(git rev-parse HEAD^$i)" &&
+		i=$(expr $i + 1) || return 1
 	done &&
+	git diff --exit-code &&
+	i=1 &&
+	while test $i -le 30
+	do
+		test -f c$i.c &&
+		i=$(expr $i + 1) || 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 &&
+HEAD is now at 429abf0 c1
+Trying simple merge with c2
+Trying simple merge with c3
+Trying simple merge with c4
+Trying simple merge with c5
+Trying simple merge with c6
+Trying simple merge with c7
+Trying simple merge with c8
+Trying simple merge with c9
+Trying simple merge with c10
+Trying simple merge with c11
+Trying simple merge with c12
+Trying simple merge with c13
+Trying simple merge with c14
+Trying simple merge with c15
+Trying simple merge with c16
+Trying simple merge with c17
+Trying simple merge with c18
+Trying simple merge with c19
+Trying simple merge with c20
+Trying simple merge with c21
+Trying simple merge with c22
+Trying simple merge with c23
+Trying simple merge with c24
+Trying simple merge with c25
+Trying simple merge with c26
+Trying simple merge with c27
+Trying simple merge with c28
+Trying simple merge with c29
+Trying simple merge with c30
+Merge made by the 'octopus' strategy.
+ c10.c | 1 +
+ c11.c | 1 +
+ c12.c | 1 +
+ c13.c | 1 +
+ c14.c | 1 +
+ c15.c | 1 +
+ c16.c | 1 +
+ c17.c | 1 +
+ c18.c | 1 +
+ c19.c | 1 +
+ c2.c  | 1 +
+ c20.c | 1 +
+ c21.c | 1 +
+ c22.c | 1 +
+ c23.c | 1 +
+ c24.c | 1 +
+ c25.c | 1 +
+ c26.c | 1 +
+ c27.c | 1 +
+ c28.c | 1 +
+ c29.c | 1 +
+ c3.c  | 1 +
+ c30.c | 1 +
+ c4.c  | 1 +
+ c5.c  | 1 +
+ c6.c  | 1 +
+ c7.c  | 1 +
+ c8.c  | 1 +
+ c9.c  | 1 +
+ 29 files changed, 29 insertions(+)
+ create mode 100644 c10.c
+ create mode 100644 c11.c
+ create mode 100644 c12.c
+ create mode 100644 c13.c
+ create mode 100644 c14.c
+ create mode 100644 c15.c
+ create mode 100644 c16.c
+ create mode 100644 c17.c
+ create mode 100644 c18.c
+ create mode 100644 c19.c
+ create mode 100644 c2.c
+ create mode 100644 c20.c
+ create mode 100644 c21.c
+ create mode 100644 c22.c
+ create mode 100644 c23.c
+ create mode 100644 c24.c
+ create mode 100644 c25.c
+ create mode 100644 c26.c
+ create mode 100644 c27.c
+ create mode 100644 c28.c
+ create mode 100644 c29.c
+ create mode 100644 c3.c
+ create mode 100644 c30.c
+ create mode 100644 c4.c
+ create mode 100644 c5.c
+ create mode 100644 c6.c
+ create mode 100644 c7.c
+ create mode 100644 c8.c
+ create mode 100644 c9.c
+ok 2 - merge c1 with c2, c3, c4, ... c29
 
-	# 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
+expecting success of 7602.3 'merge output uses pretty names': 
+	git reset --hard c1 &&
+	git merge c2 c3 c4 >actual &&
+	test_cmp expected actual
 
-[main (root-commit) 9d985b8] Initial
+HEAD is now at 429abf0 c1
+ok 3 - merge output uses pretty names
+
+expecting success of 7602.4 'merge reduces irrelevant remote heads': 
+	mv expected expected.tmp &&
+	sed s/recursive/ort/ expected.tmp >expected &&
+	rm expected.tmp &&
+	GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
+	test_cmp expected actual
+
+ok 4 - merge reduces irrelevant remote heads
+
+expecting success of 7602.5 'merge fast-forward output uses pretty names': 
+	git reset --hard c0 &&
+	git merge c1 c2 >actual &&
+	test_cmp expected actual
+
+HEAD is now at e4f5a3c c0
+ok 5 - merge fast-forward output uses pretty names
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7612-merge-verify-signatures.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7612-merge-verify-signatures/.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
+ok 1 # skip create signed commits (missing GPG)
+
+ok 2 # skip merge unsigned commit with verification (missing GPG)
+
+ok 3 # skip merge unsigned commit with merge.verifySignatures=true (missing GPG)
+
+ok 4 # skip merge commit with bad signature with verification (missing GPG)
+
+ok 5 # skip merge commit with bad signature with merge.verifySignatures=true (missing GPG)
+
+ok 6 # skip merge commit with untrusted signature with verification (missing GPG)
+
+ok 7 # skip merge commit with untrusted signature with verification and high minTrustLevel (missing GPG)
+
+ok 8 # skip merge commit with untrusted signature with verification and low minTrustLevel (missing GPG)
+
+ok 9 # skip merge commit with untrusted signature with merge.verifySignatures=true (missing GPG)
+
+ok 10 # skip merge commit with untrusted signature with merge.verifySignatures=true and minTrustLevel (missing GPG)
+
+ok 11 # skip merge signed commit with verification (missing GPG)
+
+ok 12 # skip merge signed commit with merge.verifySignatures=true (missing GPG)
+
+ok 13 # skip merge commit with bad signature without verification (missing GPG)
+
+ok 14 # skip merge commit with bad signature with merge.verifySignatures=false (missing GPG)
+
+ok 15 # skip merge commit with bad signature with merge.verifySignatures=true and --no-verify-signatures (missing GPG)
+
+ok 16 # skip merge unsigned commit into unborn branch (missing GPG)
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7406-submodule-update.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 base
-Switched to a new branch 'branch1'
-[branch1 8246e40] Change on branch1
+ 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.51.0/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(-)
-Switched to a new branch 'branch2'
-[branch2 34744a5] Change on branch2
+From /build/reproducible-path/git-2.51.0/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(-)
-Switched to a new branch 'branch3'
-[branch3 efa3c31] Change on branch3
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t7406-submodule-update/main-branch/.git/
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/main-branch-submodule) registered for path 'main-branch-submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/withsubs/.git/
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/withsubs/foo/sub'...
+done.
+Cleared directory 'sub'
+Submodule 'foo/sub' (/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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(-)
-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
+Submodule path 'submodule': merged in '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 15 - submodule update --merge staying on main
 
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7608-merge-messages.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7608-merge-messages/.git/
-expecting success of 7608.1 'merge local branch': 
-	test_commit main-1 &&
-	git checkout -b local-branch &&
-	test_commit branch-1 &&
-	git checkout main &&
-	test_commit main-2 &&
-	git merge local-branch &&
-	check_oneline "Merge branch Qlocal-branchQ"
+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.51.0/t/trash directory.t7406-submodule-update/command-in-gitmodules/.git/
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
+Submodule 'none' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/none) registered for path 'none'
+Submodule 'rebasing' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
+Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/cloned/merging'...
+done.
+Skipping submodule 'none'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/cloned/rebasing'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t7406-submodule-update/submodule) registered for path 'deeper/submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t/trash directory.t7406-submodule-update/super_update_r/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/subsuper_update_r/
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
+done.
+Submodule 'subsubmodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/linked/dir/super/submodule'...
+done.
+Submodule path 'submodule': checked out '86a3496a1d60636ce953ea5245c2a0f63a7a2aa8'
+Submodule 'subsubmodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
+Submodule 'none' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/none) registered for path 'none'
+Submodule 'rebasing' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
+Submodule 'submodule' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/super3/merging'...
+Skipping submodule 'none'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/super3/rebasing'...
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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
+
+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
+	)
+
+[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 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_TEST_PACK_PATH_WALK=0 \
+		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 &&
+	 # This test variable will create a "warning" message to stderr
+	 GIT_TEST_PACK_PATH_WALK=0 \
+	 git submodule update --init --depth=1 submodule3 >out 2>err &&
+	 test_file_not_empty out &&
+	 test_file_not_empty err
+	)
+
+Cloning into 'super4'...
+done.
+[main e3c03e6] 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
+
+expecting success of 7406.60 'submodule update --filter requires --init': 
+	test_expect_code 129 git -C super submodule update --filter blob:none
+
+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>...]
+
+    -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
+
+ok 60 - submodule update --filter requires --init
+
+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
+
+Cloning into 'super-filter'...
+done.
+Submodule 'merging' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
+Submodule 'none' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/none) registered for path 'none'
+Submodule 'rebasing' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
+Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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
+
+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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/middle/.git/
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/top/.git/
+Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/middle) registered for path 'middle'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/top-clean/middle'...
+done.
+Submodule path 'middle': checked out '8c7b95e494a2782f61ae9299ca15d668e545d9a8'
+Submodule 'bottom' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/bottom) registered for path 'middle/bottom'
+Cloning into '/build/reproducible-path/git-2.51.0/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 with multiple remotes': 
+	test_when_finished "rm -fr top-cloned" &&
+	cp -r top-clean top-cloned &&
+
+	# Create a commit in each repo, starting with bottom
+	test_commit -C bottom multiple_remote_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 "multiple_remote_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 "multiple_remote_commit" &&
+
+	# rename the submodule remote
+	git -C top-cloned/middle remote rename origin upstream &&
+
+	# Add another remote
+	git -C top-cloned/middle remote add other bogus &&
+
+	# 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 &&
+	EOF
+	test_cmp expect.err actual.err
+
+[main 87c0b26] multiple_remote_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 multiple_remote_commit.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/bottom
+   581bdeb..87c0b26  main                   -> origin/main
+ * [new tag]         multiple_remote_commit -> multiple_remote_commit
+Note: switching to 'FETCH_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 87c0b26 multiple_remote_commit
+[main ebabd02] multiple_remote_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/middle
+   8c7b95e..ebabd02  main       -> origin/main
+Note: switching to 'FETCH_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 ebabd02 multiple_remote_commit
+[main 5b329a4] multiple_remote_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 63 - submodule update with multiple remotes
+
+expecting success of 7406.64 'submodule update with renamed remote': 
+	test_when_finished "rm -fr top-cloned" &&
+	cp -r top-clean top-cloned &&
+
+	# Create a commit in each repo, starting with bottom
+	test_commit -C bottom rename_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 "rename_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 "rename_commit" &&
+
+	# rename the submodule remote
+	git -C top-cloned/middle remote rename origin upstream &&
+
+	# 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 &&
+	EOF
+	test_cmp expect.err actual.err
+
+[main 6369a8d] rename_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 rename_commit.t
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/bottom
+   87c0b26..6369a8d  main          -> origin/main
+ * [new tag]         rename_commit -> rename_commit
+Previous HEAD position was 87c0b26 multiple_remote_commit
+HEAD is now at 6369a8d rename_commit
+[main e95e984] rename_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/middle
+   ebabd02..e95e984  main       -> origin/main
+Previous HEAD position was ebabd02 multiple_remote_commit
+HEAD is now at e95e984 rename_commit
+[main 699a6ac] rename_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 64 - submodule update with renamed remote
+
+expecting success of 7406.65 'submodule update should skip unmerged submodules': 
+	test_when_finished "rm -fr top-cloned" &&
+	cp -r top-clean top-cloned &&
+
+	# 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" &&
+
+	# 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 &&
+
+	# 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
+
+[main 4a576d9] 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.51.0/t/trash directory.t7406-submodule-update/bottom
+   6369a8d..4a576d9  main            -> origin/main
+ * [new tag]         upstream_commit -> upstream_commit
+Previous HEAD position was 6369a8d rename_commit
+HEAD is now at 4a576d9 upstream_commit
+[main 630e29e] upstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/middle
+   e95e984..630e29e  main       -> origin/main
+Previous HEAD position was e95e984 rename_commit
+HEAD is now at 630e29e upstream_commit
+[main e974546] upstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 8682645] downstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 downstream_commit.t
+[detached HEAD 6860f68] downstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/middle
+   8c7b95e..630e29e  main       -> origin/main
+Fetching submodule bottom
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/bottom
+   581bdeb..4a576d9  main            -> origin/main
+ * [new tag]         upstream_commit -> upstream_commit
+ * [new tag]         multiple_remote_commit -> multiple_remote_commit
+ * [new tag]         rename_commit   -> rename_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 4a576d9
+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 65 - submodule update should skip unmerged submodules
+
+expecting success of 7406.66 'submodule update --recursive skip submodules with strategy=none': 
+	test_when_finished "rm -fr top-cloned" &&
+	cp -r top-clean top-cloned &&
 
-[main (root-commit) 8ad97f7] main-1
+	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
+
+[detached HEAD aa2074b] downstream_commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 main-1.t
-Switched to a new branch 'local-branch'
-[local-branch 7bd44c4] branch-1
+ create mode 100644 downstream_commit.t
+ok 66 - submodule update --recursive skip submodules with strategy=none
+
+expecting success of 7406.67 'commit with staged submodule change': 
+	add_submodule_commit_and_validate
+
+[main 983f55b] create submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 branch-1.t
-Switched to branch 'main'
-[main 9b0bdc1] main-2
+ create mode 160000 sub
+ok 67 - commit with staged submodule change
+
+expecting success of 7406.68 'commit with staged submodule change with ignoreSubmodules dirty': 
+	test_config diff.ignoreSubmodules dirty &&
+	add_submodule_commit_and_validate
+
+[main 2b404fa] create submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main-2.t
-Merge made by the 'ort' strategy.
- branch-1.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 branch-1.t
-ok 1 - merge local branch
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 68 - commit with staged submodule change with ignoreSubmodules dirty
 
-expecting success of 7608.2 'merge octopus branches': 
-	git checkout -b octopus-a main &&
-	test_commit octopus-1 &&
-	git checkout -b octopus-b main &&
-	test_commit octopus-2 &&
-	git checkout main &&
-	git merge octopus-a octopus-b &&
-	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ"
+expecting success of 7406.69 'commit with staged submodule change with ignoreSubmodules all': 
+	test_config diff.ignoreSubmodules all &&
+	add_submodule_commit_and_validate
 
-Switched to a new branch 'octopus-a'
-[octopus-a d4e293f] octopus-1
+[main 7858517] create submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 octopus-1.t
-Switched to a new branch 'octopus-b'
-[octopus-b fd085cf] octopus-2
+ok 69 - commit with staged submodule change with ignoreSubmodules all
+
+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 70 # skip submodule paths must not follow symlinks (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,SYMLINKS)
+
+# passed all 70 test(s)
+1..70
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7614-merge-signoff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 octopus-2.t
-Switched to branch 'main'
-Fast-forwarding to: octopus-a
-Trying simple merge with octopus-b
-Merge made by the 'octopus' strategy.
- octopus-1.t | 1 +
- octopus-2.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 octopus-1.t
- create mode 100644 octopus-2.t
-ok 2 - merge octopus branches
+ create mode 100644 file1
+ok 1 - setup
 
-expecting success of 7608.3 'merge tag': 
-	git checkout -b tag-branch main &&
-	test_commit tag-1 &&
+expecting success of 7614.2 'git merge --signoff adds a sign-off line': 
 	git checkout main &&
-	test_commit main-3 &&
-	git merge tag-1 &&
-	check_oneline "Merge tag Qtag-1Q"
+	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 a new branch 'tag-branch'
-[tag-branch 6757378] tag-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tag-1.t
 Switched to branch 'main'
-[main a5de04f] main-3
+[main 3d2fc9d] main-branch-2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 main-3.t
+ create mode 100644 file2
+warning: refname 'other-branch' is ambiguous.
+Switched to branch 'other-branch'
 Merge made by the 'ort' strategy.
- tag-1.t | 1 +
+ file2 | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 tag-1.t
-ok 3 - merge tag
+ create mode 100644 file2
+ok 2 - git merge --signoff adds a sign-off line
 
-expecting success of 7608.4 'ambiguous tag': 
-	git checkout -b ambiguous main &&
-	test_commit ambiguous &&
+expecting success of 7614.3 'git merge does not add a sign-off line': 
 	git checkout main &&
-	test_commit main-4 &&
-	git merge ambiguous &&
-	check_oneline "Merge tag QambiguousQ"
+	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 a new branch 'ambiguous'
-[ambiguous ab5df7f] ambiguous
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ambiguous.t
 Switched to branch 'main'
-[main f5d97b7] main-4
+[main fb2817d] main-branch-3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 main-4.t
-warning: refname 'ambiguous' is ambiguous.
-warning: refname 'ambiguous' is ambiguous.
+ create mode 100644 file3
+warning: refname 'other-branch' is ambiguous.
+Switched to branch 'other-branch'
 Merge made by the 'ort' strategy.
- ambiguous.t | 1 +
+ file3 | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 ambiguous.t
-ok 4 - ambiguous tag
+ create mode 100644 file3
+ok 3 - git merge does not add a sign-off line
 
-expecting success of 7608.5 'remote-tracking branch': 
-	git checkout -b remote main &&
-	test_commit remote-1 &&
-	git update-ref refs/remotes/origin/main remote &&
+expecting success of 7614.4 'git merge --no-signoff flag cancels --signoff flag': 
 	git checkout main &&
-	test_commit main-5 &&
-	git merge origin/main &&
-	check_oneline "Merge remote-tracking branch Qorigin/mainQ"
+	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 a new branch 'remote'
-[remote 52036b0] remote-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 remote-1.t
 Switched to branch 'main'
-[main 25894a3] main-5
+[main 6807046] main-branch-4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 main-5.t
+ create mode 100644 file4
+warning: refname 'other-branch' is ambiguous.
+Switched to branch 'other-branch'
 Merge made by the 'ort' strategy.
- remote-1.t | 1 +
+ file4 | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 remote-1.t
-ok 5 - remote-tracking branch
+ create mode 100644 file4
+ok 4 - git merge --no-signoff flag cancels --signoff flag
 
-# passed all 5 test(s)
-1..5
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7602-merge-octopus-many.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7602-merge-octopus-many/.git/
-expecting success of 7602.1 'setup': 
-	echo c0 > c0.c &&
-	git add c0.c &&
-	git commit -m c0 &&
-	git tag c0 &&
-	i=1 &&
-	while test $i -le 30
-	do
-		git reset --hard c0 &&
-		echo c$i > c$i.c &&
-		git add c$i.c &&
-		git commit -m c$i &&
-		git tag c$i &&
-		i=$(expr $i + 1) || return 1
-	done
+*** t7611-merge-abort.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7611-merge-abort/.git/
+expecting success of 7611.1 'setup': 
+	# Create the above repo
+	echo foo > foo &&
+	echo bar > bar &&
+	echo baz > baz &&
+	git add foo bar baz &&
+	git commit -m initial &&
+	echo bazz > baz &&
+	git commit -a -m "second" &&
+	git checkout -b conflict_branch HEAD^ &&
+	echo barf > bar &&
+	echo bazf > baz &&
+	git commit -a -m "conflict" &&
+	git checkout -b clean_branch HEAD^ &&
+	echo bart > bar &&
+	git commit -a -m "clean" &&
+	git checkout main
 
-[master (root-commit) e4f5a3c] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-HEAD is now at e4f5a3c c0
-[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 c0f42ec] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c3.c
-HEAD is now at e4f5a3c c0
-[master b7e05d5] c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c4.c
-HEAD is now at e4f5a3c c0
-[master c488b09] c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c5.c
-HEAD is now at e4f5a3c c0
-[master ec4097b] c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c6.c
-HEAD is now at e4f5a3c c0
-[master 0ce0f8d] c7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c7.c
-HEAD is now at e4f5a3c c0
-[master ff3d47c] c8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c8.c
-HEAD is now at e4f5a3c c0
-[master 7461614] c9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c9.c
-HEAD is now at e4f5a3c c0
-[master 1afdb59] c10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c10.c
-HEAD is now at e4f5a3c c0
-[master 0afbd17] c11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c11.c
-HEAD is now at e4f5a3c c0
-[master 15bc59a] c12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c12.c
-HEAD is now at e4f5a3c c0
-[master f06f676] c13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c13.c
-HEAD is now at e4f5a3c c0
-[master a776bd6] c14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c14.c
-HEAD is now at e4f5a3c c0
-[master 0d31625] c15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c15.c
-HEAD is now at e4f5a3c c0
-[master 51ac193] c16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c16.c
-HEAD is now at e4f5a3c c0
-[master 60d6a53] c17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c17.c
-HEAD is now at e4f5a3c c0
-[master 3ce5753] c18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c18.c
-HEAD is now at e4f5a3c c0
-[master 7a37c76] c19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c19.c
-HEAD is now at e4f5a3c c0
-[master 4125031] c20
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c20.c
-HEAD is now at e4f5a3c c0
-[master f295446] c21
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c21.c
-HEAD is now at e4f5a3c c0
-[master aefb514] c22
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c22.c
-HEAD is now at e4f5a3c c0
-[master 6d1037c] c23
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c23.c
-HEAD is now at e4f5a3c c0
-[master 43701ce] c24
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c24.c
-HEAD is now at e4f5a3c c0
-[master 19740f9] c25
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c25.c
-HEAD is now at e4f5a3c c0
-[master bef4659] c26
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c26.c
-HEAD is now at e4f5a3c c0
-[master 5d3dacb] c27
+[main (root-commit) a2f18f2] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c27.c
-HEAD is now at e4f5a3c c0
-[master e1b2fdb] c28
+ 3 files changed, 3 insertions(+)
+ create mode 100644 bar
+ create mode 100644 baz
+ create mode 100644 foo
+[main 9b32786] second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c28.c
-HEAD is now at e4f5a3c c0
-[master 2088804] c29
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'conflict_branch'
+[conflict_branch 98f9ce9] conflict
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c29.c
-HEAD is now at e4f5a3c c0
-[master fb57d80] c30
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'clean_branch'
+[clean_branch e1014b4] clean
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c30.c
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
 ok 1 - setup
 
-expecting success of 7602.2 'merge c1 with c2, c3, c4, ... c29': 
-	git reset --hard c1 &&
-	i=2 &&
-	refs="" &&
-	while test $i -le 30
-	do
-		refs="$refs c$i" &&
-		i=$(expr $i + 1) || return 1
-	done &&
-	git merge $refs &&
-	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
-	i=1 &&
-	while test $i -le 30
-	do
-		test "$(git rev-parse c$i)" = "$(git rev-parse HEAD^$i)" &&
-		i=$(expr $i + 1) || return 1
-	done &&
-	git diff --exit-code &&
-	i=1 &&
-	while test $i -le 30
-	do
-		test -f c$i.c &&
-		i=$(expr $i + 1) || return 1
-	done
+expecting success of 7611.2 'fails without MERGE_HEAD (unstarted merge)': 
+	test_must_fail git merge --abort 2>output &&
+	test_grep MERGE_HEAD output
 
-HEAD is now at 429abf0 c1
-Trying simple merge with c2
-Trying simple merge with c3
-Trying simple merge with c4
-Trying simple merge with c5
-Trying simple merge with c6
-Trying simple merge with c7
-Trying simple merge with c8
-Trying simple merge with c9
-Trying simple merge with c10
-Trying simple merge with c11
-Trying simple merge with c12
-Trying simple merge with c13
-Trying simple merge with c14
-Trying simple merge with c15
-Trying simple merge with c16
-Trying simple merge with c17
-Trying simple merge with c18
-Trying simple merge with c19
-Trying simple merge with c20
-Trying simple merge with c21
-Trying simple merge with c22
-Trying simple merge with c23
-Trying simple merge with c24
-Trying simple merge with c25
-Trying simple merge with c26
-Trying simple merge with c27
-Trying simple merge with c28
-Trying simple merge with c29
-Trying simple merge with c30
-Merge made by the 'octopus' strategy.
- c10.c | 1 +
- c11.c | 1 +
- c12.c | 1 +
- c13.c | 1 +
- c14.c | 1 +
- c15.c | 1 +
- c16.c | 1 +
- c17.c | 1 +
- c18.c | 1 +
- c19.c | 1 +
- c2.c  | 1 +
- c20.c | 1 +
- c21.c | 1 +
- c22.c | 1 +
- c23.c | 1 +
- c24.c | 1 +
- c25.c | 1 +
- c26.c | 1 +
- c27.c | 1 +
- c28.c | 1 +
- c29.c | 1 +
- c3.c  | 1 +
- c30.c | 1 +
- c4.c  | 1 +
- c5.c  | 1 +
- c6.c  | 1 +
- c7.c  | 1 +
- c8.c  | 1 +
- c9.c  | 1 +
- 29 files changed, 29 insertions(+)
- create mode 100644 c10.c
- create mode 100644 c11.c
- create mode 100644 c12.c
- create mode 100644 c13.c
- create mode 100644 c14.c
- create mode 100644 c15.c
- create mode 100644 c16.c
- create mode 100644 c17.c
- create mode 100644 c18.c
- create mode 100644 c19.c
- create mode 100644 c2.c
- create mode 100644 c20.c
- create mode 100644 c21.c
- create mode 100644 c22.c
- create mode 100644 c23.c
- create mode 100644 c24.c
- create mode 100644 c25.c
- create mode 100644 c26.c
- create mode 100644 c27.c
- create mode 100644 c28.c
- create mode 100644 c29.c
- create mode 100644 c3.c
- create mode 100644 c30.c
- create mode 100644 c4.c
- create mode 100644 c5.c
- create mode 100644 c6.c
- create mode 100644 c7.c
- create mode 100644 c8.c
- create mode 100644 c9.c
-ok 2 - merge c1 with c2, c3, c4, ... c29
+fatal: There is no merge to abort (MERGE_HEAD missing).
+ok 2 - fails without MERGE_HEAD (unstarted merge)
 
-expecting success of 7602.3 'merge output uses pretty names': 
-	git reset --hard c1 &&
-	git merge c2 c3 c4 >actual &&
-	test_cmp expected actual
+expecting success of 7611.3 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity': 
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)"
 
-HEAD is now at 429abf0 c1
-ok 3 - merge output uses pretty names
+ok 3 - fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity
 
-expecting success of 7602.4 'merge reduces irrelevant remote heads': 
-	mv expected expected.tmp &&
-	sed s/recursive/ort/ expected.tmp >expected &&
-	rm expected.tmp &&
-	GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
-	test_cmp expected actual
+expecting success of 7611.4 'fails without MERGE_HEAD (completed merge)': 
+	git merge clean_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	# Merge successfully completed
+	post_merge_head="$(git rev-parse HEAD)" &&
+	test_must_fail git merge --abort 2>output &&
+	test_grep MERGE_HEAD output
 
-ok 4 - merge reduces irrelevant remote heads
+Merge made by the 'ort' strategy.
+ bar | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: There is no merge to abort (MERGE_HEAD missing).
+ok 4 - fails without MERGE_HEAD (completed merge)
 
-expecting success of 7602.5 'merge fast-forward output uses pretty names': 
-	git reset --hard c0 &&
-	git merge c1 c2 >actual &&
-	test_cmp expected actual
+expecting success of 7611.5 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity': 
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$post_merge_head" = "$(git rev-parse HEAD)"
 
-HEAD is now at e4f5a3c c0
-ok 5 - merge fast-forward output uses pretty names
+ok 5 - fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity
 
-# passed all 5 test(s)
-1..5
+expecting success of 7611.6 'Forget previous merge': 
+	git reset --hard "$pre_merge_head"
+
+HEAD is now at 9b32786 second
+ok 6 - Forget previous merge
+
+expecting success of 7611.7 'Abort after --no-commit': 
+	# Redo merge, but stop before creating merge commit
+	git merge --no-commit clean_branch &&
+	test_path_is_file .git/MERGE_HEAD &&
+	# Abort non-conflicting merge
+	git merge --abort &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff)" &&
+	test -z "$(git diff --staged)"
+
+Automatic merge went well; stopped before committing as requested
+ok 7 - Abort after --no-commit
+
+expecting success of 7611.8 'Abort after conflicts': 
+	# Create conflicting merge
+	test_must_fail git merge conflict_branch &&
+	test_path_is_file .git/MERGE_HEAD &&
+	# Abort conflicting merge
+	git merge --abort &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff)" &&
+	test -z "$(git diff --staged)"
+
+Auto-merging baz
+CONFLICT (content): Merge conflict in baz
+Automatic merge failed; fix conflicts and then commit the result.
+ok 8 - Abort after conflicts
+
+expecting success of 7611.9 'Clean merge with dirty index fails': 
+	echo xyzzy >> foo &&
+	git add foo &&
+	git diff --staged > expect &&
+	test_must_fail git merge clean_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff)" &&
+	git diff --staged > actual &&
+	test_cmp expect actual
+
+error: Your local changes to the following files would be overwritten by merge:
+  foo
+Merge with strategy ort failed.
+ok 9 - Clean merge with dirty index fails
+
+expecting success of 7611.10 'Conflicting merge with dirty index fails': 
+	test_must_fail git merge conflict_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff)" &&
+	git diff --staged > actual &&
+	test_cmp expect actual
+
+error: Your local changes to the following files would be overwritten by merge:
+  foo
+Merge with strategy ort failed.
+ok 10 - Conflicting merge with dirty index fails
+
+expecting success of 7611.11 'Reset index (but preserve worktree changes)': 
+	git reset "$pre_merge_head" &&
+	git diff > actual &&
+	test_cmp expect actual
+
+Unstaged changes after reset:
+M	foo
+ok 11 - Reset index (but preserve worktree changes)
+
+expecting success of 7611.12 'Abort clean merge with non-conflicting dirty worktree': 
+	git merge --no-commit clean_branch &&
+	test_path_is_file .git/MERGE_HEAD &&
+	# Abort merge
+	git merge --abort &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
+
+Automatic merge went well; stopped before committing as requested
+ok 12 - Abort clean merge with non-conflicting dirty worktree
+
+expecting success of 7611.13 'Abort conflicting merge with non-conflicting dirty worktree': 
+	test_must_fail git merge conflict_branch &&
+	test_path_is_file .git/MERGE_HEAD &&
+	# Abort merge
+	git merge --abort &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
+
+Auto-merging baz
+CONFLICT (content): Merge conflict in baz
+Automatic merge failed; fix conflicts and then commit the result.
+ok 13 - Abort conflicting merge with non-conflicting dirty worktree
+
+expecting success of 7611.14 'Reset worktree changes': 
+	git reset --hard "$pre_merge_head"
+
+HEAD is now at 9b32786 second
+ok 14 - Reset worktree changes
+
+expecting success of 7611.15 'Fail clean merge with conflicting dirty worktree': 
+	echo xyzzy >> bar &&
+	git diff > expect &&
+	test_must_fail git merge --no-commit clean_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
+
+error: Your local changes to the following files would be overwritten by merge:
+	bar
+Please commit your changes or stash them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 15 - Fail clean merge with conflicting dirty worktree
+
+expecting success of 7611.16 'Fail conflicting merge with conflicting dirty worktree': 
+	test_must_fail git merge conflict_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
+
+error: Your local changes to the following files would be overwritten by merge:
+	bar
+Please commit your changes or stash them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 16 - Fail conflicting merge with conflicting dirty worktree
+
+expecting success of 7611.17 'Reset worktree changes': 
+	git reset --hard "$pre_merge_head"
+
+HEAD is now at 9b32786 second
+ok 17 - Reset worktree changes
+
+expecting success of 7611.18 'Fail clean merge with matching dirty worktree': 
+	echo bart > bar &&
+	git diff > expect &&
+	test_must_fail git merge --no-commit clean_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
+
+error: Your local changes to the following files would be overwritten by merge:
+	bar
+Please commit your changes or stash them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 18 - Fail clean merge with matching dirty worktree
+
+expecting success of 7611.19 'Fail conflicting merge with matching dirty worktree': 
+	echo barf > bar &&
+	git diff > expect &&
+	test_must_fail git merge conflict_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
+
+error: Your local changes to the following files would be overwritten by merge:
+	bar
+Please commit your changes or stash them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 19 - Fail conflicting merge with matching dirty worktree
+
+# passed all 19 test(s)
+1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7513-interpret-trailers.sh ***
@@ -495059,173 +498571,6 @@
 1..99
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7612-merge-verify-signatures.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7612-merge-verify-signatures/.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
-ok 1 # skip create signed commits (missing GPG)
-
-ok 2 # skip merge unsigned commit with verification (missing GPG)
-
-ok 3 # skip merge unsigned commit with merge.verifySignatures=true (missing GPG)
-
-ok 4 # skip merge commit with bad signature with verification (missing GPG)
-
-ok 5 # skip merge commit with bad signature with merge.verifySignatures=true (missing GPG)
-
-ok 6 # skip merge commit with untrusted signature with verification (missing GPG)
-
-ok 7 # skip merge commit with untrusted signature with verification and high minTrustLevel (missing GPG)
-
-ok 8 # skip merge commit with untrusted signature with verification and low minTrustLevel (missing GPG)
-
-ok 9 # skip merge commit with untrusted signature with merge.verifySignatures=true (missing GPG)
-
-ok 10 # skip merge commit with untrusted signature with merge.verifySignatures=true and minTrustLevel (missing GPG)
-
-ok 11 # skip merge signed commit with verification (missing GPG)
-
-ok 12 # skip merge signed commit with merge.verifySignatures=true (missing GPG)
-
-ok 13 # skip merge commit with bad signature without verification (missing GPG)
-
-ok 14 # skip merge commit with bad signature with merge.verifySignatures=false (missing GPG)
-
-ok 15 # skip merge commit with bad signature with merge.verifySignatures=true and --no-verify-signatures (missing GPG)
-
-ok 16 # skip merge unsigned commit into unborn branch (missing GPG)
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7614-merge-signoff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7615-diff-algo-with-mergy-operations.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7615-diff-algo-with-mergy-operations/.git/
 expecting success of 7615.1 'setup': 
@@ -495326,265 +498671,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7611-merge-abort.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7611-merge-abort/.git/
-expecting success of 7611.1 'setup': 
-	# Create the above repo
-	echo foo > foo &&
-	echo bar > bar &&
-	echo baz > baz &&
-	git add foo bar baz &&
-	git commit -m initial &&
-	echo bazz > baz &&
-	git commit -a -m "second" &&
-	git checkout -b conflict_branch HEAD^ &&
-	echo barf > bar &&
-	echo bazf > baz &&
-	git commit -a -m "conflict" &&
-	git checkout -b clean_branch HEAD^ &&
-	echo bart > bar &&
-	git commit -a -m "clean" &&
-	git checkout main
-
-[main (root-commit) a2f18f2] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 bar
- create mode 100644 baz
- create mode 100644 foo
-[main 9b32786] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'conflict_branch'
-[conflict_branch 98f9ce9] conflict
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'clean_branch'
-[clean_branch e1014b4] clean
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 7611.2 'fails without MERGE_HEAD (unstarted merge)': 
-	test_must_fail git merge --abort 2>output &&
-	test_grep MERGE_HEAD output
-
-fatal: There is no merge to abort (MERGE_HEAD missing).
-ok 2 - fails without MERGE_HEAD (unstarted merge)
-
-expecting success of 7611.3 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity': 
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)"
-
-ok 3 - fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity
-
-expecting success of 7611.4 'fails without MERGE_HEAD (completed merge)': 
-	git merge clean_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	# Merge successfully completed
-	post_merge_head="$(git rev-parse HEAD)" &&
-	test_must_fail git merge --abort 2>output &&
-	test_grep MERGE_HEAD output
-
-Merge made by the 'ort' strategy.
- bar | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: There is no merge to abort (MERGE_HEAD missing).
-ok 4 - fails without MERGE_HEAD (completed merge)
-
-expecting success of 7611.5 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity': 
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$post_merge_head" = "$(git rev-parse HEAD)"
-
-ok 5 - fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity
-
-expecting success of 7611.6 'Forget previous merge': 
-	git reset --hard "$pre_merge_head"
-
-HEAD is now at 9b32786 second
-ok 6 - Forget previous merge
-
-expecting success of 7611.7 'Abort after --no-commit': 
-	# Redo merge, but stop before creating merge commit
-	git merge --no-commit clean_branch &&
-	test_path_is_file .git/MERGE_HEAD &&
-	# Abort non-conflicting merge
-	git merge --abort &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff)" &&
-	test -z "$(git diff --staged)"
-
-Automatic merge went well; stopped before committing as requested
-ok 7 - Abort after --no-commit
-
-expecting success of 7611.8 'Abort after conflicts': 
-	# Create conflicting merge
-	test_must_fail git merge conflict_branch &&
-	test_path_is_file .git/MERGE_HEAD &&
-	# Abort conflicting merge
-	git merge --abort &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff)" &&
-	test -z "$(git diff --staged)"
-
-Auto-merging baz
-CONFLICT (content): Merge conflict in baz
-Automatic merge failed; fix conflicts and then commit the result.
-ok 8 - Abort after conflicts
-
-expecting success of 7611.9 'Clean merge with dirty index fails': 
-	echo xyzzy >> foo &&
-	git add foo &&
-	git diff --staged > expect &&
-	test_must_fail git merge clean_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff)" &&
-	git diff --staged > actual &&
-	test_cmp expect actual
-
-error: Your local changes to the following files would be overwritten by merge:
-  foo
-Merge with strategy ort failed.
-ok 9 - Clean merge with dirty index fails
-
-expecting success of 7611.10 'Conflicting merge with dirty index fails': 
-	test_must_fail git merge conflict_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff)" &&
-	git diff --staged > actual &&
-	test_cmp expect actual
-
-error: Your local changes to the following files would be overwritten by merge:
-  foo
-Merge with strategy ort failed.
-ok 10 - Conflicting merge with dirty index fails
-
-expecting success of 7611.11 'Reset index (but preserve worktree changes)': 
-	git reset "$pre_merge_head" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-Unstaged changes after reset:
-M	foo
-ok 11 - Reset index (but preserve worktree changes)
-
-expecting success of 7611.12 'Abort clean merge with non-conflicting dirty worktree': 
-	git merge --no-commit clean_branch &&
-	test_path_is_file .git/MERGE_HEAD &&
-	# Abort merge
-	git merge --abort &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-Automatic merge went well; stopped before committing as requested
-ok 12 - Abort clean merge with non-conflicting dirty worktree
-
-expecting success of 7611.13 'Abort conflicting merge with non-conflicting dirty worktree': 
-	test_must_fail git merge conflict_branch &&
-	test_path_is_file .git/MERGE_HEAD &&
-	# Abort merge
-	git merge --abort &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-Auto-merging baz
-CONFLICT (content): Merge conflict in baz
-Automatic merge failed; fix conflicts and then commit the result.
-ok 13 - Abort conflicting merge with non-conflicting dirty worktree
-
-expecting success of 7611.14 'Reset worktree changes': 
-	git reset --hard "$pre_merge_head"
-
-HEAD is now at 9b32786 second
-ok 14 - Reset worktree changes
-
-expecting success of 7611.15 'Fail clean merge with conflicting dirty worktree': 
-	echo xyzzy >> bar &&
-	git diff > expect &&
-	test_must_fail git merge --no-commit clean_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-error: Your local changes to the following files would be overwritten by merge:
-	bar
-Please commit your changes or stash them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 15 - Fail clean merge with conflicting dirty worktree
-
-expecting success of 7611.16 'Fail conflicting merge with conflicting dirty worktree': 
-	test_must_fail git merge conflict_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-error: Your local changes to the following files would be overwritten by merge:
-	bar
-Please commit your changes or stash them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 16 - Fail conflicting merge with conflicting dirty worktree
-
-expecting success of 7611.17 'Reset worktree changes': 
-	git reset --hard "$pre_merge_head"
-
-HEAD is now at 9b32786 second
-ok 17 - Reset worktree changes
-
-expecting success of 7611.18 'Fail clean merge with matching dirty worktree': 
-	echo bart > bar &&
-	git diff > expect &&
-	test_must_fail git merge --no-commit clean_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-error: Your local changes to the following files would be overwritten by merge:
-	bar
-Please commit your changes or stash them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 18 - Fail clean merge with matching dirty worktree
-
-expecting success of 7611.19 'Fail conflicting merge with matching dirty worktree': 
-	echo barf > bar &&
-	git diff > expect &&
-	test_must_fail git merge conflict_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-error: Your local changes to the following files would be overwritten by merge:
-	bar
-Please commit your changes or stash them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 19 - Fail conflicting merge with matching dirty worktree
-
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7702-repack-cyclic-alternate.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7702-repack-cyclic-alternate/.git/
 expecting success of 7702.1 'setup': 
@@ -495612,2168 +498698,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7406-submodule-update.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t7406-submodule-update/main-branch/.git/
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/main-branch-submodule) registered for path 'main-branch-submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/withsubs/.git/
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/withsubs/foo/sub'...
-done.
-Cleared directory 'sub'
-Submodule 'foo/sub' (/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t7406-submodule-update/command-in-gitmodules/.git/
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
-Submodule 'none' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/none) registered for path 'none'
-Submodule 'rebasing' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
-Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/cloned/merging'...
-done.
-Skipping submodule 'none'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/cloned/rebasing'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t7406-submodule-update/submodule) registered for path 'deeper/submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t/trash directory.t7406-submodule-update/super_update_r/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/subsuper_update_r/
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/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.51.0/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
-done.
-Submodule 'subsubmodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/linked/dir/super/submodule'...
-done.
-Submodule path 'submodule': checked out '86a3496a1d60636ce953ea5245c2a0f63a7a2aa8'
-Submodule 'subsubmodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
-Submodule 'none' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/none) registered for path 'none'
-Submodule 'rebasing' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
-Submodule 'submodule' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/super3/merging'...
-Skipping submodule 'none'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/super3/rebasing'...
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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
-
-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
-	)
-
-[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 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_TEST_PACK_PATH_WALK=0 \
-		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 &&
-	 # This test variable will create a "warning" message to stderr
-	 GIT_TEST_PACK_PATH_WALK=0 \
-	 git submodule update --init --depth=1 submodule3 >out 2>err &&
-	 test_file_not_empty out &&
-	 test_file_not_empty err
-	)
-
-Cloning into 'super4'...
-done.
-[main e3c03e6] 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
-
-expecting success of 7406.60 'submodule update --filter requires --init': 
-	test_expect_code 129 git -C super submodule update --filter blob:none
-
-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>...]
-
-    -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
-
-ok 60 - submodule update --filter requires --init
-
-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
-
-Cloning into 'super-filter'...
-done.
-Submodule 'merging' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
-Submodule 'none' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/none) registered for path 'none'
-Submodule 'rebasing' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
-Submodule 'submodule' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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
-
-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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/middle/.git/
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/top/.git/
-Cloning into '/build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t7406-submodule-update/middle) registered for path 'middle'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/top-clean/middle'...
-done.
-Submodule path 'middle': checked out '8c7b95e494a2782f61ae9299ca15d668e545d9a8'
-Submodule 'bottom' (/build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/bottom) registered for path 'middle/bottom'
-Cloning into '/build/reproducible-path/git-2.51.0/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 with multiple remotes': 
-	test_when_finished "rm -fr top-cloned" &&
-	cp -r top-clean top-cloned &&
-
-	# Create a commit in each repo, starting with bottom
-	test_commit -C bottom multiple_remote_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 "multiple_remote_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 "multiple_remote_commit" &&
-
-	# rename the submodule remote
-	git -C top-cloned/middle remote rename origin upstream &&
-
-	# Add another remote
-	git -C top-cloned/middle remote add other bogus &&
-
-	# 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 &&
-	EOF
-	test_cmp expect.err actual.err
-
-[main 87c0b26] multiple_remote_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 multiple_remote_commit.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/bottom
-   581bdeb..87c0b26  main                   -> origin/main
- * [new tag]         multiple_remote_commit -> multiple_remote_commit
-Note: switching to 'FETCH_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 87c0b26 multiple_remote_commit
-[main ebabd02] multiple_remote_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/middle
-   8c7b95e..ebabd02  main       -> origin/main
-Note: switching to 'FETCH_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 ebabd02 multiple_remote_commit
-[main 5b329a4] multiple_remote_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 63 - submodule update with multiple remotes
-
-expecting success of 7406.64 'submodule update with renamed remote': 
-	test_when_finished "rm -fr top-cloned" &&
-	cp -r top-clean top-cloned &&
-
-	# Create a commit in each repo, starting with bottom
-	test_commit -C bottom rename_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 "rename_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 "rename_commit" &&
-
-	# rename the submodule remote
-	git -C top-cloned/middle remote rename origin upstream &&
-
-	# 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 &&
-	EOF
-	test_cmp expect.err actual.err
-
-[main 6369a8d] rename_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 rename_commit.t
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/bottom
-   87c0b26..6369a8d  main          -> origin/main
- * [new tag]         rename_commit -> rename_commit
-Previous HEAD position was 87c0b26 multiple_remote_commit
-HEAD is now at 6369a8d rename_commit
-[main e95e984] rename_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/middle
-   ebabd02..e95e984  main       -> origin/main
-Previous HEAD position was ebabd02 multiple_remote_commit
-HEAD is now at e95e984 rename_commit
-[main 699a6ac] rename_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 64 - submodule update with renamed remote
-
-expecting success of 7406.65 'submodule update should skip unmerged submodules': 
-	test_when_finished "rm -fr top-cloned" &&
-	cp -r top-clean top-cloned &&
-
-	# 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" &&
-
-	# 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 &&
-
-	# 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
-
-[main 4a576d9] 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.51.0/t/trash directory.t7406-submodule-update/bottom
-   6369a8d..4a576d9  main            -> origin/main
- * [new tag]         upstream_commit -> upstream_commit
-Previous HEAD position was 6369a8d rename_commit
-HEAD is now at 4a576d9 upstream_commit
-[main 630e29e] upstream_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/middle
-   e95e984..630e29e  main       -> origin/main
-Previous HEAD position was e95e984 rename_commit
-HEAD is now at 630e29e upstream_commit
-[main e974546] upstream_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 8682645] downstream_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 downstream_commit.t
-[detached HEAD 6860f68] downstream_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/middle
-   8c7b95e..630e29e  main       -> origin/main
-Fetching submodule bottom
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7406-submodule-update/bottom
-   581bdeb..4a576d9  main            -> origin/main
- * [new tag]         upstream_commit -> upstream_commit
- * [new tag]         multiple_remote_commit -> multiple_remote_commit
- * [new tag]         rename_commit   -> rename_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 4a576d9
-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 65 - submodule update should skip unmerged submodules
-
-expecting success of 7406.66 'submodule update --recursive skip submodules with strategy=none': 
-	test_when_finished "rm -fr top-cloned" &&
-	cp -r top-clean top-cloned &&
-
-	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
-
-[detached HEAD aa2074b] downstream_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 downstream_commit.t
-ok 66 - submodule update --recursive skip submodules with strategy=none
-
-expecting success of 7406.67 'commit with staged submodule change': 
-	add_submodule_commit_and_validate
-
-[main 983f55b] create submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-ok 67 - commit with staged submodule change
-
-expecting success of 7406.68 'commit with staged submodule change with ignoreSubmodules dirty': 
-	test_config diff.ignoreSubmodules dirty &&
-	add_submodule_commit_and_validate
-
-[main 2b404fa] create submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 68 - commit with staged submodule change with ignoreSubmodules dirty
-
-expecting success of 7406.69 'commit with staged submodule change with ignoreSubmodules all': 
-	test_config diff.ignoreSubmodules all &&
-	add_submodule_commit_and_validate
-
-[main 7858517] create submodule
- Author: A U Thor <author@example.com>
-ok 69 - commit with staged submodule change with ignoreSubmodules all
-
-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 70 # skip submodule paths must not follow symlinks (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,SYMLINKS)
-
-# passed all 70 test(s)
-1..70
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7701-repack-unpack-unreachable.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7701-repack-unpack-unreachable/.git/
 expecting success of 7701.1 '-A with -d option leaves unreachable objects unpacked': 
@@ -498965,989 +499889,1037 @@
 1..65
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7519-status-fsmonitor.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor/.git/
-expecting success of 7519.1 'incompatible bare repo': 
-	test_when_finished "rm -rf ./bare-clone actual expect" &&
-	git init --bare bare-clone &&
-
-	test_must_fail \
-		git -C ./bare-clone -c core.fsmonitor=foo \
-			update-index --fsmonitor 2>actual &&
-	grep "bare repository .* is incompatible with fsmonitor" actual &&
-
-	test_must_fail \
-		git -C ./bare-clone -c core.fsmonitor=true \
-			update-index --fsmonitor 2>actual &&
-	grep "bare repository .* is incompatible with fsmonitor" actual
+*** t7703-repack-geometric.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/.git/
+expecting success of 7703.1 '--geometric with no packs': 
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor/bare-clone/
-fatal: bare repository '/build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor/bare-clone' is incompatible with fsmonitor
-fatal: bare repository '/build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor/bare-clone' is incompatible with fsmonitor
-ok 1 - incompatible bare repo
+		git repack --write-midx --geometric 2 >out &&
+		test_grep "Nothing new to pack" out
+	)
 
-checking prerequisite: FSMONITOR_DAEMON
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
+Nothing new to pack.
+ok 1 - --geometric with no packs
 
-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
+expecting success of 7703.2 '--geometric with one pack': 
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
 
-)
-prerequisite FSMONITOR_DAEMON not satisfied
-ok 2 # skip run fsmonitor-daemon in bare repo (missing FSMONITOR_DAEMON)
+		test_commit "base" &&
+		git repack -d &&
 
-ok 3 # skip run fsmonitor-daemon in virtual repo (missing FSMONITOR_DAEMON,MINGW of MINGW,FSMONITOR_DAEMON)
+		git repack --geometric 2 >out &&
 
-expecting success of 7519.4 'setup': 
-	: >tracked &&
-	: >modified &&
-	mkdir dir1 &&
-	: >dir1/tracked &&
-	: >dir1/modified &&
-	mkdir dir2 &&
-	: >dir2/tracked &&
-	: >dir2/modified &&
-	git -c core.fsmonitor= add . &&
-	git -c core.fsmonitor= commit -m initial &&
-	git config core.fsmonitor .git/hooks/fsmonitor-test &&
-	cat >.gitignore <<-\EOF
-	.gitignore
-	expect*
-	actual*
-	marker*
-	trace2*
-	EOF
+		test_grep "Nothing new to pack" out
+	)
 
-[master (root-commit) 1851a93] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
+[master (root-commit) d1ff1c9] base
  Author: A U Thor <author@example.com>
- 6 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir1/modified
- create mode 100644 dir1/tracked
- create mode 100644 dir2/modified
- create mode 100644 dir2/tracked
- create mode 100644 modified
- create mode 100644 tracked
-ok 4 - setup
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+Nothing new to pack.
+ok 2 - --geometric with one pack
 
-expecting success of 7519.5 'fsmonitor extension is off by default': 
-	test-tool dump-fsmonitor >actual &&
-	grep "^no fsmonitor" actual
+expecting success of 7703.3 '--geometric with an intact progression': 
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
 
-no fsmonitor
-ok 5 - fsmonitor extension is off by default
+		# These packs already form a geometric progression.
+		test_commit_bulk --start=1 1 && # 3 objects
+		test_commit_bulk --start=2 2 && # 6 objects
+		test_commit_bulk --start=4 4 && # 12 objects
 
-expecting success of 7519.6 'update-index --fsmonitor" adds the fsmonitor extension': 
-	git update-index --fsmonitor &&
-	test-tool dump-fsmonitor >actual &&
-	grep "^fsmonitor last update" actual
+		find $objdir/pack -name "*.pack" | sort >expect &&
+		git repack --geometric 2 -d &&
+		find $objdir/pack -name "*.pack" | sort >actual &&
 
-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 1756282968441785722
-ok 6 - update-index --fsmonitor" adds the fsmonitor extension
+		test_cmp expect actual
+	)
 
-expecting success of 7519.7 'update-index --no-fsmonitor" removes the fsmonitor extension': 
-	git update-index --no-fsmonitor &&
-	test-tool dump-fsmonitor >actual &&
-	grep "^no fsmonitor" actual
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
+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
+---------------------------------------------------------------------
 
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-warning: core.fsmonitor is set; remove it if you really want to disable fsmonitor
-no fsmonitor
-ok 7 - update-index --no-fsmonitor" removes the fsmonitor extension
+d8452bb98e031b9f6d1e3804a8cecc14e3124c9e
+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          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 (         0 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            =          7
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =        716 /        716
+---------------------------------------------------------------------
 
-expecting success of 7519.8 'update-index --fsmonitor-valid" sets the fsmonitor valid bit': 
-	test_hook fsmonitor-test<<-\EOF &&
-		printf "last_update_token\0"
-	EOF
-	git update-index --fsmonitor &&
-	git update-index --fsmonitor-valid dir1/modified &&
-	git update-index --fsmonitor-valid dir2/modified &&
-	git update-index --fsmonitor-valid modified &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+123d744603d8c13997f7dd86b4f066cc68305762
+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 (         0 unique    )
+      atoms:              7
+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          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       1501 /       1501
+---------------------------------------------------------------------
 
-ok 8 - update-index --fsmonitor-valid" sets the fsmonitor valid bit
+Nothing new to pack.
+ok 3 - --geometric with an intact progression
 
-expecting success of 7519.9 'update-index --no-fsmonitor-valid" clears the fsmonitor valid bit': 
-	git update-index --no-fsmonitor-valid dir1/modified &&
-	git update-index --no-fsmonitor-valid dir2/modified &&
-	git update-index --no-fsmonitor-valid modified &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+expecting success of 7703.4 '--geometric with loose objects': 
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
 
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-ok 9 - update-index --no-fsmonitor-valid" clears the fsmonitor valid bit
+		# These packs already form a geometric progression.
+		test_commit_bulk --start=1 1 && # 3 objects
+		test_commit_bulk --start=2 2 && # 6 objects
+		# The loose objects are packed together, breaking the
+		# progression.
+		test_commit loose && # 3 objects
 
-expecting success of 7519.10 'all files returned by integration script get flagged as invalid': 
-	write_integration_script &&
-	dirty_repo &&
-	git update-index --fsmonitor &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+		find $objdir/pack -name "*.pack" | sort >before &&
+		git repack --geometric 2 -d &&
+		find $objdir/pack -name "*.pack" | sort >after &&
 
-ok 10 - all files returned by integration script get flagged as invalid
+		comm -13 before after >new &&
+		comm -23 before after >removed &&
 
-expecting success of 7519.11 'newly added files are marked valid': 
-	test_hook --setup --clobber fsmonitor-test<<-\EOF &&
-		printf "last_update_token\0"
-	EOF
-	git add new &&
-	git add dir1/new &&
-	git add dir2/new &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+		test_line_count = 1 new &&
+		test_must_be_empty removed &&
 
-ok 11 - newly added files are marked valid
+		git repack --geometric 2 -d &&
+		find $objdir/pack -name "*.pack" | sort >after &&
 
-expecting success of 7519.12 'all unmodified files get marked valid': 
-	# modified files result in update-index returning 1
-	test_must_fail git update-index --refresh --force-write-index &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+		# The progression (3, 3, 6) is combined into one new pack.
+		test_line_count = 1 after
+	)
 
-dir1/modified: needs update
-dir2/modified: needs update
-modified: needs update
-ok 12 - all unmodified files get marked valid
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
+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
+---------------------------------------------------------------------
 
-expecting success of 7519.13 '*only* files returned by the integration script get flagged as invalid': 
-	test_hook --clobber fsmonitor-test<<-\EOF &&
-	printf "last_update_token\0"
-	printf "dir1/modified\0"
-	EOF
-	clean_repo &&
-	git update-index --refresh --force-write-index &&
-	echo 1 >modified &&
-	echo 2 >dir1/modified &&
-	echo 3 >dir2/modified &&
-	test_must_fail git update-index --refresh --force-write-index &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+d8452bb98e031b9f6d1e3804a8cecc14e3124c9e
+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          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 (         0 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            =          7
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =        716 /        716
+---------------------------------------------------------------------
 
-HEAD is now at 1851a93 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-dir1/modified: needs update
-ok 13 - *only* files returned by the integration script get flagged as invalid
+[master 3de64bf] loose
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 loose.t
+ok 4 - --geometric with loose objects
 
-expecting success of 7519.14 'refresh_index() invalidates fsmonitor cache': 
-	clean_repo &&
-	dirty_repo &&
-	write_integration_script &&
-	git add . &&
-	test_hook --clobber fsmonitor-test<<-\EOF &&
-	EOF
-	git commit -m "to reset" &&
-	git reset HEAD~1 &&
-	git status >actual &&
-	git -c core.fsmonitor= status >expect &&
-	test_cmp expect actual
+expecting success of 7703.5 '--geometric with small-pack rollup': 
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
 
-HEAD is now at 1851a93 initial
-warning: Empty last update token.
-[master 6edcb70] to reset
- Author: A U Thor <author@example.com>
- 9 files changed, 6 insertions(+)
- create mode 100644 dir1/new
- create mode 100644 dir1/untracked
- create mode 100644 dir2/new
- create mode 100644 dir2/untracked
- create mode 100644 new
- create mode 100644 untracked
-warning: Empty last update token.
-Unstaged changes after reset:
-M	dir1/modified
-M	dir2/modified
-M	modified
-warning: Empty last update token.
-ok 14 - refresh_index() invalidates fsmonitor cache
+		test_commit_bulk --start=1 1 && # 3 objects
+		test_commit_bulk --start=2 1 && # 3 objects
+		find $objdir/pack -name "*.pack" | sort >small &&
+		test_commit_bulk --start=3 4 && # 12 objects
+		test_commit_bulk --start=7 8 && # 24 objects
+		find $objdir/pack -name "*.pack" | sort >before &&
 
-expecting success of 7519.15 'setup preloadIndex to false': 
-		git config core.preloadIndex $preload_val &&
-		if test $preload_val = true
-		then
-			GIT_TEST_PRELOAD_INDEX=$preload_val && export GIT_TEST_PRELOAD_INDEX
-		else
-			sane_unset GIT_TEST_PRELOAD_INDEX
-		fi
-	
-ok 15 - setup preloadIndex to false
+		git repack --geometric 2 -d &&
 
-checking prerequisite: UNTRACKED_CACHE
+		# Three packs in total; two of the existing large ones, and one
+		# new one.
+		find $objdir/pack -name "*.pack" | sort >after &&
+		test_line_count = 3 after &&
+		comm -3 small before | tr -d "\t" >large &&
+		grep -qFf large after
+	)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
-	{ git update-index --test-untracked-cache; ret=$?; } &&
-	test $ret -ne 1
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
+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
+---------------------------------------------------------------------
 
-)
-warning: Empty last update token.
-Testing mtime in '/build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor' ...... OK
-prerequisite UNTRACKED_CACHE ok
-expecting success of 7519.16 'setup untracked cache to false': 
-			git config core.untrackedcache $uc_val
-		
-ok 16 - setup untracked cache to false
+d8452bb98e031b9f6d1e3804a8cecc14e3124c9e
+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:              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            =          6
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =        494 /        494
+---------------------------------------------------------------------
 
-expecting success of 7519.17 'compare status with and without fsmonitor': 
-			write_integration_script &&
-			clean_repo &&
-			dirty_repo &&
-			git add new &&
-			git add dir1/new &&
-			git add dir2/new &&
-			git status >actual &&
-			git -c core.fsmonitor= status >expect &&
-			test_cmp expect actual
-		
-HEAD is now at 1851a93 initial
-Removing dir1/new
-Removing dir1/untracked
-Removing dir2/new
-Removing dir2/untracked
-Removing new
-Removing untracked
-ok 17 - compare status with and without fsmonitor
+446a0a30049ffec3f6a1af16c07e8c0941b11660
+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 (         0 unique    )
+      atoms:              6
+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          =          3
+pack_report: pack_open_windows        =          3 /          3
+pack_report: pack_mapped              =       1467 /       1467
+---------------------------------------------------------------------
 
-expecting success of 7519.18 'status doesn't detect unreported modifications': 
-			test_hook --clobber fsmonitor-test<<-\EOF &&
-			printf "last_update_token\0"
-			:>marker
-			EOF
-			clean_repo &&
-			git status &&
-			test_path_is_file marker &&
-			dirty_repo &&
-			rm -f marker &&
-			git status >actual &&
-			test_path_is_file marker &&
-			test_grep ! "Changes not staged for commit:" actual &&
-			if test $uc_val = true
-			then
-				test_grep ! "Untracked files:" actual
-			fi &&
-			if test $uc_val = false
-			then
-				test_grep "Untracked files:" actual
-			fi &&
-			rm -f marker
-		
-HEAD is now at 1851a93 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-On branch master
-nothing to commit, working tree clean
-Untracked files:
-ok 18 - status doesn't detect unreported modifications
+6cf975cad5d4c3afe9d9c1beb519506ab26f2968
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           24 (         0 duplicates                  )
+      blobs  :            8 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            8 (         0 duplicates          7 deltas of          7 attempts)
+      commits:            8 (         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:             14
+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            =         14
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       2954 /       2954
+---------------------------------------------------------------------
 
-expecting success of 7519.19 'setup untracked cache to true': 
-			git config core.untrackedcache $uc_val
-		
-ok 19 - setup untracked cache to true
+ok 5 - --geometric with small-pack rollup
 
-expecting success of 7519.20 'compare status with and without fsmonitor': 
-			write_integration_script &&
-			clean_repo &&
-			dirty_repo &&
-			git add new &&
-			git add dir1/new &&
-			git add dir2/new &&
-			git status >actual &&
-			git -c core.fsmonitor= status >expect &&
-			test_cmp expect actual
-		
-HEAD is now at 1851a93 initial
-Removing dir1/new
-Removing dir1/untracked
-Removing dir2/new
-Removing dir2/untracked
-Removing new
-Removing untracked
-ok 20 - compare status with and without fsmonitor
+expecting success of 7703.6 '--geometric with small- and large-pack rollup': 
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
 
-expecting success of 7519.21 'status doesn't detect unreported modifications': 
-			test_hook --clobber fsmonitor-test<<-\EOF &&
-			printf "last_update_token\0"
-			:>marker
-			EOF
-			clean_repo &&
-			git status &&
-			test_path_is_file marker &&
-			dirty_repo &&
-			rm -f marker &&
-			git status >actual &&
-			test_path_is_file marker &&
-			test_grep ! "Changes not staged for commit:" actual &&
-			if test $uc_val = true
-			then
-				test_grep ! "Untracked files:" actual
-			fi &&
-			if test $uc_val = false
-			then
-				test_grep "Untracked files:" actual
-			fi &&
-			rm -f marker
-		
-HEAD is now at 1851a93 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-On branch master
-nothing to commit, working tree clean
-ok 21 - status doesn't detect unreported modifications
+		# size(small1) + size(small2) > size(medium) / 2
+		test_commit_bulk --start=1 1 && # 3 objects
+		test_commit_bulk --start=2 1 && # 3 objects
+		test_commit_bulk --start=2 3 && # 7 objects
+		test_commit_bulk --start=6 9 && # 27 objects &&
 
-expecting success of 7519.22 'setup preloadIndex to true': 
-		git config core.preloadIndex $preload_val &&
-		if test $preload_val = true
-		then
-			GIT_TEST_PRELOAD_INDEX=$preload_val && export GIT_TEST_PRELOAD_INDEX
-		else
-			sane_unset GIT_TEST_PRELOAD_INDEX
-		fi
-	
-ok 22 - setup preloadIndex to true
+		find $objdir/pack -name "*.pack" | sort >before &&
 
-expecting success of 7519.23 'setup untracked cache to false': 
-			git config core.untrackedcache $uc_val
-		
-ok 23 - setup untracked cache to false
+		git repack --geometric 2 -d &&
 
-expecting success of 7519.24 'compare status with and without fsmonitor': 
-			write_integration_script &&
-			clean_repo &&
-			dirty_repo &&
-			git add new &&
-			git add dir1/new &&
-			git add dir2/new &&
-			git status >actual &&
-			git -c core.fsmonitor= status >expect &&
-			test_cmp expect actual
-		
-HEAD is now at 1851a93 initial
-Removing dir1/new
-Removing dir1/untracked
-Removing dir2/new
-Removing dir2/untracked
-Removing new
-Removing untracked
-ok 24 - compare status with and without fsmonitor
+		find $objdir/pack -name "*.pack" | sort >after &&
+		comm -12 before after >untouched &&
 
-expecting success of 7519.25 'status doesn't detect unreported modifications': 
-			test_hook --clobber fsmonitor-test<<-\EOF &&
-			printf "last_update_token\0"
-			:>marker
-			EOF
-			clean_repo &&
-			git status &&
-			test_path_is_file marker &&
-			dirty_repo &&
-			rm -f marker &&
-			git status >actual &&
-			test_path_is_file marker &&
-			test_grep ! "Changes not staged for commit:" actual &&
-			if test $uc_val = true
-			then
-				test_grep ! "Untracked files:" actual
-			fi &&
-			if test $uc_val = false
-			then
-				test_grep "Untracked files:" actual
-			fi &&
-			rm -f marker
-		
-HEAD is now at 1851a93 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-On branch master
-nothing to commit, working tree clean
-Untracked files:
-ok 25 - status doesn't detect unreported modifications
+		# Two packs in total; the largest pack from before running "git
+		# repack", and one new one.
+		test_line_count = 1 untouched &&
+		test_line_count = 2 after
+	)
 
-expecting success of 7519.26 'setup untracked cache to true': 
-			git config core.untrackedcache $uc_val
-		
-ok 26 - setup untracked cache to true
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
+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
+---------------------------------------------------------------------
 
-expecting success of 7519.27 'compare status with and without fsmonitor': 
-			write_integration_script &&
-			clean_repo &&
-			dirty_repo &&
-			git add new &&
-			git add dir1/new &&
-			git add dir2/new &&
-			git status >actual &&
-			git -c core.fsmonitor= status >expect &&
-			test_cmp expect actual
-		
-HEAD is now at 1851a93 initial
-Removing dir1/new
-Removing dir1/untracked
-Removing dir2/new
-Removing dir2/untracked
-Removing new
-Removing untracked
-ok 27 - compare status with and without fsmonitor
+d8452bb98e031b9f6d1e3804a8cecc14e3124c9e
+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:              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            =          6
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =        494 /        494
+---------------------------------------------------------------------
 
-expecting success of 7519.28 'status doesn't detect unreported modifications': 
-			test_hook --clobber fsmonitor-test<<-\EOF &&
-			printf "last_update_token\0"
-			:>marker
-			EOF
-			clean_repo &&
-			git status &&
-			test_path_is_file marker &&
-			dirty_repo &&
-			rm -f marker &&
-			git status >actual &&
-			test_path_is_file marker &&
-			test_grep ! "Changes not staged for commit:" actual &&
-			if test $uc_val = true
-			then
-				test_grep ! "Untracked files:" actual
-			fi &&
-			if test $uc_val = false
-			then
-				test_grep "Untracked files:" actual
-			fi &&
-			rm -f marker
-		
-HEAD is now at 1851a93 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-On branch master
-nothing to commit, working tree clean
-ok 28 - status doesn't detect unreported modifications
+446a0a30049ffec3f6a1af16c07e8c0941b11660
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            7 (         1 duplicates                  )
+      blobs  :            2 (         1 duplicates          0 deltas of          0 attempts)
+      trees  :            2 (         0 duplicates          1 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 (         0 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            =          9
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          3 /          3
+pack_report: pack_mapped              =       1173 /       1173
+---------------------------------------------------------------------
 
-expecting success of 7519.29 'splitting the index results in the same state': 
-	write_integration_script &&
-	dirty_repo &&
-	git update-index --fsmonitor  &&
-	git ls-files -f >expect &&
-	test-tool dump-fsmonitor >&2 && echo &&
-	git update-index --fsmonitor --split-index &&
-	test-tool dump-fsmonitor >&2 && echo &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+3b6ba6da728b7d7f9d84a57cbdfe24243627f606
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           27 (         0 duplicates                  )
+      blobs  :            9 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            9 (         0 duplicates          8 deltas of          8 attempts)
+      commits:            9 (         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:             13
+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            =         15
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       2833 /       2833
+---------------------------------------------------------------------
 
-fsmonitor last update last_update_token
-------
-fsmonitor last update last_update_token
----
-ok 29 - splitting the index results in the same state
+ok 6 - --geometric with small- and large-pack rollup
 
-expecting success of 7519.30 'ignore .git changes when invalidating UNTR': 
-	test_create_repo dot-git &&
-	(
-		cd dot-git &&
-		: >tracked &&
-		test-tool chmtime =-60 tracked &&
-		: >modified &&
-		test-tool chmtime =-60 modified &&
-		mkdir dir1 &&
-		: >dir1/tracked &&
-		test-tool chmtime =-60 dir1/tracked &&
-		: >dir1/modified &&
-		test-tool chmtime =-60 dir1/modified &&
-		mkdir dir2 &&
-		: >dir2/tracked &&
-		test-tool chmtime =-60 dir2/tracked &&
-		: >dir2/modified &&
-		test-tool chmtime =-60 dir2/modified &&
-		write_integration_script &&
-		git config core.fsmonitor .git/hooks/fsmonitor-test &&
-		git update-index --untracked-cache &&
-		git update-index --fsmonitor &&
-		git status &&
-		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace-before" \
-		git status &&
-		test-tool dump-untracked-cache >../before
-	) &&
-	cat >>dot-git/.git/hooks/fsmonitor-test <<-\EOF &&
-	printf ".git\0"
-	printf ".git/index\0"
-	printf "dir1/.git\0"
-	printf "dir1/.git/index\0"
-	EOF
+expecting success of 7703.7 '--geometric ignores kept packs': 
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
 	(
-		cd dot-git &&
-		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace-after" \
-		git status &&
-		test-tool dump-untracked-cache >../after
-	) &&
-	grep "directory-invalidation" trace-before | cut -d"|" -f 9 >>before &&
-	grep "directory-invalidation" trace-after  | cut -d"|" -f 9 >>after &&
-	# UNTR extension unchanged, dir invalidation count unchanged
-	test_cmp before after
+		cd geometric &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor/dot-git/.git/
-On branch master
+		test_commit kept && # 3 objects
+		test_commit pack && # 3 objects
 
-No commits yet
+		KEPT=$(git pack-objects --revs $objdir/pack/pack <<-EOF
+		refs/tags/kept
+		EOF
+		) &&
+		PACK=$(git pack-objects --revs $objdir/pack/pack <<-EOF
+		refs/tags/pack
+		^refs/tags/kept
+		EOF
+		) &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/
-	dir2/
-	modified
-	tracked
+		# neither pack contains more than twice the number of objects in
+		# the other, so they should be combined. but, marking one as
+		# .kept on disk will "freeze" it, so the pack structure should
+		# remain unchanged.
+		touch $objdir/pack/pack-$KEPT.keep &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-On branch master
+		find $objdir/pack -name "*.pack" | sort >before &&
+		git repack --geometric 2 -d &&
+		find $objdir/pack -name "*.pack" | sort >after &&
 
-No commits yet
+		# both packs should still exist
+		test_path_is_file $objdir/pack/pack-$KEPT.pack &&
+		test_path_is_file $objdir/pack/pack-$PACK.pack &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/
-	dir2/
-	modified
-	tracked
+		# and no new packs should be created
+		test_cmp before after &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-On branch master
+		# Passing --pack-kept-objects causes packs with a .keep file to
+		# be repacked, too.
+		git repack --geometric 2 -d --pack-kept-objects &&
 
-No commits yet
+		# After repacking, two packs remain: one new one (containing the
+		# objects in both the .keep and non-kept pack), and the .keep
+		# pack (since `--pack-kept-objects -d` does not actually delete
+		# the kept pack).
+		find $objdir/pack -name "*.pack" >after &&
+		test_line_count = 2 after
+	)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/
-	dir2/
-	modified
-	tracked
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
+[master (root-commit) 08c8142] kept
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 kept.t
+[master e384986] pack
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 pack.t
+Nothing new to pack.
+ok 7 - --geometric ignores kept packs
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 30 - ignore .git changes when invalidating UNTR
+expecting success of 7703.8 '--geometric ignores --keep-pack packs': 
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
 
-expecting success of 7519.31 'discard_index() also discards fsmonitor info': 
-	test_config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-all" &&
-	test_might_fail git update-index --refresh &&
-	test-tool read-cache --print-and-refresh=tracked 2 >actual &&
-	printf "tracked is%s up to date\n" "" " not" >expect &&
-	test_cmp expect actual
+		# Create two equal-sized packs
+		test_commit kept && # 3 objects
+		git repack -d &&
+		test_commit pack && # 3 objects
+		git repack -d &&
 
-dir1/modified: needs update
-dir2/modified: needs update
-modified: needs update
-ok 31 - discard_index() also discards fsmonitor info
+		find $objdir/pack -type f -name "*.pack" | sort >packs.before &&
+		git repack --geometric 2 -dm \
+			--keep-pack="$(basename "$(head -n 1 packs.before)")" >out &&
+		find $objdir/pack -type f -name "*.pack" | sort >packs.after &&
 
-expecting success of 7519.32 'status succeeds after staging/unstaging': 
-	test_create_repo fsmonitor-stage-unstage &&
-	(
-		cd fsmonitor-stage-unstage &&
-		test_commit initial &&
-		git update-index --fsmonitor &&
-		removed=$(test_seq 1 100 | sed "s/^/z/") &&
-		touch $removed &&
-		git add $removed &&
-		git config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-env" &&
-		FSMONITOR_LIST="$removed" git restore -S $removed &&
-		FSMONITOR_LIST="$removed" git status
+		# Packs should not have changed (only one non-kept pack, no
+		# loose objects), but $midx should now exist.
+		grep "Nothing new to pack" out &&
+		test_path_is_file $midx &&
+
+		test_cmp packs.before packs.after &&
+
+		git fsck
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor/fsmonitor-stage-unstage/.git/
-[master (root-commit) 24b24cf] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
+[master (root-commit) 08c8142] kept
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-warning: core.fsmonitor is unset; set it if you really want to enable fsmonitor
-Unsupported core.fsmonitor hook version.
-Unsupported core.fsmonitor hook version.
-On branch master
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	z1
-	z10
-	z100
-	z11
-	z12
-	z13
-	z14
-	z15
-	z16
-	z17
-	z18
-	z19
-	z2
-	z20
-	z21
-	z22
-	z23
-	z24
-	z25
-	z26
-	z27
-	z28
-	z29
-	z3
-	z30
-	z31
-	z32
-	z33
-	z34
-	z35
-	z36
-	z37
-	z38
-	z39
-	z4
-	z40
-	z41
-	z42
-	z43
-	z44
-	z45
-	z46
-	z47
-	z48
-	z49
-	z5
-	z50
-	z51
-	z52
-	z53
-	z54
-	z55
-	z56
-	z57
-	z58
-	z59
-	z6
-	z60
-	z61
-	z62
-	z63
-	z64
-	z65
-	z66
-	z67
-	z68
-	z69
-	z7
-	z70
-	z71
-	z72
-	z73
-	z74
-	z75
-	z76
-	z77
-	z78
-	z79
-	z8
-	z80
-	z81
-	z82
-	z83
-	z84
-	z85
-	z86
-	z87
-	z88
-	z89
-	z9
-	z90
-	z91
-	z92
-	z93
-	z94
-	z95
-	z96
-	z97
-	z98
-	z99
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 32 - status succeeds after staging/unstaging
+ create mode 100644 kept.t
+[master e384986] pack
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 pack.t
+Nothing new to pack.
+ok 8 - --geometric ignores --keep-pack packs
 
-expecting success of 7519.33 'status succeeds with sparse index': 
+expecting success of 7703.9 '--geometric chooses largest MIDX preferred pack': 
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
 	(
-		sane_unset GIT_TEST_SPLIT_INDEX &&
+		cd geometric &&
 
-		git clone . full &&
-		git clone --sparse . sparse &&
-		git -C sparse sparse-checkout init --cone --sparse-index &&
-		git -C sparse sparse-checkout set dir1 dir2 &&
+		# These packs already form a geometric progression.
+		test_commit_bulk --start=1 1 && # 3 objects
+		test_commit_bulk --start=2 2 && # 6 objects
+		ls $objdir/pack/pack-*.idx >before &&
+		test_commit_bulk --start=4 4 && # 12 objects
+		ls $objdir/pack/pack-*.idx >after &&
 
-		test_hook --clobber fsmonitor-test <<-\EOF &&
-			printf "last_update_token\0"
-		EOF
-		git -C full config core.fsmonitor ../.git/hooks/fsmonitor-test &&
-		git -C sparse config core.fsmonitor ../.git/hooks/fsmonitor-test &&
-		check_sparse_index_behavior ! &&
+		git repack --geometric 2 -dbm &&
 
-		test_hook --clobber fsmonitor-test <<-\EOF &&
-			printf "last_update_token\0"
-			printf "dir1/modified\0"
-		EOF
-		check_sparse_index_behavior ! &&
+		comm -3 before after | xargs -n 1 basename >expect &&
+		test-tool read-midx --preferred-pack $objdir >actual &&
 
-		git -C sparse sparse-checkout add dir1a &&
+		test_cmp expect actual
+	)
 
-		for repo in full sparse
-		do
-			cp -r $repo/dir1 $repo/dir1a &&
-			git -C $repo add dir1a &&
-			git -C $repo commit -m "add dir1a" || return 1
-		done &&
-		git -C sparse sparse-checkout set dir1 dir2 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
+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
+---------------------------------------------------------------------
 
-		# This one modifies outside the sparse-checkout definition
-		# and hence we expect to expand the sparse-index.
-		test_hook --clobber fsmonitor-test <<-\EOF &&
-			printf "last_update_token\0"
-			printf "dir1a/modified\0"
-		EOF
-		check_sparse_index_behavior
-	)
+d8452bb98e031b9f6d1e3804a8cecc14e3124c9e
+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          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 (         0 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            =          7
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =        716 /        716
+---------------------------------------------------------------------
 
-Cloning into 'full'...
-done.
-Cloning into 'sparse'...
-done.
-{"event":"region_enter","sid":"20250827T082256.159307Z-Hcf858c9d-P000cdaed","thread":"main","time":"2025-08-27T08:22:56.160047Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20250827T082256.159307Z-Hcf858c9d-P000cdaed","thread":"main","time":"2025-08-27T08:22:56.163948Z","file":"fsmonitor.c","line":186,"t_rel":0.003900,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_enter","sid":"20250827T082256.216857Z-Hcf858c9d-P000cdbbb","thread":"main","time":"2025-08-27T08:22:56.217662Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20250827T082256.216857Z-Hcf858c9d-P000cdbbb","thread":"main","time":"2025-08-27T08:22:56.222430Z","file":"fsmonitor.c","line":186,"t_rel":0.004767,"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(-)
- create mode 100644 dir1a/modified
- create mode 100644 dir1a/tracked
-[master 1279bb5] add dir1a
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir1a/modified
- create mode 100644 dir1a/tracked
-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"
-{"event":"region_enter","sid":"20250827T082256.371596Z-Hcf858c9d-P000cddb1","thread":"main","time":"2025-08-27T08:22:56.378527Z","file":"sparse-index.c","line":372,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082256.371596Z-Hcf858c9d-P000cddb1","thread":"main","time":"2025-08-27T08:22:56.383189Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082256.371596Z-Hcf858c9d-P000cddb1","thread":"main","time":"2025-08-27T08:22:56.379118Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000591,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250827T082256.371596Z-Hcf858c9d-P000cddb1","thread":"main","time":"2025-08-27T08:22:56.383229Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000039,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250827T082256.371596Z-Hcf858c9d-P000cddb1","thread":"main","time":"2025-08-27T08:22:56.372382Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_enter","sid":"20250827T082256.371596Z-Hcf858c9d-P000cddb1","thread":"main","time":"2025-08-27T08:22:56.380596Z","file":"fsmonitor.c","line":176,"nesting":2,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20250827T082256.371596Z-Hcf858c9d-P000cddb1","thread":"main","time":"2025-08-27T08:22:56.378369Z","file":"fsmonitor.c","line":186,"t_rel":0.005987,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20250827T082256.371596Z-Hcf858c9d-P000cddb1","thread":"main","time":"2025-08-27T08:22:56.382071Z","file":"fsmonitor.c","line":186,"t_rel":0.001476,"nesting":2,"category":"fsm_hook","label":"query"}
-ok 33 - status succeeds with sparse index
+123d744603d8c13997f7dd86b4f066cc68305762
+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 (         0 unique    )
+      atoms:              7
+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          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       1501 /       1501
+---------------------------------------------------------------------
 
-# passed all 33 test(s)
-1..33
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7811-grep-open.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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"
+Nothing new to pack.
+ok 9 - --geometric chooses largest MIDX preferred pack
 
-ok 1 - determine default pager
+expecting success of 7703.10 '--geometric with pack.packSizeLimit': 
+	git init pack-rewrite &&
+	test_when_finished "rm -fr pack-rewrite" &&
+	(
+		cd pack-rewrite &&
 
-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-tool genrandom foo 1048576 >foo &&
+		test-tool genrandom bar 1048576 >bar &&
 
-	test_commit add-user revision.c "
-	}
-	if (seen_dashdash)
-		read_pathspec_from_stdin(revs, &sb, prune);
-	strbuf_release(&sb);
-}
+		git add foo bar &&
+		test_tick &&
+		git commit -m base &&
 
-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);
-" &&
+		git rev-parse HEAD:foo HEAD:bar >p1.objects &&
+		git rev-parse HEAD HEAD^{tree} >p2.objects &&
 
-	mkdir subdir &&
-	test_commit subdir subdir/grep.c "enum grep_pat_token" &&
+		# These two packs each contain two objects, so the following
+		# `--geometric` repack will try to combine them.
+		p1="$(git pack-objects $packdir/pack <p1.objects)" &&
+		p2="$(git pack-objects $packdir/pack <p2.objects)" &&
 
-	test_commit uninteresting unrelated "hello, world" &&
+		# Remove any loose objects in packs, since we do not want extra
+		# copies around (which would mask over potential object
+		# corruption issues).
+		git prune-packed &&
 
-	echo GREP_PATTERN >untracked
+		# Both p1 and p2 will be rolled up, but pack-objects will write
+		# three packs:
+		#
+		#   - one containing object "foo",
+		#   - another containing object "bar",
+		#   - a final pack containing the commit and tree objects
+		#     (identical to p2 above)
+		git repack --geometric 2 -d --max-pack-size=1048576 &&
 
-[master (root-commit) 6a780d2] initial
+		# Ensure `repack` can detect that the third pack it wrote
+		# (containing just the tree and commit objects) was identical to
+		# one that was below the geometric split, so that we can save it
+		# from deletion.
+		#
+		# If `repack` fails to do that, we will incorrectly delete p2,
+		# causing object corruption.
+		git fsck
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/pack-rewrite/.git/
+[master (root-commit) 6102f2f] base
  Author: A U Thor <author@example.com>
- 1 file changed, 11 insertions(+)
- create mode 100644 grep.h
-[master 7eeae3c] add-user
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+ create mode 100644 foo
+ok 10 - --geometric with pack.packSizeLimit
+
+expecting success of 7703.11 '--geometric --write-midx with packfiles in main and alternate ODB': 
+	test_when_finished "rm -fr shared member" &&
+
+	# Create a shared repository that will serve as the alternate object
+	# database for the member linked to it. It has got some objects on its
+	# own that are packed into a single packfile.
+	git init shared &&
+	test_commit -C shared common-object &&
+	git -C shared repack -ad &&
+
+	# We create member so that its alternates file points to the shared
+	# repository. We then create a commit in it so that git-repack(1) has
+	# something to repack.
+	# of the shared object database.
+	git clone --shared shared member &&
+	test_commit -C member unique-object &&
+	git -C member repack --geometric=2 --write-midx 2>err &&
+	test_must_be_empty err &&
+
+	# We should see that a new packfile was generated.
+	find shared/.git/objects/pack -type f -name "*.pack" >packs &&
+	test_line_count = 1 packs &&
+
+	# We should also see a multi-pack-index. This multi-pack-index should
+	# never refer to any packfiles in the alternate object database.
+	test_path_is_file member/.git/objects/pack/multi-pack-index &&
+	test-tool read-midx member/.git/objects >packs.midx &&
+	grep "^pack-.*\.idx$" packs.midx | sort >actual &&
+	basename member/.git/objects/pack/pack-*.idx >expect &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/shared/.git/
+[master (root-commit) 4611efd] common-object
  Author: A U Thor <author@example.com>
- 1 file changed, 11 insertions(+)
- create mode 100644 revision.c
-[master 22c3f1e] subdir
+ 1 file changed, 1 insertion(+)
+ create mode 100644 common-object.t
+Cloning into 'member'...
+done.
+[master 2badf8b] unique-object
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 subdir/grep.c
-[master cd972f3] uninteresting
+ create mode 100644 unique-object.t
+ok 11 - --geometric --write-midx with packfiles in main and alternate ODB
+
+expecting success of 7703.12 '--geometric --with-midx with no local objects': 
+	test_when_finished "rm -fr shared member" &&
+
+	# Create a repository with a single packfile that acts as alternate
+	# object database.
+	git init shared &&
+	test_commit -C shared "shared-objects" &&
+	git -C shared repack -ad &&
+
+	# Create a second repository linked to the first one and perform a
+	# geometric repack on it.
+	git clone --shared shared member &&
+	git -C member repack --geometric 2 --write-midx 2>err &&
+	test_must_be_empty err &&
+
+	# Assert that we wrote neither a new packfile nor a multi-pack-index.
+	# We should not have a packfile because the single packfile in the
+	# alternate object database does not invalidate the geometric sequence.
+	# And we should not have a multi-pack-index because these only index
+	# local packfiles, and there are none.
+	test_dir_is_empty member/$packdir
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/shared/.git/
+[master (root-commit) 5ab200f] shared-objects
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 unrelated
-ok 2 - setup
+ create mode 100644 shared-objects.t
+Cloning into 'member'...
+done.
+Nothing new to pack.
+ok 12 - --geometric --with-midx with no local objects
 
-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 &&
+expecting success of 7703.13 '--geometric with same pack in main and alternate ODB': 
+	test_when_finished "rm -fr shared member" &&
 
-	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
+	# Create a repository with a single packfile that acts as alternate
+	# object database.
+	git init shared &&
+	test_commit -C shared "shared-objects" &&
+	git -C shared repack -ad &&
 
---- expect.less	2025-08-27 08:22:56.876436391 +0000
-+++ pager-args	2025-08-27 08:22:56.884436444 +0000
-@@ -1,2 +1 @@
--+/*GREP_PATTERN
- grep.h
-ok 3 - git grep -O
+	# We create the member repository as an exact copy so that it has the
+	# same packfile.
+	cp -r shared member &&
+	test-tool path-utils real_path shared/.git/objects >member/.git/objects/info/alternates &&
+	find shared/.git/objects -type f >expected-files &&
 
-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
+	# Verify that we can repack objects as expected without observing any
+	# error. Having the same packfile in both ODBs used to cause an error
+	# in git-pack-objects(1).
+	git -C member repack --geometric 2 2>err &&
+	test_must_be_empty err &&
+	# Nothing should have changed.
+	find shared/.git/objects -type f >actual-files &&
+	test_cmp expected-files actual-files
 
-fatal: --open-files-in-pager only works on the worktree
-ok 4 - git grep -O --cached
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/shared/.git/
+[master (root-commit) 8241c38] shared-objects
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shared-objects.t
+ok 13 - --geometric with same pack in main and alternate ODB
 
-expecting success of 7811.5 'git grep -O --no-index': 
-	rm -f expect.less pager-args out &&
-	cat >expect <<-\EOF &&
-	grep.h
-	untracked
-	EOF
+expecting success of 7703.14 '--geometric -l with non-intact geometric sequence across ODBs': 
+	test_when_finished "rm -fr shared member" &&
 
-	(
-		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
+	git init shared &&
+	test_commit_bulk -C shared --start=1 1 &&
 
-ok 5 - git grep -O --no-index
+	git clone --shared shared member &&
+	test_commit_bulk -C member --start=2 1 &&
 
-expecting success of 7811.6 'setup: fake "less"': 
-	cat >less <<-\EOF &&
-	#!/bin/sh
-	printf "%s\n" "$@" >actual
-	EOF
-	chmod +x less
+	# Verify that our assumptions actually hold: both generated packfiles
+	# should have three objects and should be non-equal.
+	packed_objects shared/.git/objects/pack/pack-*.idx >shared-objects &&
+	packed_objects member/.git/objects/pack/pack-*.idx >member-objects &&
+	test_line_count = 3 shared-objects &&
+	test_line_count = 3 member-objects &&
+	! test_cmp shared-objects member-objects &&
 
-ok 6 - setup: fake "less"
+	# Perform the geometric repack. With `-l`, we should only see the local
+	# packfile and thus arrive at the conclusion that the geometric
+	# sequence is intact. We thus expect no changes.
+	#
+	# Note that we are tweaking mtimes of the packfiles so that we can
+	# verify they did not change. This is done in order to detect the case
+	# where we do repack objects, but the resulting packfile is the same.
+	test-tool chmtime --verbose =0 member/.git/objects/pack/* >expected-member-packs &&
+	git -C member repack --geometric=2 -l -d &&
+	test-tool chmtime --verbose member/.git/objects/pack/* >actual-member-packs &&
+	test_cmp expected-member-packs actual-member-packs &&
 
-expecting success of 7811.7 'git grep -O jumps to line in less': 
-	cat >expect <<-\EOF &&
-	+/*GREP_PATTERN
-	grep.h
-	EOF
+	{
+		packed_objects shared/.git/objects/pack/pack-*.idx &&
+		packed_objects member/.git/objects/pack/pack-*.idx
+	} | sort >expected-objects &&
 
-	GIT_PAGER=./less git grep -O GREP_PATTERN >out &&
-	test_cmp expect actual &&
-	test_must_be_empty out &&
+	# On the other hand, when doing a non-local geometric repack we should
+	# see both packfiles and thus repack them. We expect that the shared
+	# object database was not changed.
+	test-tool chmtime --verbose =0 shared/.git/objects/pack/* >expected-shared-packs &&
+	git -C member repack --geometric=2 -d &&
+	test-tool chmtime --verbose shared/.git/objects/pack/* >actual-shared-packs &&
+	test_cmp expected-shared-packs actual-shared-packs &&
 
-	git grep -O./less GREP_PATTERN >out2 &&
-	test_cmp expect actual &&
-	test_must_be_empty out2
+	# Furthermore, we expect that the member repository now has a single
+	# packfile that contains the combined shared and non-shared objects.
+	ls member/.git/objects/pack/pack-*.idx >actual &&
+	test_line_count = 1 actual &&
+	packed_objects member/.git/objects/pack/pack-*.idx >actual-objects &&
+	test_line_count = 6 actual-objects &&
+	test_cmp expected-objects actual-objects
 
-ok 7 - git grep -O jumps to line in less
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/shared/.git/
+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
+---------------------------------------------------------------------
 
-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
+Cloning into 'member'...
+done.
+04646a23dde207060dc8a802fc9bd5d3c2c976bd
+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:              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            =          6
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =        496 /        496
+---------------------------------------------------------------------
 
-	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
+Your branch is ahead of 'origin/master' by 1 commit.
+  (use "git push" to publish your local commits)
+--- shared-objects	2026-09-29 14:53:44.638548970 +0000
++++ member-objects	2026-09-29 14:53:44.650548970 +0000
+@@ -1,3 +1,3 @@
+-04646a23dde207060dc8a802fc9bd5d3c2c976bd
+-a0054e492840f572e48a3cb791d2e083afaf08f6
+-d64cdfb91a799a8865406d537fe77cba9ed28c6a
++1163cbeba781f9eb6e5c16afd5b8a0158ca58d1e
++4d4bc1c77f63bd5429cb0ab4d74cb8729570d293
++861b34610ee9fe8cee7738064d2d7b8a49030e4f
+Nothing new to pack.
+ok 14 - --geometric -l with non-intact geometric sequence across ODBs
 
-HEAD is now at cd972f3 uninteresting
-ok 8 - modified file
+expecting success of 7703.15 '--geometric -l disables writing bitmaps with non-local packfiles': 
+	test_when_finished "rm -fr shared member" &&
 
-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
+	git init shared &&
+	test_commit_bulk -C shared --start=1 1 &&
 
-ok 9 - copes with color settings
+	git clone --shared shared member &&
+	test_commit_bulk -C member --start=2 1 &&
 
-expecting success of 7811.10 'run from subdir': 
-	rm -f actual &&
-	echo grep.c >expect &&
+	# When performing a geometric repack with `-l` while connected to an
+	# alternate object database that has a packfile we do not have full
+	# coverage of objects. As a result, we expect that writing the bitmap
+	# will be disabled.
+	git -C member repack -l --geometric=2 --write-midx --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 member/.git/objects/pack/multi-pack-index-*.bitmap &&
 
-	(
-		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
+	# On the other hand, when we repack without `-l`, we should see that
+	# the bitmap gets created.
+	git -C member repack --geometric=2 --write-midx --write-bitmap-index 2>err &&
+	test_must_be_empty err &&
+	test_path_is_file member/.git/objects/pack/multi-pack-index-*.bitmap
 
-ok 10 - run from subdir
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/shared/.git/
+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
+---------------------------------------------------------------------
 
-# passed all 10 test(s)
-1..10
+Cloning into 'member'...
+done.
+eb6d9b3966fa3c8f4a21be95b33aec49cbb58fae
+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:              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            =          6
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =        496 /        496
+---------------------------------------------------------------------
+
+Your branch is ahead of 'origin/master' by 1 commit.
+  (use "git push" to publish your local commits)
+Nothing new to pack.
+ok 15 - --geometric -l disables writing bitmaps with non-local packfiles
+
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7600-merge.sh ***
@@ -501923,8 +502895,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	2025-08-27 08:22:57.716441933 +0000
-+++ rerere.before	2025-08-27 08:22:57.708441880 +0000
+--- rerere.after	2026-09-29 14:53:45.142548970 +0000
++++ rerere.before	2026-09-29 14:53:45.138548970 +0000
 @@ -0,0 +1 @@
 +base.t
 ok 81 - merge --quit
@@ -501960,1414 +502932,212 @@
 1..83
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7812-grep-icase-non-ascii.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7813-grep-icase-iso.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7703-repack-geometric.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/.git/
-expecting success of 7703.1 '--geometric with no packs': 
-	git init geometric &&
-	test_when_finished "rm -fr geometric" &&
-	(
-		cd geometric &&
-
-		git repack --write-midx --geometric 2 >out &&
-		test_grep "Nothing new to pack" out
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
-Nothing new to pack.
-ok 1 - --geometric with no packs
-
-expecting success of 7703.2 '--geometric with one pack': 
-	git init geometric &&
-	test_when_finished "rm -fr geometric" &&
-	(
-		cd geometric &&
-
-		test_commit "base" &&
-		git repack -d &&
-
-		git repack --geometric 2 >out &&
-
-		test_grep "Nothing new to pack" out
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.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.
-ok 2 - --geometric with one pack
-
-expecting success of 7703.3 '--geometric with an intact progression': 
-	git init geometric &&
-	test_when_finished "rm -fr geometric" &&
-	(
-		cd geometric &&
-
-		# These packs already form a geometric progression.
-		test_commit_bulk --start=1 1 && # 3 objects
-		test_commit_bulk --start=2 2 && # 6 objects
-		test_commit_bulk --start=4 4 && # 12 objects
-
-		find $objdir/pack -name "*.pack" | sort >expect &&
-		git repack --geometric 2 -d &&
-		find $objdir/pack -name "*.pack" | sort >actual &&
-
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
-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
----------------------------------------------------------------------
-
-d8452bb98e031b9f6d1e3804a8cecc14e3124c9e
-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          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 (         0 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            =          7
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =        716 /        716
----------------------------------------------------------------------
-
-123d744603d8c13997f7dd86b4f066cc68305762
-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 (         0 unique    )
-      atoms:              7
-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          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       1501 /       1501
----------------------------------------------------------------------
-
-Nothing new to pack.
-ok 3 - --geometric with an intact progression
-
-expecting success of 7703.4 '--geometric with loose objects': 
-	git init geometric &&
-	test_when_finished "rm -fr geometric" &&
-	(
-		cd geometric &&
-
-		# These packs already form a geometric progression.
-		test_commit_bulk --start=1 1 && # 3 objects
-		test_commit_bulk --start=2 2 && # 6 objects
-		# The loose objects are packed together, breaking the
-		# progression.
-		test_commit loose && # 3 objects
-
-		find $objdir/pack -name "*.pack" | sort >before &&
-		git repack --geometric 2 -d &&
-		find $objdir/pack -name "*.pack" | sort >after &&
-
-		comm -13 before after >new &&
-		comm -23 before after >removed &&
-
-		test_line_count = 1 new &&
-		test_must_be_empty removed &&
-
-		git repack --geometric 2 -d &&
-		find $objdir/pack -name "*.pack" | sort >after &&
-
-		# The progression (3, 3, 6) is combined into one new pack.
-		test_line_count = 1 after
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
-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
----------------------------------------------------------------------
-
-d8452bb98e031b9f6d1e3804a8cecc14e3124c9e
-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          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 (         0 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            =          7
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =        716 /        716
----------------------------------------------------------------------
-
-[master 3de64bf] loose
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-ok 4 - --geometric with loose objects
-
-expecting success of 7703.5 '--geometric with small-pack rollup': 
-	git init geometric &&
-	test_when_finished "rm -fr geometric" &&
-	(
-		cd geometric &&
-
-		test_commit_bulk --start=1 1 && # 3 objects
-		test_commit_bulk --start=2 1 && # 3 objects
-		find $objdir/pack -name "*.pack" | sort >small &&
-		test_commit_bulk --start=3 4 && # 12 objects
-		test_commit_bulk --start=7 8 && # 24 objects
-		find $objdir/pack -name "*.pack" | sort >before &&
-
-		git repack --geometric 2 -d &&
-
-		# Three packs in total; two of the existing large ones, and one
-		# new one.
-		find $objdir/pack -name "*.pack" | sort >after &&
-		test_line_count = 3 after &&
-		comm -3 small before | tr -d "\t" >large &&
-		grep -qFf large after
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
-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
----------------------------------------------------------------------
-
-d8452bb98e031b9f6d1e3804a8cecc14e3124c9e
-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:              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            =          6
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =        494 /        494
----------------------------------------------------------------------
-
-446a0a30049ffec3f6a1af16c07e8c0941b11660
-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 (         0 unique    )
-      atoms:              6
-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          =          3
-pack_report: pack_open_windows        =          3 /          3
-pack_report: pack_mapped              =       1467 /       1467
----------------------------------------------------------------------
-
-6cf975cad5d4c3afe9d9c1beb519506ab26f2968
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           24 (         0 duplicates                  )
-      blobs  :            8 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            8 (         0 duplicates          7 deltas of          7 attempts)
-      commits:            8 (         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:             14
-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            =         14
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       2954 /       2954
----------------------------------------------------------------------
-
-ok 5 - --geometric with small-pack rollup
-
-expecting success of 7703.6 '--geometric with small- and large-pack rollup': 
-	git init geometric &&
-	test_when_finished "rm -fr geometric" &&
-	(
-		cd geometric &&
-
-		# size(small1) + size(small2) > size(medium) / 2
-		test_commit_bulk --start=1 1 && # 3 objects
-		test_commit_bulk --start=2 1 && # 3 objects
-		test_commit_bulk --start=2 3 && # 7 objects
-		test_commit_bulk --start=6 9 && # 27 objects &&
-
-		find $objdir/pack -name "*.pack" | sort >before &&
-
-		git repack --geometric 2 -d &&
-
-		find $objdir/pack -name "*.pack" | sort >after &&
-		comm -12 before after >untouched &&
-
-		# Two packs in total; the largest pack from before running "git
-		# repack", and one new one.
-		test_line_count = 1 untouched &&
-		test_line_count = 2 after
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
-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
----------------------------------------------------------------------
-
-d8452bb98e031b9f6d1e3804a8cecc14e3124c9e
-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:              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            =          6
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =        494 /        494
----------------------------------------------------------------------
-
-446a0a30049ffec3f6a1af16c07e8c0941b11660
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            7 (         1 duplicates                  )
-      blobs  :            2 (         1 duplicates          0 deltas of          0 attempts)
-      trees  :            2 (         0 duplicates          1 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 (         0 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            =          9
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          3 /          3
-pack_report: pack_mapped              =       1173 /       1173
----------------------------------------------------------------------
-
-3b6ba6da728b7d7f9d84a57cbdfe24243627f606
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           27 (         0 duplicates                  )
-      blobs  :            9 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            9 (         0 duplicates          8 deltas of          8 attempts)
-      commits:            9 (         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:             13
-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            =         15
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       2833 /       2833
----------------------------------------------------------------------
-
-ok 6 - --geometric with small- and large-pack rollup
-
-expecting success of 7703.7 '--geometric ignores kept packs': 
-	git init geometric &&
-	test_when_finished "rm -fr geometric" &&
-	(
-		cd geometric &&
-
-		test_commit kept && # 3 objects
-		test_commit pack && # 3 objects
-
-		KEPT=$(git pack-objects --revs $objdir/pack/pack <<-EOF
-		refs/tags/kept
-		EOF
-		) &&
-		PACK=$(git pack-objects --revs $objdir/pack/pack <<-EOF
-		refs/tags/pack
-		^refs/tags/kept
-		EOF
-		) &&
-
-		# neither pack contains more than twice the number of objects in
-		# the other, so they should be combined. but, marking one as
-		# .kept on disk will "freeze" it, so the pack structure should
-		# remain unchanged.
-		touch $objdir/pack/pack-$KEPT.keep &&
-
-		find $objdir/pack -name "*.pack" | sort >before &&
-		git repack --geometric 2 -d &&
-		find $objdir/pack -name "*.pack" | sort >after &&
-
-		# both packs should still exist
-		test_path_is_file $objdir/pack/pack-$KEPT.pack &&
-		test_path_is_file $objdir/pack/pack-$PACK.pack &&
-
-		# and no new packs should be created
-		test_cmp before after &&
-
-		# Passing --pack-kept-objects causes packs with a .keep file to
-		# be repacked, too.
-		git repack --geometric 2 -d --pack-kept-objects &&
-
-		# After repacking, two packs remain: one new one (containing the
-		# objects in both the .keep and non-kept pack), and the .keep
-		# pack (since `--pack-kept-objects -d` does not actually delete
-		# the kept pack).
-		find $objdir/pack -name "*.pack" >after &&
-		test_line_count = 2 after
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
-[master (root-commit) 08c8142] kept
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 kept.t
-[master e384986] pack
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 pack.t
-Nothing new to pack.
-ok 7 - --geometric ignores kept packs
-
-expecting success of 7703.8 '--geometric ignores --keep-pack packs': 
-	git init geometric &&
-	test_when_finished "rm -fr geometric" &&
-	(
-		cd geometric &&
-
-		# Create two equal-sized packs
-		test_commit kept && # 3 objects
-		git repack -d &&
-		test_commit pack && # 3 objects
-		git repack -d &&
-
-		find $objdir/pack -type f -name "*.pack" | sort >packs.before &&
-		git repack --geometric 2 -dm \
-			--keep-pack="$(basename "$(head -n 1 packs.before)")" >out &&
-		find $objdir/pack -type f -name "*.pack" | sort >packs.after &&
-
-		# Packs should not have changed (only one non-kept pack, no
-		# loose objects), but $midx should now exist.
-		grep "Nothing new to pack" out &&
-		test_path_is_file $midx &&
-
-		test_cmp packs.before packs.after &&
-
-		git fsck
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
-[master (root-commit) 08c8142] kept
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 kept.t
-[master e384986] pack
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 pack.t
-Nothing new to pack.
-ok 8 - --geometric ignores --keep-pack packs
-
-expecting success of 7703.9 '--geometric chooses largest MIDX preferred pack': 
-	git init geometric &&
-	test_when_finished "rm -fr geometric" &&
-	(
-		cd geometric &&
-
-		# These packs already form a geometric progression.
-		test_commit_bulk --start=1 1 && # 3 objects
-		test_commit_bulk --start=2 2 && # 6 objects
-		ls $objdir/pack/pack-*.idx >before &&
-		test_commit_bulk --start=4 4 && # 12 objects
-		ls $objdir/pack/pack-*.idx >after &&
-
-		git repack --geometric 2 -dbm &&
-
-		comm -3 before after | xargs -n 1 basename >expect &&
-		test-tool read-midx --preferred-pack $objdir >actual &&
-
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/geometric/.git/
-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
----------------------------------------------------------------------
-
-d8452bb98e031b9f6d1e3804a8cecc14e3124c9e
-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          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 (         0 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            =          7
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =        716 /        716
----------------------------------------------------------------------
-
-123d744603d8c13997f7dd86b4f066cc68305762
-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 (         0 unique    )
-      atoms:              7
-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          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       1501 /       1501
----------------------------------------------------------------------
-
-Nothing new to pack.
-ok 9 - --geometric chooses largest MIDX preferred pack
-
-expecting success of 7703.10 '--geometric with pack.packSizeLimit': 
-	git init pack-rewrite &&
-	test_when_finished "rm -fr pack-rewrite" &&
-	(
-		cd pack-rewrite &&
-
-		test-tool genrandom foo 1048576 >foo &&
-		test-tool genrandom bar 1048576 >bar &&
-
-		git add foo bar &&
-		test_tick &&
-		git commit -m base &&
-
-		git rev-parse HEAD:foo HEAD:bar >p1.objects &&
-		git rev-parse HEAD HEAD^{tree} >p2.objects &&
-
-		# These two packs each contain two objects, so the following
-		# `--geometric` repack will try to combine them.
-		p1="$(git pack-objects $packdir/pack <p1.objects)" &&
-		p2="$(git pack-objects $packdir/pack <p2.objects)" &&
-
-		# Remove any loose objects in packs, since we do not want extra
-		# copies around (which would mask over potential object
-		# corruption issues).
-		git prune-packed &&
-
-		# Both p1 and p2 will be rolled up, but pack-objects will write
-		# three packs:
-		#
-		#   - one containing object "foo",
-		#   - another containing object "bar",
-		#   - a final pack containing the commit and tree objects
-		#     (identical to p2 above)
-		git repack --geometric 2 -d --max-pack-size=1048576 &&
+*** t7811-grep-open.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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"
 
-		# Ensure `repack` can detect that the third pack it wrote
-		# (containing just the tree and commit objects) was identical to
-		# one that was below the geometric split, so that we can save it
-		# from deletion.
-		#
-		# If `repack` fails to do that, we will incorrectly delete p2,
-		# causing object corruption.
-		git fsck
-	)
+ok 1 - determine default pager
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/pack-rewrite/.git/
-[master (root-commit) 6102f2f] base
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bar
- create mode 100644 foo
-ok 10 - --geometric with pack.packSizeLimit
+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 7703.11 '--geometric --write-midx with packfiles in main and alternate ODB': 
-	test_when_finished "rm -fr shared member" &&
+	test_commit add-user revision.c "
+	}
+	if (seen_dashdash)
+		read_pathspec_from_stdin(revs, &sb, prune);
+	strbuf_release(&sb);
+}
 
-	# Create a shared repository that will serve as the alternate object
-	# database for the member linked to it. It has got some objects on its
-	# own that are packed into a single packfile.
-	git init shared &&
-	test_commit -C shared common-object &&
-	git -C shared repack -ad &&
+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);
+" &&
 
-	# We create member so that its alternates file points to the shared
-	# repository. We then create a commit in it so that git-repack(1) has
-	# something to repack.
-	# of the shared object database.
-	git clone --shared shared member &&
-	test_commit -C member unique-object &&
-	git -C member repack --geometric=2 --write-midx 2>err &&
-	test_must_be_empty err &&
+	mkdir subdir &&
+	test_commit subdir subdir/grep.c "enum grep_pat_token" &&
 
-	# We should see that a new packfile was generated.
-	find shared/.git/objects/pack -type f -name "*.pack" >packs &&
-	test_line_count = 1 packs &&
+	test_commit uninteresting unrelated "hello, world" &&
 
-	# We should also see a multi-pack-index. This multi-pack-index should
-	# never refer to any packfiles in the alternate object database.
-	test_path_is_file member/.git/objects/pack/multi-pack-index &&
-	test-tool read-midx member/.git/objects >packs.midx &&
-	grep "^pack-.*\.idx$" packs.midx | sort >actual &&
-	basename member/.git/objects/pack/pack-*.idx >expect &&
-	test_cmp expect actual
+	echo GREP_PATTERN >untracked
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/shared/.git/
-[master (root-commit) 4611efd] common-object
+[master (root-commit) 6a780d2] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 common-object.t
-Cloning into 'member'...
-done.
-[master 2badf8b] unique-object
+ 1 file changed, 11 insertions(+)
+ create mode 100644 grep.h
+[master 7eeae3c] add-user
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unique-object.t
-ok 11 - --geometric --write-midx with packfiles in main and alternate ODB
-
-expecting success of 7703.12 '--geometric --with-midx with no local objects': 
-	test_when_finished "rm -fr shared member" &&
-
-	# Create a repository with a single packfile that acts as alternate
-	# object database.
-	git init shared &&
-	test_commit -C shared "shared-objects" &&
-	git -C shared repack -ad &&
-
-	# Create a second repository linked to the first one and perform a
-	# geometric repack on it.
-	git clone --shared shared member &&
-	git -C member repack --geometric 2 --write-midx 2>err &&
-	test_must_be_empty err &&
-
-	# Assert that we wrote neither a new packfile nor a multi-pack-index.
-	# We should not have a packfile because the single packfile in the
-	# alternate object database does not invalidate the geometric sequence.
-	# And we should not have a multi-pack-index because these only index
-	# local packfiles, and there are none.
-	test_dir_is_empty member/$packdir
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/shared/.git/
-[master (root-commit) 5ab200f] shared-objects
+ 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 shared-objects.t
-Cloning into 'member'...
-done.
-Nothing new to pack.
-ok 12 - --geometric --with-midx with no local objects
-
-expecting success of 7703.13 '--geometric with same pack in main and alternate ODB': 
-	test_when_finished "rm -fr shared member" &&
-
-	# Create a repository with a single packfile that acts as alternate
-	# object database.
-	git init shared &&
-	test_commit -C shared "shared-objects" &&
-	git -C shared repack -ad &&
-
-	# We create the member repository as an exact copy so that it has the
-	# same packfile.
-	cp -r shared member &&
-	test-tool path-utils real_path shared/.git/objects >member/.git/objects/info/alternates &&
-	find shared/.git/objects -type f >expected-files &&
-
-	# Verify that we can repack objects as expected without observing any
-	# error. Having the same packfile in both ODBs used to cause an error
-	# in git-pack-objects(1).
-	git -C member repack --geometric 2 2>err &&
-	test_must_be_empty err &&
-	# Nothing should have changed.
-	find shared/.git/objects -type f >actual-files &&
-	test_cmp expected-files actual-files
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/shared/.git/
-[master (root-commit) 8241c38] shared-objects
+ create mode 100644 subdir/grep.c
+[master cd972f3] uninteresting
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 shared-objects.t
-ok 13 - --geometric with same pack in main and alternate ODB
-
-expecting success of 7703.14 '--geometric -l with non-intact geometric sequence across ODBs': 
-	test_when_finished "rm -fr shared member" &&
-
-	git init shared &&
-	test_commit_bulk -C shared --start=1 1 &&
-
-	git clone --shared shared member &&
-	test_commit_bulk -C member --start=2 1 &&
-
-	# Verify that our assumptions actually hold: both generated packfiles
-	# should have three objects and should be non-equal.
-	packed_objects shared/.git/objects/pack/pack-*.idx >shared-objects &&
-	packed_objects member/.git/objects/pack/pack-*.idx >member-objects &&
-	test_line_count = 3 shared-objects &&
-	test_line_count = 3 member-objects &&
-	! test_cmp shared-objects member-objects &&
+ create mode 100644 unrelated
+ok 2 - setup
 
-	# Perform the geometric repack. With `-l`, we should only see the local
-	# packfile and thus arrive at the conclusion that the geometric
-	# sequence is intact. We thus expect no changes.
-	#
-	# Note that we are tweaking mtimes of the packfiles so that we can
-	# verify they did not change. This is done in order to detect the case
-	# where we do repack objects, but the resulting packfile is the same.
-	test-tool chmtime --verbose =0 member/.git/objects/pack/* >expected-member-packs &&
-	git -C member repack --geometric=2 -l -d &&
-	test-tool chmtime --verbose member/.git/objects/pack/* >actual-member-packs &&
-	test_cmp expected-member-packs actual-member-packs &&
+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 &&
 	{
-		packed_objects shared/.git/objects/pack/pack-*.idx &&
-		packed_objects member/.git/objects/pack/pack-*.idx
-	} | sort >expected-objects &&
-
-	# On the other hand, when doing a non-local geometric repack we should
-	# see both packfiles and thus repack them. We expect that the shared
-	# object database was not changed.
-	test-tool chmtime --verbose =0 shared/.git/objects/pack/* >expected-shared-packs &&
-	git -C member repack --geometric=2 -d &&
-	test-tool chmtime --verbose shared/.git/objects/pack/* >actual-shared-packs &&
-	test_cmp expected-shared-packs actual-shared-packs &&
-
-	# Furthermore, we expect that the member repository now has a single
-	# packfile that contains the combined shared and non-shared objects.
-	ls member/.git/objects/pack/pack-*.idx >actual &&
-	test_line_count = 1 actual &&
-	packed_objects member/.git/objects/pack/pack-*.idx >actual-objects &&
-	test_line_count = 6 actual-objects &&
-	test_cmp expected-objects actual-objects
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/shared/.git/
-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
----------------------------------------------------------------------
-
-Cloning into 'member'...
-done.
-04646a23dde207060dc8a802fc9bd5d3c2c976bd
-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:              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            =          6
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =        496 /        496
----------------------------------------------------------------------
-
-Your branch is ahead of 'origin/master' by 1 commit.
-  (use "git push" to publish your local commits)
---- shared-objects	2025-08-27 08:22:57.900443147 +0000
-+++ member-objects	2025-08-27 08:22:57.936443385 +0000
-@@ -1,3 +1,3 @@
--04646a23dde207060dc8a802fc9bd5d3c2c976bd
--a0054e492840f572e48a3cb791d2e083afaf08f6
--d64cdfb91a799a8865406d537fe77cba9ed28c6a
-+1163cbeba781f9eb6e5c16afd5b8a0158ca58d1e
-+4d4bc1c77f63bd5429cb0ab4d74cb8729570d293
-+861b34610ee9fe8cee7738064d2d7b8a49030e4f
-Nothing new to pack.
-ok 14 - --geometric -l with non-intact geometric sequence across ODBs
+		test_cmp expect.less pager-args ||
+		test_cmp expect.notless pager-args
+	} &&
+	test_must_be_empty out
 
-expecting success of 7703.15 '--geometric -l disables writing bitmaps with non-local packfiles': 
-	test_when_finished "rm -fr shared member" &&
+--- expect.less	2026-09-29 14:53:45.118548970 +0000
++++ pager-args	2026-09-29 14:53:45.122548970 +0000
+@@ -1,2 +1 @@
+-+/*GREP_PATTERN
+ grep.h
+ok 3 - git grep -O
 
-	git init shared &&
-	test_commit_bulk -C shared --start=1 1 &&
+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
 
-	git clone --shared shared member &&
-	test_commit_bulk -C member --start=2 1 &&
+fatal: --open-files-in-pager only works on the worktree
+ok 4 - git grep -O --cached
 
-	# When performing a geometric repack with `-l` while connected to an
-	# alternate object database that has a packfile we do not have full
-	# coverage of objects. As a result, we expect that writing the bitmap
-	# will be disabled.
-	git -C member repack -l --geometric=2 --write-midx --write-bitmap-index 2>err &&
-	cat >expect <<-EOF &&
-	warning: disabling bitmap writing, as some objects are not being packed
+expecting success of 7811.5 'git grep -O --no-index': 
+	rm -f expect.less pager-args out &&
+	cat >expect <<-\EOF &&
+	grep.h
+	untracked
 	EOF
-	test_cmp expect err &&
-	test_path_is_missing member/.git/objects/pack/multi-pack-index-*.bitmap &&
-
-	# On the other hand, when we repack without `-l`, we should see that
-	# the bitmap gets created.
-	git -C member repack --geometric=2 --write-midx --write-bitmap-index 2>err &&
-	test_must_be_empty err &&
-	test_path_is_file member/.git/objects/pack/multi-pack-index-*.bitmap
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7703-repack-geometric/shared/.git/
-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
----------------------------------------------------------------------
-
-Cloning into 'member'...
-done.
-eb6d9b3966fa3c8f4a21be95b33aec49cbb58fae
-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:              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            =          6
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =        496 /        496
----------------------------------------------------------------------
-
-Your branch is ahead of 'origin/master' by 1 commit.
-  (use "git push" to publish your local commits)
-Nothing new to pack.
-ok 15 - --geometric -l disables writing bitmaps with non-local packfiles
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7815-grep-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+	(
+		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
 
-expecting success of 7815.11 'git grep ile a': 
-	git grep ile a
+ok 5 - git grep -O --no-index
 
-Binary file a matches
-ok 11 - git grep ile a
+expecting success of 7811.6 'setup: fake "less"': 
+	cat >less <<-\EOF &&
+	#!/bin/sh
+	printf "%s\n" "$@" >actual
+	EOF
+	chmod +x less
 
-checking known breakage of 7815.12 'git grep .fi a': 
-	git grep .fi a
+ok 6 - setup: fake "less"
 
-not ok 12 - git grep .fi a # TODO known breakage
+expecting success of 7811.7 'git grep -O jumps to line in less': 
+	cat >expect <<-\EOF &&
+	+/*GREP_PATTERN
+	grep.h
+	EOF
 
-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 &&
+	GIT_PAGER=./less git grep -O GREP_PATTERN >out &&
 	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
+	test_must_be_empty out &&
 
-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 &&
+	git grep -O./less GREP_PATTERN >out2 &&
 	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
+	test_must_be_empty out2
 
-ok 17 - grep respects not-binary diff attribute
+ok 7 - git grep -O jumps to line in less
 
-expecting success of 7815.18 'setup textconv filters': 
-	write_script nul_to_q_textconv <<-\EOF &&
-	tr "\000" "Q" <"$1"
+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
-	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
+	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
 
-ok 19 - grep does not honor textconv
+HEAD is now at cd972f3 uninteresting
+ok 8 - modified file
 
-expecting success of 7815.20 'grep --textconv honors textconv': 
-	echo "a:binaryQfileQm[*]cQ*æQð" >expect &&
-	git grep --textconv Qfile >actual &&
+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 20 - grep --textconv honors textconv
+ok 9 - copes with color settings
 
-expecting success of 7815.21 'grep --no-textconv does not honor textconv': 
-	test_must_fail git grep --no-textconv Qfile
+expecting success of 7811.10 'run from subdir': 
+	rm -f actual &&
+	echo grep.c >expect &&
 
-ok 21 - grep --no-textconv does not honor textconv
+	(
+		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
 
-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 10 - run from subdir
 
-ok 22 - grep --textconv blob honors textconv
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7813-grep-icase-iso.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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)
 
-# still have 1 known breakage(s)
-# passed all remaining 21 test(s)
-1..22
+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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7609-mergetool--lib.sh ***
@@ -503401,253 +503171,6 @@
 1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7817-grep-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-	) &&
-
-	git init sub2 &&
-	(
-		cd sub2 &&
-		echo "text" >a &&
-		git add a &&
-		git commit -m sub2
-	) &&
-
-	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.51.0/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.51.0/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
-
-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: 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
-
-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
-
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 4 - grep --cached searches entries with the SKIP_WORKTREE bit
-
-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
-
-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: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 5 - grep --recurse-submodules honors sparse checkout in submodule
-
-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
-
-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
-
-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
-
-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 7 - working tree grep does not search the index with CE_VALID and SKIP_WORKTREE
-
-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
-
-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 8 - grep --cached searches index entries with both CE_VALID and SKIP_WORKTREE
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7400-submodule-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/.git/
 expecting success of 7400.1 'setup - enable local submodules': 
@@ -504247,8 +503770,8 @@
 Turn off this advice by setting config variable advice.detachedHead to false
 
 HEAD is now at 8f98e77 initial commit
---- actual	2025-08-27 08:22:40.404327722 +0000
-+++ actual2	2025-08-27 08:22:40.676329517 +0000
+--- actual	2026-09-29 14:53:32.262548970 +0000
++++ actual2	2026-09-29 14:53:32.450548970 +0000
 @@ -4,7 +4,7 @@
  23ad8e191a506339bc2aa0ae92a950f35303f38b
  23ad8e191a506339bc2aa0ae92a950f35303f38b
@@ -505174,677 +504697,2078 @@
 
 ok 98 - submodule deinit should unset core.worktree
 
-expecting success of 7400.99 'submodule deinit from subdirectory': 
-	git submodule update --init &&
-	git config submodule.example.foo bar &&
-	mkdir -p sub &&
-	(
-		cd sub &&
-		git submodule deinit ../init >../output
-	) &&
-	test_grep "\\.\\./init" output &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test -n "$(git config --get-regexp "submodule\.example2\.")" &&
-	test -f example2/.git &&
-	rmdir init
+expecting success of 7400.99 'submodule deinit from subdirectory': 
+	git submodule update --init &&
+	git config submodule.example.foo bar &&
+	mkdir -p sub &&
+	(
+		cd sub &&
+		git submodule deinit ../init >../output
+	) &&
+	test_grep "\\.\\./init" output &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test -n "$(git config --get-regexp "submodule\.example2\.")" &&
+	test -f example2/.git &&
+	rmdir init
+
+Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+Cleared directory '../init'
+Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) unregistered for path '../init'
+ok 99 - submodule deinit from subdirectory
+
+expecting success of 7400.100 'submodule deinit . deinits all initialized submodules': 
+	git submodule update --init &&
+	git config submodule.example.foo bar &&
+	git config submodule.example2.frotz nitfol &&
+	test_must_fail git submodule deinit &&
+	git submodule deinit . >actual &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test -z "$(git config --get-regexp "submodule\.example2\.")" &&
+	test_grep "Cleared directory .init" actual &&
+	test_grep "Cleared directory .example2" actual &&
+	rmdir init example2
+
+Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+fatal: Use '--all' if you really want to deinitialize all submodules
+Cleared directory 'init'
+Cleared directory 'example2'
+ok 100 - submodule deinit . deinits all initialized submodules
+
+expecting success of 7400.101 'submodule deinit --all deinits all initialized submodules': 
+	git submodule update --init &&
+	git config submodule.example.foo bar &&
+	git config submodule.example2.frotz nitfol &&
+	test_must_fail git submodule deinit &&
+	git submodule deinit --all >actual &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test -z "$(git config --get-regexp "submodule\.example2\.")" &&
+	test_grep "Cleared directory .init" actual &&
+	test_grep "Cleared directory .example2" actual &&
+	rmdir init example2
+
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'example2' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
+Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+fatal: Use '--all' if you really want to deinitialize all submodules
+Cleared directory 'init'
+Cleared directory 'example2'
+ok 101 - submodule deinit --all deinits all initialized submodules
+
+expecting success of 7400.102 'submodule deinit deinits a submodule when its work tree is missing or empty': 
+	git submodule update --init &&
+	rm -rf init example2/* example2/.git &&
+	git submodule deinit init example2 >actual &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test -z "$(git config --get-regexp "submodule\.example2\.")" &&
+	test_grep ! "Cleared directory .init" actual &&
+	test_grep "Cleared directory .example2" actual &&
+	rmdir init
+
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'example2' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
+Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+Cleared directory 'example2'
+ok 102 - submodule deinit deinits a submodule when its work tree is missing or empty
+
+expecting success of 7400.103 'submodule deinit fails when the submodule contains modifications unless forced': 
+	git submodule update --init &&
+	echo X >>init/s &&
+	test_must_fail git submodule deinit init &&
+	test -n "$(git config --get-regexp "submodule\.example\.")" &&
+	test -f example2/.git &&
+	git submodule deinit -f init >actual &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test_grep "Cleared directory .init" actual &&
+	rmdir init
+
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'example2' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
+Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+error: the following file has local modifications:
+    init
+(use --cached to keep the file, or -f to force removal)
+fatal: Submodule work tree 'init' contains local modifications; use '-f' to discard them
+Cleared directory 'init'
+ok 103 - submodule deinit fails when the submodule contains modifications unless forced
+
+expecting success of 7400.104 'submodule deinit fails when the submodule contains untracked files unless forced': 
+	git submodule update --init &&
+	echo X >>init/untracked &&
+	test_must_fail git submodule deinit init &&
+	test -n "$(git config --get-regexp "submodule\.example\.")" &&
+	test -f example2/.git &&
+	git submodule deinit -f init >actual &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test_grep "Cleared directory .init" actual &&
+	rmdir init
+
+Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+error: the following file has local modifications:
+    init
+(use --cached to keep the file, or -f to force removal)
+fatal: Submodule work tree 'init' contains local modifications; use '-f' to discard them
+Cleared directory 'init'
+ok 104 - submodule deinit fails when the submodule contains untracked files unless forced
+
+expecting success of 7400.105 'submodule deinit fails when the submodule HEAD does not match unless forced': 
+	git submodule update --init &&
+	(
+		cd init &&
+		git checkout HEAD^
+	) &&
+	test_must_fail git submodule deinit init &&
+	test -n "$(git config --get-regexp "submodule\.example\.")" &&
+	test -f example2/.git &&
+	git submodule deinit -f init >actual &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test_grep "Cleared directory .init" actual &&
+	rmdir init
+
+Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  da28091 change subproject
+
+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> da28091
+
+HEAD is now at 36aca32 submodule commit 1
+error: the following file has local modifications:
+    init
+(use --cached to keep the file, or -f to force removal)
+fatal: Submodule work tree 'init' contains local modifications; use '-f' to discard them
+Cleared directory 'init'
+ok 105 - submodule deinit fails when the submodule HEAD does not match unless forced
+
+expecting success of 7400.106 'submodule deinit is silent when used on an uninitialized submodule': 
+	git submodule update --init &&
+	git submodule deinit init >actual &&
+	test_grep "Submodule .example. (.*) unregistered for path .init" actual &&
+	test_grep "Cleared directory .init" actual &&
+	git submodule deinit init >actual &&
+	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
+	test_grep "Cleared directory .init" actual &&
+	git submodule deinit . >actual &&
+	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
+	test_grep "Submodule .example2. (.*) unregistered for path .example2" actual &&
+	test_grep "Cleared directory .init" actual &&
+	git submodule deinit . >actual &&
+	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
+	test_grep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
+	test_grep "Cleared directory .init" actual &&
+	git submodule deinit --all >actual &&
+	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
+	test_grep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
+	test_grep "Cleared directory .init" actual &&
+	rmdir init example2
+
+Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/./.subrepo
+ * branch            da28091fa1960864823ed381ef2a1c41222b8351 -> FETCH_HEAD
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) unregistered for path 'init'
+Cleared directory 'init'
+warning: Could not unset core.worktree setting in submodule 'init'
+Cleared directory 'init'
+warning: Could not unset core.worktree setting in submodule 'init'
+Submodule 'example2' (./init2) unregistered for path 'example2'
+Cleared directory 'init'
+warning: Could not unset core.worktree setting in submodule 'example2'
+warning: Could not unset core.worktree setting in submodule 'init'
+Cleared directory 'init'
+warning: Could not unset core.worktree setting in submodule 'example2'
+warning: Could not unset core.worktree setting in submodule 'init'
+Cleared directory 'init'
+ok 106 - submodule deinit is silent when used on an uninitialized submodule
+
+expecting success of 7400.107 'submodule deinit absorbs .git directory if .git is a directory': 
+	git submodule update --init &&
+	(
+		cd init &&
+		rm .git &&
+		mv ../.git/modules/example .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree
+	) &&
+	git submodule deinit init &&
+	test_path_is_missing init/.git &&
+	test -z "$(git config --get-regexp "submodule\.example\.")"
+
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'example2' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
+Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+warning: Submodule work tree 'init' contains a .git directory. This will be replaced with a .git file by using absorbgitdirs.
+Migrating git directory of 'init' from
+'/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init/.git' to
+'/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/.git/modules/example'
+Cleared directory 'init'
+Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) unregistered for path 'init'
+ok 107 - submodule deinit absorbs .git directory if .git is a directory
+
+expecting success of 7400.108 'submodule with UTF-8 name': 
+	svname=$(printf "\303\245 \303\244\303\266") &&
+	mkdir "$svname" &&
+	(
+		cd "$svname" &&
+		git init &&
+		>sub &&
+		git add sub &&
+		git commit -m "init sub"
+	) &&
+	git submodule add ./"$svname" &&
+	git submodule >&2 &&
+	test -n "$(git submodule | grep "$svname")"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/å äö/.git/
+[main (root-commit) ea6909a] init sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 sub
+Adding existing repo at 'å äö' to the index
+ cf4817bea522d7a895a8f804894e1254c741baae example2 (rev-1-2-gcf4817b)
+-da28091fa1960864823ed381ef2a1c41222b8351 init
+ ea6909a6ccbadc034edc8c42d9d2b85a69afe610 å äö (heads/main)
+ok 108 - submodule with UTF-8 name
+
+expecting success of 7400.109 'submodule add clone shallow submodule': 
+	mkdir super &&
+	pwd=$(pwd) &&
+	(
+		cd super &&
+		git init &&
+		git submodule add --depth=1 file://"$pwd"/example2 submodule &&
+		(
+			cd submodule &&
+			test 1 = $(git log --oneline | wc -l)
+		)
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/super/.git/
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/super/submodule'...
+ok 109 - submodule add clone shallow submodule
+
+expecting success of 7400.110 'setup superproject with submodules': 
+	git init sub1 &&
+	test_commit -C sub1 test &&
+	test_commit -C sub1 test2 &&
+	git init multisuper &&
+	git -C multisuper submodule add ../sub1 sub0 &&
+	git -C multisuper submodule add ../sub1 sub1 &&
+	git -C multisuper submodule add ../sub1 sub2 &&
+	git -C multisuper submodule add ../sub1 sub3 &&
+	git -C multisuper commit -m "add some submodules"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1/.git/
+[main (root-commit) f9e7a82] test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.t
+[main 71cddcb] test2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test2.t
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/.git/
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/sub0'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/sub2'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/sub3'...
+done.
+[main (root-commit) a188ac0] add some submodules
+ Author: A U Thor <author@example.com>
+ 5 files changed, 16 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub0
+ create mode 160000 sub1
+ create mode 160000 sub2
+ create mode 160000 sub3
+ok 110 - setup superproject with submodules
+
+expecting success of 7400.111 'submodule update --init with a specification': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	pwd=$(pwd) &&
+	git clone file://"$pwd"/multisuper multisuper_clone &&
+	git -C multisuper_clone submodule update --init . ":(exclude)sub0" &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
+	test_cmp expect actual
+
+Cloning into 'multisuper_clone'...
+Submodule 'sub1' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
+Submodule 'sub2' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
+Submodule 'sub3' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
+Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 111 - submodule update --init with a specification
+
+expecting success of 7400.112 'submodule update --init with submodule.active set': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	pwd=$(pwd) &&
+	git clone file://"$pwd"/multisuper multisuper_clone &&
+	git -C multisuper_clone config submodule.active "." &&
+	git -C multisuper_clone config --add submodule.active ":(exclude)sub0" &&
+	git -C multisuper_clone submodule update --init &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
+	test_cmp expect actual
+
+Cloning into 'multisuper_clone'...
+Submodule 'sub1' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
+Submodule 'sub2' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
+Submodule 'sub3' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
+Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 112 - submodule update --init with submodule.active set
+
+expecting success of 7400.113 'submodule update and setting submodule.<name>.active': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	pwd=$(pwd) &&
+	git clone file://"$pwd"/multisuper multisuper_clone &&
+	git -C multisuper_clone config --bool submodule.sub0.active "true" &&
+	git -C multisuper_clone config --bool submodule.sub1.active "false" &&
+	git -C multisuper_clone config --bool submodule.sub2.active "true" &&
+
+	cat >expect <<-\EOF &&
+	 sub0 (test2)
+	-sub1
+	 sub2 (test2)
+	-sub3
+	EOF
+	git -C multisuper_clone submodule update &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
+	test_cmp expect actual
+
+Cloning into 'multisuper_clone'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub0'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
+Submodule path 'sub0': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 113 - submodule update and setting submodule.<name>.active
+
+expecting success of 7400.114 'clone active submodule without submodule url set': 
+	test_when_finished "rm -rf test/test" &&
+	mkdir test &&
+	# another dir breaks accidental relative paths still being correct
+	git clone file://"$pwd"/multisuper test/test &&
+	(
+		cd test/test &&
+		git config submodule.active "." &&
+
+		# do not pass --init flag, as the submodule is already active:
+		git submodule update &&
+		git submodule status >actual_raw &&
+
+		cut -d" " -f3- actual_raw >actual &&
+		cat >expect <<-\EOF &&
+		sub0 (test2)
+		sub1 (test2)
+		sub2 (test2)
+		sub3 (test2)
+		EOF
+		test_cmp expect actual
+	)
+
+Cloning into 'test/test'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/test/test/sub0'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/test/test/sub1'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/test/test/sub2'...
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/test/test/sub3'...
+Submodule path 'sub0': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 114 - clone active submodule without submodule url set
+
+expecting success of 7400.115 'update submodules without url set in .gitconfig': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	git clone file://"$pwd"/multisuper multisuper_clone &&
+
+	git -C multisuper_clone submodule init &&
+	for s in sub0 sub1 sub2 sub3
+	do
+		key=submodule.$s.url &&
+		git -C multisuper_clone config --local --unset $key &&
+		git -C multisuper_clone config --file .gitmodules --unset $key || return 1
+	done &&
+
+	test_must_fail git -C multisuper_clone submodule update 2>err &&
+	grep "cannot clone submodule .sub[0-3]. without a URL" err
+
+Cloning into 'multisuper_clone'...
+Submodule 'sub0' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub0'
+Submodule 'sub1' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
+Submodule 'sub2' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
+Submodule 'sub3' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
+fatal: cannot clone submodule 'sub0' without a URL
+ok 115 - update submodules without url set in .gitconfig
+
+expecting success of 7400.116 'clone --recurse-submodules with a pathspec works': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	cat >expected <<-\EOF &&
+	 sub0 (test2)
+	-sub1
+	-sub2
+	-sub3
+	EOF
+
+	git clone --recurse-submodules="sub0" multisuper multisuper_clone &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
+	test_cmp expected actual
+
+Cloning into 'multisuper_clone'...
+done.
+Submodule 'sub0' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub0'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub0'...
+done.
+Submodule path 'sub0': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 116 - clone --recurse-submodules with a pathspec works
+
+expecting success of 7400.117 'clone with multiple --recurse-submodules options': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	cat >expect <<-\EOF &&
+	-sub0
+	 sub1 (test2)
+	-sub2
+	 sub3 (test2)
+	EOF
+
+	git clone --recurse-submodules="." \
+		  --recurse-submodules=":(exclude)sub0" \
+		  --recurse-submodules=":(exclude)sub2" \
+		  multisuper multisuper_clone &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
+	test_cmp expect actual
+
+Cloning into 'multisuper_clone'...
+done.
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
+Submodule 'sub3' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
+done.
+Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 117 - clone with multiple --recurse-submodules options
+
+expecting success of 7400.118 'clone and subsequent updates correctly auto-initialize submodules': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	cat <<-\EOF >expect &&
+	-sub0
+	 sub1 (test2)
+	-sub2
+	 sub3 (test2)
+	EOF
+
+	cat <<-\EOF >expect2 &&
+	-sub0
+	 sub1 (test2)
+	-sub2
+	 sub3 (test2)
+	-sub4
+	 sub5 (test2)
+	EOF
+
+	git clone --recurse-submodules="." \
+		  --recurse-submodules=":(exclude)sub0" \
+		  --recurse-submodules=":(exclude)sub2" \
+		  --recurse-submodules=":(exclude)sub4" \
+		  multisuper multisuper_clone &&
+
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
+	test_cmp expect actual &&
+
+	git -C multisuper submodule add ../sub1 sub4 &&
+	git -C multisuper submodule add ../sub1 sub5 &&
+	git -C multisuper commit -m "add more submodules" &&
+	# obtain the new superproject
+	git -C multisuper_clone pull &&
+	git -C multisuper_clone submodule update --init &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
+	test_cmp expect2 actual
+
+Cloning into 'multisuper_clone'...
+done.
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
+Submodule 'sub3' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
+done.
+Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/sub4'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/sub5'...
+done.
+[main 084f781] add more submodules
+ Author: A U Thor <author@example.com>
+ 3 files changed, 8 insertions(+)
+ create mode 160000 sub4
+ create mode 160000 sub5
+From /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper
+   a188ac0..084f781  main       -> origin/main
+Could not access submodule 'sub5' at commit 084f781
+Updating a188ac0..084f781
+Fast-forward
+ .gitmodules | 6 ++++++
+ sub4        | 1 +
+ sub5        | 1 +
+ 3 files changed, 8 insertions(+)
+ create mode 160000 sub4
+ create mode 160000 sub5
+Submodule 'sub5' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub5'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub5'...
+done.
+Submodule path 'sub5': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 118 - clone and subsequent updates correctly auto-initialize submodules
+
+expecting success of 7400.119 'init properly sets the config': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	git clone --recurse-submodules="." \
+		  --recurse-submodules=":(exclude)sub0" \
+		  multisuper multisuper_clone &&
+
+	git -C multisuper_clone submodule init -- sub0 sub1 &&
+	git -C multisuper_clone config --get submodule.sub0.active &&
+	test_must_fail git -C multisuper_clone config --get submodule.sub1.active
+
+Cloning into 'multisuper_clone'...
+done.
+Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
+Submodule 'sub2' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
+Submodule 'sub3' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
+Submodule 'sub4' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub4'
+Submodule 'sub5' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub5'
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub4'...
+done.
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub5'...
+done.
+Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub4': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub5': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule 'sub0' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub0'
+true
+ok 119 - init properly sets the config
+
+expecting success of 7400.120 'recursive clone respects -q': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	git clone -q --recurse-submodules multisuper multisuper_clone >actual &&
+	test_must_be_empty actual
+
+ok 120 - recursive clone respects -q
+
+expecting success of 7400.121 '`submodule init` and `init.templateDir`': 
+	mkdir -p tmpl/hooks &&
+	write_script tmpl/hooks/post-checkout <<-EOF &&
+	echo HOOK-RUN >&2
+	echo I was here >hook.run
+	exit 1
+	EOF
+
+	test_config init.templateDir "$(pwd)/tmpl" &&
+	test_when_finished \
+		"git config --global --unset init.templateDir || true" &&
+	(
+		sane_unset GIT_TEMPLATE_DIR &&
+		NO_SET_GIT_TEMPLATE_DIR=t &&
+		export NO_SET_GIT_TEMPLATE_DIR &&
+
+		git config --global init.templateDir "$(pwd)/tmpl" &&
+		test_must_fail git submodule \
+			add "$submodurl" sub-global 2>err &&
+		git config --global --unset init.templateDir &&
+		test_grep HOOK-RUN err &&
+		test_path_is_file sub-global/hook.run &&
+
+		git config init.templateDir "$(pwd)/tmpl" &&
+		git submodule add "$submodurl" sub-local 2>err &&
+		git config --unset init.templateDir &&
+		test_grep ! HOOK-RUN err &&
+		test_path_is_missing sub-local/hook.run
+	)
+
+HOOK-RUN
+ok 121 - `submodule init` and `init.templateDir`
+
+expecting success of 7400.122 'submodule add fails when name is reused': 
+	git init test-submodule &&
+	(
+		cd test-submodule &&
+		git commit --allow-empty -m init &&
+
+		git init ../child-origin &&
+		git -C ../child-origin commit --allow-empty -m init &&
+
+		git submodule add ../child-origin child &&
+		git commit -m "Add submodule child" &&
+
+		git mv child child_old &&
+		git commit -m "Move child to child_old" &&
+
+		# Now adding a *new* repo at the old name must fail
+		git init ../child2-origin &&
+		git -C ../child2-origin commit --allow-empty -m init &&
+		test_must_fail git submodule add ../child2-origin child 2>err &&
+		test_grep "already used for" err
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/test-submodule/.git/
+[main (root-commit) edb5fba] init
+ Author: A U Thor <author@example.com>
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/child-origin/.git/
+[main (root-commit) edb5fba] init
+ Author: A U Thor <author@example.com>
+Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/test-submodule/child'...
+done.
+[main f5885bd] Add submodule child
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 child
+[main 3136be9] Move child to child_old
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename child => child_old (100%)
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/child2-origin/.git/
+[main (root-commit) edb5fba] init
+ Author: A U Thor <author@example.com>
+fatal: submodule name 'child' already used for path 'child_old'
+ok 122 - submodule add fails when name is reused
+
+# passed all 122 test(s)
+1..122
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7812-grep-icase-non-ascii.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7815-grep-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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': 
+	write_script nul_to_q_textconv <<-\EOF &&
+	tr "\000" "Q" <"$1"
+	EOF
+	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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7519-status-fsmonitor.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor/.git/
+expecting success of 7519.1 'incompatible bare repo': 
+	test_when_finished "rm -rf ./bare-clone actual expect" &&
+	git init --bare bare-clone &&
+
+	test_must_fail \
+		git -C ./bare-clone -c core.fsmonitor=foo \
+			update-index --fsmonitor 2>actual &&
+	grep "bare repository .* is incompatible with fsmonitor" actual &&
+
+	test_must_fail \
+		git -C ./bare-clone -c core.fsmonitor=true \
+			update-index --fsmonitor 2>actual &&
+	grep "bare repository .* is incompatible with fsmonitor" actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor/bare-clone/
+fatal: bare repository '/build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor/bare-clone' is incompatible with fsmonitor
+fatal: bare repository '/build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor/bare-clone' is incompatible with fsmonitor
+ok 1 - incompatible bare repo
+
+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 2 # skip run fsmonitor-daemon in bare repo (missing FSMONITOR_DAEMON)
+
+ok 3 # skip run fsmonitor-daemon in virtual repo (missing FSMONITOR_DAEMON,MINGW of MINGW,FSMONITOR_DAEMON)
+
+expecting success of 7519.4 'setup': 
+	: >tracked &&
+	: >modified &&
+	mkdir dir1 &&
+	: >dir1/tracked &&
+	: >dir1/modified &&
+	mkdir dir2 &&
+	: >dir2/tracked &&
+	: >dir2/modified &&
+	git -c core.fsmonitor= add . &&
+	git -c core.fsmonitor= commit -m initial &&
+	git config core.fsmonitor .git/hooks/fsmonitor-test &&
+	cat >.gitignore <<-\EOF
+	.gitignore
+	expect*
+	actual*
+	marker*
+	trace2*
+	EOF
+
+[master (root-commit) 1851a93] initial
+ Author: A U Thor <author@example.com>
+ 6 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir1/modified
+ create mode 100644 dir1/tracked
+ create mode 100644 dir2/modified
+ create mode 100644 dir2/tracked
+ create mode 100644 modified
+ create mode 100644 tracked
+ok 4 - setup
+
+expecting success of 7519.5 'fsmonitor extension is off by default': 
+	test-tool dump-fsmonitor >actual &&
+	grep "^no fsmonitor" actual
+
+no fsmonitor
+ok 5 - fsmonitor extension is off by default
+
+expecting success of 7519.6 'update-index --fsmonitor" adds the fsmonitor extension': 
+	git update-index --fsmonitor &&
+	test-tool dump-fsmonitor >actual &&
+	grep "^fsmonitor last update" actual
+
+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 1790693618730183560
+ok 6 - update-index --fsmonitor" adds the fsmonitor extension
+
+expecting success of 7519.7 'update-index --no-fsmonitor" removes the fsmonitor extension': 
+	git update-index --no-fsmonitor &&
+	test-tool dump-fsmonitor >actual &&
+	grep "^no fsmonitor" actual
+
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+warning: core.fsmonitor is set; remove it if you really want to disable fsmonitor
+no fsmonitor
+ok 7 - update-index --no-fsmonitor" removes the fsmonitor extension
+
+expecting success of 7519.8 'update-index --fsmonitor-valid" sets the fsmonitor valid bit': 
+	test_hook fsmonitor-test<<-\EOF &&
+		printf "last_update_token\0"
+	EOF
+	git update-index --fsmonitor &&
+	git update-index --fsmonitor-valid dir1/modified &&
+	git update-index --fsmonitor-valid dir2/modified &&
+	git update-index --fsmonitor-valid modified &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+ok 8 - update-index --fsmonitor-valid" sets the fsmonitor valid bit
+
+expecting success of 7519.9 'update-index --no-fsmonitor-valid" clears the fsmonitor valid bit': 
+	git update-index --no-fsmonitor-valid dir1/modified &&
+	git update-index --no-fsmonitor-valid dir2/modified &&
+	git update-index --no-fsmonitor-valid modified &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+ok 9 - update-index --no-fsmonitor-valid" clears the fsmonitor valid bit
+
+expecting success of 7519.10 'all files returned by integration script get flagged as invalid': 
+	write_integration_script &&
+	dirty_repo &&
+	git update-index --fsmonitor &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+ok 10 - all files returned by integration script get flagged as invalid
+
+expecting success of 7519.11 'newly added files are marked valid': 
+	test_hook --setup --clobber fsmonitor-test<<-\EOF &&
+		printf "last_update_token\0"
+	EOF
+	git add new &&
+	git add dir1/new &&
+	git add dir2/new &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+ok 11 - newly added files are marked valid
+
+expecting success of 7519.12 'all unmodified files get marked valid': 
+	# modified files result in update-index returning 1
+	test_must_fail git update-index --refresh --force-write-index &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+dir1/modified: needs update
+dir2/modified: needs update
+modified: needs update
+ok 12 - all unmodified files get marked valid
+
+expecting success of 7519.13 '*only* files returned by the integration script get flagged as invalid': 
+	test_hook --clobber fsmonitor-test<<-\EOF &&
+	printf "last_update_token\0"
+	printf "dir1/modified\0"
+	EOF
+	clean_repo &&
+	git update-index --refresh --force-write-index &&
+	echo 1 >modified &&
+	echo 2 >dir1/modified &&
+	echo 3 >dir2/modified &&
+	test_must_fail git update-index --refresh --force-write-index &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+HEAD is now at 1851a93 initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+dir1/modified: needs update
+ok 13 - *only* files returned by the integration script get flagged as invalid
+
+expecting success of 7519.14 'refresh_index() invalidates fsmonitor cache': 
+	clean_repo &&
+	dirty_repo &&
+	write_integration_script &&
+	git add . &&
+	test_hook --clobber fsmonitor-test<<-\EOF &&
+	EOF
+	git commit -m "to reset" &&
+	git reset HEAD~1 &&
+	git status >actual &&
+	git -c core.fsmonitor= status >expect &&
+	test_cmp expect actual
+
+HEAD is now at 1851a93 initial
+warning: Empty last update token.
+[master 6edcb70] to reset
+ Author: A U Thor <author@example.com>
+ 9 files changed, 6 insertions(+)
+ create mode 100644 dir1/new
+ create mode 100644 dir1/untracked
+ create mode 100644 dir2/new
+ create mode 100644 dir2/untracked
+ create mode 100644 new
+ create mode 100644 untracked
+warning: Empty last update token.
+Unstaged changes after reset:
+M	dir1/modified
+M	dir2/modified
+M	modified
+warning: Empty last update token.
+ok 14 - refresh_index() invalidates fsmonitor cache
+
+expecting success of 7519.15 'setup preloadIndex to false': 
+		git config core.preloadIndex $preload_val &&
+		if test $preload_val = true
+		then
+			GIT_TEST_PRELOAD_INDEX=$preload_val && export GIT_TEST_PRELOAD_INDEX
+		else
+			sane_unset GIT_TEST_PRELOAD_INDEX
+		fi
+	
+ok 15 - setup preloadIndex to false
+
+checking prerequisite: UNTRACKED_CACHE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
+	{ git update-index --test-untracked-cache; ret=$?; } &&
+	test $ret -ne 1
+
+)
+warning: Empty last update token.
+Testing mtime in '/build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor' ...... OK
+prerequisite UNTRACKED_CACHE ok
+expecting success of 7519.16 'setup untracked cache to false': 
+			git config core.untrackedcache $uc_val
+		
+ok 16 - setup untracked cache to false
+
+expecting success of 7519.17 'compare status with and without fsmonitor': 
+			write_integration_script &&
+			clean_repo &&
+			dirty_repo &&
+			git add new &&
+			git add dir1/new &&
+			git add dir2/new &&
+			git status >actual &&
+			git -c core.fsmonitor= status >expect &&
+			test_cmp expect actual
+		
+HEAD is now at 1851a93 initial
+Removing dir1/new
+Removing dir1/untracked
+Removing dir2/new
+Removing dir2/untracked
+Removing new
+Removing untracked
+ok 17 - compare status with and without fsmonitor
+
+expecting success of 7519.18 'status doesn't detect unreported modifications': 
+			test_hook --clobber fsmonitor-test<<-\EOF &&
+			printf "last_update_token\0"
+			:>marker
+			EOF
+			clean_repo &&
+			git status &&
+			test_path_is_file marker &&
+			dirty_repo &&
+			rm -f marker &&
+			git status >actual &&
+			test_path_is_file marker &&
+			test_grep ! "Changes not staged for commit:" actual &&
+			if test $uc_val = true
+			then
+				test_grep ! "Untracked files:" actual
+			fi &&
+			if test $uc_val = false
+			then
+				test_grep "Untracked files:" actual
+			fi &&
+			rm -f marker
+		
+HEAD is now at 1851a93 initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+On branch master
+nothing to commit, working tree clean
+Untracked files:
+ok 18 - status doesn't detect unreported modifications
+
+expecting success of 7519.19 'setup untracked cache to true': 
+			git config core.untrackedcache $uc_val
+		
+ok 19 - setup untracked cache to true
 
-Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-Cleared directory '../init'
-Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) unregistered for path '../init'
-ok 99 - submodule deinit from subdirectory
+expecting success of 7519.20 'compare status with and without fsmonitor': 
+			write_integration_script &&
+			clean_repo &&
+			dirty_repo &&
+			git add new &&
+			git add dir1/new &&
+			git add dir2/new &&
+			git status >actual &&
+			git -c core.fsmonitor= status >expect &&
+			test_cmp expect actual
+		
+HEAD is now at 1851a93 initial
+Removing dir1/new
+Removing dir1/untracked
+Removing dir2/new
+Removing dir2/untracked
+Removing new
+Removing untracked
+ok 20 - compare status with and without fsmonitor
 
-expecting success of 7400.100 'submodule deinit . deinits all initialized submodules': 
-	git submodule update --init &&
-	git config submodule.example.foo bar &&
-	git config submodule.example2.frotz nitfol &&
-	test_must_fail git submodule deinit &&
-	git submodule deinit . >actual &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test -z "$(git config --get-regexp "submodule\.example2\.")" &&
-	test_grep "Cleared directory .init" actual &&
-	test_grep "Cleared directory .example2" actual &&
-	rmdir init example2
+expecting success of 7519.21 'status doesn't detect unreported modifications': 
+			test_hook --clobber fsmonitor-test<<-\EOF &&
+			printf "last_update_token\0"
+			:>marker
+			EOF
+			clean_repo &&
+			git status &&
+			test_path_is_file marker &&
+			dirty_repo &&
+			rm -f marker &&
+			git status >actual &&
+			test_path_is_file marker &&
+			test_grep ! "Changes not staged for commit:" actual &&
+			if test $uc_val = true
+			then
+				test_grep ! "Untracked files:" actual
+			fi &&
+			if test $uc_val = false
+			then
+				test_grep "Untracked files:" actual
+			fi &&
+			rm -f marker
+		
+HEAD is now at 1851a93 initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+On branch master
+nothing to commit, working tree clean
+ok 21 - status doesn't detect unreported modifications
 
-Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-fatal: Use '--all' if you really want to deinitialize all submodules
-Cleared directory 'init'
-Cleared directory 'example2'
-ok 100 - submodule deinit . deinits all initialized submodules
+expecting success of 7519.22 'setup preloadIndex to true': 
+		git config core.preloadIndex $preload_val &&
+		if test $preload_val = true
+		then
+			GIT_TEST_PRELOAD_INDEX=$preload_val && export GIT_TEST_PRELOAD_INDEX
+		else
+			sane_unset GIT_TEST_PRELOAD_INDEX
+		fi
+	
+ok 22 - setup preloadIndex to true
 
-expecting success of 7400.101 'submodule deinit --all deinits all initialized submodules': 
-	git submodule update --init &&
-	git config submodule.example.foo bar &&
-	git config submodule.example2.frotz nitfol &&
-	test_must_fail git submodule deinit &&
-	git submodule deinit --all >actual &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test -z "$(git config --get-regexp "submodule\.example2\.")" &&
-	test_grep "Cleared directory .init" actual &&
-	test_grep "Cleared directory .example2" actual &&
-	rmdir init example2
+expecting success of 7519.23 'setup untracked cache to false': 
+			git config core.untrackedcache $uc_val
+		
+ok 23 - setup untracked cache to false
 
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'example2' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
-Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-fatal: Use '--all' if you really want to deinitialize all submodules
-Cleared directory 'init'
-Cleared directory 'example2'
-ok 101 - submodule deinit --all deinits all initialized submodules
+expecting success of 7519.24 'compare status with and without fsmonitor': 
+			write_integration_script &&
+			clean_repo &&
+			dirty_repo &&
+			git add new &&
+			git add dir1/new &&
+			git add dir2/new &&
+			git status >actual &&
+			git -c core.fsmonitor= status >expect &&
+			test_cmp expect actual
+		
+HEAD is now at 1851a93 initial
+Removing dir1/new
+Removing dir1/untracked
+Removing dir2/new
+Removing dir2/untracked
+Removing new
+Removing untracked
+ok 24 - compare status with and without fsmonitor
 
-expecting success of 7400.102 'submodule deinit deinits a submodule when its work tree is missing or empty': 
-	git submodule update --init &&
-	rm -rf init example2/* example2/.git &&
-	git submodule deinit init example2 >actual &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test -z "$(git config --get-regexp "submodule\.example2\.")" &&
-	test_grep ! "Cleared directory .init" actual &&
-	test_grep "Cleared directory .example2" actual &&
-	rmdir init
+expecting success of 7519.25 'status doesn't detect unreported modifications': 
+			test_hook --clobber fsmonitor-test<<-\EOF &&
+			printf "last_update_token\0"
+			:>marker
+			EOF
+			clean_repo &&
+			git status &&
+			test_path_is_file marker &&
+			dirty_repo &&
+			rm -f marker &&
+			git status >actual &&
+			test_path_is_file marker &&
+			test_grep ! "Changes not staged for commit:" actual &&
+			if test $uc_val = true
+			then
+				test_grep ! "Untracked files:" actual
+			fi &&
+			if test $uc_val = false
+			then
+				test_grep "Untracked files:" actual
+			fi &&
+			rm -f marker
+		
+HEAD is now at 1851a93 initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+On branch master
+nothing to commit, working tree clean
+Untracked files:
+ok 25 - status doesn't detect unreported modifications
 
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'example2' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
-Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-Cleared directory 'example2'
-ok 102 - submodule deinit deinits a submodule when its work tree is missing or empty
+expecting success of 7519.26 'setup untracked cache to true': 
+			git config core.untrackedcache $uc_val
+		
+ok 26 - setup untracked cache to true
 
-expecting success of 7400.103 'submodule deinit fails when the submodule contains modifications unless forced': 
-	git submodule update --init &&
-	echo X >>init/s &&
-	test_must_fail git submodule deinit init &&
-	test -n "$(git config --get-regexp "submodule\.example\.")" &&
-	test -f example2/.git &&
-	git submodule deinit -f init >actual &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test_grep "Cleared directory .init" actual &&
-	rmdir init
+expecting success of 7519.27 'compare status with and without fsmonitor': 
+			write_integration_script &&
+			clean_repo &&
+			dirty_repo &&
+			git add new &&
+			git add dir1/new &&
+			git add dir2/new &&
+			git status >actual &&
+			git -c core.fsmonitor= status >expect &&
+			test_cmp expect actual
+		
+HEAD is now at 1851a93 initial
+Removing dir1/new
+Removing dir1/untracked
+Removing dir2/new
+Removing dir2/untracked
+Removing new
+Removing untracked
+ok 27 - compare status with and without fsmonitor
 
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'example2' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
-Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-error: the following file has local modifications:
-    init
-(use --cached to keep the file, or -f to force removal)
-fatal: Submodule work tree 'init' contains local modifications; use '-f' to discard them
-Cleared directory 'init'
-ok 103 - submodule deinit fails when the submodule contains modifications unless forced
+expecting success of 7519.28 'status doesn't detect unreported modifications': 
+			test_hook --clobber fsmonitor-test<<-\EOF &&
+			printf "last_update_token\0"
+			:>marker
+			EOF
+			clean_repo &&
+			git status &&
+			test_path_is_file marker &&
+			dirty_repo &&
+			rm -f marker &&
+			git status >actual &&
+			test_path_is_file marker &&
+			test_grep ! "Changes not staged for commit:" actual &&
+			if test $uc_val = true
+			then
+				test_grep ! "Untracked files:" actual
+			fi &&
+			if test $uc_val = false
+			then
+				test_grep "Untracked files:" actual
+			fi &&
+			rm -f marker
+		
+HEAD is now at 1851a93 initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+On branch master
+nothing to commit, working tree clean
+ok 28 - status doesn't detect unreported modifications
 
-expecting success of 7400.104 'submodule deinit fails when the submodule contains untracked files unless forced': 
-	git submodule update --init &&
-	echo X >>init/untracked &&
-	test_must_fail git submodule deinit init &&
-	test -n "$(git config --get-regexp "submodule\.example\.")" &&
-	test -f example2/.git &&
-	git submodule deinit -f init >actual &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test_grep "Cleared directory .init" actual &&
-	rmdir init
+expecting success of 7519.29 'splitting the index results in the same state': 
+	write_integration_script &&
+	dirty_repo &&
+	git update-index --fsmonitor  &&
+	git ls-files -f >expect &&
+	test-tool dump-fsmonitor >&2 && echo &&
+	git update-index --fsmonitor --split-index &&
+	test-tool dump-fsmonitor >&2 && echo &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
 
-Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-error: the following file has local modifications:
-    init
-(use --cached to keep the file, or -f to force removal)
-fatal: Submodule work tree 'init' contains local modifications; use '-f' to discard them
-Cleared directory 'init'
-ok 104 - submodule deinit fails when the submodule contains untracked files unless forced
+fsmonitor last update last_update_token
+------
+fsmonitor last update last_update_token
+---
+ok 29 - splitting the index results in the same state
 
-expecting success of 7400.105 'submodule deinit fails when the submodule HEAD does not match unless forced': 
-	git submodule update --init &&
+expecting success of 7519.30 'ignore .git changes when invalidating UNTR': 
+	test_create_repo dot-git &&
 	(
-		cd init &&
-		git checkout HEAD^
+		cd dot-git &&
+		: >tracked &&
+		test-tool chmtime =-60 tracked &&
+		: >modified &&
+		test-tool chmtime =-60 modified &&
+		mkdir dir1 &&
+		: >dir1/tracked &&
+		test-tool chmtime =-60 dir1/tracked &&
+		: >dir1/modified &&
+		test-tool chmtime =-60 dir1/modified &&
+		mkdir dir2 &&
+		: >dir2/tracked &&
+		test-tool chmtime =-60 dir2/tracked &&
+		: >dir2/modified &&
+		test-tool chmtime =-60 dir2/modified &&
+		write_integration_script &&
+		git config core.fsmonitor .git/hooks/fsmonitor-test &&
+		git update-index --untracked-cache &&
+		git update-index --fsmonitor &&
+		git status &&
+		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace-before" \
+		git status &&
+		test-tool dump-untracked-cache >../before
 	) &&
-	test_must_fail git submodule deinit init &&
-	test -n "$(git config --get-regexp "submodule\.example\.")" &&
-	test -f example2/.git &&
-	git submodule deinit -f init >actual &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test_grep "Cleared directory .init" actual &&
-	rmdir init
+	cat >>dot-git/.git/hooks/fsmonitor-test <<-\EOF &&
+	printf ".git\0"
+	printf ".git/index\0"
+	printf "dir1/.git\0"
+	printf "dir1/.git/index\0"
+	EOF
+	(
+		cd dot-git &&
+		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace-after" \
+		git status &&
+		test-tool dump-untracked-cache >../after
+	) &&
+	grep "directory-invalidation" trace-before | cut -d"|" -f 9 >>before &&
+	grep "directory-invalidation" trace-after  | cut -d"|" -f 9 >>after &&
+	# UNTR extension unchanged, dir invalidation count unchanged
+	test_cmp before after
 
-Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor/dot-git/.git/
+On branch master
 
-  da28091 change subproject
+No commits yet
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/
+	dir2/
+	modified
+	tracked
 
- git branch <new-branch-name> da28091
+nothing added to commit but untracked files present (use "git add" to track)
+On branch master
 
-HEAD is now at 36aca32 submodule commit 1
-error: the following file has local modifications:
-    init
-(use --cached to keep the file, or -f to force removal)
-fatal: Submodule work tree 'init' contains local modifications; use '-f' to discard them
-Cleared directory 'init'
-ok 105 - submodule deinit fails when the submodule HEAD does not match unless forced
+No commits yet
 
-expecting success of 7400.106 'submodule deinit is silent when used on an uninitialized submodule': 
-	git submodule update --init &&
-	git submodule deinit init >actual &&
-	test_grep "Submodule .example. (.*) unregistered for path .init" actual &&
-	test_grep "Cleared directory .init" actual &&
-	git submodule deinit init >actual &&
-	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
-	test_grep "Cleared directory .init" actual &&
-	git submodule deinit . >actual &&
-	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
-	test_grep "Submodule .example2. (.*) unregistered for path .example2" actual &&
-	test_grep "Cleared directory .init" actual &&
-	git submodule deinit . >actual &&
-	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
-	test_grep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
-	test_grep "Cleared directory .init" actual &&
-	git submodule deinit --all >actual &&
-	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
-	test_grep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
-	test_grep "Cleared directory .init" actual &&
-	rmdir init example2
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/
+	dir2/
+	modified
+	tracked
 
-Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/./.subrepo
- * branch            da28091fa1960864823ed381ef2a1c41222b8351 -> FETCH_HEAD
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) unregistered for path 'init'
-Cleared directory 'init'
-warning: Could not unset core.worktree setting in submodule 'init'
-Cleared directory 'init'
-warning: Could not unset core.worktree setting in submodule 'init'
-Submodule 'example2' (./init2) unregistered for path 'example2'
-Cleared directory 'init'
-warning: Could not unset core.worktree setting in submodule 'example2'
-warning: Could not unset core.worktree setting in submodule 'init'
-Cleared directory 'init'
-warning: Could not unset core.worktree setting in submodule 'example2'
-warning: Could not unset core.worktree setting in submodule 'init'
-Cleared directory 'init'
-ok 106 - submodule deinit is silent when used on an uninitialized submodule
+nothing added to commit but untracked files present (use "git add" to track)
+On branch master
 
-expecting success of 7400.107 'submodule deinit absorbs .git directory if .git is a directory': 
-	git submodule update --init &&
-	(
-		cd init &&
-		rm .git &&
-		mv ../.git/modules/example .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree
-	) &&
-	git submodule deinit init &&
-	test_path_is_missing init/.git &&
-	test -z "$(git config --get-regexp "submodule\.example\.")"
+No commits yet
 
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'example2' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
-Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-warning: Submodule work tree 'init' contains a .git directory. This will be replaced with a .git file by using absorbgitdirs.
-Migrating git directory of 'init' from
-'/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init/.git' to
-'/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/.git/modules/example'
-Cleared directory 'init'
-Submodule 'example' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/init2) unregistered for path 'init'
-ok 107 - submodule deinit absorbs .git directory if .git is a directory
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/
+	dir2/
+	modified
+	tracked
 
-expecting success of 7400.108 'submodule with UTF-8 name': 
-	svname=$(printf "\303\245 \303\244\303\266") &&
-	mkdir "$svname" &&
-	(
-		cd "$svname" &&
-		git init &&
-		>sub &&
-		git add sub &&
-		git commit -m "init sub"
-	) &&
-	git submodule add ./"$svname" &&
-	git submodule >&2 &&
-	test -n "$(git submodule | grep "$svname")"
+nothing added to commit but untracked files present (use "git add" to track)
+ok 30 - ignore .git changes when invalidating UNTR
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/å äö/.git/
-[main (root-commit) ea6909a] init sub
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 sub
-Adding existing repo at 'å äö' to the index
- cf4817bea522d7a895a8f804894e1254c741baae example2 (rev-1-2-gcf4817b)
--da28091fa1960864823ed381ef2a1c41222b8351 init
- ea6909a6ccbadc034edc8c42d9d2b85a69afe610 å äö (heads/main)
-ok 108 - submodule with UTF-8 name
+expecting success of 7519.31 'discard_index() also discards fsmonitor info': 
+	test_config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-all" &&
+	test_might_fail git update-index --refresh &&
+	test-tool read-cache --print-and-refresh=tracked 2 >actual &&
+	printf "tracked is%s up to date\n" "" " not" >expect &&
+	test_cmp expect actual
 
-expecting success of 7400.109 'submodule add clone shallow submodule': 
-	mkdir super &&
-	pwd=$(pwd) &&
+dir1/modified: needs update
+dir2/modified: needs update
+modified: needs update
+ok 31 - discard_index() also discards fsmonitor info
+
+expecting success of 7519.32 'status succeeds after staging/unstaging': 
+	test_create_repo fsmonitor-stage-unstage &&
 	(
-		cd super &&
-		git init &&
-		git submodule add --depth=1 file://"$pwd"/example2 submodule &&
-		(
-			cd submodule &&
-			test 1 = $(git log --oneline | wc -l)
-		)
+		cd fsmonitor-stage-unstage &&
+		test_commit initial &&
+		git update-index --fsmonitor &&
+		removed=$(test_seq 1 100 | sed "s/^/z/") &&
+		touch $removed &&
+		git add $removed &&
+		git config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-env" &&
+		FSMONITOR_LIST="$removed" git restore -S $removed &&
+		FSMONITOR_LIST="$removed" git status
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/super/.git/
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/super/submodule'...
-ok 109 - submodule add clone shallow submodule
-
-expecting success of 7400.110 'setup superproject with submodules': 
-	git init sub1 &&
-	test_commit -C sub1 test &&
-	test_commit -C sub1 test2 &&
-	git init multisuper &&
-	git -C multisuper submodule add ../sub1 sub0 &&
-	git -C multisuper submodule add ../sub1 sub1 &&
-	git -C multisuper submodule add ../sub1 sub2 &&
-	git -C multisuper submodule add ../sub1 sub3 &&
-	git -C multisuper commit -m "add some submodules"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1/.git/
-[main (root-commit) f9e7a82] test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.t
-[main 71cddcb] test2
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7519-status-fsmonitor/fsmonitor-stage-unstage/.git/
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 test2.t
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/.git/
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/sub0'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/sub2'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/sub3'...
-done.
-[main (root-commit) a188ac0] add some submodules
- Author: A U Thor <author@example.com>
- 5 files changed, 16 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub0
- create mode 160000 sub1
- create mode 160000 sub2
- create mode 160000 sub3
-ok 110 - setup superproject with submodules
-
-expecting success of 7400.111 'submodule update --init with a specification': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	pwd=$(pwd) &&
-	git clone file://"$pwd"/multisuper multisuper_clone &&
-	git -C multisuper_clone submodule update --init . ":(exclude)sub0" &&
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
-	test_cmp expect actual
-
-Cloning into 'multisuper_clone'...
-Submodule 'sub1' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
-Submodule 'sub2' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
-Submodule 'sub3' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
-Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 111 - submodule update --init with a specification
+ create mode 100644 initial.t
+warning: core.fsmonitor is unset; set it if you really want to enable fsmonitor
+Unsupported core.fsmonitor hook version.
+Unsupported core.fsmonitor hook version.
+On branch master
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	z1
+	z10
+	z100
+	z11
+	z12
+	z13
+	z14
+	z15
+	z16
+	z17
+	z18
+	z19
+	z2
+	z20
+	z21
+	z22
+	z23
+	z24
+	z25
+	z26
+	z27
+	z28
+	z29
+	z3
+	z30
+	z31
+	z32
+	z33
+	z34
+	z35
+	z36
+	z37
+	z38
+	z39
+	z4
+	z40
+	z41
+	z42
+	z43
+	z44
+	z45
+	z46
+	z47
+	z48
+	z49
+	z5
+	z50
+	z51
+	z52
+	z53
+	z54
+	z55
+	z56
+	z57
+	z58
+	z59
+	z6
+	z60
+	z61
+	z62
+	z63
+	z64
+	z65
+	z66
+	z67
+	z68
+	z69
+	z7
+	z70
+	z71
+	z72
+	z73
+	z74
+	z75
+	z76
+	z77
+	z78
+	z79
+	z8
+	z80
+	z81
+	z82
+	z83
+	z84
+	z85
+	z86
+	z87
+	z88
+	z89
+	z9
+	z90
+	z91
+	z92
+	z93
+	z94
+	z95
+	z96
+	z97
+	z98
+	z99
 
-expecting success of 7400.112 'submodule update --init with submodule.active set': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	pwd=$(pwd) &&
-	git clone file://"$pwd"/multisuper multisuper_clone &&
-	git -C multisuper_clone config submodule.active "." &&
-	git -C multisuper_clone config --add submodule.active ":(exclude)sub0" &&
-	git -C multisuper_clone submodule update --init &&
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
-	test_cmp expect actual
+nothing added to commit but untracked files present (use "git add" to track)
+ok 32 - status succeeds after staging/unstaging
 
-Cloning into 'multisuper_clone'...
-Submodule 'sub1' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
-Submodule 'sub2' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
-Submodule 'sub3' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
-Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 112 - submodule update --init with submodule.active set
+expecting success of 7519.33 'status succeeds with sparse index': 
+	(
+		sane_unset GIT_TEST_SPLIT_INDEX &&
 
-expecting success of 7400.113 'submodule update and setting submodule.<name>.active': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	pwd=$(pwd) &&
-	git clone file://"$pwd"/multisuper multisuper_clone &&
-	git -C multisuper_clone config --bool submodule.sub0.active "true" &&
-	git -C multisuper_clone config --bool submodule.sub1.active "false" &&
-	git -C multisuper_clone config --bool submodule.sub2.active "true" &&
+		git clone . full &&
+		git clone --sparse . sparse &&
+		git -C sparse sparse-checkout init --cone --sparse-index &&
+		git -C sparse sparse-checkout set dir1 dir2 &&
 
-	cat >expect <<-\EOF &&
-	 sub0 (test2)
-	-sub1
-	 sub2 (test2)
-	-sub3
-	EOF
-	git -C multisuper_clone submodule update &&
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
-	test_cmp expect actual
+		test_hook --clobber fsmonitor-test <<-\EOF &&
+			printf "last_update_token\0"
+		EOF
+		git -C full config core.fsmonitor ../.git/hooks/fsmonitor-test &&
+		git -C sparse config core.fsmonitor ../.git/hooks/fsmonitor-test &&
+		check_sparse_index_behavior ! &&
 
-Cloning into 'multisuper_clone'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub0'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
-Submodule path 'sub0': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 113 - submodule update and setting submodule.<name>.active
+		test_hook --clobber fsmonitor-test <<-\EOF &&
+			printf "last_update_token\0"
+			printf "dir1/modified\0"
+		EOF
+		check_sparse_index_behavior ! &&
 
-expecting success of 7400.114 'clone active submodule without submodule url set': 
-	test_when_finished "rm -rf test/test" &&
-	mkdir test &&
-	# another dir breaks accidental relative paths still being correct
-	git clone file://"$pwd"/multisuper test/test &&
-	(
-		cd test/test &&
-		git config submodule.active "." &&
+		git -C sparse sparse-checkout add dir1a &&
 
-		# do not pass --init flag, as the submodule is already active:
-		git submodule update &&
-		git submodule status >actual_raw &&
+		for repo in full sparse
+		do
+			cp -r $repo/dir1 $repo/dir1a &&
+			git -C $repo add dir1a &&
+			git -C $repo commit -m "add dir1a" || return 1
+		done &&
+		git -C sparse sparse-checkout set dir1 dir2 &&
 
-		cut -d" " -f3- actual_raw >actual &&
-		cat >expect <<-\EOF &&
-		sub0 (test2)
-		sub1 (test2)
-		sub2 (test2)
-		sub3 (test2)
+		# This one modifies outside the sparse-checkout definition
+		# and hence we expect to expand the sparse-index.
+		test_hook --clobber fsmonitor-test <<-\EOF &&
+			printf "last_update_token\0"
+			printf "dir1a/modified\0"
 		EOF
-		test_cmp expect actual
+		check_sparse_index_behavior
 	)
 
-Cloning into 'test/test'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/test/test/sub0'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/test/test/sub1'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/test/test/sub2'...
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/test/test/sub3'...
-Submodule path 'sub0': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 114 - clone active submodule without submodule url set
+Cloning into 'full'...
+done.
+Cloning into 'sparse'...
+done.
+{"event":"region_enter","sid":"20260929T145345.999120Z-H5c947e1c-P00262d82","thread":"main","time":"2026-09-29T14:53:45.999845Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20260929T145345.999120Z-H5c947e1c-P00262d82","thread":"main","time":"2026-09-29T14:53:46.001722Z","file":"fsmonitor.c","line":186,"t_rel":0.001877,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20260929T145346.037366Z-H5c947e1c-P00262e71","thread":"main","time":"2026-09-29T14:53:46.038057Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20260929T145346.037366Z-H5c947e1c-P00262e71","thread":"main","time":"2026-09-29T14:53:46.043455Z","file":"fsmonitor.c","line":186,"t_rel":0.005396,"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(-)
+ create mode 100644 dir1a/modified
+ create mode 100644 dir1a/tracked
+[master 1279bb5] add dir1a
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir1a/modified
+ create mode 100644 dir1a/tracked
+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"
+{"event":"region_enter","sid":"20260929T145346.147860Z-H5c947e1c-P0026311f","thread":"main","time":"2026-09-29T14:53:46.150841Z","file":"sparse-index.c","line":372,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145346.147860Z-H5c947e1c-P0026311f","thread":"main","time":"2026-09-29T14:53:46.155681Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145346.147860Z-H5c947e1c-P0026311f","thread":"main","time":"2026-09-29T14:53:46.151496Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000654,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260929T145346.147860Z-H5c947e1c-P0026311f","thread":"main","time":"2026-09-29T14:53:46.155720Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000040,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260929T145346.147860Z-H5c947e1c-P0026311f","thread":"main","time":"2026-09-29T14:53:46.148527Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20260929T145346.147860Z-H5c947e1c-P0026311f","thread":"main","time":"2026-09-29T14:53:46.151760Z","file":"fsmonitor.c","line":176,"nesting":2,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20260929T145346.147860Z-H5c947e1c-P0026311f","thread":"main","time":"2026-09-29T14:53:46.150669Z","file":"fsmonitor.c","line":186,"t_rel":0.002141,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20260929T145346.147860Z-H5c947e1c-P0026311f","thread":"main","time":"2026-09-29T14:53:46.154542Z","file":"fsmonitor.c","line":186,"t_rel":0.002781,"nesting":2,"category":"fsm_hook","label":"query"}
+ok 33 - status succeeds with sparse index
 
-expecting success of 7400.115 'update submodules without url set in .gitconfig': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	git clone file://"$pwd"/multisuper multisuper_clone &&
+# passed all 33 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7817-grep-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 -C multisuper_clone submodule init &&
-	for s in sub0 sub1 sub2 sub3
-	do
-		key=submodule.$s.url &&
-		git -C multisuper_clone config --local --unset $key &&
-		git -C multisuper_clone config --file .gitmodules --unset $key || return 1
-	done &&
+	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
+	) &&
 
-	test_must_fail git -C multisuper_clone submodule update 2>err &&
-	grep "cannot clone submodule .sub[0-3]. without a URL" err
+	git init sub2 &&
+	(
+		cd sub2 &&
+		echo "text" >a &&
+		git add a &&
+		git commit -m sub2
+	) &&
 
-Cloning into 'multisuper_clone'...
-Submodule 'sub0' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub0'
-Submodule 'sub1' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
-Submodule 'sub2' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
-Submodule 'sub3' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
-fatal: cannot clone submodule 'sub0' without a URL
-ok 115 - update submodules without url set in .gitconfig
+	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" &&
 
-expecting success of 7400.116 'clone --recurse-submodules with a pathspec works': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	cat >expected <<-\EOF &&
-	 sub0 (test2)
-	-sub1
-	-sub2
-	-sub3
-	EOF
+	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 &&
 
-	git clone --recurse-submodules="sub0" multisuper multisuper_clone &&
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
-	test_cmp expected actual
+	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
 
-Cloning into 'multisuper_clone'...
-done.
-Submodule 'sub0' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub0'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub0'...
-done.
-Submodule path 'sub0': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 116 - clone --recurse-submodules with a pathspec works
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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
 
-expecting success of 7400.117 'clone with multiple --recurse-submodules options': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	cat >expect <<-\EOF &&
-	-sub0
-	 sub1 (test2)
-	-sub2
-	 sub3 (test2)
+expecting success of 7817.2 'working tree grep honors sparse checkout': 
+	cat >expect <<-EOF &&
+	a:text
+	b:new-text
 	EOF
-
-	git clone --recurse-submodules="." \
-		  --recurse-submodules=":(exclude)sub0" \
-		  --recurse-submodules=":(exclude)sub2" \
-		  multisuper multisuper_clone &&
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
+	test_when_finished "rm -f b" &&
+	echo "new-text" >b &&
+	git grep "text" >actual &&
 	test_cmp expect actual
 
-Cloning into 'multisuper_clone'...
-done.
-Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
-Submodule 'sub3' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
-done.
-Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 117 - clone with multiple --recurse-submodules options
-
-expecting success of 7400.118 'clone and subsequent updates correctly auto-initialize submodules': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	cat <<-\EOF >expect &&
-	-sub0
-	 sub1 (test2)
-	-sub2
-	 sub3 (test2)
-	EOF
+ok 2 - working tree grep honors sparse checkout
 
-	cat <<-\EOF >expect2 &&
-	-sub0
-	 sub1 (test2)
-	-sub2
-	 sub3 (test2)
-	-sub4
-	 sub5 (test2)
+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 clone --recurse-submodules="." \
-		  --recurse-submodules=":(exclude)sub0" \
-		  --recurse-submodules=":(exclude)sub2" \
-		  --recurse-submodules=":(exclude)sub4" \
-		  multisuper multisuper_clone &&
-
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
-	test_cmp expect actual &&
+	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 -C multisuper submodule add ../sub1 sub4 &&
-	git -C multisuper submodule add ../sub1 sub5 &&
-	git -C multisuper commit -m "add more submodules" &&
-	# obtain the new superproject
-	git -C multisuper_clone pull &&
-	git -C multisuper_clone submodule update --init &&
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
-	test_cmp expect2 actual
+	git sparse-checkout init &&
+	test_path_is_missing b &&
+	test_must_fail git merge branchY &&
+	git grep "modified-b" >actual &&
+	test_cmp expect actual
 
-Cloning into 'multisuper_clone'...
-done.
-Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
-Submodule 'sub3' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
-done.
-Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/sub4'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper/sub5'...
-done.
-[main 084f781] add more submodules
+Switched to a new branch 'branchY'
+[branchY 69623d1] modified-b-in-branchY
  Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 160000 sub4
- create mode 160000 sub5
-From /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper
-   a188ac0..084f781  main       -> origin/main
-Could not access submodule 'sub5' at commit 084f781
-Updating a188ac0..084f781
-Fast-forward
- .gitmodules | 6 ++++++
- sub4        | 1 +
- sub5        | 1 +
- 3 files changed, 8 insertions(+)
- create mode 160000 sub4
- create mode 160000 sub5
-Submodule 'sub5' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub5'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub5'...
-done.
-Submodule path 'sub5': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 118 - clone and subsequent updates correctly auto-initialize submodules
-
-expecting success of 7400.119 'init properly sets the config': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	git clone --recurse-submodules="." \
-		  --recurse-submodules=":(exclude)sub0" \
-		  multisuper multisuper_clone &&
-
-	git -C multisuper_clone submodule init -- sub0 sub1 &&
-	git -C multisuper_clone config --get submodule.sub0.active &&
-	test_must_fail git -C multisuper_clone config --get submodule.sub1.active
-
-Cloning into 'multisuper_clone'...
-done.
-Submodule 'sub1' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
-Submodule 'sub2' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
-Submodule 'sub3' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
-Submodule 'sub4' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub4'
-Submodule 'sub5' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub5'
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub4'...
-done.
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/multisuper_clone/sub5'...
-done.
-Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub4': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub5': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule 'sub0' (/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub0'
-true
-ok 119 - init properly sets the config
-
-expecting success of 7400.120 'recursive clone respects -q': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	git clone -q --recurse-submodules multisuper multisuper_clone >actual &&
-	test_must_be_empty actual
-
-ok 120 - recursive clone respects -q
+ 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: 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
 
-expecting success of 7400.121 '`submodule init` and `init.templateDir`': 
-	mkdir -p tmpl/hooks &&
-	write_script tmpl/hooks/post-checkout <<-EOF &&
-	echo HOOK-RUN >&2
-	echo I was here >hook.run
-	exit 1
+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
 
-	test_config init.templateDir "$(pwd)/tmpl" &&
-	test_when_finished \
-		"git config --global --unset init.templateDir || true" &&
-	(
-		sane_unset GIT_TEMPLATE_DIR &&
-		NO_SET_GIT_TEMPLATE_DIR=t &&
-		export NO_SET_GIT_TEMPLATE_DIR &&
-
-		git config --global init.templateDir "$(pwd)/tmpl" &&
-		test_must_fail git submodule \
-			add "$submodurl" sub-global 2>err &&
-		git config --global --unset init.templateDir &&
-		test_grep HOOK-RUN err &&
-		test_path_is_file sub-global/hook.run &&
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+ok 4 - grep --cached searches entries with the SKIP_WORKTREE bit
 
-		git config init.templateDir "$(pwd)/tmpl" &&
-		git submodule add "$submodurl" sub-local 2>err &&
-		git config --unset init.templateDir &&
-		test_grep ! HOOK-RUN err &&
-		test_path_is_missing sub-local/hook.run
-	)
+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
 
-HOOK-RUN
-ok 121 - `submodule init` and `init.templateDir`
+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: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+ok 5 - grep --recurse-submodules honors sparse checkout in submodule
 
-expecting success of 7400.122 'submodule add fails when name is reused': 
-	git init test-submodule &&
-	(
-		cd test-submodule &&
-		git commit --allow-empty -m init &&
+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
 
-		git init ../child-origin &&
-		git -C ../child-origin commit --allow-empty -m init &&
+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
 
-		git submodule add ../child-origin child &&
-		git commit -m "Add submodule child" &&
+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
 
-		git mv child child_old &&
-		git commit -m "Move child to child_old" &&
+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 7 - working tree grep does not search the index with CE_VALID and SKIP_WORKTREE
 
-		# Now adding a *new* repo at the old name must fail
-		git init ../child2-origin &&
-		git -C ../child2-origin commit --allow-empty -m init &&
-		test_must_fail git submodule add ../child2-origin child 2>err &&
-		test_grep "already used for" err
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/test-submodule/.git/
-[main (root-commit) edb5fba] init
- Author: A U Thor <author@example.com>
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/child-origin/.git/
-[main (root-commit) edb5fba] init
- Author: A U Thor <author@example.com>
-Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/test-submodule/child'...
-done.
-[main f5885bd] Add submodule child
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 child
-[main 3136be9] Move child to child_old
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename child => child_old (100%)
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7400-submodule-basic/child2-origin/.git/
-[main (root-commit) edb5fba] init
- Author: A U Thor <author@example.com>
-fatal: submodule name 'child' already used for path 'child_old'
-ok 122 - submodule add fails when name is reused
+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 8 - grep --cached searches index entries with both CE_VALID and SKIP_WORKTREE
 
-# passed all 122 test(s)
-1..122
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7700-repack.sh ***
@@ -506696,8 +507620,8 @@
 
 Nothing new to pack.
 Nothing new to pack.
---- before	2025-08-27 08:22:59.296452357 +0000
-+++ after	2025-08-27 08:22:59.392452990 +0000
+--- before	2026-09-29 14:53:45.866548970 +0000
++++ after	2026-09-29 14:53:45.926548970 +0000
 @@ -1 +1 @@
 -8cd3b9bb7db0d633144114a81b7374e6a2b1b22c
 +3d2725684b43b31e3b81e5070d1847c9f1e2cf00
@@ -506930,7 +507854,7 @@
 hint:
 hint: Turn this message off by running
 hint: "git config set advice.graftFileDeprecated false"
-{"event":"child_start","sid":"20250827T082300.207143Z-Hcf858c9d-P000d165c","thread":"main","time":"2025-08-27T08:23:00.207740Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--name-hash-version=2","--delta-base-offset",".git/objects/pack/.tmp-857692-pack","--keep-true-parents","--honor-pack-keep","--non-empty","--all","--reflog","--indexed-objects"]}
+{"event":"child_start","sid":"20260929T145346.486003Z-H5c947e1c-P00263739","thread":"main","time":"2026-09-29T14:53:46.486599Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--name-hash-version=2","--delta-base-offset",".git/objects/pack/.tmp-2504505-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 7700.41 'setup for update-server-info': 
@@ -508527,8 +509451,8 @@
 	git -c status.branch=true status -s >actual &&
 	! test_cmp expected_nobranch actual
 
---- expected_nobranch	2025-08-27 08:22:56.540434175 +0000
-+++ actual	2025-08-27 08:22:56.556434280 +0000
+--- expected_nobranch	2026-09-29 14:53:44.102548970 +0000
++++ actual	2026-09-29 14:53:44.110548970 +0000
 @@ -1,2 +1,3 @@
 +## main...upstream [ahead 2, behind 2]
   M dir1/modified
@@ -508765,11 +509689,11 @@
 	dir2/untracked
 	untracked
 
---- .git/test-mtime-expect	2025-08-27 08:22:59.624454521 +0000
-+++ .git/test-mtime-actual	2025-08-27 08:22:59.624454521 +0000
+--- .git/test-mtime-expect	2026-09-29 14:53:46.066548970 +0000
++++ .git/test-mtime-actual	2026-09-29 14:53:46.070548970 +0000
 @@ -1 +1 @@
 -1234567890
-+1756282979
++1790693625
 ok 118 - --no-optional-locks prevents index update
 
 expecting success of 7508.119 'racy timestamps will be fixed for clean worktree': 
@@ -508813,11 +509737,11 @@
 	untracked
 
 nothing added to commit but untracked files present (use "git add" to track)
---- .git/test-mtime-expect	2025-08-27 08:23:00.044457292 +0000
-+++ .git/test-mtime-actual	2025-08-27 08:23:00.052457345 +0000
+--- .git/test-mtime-expect	2026-09-29 14:53:46.330548970 +0000
++++ .git/test-mtime-actual	2026-09-29 14:53:46.334548970 +0000
 @@ -1 +1 @@
 -1234567890
-+1756282979
++1790693626
 ok 119 - racy timestamps will be fixed for clean worktree
 
 expecting success of 7508.120 'racy timestamps will be fixed for dirty worktree': 
@@ -508859,11 +509783,11 @@
 	untracked
 
 no changes added to commit (use "git add" and/or "git commit -a")
---- .git/test-mtime-expect	2025-08-27 08:23:00.436459878 +0000
-+++ .git/test-mtime-actual	2025-08-27 08:23:00.436459878 +0000
+--- .git/test-mtime-expect	2026-09-29 14:53:46.614548970 +0000
++++ .git/test-mtime-actual	2026-09-29 14:53:46.618548970 +0000
 @@ -1 +1 @@
 -1234567890
-+1756282980
++1790693626
 ok 120 - racy timestamps will be fixed for dirty worktree
 
 expecting success of 7508.121 'setup slow status advice': 
@@ -510690,9 +511614,9 @@
 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.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
 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': 
@@ -511761,6 +512685,179 @@
 1..30
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t8006-blame-textconv.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t8006-blame-textconv/.git/
+expecting success of 8006.1 'setup ': 
+	echo "bin: test number 0" >zero.bin &&
+	echo "bin: test 1" >one.bin &&
+	echo "bin: test number 2" >two.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 1 version 2" >one.bin &&
+	echo "bin: test number 2 version 2" >>two.bin &&
+	rm -f symlink.bin &&
+	test_ln_s_add two.bin symlink.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) 5a31b05] First
+ Author: Number1 <author@example.com>
+ Date: Fri Jan 1 18:00:00 2010 +0000
+ 5 files changed, 7 insertions(+)
+ create mode 100755 helper
+ create mode 100644 one.bin
+ create mode 120000 symlink.bin
+ create mode 100644 two.bin
+ create mode 100644 zero.bin
+[master 98d882b] Second
+ Author: Number2 <author@example.com>
+ Date: Fri Jan 1 20:00:00 2010 +0000
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+ok 1 - setup 
+
+expecting success of 8006.2 'no filter specified': 
+	git blame one.bin >blame &&
+	find_blame Number2 <blame >result &&
+	test_cmp expected result
+
+ok 2 - no filter specified
+
+expecting success of 8006.3 'setup textconv filters': 
+	echo "*.bin diff=test" >.gitattributes &&
+	echo "zero.bin eol=crlf" >>.gitattributes &&
+	git config diff.test.textconv ./helper &&
+	git config diff.test.cachetextconv false
+
+ok 3 - setup textconv filters
+
+expecting success of 8006.4 'blame with --no-textconv': 
+	git blame --no-textconv one.bin >blame &&
+	find_blame <blame> result &&
+	test_cmp expected result
+
+ok 4 - blame with --no-textconv
+
+expecting success of 8006.5 'basic blame on last commit': 
+	git blame one.bin >blame &&
+	find_blame  <blame >result &&
+	test_cmp expected result
+
+ok 5 - basic blame on last commit
+
+expecting success of 8006.6 'blame --textconv going through revisions': 
+	git blame --textconv two.bin >blame &&
+	find_blame <blame >result &&
+	test_cmp expected result
+
+ok 6 - blame --textconv going through revisions
+
+expecting success of 8006.7 'blame --textconv with local changes': 
+	test_when_finished "git checkout zero.bin" &&
+	printf "bin: updated number 0\015" >zero.bin &&
+	git blame --textconv zero.bin >blame &&
+	expect="(Not Committed Yet ....-..-.. ..:..:.. +0000 1)" &&
+	expect="$expect converted: updated number 0" &&
+	expr "$(find_blame <blame)" : "^$expect"
+
+75
+Updated 1 path from the index
+ok 7 - blame --textconv with local changes
+
+expecting success of 8006.8 'setup +cachetextconv': 
+	git config diff.test.cachetextconv true
+
+ok 8 - setup +cachetextconv
+
+expecting success of 8006.9 'blame --textconv works with textconvcache': 
+	git blame --textconv two.bin >blame &&
+	find_blame <blame >result &&
+	test_cmp expected result &&
+	git blame --textconv one.bin >blame &&
+	find_blame  <blame >result &&
+	test_cmp expected_one result
+
+ok 9 - blame --textconv works with textconvcache
+
+expecting success of 8006.10 'setup -cachetextconv': 
+	git config diff.test.cachetextconv false
+
+ok 10 - setup -cachetextconv
+
+expecting success of 8006.11 'make a new commit': 
+	echo "bin: test number 2 version 3" >>two.bin &&
+	GIT_AUTHOR_NAME=Number3 git commit -a -m Third --date="2010-01-01 22:00:00"
+
+[master f875d8b] Third
+ Author: Number3 <author@example.com>
+ Date: Fri Jan 1 22:00:00 2010 +0000
+ 1 file changed, 1 insertion(+)
+ok 11 - make a new commit
+
+expecting success of 8006.12 'blame from previous revision': 
+	git blame HEAD^ two.bin >blame &&
+	find_blame <blame >result &&
+	test_cmp expected result
+
+ok 12 - blame from previous revision
+
+expecting success of 8006.13 'blame with --no-textconv (on symlink)': 
+	git blame --no-textconv symlink.bin >blame &&
+	find_blame <blame >result &&
+	test_cmp expected result
+
+ok 13 - blame with --no-textconv (on symlink)
+
+expecting success of 8006.14 'blame --textconv (on symlink)': 
+	git blame --textconv symlink.bin >blame &&
+	find_blame <blame >result &&
+	test_cmp expected result
+
+ok 14 - blame --textconv (on symlink)
+
+expecting success of 8006.15 'make another new commit': 
+	cat >three.bin <<\EOF &&
+bin: test number 2
+bin: test number 2 version 2
+bin: test number 2 version 3
+bin: test number 3
+EOF
+	git add three.bin &&
+	GIT_AUTHOR_NAME=Number4 git commit -a -m Fourth --date="2010-01-01 23:00:00"
+
+[master cac7ad1] Fourth
+ Author: Number4 <author@example.com>
+ Date: Fri Jan 1 23:00:00 2010 +0000
+ 1 file changed, 4 insertions(+)
+ create mode 100644 three.bin
+ok 15 - make another new commit
+
+expecting success of 8006.16 'blame on last commit (-C -C, symlink)': 
+	git blame -C -C three.bin >blame &&
+	find_blame <blame >result &&
+	cat >expected <<\EOF &&
+(Number1 2010-01-01 18:00:00 +0000 1) converted: test number 2
+(Number2 2010-01-01 20:00:00 +0000 2) converted: test number 2 version 2
+(Number3 2010-01-01 22:00:00 +0000 3) converted: test number 2 version 3
+(Number4 2010-01-01 23:00:00 +0000 4) converted: test number 3
+EOF
+	test_cmp expected result
+
+ok 16 - blame on last commit (-C -C, symlink)
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t8007-cat-file-textconv.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t8007-cat-file-textconv/.git/
 expecting success of 8007.1 'setup ': 
@@ -511966,476 +513063,2762 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t8006-blame-textconv.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t8006-blame-textconv/.git/
-expecting success of 8006.1 'setup ': 
-	echo "bin: test number 0" >zero.bin &&
-	echo "bin: test 1" >one.bin &&
-	echo "bin: test number 2" >two.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 1 version 2" >one.bin &&
-	echo "bin: test number 2 version 2" >>two.bin &&
-	rm -f symlink.bin &&
-	test_ln_s_add two.bin symlink.bin &&
-	GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
+*** t8009-blame-vs-topicbranches.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
 
-checking prerequisite: SYMLINKS
+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
 
-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
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t8010-cat-file-filters.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t8010-cat-file-filters/.git/
+expecting success of 8010.1 'setup ': 
+	echo "*.txt eol=crlf diff=txt" >.gitattributes &&
+	echo "hello" | append_cr >world.txt &&
+	git add .gitattributes world.txt &&
+	test_tick &&
+	git commit -m "Initial commit"
 
-)
-prerequisite SYMLINKS ok
-[master (root-commit) 5a31b05] First
- Author: Number1 <author@example.com>
- Date: Fri Jan 1 18:00:00 2010 +0000
- 5 files changed, 7 insertions(+)
- create mode 100755 helper
- create mode 100644 one.bin
- create mode 120000 symlink.bin
- create mode 100644 two.bin
- create mode 100644 zero.bin
-[master 98d882b] Second
- Author: Number2 <author@example.com>
- Date: Fri Jan 1 20:00:00 2010 +0000
- 3 files changed, 3 insertions(+), 2 deletions(-)
+[master (root-commit) 7b708d0] Initial commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 world.txt
 ok 1 - setup 
 
-expecting success of 8006.2 'no filter specified': 
-	git blame one.bin >blame &&
-	find_blame Number2 <blame >result &&
-	test_cmp expected result
+expecting success of 8010.2 'no filters with `git show`': 
+	git show HEAD:world.txt >actual &&
+	! has_cr actual
 
-ok 2 - no filter specified
 
-expecting success of 8006.3 'setup textconv filters': 
-	echo "*.bin diff=test" >.gitattributes &&
-	echo "zero.bin eol=crlf" >>.gitattributes &&
-	git config diff.test.textconv ./helper &&
-	git config diff.test.cachetextconv false
+ok 2 - no filters with `git show`
 
-ok 3 - setup textconv filters
+expecting success of 8010.3 'no filters with cat-file': 
+	git cat-file blob HEAD:world.txt >actual &&
+	! has_cr actual
 
-expecting success of 8006.4 'blame with --no-textconv': 
-	git blame --no-textconv one.bin >blame &&
-	find_blame <blame> result &&
-	test_cmp expected result
+ok 3 - no filters with cat-file
 
-ok 4 - blame with --no-textconv
+expecting success of 8010.4 'cat-file --filters converts to worktree version': 
+	git cat-file --filters HEAD:world.txt >actual &&
+	has_cr actual
 
-expecting success of 8006.5 'basic blame on last commit': 
-	git blame one.bin >blame &&
-	find_blame  <blame >result &&
-	test_cmp expected result
+ok 4 - cat-file --filters converts to worktree version
 
-ok 5 - basic blame on last commit
+expecting success of 8010.5 'cat-file --filters --path=<path> works': 
+	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
+	git cat-file --filters --path=world.txt $sha1 >actual &&
+	has_cr actual
 
-expecting success of 8006.6 'blame --textconv going through revisions': 
-	git blame --textconv two.bin >blame &&
-	find_blame <blame >result &&
-	test_cmp expected result
+ok 5 - cat-file --filters --path=<path> works
 
-ok 6 - blame --textconv going through revisions
+expecting success of 8010.6 'cat-file --textconv --path=<path> works': 
+	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
+	test_config diff.txt.textconv "tr A-Za-z N-ZA-Mn-za-m <" &&
+	git cat-file --textconv --path=hello.txt $sha1 >rot13 &&
+	test uryyb = "$(remove_cr <rot13)"
 
-expecting success of 8006.7 'blame --textconv with local changes': 
-	test_when_finished "git checkout zero.bin" &&
-	printf "bin: updated number 0\015" >zero.bin &&
-	git blame --textconv zero.bin >blame &&
-	expect="(Not Committed Yet ....-..-.. ..:..:.. +0000 1)" &&
-	expect="$expect converted: updated number 0" &&
-	expr "$(find_blame <blame)" : "^$expect"
+ok 6 - cat-file --textconv --path=<path> works
 
-75
-Updated 1 path from the index
-ok 7 - blame --textconv with local changes
+expecting success of 8010.7 '--path=<path> complains without --textconv/--filters': 
+	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
+	test_must_fail git cat-file --path=hello.txt blob $sha1 >actual 2>err &&
+	test_must_be_empty actual &&
+	grep "path.*needs.*filters" err
 
-expecting success of 8006.8 'setup +cachetextconv': 
-	git config diff.test.cachetextconv true
+fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
+ok 7 - --path=<path> complains without --textconv/--filters
 
-ok 8 - setup +cachetextconv
+expecting success of 8010.8 '--textconv/--filters complain without path': 
+	test_must_fail git cat-file --textconv HEAD &&
+	test_must_fail git cat-file --filters HEAD
 
-expecting success of 8006.9 'blame --textconv works with textconvcache': 
-	git blame --textconv two.bin >blame &&
-	find_blame <blame >result &&
-	test_cmp expected result &&
-	git blame --textconv one.bin >blame &&
-	find_blame  <blame >result &&
-	test_cmp expected_one result
+fatal: <object>:<path> required, only <object> 'HEAD' given
+fatal: <object>:<path> required, only <object> 'HEAD' given
+ok 8 - --textconv/--filters complain without path
 
-ok 9 - blame --textconv works with textconvcache
+expecting success of 8010.9 'cat-file --textconv --batch works': 
+	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
+	test_config diff.txt.textconv "tr A-Za-z N-ZA-Mn-za-m <" &&
+	printf "%s hello.txt\n%s hello\n" $sha1 $sha1 |
+	git cat-file --textconv --batch >actual &&
+	printf "%s blob 6\nuryyb\r\n\n%s blob 6\nhello\n\n" \
+		$sha1 $sha1 >expect &&
+	test_cmp expect actual
 
-expecting success of 8006.10 'setup -cachetextconv': 
-	git config diff.test.cachetextconv false
+ok 9 - cat-file --textconv --batch works
 
-ok 10 - setup -cachetextconv
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t8011-blame-split-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t8011-blame-split-file/.git/
+expecting success of 8011.1 'setup split file case': 
+	# use lines long enough to trigger content detection
+	test_seq 1000 1010 >one &&
+	test_seq 2000 2010 >two &&
+	git add one two &&
+	test_commit base &&
 
-expecting success of 8006.11 'make a new commit': 
-	echo "bin: test number 2 version 3" >>two.bin &&
-	GIT_AUTHOR_NAME=Number3 git commit -a -m Third --date="2010-01-01 22:00:00"
+	sed "6s/^/modified /" <one >one.tmp &&
+	mv one.tmp one &&
+	sed "6s/^/modified /" <two >two.tmp &&
+	mv two.tmp two &&
+	git add -u &&
+	test_commit modified &&
 
-[master f875d8b] Third
- Author: Number3 <author@example.com>
- Date: Fri Jan 1 22:00:00 2010 +0000
+	cat one two >combined &&
+	git add combined &&
+	git rm one two &&
+	test_commit combined
+
+[master (root-commit) ad6b874] base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 23 insertions(+)
+ create mode 100644 base.t
+ create mode 100644 one
+ create mode 100644 two
+[master 9b55153] modified
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 modified.t
+rm 'one'
+rm 'two'
+[master cc1b823] combined
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+), 11 deletions(-)
+ rename one => combined (50%)
+ create mode 100644 combined.t
+ delete mode 100644 two
+ok 1 - setup split file case
+
+expecting success of 8011.2 'setup simulated porcelain': 
+	# This just reads porcelain-ish output and tries
+	# to output the value of a given field for each line (either by
+	# reading the field that accompanies this line, or referencing
+	# the information found last time the commit was mentioned).
+	cat >read-porcelain.pl <<-\EOF
+	my $field = shift;
+	while (<>) {
+		if (/^[0-9a-f]{40,} /) {
+			flush();
+			$hash = $&;
+		} elsif (/^$field (.*)/) {
+			$cache{$hash} = $1;
+		}
+	}
+	flush();
+
+	sub flush {
+		return unless defined $hash;
+		if (defined $cache{$hash}) {
+			print "$cache{$hash}\n";
+		} else {
+			print "NONE\n";
+		}
+	}
+	EOF
+
+ok 2 - setup simulated porcelain
+
+expecting success of 8011.3 'generate --porcelain output': 
+		git blame --root -C --$output combined >output
+	
+ok 3 - generate --porcelain output
+
+expecting success of 8011.4 'porcelain output finds correct commits': 
+		generate_expect >expect <<-\EOF &&
+		5 base
+		1 modified
+		10 base
+		1 modified
+		5 base
+		EOF
+		perl read-porcelain.pl summary <output >actual &&
+		test_cmp expect actual
+	
+ok 4 - porcelain output finds correct commits
+
+expecting success of 8011.5 'porcelain output shows correct filenames': 
+		generate_expect >expect <<-\EOF &&
+		11 one
+		11 two
+		EOF
+		perl read-porcelain.pl filename <output >actual &&
+		test_cmp expect actual
+	
+ok 5 - porcelain output shows correct filenames
+
+expecting success of 8011.6 'porcelain output shows correct previous pointer': 
+		generate_expect >expect <<-EOF &&
+		5 NONE
+		1 $(git rev-parse modified^) one
+		10 NONE
+		1 $(git rev-parse modified^) two
+		5 NONE
+		EOF
+		perl read-porcelain.pl previous <output >actual &&
+		test_cmp expect actual
+	
+ok 6 - porcelain output shows correct previous pointer
+
+expecting success of 8011.7 'generate --line-porcelain output': 
+		git blame --root -C --$output combined >output
+	
+ok 7 - generate --line-porcelain output
+
+expecting success of 8011.8 'line-porcelain output finds correct commits': 
+		generate_expect >expect <<-\EOF &&
+		5 base
+		1 modified
+		10 base
+		1 modified
+		5 base
+		EOF
+		perl read-porcelain.pl summary <output >actual &&
+		test_cmp expect actual
+	
+ok 8 - line-porcelain output finds correct commits
+
+expecting success of 8011.9 'line-porcelain output shows correct filenames': 
+		generate_expect >expect <<-\EOF &&
+		11 one
+		11 two
+		EOF
+		perl read-porcelain.pl filename <output >actual &&
+		test_cmp expect actual
+	
+ok 9 - line-porcelain output shows correct filenames
+
+expecting success of 8011.10 'line-porcelain output shows correct previous pointer': 
+		generate_expect >expect <<-EOF &&
+		5 NONE
+		1 $(git rev-parse modified^) one
+		10 NONE
+		1 $(git rev-parse modified^) two
+		5 NONE
+		EOF
+		perl read-porcelain.pl previous <output >actual &&
+		test_cmp expect actual
+	
+ok 10 - line-porcelain output shows correct previous pointer
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7704-repack-cruft.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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(+)
-ok 11 - make a new commit
+ 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.51.0/t/trash directory.t7704-repack-cruft/expire-to-now/expired.git/
+ok 1 - --expire-to stores pruned objects (now)
 
-expecting success of 8006.12 'blame from previous revision': 
-	git blame HEAD^ two.bin >blame &&
-	find_blame <blame >result &&
-	test_cmp expected result
+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 12 - blame from previous revision
+		git branch -M main &&
 
-expecting success of 8006.13 'blame with --no-textconv (on symlink)': 
-	git blame --no-textconv symlink.bin >blame &&
-	find_blame <blame >result &&
-	test_cmp expected result
+		test_commit base &&
 
-ok 13 - blame with --no-textconv (on symlink)
+		# 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 &&
 
-expecting success of 8006.14 'blame --textconv (on symlink)': 
-	git blame --textconv symlink.bin >blame &&
-	find_blame <blame >result &&
-	test_cmp expected result
+		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)" &&
 
-ok 14 - blame --textconv (on symlink)
+		# 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 &&
 
-expecting success of 8006.15 'make another new commit': 
-	cat >three.bin <<\EOF &&
-bin: test number 2
-bin: test number 2 version 2
-bin: test number 2 version 3
-bin: test number 3
-EOF
-	git add three.bin &&
-	GIT_AUTHOR_NAME=Number4 git commit -a -m Fourth --date="2010-01-01 23:00:00"
+		# 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.51.0/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.51.0/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 too large': 
+	git init max-cruft-size-large &&
+	(
+		cd max-cruft-size-large &&
+		test_commit base &&
+
+		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
+		git repack --cruft -d &&
+		cruft_foo="$(ls $packdir/pack-*.mtimes)" &&
+
+		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-tool pack-mtimes $(basename "$cruft_foo") >foo.objects &&
+		test-tool pack-mtimes $(basename "$cruft_bar") >bar.objects &&
+
+		grep "^$foo" foo.objects &&
+		test_line_count = 1 foo.objects &&
+		grep "^$bar" bar.objects &&
+		test_line_count = 1 bar.objects
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 1790693623
+bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1790693623
+ok 3 - --max-cruft-size creates new packs when too large
+
+expecting success of 7704.4 '--max-cruft-size combines existing packs when not too large': 
+	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.51.0/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 1790693624
+bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1790693624
+ok 4 - --max-cruft-size combines existing packs when not too large
+
+expecting success of 7704.5 '--combine-cruft-below-size combines packs': 
+	repo=combine-cruft-below-size &&
+	test_when_finished "rm -fr $repo" &&
+
+	git init "$repo" &&
+	(
+		cd "$repo" &&
+
+		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 `--combine-cruft-below-size=1M`
+		# should combine both 0.5 MiB packs together, but
+		# ignore the two packs which are >= 1.0 MiB.
+		ls $packdir/pack-*.mtimes | sort >cruft.before &&
+		git repack -d --cruft --combine-cruft-below-size=1M &&
+		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 &&
+
+		# The two packs smaller than 1.0MiB should be repacked
+		# together.
+		printf "%s\n" $cruft_foo $cruft_bar | sort >expect.removed &&
+		test_cmp expect.removed cruft.removed &&
+
+		# ...and contain the set of objects rolled up.
+		test-tool pack-mtimes "$(basename $(cat cruft.new))" >actual.raw &&
+		sort actual.raw >actual.objects &&
+
+		test_cmp expect.objects actual.objects
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/combine-cruft-below-size/.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 - --combine-cruft-below-size combines packs
+
+expecting success of 7704.6 'setup cruft with freshened objects': 
+	git init cruft-freshen &&
+	(
+		cd cruft-freshen &&
+
+		test_commit base &&
+		git repack -ad &&
+
+		foo="$(generate_random_blob foo 64)" &&
+		test-tool chmtime --get -10000 \
+			"$objdir/$(test_oid_to_path "$foo")" >foo.mtime &&
+
+		git repack --cruft -d &&
+
+		cruft="$(ls $packdir/pack-*.mtimes)" &&
+		test-tool pack-mtimes "$(basename $cruft)" >actual &&
+		echo "$foo $(cat foo.mtime)" >expect &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/cruft-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 cruft with freshened objects
+
+expecting success of 7704.7 'cruft with freshened objects (loose)': 
+	(
+		cd cruft-freshen &&
+
+		# 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 &&
+
+		cruft="$(ls $packdir/pack-*.mtimes)" &&
+		test-tool pack-mtimes "$(basename $cruft)" >actual &&
+		echo "$foo $(cat foo.mtime)" >expect &&
+		test_cmp expect actual
+	)
+
+ok 7 - cruft with freshened objects (loose)
+
+expecting success of 7704.8 'cruft with freshened objects (packed)': 
+	(
+		cd cruft-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 &&
+
+		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
+	)
+
+ok 8 - cruft with freshened objects (packed)
+
+expecting success of 7704.9 'multi-cruft with freshened objects (previously cruft)': 
+	repo="max-cruft-size-threshold" &&
+
+	test_when_finished "rm -fr $repo" &&
+	git init "$repo" &&
+	(
+		cd "$repo" &&
+
+		test_commit base &&
+		foo="$(generate_random_blob foo $((2*1024*1024)))" &&
+		bar="$(generate_random_blob bar $((2*1024*1024)))" &&
+		baz="$(generate_random_blob baz $((2*1024*1024)))" &&
+
+		test-tool chmtime --get -100000 \
+			"$objdir/$(test_oid_to_path "$foo")" >foo.old &&
+		test-tool chmtime --get -100000 \
+			"$objdir/$(test_oid_to_path "$bar")" >bar.old &&
+		test-tool chmtime --get -100000 \
+			"$objdir/$(test_oid_to_path "$baz")" >baz.old &&
+
+		git repack --cruft -d &&
+
+		# Make an identical copy of foo stored in a pack with a more
+		# recent mtime.
+		foo="$(generate_random_blob foo $((2*1024*1024)))" &&
+		foo_pack="$(echo "$foo" | git pack-objects $packdir/pack)" &&
+		test-tool chmtime --get -100 \
+			"$packdir/pack-$foo_pack.pack" >foo.new &&
+		git prune-packed &&
+
+		# Make a loose copy of bar, also with a more recent mtime.
+		bar="$(generate_random_blob bar $((2*1024*1024)))" &&
+		test-tool chmtime --get -100 \
+			"$objdir/$(test_oid_to_path "$bar")" >bar.new &&
+
+		# Make a new cruft object $quux to ensure we do not
+		# generate an identical pack to the existing cruft
+		# pack.
+		quux="$(generate_random_blob quux $((1024)))" &&
+		test-tool chmtime --get -100 \
+			"$objdir/$(test_oid_to_path "$quux")" >quux.new &&
+
+		git repack --cruft --max-cruft-size=3M -d &&
+
+		for p in $packdir/pack-*.mtimes
+		do
+			test-tool pack-mtimes "$(basename "$p")" || return 1
+		done >actual.raw &&
+		sort actual.raw >actual &&
+
+		# Among the set of all cruft packs, we should see the
+		# new mtimes for object $foo and $bar, as well as the
+		# single new copy of $baz.
+		sort >expect <<-EOF &&
+		$foo $(cat foo.new)
+		$bar $(cat bar.new)
+		$baz $(cat baz.old)
+		$quux $(cat quux.new)
+		EOF
+
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/max-cruft-size-threshold/.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 - multi-cruft with freshened objects (previously cruft)
+
+expecting success of 7704.10 '--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 &&
+
+		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.51.0/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 10 - --max-cruft-size with pruning
+
+expecting success of 7704.11 '--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
+	) &&
+
+	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.51.0/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 11 - --max-cruft-size ignores non-local packs
+
+expecting success of 7704.12 'reachable packs are preferred over cruft ones': 
+	repo="cruft-preferred-packs" &&
+	git init "$repo" &&
+	(
+		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"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 12 - reachable packs are preferred over cruft ones
+
+expecting success of 7704.13 'repack --cruft generates a cruft pack': 
+	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
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-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 13 - repack --cruft generates a cruft pack
+
+expecting success of 7704.14 'cruft packs are not included in geometric repack': 
+	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 &&
+		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
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-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 14 - cruft packs are not included in geometric repack
+
+expecting success of 7704.15 'repack --geometric collects once-cruft objects': 
+	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 &&
+		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
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-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 15 - repack --geometric collects once-cruft objects
+
+expecting success of 7704.16 '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.51.0/t/trash directory.t7704-repack-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 16 - cruft repack with no reachable objects
+
+expecting success of 7704.17 '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=$(generate_random_blob foo 1048576) &&
+		bar=$(generate_random_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"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-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 base.t
+ok 17 - cruft repack with --max-pack-size
+
+expecting success of 7704.18 '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 18 - cruft repack with pack.packSizeLimit
+
+expecting success of 7704.19 '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.51.0/t/trash directory.t7704-repack-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":"20260929T145348.369412Z-H5c947e1c-P002657ad","thread":"main","time":"2026-09-29T14:53:48.374643Z","file":"run-command.c","line":740,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-2512813-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"start","sid":"20260929T145348.369412Z-H5c947e1c-P002657ad/20260929T145348.376790Z-H5c947e1c-P002657dd","thread":"main","time":"2026-09-29T14:53:48.376853Z","file":"common-init.c","line":58,"t_abs":0.000248,"argv":["/build/reproducible-path/git-2.51.0/git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-2512813-pack","--cruft","--honor-pack-keep","--non-empty"]}
+ok 19 - cruft repack respects repack.cruftWindow
+
+expecting success of 7704.20 '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.51.0/t/trash directory.t7704-repack-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":"20260929T145348.434612Z-H5c947e1c-P002658cc","thread":"main","time":"2026-09-29T14:53:48.439512Z","file":"run-command.c","line":740,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-2513100-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"start","sid":"20260929T145348.434612Z-H5c947e1c-P002658cc/20260929T145348.440855Z-H5c947e1c-P002658ef","thread":"main","time":"2026-09-29T14:53:48.440926Z","file":"common-init.c","line":58,"t_abs":0.000253,"argv":["/build/reproducible-path/git-2.51.0/git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-2513100-pack","--cruft","--honor-pack-keep","--non-empty"]}
+ok 20 - cruft repack respects --window by default
+
+expecting success of 7704.21 '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.51.0/t/trash directory.t7704-repack-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 21 - cruft repack respects --quiet
+
+expecting success of 7704.22 'repack --write-midx excludes cruft where possible': 
+	setup_cruft_exclude_tests exclude-cruft-when-possible &&
+	(
+		cd exclude-cruft-when-possible &&
+
+		GIT_TEST_MULTI_PACK_INDEX=0 \
+		git repack -d --geometric=2 --write-midx --write-bitmap-index &&
+
+		test-tool read-midx --show-objects $objdir >midx &&
+		cruft="$(ls $packdir/*.mtimes)" &&
+		test_grep ! "$(basename "$cruft" .mtimes).idx" midx &&
+
+		git rev-list --all --objects --no-object-names >reachable.raw &&
+		sort reachable.raw >reachable.objects &&
+		awk "/\.pack$/ { print \$1 }" <midx | sort >midx.objects &&
+
+		test_cmp reachable.objects midx.objects
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/exclude-cruft-when-possible/.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
+HEAD is now at d79ce16 one
+Updating d79ce16..139b20d
+Fast-forward
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[master 25e18d2] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+ok 22 - repack --write-midx excludes cruft where possible
+
+expecting success of 7704.23 'repack --write-midx includes cruft when instructed': 
+	setup_cruft_exclude_tests exclude-cruft-when-instructed &&
+	(
+		cd exclude-cruft-when-instructed &&
+
+		GIT_TEST_MULTI_PACK_INDEX=0 \
+		git -c repack.midxMustContainCruft=true repack \
+			-d --geometric=2 --write-midx --write-bitmap-index &&
+
+		test-tool read-midx --show-objects $objdir >midx &&
+		cruft="$(ls $packdir/*.mtimes)" &&
+		test_grep "$(basename "$cruft" .mtimes).idx" midx &&
+
+		git cat-file --batch-check="%(objectname)" --batch-all-objects \
+			>all.objects &&
+		awk "/\.pack$/ { print \$1 }" <midx | sort >midx.objects &&
+
+		test_cmp all.objects midx.objects
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/exclude-cruft-when-instructed/.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
+HEAD is now at d79ce16 one
+Updating d79ce16..139b20d
+Fast-forward
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[master 25e18d2] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+pack-45dcff625845dc0ad702f91d853d0950f9be0eb9.idx
+ok 23 - repack --write-midx includes cruft when instructed
+
+expecting success of 7704.24 'repack --write-midx includes cruft when necessary': 
+	setup_cruft_exclude_tests exclude-cruft-when-necessary &&
+	(
+		cd exclude-cruft-when-necessary &&
+
+		test_path_is_file $(ls $packdir/pack-*.mtimes) &&
+		( cd $packdir && ls pack-*.idx ) | sort >packs.all &&
+		git multi-pack-index write --stdin-packs --bitmap <packs.all &&
+
+		test_commit five &&
+		GIT_TEST_MULTI_PACK_INDEX=0 \
+		git repack -d --geometric=2 --write-midx --write-bitmap-index &&
+
+		test-tool read-midx --show-objects $objdir >midx &&
+		awk "/\.pack$/ { print \$1 }" <midx | sort >midx.objects &&
+		git cat-file --batch-all-objects --batch-check="%(objectname)" \
+			>expect.objects &&
+		test_cmp expect.objects midx.objects &&
+
+		grep "^pack-" midx >midx.packs &&
+		test_line_count = "$(($(wc -l <packs.all) + 1))" midx.packs
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/exclude-cruft-when-necessary/.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
+HEAD is now at d79ce16 one
+Updating d79ce16..139b20d
+Fast-forward
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[master 25e18d2] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+[master 9bb13c5] five
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+ok 24 - repack --write-midx includes cruft when necessary
+
+expecting success of 7704.25 'repack --write-midx includes cruft when already geometric': 
+	git init repack--write-midx-geometric-noop &&
+	(
+		cd repack--write-midx-geometric-noop &&
+
+		git branch -M main &&
+		test_commit A &&
+		test_commit B &&
+
+		git checkout -B side &&
+		test_commit --no-tag C &&
+		C="$(git rev-parse HEAD)" &&
+
+		git checkout main &&
+		git branch -D side &&
+		git reflog expire --all --expire=all &&
+
+		# At this point we have two packs: one containing the
+		# objects belonging to commits A and B, and another
+		# (cruft) pack containing the objects belonging to
+		# commit C.
+		git repack --cruft -d &&
+
+		# Create a third pack which contains a merge commit
+		# making commit C reachable again.
+		#
+		# --no-ff is important here, as it ensures that we
+		# actually write a new object and subsequently a new
+		# pack to contain it.
+		git merge --no-ff $C &&
+		git repack -d &&
+
+		ls $packdir/pack-*.idx | sort >packs.all &&
+		cruft="$(ls $packdir/pack-*.mtimes)" &&
+		cruft="${cruft%.mtimes}.idx" &&
+
+		for idx in $(grep -v $cruft <packs.all)
+		do
+			git show-index <$idx >out &&
+			wc -l <out || return 1
+		done >sizes.raw &&
+
+		# Make sure that there are two non-cruft packs, and
+		# that one of them contains at least twice as many
+		# objects as the other, ensuring that they are already
+		# in a geometric progression.
+		sort -n sizes.raw >sizes &&
+		test_line_count = 2 sizes &&
+		s1=$(head -n 1 sizes) &&
+		s2=$(tail -n 1 sizes) &&
+		test "$s2" -gt "$((2 * $s1))" &&
+
+		git -c repack.midxMustContainCruft=false repack --geometric=2 \
+			--write-midx --write-bitmap-index
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/repack--write-midx-geometric-noop/.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
+Switched to a new branch 'side'
+[side 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to branch 'main'
+Deleted branch side (was 35a8500).
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Nothing new to pack.
+ok 25 - repack --write-midx includes cruft when already geometric
+
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t8001-annotate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t8001-annotate/.git/
+expecting success of 8001.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 8001.2 'blame 1 author': 
+	check_count A 2
+
+git annotate  file 
+Author A (expected 2, attributed 2) good
+ok 2 - blame 1 author
+
+expecting success of 8001.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 annotate  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 8001.4 'blame with --contents': 
+	check_count --contents=file A 2
+
+git annotate  --contents=file file 
+Author A (expected 2, attributed 2) good
+ok 4 - blame with --contents
+
+expecting success of 8001.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 annotate  --contents=contents file 
+Author A (expected 1, attributed 1) good
+ok 5 - blame with --contents in a bare repo
+
+expecting success of 8001.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 annotate  --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 8001.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 annotate  file 
+Author A (expected 2, attributed 2) good
+ok 7 - blame in a bare repo without starting commit
+
+expecting success of 8001.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 annotate  file testTag
+Author A (expected 2, attributed 2) good
+git annotate  file testTag2
+Author A (expected 2, attributed 2) good
+ok 8 - blame by tag objects
+
+expecting success of 8001.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 8001.10 'blame 2 authors': 
+	check_count A 2 B 2
+
+git annotate  file 
+Author B (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
+ok 10 - blame 2 authors
+
+expecting success of 8001.11 'blame with --contents and revision': 
+	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
+ok 11 - blame with --contents and revision
+
+expecting success of 8001.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 8001.13 'blame 2 authors + 1 branch1 author': 
+	check_count A 2 B 2 B1 2
+
+git annotate  file 
+Author A (expected 2, attributed 2) good
+Author B (expected 2, attributed 2) good
+Author B1 (expected 2, attributed 2) good
+ok 13 - blame 2 authors + 1 branch1 author
+
+expecting success of 8001.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 8001.15 'blame 2 authors + 1 branch2 author': 
+	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
+ok 15 - blame 2 authors + 1 branch2 author
+
+expecting success of 8001.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 8001.17 'blame 2 authors + 2 merged-in authors': 
+	check_count A 2 B 1 B1 2 B2 1
+
+git annotate  file 
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+ok 17 - blame 2 authors + 2 merged-in authors
+
+expecting success of 8001.18 'blame --first-parent blames merge for branch1': 
+	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
+
+git annotate  --first-parent file 
+Author A U Thor (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
+ok 18 - blame --first-parent blames merge for branch1
+
+expecting success of 8001.19 'blame ancestor': 
+	check_count -h main A 2 B 2
+
+git annotate  file main
+Author A (expected 2, attributed 2) good
+Author B (expected 2, attributed 2) good
+ok 19 - blame ancestor
+
+expecting success of 8001.20 'blame great-ancestor': 
+	check_count -h main^ A 2
+
+git annotate  file main^
+Author A (expected 2, attributed 2) good
+ok 20 - blame great-ancestor
+
+expecting success of 8001.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 8001.22 'blame evil merge': 
+	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
+
+git annotate  file 
+Author B1 (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+ok 22 - blame evil merge
+
+expecting success of 8001.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 annotate  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 8001.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 8001.25 'blame incomplete line': 
+	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
+
+git annotate  file 
+Author A (expected 2, attributed 2) good
+Author B1 (expected 2, attributed 2) good
+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
+ok 25 - blame incomplete line
+
+expecting success of 8001.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 8001.27 'blame edits': 
+	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
+
+git annotate  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
+Author C (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 27 - blame edits
+
+expecting success of 8001.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 8001.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 annotate  file 
+Author C (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 B (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
+ok 29 - blame obfuscated email
+
+expecting success of 8001.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 annotate  -L1 file 
+Author D (expected 1, attributed 1) good
+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 C (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+ok 30 - blame -L 1 (all)
+
+expecting success of 8001.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 annotate  -L, file 
+Author A (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author D (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 A U Thor (expected 1, attributed 1) good
+Author B2 (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 B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 32 - blame -L X (X to end)
+
+expecting success of 8001.33 '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 B1 (expected 1, attributed 1) good
+Author D (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 B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 34 - blame -L ,Y (up to Y)
+
+expecting success of 8001.35 'blame -L X,X': 
+	check_count -L3,3 B2 1
+
+git annotate  -L3,3 file 
+Author B2 (expected 1, attributed 1) good
+ok 35 - blame -L X,X
+
+expecting success of 8001.36 'blame -L X,Y': 
+	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 B2 (expected 1, attributed 1) good
+Author B1 (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 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
+ok 37 - blame -L Y,X (undocumented)
+
+expecting success of 8001.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 8001.39 'blame -L 0': 
+	test_must_fail $PROG -L0 file
+
+fatal: -L invalid line number: 0
+ok 39 - blame -L 0
+
+expecting success of 8001.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 8001.41 'blame -L ,+0': 
+	test_must_fail $PROG -L,+0 file
+
+fatal: -L invalid empty range
+ok 41 - blame -L ,+0
+
+expecting success of 8001.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 8001.43 'blame -L X,+1': 
+	check_count -L3,+1 B2 1
+
+git annotate  -L3,+1 file 
+Author B2 (expected 1, attributed 1) good
+ok 43 - blame -L X,+1
+
+expecting success of 8001.44 'blame -L X,+N': 
+	check_count -L3,+4 B 1 B1 1 B2 1 D 1
+
+git annotate  -L3,+4 file 
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 44 - blame -L X,+N
+
+expecting success of 8001.45 'blame -L ,-0': 
+	test_must_fail $PROG -L,-0 file
+
+fatal: -L invalid empty range
+ok 45 - blame -L ,-0
+
+expecting success of 8001.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 8001.47 'blame -L X,-1': 
+	check_count -L3,-1 B2 1
+
+git annotate  -L3,-1 file 
+Author B2 (expected 1, attributed 1) good
+ok 47 - blame -L X,-1
+
+expecting success of 8001.48 'blame -L X,-N': 
+	check_count -L6,-4 B 1 B1 1 B2 1 D 1
+
+git annotate  -L6,-4 file 
+Author B1 (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 48 - blame -L X,-N
+
+expecting success of 8001.49 'blame -L /RE/ (RE to end)': 
+	check_count -L/evil/ C 1 "A U Thor" 1
+
+git annotate  -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)
+
+expecting success of 8001.50 'blame -L /RE/,/RE2/': 
+	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
+
+git annotate  -L/robot/,/green/ file 
+Author D (expected 1, attributed 1) good
+Author B (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 50 - blame -L /RE/,/RE2/
+
+expecting success of 8001.51 'blame -L X,/RE/': 
+	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
+
+git annotate  -L5,/evil/ file 
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 51 - blame -L X,/RE/
+
+expecting success of 8001.52 'blame -L /RE/,Y': 
+	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
+
+git annotate  -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 8001.53 'blame -L /RE/,+N': 
+	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
+
+git annotate  -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 8001.54 'blame -L /RE/,-N': 
+	check_count -L/99/,-3 B 1 B2 1 D 1
+
+git annotate  -L/99/,-3 file 
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+ok 54 - blame -L /RE/,-N
+
+expecting success of 8001.55 'blame -L X (X == nlines)': 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L$n C 1
+
+git annotate  -L8 file 
+Author C (expected 1, attributed 1) good
+ok 55 - blame -L X (X == nlines)
+
+expecting success of 8001.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 8001.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 8001.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 annotate  -L,8 file 
+Author A U Thor (expected 1, attributed 1) good
+Author B (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 C (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 58 - blame -L ,Y (Y == nlines)
+
+expecting success of 8001.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 annotate  -L,9 file 
+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 A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author E (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 E (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 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
+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 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
+ok 61 - blame -L multiple (disjoint)
+
+expecting success of 8001.62 'blame -L multiple (disjoint: unordered)': 
+	check_count -L6,7 -L2,3 A 1 B1 1 B2 1 "A U Thor" 1
+
+git annotate  -L6,7 -L2,3 file 
+Author A U Thor (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
+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 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
+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 B2 (expected 1, attributed 1) good
+ok 64 - blame -L multiple (adjacent: unordered)
+
+expecting success of 8001.65 'blame -L multiple (overlapping)': 
+	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
+
+git annotate  -L2,4 -L3,5 file 
+Author A (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 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 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)
+
+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 D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author C (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 B (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 B2 (expected 1, attributed 1) good
+Author A (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 B1 (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 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 D (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 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 D (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
+ok 71 - blame -L /RE/ (relative: adjacent)
+
+expecting success of 8001.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 8001.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 8001.74 'blame -L ^/RE/ (absolute)': 
+	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
+
+git annotate  -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 8001.75 'blame -L ^/RE/ (absolute: no preceding range)': 
+	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
+ok 75 - blame -L ^/RE/ (absolute: no preceding range)
+
+expecting success of 8001.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 8001.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 annotate  -L8 -L^/$/,+2 file 
+Author C (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 77 - blame -L ^/RE/ (absolute: end-of-file)
+
+expecting success of 8001.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 8001.79 'blame -L :literal': 
+	check_count -f hello.c -L:main F 4 G 1
+
+git annotate  -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 8001.80 'blame -L :regex': 
+	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
+
+git annotate  -L:m[a-z][a-z]l hello.c 
+Author H (expected 4, attributed 4) good
+ok 80 - blame -L :regex
+
+expecting success of 8001.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 8001.82 'blame -L :RE (relative)': 
+	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
+
+git annotate  -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 8001.83 'blame -L :RE (relative: no preceding range)': 
+	check_count -f hello.c -L:ma.. F 4 G 1
+
+git annotate  -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 8001.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 8001.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 8001.86 'blame -L ^:RE (absolute)': 
+	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
+
+git annotate  -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)
+
+expecting success of 8001.87 'blame -L ^:RE (absolute: no preceding range)': 
+	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
+ok 87 - blame -L ^:RE (absolute: no preceding range)
+
+expecting success of 8001.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 8001.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 annotate  -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 8001.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 annotate  -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
+
+expecting success of 8001.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 8001.92 'blame empty': 
+	check_count -h HEAD^^ -f incremental
+
+git annotate  incremental HEAD^^
+ok 92 - blame empty
+
+expecting success of 8001.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 8001.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 8001.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 8001.96 'blame half': 
+	check_count -h HEAD^ -f incremental I 1
+
+git annotate  incremental HEAD^
+Author I (expected 1, attributed 1) good
+ok 96 - blame half
+
+expecting success of 8001.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 8001.98 'blame -L 1 half': 
+	check_count -h HEAD^ -f incremental -L1 I 1
+
+git annotate  -L1 incremental HEAD^
+Author I (expected 1, attributed 1) good
+ok 98 - blame -L 1 half
+
+expecting success of 8001.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 8001.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 8001.101 'blame full': 
+	check_count -f incremental I 1
+
+git annotate  incremental 
+Author I (expected 1, attributed 1) good
+ok 101 - blame full
+
+expecting success of 8001.102 'blame -L 0 full': 
+	test_must_fail $PROG -L0 incremental
 
-[master cac7ad1] Fourth
- Author: Number4 <author@example.com>
- Date: Fri Jan 1 23:00:00 2010 +0000
- 1 file changed, 4 insertions(+)
- create mode 100644 three.bin
-ok 15 - make another new commit
+fatal: -L invalid line number: 0
+ok 102 - blame -L 0 full
 
-expecting success of 8006.16 'blame on last commit (-C -C, symlink)': 
-	git blame -C -C three.bin >blame &&
-	find_blame <blame >result &&
-	cat >expected <<\EOF &&
-(Number1 2010-01-01 18:00:00 +0000 1) converted: test number 2
-(Number2 2010-01-01 20:00:00 +0000 2) converted: test number 2 version 2
-(Number3 2010-01-01 22:00:00 +0000 3) converted: test number 2 version 3
-(Number4 2010-01-01 23:00:00 +0000 4) converted: test number 3
-EOF
-	test_cmp expected result
+expecting success of 8001.103 'blame -L 1 full': 
+	check_count -f incremental -L1 I 1
 
-ok 16 - blame on last commit (-C -C, symlink)
+git annotate  -L1 incremental 
+Author I (expected 1, attributed 1) good
+ok 103 - blame -L 1 full
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t8010-cat-file-filters.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t8010-cat-file-filters/.git/
-expecting success of 8010.1 'setup ': 
-	echo "*.txt eol=crlf diff=txt" >.gitattributes &&
-	echo "hello" | append_cr >world.txt &&
-	git add .gitattributes world.txt &&
-	test_tick &&
-	git commit -m "Initial commit"
+expecting success of 8001.104 'blame -L 2 full': 
+	test_must_fail $PROG -L2 incremental
 
-[master (root-commit) 7b708d0] Initial commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 world.txt
-ok 1 - setup 
+fatal: file incremental has only 1 line
+ok 104 - blame -L 2 full
 
-expecting success of 8010.2 'no filters with `git show`': 
-	git show HEAD:world.txt >actual &&
-	! has_cr actual
+expecting success of 8001.105 'blame -L 3 full': 
+	test_must_fail $PROG -L3 incremental
 
+fatal: file incremental has only 1 line
+ok 105 - blame -L 3 full
 
-ok 2 - no filters with `git show`
+expecting success of 8001.106 'blame -L': 
+	test_must_fail $PROG -L file
 
-expecting success of 8010.3 'no filters with cat-file': 
-	git cat-file blob HEAD:world.txt >actual &&
-	! has_cr actual
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
 
-ok 3 - no filters with cat-file
+    <rev-opts> are documented in git-rev-list(1)
 
-expecting success of 8010.4 'cat-file --filters converts to worktree version': 
-	git cat-file --filters HEAD:world.txt >actual &&
-	has_cr actual
+    --[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 4 - cat-file --filters converts to worktree version
+ok 106 - blame -L
 
-expecting success of 8010.5 'cat-file --filters --path=<path> works': 
-	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
-	git cat-file --filters --path=world.txt $sha1 >actual &&
-	has_cr actual
+expecting success of 8001.107 'blame -L X,+': 
+	test_must_fail $PROG -L1,+ file
 
-ok 5 - cat-file --filters --path=<path> works
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 107 - blame -L X,+
 
-expecting success of 8010.6 'cat-file --textconv --path=<path> works': 
-	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
-	test_config diff.txt.textconv "tr A-Za-z N-ZA-Mn-za-m <" &&
-	git cat-file --textconv --path=hello.txt $sha1 >rot13 &&
-	test uryyb = "$(remove_cr <rot13)"
+expecting success of 8001.108 'blame -L X,-': 
+	test_must_fail $PROG -L1,- file
 
-ok 6 - cat-file --textconv --path=<path> works
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 108 - blame -L X,-
 
-expecting success of 8010.7 '--path=<path> complains without --textconv/--filters': 
-	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
-	test_must_fail git cat-file --path=hello.txt blob $sha1 >actual 2>err &&
-	test_must_be_empty actual &&
-	grep "path.*needs.*filters" err
+expecting success of 8001.109 'blame -L X (non-numeric X)': 
+	test_must_fail $PROG -LX file
 
-fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
-ok 7 - --path=<path> complains without --textconv/--filters
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 109 - blame -L X (non-numeric X)
 
-expecting success of 8010.8 '--textconv/--filters complain without path': 
-	test_must_fail git cat-file --textconv HEAD &&
-	test_must_fail git cat-file --filters HEAD
+expecting success of 8001.110 'blame -L X,Y (non-numeric Y)': 
+	test_must_fail $PROG -L1,Y file
 
-fatal: <object>:<path> required, only <object> 'HEAD' given
-fatal: <object>:<path> required, only <object> 'HEAD' given
-ok 8 - --textconv/--filters complain without path
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 110 - blame -L X,Y (non-numeric Y)
 
-expecting success of 8010.9 'cat-file --textconv --batch works': 
-	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
-	test_config diff.txt.textconv "tr A-Za-z N-ZA-Mn-za-m <" &&
-	printf "%s hello.txt\n%s hello\n" $sha1 $sha1 |
-	git cat-file --textconv --batch >actual &&
-	printf "%s blob 6\nuryyb\r\n\n%s blob 6\nhello\n\n" \
-		$sha1 $sha1 >expect &&
-	test_cmp expect actual
+expecting success of 8001.111 'blame -L X,+N (non-numeric N)': 
+	test_must_fail $PROG -L1,+N file
 
-ok 9 - cat-file --textconv --batch works
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 111 - blame -L X,+N (non-numeric N)
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t8009-blame-vs-topicbranches.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 8001.112 'blame -L X,-N (non-numeric N)': 
+	test_must_fail $PROG -L1,-N file
 
-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
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 112 - blame -L X,-N (non-numeric N)
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t8011-blame-split-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t8011-blame-split-file/.git/
-expecting success of 8011.1 'setup split file case': 
-	# use lines long enough to trigger content detection
-	test_seq 1000 1010 >one &&
-	test_seq 2000 2010 >two &&
-	git add one two &&
-	test_commit base &&
+expecting success of 8001.113 'blame -L ,^/RE/': 
+	test_must_fail $PROG -L1,^/99/ file
 
-	sed "6s/^/modified /" <one >one.tmp &&
-	mv one.tmp one &&
-	sed "6s/^/modified /" <two >two.tmp &&
-	mv two.tmp two &&
-	git add -u &&
-	test_commit modified &&
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 113 - blame -L ,^/RE/
 
-	cat one two >combined &&
-	git add combined &&
-	git rm one two &&
-	test_commit combined
+expecting success of 8001.114 'blame progress on a full file': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (10/10), done.
+	EOF
 
-[master (root-commit) ad6b874] base
- Author: A U Thor <author@example.com>
- 3 files changed, 23 insertions(+)
- create mode 100644 base.t
- create mode 100644 one
- create mode 100644 two
-[master 9b55153] modified
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 modified.t
-rm 'one'
-rm 'two'
-[master cc1b823] combined
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+), 11 deletions(-)
- rename one => combined (50%)
- create mode 100644 combined.t
- delete mode 100644 two
-ok 1 - setup split file case
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress hello.c 2>stderr &&
 
-expecting success of 8011.2 'setup simulated porcelain': 
-	# This just reads porcelain-ish output and tries
-	# to output the value of a given field for each line (either by
-	# reading the field that accompanies this line, or referencing
-	# the information found last time the commit was mentioned).
-	cat >read-porcelain.pl <<-\EOF
-	my $field = shift;
-	while (<>) {
-		if (/^[0-9a-f]{40,} /) {
-			flush();
-			$hash = $&;
-		} elsif (/^$field (.*)/) {
-			$cache{$hash} = $1;
-		}
-	}
-	flush();
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
 
-	sub flush {
-		return unless defined $hash;
-		if (defined $cache{$hash}) {
-			print "$cache{$hash}\n";
-		} else {
-			print "NONE\n";
-		}
-	}
+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 8001.115 'blame progress on a single range': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (4/4), done.
 	EOF
 
-ok 2 - setup simulated porcelain
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress -L 3,6 hello.c 2>stderr &&
 
-expecting success of 8011.3 'generate --porcelain output': 
-		git blame --root -C --$output combined >output
-	
-ok 3 - generate --porcelain output
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
 
-expecting success of 8011.4 'porcelain output finds correct commits': 
-		generate_expect >expect <<-\EOF &&
-		5 base
-		1 modified
-		10 base
-		1 modified
-		5 base
-		EOF
-		perl read-porcelain.pl summary <output >actual &&
-		test_cmp expect actual
-	
-ok 4 - porcelain output finds correct commits
+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 8011.5 'porcelain output shows correct filenames': 
-		generate_expect >expect <<-\EOF &&
-		11 one
-		11 two
-		EOF
-		perl read-porcelain.pl filename <output >actual &&
-		test_cmp expect actual
-	
-ok 5 - porcelain output shows correct filenames
+expecting success of 8001.116 'blame progress on multiple ranges': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (7/7), done.
+	EOF
 
-expecting success of 8011.6 'porcelain output shows correct previous pointer': 
-		generate_expect >expect <<-EOF &&
-		5 NONE
-		1 $(git rev-parse modified^) one
-		10 NONE
-		1 $(git rev-parse modified^) two
-		5 NONE
-		EOF
-		perl read-porcelain.pl previous <output >actual &&
-		test_cmp expect actual
-	
-ok 6 - porcelain output shows correct previous pointer
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress -L 3,6 -L 8,10 hello.c 2>stderr &&
 
-expecting success of 8011.7 'generate --line-porcelain output': 
-		git blame --root -C --$output combined >output
-	
-ok 7 - generate --line-porcelain output
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
 
-expecting success of 8011.8 'line-porcelain output finds correct commits': 
-		generate_expect >expect <<-\EOF &&
-		5 base
-		1 modified
-		10 base
-		1 modified
-		5 base
-		EOF
-		perl read-porcelain.pl summary <output >actual &&
-		test_cmp expect actual
-	
-ok 8 - line-porcelain output finds correct commits
+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 8011.9 'line-porcelain output shows correct filenames': 
-		generate_expect >expect <<-\EOF &&
-		11 one
-		11 two
-		EOF
-		perl read-porcelain.pl filename <output >actual &&
-		test_cmp expect actual
-	
-ok 9 - line-porcelain output shows correct filenames
+expecting success of 8001.117 'annotate old revision': 
+	git annotate file main >actual &&
+	awk "{ print \$3; }" <actual >authors &&
+	test 2 = $(grep A <authors | wc -l) &&
+	test 2 = $(grep B <authors | wc -l)
 
-expecting success of 8011.10 'line-porcelain output shows correct previous pointer': 
-		generate_expect >expect <<-EOF &&
-		5 NONE
-		1 $(git rev-parse modified^) one
-		10 NONE
-		1 $(git rev-parse modified^) two
-		5 NONE
-		EOF
-		perl read-porcelain.pl previous <output >actual &&
-		test_cmp expect actual
-	
-ok 10 - line-porcelain output shows correct previous pointer
+ok 117 - annotate old revision
 
-# passed all 10 test(s)
-1..10
+# passed all 117 test(s)
+1..117
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7810-grep.sh ***
@@ -515091,6 +518474,392 @@
 1..263
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t8013-blame-ignore-revs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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_unblamable_lines with --porcelain': 
+		sha=e0d35d6f2d5fab63267e58d684cea1ecf86f12b1 &&
+
+		git -c blame.markUnblamableLines=false blame --porcelain --ignore-rev Y file >raw &&
+		cat > sedscript <<- 'EOF' &&
+		/^	y3/i\
+		unblamable
+		/^	y4/i\
+		unblamable
+		EOF
+		sed -f sedscript raw >expect &&
+
+		git -c blame.markUnblamableLines=true blame --porcelain --ignore-rev Y file >actual &&
+		test_cmp expect actual
+	
+ok 12 - mark_unblamable_lines with --porcelain
+
+expecting success of 8013.13 'mark_unblamable_lines with --line-porcelain': 
+		sha=e0d35d6f2d5fab63267e58d684cea1ecf86f12b1 &&
+
+		git -c blame.markUnblamableLines=false blame --line-porcelain --ignore-rev Y file >raw &&
+		cat > sedscript <<- 'EOF' &&
+		/^	y3/i\
+		unblamable
+		/^	y4/i\
+		unblamable
+		EOF
+		sed -f sedscript raw >expect &&
+
+		git -c blame.markUnblamableLines=true blame --line-porcelain --ignore-rev Y file >actual &&
+		test_cmp expect actual
+	
+ok 13 - mark_unblamable_lines with --line-porcelain
+
+expecting success of 8013.14 '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-09-29 14:53:49.310548970 +0000
++++ actual	2026-09-29 14:53:49.326548970 +0000
+@@ -1 +1 @@
+-?
++e
+--- expect	2026-09-29 14:53:49.310548970 +0000
++++ actual	2026-09-29 14:53:49.334548970 +0000
+@@ -1 +1 @@
+-?
++e
+ok 14 - mark_ignored_lines
+
+expecting success of 8013.15 'mark_ignored_lines with --porcelain': 
+		sha=e0d35d6f2d5fab63267e58d684cea1ecf86f12b1 &&
+
+		git -c blame.markIgnoredLines=false blame --porcelain --ignore-rev Z file >raw &&
+		cat > sedscript <<- 'EOF' &&
+		/^	line-one-Z/i\
+		ignored
+		/^	line-two-Z/i\
+		ignored
+		EOF
+		sed -f sedscript raw >expect &&
+
+		git -c blame.markIgnoredLines=true blame --porcelain --ignore-rev Z file >actual &&
+		test_cmp expect actual
+	
+ok 15 - mark_ignored_lines with --porcelain
+
+expecting success of 8013.16 'mark_ignored_lines with --line-porcelain': 
+		sha=e0d35d6f2d5fab63267e58d684cea1ecf86f12b1 &&
+
+		git -c blame.markIgnoredLines=false blame --line-porcelain --ignore-rev Z file >raw &&
+		cat > sedscript <<- 'EOF' &&
+		/^	line-one-Z/i\
+		ignored
+		/^	line-two-Z/i\
+		ignored
+		EOF
+		sed -f sedscript raw >expect &&
+
+		git -c blame.markIgnoredLines=true blame --line-porcelain --ignore-rev Z file >actual &&
+		test_cmp expect actual
+	
+ok 16 - mark_ignored_lines with --line-porcelain
+
+expecting success of 8013.17 '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 17 - mark_unblamable_lines_intermediate
+
+expecting success of 8013.18 '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.51.0/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 18 - ignored_chunk_negative_parent_size
+
+expecting success of 8013.19 '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.51.0/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 19 - ignore_merge
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7816-grep-binary-pattern.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7816-grep-binary-pattern/.git/
 # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
@@ -517150,8 +520919,8 @@
 HEAD is now at 0fb48cf add a
 Entering 'submodule'
 Entering 'submodule/sub'
---- expect	2025-08-27 08:23:00.948463256 +0000
-+++ actual	2025-08-27 08:23:00.988463520 +0000
+--- expect	2026-09-29 14:53:47.750548970 +0000
++++ actual	2026-09-29 14:53:47.806548970 +0000
 @@ -1 +1,3 @@
  a:(1|2)x(3|4)
 +submodule/a:(1|2)x(3|4)
@@ -517182,8 +520951,8 @@
 HEAD is now at 0fb48cf add a
 Entering 'submodule'
 Entering 'submodule/sub'
---- expect	2025-08-27 08:23:01.240465182 +0000
-+++ actual	2025-08-27 08:23:01.280465446 +0000
+--- expect	2026-09-29 14:53:48.094548970 +0000
++++ actual	2026-09-29 14:53:48.114548970 +0000
 @@ -1 +1,3 @@
  a:(1|2)x(3|4)
 +submodule/a:(1|2)x(3|4)
@@ -517215,8 +520984,8 @@
 HEAD is now at 0fb48cf add a
 Entering 'submodule'
 Entering 'submodule/sub'
---- expect	2025-08-27 08:23:01.576467399 +0000
-+++ actual	2025-08-27 08:23:01.604467584 +0000
+--- expect	2026-09-29 14:53:48.338548970 +0000
++++ actual	2026-09-29 14:53:48.362548970 +0000
 @@ -1 +1,3 @@
  a:(1|2)x(3|4)
 +submodule/a:(1|2)x(3|4)
@@ -517244,8 +521013,8 @@
 HEAD is now at 0fb48cf add a
 Entering 'submodule'
 Entering 'submodule/sub'
---- expect	2025-08-27 08:23:01.888469457 +0000
-+++ actual	2025-08-27 08:23:01.912469616 +0000
+--- expect	2026-09-29 14:53:48.590548970 +0000
++++ actual	2026-09-29 14:53:48.606548970 +0000
 @@ -1 +1,2 @@
  submodule/a:(1|2)x(3|4)
 +submodule/sub/a:(1|2)x(3|4)
@@ -517333,7 +521102,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 Aug 27 08:23 .git/refs/notes/textconv/d2x_cached
+-rw-r--r-- 1 pbuilder2 pbuilder2 41 Sep 29 14:53 .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': 
@@ -517403,7 +521172,7 @@
 Submodule 'sub' (file:///build/reproducible-path/git-2.51.0/t/trash directory.t7814-grep-recurse-submodules/super/sub) registered for path 'sub'
 Cloning into '/build/reproducible-path/git-2.51.0/t/trash directory.t7814-grep-recurse-submodules/partial/sub'...
 Submodule path 'sub': checked out '289fae02a658deff257301016761eff04f091022'
-{"event":"data","sid":"20250827T082303.203620Z-Hcf858c9d-P000d3d48","thread":"th01:unknown","time":"2025-08-27T08:23:03.218678Z","file":"promisor-remote.c","line":55,"repo":2,"t_abs":0.015295,"t_rel":0.008195,"nesting":1,"category":"promisor","key":"fetch_count","value":"1"}
+{"event":"data","sid":"20260929T145349.759841Z-H5c947e1c-P00266c68","thread":"th01:unknown","time":"2026-09-29T14:53:49.764443Z","file":"promisor-remote.c","line":55,"repo":2,"t_abs":0.004845,"t_rel":0.002038,"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': 
@@ -517471,1749 +521240,6 @@
 1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t8001-annotate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t8001-annotate/.git/
-expecting success of 8001.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 8001.2 'blame 1 author': 
-	check_count A 2
-
-git annotate  file 
-Author A (expected 2, attributed 2) good
-ok 2 - blame 1 author
-
-expecting success of 8001.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 annotate  file 
-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': 
-	check_count --contents=file A 2
-
-git annotate  --contents=file file 
-Author A (expected 2, attributed 2) good
-ok 4 - blame with --contents
-
-expecting success of 8001.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 annotate  --contents=contents file 
-Author A (expected 1, attributed 1) good
-ok 5 - blame with --contents in a bare repo
-
-expecting success of 8001.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 annotate  --contents=contents file 
-Author External file (--contents) (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 6 - blame with --contents changed
-
-expecting success of 8001.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 annotate  file 
-Author A (expected 2, attributed 2) good
-ok 7 - blame in a bare repo without starting commit
-
-expecting success of 8001.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 annotate  file testTag
-Author A (expected 2, attributed 2) good
-git annotate  file testTag2
-Author A (expected 2, attributed 2) good
-ok 8 - blame by tag objects
-
-expecting success of 8001.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 8001.10 'blame 2 authors': 
-	check_count A 2 B 2
-
-git annotate  file 
-Author B (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-ok 10 - blame 2 authors
-
-expecting success of 8001.11 'blame with --contents and revision': 
-	check_count -h testTag --contents=file A 2 "External file (--contents)" 2
-
-git annotate  --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 8001.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 8001.13 'blame 2 authors + 1 branch1 author': 
-	check_count A 2 B 2 B1 2
-
-git annotate  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 8001.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 8001.15 'blame 2 authors + 1 branch2 author': 
-	check_count A 2 B 1 B2 1
-
-git annotate  file 
-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': 
-	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 8001.17 'blame 2 authors + 2 merged-in authors': 
-	check_count A 2 B 1 B1 2 B2 1
-
-git annotate  file 
-Author B (expected 1, attributed 1) 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 8001.18 'blame --first-parent blames merge for branch1': 
-	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
-ok 18 - blame --first-parent blames merge for branch1
-
-expecting success of 8001.19 'blame ancestor': 
-	check_count -h main A 2 B 2
-
-git annotate  file main
-Author B (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-ok 19 - blame ancestor
-
-expecting success of 8001.20 'blame great-ancestor': 
-	check_count -h main^ A 2
-
-git annotate  file main^
-Author A (expected 2, attributed 2) good
-ok 20 - blame great-ancestor
-
-expecting success of 8001.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 8001.22 'blame evil merge': 
-	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
-
-git annotate  file 
-Author A (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 22 - blame evil merge
-
-expecting success of 8001.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 annotate  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 8001.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 8001.25 'blame incomplete line': 
-	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
-
-git annotate  file 
-Author A (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
-Author C (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 25 - blame incomplete line
-
-expecting success of 8001.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 8001.27 'blame edits': 
-	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
-
-git annotate  file 
-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 C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 27 - blame edits
-
-expecting success of 8001.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 8001.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 annotate  file 
-Author A (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 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 29 - blame obfuscated email
-
-expecting success of 8001.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 annotate  -L1 file 
-Author B1 (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 E (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)': 
-	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
-
-git annotate  -L, file 
-Author B1 (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 E (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (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 D (expected 1, attributed 1) good
-Author C (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 8001.33 '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 B1 (expected 1, attributed 1) good
-Author D (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
-ok 34 - blame -L ,Y (up to Y)
-
-expecting success of 8001.35 'blame -L X,X': 
-	check_count -L3,3 B2 1
-
-git annotate  -L3,3 file 
-Author B2 (expected 1, attributed 1) good
-ok 35 - blame -L X,X
-
-expecting success of 8001.36 'blame -L X,Y': 
-	check_count -L3,6 B 1 B1 1 B2 1 D 1
-
-git annotate  -L3,6 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 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 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 8001.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 8001.39 'blame -L 0': 
-	test_must_fail $PROG -L0 file
-
-fatal: -L invalid line number: 0
-ok 39 - blame -L 0
-
-expecting success of 8001.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 8001.41 'blame -L ,+0': 
-	test_must_fail $PROG -L,+0 file
-
-fatal: -L invalid empty range
-ok 41 - blame -L ,+0
-
-expecting success of 8001.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 8001.43 'blame -L X,+1': 
-	check_count -L3,+1 B2 1
-
-git annotate  -L3,+1 file 
-Author B2 (expected 1, attributed 1) good
-ok 43 - blame -L X,+1
-
-expecting success of 8001.44 'blame -L X,+N': 
-	check_count -L3,+4 B 1 B1 1 B2 1 D 1
-
-git annotate  -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
-ok 44 - blame -L X,+N
-
-expecting success of 8001.45 'blame -L ,-0': 
-	test_must_fail $PROG -L,-0 file
-
-fatal: -L invalid empty range
-ok 45 - blame -L ,-0
-
-expecting success of 8001.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 8001.47 'blame -L X,-1': 
-	check_count -L3,-1 B2 1
-
-git annotate  -L3,-1 file 
-Author B2 (expected 1, attributed 1) good
-ok 47 - blame -L X,-1
-
-expecting success of 8001.48 'blame -L X,-N': 
-	check_count -L6,-4 B 1 B1 1 B2 1 D 1
-
-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
-ok 48 - blame -L X,-N
-
-expecting success of 8001.49 'blame -L /RE/ (RE to end)': 
-	check_count -L/evil/ C 1 "A U Thor" 1
-
-git annotate  -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 8001.50 'blame -L /RE/,/RE2/': 
-	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
-
-git annotate  -L/robot/,/green/ file 
-Author B (expected 1, attributed 1) good
-Author E (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
-ok 50 - blame -L /RE/,/RE2/
-
-expecting success of 8001.51 'blame -L X,/RE/': 
-	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
-
-git annotate  -L5,/evil/ file 
-Author B1 (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 8001.52 'blame -L /RE/,Y': 
-	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
-
-git annotate  -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 8001.53 'blame -L /RE/,+N': 
-	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
-
-git annotate  -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
-ok 53 - blame -L /RE/,+N
-
-expecting success of 8001.54 'blame -L /RE/,-N': 
-	check_count -L/99/,-3 B 1 B2 1 D 1
-
-git annotate  -L/99/,-3 file 
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 54 - blame -L /RE/,-N
-
-expecting success of 8001.55 'blame -L X (X == nlines)': 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L$n C 1
-
-git annotate  -L8 file 
-Author C (expected 1, attributed 1) good
-ok 55 - blame -L X (X == nlines)
-
-expecting success of 8001.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 8001.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 8001.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 annotate  -L,8 file 
-Author A (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 B (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 58 - blame -L ,Y (Y == nlines)
-
-expecting success of 8001.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 annotate  -L,9 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
-Author E (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 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 B2 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B (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 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 61 - blame -L multiple (disjoint)
-
-expecting success of 8001.62 'blame -L multiple (disjoint: unordered)': 
-	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 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (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 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 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 B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 64 - blame -L multiple (adjacent: unordered)
-
-expecting success of 8001.65 'blame -L multiple (overlapping)': 
-	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
-
-git annotate  -L2,4 -L3,5 file 
-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 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 D (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
-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 A U Thor (expected 1, attributed 1) good
-Author B1 (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 B (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 B1 (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 A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (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 D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author C (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 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 B1 (expected 1, attributed 1) good
-Author A U Thor (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
-ok 71 - blame -L /RE/ (relative: adjacent)
-
-expecting success of 8001.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 8001.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 8001.74 'blame -L ^/RE/ (absolute)': 
-	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
-
-git annotate  -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 8001.75 'blame -L ^/RE/ (absolute: no preceding range)': 
-	check_count -L^/dog/,+2 A 1 B2 1
-
-git annotate  -L^/dog/,+2 file 
-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)': 
-	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 8001.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 annotate  -L8 -L^/$/,+2 file 
-Author C (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 77 - blame -L ^/RE/ (absolute: end-of-file)
-
-expecting success of 8001.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 8001.79 'blame -L :literal': 
-	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
-ok 79 - blame -L :literal
-
-expecting success of 8001.80 'blame -L :regex': 
-	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
-
-git annotate  -L:m[a-z][a-z]l hello.c 
-Author H (expected 4, attributed 4) good
-ok 80 - blame -L :regex
-
-expecting success of 8001.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 8001.82 'blame -L :RE (relative)': 
-	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
-ok 82 - blame -L :RE (relative)
-
-expecting success of 8001.83 'blame -L :RE (relative: no preceding range)': 
-	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
-ok 83 - blame -L :RE (relative: no preceding range)
-
-expecting success of 8001.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 8001.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 8001.86 'blame -L ^:RE (absolute)': 
-	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
-
-git annotate  -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)
-
-expecting success of 8001.87 'blame -L ^:RE (absolute: no preceding range)': 
-	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
-ok 87 - blame -L ^:RE (absolute: no preceding range)
-
-expecting success of 8001.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 8001.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 annotate  -L10 -L^:ma.. hello.c 
-Author H (expected 1, attributed 1) good
-Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
-ok 89 - blame -L ^:RE (absolute: end-of-file)
-
-expecting success of 8001.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 annotate  -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 8001.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 8001.92 'blame empty': 
-	check_count -h HEAD^^ -f incremental
-
-git annotate  incremental HEAD^^
-ok 92 - blame empty
-
-expecting success of 8001.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 8001.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 8001.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 8001.96 'blame half': 
-	check_count -h HEAD^ -f incremental I 1
-
-git annotate  incremental HEAD^
-Author I (expected 1, attributed 1) good
-ok 96 - blame half
-
-expecting success of 8001.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 8001.98 'blame -L 1 half': 
-	check_count -h HEAD^ -f incremental -L1 I 1
-
-git annotate  -L1 incremental HEAD^
-Author I (expected 1, attributed 1) good
-ok 98 - blame -L 1 half
-
-expecting success of 8001.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 8001.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 8001.101 'blame full': 
-	check_count -f incremental I 1
-
-git annotate  incremental 
-Author I (expected 1, attributed 1) good
-ok 101 - blame full
-
-expecting success of 8001.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 8001.103 'blame -L 1 full': 
-	check_count -f incremental -L1 I 1
-
-git annotate  -L1 incremental 
-Author I (expected 1, attributed 1) good
-ok 103 - blame -L 1 full
-
-expecting success of 8001.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 8001.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 8001.106 'blame -L': 
-	test_must_fail $PROG -L file
-
-usage: git annotate [<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 8001.107 'blame -L X,+': 
-	test_must_fail $PROG -L1,+ file
-
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 107 - blame -L X,+
-
-expecting success of 8001.108 'blame -L X,-': 
-	test_must_fail $PROG -L1,- file
-
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 108 - blame -L X,-
-
-expecting success of 8001.109 'blame -L X (non-numeric X)': 
-	test_must_fail $PROG -LX file
-
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 109 - blame -L X (non-numeric X)
-
-expecting success of 8001.110 'blame -L X,Y (non-numeric Y)': 
-	test_must_fail $PROG -L1,Y file
-
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 110 - blame -L X,Y (non-numeric Y)
-
-expecting success of 8001.111 'blame -L X,+N (non-numeric N)': 
-	test_must_fail $PROG -L1,+N file
-
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 111 - blame -L X,+N (non-numeric N)
-
-expecting success of 8001.112 'blame -L X,-N (non-numeric N)': 
-	test_must_fail $PROG -L1,-N file
-
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 112 - blame -L X,-N (non-numeric N)
-
-expecting success of 8001.113 'blame -L ,^/RE/': 
-	test_must_fail $PROG -L1,^/99/ file
-
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 113 - blame -L ,^/RE/
-
-expecting success of 8001.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 8001.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 8001.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 8001.117 'annotate old revision': 
-	git annotate file main >actual &&
-	awk "{ print \$3; }" <actual >authors &&
-	test 2 = $(grep A <authors | wc -l) &&
-	test 2 = $(grep B <authors | wc -l)
-
-ok 117 - annotate old revision
-
-# passed all 117 test(s)
-1..117
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t8013-blame-ignore-revs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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_unblamable_lines with --porcelain': 
-		sha=e0d35d6f2d5fab63267e58d684cea1ecf86f12b1 &&
-
-		git -c blame.markUnblamableLines=false blame --porcelain --ignore-rev Y file >raw &&
-		cat > sedscript <<- 'EOF' &&
-		/^	y3/i\
-		unblamable
-		/^	y4/i\
-		unblamable
-		EOF
-		sed -f sedscript raw >expect &&
-
-		git -c blame.markUnblamableLines=true blame --porcelain --ignore-rev Y file >actual &&
-		test_cmp expect actual
-	
-ok 12 - mark_unblamable_lines with --porcelain
-
-expecting success of 8013.13 'mark_unblamable_lines with --line-porcelain': 
-		sha=e0d35d6f2d5fab63267e58d684cea1ecf86f12b1 &&
-
-		git -c blame.markUnblamableLines=false blame --line-porcelain --ignore-rev Y file >raw &&
-		cat > sedscript <<- 'EOF' &&
-		/^	y3/i\
-		unblamable
-		/^	y4/i\
-		unblamable
-		EOF
-		sed -f sedscript raw >expect &&
-
-		git -c blame.markUnblamableLines=true blame --line-porcelain --ignore-rev Y file >actual &&
-		test_cmp expect actual
-	
-ok 13 - mark_unblamable_lines with --line-porcelain
-
-expecting success of 8013.14 '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	2025-08-27 08:23:03.432479644 +0000
-+++ actual	2025-08-27 08:23:03.448479749 +0000
-@@ -1 +1 @@
--?
-+e
---- expect	2025-08-27 08:23:03.432479644 +0000
-+++ actual	2025-08-27 08:23:03.452479776 +0000
-@@ -1 +1 @@
--?
-+e
-ok 14 - mark_ignored_lines
-
-expecting success of 8013.15 'mark_ignored_lines with --porcelain': 
-		sha=e0d35d6f2d5fab63267e58d684cea1ecf86f12b1 &&
-
-		git -c blame.markIgnoredLines=false blame --porcelain --ignore-rev Z file >raw &&
-		cat > sedscript <<- 'EOF' &&
-		/^	line-one-Z/i\
-		ignored
-		/^	line-two-Z/i\
-		ignored
-		EOF
-		sed -f sedscript raw >expect &&
-
-		git -c blame.markIgnoredLines=true blame --porcelain --ignore-rev Z file >actual &&
-		test_cmp expect actual
-	
-ok 15 - mark_ignored_lines with --porcelain
-
-expecting success of 8013.16 'mark_ignored_lines with --line-porcelain': 
-		sha=e0d35d6f2d5fab63267e58d684cea1ecf86f12b1 &&
-
-		git -c blame.markIgnoredLines=false blame --line-porcelain --ignore-rev Z file >raw &&
-		cat > sedscript <<- 'EOF' &&
-		/^	line-one-Z/i\
-		ignored
-		/^	line-two-Z/i\
-		ignored
-		EOF
-		sed -f sedscript raw >expect &&
-
-		git -c blame.markIgnoredLines=true blame --line-porcelain --ignore-rev Z file >actual &&
-		test_cmp expect actual
-	
-ok 16 - mark_ignored_lines with --line-porcelain
-
-expecting success of 8013.17 '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 17 - mark_unblamable_lines_intermediate
-
-expecting success of 8013.18 '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.51.0/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 18 - ignored_chunk_negative_parent_size
-
-expecting success of 8013.19 '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.51.0/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 19 - ignore_merge
-
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9003-help-autocorrect.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9003-help-autocorrect/.git/
 expecting success of 9003.1 'setup': 
@@ -519398,8 +521424,8 @@
 	check_count A 1 "Not Committed Yet" 1
 
 git blame -c  file 
-Author A (expected 1, attributed 1) good
 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': 
@@ -519429,8 +521455,8 @@
 	check_count --contents=contents A 1 "External file (--contents)" 1
 
 git blame -c  --contents=contents file 
-Author External file (--contents) (expected 1, attributed 1) good
 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': 
@@ -519478,16 +521504,16 @@
 	check_count A 2 B 2
 
 git blame -c  file 
-Author B (expected 2, attributed 2) good
 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 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 8002.12 'setup B1 lines (branch1)': 
@@ -519508,8 +521534,8 @@
 
 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
+Author B1 (expected 2, attributed 2) good
 ok 13 - blame 2 authors + 1 branch1 author
 
 expecting success of 8002.14 'setup B2 lines (branch2)': 
@@ -519529,8 +521555,8 @@
 	check_count A 2 B 1 B2 1
 
 git blame -c  file 
-Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
 ok 15 - blame 2 authors + 1 branch2 author
 
@@ -519548,19 +521574,19 @@
 
 git blame -c  file 
 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
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) 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 B2 (expected 1, attributed 1) good
+Author B (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 B2 (expected 1, attributed 1) good
 ok 18 - blame --first-parent blames merge for branch1
 
 expecting success of 8002.19 'blame ancestor': 
@@ -519592,10 +521618,10 @@
 
 git blame -c  file 
 Author A U Thor (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 B (expected 1, attributed 1) good
 Author B1 (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
 ok 22 - blame evil merge
 
 expecting success of 8002.23 'blame huge graft': 
@@ -519778,8 +521804,8 @@
 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
+Author 01 (expected 1, attributed 1) good
 Switched to branch 'branch2'
 ok 23 - blame huge graft
 
@@ -519797,12 +521823,12 @@
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
 
 git blame -c  file 
+Author B (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) 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 U Thor (expected 1, attributed 1) good
 ok 25 - blame incomplete line
 
 expecting success of 8002.26 'setup edits': 
@@ -519824,13 +521850,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 (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 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 (expected 1, attributed 1) good
 ok 27 - blame edits
 
 expecting success of 8002.28 'setup obfuscated email': 
@@ -519849,13 +521875,13 @@
 	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 C (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 B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author D (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 E (expected 1, attributed 1) good
 ok 29 - blame obfuscated email
 
@@ -519863,14 +521889,14 @@
 	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 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 C (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 D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 ok 30 - blame -L 1 (all)
 
 expecting success of 8002.31 'blame -L , (all)': 
@@ -519878,32 +521904,32 @@
 
 git blame -c  -L, file 
 Author D (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
-Author E (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 B (expected 1, attributed 1) good
+Author A (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 A U Thor (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 D (expected 1, attributed 1) good
+Author A U Thor (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 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 C (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 ok 33 - blame -L X, (X to end)
 
@@ -519911,9 +521937,9 @@
 	check_count -L,3 A 1 B2 1 E 1
 
 git blame -c  -L,3 file 
+Author B2 (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 34 - blame -L ,Y (up to Y)
 
 expecting success of 8002.35 'blame -L X,X': 
@@ -519927,9 +521953,9 @@
 	check_count -L3,6 B 1 B1 1 B2 1 D 1
 
 git blame -c  -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 B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 ok 36 - blame -L X,Y
 
@@ -519937,10 +521963,10 @@
 	check_count -L6,3 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L6,3 file 
-Author D (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 B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 ok 37 - blame -L Y,X (undocumented)
 
 expecting success of 8002.38 'blame -L -X': 
@@ -519984,9 +522010,9 @@
 	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 D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 ok 44 - blame -L X,+N
 
@@ -520013,10 +522039,10 @@
 	check_count -L6,-4 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L6,-4 file 
-Author B1 (expected 1, attributed 1) good
-Author B (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 B1 (expected 1, attributed 1) good
 ok 48 - blame -L X,-N
 
 expecting success of 8002.49 'blame -L /RE/ (RE to end)': 
@@ -520031,20 +522057,20 @@
 	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 B (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
-Author D (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 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 51 - blame -L X,/RE/
 
 expecting success of 8002.52 'blame -L /RE/,Y': 
@@ -520069,9 +522095,9 @@
 	check_count -L/99/,-3 B 1 B2 1 D 1
 
 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
+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)': 
@@ -520100,14 +522126,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 E (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
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author A U Thor (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 C (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 ok 58 - blame -L ,Y (Y == nlines)
 
 expecting success of 8002.59 'blame -L ,Y (Y == nlines + 1)': 
@@ -520115,13 +522141,13 @@
 	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 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
 Author A U Thor (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
 Author B (expected 1, attributed 1) good
 ok 59 - blame -L ,Y (Y == nlines + 1)
 
@@ -520129,14 +522155,14 @@
 	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 A U Thor (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
 Author A (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 D (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
 ok 60 - blame -L ,Y (Y > nlines)
 
 expecting success of 8002.61 'blame -L multiple (disjoint)': 
@@ -520145,28 +522171,28 @@
 git blame -c  -L2,3 -L6,7 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
+Author A U Thor (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 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 B2 (expected 1, attributed 1) good
+Author A (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 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
 ok 63 - blame -L multiple (adjacent)
 
 expecting success of 8002.64 'blame -L multiple (adjacent: unordered)': 
@@ -520174,19 +522200,19 @@
 
 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 D (expected 1, attributed 1) good
+Author A (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 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
+Author D (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)': 
@@ -520194,8 +522220,8 @@
 
 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 B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 ok 66 - blame -L multiple (overlapping: unordered)
 
@@ -520203,48 +522229,48 @@
 	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 B (expected 1, attributed 1) good
-Author B2 (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 B1 (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 A U Thor (expected 1, attributed 1) good
+Author B2 (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 B1 (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 A U Thor (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
 Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (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 B2 (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 D (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 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 D (expected 1, attributed 1) good
+Author B (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 A U Thor (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
 ok 70 - blame -L /RE/ (relative: no preceding range)
@@ -520273,8 +522299,8 @@
 	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
 
 git blame -c  -L3,3 -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 74 - blame -L ^/RE/ (absolute)
 
 expecting success of 8002.75 'blame -L ^/RE/ (absolute: no preceding range)': 
@@ -520346,8 +522372,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 8002.80 'blame -L :regex': 
@@ -520367,8 +522393,8 @@
 	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
 
 git blame -c  -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 8002.83 'blame -L :RE (relative: no preceding range)': 
@@ -520395,8 +522421,8 @@
 	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
 
 git blame -c  -L3,3 -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 86 - blame -L ^:RE (absolute)
 
 expecting success of 8002.87 'blame -L ^:RE (absolute: no preceding range)': 
@@ -520418,9 +522444,9 @@
 	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
 
 git blame -c  -L10 -L^:ma.. hello.c 
-Author F (expected 4, attributed 4) good
 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': 
@@ -520452,8 +522478,8 @@
  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
+Author B (expected 1, attributed 1) good
 ok 90 - blame -L :funcname with userdiff driver
 
 expecting success of 8002.91 'setup incremental': 
@@ -520740,12 +522766,12 @@
 git blame -c -e  file 
 Author <B2@test.git> (expected 1, attributed 1) good
 Author <D@test.git> (expected 1, attributed 1) good
+Author <author@example.com> (expected 1, attributed 1) good
+Author <B1@test.git> (expected 1, attributed 1) good
 Author <C@test.git> (expected 1, attributed 1) good
+Author <A@test.git> (expected 1, attributed 1) good
 Author <E at test dot git> (expected 1, attributed 1) good
 Author <B@test.git> (expected 1, attributed 1) good
-Author <author@example.com> (expected 1, attributed 1) good
-Author <A@test.git> (expected 1, attributed 1) good
-Author <B1@test.git> (expected 1, attributed 1) good
 ok 119 - blame --show-email
 
 expecting success of 8002.120 'setup showEmail tests': 
@@ -520947,1115 +522973,13 @@
 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-08-27 08:23:04 +0000 2) bar
+00000000 (Not Committed Yet 2026-09-29 14:53:50 +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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7704-repack-cruft.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/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.51.0/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 too large': 
-	git init max-cruft-size-large &&
-	(
-		cd max-cruft-size-large &&
-		test_commit base &&
-
-		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
-		git repack --cruft -d &&
-		cruft_foo="$(ls $packdir/pack-*.mtimes)" &&
-
-		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-tool pack-mtimes $(basename "$cruft_foo") >foo.objects &&
-		test-tool pack-mtimes $(basename "$cruft_bar") >bar.objects &&
-
-		grep "^$foo" foo.objects &&
-		test_line_count = 1 foo.objects &&
-		grep "^$bar" bar.objects &&
-		test_line_count = 1 bar.objects
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 1756282976
-bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1756282976
-ok 3 - --max-cruft-size creates new packs when too large
-
-expecting success of 7704.4 '--max-cruft-size combines existing packs when not too large': 
-	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.51.0/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 1756282976
-bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1756282977
-ok 4 - --max-cruft-size combines existing packs when not too large
-
-expecting success of 7704.5 '--combine-cruft-below-size combines packs': 
-	repo=combine-cruft-below-size &&
-	test_when_finished "rm -fr $repo" &&
-
-	git init "$repo" &&
-	(
-		cd "$repo" &&
-
-		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 `--combine-cruft-below-size=1M`
-		# should combine both 0.5 MiB packs together, but
-		# ignore the two packs which are >= 1.0 MiB.
-		ls $packdir/pack-*.mtimes | sort >cruft.before &&
-		git repack -d --cruft --combine-cruft-below-size=1M &&
-		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 &&
-
-		# The two packs smaller than 1.0MiB should be repacked
-		# together.
-		printf "%s\n" $cruft_foo $cruft_bar | sort >expect.removed &&
-		test_cmp expect.removed cruft.removed &&
-
-		# ...and contain the set of objects rolled up.
-		test-tool pack-mtimes "$(basename $(cat cruft.new))" >actual.raw &&
-		sort actual.raw >actual.objects &&
-
-		test_cmp expect.objects actual.objects
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/combine-cruft-below-size/.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 - --combine-cruft-below-size combines packs
-
-expecting success of 7704.6 'setup cruft with freshened objects': 
-	git init cruft-freshen &&
-	(
-		cd cruft-freshen &&
-
-		test_commit base &&
-		git repack -ad &&
-
-		foo="$(generate_random_blob foo 64)" &&
-		test-tool chmtime --get -10000 \
-			"$objdir/$(test_oid_to_path "$foo")" >foo.mtime &&
-
-		git repack --cruft -d &&
-
-		cruft="$(ls $packdir/pack-*.mtimes)" &&
-		test-tool pack-mtimes "$(basename $cruft)" >actual &&
-		echo "$foo $(cat foo.mtime)" >expect &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/cruft-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 cruft with freshened objects
-
-expecting success of 7704.7 'cruft with freshened objects (loose)': 
-	(
-		cd cruft-freshen &&
-
-		# 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 &&
-
-		cruft="$(ls $packdir/pack-*.mtimes)" &&
-		test-tool pack-mtimes "$(basename $cruft)" >actual &&
-		echo "$foo $(cat foo.mtime)" >expect &&
-		test_cmp expect actual
-	)
-
-ok 7 - cruft with freshened objects (loose)
-
-expecting success of 7704.8 'cruft with freshened objects (packed)': 
-	(
-		cd cruft-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 &&
-
-		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
-	)
-
-ok 8 - cruft with freshened objects (packed)
-
-expecting success of 7704.9 'multi-cruft with freshened objects (previously cruft)': 
-	repo="max-cruft-size-threshold" &&
-
-	test_when_finished "rm -fr $repo" &&
-	git init "$repo" &&
-	(
-		cd "$repo" &&
-
-		test_commit base &&
-		foo="$(generate_random_blob foo $((2*1024*1024)))" &&
-		bar="$(generate_random_blob bar $((2*1024*1024)))" &&
-		baz="$(generate_random_blob baz $((2*1024*1024)))" &&
-
-		test-tool chmtime --get -100000 \
-			"$objdir/$(test_oid_to_path "$foo")" >foo.old &&
-		test-tool chmtime --get -100000 \
-			"$objdir/$(test_oid_to_path "$bar")" >bar.old &&
-		test-tool chmtime --get -100000 \
-			"$objdir/$(test_oid_to_path "$baz")" >baz.old &&
-
-		git repack --cruft -d &&
-
-		# Make an identical copy of foo stored in a pack with a more
-		# recent mtime.
-		foo="$(generate_random_blob foo $((2*1024*1024)))" &&
-		foo_pack="$(echo "$foo" | git pack-objects $packdir/pack)" &&
-		test-tool chmtime --get -100 \
-			"$packdir/pack-$foo_pack.pack" >foo.new &&
-		git prune-packed &&
-
-		# Make a loose copy of bar, also with a more recent mtime.
-		bar="$(generate_random_blob bar $((2*1024*1024)))" &&
-		test-tool chmtime --get -100 \
-			"$objdir/$(test_oid_to_path "$bar")" >bar.new &&
-
-		# Make a new cruft object $quux to ensure we do not
-		# generate an identical pack to the existing cruft
-		# pack.
-		quux="$(generate_random_blob quux $((1024)))" &&
-		test-tool chmtime --get -100 \
-			"$objdir/$(test_oid_to_path "$quux")" >quux.new &&
-
-		git repack --cruft --max-cruft-size=3M -d &&
-
-		for p in $packdir/pack-*.mtimes
-		do
-			test-tool pack-mtimes "$(basename "$p")" || return 1
-		done >actual.raw &&
-		sort actual.raw >actual &&
-
-		# Among the set of all cruft packs, we should see the
-		# new mtimes for object $foo and $bar, as well as the
-		# single new copy of $baz.
-		sort >expect <<-EOF &&
-		$foo $(cat foo.new)
-		$bar $(cat bar.new)
-		$baz $(cat baz.old)
-		$quux $(cat quux.new)
-		EOF
-
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/max-cruft-size-threshold/.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 - multi-cruft with freshened objects (previously cruft)
-
-expecting success of 7704.10 '--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 &&
-
-		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.51.0/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 10 - --max-cruft-size with pruning
-
-expecting success of 7704.11 '--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
-	) &&
-
-	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.51.0/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 11 - --max-cruft-size ignores non-local packs
-
-expecting success of 7704.12 'reachable packs are preferred over cruft ones': 
-	repo="cruft-preferred-packs" &&
-	git init "$repo" &&
-	(
-		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"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 12 - reachable packs are preferred over cruft ones
-
-expecting success of 7704.13 'repack --cruft generates a cruft pack': 
-	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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-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 13 - repack --cruft generates a cruft pack
-
-expecting success of 7704.14 'cruft packs are not included in geometric repack': 
-	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 &&
-		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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-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 14 - cruft packs are not included in geometric repack
-
-expecting success of 7704.15 'repack --geometric collects once-cruft objects': 
-	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 &&
-		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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-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 15 - repack --geometric collects once-cruft objects
-
-expecting success of 7704.16 '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.51.0/t/trash directory.t7704-repack-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 16 - cruft repack with no reachable objects
-
-expecting success of 7704.17 '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=$(generate_random_blob foo 1048576) &&
-		bar=$(generate_random_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"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-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 base.t
-ok 17 - cruft repack with --max-pack-size
-
-expecting success of 7704.18 '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 18 - cruft repack with pack.packSizeLimit
-
-expecting success of 7704.19 '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.51.0/t/trash directory.t7704-repack-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":"20250827T082304.142875Z-Hcf858c9d-P000d467c","thread":"main","time":"2025-08-27T08:23:04.156143Z","file":"run-command.c","line":740,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-870012-pack","--cruft","--honor-pack-keep","--non-empty"]}
-{"event":"start","sid":"20250827T082304.142875Z-Hcf858c9d-P000d467c/20250827T082304.160230Z-Hcf858c9d-P000d4694","thread":"main","time":"2025-08-27T08:23:04.160297Z","file":"common-init.c","line":58,"t_abs":0.000270,"argv":["/build/reproducible-path/git-2.51.0/git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-870012-pack","--cruft","--honor-pack-keep","--non-empty"]}
-ok 19 - cruft repack respects repack.cruftWindow
-
-expecting success of 7704.20 '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.51.0/t/trash directory.t7704-repack-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":"20250827T082304.229292Z-Hcf858c9d-P000d472c","thread":"main","time":"2025-08-27T08:23:04.236894Z","file":"run-command.c","line":740,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-870188-pack","--cruft","--honor-pack-keep","--non-empty"]}
-{"event":"start","sid":"20250827T082304.229292Z-Hcf858c9d-P000d472c/20250827T082304.241260Z-Hcf858c9d-P000d4742","thread":"main","time":"2025-08-27T08:23:04.241321Z","file":"common-init.c","line":58,"t_abs":0.000261,"argv":["/build/reproducible-path/git-2.51.0/git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-870188-pack","--cruft","--honor-pack-keep","--non-empty"]}
-ok 20 - cruft repack respects --window by default
-
-expecting success of 7704.21 '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.51.0/t/trash directory.t7704-repack-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 21 - cruft repack respects --quiet
-
-expecting success of 7704.22 'repack --write-midx excludes cruft where possible': 
-	setup_cruft_exclude_tests exclude-cruft-when-possible &&
-	(
-		cd exclude-cruft-when-possible &&
-
-		GIT_TEST_MULTI_PACK_INDEX=0 \
-		git repack -d --geometric=2 --write-midx --write-bitmap-index &&
-
-		test-tool read-midx --show-objects $objdir >midx &&
-		cruft="$(ls $packdir/*.mtimes)" &&
-		test_grep ! "$(basename "$cruft" .mtimes).idx" midx &&
-
-		git rev-list --all --objects --no-object-names >reachable.raw &&
-		sort reachable.raw >reachable.objects &&
-		awk "/\.pack$/ { print \$1 }" <midx | sort >midx.objects &&
-
-		test_cmp reachable.objects midx.objects
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/exclude-cruft-when-possible/.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
-HEAD is now at d79ce16 one
-Updating d79ce16..139b20d
-Fast-forward
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[master 25e18d2] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-ok 22 - repack --write-midx excludes cruft where possible
-
-expecting success of 7704.23 'repack --write-midx includes cruft when instructed': 
-	setup_cruft_exclude_tests exclude-cruft-when-instructed &&
-	(
-		cd exclude-cruft-when-instructed &&
-
-		GIT_TEST_MULTI_PACK_INDEX=0 \
-		git -c repack.midxMustContainCruft=true repack \
-			-d --geometric=2 --write-midx --write-bitmap-index &&
-
-		test-tool read-midx --show-objects $objdir >midx &&
-		cruft="$(ls $packdir/*.mtimes)" &&
-		test_grep "$(basename "$cruft" .mtimes).idx" midx &&
-
-		git cat-file --batch-check="%(objectname)" --batch-all-objects \
-			>all.objects &&
-		awk "/\.pack$/ { print \$1 }" <midx | sort >midx.objects &&
-
-		test_cmp all.objects midx.objects
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/exclude-cruft-when-instructed/.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
-HEAD is now at d79ce16 one
-Updating d79ce16..139b20d
-Fast-forward
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[master 25e18d2] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-pack-45dcff625845dc0ad702f91d853d0950f9be0eb9.idx
-ok 23 - repack --write-midx includes cruft when instructed
-
-expecting success of 7704.24 'repack --write-midx includes cruft when necessary': 
-	setup_cruft_exclude_tests exclude-cruft-when-necessary &&
-	(
-		cd exclude-cruft-when-necessary &&
-
-		test_path_is_file $(ls $packdir/pack-*.mtimes) &&
-		( cd $packdir && ls pack-*.idx ) | sort >packs.all &&
-		git multi-pack-index write --stdin-packs --bitmap <packs.all &&
-
-		test_commit five &&
-		GIT_TEST_MULTI_PACK_INDEX=0 \
-		git repack -d --geometric=2 --write-midx --write-bitmap-index &&
-
-		test-tool read-midx --show-objects $objdir >midx &&
-		awk "/\.pack$/ { print \$1 }" <midx | sort >midx.objects &&
-		git cat-file --batch-all-objects --batch-check="%(objectname)" \
-			>expect.objects &&
-		test_cmp expect.objects midx.objects &&
-
-		grep "^pack-" midx >midx.packs &&
-		test_line_count = "$(($(wc -l <packs.all) + 1))" midx.packs
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/exclude-cruft-when-necessary/.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
-HEAD is now at d79ce16 one
-Updating d79ce16..139b20d
-Fast-forward
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[master 25e18d2] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-[master 9bb13c5] five
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-ok 24 - repack --write-midx includes cruft when necessary
-
-expecting success of 7704.25 'repack --write-midx includes cruft when already geometric': 
-	git init repack--write-midx-geometric-noop &&
-	(
-		cd repack--write-midx-geometric-noop &&
-
-		git branch -M main &&
-		test_commit A &&
-		test_commit B &&
-
-		git checkout -B side &&
-		test_commit --no-tag C &&
-		C="$(git rev-parse HEAD)" &&
-
-		git checkout main &&
-		git branch -D side &&
-		git reflog expire --all --expire=all &&
-
-		# At this point we have two packs: one containing the
-		# objects belonging to commits A and B, and another
-		# (cruft) pack containing the objects belonging to
-		# commit C.
-		git repack --cruft -d &&
-
-		# Create a third pack which contains a merge commit
-		# making commit C reachable again.
-		#
-		# --no-ff is important here, as it ensures that we
-		# actually write a new object and subsequently a new
-		# pack to contain it.
-		git merge --no-ff $C &&
-		git repack -d &&
-
-		ls $packdir/pack-*.idx | sort >packs.all &&
-		cruft="$(ls $packdir/pack-*.mtimes)" &&
-		cruft="${cruft%.mtimes}.idx" &&
-
-		for idx in $(grep -v $cruft <packs.all)
-		do
-			git show-index <$idx >out &&
-			wc -l <out || return 1
-		done >sizes.raw &&
-
-		# Make sure that there are two non-cruft packs, and
-		# that one of them contains at least twice as many
-		# objects as the other, ensuring that they are already
-		# in a geometric progression.
-		sort -n sizes.raw >sizes &&
-		test_line_count = 2 sizes &&
-		s1=$(head -n 1 sizes) &&
-		s2=$(tail -n 1 sizes) &&
-		test "$s2" -gt "$((2 * $s1))" &&
-
-		git -c repack.midxMustContainCruft=false repack --geometric=2 \
-			--write-midx --write-bitmap-index
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7704-repack-cruft/repack--write-midx-geometric-noop/.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
-Switched to a new branch 'side'
-[side 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to branch 'main'
-Deleted branch side (was 35a8500).
-Merge made by the 'ort' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Nothing new to pack.
-ok 25 - repack --write-midx includes cruft when already geometric
-
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t8014-blame-ignore-fuzzy.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t8014-blame-ignore-fuzzy/.git/
 expecting success of 8014.1 'setup': 
@@ -522546,8 +523470,8 @@
 	test_subcommand git gc --no-quiet --no-detach --skip-foreground-tasks <run-no-quiet.txt
 
 Nothing new to pack.
-{"event":"child_start","sid":"20250827T082259.426819Z-Hcf858c9d-P000d0b5b","thread":"main","time":"2025-08-27T08:22:59.436102Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach","--skip-foreground-tasks"]}
-{"event":"child_start","sid":"20250827T082259.494269Z-Hcf858c9d-P000d0c4f","thread":"main","time":"2025-08-27T08:22:59.500295Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","gc","--no-quiet","--no-detach","--skip-foreground-tasks"]}
+{"event":"child_start","sid":"20260929T145346.325675Z-H5c947e1c-P002634a9","thread":"main","time":"2026-09-29T14:53:46.331169Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach","--skip-foreground-tasks"]}
+{"event":"child_start","sid":"20260929T145346.371815Z-H5c947e1c-P00263563","thread":"main","time":"2026-09-29T14:53:46.378953Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","gc","--no-quiet","--no-detach","--skip-foreground-tasks"]}
 ok 2 - run [--auto|--quiet]
 
 expecting success of 7900.3 'maintenance.auto config option': 
@@ -522562,8 +523486,8 @@
 		commit --quiet --allow-empty -m 3 &&
 	test_subcommand ! git maintenance run --auto --quiet --detach <false
 
-{"event":"child_start","sid":"20250827T082259.559143Z-Hcf858c9d-P000d0d17","thread":"main","time":"2025-08-27T08:22:59.561243Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
-{"event":"child_start","sid":"20250827T082259.578251Z-Hcf858c9d-P000d0d36","thread":"main","time":"2025-08-27T08:22:59.581546Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+{"event":"child_start","sid":"20260929T145346.428686Z-H5c947e1c-P0026364a","thread":"main","time":"2026-09-29T14:53:46.430612Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+{"event":"child_start","sid":"20260929T145346.442296Z-H5c947e1c-P00263681","thread":"main","time":"2026-09-29T14:53:46.444488Z","file":"run-command.c","line":740,"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': 
@@ -522572,7 +523496,7 @@
 		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":"20250827T082259.625946Z-Hcf858c9d-P000d0de9","thread":"main","time":"2025-08-27T08:22:59.628571Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+{"event":"child_start","sid":"20260929T145346.477423Z-H5c947e1c-P0026371d","thread":"main","time":"2026-09-29T14:53:46.479766Z","file":"run-command.c","line":740,"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': 
@@ -522581,7 +523505,7 @@
 		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":"20250827T082259.667391Z-Hcf858c9d-P000d0e7b","thread":"main","time":"2025-08-27T08:22:59.674463Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20260929T145346.517101Z-H5c947e1c-P002637c7","thread":"main","time":"2026-09-29T14:53:46.519435Z","file":"run-command.c","line":740,"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': 
@@ -522590,7 +523514,7 @@
 		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":"20250827T082259.724230Z-Hcf858c9d-P000d0f26","thread":"main","time":"2025-08-27T08:22:59.728409Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+{"event":"child_start","sid":"20260929T145346.543820Z-H5c947e1c-P00263835","thread":"main","time":"2026-09-29T14:53:46.546444Z","file":"run-command.c","line":740,"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': 
@@ -522599,7 +523523,7 @@
 		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":"20250827T082259.770546Z-Hcf858c9d-P000d0fe0","thread":"main","time":"2025-08-27T08:22:59.781235Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20260929T145346.570697Z-H5c947e1c-P002638b2","thread":"main","time":"2026-09-29T14:53:46.579592Z","file":"run-command.c","line":740,"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': 
@@ -522609,7 +523533,7 @@
 	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":"20250827T082259.822595Z-Hcf858c9d-P000d1080","thread":"main","time":"2025-08-27T08:22:59.829102Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20260929T145346.623768Z-H5c947e1c-P0026398a","thread":"main","time":"2026-09-29T14:53:46.637971Z","file":"run-command.c","line":740,"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': 
@@ -522668,7 +523592,7 @@
 	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":"20250827T082259.984127Z-Hcf858c9d-P000d12d6","thread":"main","time":"2025-08-27T08:22:59.984754Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260929T145346.764671Z-H5c947e1c-P00263c44","thread":"main","time":"2026-09-29T14:53:46.765921Z","file":"run-command.c","line":740,"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>': 
@@ -522687,11 +523611,11 @@
 	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":"20250827T082300.029062Z-Hcf858c9d-P000d1361","thread":"main","time":"2025-08-27T08:23:00.036861Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach","--skip-foreground-tasks"]}
-{"event":"child_start","sid":"20250827T082300.098900Z-Hcf858c9d-P000d1475","thread":"main","time":"2025-08-27T08:23:00.117417Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach","--skip-foreground-tasks"]}
-{"event":"child_start","sid":"20250827T082300.006100Z-Hcf858c9d-P000d131f","thread":"main","time":"2025-08-27T08:23:00.006643Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250827T082300.082996Z-Hcf858c9d-P000d1459","thread":"main","time":"2025-08-27T08:23:00.083527Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250827T082300.098900Z-Hcf858c9d-P000d1475","thread":"main","time":"2025-08-27T08:23:00.112238Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260929T145346.798936Z-H5c947e1c-P00263ce5","thread":"main","time":"2026-09-29T14:53:46.806846Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach","--skip-foreground-tasks"]}
+{"event":"child_start","sid":"20260929T145346.848587Z-H5c947e1c-P00263dd1","thread":"main","time":"2026-09-29T14:53:46.869100Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach","--skip-foreground-tasks"]}
+{"event":"child_start","sid":"20260929T145346.790778Z-H5c947e1c-P00263cbb","thread":"main","time":"2026-09-29T14:53:46.791291Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260929T145346.840056Z-H5c947e1c-P00263d9c","thread":"main","time":"2026-09-29T14:53:46.840567Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260929T145346.848587Z-H5c947e1c-P00263dd1","thread":"main","time":"2026-09-29T14:53:46.861888Z","file":"run-command.c","line":740,"child_id":2,"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': 
@@ -522739,9 +523663,9 @@
  Author: A U Thor <author@example.com>
 [master 826111a] third
  Author: A U Thor <author@example.com>
-{"event":"child_start","sid":"20250827T082300.236045Z-Hcf858c9d-P000d16bf","thread":"main","time":"2025-08-27T08:23:00.249027Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250827T082300.286461Z-Hcf858c9d-P000d1779","thread":"main","time":"2025-08-27T08:23:00.287603Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250827T082300.325663Z-Hcf858c9d-P000d1802","thread":"main","time":"2025-08-27T08:23:00.326846Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260929T145346.968716Z-H5c947e1c-P00263fd2","thread":"main","time":"2026-09-29T14:53:46.976179Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260929T145347.012105Z-H5c947e1c-P002640a2","thread":"main","time":"2026-09-29T14:53:47.014229Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260929T145347.042126Z-H5c947e1c-P00264138","thread":"main","time":"2026-09-29T14:53:47.043352Z","file":"run-command.c","line":740,"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': 
@@ -522808,8 +523732,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-{"event":"child_start","sid":"20250827T082300.536062Z-Hcf858c9d-P000d1af4","thread":"main","time":"2025-08-27T08:23:00.536779Z","file":"run-command.c","line":740,"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":"20250827T082300.536062Z-Hcf858c9d-P000d1af4","thread":"main","time":"2025-08-27T08:23:00.580373Z","file":"run-command.c","line":740,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","fetch","remote2","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
+{"event":"child_start","sid":"20260929T145347.196531Z-H5c947e1c-P0026443b","thread":"main","time":"2026-09-29T14:53:47.197179Z","file":"run-command.c","line":740,"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":"20260929T145347.196531Z-H5c947e1c-P0026443b","thread":"main","time":"2026-09-29T14:53:47.226328Z","file":"run-command.c","line":740,"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
@@ -522962,7 +523886,7 @@
  * [new branch]      master     -> remote2/master
  * [new branch]      two        -> remote2/two
  * [new tag]         two        -> two
-{"event":"child_start","sid":"20250827T082300.767984Z-Hcf858c9d-P000d1ddf","thread":"main","time":"2025-08-27T08:23:00.771701Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","fetch","remote2","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
+{"event":"child_start","sid":"20260929T145347.366871Z-H5c947e1c-P0026474c","thread":"main","time":"2026-09-29T14:53:47.367450Z","file":"run-command.c","line":740,"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': 
@@ -523032,8 +523956,8 @@
 
 07163daad06a0119b0a241cf1882adae4f88fd56
 4e26d6d394bf76d04cf3ab6f994c0bcaaf1a0a2f
-{"event":"child_start","sid":"20250827T082301.012242Z-Hcf858c9d-P000d2152","thread":"main","time":"2025-08-27T08:23:01.013042Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250827T082301.029528Z-Hcf858c9d-P000d219d","thread":"main","time":"2025-08-27T08:23:01.030265Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260929T145347.579680Z-H5c947e1c-P00264b2c","thread":"main","time":"2026-09-29T14:53:47.580361Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260929T145347.600774Z-H5c947e1c-P00264b88","thread":"main","time":"2026-09-29T14:53:47.601530Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
 ok 22 - maintenance.loose-objects.auto
 
 expecting success of 7900.23 'maintenance.loose-objects.batchSize': 
@@ -523203,7 +524127,7 @@
  1 file changed, 1 insertion(+)
  create mode 100644 C.t
 c78702c54cf51d5c63513c9a26d5fb24e63ee352
-{"event":"child_start","sid":"20250827T082301.804396Z-Hcf858c9d-P000d2b41","thread":"main","time":"2025-08-27T08:23:01.814471Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20260929T145348.348664Z-H5c947e1c-P0026575f","thread":"main","time":"2026-09-29T14:53:48.350307Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
 ok 26 - maintenance.incremental-repack.auto
 
 expecting success of 7900.27 'maintenance.incremental-repack.auto (when config is unset)': 
@@ -523230,7 +524154,7 @@
  1 file changed, 1 insertion(+)
  create mode 100644 C.t
 c78702c54cf51d5c63513c9a26d5fb24e63ee352
-{"event":"child_start","sid":"20250827T082302.050764Z-Hcf858c9d-P000d2e76","thread":"main","time":"2025-08-27T08:23:02.051437Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20260929T145348.541501Z-H5c947e1c-P00265a73","thread":"main","time":"2026-09-29T14:53:48.542177Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
 ok 27 - maintenance.incremental-repack.auto (when config is unset)
 
 expecting success of 7900.28 'pack-refs task': 
@@ -523242,7 +524166,7 @@
 		git maintenance run --task=pack-refs &&
 	test_subcommand git pack-refs --all --prune <pack-refs.txt
 
-{"event":"child_start","sid":"20250827T082302.159383Z-Hcf858c9d-P000d2fdb","thread":"main","time":"2025-08-27T08:23:02.159947Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
+{"event":"child_start","sid":"20260929T145348.624598Z-H5c947e1c-P00265c1f","thread":"main","time":"2026-09-29T14:53:48.625158Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
 ok 28 - pack-refs task
 
 expecting success of 7900.29 'reflog-expire task': 
@@ -523250,7 +524174,7 @@
 		git maintenance run --task=reflog-expire &&
 	test_subcommand git reflog expire --all <reflog-expire.txt
 
-{"event":"child_start","sid":"20250827T082302.175972Z-Hcf858c9d-P000d300d","thread":"main","time":"2025-08-27T08:23:02.176569Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","reflog","expire","--all"]}
+{"event":"child_start","sid":"20260929T145348.642794Z-H5c947e1c-P00265c72","thread":"main","time":"2026-09-29T14:53:48.645572Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","reflog","expire","--all"]}
 ok 29 - reflog-expire task
 
 expecting success of 7900.30 'reflog-expire task --auto only packs when exceeding limits': 
@@ -523272,13 +524196,13 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 reflog-two.t
-{"event":"child_start","sid":"20250827T082302.312469Z-Hcf858c9d-P000d31b6","thread":"main","time":"2025-08-27T08:23:02.313104Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","reflog","expire","--all"]}
+{"event":"child_start","sid":"20260929T145348.727137Z-H5c947e1c-P00265dc3","thread":"main","time":"2026-09-29T14:53:48.727769Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","reflog","expire","--all"]}
 ok 30 - reflog-expire task --auto only packs when exceeding limits
 
 expecting success of 7900.31 'worktree-prune task without --auto always prunes': 
 	test_expect_worktree_prune git maintenance run --task=worktree-prune
 
-{"event":"child_start","sid":"20250827T082302.338723Z-Hcf858c9d-P000d3206","thread":"main","time":"2025-08-27T08:23:02.339279Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","3.months.ago"]}
+{"event":"child_start","sid":"20260929T145348.747238Z-H5c947e1c-P00265e0e","thread":"main","time":"2026-09-29T14:53:48.747815Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","3.months.ago"]}
 ok 31 - worktree-prune task without --auto always prunes
 
 expecting success of 7900.32 'worktree-prune task --auto only prunes with prunable worktree': 
@@ -523287,7 +524211,7 @@
 	: >.git/worktrees/abc &&
 	test_expect_worktree_prune git maintenance run --auto --task=worktree-prune
 
-{"event":"child_start","sid":"20250827T082302.369063Z-Hcf858c9d-P000d326a","thread":"main","time":"2025-08-27T08:23:02.369720Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","3.months.ago"]}
+{"event":"child_start","sid":"20260929T145348.789782Z-H5c947e1c-P00265e9d","thread":"main","time":"2026-09-29T14:53:48.790360Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","3.months.ago"]}
 ok 32 - worktree-prune task --auto only prunes with prunable worktree
 
 expecting success of 7900.33 'worktree-prune task with --auto honors maintenance.worktree-prune.auto': 
@@ -523305,8 +524229,8 @@
 	test_expect_worktree_prune ! git -c maintenance.worktree-prune.auto=4 maintenance run --auto --task=worktree-prune &&
 	test_expect_worktree_prune git -c maintenance.worktree-prune.auto=3 maintenance run --auto --task=worktree-prune
 
-{"event":"child_start","sid":"20250827T082302.389627Z-Hcf858c9d-P000d32bb","thread":"main","time":"2025-08-27T08:23:02.390180Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","3.months.ago"]}
-{"event":"child_start","sid":"20250827T082302.463063Z-Hcf858c9d-P000d33a3","thread":"main","time":"2025-08-27T08:23:02.463694Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","3.months.ago"]}
+{"event":"child_start","sid":"20260929T145348.804070Z-H5c947e1c-P00265ee1","thread":"main","time":"2026-09-29T14:53:48.804610Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","3.months.ago"]}
+{"event":"child_start","sid":"20260929T145348.840064Z-H5c947e1c-P00265f77","thread":"main","time":"2026-09-29T14:53:48.840699Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","3.months.ago"]}
 ok 33 - worktree-prune task with --auto honors maintenance.worktree-prune.auto
 
 expecting success of 7900.34 'worktree-prune task with --auto honors maintenance.worktree-prune.auto': 
@@ -523324,8 +524248,8 @@
 	test_expect_worktree_prune ! git -c maintenance.worktree-prune.auto=4 maintenance run --auto --task=worktree-prune &&
 	test_expect_worktree_prune git -c maintenance.worktree-prune.auto=3 maintenance run --auto --task=worktree-prune
 
-{"event":"child_start","sid":"20250827T082302.484064Z-Hcf858c9d-P000d33d3","thread":"main","time":"2025-08-27T08:23:02.488674Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","3.months.ago"]}
-{"event":"child_start","sid":"20250827T082302.550669Z-Hcf858c9d-P000d34b6","thread":"main","time":"2025-08-27T08:23:02.551284Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","3.months.ago"]}
+{"event":"child_start","sid":"20260929T145348.855241Z-H5c947e1c-P00265fb7","thread":"main","time":"2026-09-29T14:53:48.855847Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","3.months.ago"]}
+{"event":"child_start","sid":"20260929T145348.889276Z-H5c947e1c-P0026602e","thread":"main","time":"2026-09-29T14:53:48.889903Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","3.months.ago"]}
 ok 34 - worktree-prune task with --auto honors maintenance.worktree-prune.auto
 
 expecting success of 7900.35 'worktree-prune task honors gc.worktreePruneExpire': 
@@ -523344,13 +524268,13 @@
 
 Preparing worktree (new branch 'worktree')
 HEAD is now at aad931c reflog-two
-{"event":"child_start","sid":"20250827T082302.614958Z-Hcf858c9d-P000d358f","thread":"main","time":"2025-08-27T08:23:02.615582Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","now"]}
+{"event":"child_start","sid":"20260929T145348.947416Z-H5c947e1c-P002660ec","thread":"main","time":"2026-09-29T14:53:48.948030Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","worktree","prune","--expire","now"]}
 ok 35 - worktree-prune task honors gc.worktreePruneExpire
 
 expecting success of 7900.36 'rerere-gc task without --auto always collects garbage': 
 	test_expect_rerere_gc git maintenance run --task=rerere-gc
 
-{"event":"child_start","sid":"20250827T082302.626423Z-Hcf858c9d-P000d35b5","thread":"main","time":"2025-08-27T08:23:02.627129Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","rerere","gc"]}
+{"event":"child_start","sid":"20260929T145348.977132Z-H5c947e1c-P0026615a","thread":"main","time":"2026-09-29T14:53:48.977705Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","rerere","gc"]}
 ok 36 - rerere-gc task without --auto always collects garbage
 
 expecting success of 7900.37 'rerere-gc task with --auto only prunes with prunable entries': 
@@ -523361,7 +524285,7 @@
 	: >.git/rr-cache/entry &&
 	test_expect_rerere_gc git maintenance run --auto --task=rerere-gc
 
-{"event":"child_start","sid":"20250827T082302.708382Z-Hcf858c9d-P000d36d9","thread":"main","time":"2025-08-27T08:23:02.713146Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","rerere","gc"]}
+{"event":"child_start","sid":"20260929T145349.029405Z-H5c947e1c-P00266227","thread":"main","time":"2026-09-29T14:53:49.030041Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","rerere","gc"]}
 ok 37 - rerere-gc task with --auto only prunes with prunable entries
 
 expecting success of 7900.38 'rerere-gc task with --auto honors maintenance.rerere-gc.auto': 
@@ -523381,8 +524305,8 @@
 	: >.git/rr-cache/entry-1 &&
 	test_expect_rerere_gc ! git -c maintenance.rerere-gc.auto=0 maintenance run --auto --task=rerere-gc
 
-{"event":"child_start","sid":"20250827T082302.744475Z-Hcf858c9d-P000d3775","thread":"main","time":"2025-08-27T08:23:02.745070Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","rerere","gc"]}
-{"event":"child_start","sid":"20250827T082302.819132Z-Hcf858c9d-P000d3873","thread":"main","time":"2025-08-27T08:23:02.819705Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","rerere","gc"]}
+{"event":"child_start","sid":"20260929T145349.058375Z-H5c947e1c-P0026626f","thread":"main","time":"2026-09-29T14:53:49.058915Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","rerere","gc"]}
+{"event":"child_start","sid":"20260929T145349.116477Z-H5c947e1c-P00266344","thread":"main","time":"2026-09-29T14:53:49.119469Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","rerere","gc"]}
 ok 38 - rerere-gc task with --auto honors maintenance.rerere-gc.auto
 
 expecting success of 7900.39 '--auto and --schedule incompatible': 
@@ -523435,12 +524359,12 @@
 		--no-progress <weekly.txt &&
 	test_subcommand git multi-pack-index write --no-progress <weekly.txt
 
-{"event":"child_start","sid":"20250827T082302.936025Z-Hcf858c9d-P000d3a1d","thread":"main","time":"2025-08-27T08:23:03.046038Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250827T082303.101272Z-Hcf858c9d-P000d3c32","thread":"main","time":"2025-08-27T08:23:03.173661Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250827T082303.101272Z-Hcf858c9d-P000d3c32","thread":"main","time":"2025-08-27T08:23:03.177782Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250827T082303.210660Z-Hcf858c9d-P000d3d63","thread":"main","time":"2025-08-27T08:23:03.269773Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250827T082303.210660Z-Hcf858c9d-P000d3d63","thread":"main","time":"2025-08-27T08:23:03.297907Z","file":"run-command.c","line":740,"child_id":7,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250827T082303.210660Z-Hcf858c9d-P000d3d63","thread":"main","time":"2025-08-27T08:23:03.279412Z","file":"run-command.c","line":740,"child_id":4,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20260929T145349.240942Z-H5c947e1c-P002664e2","thread":"main","time":"2026-09-29T14:53:49.335475Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260929T145349.370459Z-H5c947e1c-P002666b7","thread":"main","time":"2026-09-29T14:53:49.398684Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260929T145349.370459Z-H5c947e1c-P002666b7","thread":"main","time":"2026-09-29T14:53:49.406791Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260929T145349.435147Z-H5c947e1c-P00266799","thread":"main","time":"2026-09-29T14:53:49.478624Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260929T145349.435147Z-H5c947e1c-P00266799","thread":"main","time":"2026-09-29T14:53:49.500547Z","file":"run-command.c","line":740,"child_id":7,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260929T145349.435147Z-H5c947e1c-P00266799","thread":"main","time":"2026-09-29T14:53:49.482501Z","file":"run-command.c","line":740,"child_id":4,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
 ok 42 - --schedule inheritance weekly -> daily -> hourly
 
 expecting success of 7900.43 'maintenance.strategy inheritance': 
@@ -523505,17 +524429,17 @@
 	test_subcommand ! git multi-pack-index write --no-progress \
 		<modified-daily.txt
 
-{"event":"child_start","sid":"20250827T082303.350702Z-Hcf858c9d-P000d3eea","thread":"main","time":"2025-08-27T08:23:03.392049Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250827T082303.398379Z-Hcf858c9d-P000d3f6e","thread":"main","time":"2025-08-27T08:23:03.461696Z","file":"run-command.c","line":740,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250827T082303.398379Z-Hcf858c9d-P000d3f6e","thread":"main","time":"2025-08-27T08:23:03.443757Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250827T082303.398379Z-Hcf858c9d-P000d3f6e","thread":"main","time":"2025-08-27T08:23:03.446984Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-{"event":"child_start","sid":"20250827T082303.472501Z-Hcf858c9d-P000d4036","thread":"main","time":"2025-08-27T08:23:03.580635Z","file":"run-command.c","line":740,"child_id":7,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250827T082303.472501Z-Hcf858c9d-P000d4036","thread":"main","time":"2025-08-27T08:23:03.557100Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250827T082303.472501Z-Hcf858c9d-P000d4036","thread":"main","time":"2025-08-27T08:23:03.560228Z","file":"run-command.c","line":740,"child_id":4,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-{"event":"child_start","sid":"20250827T082303.472501Z-Hcf858c9d-P000d4036","thread":"main","time":"2025-08-27T08:23:03.480017Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
-{"event":"child_start","sid":"20250827T082303.698276Z-Hcf858c9d-P000d4292","thread":"main","time":"2025-08-27T08:23:03.737376Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250827T082303.749940Z-Hcf858c9d-P000d4327","thread":"main","time":"2025-08-27T08:23:03.808582Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250827T082303.749940Z-Hcf858c9d-P000d4327","thread":"main","time":"2025-08-27T08:23:03.801072Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260929T145349.562595Z-H5c947e1c-P0026698c","thread":"main","time":"2026-09-29T14:53:49.612225Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260929T145349.622842Z-H5c947e1c-P00266a4d","thread":"main","time":"2026-09-29T14:53:49.673961Z","file":"run-command.c","line":740,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260929T145349.622842Z-H5c947e1c-P00266a4d","thread":"main","time":"2026-09-29T14:53:49.655201Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260929T145349.622842Z-H5c947e1c-P00266a4d","thread":"main","time":"2026-09-29T14:53:49.660093Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20260929T145349.689258Z-H5c947e1c-P00266b56","thread":"main","time":"2026-09-29T14:53:49.738434Z","file":"run-command.c","line":740,"child_id":7,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260929T145349.689258Z-H5c947e1c-P00266b56","thread":"main","time":"2026-09-29T14:53:49.720163Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260929T145349.689258Z-H5c947e1c-P00266b56","thread":"main","time":"2026-09-29T14:53:49.724759Z","file":"run-command.c","line":740,"child_id":4,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20260929T145349.689258Z-H5c947e1c-P00266b56","thread":"main","time":"2026-09-29T14:53:49.689795Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
+{"event":"child_start","sid":"20260929T145349.812289Z-H5c947e1c-P00266d39","thread":"main","time":"2026-09-29T14:53:49.842892Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260929T145349.854717Z-H5c947e1c-P00266dea","thread":"main","time":"2026-09-29T14:53:49.906332Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260929T145349.854717Z-H5c947e1c-P00266dea","thread":"main","time":"2026-09-29T14:53:49.898326Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
 ok 43 - maintenance.strategy inheritance
 
 expecting success of 7900.44 'register and unregister': 
@@ -523842,9 +524766,9 @@
 	test_cmp expect args
 
 /build/reproducible-path/git-2.51.0/t/trash directory.t7900-maintenance
-/create /tn Git Maintenance (hourly) /f /xml /build/reproducible-path/git-2.51.0/t/trash directory.t7900-maintenance/.git/schedule_hourly_m0IQ5f
-/create /tn Git Maintenance (daily) /f /xml /build/reproducible-path/git-2.51.0/t/trash directory.t7900-maintenance/.git/schedule_daily_GQJufa
-/create /tn Git Maintenance (weekly) /f /xml /build/reproducible-path/git-2.51.0/t/trash directory.t7900-maintenance/.git/schedule_weekly_gH7T21
+/create /tn Git Maintenance (hourly) /f /xml /build/reproducible-path/git-2.51.0/t/trash directory.t7900-maintenance/.git/schedule_hourly_kMrg3v
+/create /tn Git Maintenance (daily) /f /xml /build/reproducible-path/git-2.51.0/t/trash directory.t7900-maintenance/.git/schedule_daily_Oc6Hzu
+/create /tn Git Maintenance (weekly) /f /xml /build/reproducible-path/git-2.51.0/t/trash directory.t7900-maintenance/.git/schedule_weekly_mJSGhz
 /build/reproducible-path/git-2.51.0/t/trash directory.t7900-maintenance
 ok 57 - start and stop Windows maintenance
 
@@ -523901,7 +524825,7 @@
 	systemd-analyze verify /lib/systemd/system/basic.target
 
 )
-t7900-maintenance.sh: 7: eval: systemd-analyze: not found
+./test-lib.sh: line 1006: systemd-analyze: command not found
 prerequisite SYSTEMD_ANALYZE not satisfied
 ExecStart="/build/reproducible-path/git-2.51.0/git" --exec-path="/build/reproducible-path/git-2.51.0" -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.51.0/git" --exec-path="/build/reproducible-path/git-2.51.0" -c credential.interactive=false -c core.askPass=true  for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=%i
@@ -524068,8 +524992,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 something.t
-{"event":"region_enter","sid":"20250827T082305.898645Z-Hcf858c9d-P000d527b","thread":"main","time":"2025-08-27T08:23:05.899204Z","file":"builtin/gc.c","line":1688,"repo":1,"nesting":1,"category":"maintenance","label":"detach"}
-{"event":"region_leave","sid":"20250827T082305.898645Z-Hcf858c9d-P000d527b","thread":"main","time":"2025-08-27T08:23:05.899634Z","file":"builtin/gc.c","line":1690,"repo":1,"t_rel":0.000400,"nesting":1,"category":"maintenance","label":"detach"}
+{"event":"region_enter","sid":"20260929T145352.300008Z-H5c947e1c-P002682b7","thread":"main","time":"2026-09-29T14:53:52.300557Z","file":"builtin/gc.c","line":1688,"repo":1,"nesting":1,"category":"maintenance","label":"detach"}
+{"event":"region_leave","sid":"20260929T145352.300008Z-H5c947e1c-P002682b7","thread":"main","time":"2026-09-29T14:53:52.301370Z","file":"builtin/gc.c","line":1690,"repo":1,"t_rel":0.000609,"nesting":1,"category":"maintenance","label":"detach"}
 ok 65 - --detach causes maintenance to run in background
 
 expecting success of 7900.66 'repacking loose objects is quiet': 
@@ -524174,8 +525098,8 @@
 	check_count --contents=contents A 1 "External file (--contents)" 1
 
 git blame -c  --contents=contents file 
-Author External file (--contents) (expected 1, attributed 1) good
 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 8012.7 'blame in a bare repo without starting commit': 
@@ -524231,8 +525155,8 @@
 	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
+Author External file (--contents) (expected 2, attributed 2) good
 ok 11 - blame with --contents and revision
 
 expecting success of 8012.12 'setup B1 lines (branch1)': 
@@ -524252,9 +525176,9 @@
 	check_count A 2 B 2 B1 2
 
 git blame -c  file 
-Author B1 (expected 2, attributed 2) good
 Author B (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
+Author B1 (expected 2, attributed 2) good
 ok 13 - blame 2 authors + 1 branch1 author
 
 expecting success of 8012.14 'setup B2 lines (branch2)': 
@@ -524274,8 +525198,8 @@
 	check_count A 2 B 1 B2 1
 
 git blame -c  file 
-Author A (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 15 - blame 2 authors + 1 branch2 author
 
@@ -524292,28 +525216,28 @@
 	check_count A 2 B 1 B1 2 B2 1
 
 git blame -c  file 
+Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
 Author B1 (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) 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 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
+Author B (expected 1, attributed 1) good
+Author A U Thor (expected 2, attributed 2) good
 ok 18 - blame --first-parent blames merge for branch1
 
 expecting success of 8012.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
+Author A (expected 2, attributed 2) good
 ok 19 - blame ancestor
 
 expecting success of 8012.20 'blame great-ancestor': 
@@ -524336,11 +525260,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 B (expected 1, attributed 1) 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 B1 (expected 2, attributed 2) good
-Author A U Thor (expected 1, attributed 1) good
 ok 22 - blame evil merge
 
 expecting success of 8012.23 'blame huge graft': 
@@ -524523,8 +525447,8 @@
 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
+Author 01 (expected 1, attributed 1) good
 Switched to branch 'branch2'
 ok 23 - blame huge graft
 
@@ -524542,12 +525466,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 A (expected 2, attributed 2) good
 Author B1 (expected 2, attributed 2) good
+Author C (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
-Author C (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': 
@@ -524569,13 +525493,13 @@
 	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
 
 git blame -c  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
+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 A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 27 - blame edits
 
 expecting success of 8012.28 'setup obfuscated email': 
@@ -524594,14 +525518,14 @@
 	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 B2 (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
-Author A (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author D (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
 ok 29 - blame obfuscated email
 
 expecting success of 8012.30 'blame -L 1 (all)': 
@@ -524609,35 +525533,35 @@
 
 git blame -c  -L1 file 
 Author E (expected 1, attributed 1) good
+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 A U Thor (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 B1 (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 B (expected 1, attributed 1) good
-Author C (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 B1 (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 A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B1 (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 A U Thor (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
 ok 32 - blame -L X (X to end)
@@ -524646,10 +525570,10 @@
 	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 C (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 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)': 
@@ -524657,8 +525581,8 @@
 
 git blame -c  -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 A (expected 1, attributed 1) good
 ok 34 - blame -L ,Y (up to Y)
 
 expecting success of 8012.35 'blame -L X,X': 
@@ -524673,19 +525597,19 @@
 
 git blame -c  -L3,6 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
+Author B2 (expected 1, attributed 1) good
 ok 36 - blame -L X,Y
 
 expecting success of 8012.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 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
 ok 37 - blame -L Y,X (undocumented)
 
 expecting success of 8012.38 'blame -L -X': 
@@ -524729,10 +525653,10 @@
 	check_count -L3,+4 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L3,+4 file 
-Author B1 (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 B (expected 1, attributed 1) good
 ok 44 - blame -L X,+N
 
 expecting success of 8012.45 'blame -L ,-0': 
@@ -524758,10 +525682,10 @@
 	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 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
+Author B1 (expected 1, attributed 1) good
 ok 48 - blame -L X,-N
 
 expecting success of 8012.49 'blame -L /RE/ (RE to end)': 
@@ -524776,11 +525700,11 @@
 	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 B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 Author E (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 50 - blame -L /RE/,/RE2/
 
 expecting success of 8012.51 'blame -L X,/RE/': 
@@ -524796,8 +525720,8 @@
 	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
 
 git blame -c  -L/99/,7 file 
-Author B1 (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
 ok 52 - blame -L /RE/,Y
 
@@ -524846,13 +525770,13 @@
 
 git blame -c  -L,8 file 
 Author E (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 A U Thor (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 C (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 58 - blame -L ,Y (Y == nlines)
 
 expecting success of 8012.59 'blame -L ,Y (Y == nlines + 1)': 
@@ -524860,37 +525784,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 A (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 A U Thor (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 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 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 D (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 E (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author B2 (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
+Author C (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 A (expected 1, attributed 1) good
-Author B2 (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
 ok 61 - blame -L multiple (disjoint)
 
@@ -524898,20 +525822,20 @@
 	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 B1 (expected 1, attributed 1) good
 Author A U Thor (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 A (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 B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 63 - blame -L multiple (adjacent)
 
 expecting success of 8012.64 'blame -L multiple (adjacent: unordered)': 
@@ -524919,78 +525843,78 @@
 
 git blame -c  -L4,5 -L2,3 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 B2 (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 A (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 D (expected 1, attributed 1) good
+Author B2 (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 B2 (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 D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 66 - blame -L multiple (overlapping: unordered)
 
 expecting success of 8012.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 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 C (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 D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B (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 A U Thor (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
-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 (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 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 B1 (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author A U Thor (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
 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 B1 (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 B (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 B1 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 ok 70 - blame -L /RE/ (relative: no preceding range)
 
@@ -524998,8 +525922,8 @@
 	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
+Author A (expected 1, attributed 1) good
 ok 71 - blame -L /RE/ (relative: adjacent)
 
 expecting success of 8012.72 'blame -L /RE/ (relative: not found)': 
@@ -525018,8 +525942,8 @@
 	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
 
 git blame -c  -L3,3 -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 74 - blame -L ^/RE/ (absolute)
 
 expecting success of 8012.75 'blame -L ^/RE/ (absolute: no preceding range)': 
@@ -525041,9 +525965,9 @@
 	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
 
 git blame -c  -L8 -L^/$/,+2 file 
-Author C (expected 1, attributed 1) good
 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 8012.78 'setup -L :regex': 
@@ -525120,8 +526044,8 @@
 	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
+Author F (expected 4, attributed 4) good
 ok 83 - blame -L :RE (relative: no preceding range)
 
 expecting success of 8012.84 'blame -L :RE (relative: not found)': 
@@ -525163,9 +526087,9 @@
 	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
 
 git blame -c  -L10 -L^:ma.. hello.c 
+Author F (expected 4, attributed 4) good
 Author H (expected 1, attributed 1) good
 Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
 ok 89 - blame -L ^:RE (absolute: end-of-file)
 
 expecting success of 8012.90 'blame -L :funcname with userdiff driver': 
@@ -525499,10 +526423,10 @@
 	test_line_count = 1 colored &&
 	grep qfunc colored
 
-[branch2 7c4292e] new commit
+[branch2 3ad7858] new commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-<CYAN>7c4292e3 (A U Thor 2025-08-27 08:23:06 +0000 11) <RESET>void qfunc();
+<CYAN>3ad7858d (A U Thor 2026-09-29 14:53:52 +0000 11) <RESET>void qfunc();
 ok 119 - blame color by age: new code is different
 
 # passed all 119 test(s)
@@ -525541,7 +526465,7 @@
 	
 	A	deeply/nested/directory/number/1/file
 	A	deeply/nested/directory/number/2/another
-r1 = 1b143edf3f13b919fe04f4ca771b229f56401c55 (refs/remotes/git-svn)
+r1 = 7873ecadd27b8a12228ef53a925f90fe928bc6ea (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9102-git-svn-deep-rmdir/svnrepo r1
 Switched to a new branch 'test-rmdir'
@@ -525554,7 +526478,7 @@
 	svn_cmd ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
 	
 rm 'deeply/nested/directory/number/2/another'
-[test-rmdir 950b242] remove another
+[test-rmdir 64d5e49] remove another
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
  delete mode 100644 deeply/nested/directory/number/2/another
@@ -525563,7 +526487,7 @@
 	D	deeply/nested/directory/number/2/another
 	D	deeply/nested/directory/number/2/
 W: -empty_dir: deeply/nested/directory/number/2
-r2 = f9653aa188b6462a0510820725596d468e2bdb8d (refs/remotes/git-svn)
+r2 = 14eeefcc86145b2bf67f76e69106a9e076b006ca (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 deeply/nested/directory/number/1/
 deeply/nested/directory/number/1/file
@@ -525573,6 +526497,128 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9103-git-svn-tracked-directory-removed.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9103-git-svn-tracked-directory-removed/.git/
+expecting success of 9103.1 'make history for tracking': 
+	mkdir import &&
+	mkdir import/trunk &&
+	echo hello >> import/trunk/README &&
+	svn_cmd import -m initial import "$svnrepo" &&
+	rm -rf import &&
+	svn_cmd co "$svnrepo"/trunk trunk &&
+	echo bye bye >> trunk/README &&
+	svn_cmd rm -m "gone" "$svnrepo"/trunk &&
+	rm -rf trunk &&
+	mkdir trunk &&
+	echo "new" > trunk/FOLLOWME &&
+	svn_cmd import -m "new trunk" trunk "$svnrepo"/trunk
+
+Adding         import/trunk
+Adding         import/trunk/README
+Committing transaction...
+Committed revision 1.
+A    trunk/README
+Checked out revision 1.
+Committing transaction...
+Committed revision 2.
+Adding         trunk/FOLLOWME
+Committing transaction...
+Committed revision 3.
+ok 1 - make history for tracking
+
+expecting success of 9103.2 'clone repo with git': 
+	git svn clone -s "$svnrepo" x &&
+	test_path_is_file x/FOLLOWME &&
+	test_path_is_missing x/README
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9103-git-svn-tracked-directory-removed/x/.git/
+	A	README
+r1 = efa62ad33e2a282b222b4f9332475e5306c36eb9 (refs/remotes/origin/trunk)
+	D	README
+	A	FOLLOWME
+r3 = 0f8b2899b7dae387d6924035d81994757ef6037d (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9103-git-svn-tracked-directory-removed/svnrepo/trunk r3
+ok 2 - clone repo with git
+
+expecting success of 9103.3 'make sure r2 still has old file': 
+	(
+		cd x &&
+		test -n "$(git svn find-rev r1)" &&
+		git reset --hard "$(git svn find-rev r1)" &&
+		test_path_is_file README &&
+		test_path_is_missing FOLLOWME &&
+		test -z "$(git svn find-rev r2)"
+	)
+
+HEAD is now at efa62ad initial
+ok 3 - make sure r2 still has old file
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9105-git-svn-commit-diff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9105-git-svn-commit-diff/.git/
+expecting success of 9105.1 'initialize repo': 
+	mkdir import &&
+	(
+		cd import &&
+		echo hello >readme &&
+		svn_cmd import -m "initial" . "$svnrepo"
+	) &&
+	echo hello > readme &&
+	git update-index --add readme &&
+	git commit -a -m "initial" &&
+	echo world >> readme &&
+	git commit -a -m "another"
+	
+Adding         readme
+Committing transaction...
+Committed revision 1.
+[master (root-commit) ecebef3] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 readme
+[master 32e6dbc] another
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - initialize repo
+
+expecting success of 9105.2 'test the commit-diff command': 
+	test -n "$prev" && test -n "$head" &&
+	git svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
+	svn_cmd co "$svnrepo" wc &&
+	cmp readme wc/readme
+	
+	M	readme
+Committed r2
+A    wc/readme
+Checked out revision 2.
+ok 2 - test the commit-diff command
+
+expecting success of 9105.3 'commit-diff to a sub-directory (with git svn config)': 
+	svn_cmd import -m "sub-directory" import "$svnrepo"/subdir &&
+	git svn init --minimize-url "$svnrepo"/subdir &&
+	git svn fetch &&
+	git svn commit-diff -r3 "$prev" "$head" &&
+	svn_cmd cat "$svnrepo"/subdir/readme > readme.2 &&
+	cmp readme readme.2
+	
+Adding         import/readme
+Committing transaction...
+Committed revision 3.
+Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo/subdir => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo
+	A	readme
+r3 = 2960cc81f1ebfc86bda07552ca0aabdab47b88ff (refs/remotes/git-svn)
+	M	readme
+Committed r4
+ok 3 - commit-diff to a sub-directory (with git svn config)
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t7800-difftool.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7800-difftool/.git/
 expecting success of 7800.1 'basic usage requires no repo': 
@@ -525726,7 +526772,7 @@
 		fi &&
 		test_expect_code ${expected_code} git difftool ${opt} -y -t nonexistent branch
 	
-/build/reproducible-path/git-2.51.0/git-difftool--helper: 1: eval: i-dont-exist: not found
+/build/reproducible-path/git-2.51.0/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
 
@@ -525799,7 +526845,7 @@
 		fi &&
 		test_expect_code ${expected_code} git difftool ${opt} -y -t nonexistent branch
 	
-/build/reproducible-path/git-2.51.0/git-difftool--helper: 1: eval: i-dont-exist: not found
+/build/reproducible-path/git-2.51.0/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
 
@@ -526691,10 +527737,10 @@
 		test_cmp expect "$(cat tmpdir)/file"
 	)
 
-warning: both files modified: '/build/reproducible-path/git-2.51.0/t/trash directory.t7800-difftool/file' and '/build/reproducible-path/git-2.51.0/t/trash directory.t7800-difftool/git-difftool.kg5zm2/right/file'.
+warning: both files modified: '/build/reproducible-path/git-2.51.0/t/trash directory.t7800-difftool/file' and '/build/reproducible-path/git-2.51.0/t/trash directory.t7800-difftool/git-difftool.KJsrQZ/right/file'.
 warning: working tree file has been left.
 warning: 
-warning: temporary files exist in '/build/reproducible-path/git-2.51.0/t/trash directory.t7800-difftool/git-difftool.kg5zm2'.
+warning: temporary files exist in '/build/reproducible-path/git-2.51.0/t/trash directory.t7800-difftool/git-difftool.KJsrQZ'.
 warning: you may want to cleanup or recover these.
 ok 84 - difftool --no-symlinks detects conflict 
 
@@ -526906,9 +527952,9 @@
 	git add -N intent-to-add &&
 	git difftool --dir-diff --extcmd ls
 
-/tmp/git-difftool.iX0sTn/left/:
+/tmp/git-difftool.GmIyXs/left/:
 
-/tmp/git-difftool.iX0sTn/right/:
+/tmp/git-difftool.GmIyXs/right/:
 intent-to-add
 HEAD is now at 8845cd2 initial
 ok 89 - add -N and difftool -d
@@ -527026,128 +528072,6 @@
 1..95
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9103-git-svn-tracked-directory-removed.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9103-git-svn-tracked-directory-removed/.git/
-expecting success of 9103.1 'make history for tracking': 
-	mkdir import &&
-	mkdir import/trunk &&
-	echo hello >> import/trunk/README &&
-	svn_cmd import -m initial import "$svnrepo" &&
-	rm -rf import &&
-	svn_cmd co "$svnrepo"/trunk trunk &&
-	echo bye bye >> trunk/README &&
-	svn_cmd rm -m "gone" "$svnrepo"/trunk &&
-	rm -rf trunk &&
-	mkdir trunk &&
-	echo "new" > trunk/FOLLOWME &&
-	svn_cmd import -m "new trunk" trunk "$svnrepo"/trunk
-
-Adding         import/trunk
-Adding         import/trunk/README
-Committing transaction...
-Committed revision 1.
-A    trunk/README
-Checked out revision 1.
-Committing transaction...
-Committed revision 2.
-Adding         trunk/FOLLOWME
-Committing transaction...
-Committed revision 3.
-ok 1 - make history for tracking
-
-expecting success of 9103.2 'clone repo with git': 
-	git svn clone -s "$svnrepo" x &&
-	test_path_is_file x/FOLLOWME &&
-	test_path_is_missing x/README
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9103-git-svn-tracked-directory-removed/x/.git/
-	A	README
-r1 = 852699bae9cbc33aa44661517d51e73d8d674be3 (refs/remotes/origin/trunk)
-	D	README
-	A	FOLLOWME
-r3 = c6cb24d573bb6a457477dd1a52d66093ca7e2c11 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9103-git-svn-tracked-directory-removed/svnrepo/trunk r3
-ok 2 - clone repo with git
-
-expecting success of 9103.3 'make sure r2 still has old file': 
-	(
-		cd x &&
-		test -n "$(git svn find-rev r1)" &&
-		git reset --hard "$(git svn find-rev r1)" &&
-		test_path_is_file README &&
-		test_path_is_missing FOLLOWME &&
-		test -z "$(git svn find-rev r2)"
-	)
-
-HEAD is now at 852699b initial
-ok 3 - make sure r2 still has old file
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9105-git-svn-commit-diff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9105-git-svn-commit-diff/.git/
-expecting success of 9105.1 'initialize repo': 
-	mkdir import &&
-	(
-		cd import &&
-		echo hello >readme &&
-		svn_cmd import -m "initial" . "$svnrepo"
-	) &&
-	echo hello > readme &&
-	git update-index --add readme &&
-	git commit -a -m "initial" &&
-	echo world >> readme &&
-	git commit -a -m "another"
-	
-Adding         readme
-Committing transaction...
-Committed revision 1.
-[master (root-commit) ecebef3] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 readme
-[master 32e6dbc] another
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - initialize repo
-
-expecting success of 9105.2 'test the commit-diff command': 
-	test -n "$prev" && test -n "$head" &&
-	git svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
-	svn_cmd co "$svnrepo" wc &&
-	cmp readme wc/readme
-	
-	M	readme
-Committed r2
-A    wc/readme
-Checked out revision 2.
-ok 2 - test the commit-diff command
-
-expecting success of 9105.3 'commit-diff to a sub-directory (with git svn config)': 
-	svn_cmd import -m "sub-directory" import "$svnrepo"/subdir &&
-	git svn init --minimize-url "$svnrepo"/subdir &&
-	git svn fetch &&
-	git svn commit-diff -r3 "$prev" "$head" &&
-	svn_cmd cat "$svnrepo"/subdir/readme > readme.2 &&
-	cmp readme readme.2
-	
-Adding         import/readme
-Committing transaction...
-Committed revision 3.
-Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo/subdir => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo
-	A	readme
-r3 = fcca8f6125b126a0e1d9833fd7baeb833c0c96b7 (refs/remotes/git-svn)
-	M	readme
-Committed r4
-ok 3 - commit-diff to a sub-directory (with git svn config)
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9112-git-svn-md5less-file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9112-git-svn-md5less-file/.git/
 expecting success of 9112.1 'load svn dumpfile': svnadmin load "$rawsvnrepo" < dumpfile.svn
@@ -527163,7 +528087,7 @@
 
 expecting success of 9112.3 'fetch revisions from svn': git svn fetch
 	A	md5less-file
-r1 = 30fb8bd396914eab2b330c1f557aef8e168f9b29 (refs/remotes/git-svn)
+r1 = 1c43fa957cfbbb8be8e431ec8ed2b03ea18aea80 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9112-git-svn-md5less-file/svnrepo r1
 ok 3 - fetch revisions from svn
@@ -527190,10 +528114,10 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir/a/b/c/d/e => file:///build/reproducible-path/git-2.51.0/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)
+	A	file
+r1 = 6aadfc98d31cbed4e89c9d601491ad7b5c46d857 (refs/remotes/e)
 	D	a/b/c/d/e/file
 	D	a/
 	A	file
@@ -527356,22 +528280,22 @@
 	(required for this version (2.51.0) of git-svn) does not exist.
 Done migrating from a git-svn v1 layout
 	A	readme
-r1 = 08465c77d0ebcdf7878478b671875eff20eac59d (refs/remotes/trunk)
+r1 = 3553f7914e1720bd5a5aa8f609544698d2b41c92 (refs/remotes/trunk)
 branch_from: /trunk => /trunk/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a, 1
-Found branch parent: (refs/remotes/branches/start) 08465c77d0ebcdf7878478b671875eff20eac59d
+Found branch parent: (refs/remotes/branches/start) 3553f7914e1720bd5a5aa8f609544698d2b41c92
 Following parent with do_switch
 Successfully followed parent
-r2 = 992f89db07006943c4e8dd44ab9bdf11b7b8276c (refs/remotes/branches/start)
+r2 = 7a79624f1e741dd0647b7a267c2f1ea790833c3e (refs/remotes/branches/start)
 	M	readme
-r3 = 6ab22bff2032ff24b0d27132263cde48405c931e (refs/remotes/branches/start)
+r3 = 4128a1c2b57ccc2e53d2e1e4725bf2398586071c (refs/remotes/branches/start)
 branch_from: /branches/start => /branches/start/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end/src/a, 3
-Found branch parent: (refs/remotes/tags/end) 6ab22bff2032ff24b0d27132263cde48405c931e
+Found branch parent: (refs/remotes/tags/end) 4128a1c2b57ccc2e53d2e1e4725bf2398586071c
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r4 = f7cea4ad7334994237b3b4a18bf15ec1f51417f7 (refs/remotes/tags/end)
+r4 = 6ffb20e88e1d68db471e3ba1c2abf30d100ccdb5 (refs/remotes/tags/end)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/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.
@@ -527413,26 +528337,26 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = b17a9dcb5abe4a1966d2a903f9da6d217f2e2c36 (refs/remotes/two/trunk)
+r1 = 1db4f5332993ecd0cae1cf5754ee920116fade58 (refs/remotes/two/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start, 1
-Found branch parent: (refs/remotes/two/branches/start) b17a9dcb5abe4a1966d2a903f9da6d217f2e2c36
+Found branch parent: (refs/remotes/two/branches/start) 1db4f5332993ecd0cae1cf5754ee920116fade58
 Following parent with do_switch
 Successfully followed parent
-r2 = 65ba4eb36023f133aa0a2a3a9fac5fc9fb38c330 (refs/remotes/two/branches/start)
+r2 = 8901f8d7b0df76f47164c8f57011bbc337815d17 (refs/remotes/two/branches/start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = be0cbb59bbecb99ab79db795036fe33ae21bbd9b (refs/remotes/two/branches/start)
+r3 = da42696ea1c7155cf0b50484e62d5598ee16560d (refs/remotes/two/branches/start)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/two/tags/end) be0cbb59bbecb99ab79db795036fe33ae21bbd9b
+Found branch parent: (refs/remotes/two/tags/end) da42696ea1c7155cf0b50484e62d5598ee16560d
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 6c834c9e095b0c3776e56d0d5bde7559539dcf62 (refs/remotes/two/tags/end)
+r4 = 2e8b551438d14f0b3f47b310ae1f5ec34d5920b6 (refs/remotes/two/tags/end)
 	M	src/b/readme
-r5 = 858d32f38fcba4e7b09efa549ca46797b4655b09 (refs/remotes/two/tags/end)
+r5 = 28458fac76b7f162afe7dcdc460b1ce45b6bc5f0 (refs/remotes/two/tags/end)
 	M	src/b/readme
-r6 = 8565190cc2e405dcdc8fc9f80cc367658164387c (refs/remotes/two/tags/end)
+r6 = bb576736bfeb911f11cecf39563f3bb3ec8eea42 (refs/remotes/two/tags/end)
 ok 2 - test left-hand-side only globbing
 
 expecting success of 9108.3 'prepare test disallow multi-globs': 
@@ -527484,10 +528408,10 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh/a/b/c/d/e => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
-	A	a/b/c/d/e/file
-r9 (@1) = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
 	A	file
 r9 (@1) = 6aadfc98d31cbed4e89c9d601491ad7b5c46d857 (refs/remotes/e)
+	A	a/b/c/d/e/file
+r9 (@1) = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
 	D	a/b/c/d/e/file
 	D	a/
 	A	file
@@ -527653,19 +528577,19 @@
 	test_must_fail git svn dcommit
 	
 	A	file
-r1 = ca236319d0dc25239664e3b9dc53ad32ca000e43 (refs/remotes/git-svn)
+r1 = 166c59f6668870708681d602794ce3fba68349b1 (refs/remotes/git-svn)
 	M	file
-r2 = 664e3ecd38207679378ff60f409ff2176d376689 (refs/remotes/git-svn)
+r2 = 98258654695ebdf24a46fffaf142f76eb207a158 (refs/remotes/git-svn)
 	M	file
-r3 = 66909a41c229f1d968958d092e462452924c2d09 (refs/remotes/git-svn)
-HEAD is now at 66909a4 third line from git
+r3 = 668f4de68ea470bbca5e3c088ad86a23d6d1c781 (refs/remotes/git-svn)
+HEAD is now at 668f4de third line from git
 A    t.svn/file
 Checked out revision 3.
 Sending        file
 Transmitting file data .done
 Committing transaction...
 Committed revision 4.
-[master 3aa9193] fourth line from git
+[master a3494a2] fourth line from git
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -527673,7 +528597,7 @@
 
 ERROR from SVN:
 Transaction is out of date: File '/file' is out of date
-W: 3aa91936205f4f0270319b9571d1c48f637d0db3 and refs/remotes/git-svn differ, using rebase:
+W: a3494a28f5a9f1d3ccea6fd08403a2014fb54562 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
@@ -527692,12 +528616,12 @@
 	git commit -a -m 'more changes' &&
 	git svn dcommit
 	
-HEAD is now at 66909a4 third line from git
-[master ad65425] index merge
+HEAD is now at 668f4de third line from git
+[master 4e3efc0] index merge
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file2
-[master 37f3af3] more changes
+[master 7974228] more changes
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -527705,20 +528629,20 @@
 	A	file2
 Committed r5
 	M	file
-r4 = 0adf44931267a41ca0e0fcdee8795234fe1fd56d (refs/remotes/git-svn)
+r4 = b2c36368464ae3bbf02f6df66093c9bf1bd52d4c (refs/remotes/git-svn)
 	A	file2
-r5 = 2ae46103009fe56ae7b19f0ad486f4db1ebba364 (refs/remotes/git-svn)
-W: ad6542578e7fe3d51e8020e28fd650c542c5e277 and refs/remotes/git-svn differ, using rebase:
+r5 = 37b6666dc7e8cf1aeaeffb59ebb47ad729f22e50 (refs/remotes/git-svn)
+W: 4e3efc009dff9974fb91fc6369baf1b41d36852c and refs/remotes/git-svn differ, using rebase:
 :100644 100644 d270188940c824ce4f1e8aa864ca5d2f8c75f939 b349877e032add143a5dc286d30e523181dea4ef M	file
-warning: skipped previously applied commit ad65425
+warning: skipped previously applied commit 4e3efc0
 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 = 62c6ad40207c118c8f0b54fffcb6273d2a8b42a6 (refs/remotes/git-svn)
-No changes between 50dfbcdfc12a21cc9aa52ba0c1a3c069a3611447 and refs/remotes/git-svn
+r6 = f486c08ad5a2966c2145bcdbf524e14ee23e775e (refs/remotes/git-svn)
+No changes between bc1735adb43a619eb5d87f6f7128a7bef2cab17d and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 6 - dcommit does the svn equivalent of an index merge
 
@@ -527750,12 +528674,12 @@
 	git commit -a -m 'clobber' &&
 	test_must_fail git svn dcommit
 	
-HEAD is now at 62c6ad4 more changes
-[master aefc7a4] new file
+HEAD is now at f486c08 more changes
+[master ba6c920] new file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 new-file
-[master f11d58b] clobber
+[master f7e6e65] clobber
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 4 deletions(-)
 Duplicate specification "id|i=s" for option "i"
@@ -527763,23 +528687,23 @@
 	A	new-file
 Committed r8
 	M	file
-r7 = 0e6dbe384d69406904f53cb6b789279546f0571d (refs/remotes/git-svn)
+r7 = c48cfe883b282cf2b668b722c0f18a4457f25e20 (refs/remotes/git-svn)
 	A	new-file
-r8 = d3559c64237cbf45e47094a3f4777f602e155a9b (refs/remotes/git-svn)
-W: aefc7a410c0a6ed3474c16d5e74f0fd2c7ee78af and refs/remotes/git-svn differ, using rebase:
+r8 = 12fe94d25fa5962c9785d3cb57eb7ae85efc3bb1 (refs/remotes/git-svn)
+W: ba6c9207a4ce85d7885861c73d86cb47e48ab85a and refs/remotes/git-svn differ, using rebase:
 :100644 100644 b349877e032add143a5dc286d30e523181dea4ef fad4bec9888fc6883cc5a8447f365d44b8e4ebba M	file
-warning: skipped previously applied commit aefc7a4
+warning: skipped previously applied commit ba6c920
 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 f11d58b... clobber
+error: could not apply f7e6e65... 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 f11d58b... # clobber
+Could not apply f7e6e65... # clobber
 rebase refs/remotes/git-svn: command returned error: 1
 
 ok 8 - multiple dcommit from git svn will not clobber svn
@@ -527788,7 +528712,7 @@
 	git status >output &&
 	grep currently.rebasing output
 
-You are currently rebasing branch 'master' on 'd3559c6'.
+You are currently rebasing branch 'master' on '12fe94d'.
 ok 9 - check that rebase really failed
 
 expecting success of 9106.10 'resolve, continue the rebase and dcommit': 
@@ -527797,7 +528721,7 @@
 	git rebase --continue &&
 	git svn dcommit
 	
-[detached HEAD 6bf3dd4] clobber
+[detached HEAD a9b661d] clobber
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 5 deletions(-)
 Successfully rebased and updated refs/heads/master.
@@ -527806,8 +528730,8 @@
 	M	file
 Committed r9
 	M	file
-r9 = 64fca8d3bfdb513cb8d2d0b0b3561e6b7cfa09a9 (refs/remotes/git-svn)
-No changes between 6bf3dd416fb5df0b410f056fddcbca96dd23c15e and refs/remotes/git-svn
+r9 = d5353b59d4869fc066615981559192834114709e (refs/remotes/git-svn)
+No changes between a9b661d72b4538155caa0795d87c74210280e992 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 10 - resolve, continue the rebase and dcommit
 
@@ -527815,6 +528739,122 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9114-git-svn-dcommit-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9114-git-svn-dcommit-merge/.git/
+expecting success of 9114.1 'setup svn repository': 
+	svn_cmd co "$svnrepo" mysvnwork &&
+	mkdir -p mysvnwork/trunk &&
+	(
+		cd mysvnwork &&
+		big_text_block >>trunk/README &&
+		svn_cmd add trunk &&
+		svn_cmd ci -m "first commit" trunk
+	)
+	
+Checked out revision 0.
+A         trunk
+A         trunk/README
+Adding         trunk
+Adding         trunk/README
+Transmitting file data .done
+Committing transaction...
+Committed revision 1.
+ok 1 - setup svn repository
+
+expecting success of 9114.2 'setup git mirror and merge': 
+	git svn init "$svnrepo" -t tags -T trunk -b branches &&
+	git svn fetch &&
+	git checkout -b svn remotes/origin/trunk &&
+	git checkout -b merge &&
+	echo new file > new_file &&
+	git add new_file &&
+	git commit -a -m "New file" &&
+	echo hello >> README &&
+	git commit -a -m "hello" &&
+	echo add some stuff >> new_file &&
+	git commit -a -m "add some stuff" &&
+	git checkout svn &&
+	mv -f README tmp &&
+	echo friend > README &&
+	cat tmp >> README &&
+	git commit -a -m "friend" &&
+	git merge merge
+	
+	A	README
+r1 = 0593342bb1a0387874d3ce8aa64f0b415a56aa7d (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk r1
+Switched to a new branch 'svn'
+Switched to a new branch 'merge'
+[merge fbb721e] New file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new_file
+[merge 174ed92] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[merge b69d3fd] add some stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'svn'
+[svn 167ea7f] friend
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Auto-merging README
+Merge made by the 'ort' strategy.
+ README   | 1 +
+ new_file | 2 ++
+ 2 files changed, 3 insertions(+)
+ create mode 100644 new_file
+ok 2 - setup git mirror and merge
+
+expecting success of 9114.3 'verify pre-merge ancestry': 
+	test x$(git rev-parse --verify refs/heads/svn^2) = 	     x$(git rev-parse --verify refs/heads/merge) &&
+	git cat-file commit refs/heads/svn^ >actual &&
+	grep '^friend$' actual
+	
+friend
+ok 3 - verify pre-merge ancestry
+
+expecting success of 9114.4 'git svn dcommit merges': 
+	git svn dcommit
+	
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk ...
+	M	README
+Committed r2
+	M	README
+r2 = 4d56d20a70befbacdfed83988c7776ffebc8722a (refs/remotes/origin/trunk)
+	A	new_file
+	M	README
+Committed r3
+	M	README
+	A	new_file
+r3 = 7c282d0f6942698533efb8c2af687334337a5b41 (refs/remotes/origin/trunk)
+No changes between a1d74c16a67662cfed2eb394e1570a186a12900b and refs/remotes/origin/trunk
+Resetting to the latest refs/remotes/origin/trunk
+ok 4 - git svn dcommit merges
+
+expecting success of 9114.5 'verify post-merge ancestry': 
+	test x$(git rev-parse --verify refs/heads/svn) = 	     x$(git rev-parse --verify refs/remotes/origin/trunk) &&
+	test x$(git rev-parse --verify refs/heads/svn^2) = 	     x$(git rev-parse --verify refs/heads/merge) &&
+	git cat-file commit refs/heads/svn^ >actual &&
+	grep '^friend$' actual
+	
+friend
+ok 5 - verify post-merge ancestry
+
+expecting success of 9114.6 'verify merge commit message': 
+	git rev-list --pretty=raw -1 refs/heads/svn >actual &&
+	grep "    Merge branch 'merge' into svn" actual
+	
+    Merge branch 'merge' into svn
+ok 6 - verify merge commit message
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9107-git-svn-migrate.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9107-git-svn-migrate/.git/
 expecting success of 9107.1 'setup old-looking metadata': 
@@ -527859,7 +528899,7 @@
 	A	tags/0.2/README
 	A	tags/0.3/README
 	A	trunk/README
-r1 = e31ce713e6bed46f84517d294792761edf8d93a2 (refs/remotes/git-svn)
+r1 = c5a4001f7dfdc8324403a054dcbd32cc4f5ba3cc (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9107-git-svn-migrate/svnrepo r1
 ok 1 - setup old-looking metadata
@@ -527867,7 +528907,7 @@
 expecting success of 9107.2 'git-svn-HEAD is a real HEAD': 
 	git rev-parse --verify refs/heads/git-svn-HEAD^0
 
-e31ce713e6bed46f84517d294792761edf8d93a2
+c5a4001f7dfdc8324403a054dcbd32cc4f5ba3cc
 ok 2 - git-svn-HEAD is a real HEAD
 
 expecting success of 9107.3 'initialize old-style (v0) git svn layout': 
@@ -527893,8 +528933,8 @@
  - .git/git-svn => .git/svn/git-svn
  - .git/svn/info => .git/svn/svn/info
 Done migrating from a git-svn v1 layout
-e31ce713e6bed46f84517d294792761edf8d93a2
-e31ce713e6bed46f84517d294792761edf8d93a2
+c5a4001f7dfdc8324403a054dcbd32cc4f5ba3cc
+c5a4001f7dfdc8324403a054dcbd32cc4f5ba3cc
 ok 3 - initialize old-style (v0) git svn layout
 
 expecting success of 9107.4 'initialize a multi-repository repo': 
@@ -527954,21 +528994,21 @@
 		done
 	done
 
-Rebuilding .git/svn/git-svn/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796 ...
-r1 = e31ce713e6bed46f84517d294792761edf8d93a2
-Done rebuilding .git/svn/git-svn/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796
+Rebuilding .git/svn/git-svn/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986 ...
+r1 = c5a4001f7dfdc8324403a054dcbd32cc4f5ba3cc
+Done rebuilding .git/svn/git-svn/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986
 	A	README
-r1 = b285d5f378690675742dd683e5bc0360af656eee (refs/remotes/origin/tags/0.3)
+r1 = 0d1117577387bbe2ac5adbfc266c09135562c11e (refs/remotes/origin/a)
 	A	README
-r1 = 37795dbddf68a6df8b4da8b7e47bec81a6e60fb4 (refs/remotes/origin/a)
+r1 = d1f1cf0f768b55318c5eda252ac7a4cd098d05c5 (refs/remotes/origin/tags/0.3)
 	A	README
-r1 = f9287ac7386776159c57682aaec9e19a903193e5 (refs/remotes/origin/tags/0.2)
+r1 = 95e71845abd56aef3711909bdba98e5b57d4220d (refs/remotes/origin/trunk)
 	A	README
-r1 = ed4a91af7d400b3ac00b88c4b582c4250cc0be99 (refs/remotes/origin/trunk)
+r1 = 4431806112bd5be8662ea97cca1c470f35dfc2ff (refs/remotes/origin/tags/0.1)
 	A	README
-r1 = b611600a882ab85ae2721c087ae7e5ef37e3ffef (refs/remotes/origin/tags/0.1)
+r1 = d6278f5441b5ec8e8b1dcd2447fc0ada1a7db4d2 (refs/remotes/origin/b)
 	A	README
-r1 = 189505a7e524d87507c26e186886eda46a776538 (refs/remotes/origin/b)
+r1 = 2c55fdafd80e02973319e61c6a2533672a9b7b0e (refs/remotes/origin/tags/0.2)
 ok 5 - multi-fetch works on partial urls + paths
 
 expecting success of 9107.6 'migrate --minimize on old inited layout': 
@@ -528031,152 +529071,36 @@
 	test ! -e "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db &&
 	test -f "$expect"
 	
-Rebuilding .git/svn/refs/remotes/git-svn/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796 ...
-r1 = e31ce713e6bed46f84517d294792761edf8d93a2
-Done rebuilding .git/svn/refs/remotes/git-svn/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796
-Rebuilding .git/svn/refs/remotes/origin/a/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796 ...
-r1 = 37795dbddf68a6df8b4da8b7e47bec81a6e60fb4
-Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796
-Rebuilding .git/svn/refs/remotes/origin/b/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796 ...
-r1 = 189505a7e524d87507c26e186886eda46a776538
-Done rebuilding .git/svn/refs/remotes/origin/b/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796
-Rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796 ...
-r1 = b611600a882ab85ae2721c087ae7e5ef37e3ffef
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796
-Rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796 ...
-r1 = f9287ac7386776159c57682aaec9e19a903193e5
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796
-Rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796 ...
-r1 = b285d5f378690675742dd683e5bc0360af656eee
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796
-Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796 ...
-r1 = ed4a91af7d400b3ac00b88c4b582c4250cc0be99
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796
-Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796 ...
-r1 = ed4a91af7d400b3ac00b88c4b582c4250cc0be99
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.0ebbb151-e882-41d7-9f61-4cffe9647796
+Rebuilding .git/svn/refs/remotes/git-svn/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986 ...
+r1 = c5a4001f7dfdc8324403a054dcbd32cc4f5ba3cc
+Done rebuilding .git/svn/refs/remotes/git-svn/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986
+Rebuilding .git/svn/refs/remotes/origin/a/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986 ...
+r1 = 0d1117577387bbe2ac5adbfc266c09135562c11e
+Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986
+Rebuilding .git/svn/refs/remotes/origin/b/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986 ...
+r1 = d6278f5441b5ec8e8b1dcd2447fc0ada1a7db4d2
+Done rebuilding .git/svn/refs/remotes/origin/b/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986
+Rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986 ...
+r1 = 4431806112bd5be8662ea97cca1c470f35dfc2ff
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986
+Rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986 ...
+r1 = 2c55fdafd80e02973319e61c6a2533672a9b7b0e
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986
+Rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986 ...
+r1 = d1f1cf0f768b55318c5eda252ac7a4cd098d05c5
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986
+Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986 ...
+r1 = 95e71845abd56aef3711909bdba98e5b57d4220d
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986
+Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986 ...
+r1 = 95e71845abd56aef3711909bdba98e5b57d4220d
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.4c7e85a6-361b-45f5-8b66-31bb9fcb9986
 ok 7 - .rev_db auto-converted to .rev_map.UUID
 
 # passed all 7 test(s)
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9114-git-svn-dcommit-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9114-git-svn-dcommit-merge/.git/
-expecting success of 9114.1 'setup svn repository': 
-	svn_cmd co "$svnrepo" mysvnwork &&
-	mkdir -p mysvnwork/trunk &&
-	(
-		cd mysvnwork &&
-		big_text_block >>trunk/README &&
-		svn_cmd add trunk &&
-		svn_cmd ci -m "first commit" trunk
-	)
-	
-Checked out revision 0.
-A         trunk
-A         trunk/README
-Adding         trunk
-Adding         trunk/README
-Transmitting file data .done
-Committing transaction...
-Committed revision 1.
-ok 1 - setup svn repository
-
-expecting success of 9114.2 'setup git mirror and merge': 
-	git svn init "$svnrepo" -t tags -T trunk -b branches &&
-	git svn fetch &&
-	git checkout -b svn remotes/origin/trunk &&
-	git checkout -b merge &&
-	echo new file > new_file &&
-	git add new_file &&
-	git commit -a -m "New file" &&
-	echo hello >> README &&
-	git commit -a -m "hello" &&
-	echo add some stuff >> new_file &&
-	git commit -a -m "add some stuff" &&
-	git checkout svn &&
-	mv -f README tmp &&
-	echo friend > README &&
-	cat tmp >> README &&
-	git commit -a -m "friend" &&
-	git merge merge
-	
-	A	README
-r1 = cc5f4db1e2edf47475f0031ef65cb85072fba7d2 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk r1
-Switched to a new branch 'svn'
-Switched to a new branch 'merge'
-[merge 55a217b] New file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new_file
-[merge 8a85014] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[merge 9e04709] add some stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'svn'
-[svn 0b18e6c] friend
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Auto-merging README
-Merge made by the 'ort' strategy.
- README   | 1 +
- new_file | 2 ++
- 2 files changed, 3 insertions(+)
- create mode 100644 new_file
-ok 2 - setup git mirror and merge
-
-expecting success of 9114.3 'verify pre-merge ancestry': 
-	test x$(git rev-parse --verify refs/heads/svn^2) = 	     x$(git rev-parse --verify refs/heads/merge) &&
-	git cat-file commit refs/heads/svn^ >actual &&
-	grep '^friend$' actual
-	
-friend
-ok 3 - verify pre-merge ancestry
-
-expecting success of 9114.4 'git svn dcommit merges': 
-	git svn dcommit
-	
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk ...
-	M	README
-Committed r2
-	M	README
-r2 = 427dab1482ad0ed6203ff013ba53b8ea54ef8900 (refs/remotes/origin/trunk)
-	A	new_file
-	M	README
-Committed r3
-	M	README
-	A	new_file
-r3 = 9b16f80f662bc856b543f6141bea8ee0d80567f2 (refs/remotes/origin/trunk)
-No changes between 6b812f568d50b48f0a4648bc52afba76adbbf1aa and refs/remotes/origin/trunk
-Resetting to the latest refs/remotes/origin/trunk
-ok 4 - git svn dcommit merges
-
-expecting success of 9114.5 'verify post-merge ancestry': 
-	test x$(git rev-parse --verify refs/heads/svn) = 	     x$(git rev-parse --verify refs/remotes/origin/trunk) &&
-	test x$(git rev-parse --verify refs/heads/svn^2) = 	     x$(git rev-parse --verify refs/heads/merge) &&
-	git cat-file commit refs/heads/svn^ >actual &&
-	grep '^friend$' actual
-	
-friend
-ok 5 - verify post-merge ancestry
-
-expecting success of 9114.6 'verify merge commit message': 
-	git rev-list --pretty=raw -1 refs/heads/svn >actual &&
-	grep "    Merge branch 'merge' into svn" actual
-	
-    Merge branch 'merge' into svn
-ok 6 - verify merge commit message
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9119-git-svn-info.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9119-git-svn-info/.git/
 1..0 # SKIP skipping svn-info test (SVN version: 1.14.5 not supported)
@@ -528242,13 +529166,13 @@
 	A	ne_cr
 	A	ne_crlf
 	A	ne_lf
-r1 = dbf56bb4f4eff4e4fc56e3a1106cc501d8724598 (refs/remotes/git-svn)
+r1 = 733be09acd71d23daf6cb0343dac55ec21ae43fb (refs/remotes/git-svn)
 	M	kw.c
-r2 = ee3bcd5f8a8be207cd09b2f4717e154855eb82f4 (refs/remotes/git-svn)
+r2 = f461c42d9d80b185dab559ffb4994638172388e4 (refs/remotes/git-svn)
 	M	kw.c
-r3 = dff249835af1ba68e29f284230e3a93a0e8fd1f3 (refs/remotes/git-svn)
+r3 = 158b6cd5c2363018b27ced311b08c7f7b487dc01 (refs/remotes/git-svn)
 	M	kw.c
-r4 = 41e92f08dd4315cbfc4d27d5949239d50541f66f (refs/remotes/git-svn)
+r4 = 0eefc80d7ad653d1984868b4b832ba9099193f74 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9101-git-svn-props/svnrepo r4
 ok 4 - fetch revisions from svn
@@ -528259,16 +529183,16 @@
 	git svn set-tree remotes/git-svn..mybranch &&
 	git pull . remotes/git-svn
 Switched to a new branch 'mybranch'
-[mybranch 75a0e14] test keywords ignoring
+[mybranch c5c8245] test keywords ignoring
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 	M	kw.c
 	M	kw.c
-r5 = 465257bb6a423bc13028ad8542b44bce00621d20 (refs/remotes/git-svn)
+r5 = 291a4e4383947e8c8ee801031818a4118f003e40 (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 75a0e14..465257b
+Updating c5c8245..291a4e4
 Fast-forward
 ok 5 - test svn:keywords ignoring
 
@@ -528301,10 +529225,10 @@
 	M	crlf
 	M	empty
 	M	ne_crlf
-r6 = dd248ea13744c175535c90c51ef663ef35cf1a8a (refs/remotes/git-svn)
+r6 = db09d726cb2d4e7dd2ea73c31b9665759b728071 (refs/remotes/git-svn)
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 465257b..dd248ea
+Updating 291a4e4..db09d72
 Fast-forward
  crlf    | 3 +--
  ne_crlf | 3 +--
@@ -528372,10 +529296,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 = a4fc917e4e6095d6673b74c577e634b50a25f250 (refs/remotes/git-svn)
+r7 = d10c64f468322fcaeacc5c39fa0166e05791cc3d (refs/remotes/git-svn)
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating dd248ea..a4fc917
+Updating db09d72..d10c64f
 Fast-forward
  cr    | 4 +++-
  ne_cr | 4 +++-
@@ -528435,10 +529359,10 @@
 	grep gitignore ls_files_result | cmp - create-ignore-index.expect
 	
 	A	deeply/nested/directory/.keep
-r8 = b7f32169be649dd1d8b6633a10f8b75b12c8711c (refs/remotes/git-svn)
+r8 = 56ced2cc74d680ea2d8218be53ea5b5c6432f7cf (refs/remotes/git-svn)
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating a4fc917..b7f3216
+Updating d10c64f..56ced2c
 Fast-forward
  deeply/nested/directory/.keep | 0
  1 file changed, 0 insertions(+), 0 deletions(-)
@@ -528596,22 +529520,22 @@
 	(required for this version (2.51.0) of git-svn) does not exist.
 Done migrating from a git-svn v1 layout
 	A	readme
-r1 = d6f97df72b623157709411594960619211b6b9ec (refs/remotes/trunk)
+r1 = 44cf44ec8458c24c45c8785b9dd82708fab76438 (refs/remotes/trunk)
 branch_from: /trunk => /trunk/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a, 1
-Found branch parent: (refs/remotes/branches/v1/start) d6f97df72b623157709411594960619211b6b9ec
+Found branch parent: (refs/remotes/branches/v1/start) 44cf44ec8458c24c45c8785b9dd82708fab76438
 Following parent with do_switch
 Successfully followed parent
-r2 = f9a526fd45730b33a6369f3ecc3011b5b9e10401 (refs/remotes/branches/v1/start)
+r2 = 427c264429f38a9ae0b2c24499abd72ed071af47 (refs/remotes/branches/v1/start)
 	M	readme
-r3 = 638a54e65ab59b89a1b792b23cc0feb3f1d5bdb7 (refs/remotes/branches/v1/start)
+r3 = 4c11fb632f4172a43112a6e6efcb4b9b3be687c5 (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.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end/src/a, 3
-Found branch parent: (refs/remotes/tags/end) 638a54e65ab59b89a1b792b23cc0feb3f1d5bdb7
+Found branch parent: (refs/remotes/tags/end) 4c11fb632f4172a43112a6e6efcb4b9b3be687c5
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r4 = 070b1e3ba6e94f8ff0fc40de629c33e0a73bfd9a (refs/remotes/tags/end)
+r4 = ce64cd7466cfe4f8e8de73902fda167f8babd948 (refs/remotes/tags/end)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/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.
@@ -528653,26 +529577,26 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 185a56acee7139dd7980cadf0c37efc3f384789f (refs/remotes/two/trunk)
+r1 = 7a611473c6d80bf1974147c02afd9e540a05d21c (refs/remotes/two/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
-Found branch parent: (refs/remotes/two/branches/v1/start) 185a56acee7139dd7980cadf0c37efc3f384789f
+Found branch parent: (refs/remotes/two/branches/v1/start) 7a611473c6d80bf1974147c02afd9e540a05d21c
 Following parent with do_switch
 Successfully followed parent
-r2 = 2d85034ae88a1d7c572e11c1ff9f1e4e9f245218 (refs/remotes/two/branches/v1/start)
+r2 = 802d475d6d28c54281ca2f6e7f8ecc4e4e46b6fe (refs/remotes/two/branches/v1/start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = 7aeccacdbeba63f420e300eebad935e13ddc3bc4 (refs/remotes/two/branches/v1/start)
+r3 = 95c732f0bfad61d42d5806e5f5454d8e149588ef (refs/remotes/two/branches/v1/start)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/two/tags/end) 7aeccacdbeba63f420e300eebad935e13ddc3bc4
+Found branch parent: (refs/remotes/two/tags/end) 95c732f0bfad61d42d5806e5f5454d8e149588ef
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = e18c0d425813bed3e2b9d24fa4a7f2152781db32 (refs/remotes/two/tags/end)
+r4 = bca03c55e1ec7ebe6b575355e199b5de0a33c22c (refs/remotes/two/tags/end)
 	M	src/b/readme
-r5 = faf9604259f00bdff7cd11a2271fa2ae14a20ff7 (refs/remotes/two/tags/end)
+r5 = 804a2ee31ff9376c8740f2a880eb9f6ab4ce8842 (refs/remotes/two/tags/end)
 	M	src/b/readme
-r6 = 24ae1f4626211a9e67323980acc8f7c9919bbd9a (refs/remotes/two/tags/end)
+r6 = d4abdbb15af21364b25ed30bb90b29bc3586da66 (refs/remotes/two/tags/end)
 ok 2 - test left-hand-side only globbing
 
 expecting success of 9109.3 'test another branch': 
@@ -528747,43 +529671,43 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 185a56acee7139dd7980cadf0c37efc3f384789f (refs/remotes/four/trunk)
+r1 = 7a611473c6d80bf1974147c02afd9e540a05d21c (refs/remotes/four/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
-Found branch parent: (refs/remotes/four/branches/v1/start) 185a56acee7139dd7980cadf0c37efc3f384789f
+Found branch parent: (refs/remotes/four/branches/v1/start) 7a611473c6d80bf1974147c02afd9e540a05d21c
 Following parent with do_switch
 Successfully followed parent
-r2 = 2d85034ae88a1d7c572e11c1ff9f1e4e9f245218 (refs/remotes/four/branches/v1/start)
+r2 = 802d475d6d28c54281ca2f6e7f8ecc4e4e46b6fe (refs/remotes/four/branches/v1/start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = 7aeccacdbeba63f420e300eebad935e13ddc3bc4 (refs/remotes/four/branches/v1/start)
+r3 = 95c732f0bfad61d42d5806e5f5454d8e149588ef (refs/remotes/four/branches/v1/start)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/four/tags/end) 7aeccacdbeba63f420e300eebad935e13ddc3bc4
+Found branch parent: (refs/remotes/four/tags/end) 95c732f0bfad61d42d5806e5f5454d8e149588ef
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = e18c0d425813bed3e2b9d24fa4a7f2152781db32 (refs/remotes/four/tags/end)
+r4 = bca03c55e1ec7ebe6b575355e199b5de0a33c22c (refs/remotes/four/tags/end)
 	M	src/b/readme
-r5 = faf9604259f00bdff7cd11a2271fa2ae14a20ff7 (refs/remotes/four/tags/end)
+r5 = 804a2ee31ff9376c8740f2a880eb9f6ab4ce8842 (refs/remotes/four/tags/end)
 	M	src/b/readme
-r6 = 24ae1f4626211a9e67323980acc8f7c9919bbd9a (refs/remotes/four/tags/end)
+r6 = d4abdbb15af21364b25ed30bb90b29bc3586da66 (refs/remotes/four/tags/end)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start, 3
-Found branch parent: (refs/remotes/four/branches/v2/start) 185a56acee7139dd7980cadf0c37efc3f384789f
+Found branch parent: (refs/remotes/four/branches/v2/start) 7a611473c6d80bf1974147c02afd9e540a05d21c
 Following parent with do_switch
 Successfully followed parent
-r7 = d9d2a681145efd9466da67be66306b70a424fd54 (refs/remotes/four/branches/v2/start)
+r7 = 607bcb9c7d68fa34218907b9b0958b5f7a190c0b (refs/remotes/four/branches/v2/start)
 	M	src/a/readme
 	M	src/b/readme
-r8 = 9a614f27386e60fad5c429d14e662c38d297a8e4 (refs/remotes/four/branches/v2/start)
+r8 = df9216e2937481d39987ee3d20f51336602f9787 (refs/remotes/four/branches/v2/start)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/next, 8
-Found branch parent: (refs/remotes/four/tags/next) 9a614f27386e60fad5c429d14e662c38d297a8e4
+Found branch parent: (refs/remotes/four/tags/next) df9216e2937481d39987ee3d20f51336602f9787
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r9 = f8efed98b7013b1fbd0091207261edb64d5f8151 (refs/remotes/four/tags/next)
+r9 = 75e379b54bab532562cf9adc0f012f351ccabe8a (refs/remotes/four/tags/next)
 	M	src/b/readme
-r10 = 899bdd4b93d2fb4d253093f38d8535f8bd0bbf58 (refs/remotes/four/tags/next)
+r10 = aa5913a20ce22d13fa7872da2a7c9f49b3d51093 (refs/remotes/four/tags/next)
 ok 3 - test another branch
 
 expecting success of 9109.4 'prepare test disallow multiple globs': 
@@ -528829,7 +529753,7 @@
 	git checkout -b mybranch remotes/git-svn
 	
 	A	foo
-r1 = 7ed0290590dbfb2daa2b4ef1f04e98194eff8fc0 (refs/remotes/git-svn)
+r1 = 34ea414d12b7705bc5029a529739d11fad1ba13b (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9123-git-svn-rebuild-with-rewriteroot/svnrepo r1
 Switched to a new branch 'mybranch'
@@ -528937,10 +529861,10 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9122-git-svn-author/work.git/.git/
 	A	file
-r1 = 7b43cdd68ba86d39b919a13e1981adfbf4f7b983 (refs/remotes/git-svn)
+r1 = 5154b3436243be124ba3a7230b6c677f6b281f77 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9122-git-svn-author/svnrepo r1
-[master b78deba] second
+[master ee2ad58] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -528948,10 +529872,10 @@
 	M	file
 Committed r2
 	M	file
-r2 = 9a9eb5327a54ce312870daf5cc8426fb488a2893 (refs/remotes/git-svn)
-No changes between b78deba381e752ba9317a3543b281f3edb2b0da9 and refs/remotes/git-svn
+r2 = 8a643c1fe6a4e4483ae754b96de75c5d8c04db8b (refs/remotes/git-svn)
+No changes between ee2ad584dfeec09959e69b70b168811f53e3cee2 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master cd0d748] third
+[master ad402ce] third
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -528959,10 +529883,10 @@
 	M	file
 Committed r3
 	M	file
-r3 = 971e143d6c3a2fcd9fed431519ea2d7d9d4f90fe (refs/remotes/git-svn)
-No changes between cd0d748fdc39e01066e1ff7c825c65707dc7237b and refs/remotes/git-svn
+r3 = 8adb7cae57778a8469d00c930fc3923128369094 (refs/remotes/git-svn)
+No changes between ad402ceaa6076c6d3cc1d738b3944ad77c939747 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master dfd1ec6] fourth
+[master 2fc1d57] fourth
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -528970,44 +529894,44 @@
 	M	file
 Committed r4
 	M	file
-r4 = 4b6f28bef2613faa0fac4fad7e0f6f162901c928 (refs/remotes/git-svn)
-No changes between dfd1ec6cdace4bd2409e65d421f0ea2a52b854b1 and refs/remotes/git-svn
+r4 = 92d77225f54e1d826696fc0bf0f3c00e4a16f227 (refs/remotes/git-svn)
+No changes between 2fc1d572cd3f232587ffaa3e1b34da67a917997a and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-commit 4b6f28bef2613faa0fac4fad7e0f6f162901c928
+commit 92d77225f54e1d826696fc0bf0f3c00e4a16f227
 Author: A U Thor <author@example.com>
-Date:   Wed Aug 27 08:23:26 2025 +0000
+Date:   Tue Sep 29 14:54:08 2026 +0000
 
     fourth
     
     From: A U Thor <author@example.com>
     
-    git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9122-git-svn-author/svnrepo@4 ec1108a8-2be0-4721-a01b-b0d918b58122
+    git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9122-git-svn-author/svnrepo@4 35b76d01-81bf-4f65-a4e8-2906a80cf46c
 
-commit 971e143d6c3a2fcd9fed431519ea2d7d9d4f90fe
-Author: pbuilder1 <pbuilder1@ec1108a8-2be0-4721-a01b-b0d918b58122>
-Date:   Wed Aug 27 08:23:25 2025 +0000
+commit 8adb7cae57778a8469d00c930fc3923128369094
+Author: pbuilder2 <pbuilder2@35b76d01-81bf-4f65-a4e8-2906a80cf46c>
+Date:   Tue Sep 29 14:54:07 2026 +0000
 
     third
     
     From: A U Thor <author@example.com>
     
-    git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9122-git-svn-author/svnrepo@3 ec1108a8-2be0-4721-a01b-b0d918b58122
+    git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9122-git-svn-author/svnrepo@3 35b76d01-81bf-4f65-a4e8-2906a80cf46c
 
-commit 9a9eb5327a54ce312870daf5cc8426fb488a2893
-Author: pbuilder1 <pbuilder1@ec1108a8-2be0-4721-a01b-b0d918b58122>
-Date:   Wed Aug 27 08:23:23 2025 +0000
+commit 8a643c1fe6a4e4483ae754b96de75c5d8c04db8b
+Author: pbuilder2 <pbuilder2@35b76d01-81bf-4f65-a4e8-2906a80cf46c>
+Date:   Tue Sep 29 14:54:06 2026 +0000
 
     second
     
-    git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9122-git-svn-author/svnrepo@2 ec1108a8-2be0-4721-a01b-b0d918b58122
+    git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9122-git-svn-author/svnrepo@2 35b76d01-81bf-4f65-a4e8-2906a80cf46c
 
-commit 7b43cdd68ba86d39b919a13e1981adfbf4f7b983
-Author: pbuilder1 <pbuilder1@ec1108a8-2be0-4721-a01b-b0d918b58122>
-Date:   Wed Aug 27 08:23:20 2025 +0000
+commit 5154b3436243be124ba3a7230b6c677f6b281f77
+Author: pbuilder2 <pbuilder2@35b76d01-81bf-4f65-a4e8-2906a80cf46c>
+Date:   Tue Sep 29 14:54:03 2026 +0000
 
     first commit
     
-    git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9122-git-svn-author/svnrepo@1 ec1108a8-2be0-4721-a01b-b0d918b58122
+    git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9122-git-svn-author/svnrepo@1 35b76d01-81bf-4f65-a4e8-2906a80cf46c
     From: A U Thor <author@example.com>
     From: A U Thor <author@example.com>
 Author: A U Thor <author@example.com>
@@ -529092,51 +530016,51 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9118-git-svn-funky-branch-names/project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo
 	A	foo
-r1 = e0768b1d791806711a829169297baa4b481d28cf (refs/remotes/origin/trunk)
+r1 = 3fb894a736281ff417c4c275e13b4ac28e558df5 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin, 1
-Found branch parent: (refs/remotes/origin/fun plugin) e0768b1d791806711a829169297baa4b481d28cf
+Found branch parent: (refs/remotes/origin/fun plugin) 3fb894a736281ff417c4c275e13b4ac28e558df5
 Following parent with do_switch
 Successfully followed parent
-r2 = c115c6a48eb15e95e13234fdb5affea932cb0988 (refs/remotes/origin/fun plugin)
+r2 = 2b185dd85632a7aafd5448519f9065f194d598ae (refs/remotes/origin/fun plugin)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/reproducible-path/git-2.51.0/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!) c115c6a48eb15e95e13234fdb5affea932cb0988
+Found branch parent: (refs/remotes/origin/more fun plugin!) 2b185dd85632a7aafd5448519f9065f194d598ae
 Following parent with do_switch
 Successfully followed parent
-r3 = c4ea8d51da9f9cc1be807155edd84204352467fc (refs/remotes/origin/more fun plugin!)
+r3 = 1caffee19602f7fb4dc5fbea84b32bf5477dec10 (refs/remotes/origin/more fun plugin!)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/reproducible-path/git-2.51.0/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)) c115c6a48eb15e95e13234fdb5affea932cb0988
+Found branch parent: (refs/remotes/origin/Abo-Uebernahme (Bug #994)) 2b185dd85632a7aafd5448519f9065f194d598ae
 Following parent with do_switch
 Successfully followed parent
-r4 = 8d1ecfbb17583d4209598f16eaf1cb6237ed2218 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
+r4 = e65cb0ee843c62365d8aa1438291d2b9793e8d82 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/.leading_dot, 4
-Found branch parent: (refs/remotes/origin/.leading_dot) e0768b1d791806711a829169297baa4b481d28cf
+Found branch parent: (refs/remotes/origin/.leading_dot) 3fb894a736281ff417c4c275e13b4ac28e558df5
 Following parent with do_switch
 Successfully followed parent
-r5 = ce5c6a261b00783dc00b1ee2b0434f81dd43a776 (refs/remotes/origin/.leading_dot)
+r5 = 541b59536261154ae8f72284b793061d7b2cbe65 (refs/remotes/origin/.leading_dot)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dot., 5
-Found branch parent: (refs/remotes/origin/trailing_dot.) e0768b1d791806711a829169297baa4b481d28cf
+Found branch parent: (refs/remotes/origin/trailing_dot.) 3fb894a736281ff417c4c275e13b4ac28e558df5
 Following parent with do_switch
 Successfully followed parent
-r6 = a22851c07c2ac12b0f28f5214294e58e55ed7b4b (refs/remotes/origin/trailing_dot.)
+r6 = 0d51b13b6dc14a8898eb8b0ce24dbe014eec1589 (refs/remotes/origin/trailing_dot.)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.51.0/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) e0768b1d791806711a829169297baa4b481d28cf
+Found branch parent: (refs/remotes/origin/trailing_dotlock.lock) 3fb894a736281ff417c4c275e13b4ac28e558df5
 Following parent with do_switch
 Successfully followed parent
-r7 = 8269e4d560d9f70df58e221c1fe0009dc6662c38 (refs/remotes/origin/trailing_dotlock.lock)
+r7 = f8f86fb8b5b7d01bb2c85ecd599c5aca508e9775 (refs/remotes/origin/trailing_dotlock.lock)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.51.0/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) e0768b1d791806711a829169297baa4b481d28cf
+Found branch parent: (refs/remotes/origin/not-a@{0}reflog) 3fb894a736281ff417c4c275e13b4ac28e558df5
 Following parent with do_switch
 Successfully followed parent
-r8 = 27a6f832a1cafa402632dc1e605f6469dcdc12f5 (refs/remotes/origin/not-a@{0}reflog)
+r8 = 7abd7d83dc206eb58edf5dfd46b7e74b45deacc6 (refs/remotes/origin/not-a@{0}reflog)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk r1
-c115c6a48eb15e95e13234fdb5affea932cb0988
-c4ea8d51da9f9cc1be807155edd84204352467fc
-8d1ecfbb17583d4209598f16eaf1cb6237ed2218
-ce5c6a261b00783dc00b1ee2b0434f81dd43a776
-a22851c07c2ac12b0f28f5214294e58e55ed7b4b
-8269e4d560d9f70df58e221c1fe0009dc6662c38
-27a6f832a1cafa402632dc1e605f6469dcdc12f5
+2b185dd85632a7aafd5448519f9065f194d598ae
+1caffee19602f7fb4dc5fbea84b32bf5477dec10
+e65cb0ee843c62365d8aa1438291d2b9793e8d82
+541b59536261154ae8f72284b793061d7b2cbe65
+0d51b13b6dc14a8898eb8b0ce24dbe014eec1589
+f8f86fb8b5b7d01bb2c85ecd599c5aca508e9775
+7abd7d83dc206eb58edf5dfd46b7e74b45deacc6
 ok 2 - test clone with funky branch names
 
 expecting success of 9118.3 'test dcommit to funky branch': 
@@ -529148,8 +530072,8 @@
 		git svn dcommit
 	)
 	
-HEAD is now at c4ea8d5 more fun!
-[master 5a7ad63] hello
+HEAD is now at 1caffee more fun!
+[master a135f6a] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -529157,8 +530081,8 @@
 	M	foo
 Committed r9
 	M	foo
-r9 = 57f7f21158707c352773066cb6bee2337632aaa4 (refs/remotes/origin/more fun plugin!)
-No changes between 5a7ad63b1c4d5c31d0126e91a82f2b9b3a0ec449 and refs/remotes/origin/more%20fun%20plugin!
+r9 = 5d65a26a4d5e9b8606513cd95051784e7ff5f59a (refs/remotes/origin/more fun plugin!)
+No changes between a135f6a22a64efc877574f7cddb219883091a838 and refs/remotes/origin/more%20fun%20plugin!
 Resetting to the latest refs/remotes/origin/more%20fun%20plugin!
 ok 3 - test dcommit to funky branch
 
@@ -529171,8 +530095,8 @@
 		git svn dcommit
 	)
 	
-HEAD is now at 8d1ecfb scary
-[master ecd859e] eep
+HEAD is now at e65cb0e scary
+[master daa6f79] eep
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -529180,8 +530104,8 @@
 	M	foo
 Committed r10
 	M	foo
-r10 = 04dec361e5190f8b37aeefa54c82f6f1af0aabdb (refs/remotes/origin/Abo-Uebernahme (Bug #994))
-No changes between ecd859e0b5d1d16a84a267a2376e98987a7a29cc and refs/remotes/origin/Abo-Uebernahme%20(Bug%20#994)
+r10 = e1aa8d9dc974a89d0e218c6296a1ef6bf227c244 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
+No changes between daa6f79669ccc7bfa709b0316bc840339196fad1 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
 
@@ -529194,8 +530118,8 @@
 		git svn dcommit
 	)
 	
-HEAD is now at 8269e4d trailing .lock
-[master 0d1e86e] bar
+HEAD is now at f8f86fb trailing .lock
+[master c08a840] bar
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -529203,8 +530127,8 @@
 	M	foo
 Committed r11
 	M	foo
-r11 = c34d1e143b743e611c74fb7162334bc78e29b6ed (refs/remotes/origin/trailing_dotlock.lock)
-No changes between 0d1e86e5a9943243693af594445b3aefce88b53d and refs/remotes/origin/trailing_dotlock%2Elock
+r11 = 181f272d4d2f112583d867a71828e05b0b5502c5 (refs/remotes/origin/trailing_dotlock.lock)
+No changes between c08a840a4c0ce5c448d81f3bb8cfe1cfa1173f44 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
 
@@ -529234,7 +530158,7 @@
 Committing transaction...
 Committed revision 1.
 	A	foo
-r1 = 2f994f44f39cb00e884e621d5d2e15b4ccbc29e7 (refs/remotes/git-svn)
+r1 = 9ae9b80991c01aa21caa577bf28b7bab8e0fc574 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9124-git-svn-dcommit-auto-props/svnrepo r1
 ok 1 - initialize git svn
@@ -529253,7 +530177,7 @@
 	git commit -m "files for enabled auto-props" &&
 	git svn dcommit --config-dir=user
 
-[master 3fae6c1] files for enabled auto-props
+[master eb2f474] files for enabled auto-props
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100644 bar
@@ -529268,8 +530192,8 @@
 	A	bar
 	A	exec1.sh
 	A	hello.txt
-r2 = 30a2be04801b49f002e848454a1c9577bb926f8d (refs/remotes/git-svn)
-No changes between 3fae6c1209358b6f83fa22eed5e56dd2295bda48 and refs/remotes/git-svn
+r2 = 19cf12d64221f4d5e5593076f4fef94fe4d192ae (refs/remotes/git-svn)
+No changes between eb2f474e2ec1d4bce1a97c2a7579f27bc69e46e7 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 3 - add files matching auto-props
 
@@ -529286,7 +530210,7 @@
 	git commit -m "files for disabled auto-props" &&
 	git svn dcommit --config-dir=user
 
-[master 512e1ea] files for disabled auto-props
+[master 5eb43ac] files for disabled auto-props
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100755 exec2.sh
@@ -529301,8 +530225,8 @@
 	A	exec2.sh
 	A	world.txt
 	A	zot
-r3 = 080a3771dc6fbbdf3b82a10b3f8e987b43f9950e (refs/remotes/git-svn)
-No changes between 512e1eae85c7441819717f35e50c15d65b550bdb and refs/remotes/git-svn
+r3 = 629efa70c4126b7d61c58e78e7aa62ec80aca9df (refs/remotes/git-svn)
+No changes between 5eb43ac4ea0e135f86847e69a158884941cd41d7 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 5 - add files matching disabled auto-props
 
@@ -529371,7 +530295,7 @@
 		test "x$(svn_cmd propget svn:eol-style foo.sh)" = "xLF"
 	)
 
-[master 4c899f3] foo => foo.sh
+[master 383592f] foo => foo.sh
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename foo => foo.sh (100%)
@@ -529382,8 +530306,8 @@
 	D	foo
 	A	foo.sh
 W: -empty_dir: foo
-r4 = 634146ab3ec41c0f62cdca2babd62f3183d5014d (refs/remotes/git-svn)
-No changes between 4c899f37922f0cb7bf5ddf6cbb678725b5a14243 and refs/remotes/git-svn
+r4 = 7512b7ec80495720bfd6f520ab73af4fdbd28bc5 (refs/remotes/git-svn)
+No changes between 383592fc83ac674ac0847871107ead9323305538 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 D    foo
@@ -529395,6 +530319,86 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9125-git-svn-multi-glob-branch-names.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9125-git-svn-multi-glob-branch-names/.git/
+expecting success of 9125.1 'setup svnrepo': 
+	mkdir project project/trunk project/branches \
+			project/branches/v14.1 project/tags &&
+	echo foo > project/trunk/foo &&
+	svn_cmd import -m "$test_description" project "$svnrepo/project" &&
+	rm -rf project &&
+	svn_cmd cp -m "fun" "$svnrepo/project/trunk" \
+	                "$svnrepo/project/branches/v14.1/beta" &&
+	svn_cmd cp -m "more fun!" "$svnrepo/project/branches/v14.1/beta" \
+	                      "$svnrepo/project/branches/v14.1/gold"
+	
+Adding         project/branches
+Adding         project/branches/v14.1
+Adding         project/tags
+Adding         project/trunk
+Adding         project/trunk/foo
+Committing transaction...
+Committed revision 1.
+Committing transaction...
+Committed revision 2.
+Committing transaction...
+Committed revision 3.
+ok 1 - setup svnrepo
+
+expecting success of 9125.2 'test clone with multi-glob in branch names': 
+	git svn clone -T trunk -b branches/*/* -t tags \
+	              "$svnrepo/project" project &&
+	(cd project &&
+		git rev-parse "refs/remotes/origin/v14.1/beta" &&
+		git rev-parse "refs/remotes/origin/v14.1/gold"
+	)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9125-git-svn-multi-glob-branch-names/project/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo
+	A	foo
+r1 = 2225138dc532d1b7d6c2f04c453f63f52a817c23 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/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) 2225138dc532d1b7d6c2f04c453f63f52a817c23
+Following parent with do_switch
+Successfully followed parent
+r2 = e5a954880e06159ee150d6edd6d97db36a575461 (refs/remotes/origin/v14.1/beta)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/beta => file:///build/reproducible-path/git-2.51.0/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) e5a954880e06159ee150d6edd6d97db36a575461
+Following parent with do_switch
+Successfully followed parent
+r3 = 052eb7d9cf70650064fa9dbdeb1d65503db14dd7 (refs/remotes/origin/v14.1/gold)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk r1
+e5a954880e06159ee150d6edd6d97db36a575461
+052eb7d9cf70650064fa9dbdeb1d65503db14dd7
+ok 2 - test clone with multi-glob in branch names
+
+expecting success of 9125.3 'test dcommit to multi-globbed branch': 
+	(cd project &&
+	git reset --hard 'refs/remotes/origin/v14.1/gold' &&
+	echo hello >> foo &&
+	git commit -m 'hello' -- foo &&
+	git svn dcommit
+	)
+	
+HEAD is now at 052eb7d more fun!
+[master 15ae061] hello
+ 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.51.0/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/gold ...
+	M	foo
+Committed r4
+	M	foo
+r4 = ead064a78700ff6d866eb4607462a994345df136 (refs/remotes/origin/v14.1/gold)
+No changes between 15ae0619723d403a58e51c7852012128403603bb 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
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9120-git-svn-clone-with-percent-escapes.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9120-git-svn-clone-with-percent-escapes/.git/
 expecting success of 9120.1 'setup svnrepo': 
@@ -529431,14 +530435,14 @@
 	A	trunk/foo
 W: +empty_dir: branches
 W: +empty_dir: tags
-r1 = b8aad7f06b97dcef6e6f8281557d1d671300c346 (refs/remotes/git-svn)
+r1 = 86cdb01fe2553a550bb047f6e0d7c1cb97800a93 (refs/remotes/git-svn)
 	A	branches/b/foo
-r2 = c8170a75e13cae6d279a0cbcfd7caceb887bb5c6 (refs/remotes/git-svn)
+r2 = 2cd2998380cdf7715f5194af47c18661b791fa7d (refs/remotes/git-svn)
 	A	tags/v1/foo
-r3 = 9792e95df981127bf02983e55129663fbfae6fa7 (refs/remotes/git-svn)
+r3 = fe6739f2c2e5767293762bcbf0a16e3b3d02a07b (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject r3
-9792e95df981127bf02983e55129663fbfae6fa7
+fe6739f2c2e5767293762bcbf0a16e3b3d02a07b
 ok 2 - test clone with percent escapes
 
 expecting success of 9120.3 'svn checkout with percent escapes': 
@@ -529485,10 +530489,10 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9120-git-svn-clone-with-percent-escapes/minimize/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
 	A	foo
-r1 = d19c6d083e810a7bc24572611a773f368a5966ea (refs/remotes/git-svn)
+r1 = 1a828ca5ed9ac42926fb476ae3fe821315bf6ed8 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-d19c6d083e810a7bc24572611a773f368a5966ea
+1a828ca5ed9ac42926fb476ae3fe821315bf6ed8
 ok 5 - test clone trunk with percent escapes and minimize-url
 
 expecting success of 9120.6 'test clone trunk with percent escapes': 
@@ -529500,10 +530504,10 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9120-git-svn-clone-with-percent-escapes/trunk/.git/
 	A	foo
-r1 = d19c6d083e810a7bc24572611a773f368a5966ea (refs/remotes/git-svn)
+r1 = 1a828ca5ed9ac42926fb476ae3fe821315bf6ed8 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-d19c6d083e810a7bc24572611a773f368a5966ea
+1a828ca5ed9ac42926fb476ae3fe821315bf6ed8
 ok 6 - test clone trunk with percent escapes
 
 expecting success of 9120.7 'test clone --stdlayout with percent escapes': 
@@ -529518,22 +530522,22 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9120-git-svn-clone-with-percent-escapes/percent/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
 	A	foo
-r1 = d19c6d083e810a7bc24572611a773f368a5966ea (refs/remotes/origin/trunk)
+r1 = 1a828ca5ed9ac42926fb476ae3fe821315bf6ed8 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
-Found branch parent: (refs/remotes/origin/b) d19c6d083e810a7bc24572611a773f368a5966ea
+Found branch parent: (refs/remotes/origin/b) 1a828ca5ed9ac42926fb476ae3fe821315bf6ed8
 Following parent with do_switch
 Successfully followed parent
-r2 = 2708147ca1834d795798298a0a2c5b2e8848b6bf (refs/remotes/origin/b)
+r2 = 50b2ca78246a80548463d138cb5642d476748172 (refs/remotes/origin/b)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
-Found branch parent: (refs/remotes/origin/tags/v1) d19c6d083e810a7bc24572611a773f368a5966ea
+Found branch parent: (refs/remotes/origin/tags/v1) 1a828ca5ed9ac42926fb476ae3fe821315bf6ed8
 Following parent with do_switch
 Successfully followed parent
-r3 = 9537dfa65dea072983d52b3a8d76cf7121027853 (refs/remotes/origin/tags/v1)
+r3 = 43464f40854db262919102858bfacd6156cb79f3 (refs/remotes/origin/tags/v1)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-d19c6d083e810a7bc24572611a773f368a5966ea
-2708147ca1834d795798298a0a2c5b2e8848b6bf
-9537dfa65dea072983d52b3a8d76cf7121027853
+1a828ca5ed9ac42926fb476ae3fe821315bf6ed8
+50b2ca78246a80548463d138cb5642d476748172
+43464f40854db262919102858bfacd6156cb79f3
 ok 7 - test clone --stdlayout with percent escapes
 
 expecting success of 9120.8 'test clone -s with unescaped space': 
@@ -529548,108 +530552,28 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9120-git-svn-clone-with-percent-escapes/space/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
 	A	foo
-r1 = d19c6d083e810a7bc24572611a773f368a5966ea (refs/remotes/origin/trunk)
+r1 = 1a828ca5ed9ac42926fb476ae3fe821315bf6ed8 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
-Found branch parent: (refs/remotes/origin/b) d19c6d083e810a7bc24572611a773f368a5966ea
+Found branch parent: (refs/remotes/origin/b) 1a828ca5ed9ac42926fb476ae3fe821315bf6ed8
 Following parent with do_switch
 Successfully followed parent
-r2 = 2708147ca1834d795798298a0a2c5b2e8848b6bf (refs/remotes/origin/b)
+r2 = 50b2ca78246a80548463d138cb5642d476748172 (refs/remotes/origin/b)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
-Found branch parent: (refs/remotes/origin/tags/v1) d19c6d083e810a7bc24572611a773f368a5966ea
+Found branch parent: (refs/remotes/origin/tags/v1) 1a828ca5ed9ac42926fb476ae3fe821315bf6ed8
 Following parent with do_switch
 Successfully followed parent
-r3 = 9537dfa65dea072983d52b3a8d76cf7121027853 (refs/remotes/origin/tags/v1)
+r3 = 43464f40854db262919102858bfacd6156cb79f3 (refs/remotes/origin/tags/v1)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-d19c6d083e810a7bc24572611a773f368a5966ea
-2708147ca1834d795798298a0a2c5b2e8848b6bf
-9537dfa65dea072983d52b3a8d76cf7121027853
+1a828ca5ed9ac42926fb476ae3fe821315bf6ed8
+50b2ca78246a80548463d138cb5642d476748172
+43464f40854db262919102858bfacd6156cb79f3
 ok 8 - test clone -s with unescaped space
 
 # passed all 8 test(s)
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9125-git-svn-multi-glob-branch-names.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9125-git-svn-multi-glob-branch-names/.git/
-expecting success of 9125.1 'setup svnrepo': 
-	mkdir project project/trunk project/branches \
-			project/branches/v14.1 project/tags &&
-	echo foo > project/trunk/foo &&
-	svn_cmd import -m "$test_description" project "$svnrepo/project" &&
-	rm -rf project &&
-	svn_cmd cp -m "fun" "$svnrepo/project/trunk" \
-	                "$svnrepo/project/branches/v14.1/beta" &&
-	svn_cmd cp -m "more fun!" "$svnrepo/project/branches/v14.1/beta" \
-	                      "$svnrepo/project/branches/v14.1/gold"
-	
-Adding         project/branches
-Adding         project/branches/v14.1
-Adding         project/tags
-Adding         project/trunk
-Adding         project/trunk/foo
-Committing transaction...
-Committed revision 1.
-Committing transaction...
-Committed revision 2.
-Committing transaction...
-Committed revision 3.
-ok 1 - setup svnrepo
-
-expecting success of 9125.2 'test clone with multi-glob in branch names': 
-	git svn clone -T trunk -b branches/*/* -t tags \
-	              "$svnrepo/project" project &&
-	(cd project &&
-		git rev-parse "refs/remotes/origin/v14.1/beta" &&
-		git rev-parse "refs/remotes/origin/v14.1/gold"
-	)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9125-git-svn-multi-glob-branch-names/project/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo
-	A	foo
-r1 = b03ced5e64547cd454a911c18b6af52da2ee1de3 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/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) b03ced5e64547cd454a911c18b6af52da2ee1de3
-Following parent with do_switch
-Successfully followed parent
-r2 = cfee164d0c6d28f4b068d4410dc79b213456350b (refs/remotes/origin/v14.1/beta)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/beta => file:///build/reproducible-path/git-2.51.0/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) cfee164d0c6d28f4b068d4410dc79b213456350b
-Following parent with do_switch
-Successfully followed parent
-r3 = 04dbf46c8cdb51c4e1a3674e5a3a575459acffd0 (refs/remotes/origin/v14.1/gold)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk r1
-cfee164d0c6d28f4b068d4410dc79b213456350b
-04dbf46c8cdb51c4e1a3674e5a3a575459acffd0
-ok 2 - test clone with multi-glob in branch names
-
-expecting success of 9125.3 'test dcommit to multi-globbed branch': 
-	(cd project &&
-	git reset --hard 'refs/remotes/origin/v14.1/gold' &&
-	echo hello >> foo &&
-	git commit -m 'hello' -- foo &&
-	git svn dcommit
-	)
-	
-HEAD is now at 04dbf46 more fun!
-[master dd491a7] hello
- 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.51.0/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/gold ...
-	M	foo
-Committed r4
-	M	foo
-r4 = d00882f265e9788668b9408fd6f529406c42d7ee (refs/remotes/origin/v14.1/gold)
-No changes between dd491a71439a15026bfbb68fa161dbac604a5828 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
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9117-git-svn-init-clone.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9117-git-svn-init-clone/.git/
 expecting success of 9117.1 'setup svnrepo': 
@@ -529675,7 +530599,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
 	A	foo
-r1 = 039a8bf8be374438deb56ccc498c61105af016c5 (refs/remotes/git-svn)
+r1 = 7ee00c44d9e8ec052890076fa03b986429dfe2b0 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 2 - basic clone
@@ -529689,7 +530613,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9117-git-svn-init-clone/target/.git/
 	A	foo
-r1 = 039a8bf8be374438deb56ccc498c61105af016c5 (refs/remotes/git-svn)
+r1 = 7ee00c44d9e8ec052890076fa03b986429dfe2b0 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 3 - clone to target directory
@@ -529704,7 +530628,7 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9117-git-svn-init-clone/project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
 	A	foo
-r1 = 039a8bf8be374438deb56ccc498c61105af016c5 (refs/remotes/origin/trunk)
+r1 = 7ee00c44d9e8ec052890076fa03b986429dfe2b0 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 4 - clone with --stdlayout
@@ -529719,7 +530643,7 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9117-git-svn-init-clone/target/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
 	A	foo
-r1 = 039a8bf8be374438deb56ccc498c61105af016c5 (refs/remotes/origin/trunk)
+r1 = 7ee00c44d9e8ec052890076fa03b986429dfe2b0 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 5 - clone to target directory with --stdlayout
@@ -529743,7 +530667,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
 	A	foo
-r1 = 039a8bf8be374438deb56ccc498c61105af016c5 (refs/remotes/git-svn)
+r1 = 7ee00c44d9e8ec052890076fa03b986429dfe2b0 (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/': 
@@ -529767,7 +530691,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9117-git-svn-init-clone/project/.git/
 	A	foo
-r1 = 039a8bf8be374438deb56ccc498c61105af016c5 (refs/remotes/origin/trunk)
+r1 = 7ee00c44d9e8ec052890076fa03b986429dfe2b0 (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': 
@@ -529791,7 +530715,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9117-git-svn-init-clone/project/.git/
 	A	foo
-r1 = 039a8bf8be374438deb56ccc498c61105af016c5 (refs/remotes/trunk)
+r1 = 7ee00c44d9e8ec052890076fa03b986429dfe2b0 (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': 
@@ -529996,12 +530920,12 @@
 	git svn fetch -r1:2
 
 	A	foo
-r1 = 370c05a0d56509167db2b35fceb97af73e274a34 (refs/remotes/origin/trunk)
+r1 = 06734d4de4f5de3e670ec66799662bc98e7f2df2 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) 370c05a0d56509167db2b35fceb97af73e274a34
+Found branch parent: (refs/remotes/origin/a) 06734d4de4f5de3e670ec66799662bc98e7f2df2
 Following parent with do_switch
 Successfully followed parent
-r2 = b724b38693711a11aad8171c25cceb1b42f6eeda (refs/remotes/origin/a)
+r2 = dbf93a15b1b4552ce3feb48bb895b7df7aab2c4c (refs/remotes/origin/a)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r1
 ok 2 - import an early SVN revision into git
@@ -530018,16 +530942,16 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9127-git-svn-partial-rebuild/mirror/.git/
 	A	foo
-r1 = 370c05a0d56509167db2b35fceb97af73e274a34 (refs/remotes/origin/trunk)
+r1 = 06734d4de4f5de3e670ec66799662bc98e7f2df2 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) 370c05a0d56509167db2b35fceb97af73e274a34
+Found branch parent: (refs/remotes/origin/a) 06734d4de4f5de3e670ec66799662bc98e7f2df2
 Following parent with do_switch
 Successfully followed parent
-r2 = b724b38693711a11aad8171c25cceb1b42f6eeda (refs/remotes/origin/a)
+r2 = dbf93a15b1b4552ce3feb48bb895b7df7aab2c4c (refs/remotes/origin/a)
 	M	foo
-r3 = cd04ed13ad73214f176ce3cb09176425950a28d4 (refs/remotes/origin/trunk)
+r3 = 941b6d570455db10f9683f123a2002640f54c0fa (refs/remotes/origin/trunk)
 	A	a
-r4 = c7e6c679e57021d7f544e068034926345efb730b (refs/remotes/origin/a)
+r4 = 85d9b5d514239db1954eaff22779007dbbbdfd60 (refs/remotes/origin/a)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r3
 ok 3 - make full git mirror of SVN
@@ -530039,16 +530963,16 @@
 	git svn fetch
 
 From file:///build/reproducible-path/git-2.51.0/t/trash directory.t9127-git-svn-partial-rebuild/mirror/
-   b724b38..c7e6c67  origin/a     -> origin/a
-   370c05a..cd04ed1  origin/trunk -> origin/trunk
-Partial-rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.2610da68-d25e-474a-a87c-fd0d277c9079 ...
-Currently at 1 = 370c05a0d56509167db2b35fceb97af73e274a34
-r3 = cd04ed13ad73214f176ce3cb09176425950a28d4
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.2610da68-d25e-474a-a87c-fd0d277c9079
-Partial-rebuilding .git/svn/refs/remotes/origin/a/.rev_map.2610da68-d25e-474a-a87c-fd0d277c9079 ...
-Currently at 2 = b724b38693711a11aad8171c25cceb1b42f6eeda
-r4 = c7e6c679e57021d7f544e068034926345efb730b
-Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.2610da68-d25e-474a-a87c-fd0d277c9079
+   dbf93a1..85d9b5d  origin/a     -> origin/a
+   06734d4..941b6d5  origin/trunk -> origin/trunk
+Partial-rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.07da0669-f9c3-4f36-8185-b8a32490dfba ...
+Currently at 1 = 06734d4de4f5de3e670ec66799662bc98e7f2df2
+r3 = 941b6d570455db10f9683f123a2002640f54c0fa
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.07da0669-f9c3-4f36-8185-b8a32490dfba
+Partial-rebuilding .git/svn/refs/remotes/origin/a/.rev_map.07da0669-f9c3-4f36-8185-b8a32490dfba ...
+Currently at 2 = dbf93a15b1b4552ce3feb48bb895b7df7aab2c4c
+r4 = 85d9b5d514239db1954eaff22779007dbbbdfd60
+Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.07da0669-f9c3-4f36-8185-b8a32490dfba
 ok 4 - fetch from git mirror and partial-rebuild
 
 # passed all 4 test(s)
@@ -530100,7 +531024,7 @@
 	A	#{bad_directory_name}/ foo
 Committed r2
 	A	#{bad_directory_name}/ foo
-r2 = 40e06610695497cbaed1d7b0793cd42dea59c763 (refs/remotes/git-svn)
+r2 = c3c9efa9e5c2fddd3ae68273bfff9f43ad449013 (refs/remotes/git-svn)
 No changes between 36a5c3e1fdd88d8412c2248d0e93d71722d13703 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 3 - create file in existing ugly and empty dir
@@ -530110,7 +531034,7 @@
 	git commit -m "rename ugly file" &&
 	git svn dcommit
 	
-[master 328def2] rename ugly file
+[master a17953f] 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%)
@@ -530121,8 +531045,8 @@
 	D	#{bad_directory_name}/ foo
 	A	file name with feces
 W: -empty_dir: #{bad_directory_name}/ foo
-r3 = 02075ba36612f13a2ce16709463b488d042dfe44 (refs/remotes/git-svn)
-No changes between 328def2eb6c37c705bce06d77e923e7fa243180a and refs/remotes/git-svn
+r3 = d7f391c70712577734e1002df51b3a1d64cbd9ca (refs/remotes/git-svn)
+No changes between a17953f62f3d19254170509b046857c6bc6862bf and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 4 - rename ugly file
 
@@ -530136,7 +531060,7 @@
 	git commit -m "moved pretty file" &&
 	git svn dcommit
 	
-[master bb64eb7] pretty :x
+[master b55293b] pretty :x
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 pretty
@@ -530145,10 +531069,10 @@
 	A	pretty
 Committed r4
 	A	pretty
-r4 = cdbae4a39003d2810851fb7bee2b91c4471efe71 (refs/remotes/git-svn)
-No changes between bb64eb7b4966b7290085c3197e9893513806e72a and refs/remotes/git-svn
+r4 = 6d2c1631b99bfdda305c8628e0863f0336af17ec (refs/remotes/git-svn)
+No changes between b55293bfc1ca7d394ac68a8983278a47478f6a7a and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master 6507a72] moved pretty file
+[master 2fc30cb] moved pretty file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename pretty => regular_dir_name/pretty (100%)
@@ -530159,8 +531083,8 @@
 	D	pretty
 	A	regular_dir_name/pretty
 W: -empty_dir: pretty
-r5 = 763c40efecd39ab388c764a592f58f2934fb4020 (refs/remotes/git-svn)
-No changes between 6507a7286d5322286ee8569ccb25e51e831de076 and refs/remotes/git-svn
+r5 = 5c5b1adce1d50db6dbff46a955b812ab3ed16c47 (refs/remotes/git-svn)
+No changes between 2fc30cb0fda3ee678d1c465e8fa8fe3ff659ce28 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 5 - rename pretty file
 
@@ -530169,7 +531093,7 @@
 	git commit -m booboo &&
 	git svn dcommit
 	
-[master 40fde55] booboo
+[master 1f062e0] 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%)
@@ -530180,8 +531104,8 @@
 	A	#{bad_directory_name}/ booboo
 	D	regular_dir_name/pretty
 W: -empty_dir: regular_dir_name/pretty
-r6 = 42f4dcc290c5fb378086b8de2f40b668e552a5b7 (refs/remotes/git-svn)
-No changes between 40fde552f76a40107f10d4e3213b167a52ea0478 and refs/remotes/git-svn
+r6 = c06cf2c3f7717bb102265ba610a030fa0f88e982 (refs/remotes/git-svn)
+No changes between 1f062e0ce413d84465387cbdcaaec67af01b8e50 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 6 - rename pretty file into ugly one
 
@@ -530194,11 +531118,11 @@
 	git commit -m plus_dir &&
 	git svn dcommit
 	
-[master 8a8986d] plus
+[master ceb8b21] plus
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 +_+
-[master ffaa5ea] plus_dir
+[master fd4920d] plus_dir
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename +_+ => gtk+/_+_ (100%)
@@ -530207,14 +531131,14 @@
 	A	+_+
 Committed r7
 	A	+_+
-r7 = f8e9a5107ae607cada5223ebb6bb058710a53cb8 (refs/remotes/git-svn)
+r7 = 05d64337a0ed9e02da7fc12fefb14edf332a8ec3 (refs/remotes/git-svn)
 	R	+_+ => gtk+/_+_
 Committed r8
 	D	+_+
 	A	gtk+/_+_
 W: -empty_dir: +_+
-r8 = ff563c302f2b160323f8f3c3350dae3ed0996ab7 (refs/remotes/git-svn)
-No changes between ffaa5ea16416478112a6cce800ab79fe194bd71f and refs/remotes/git-svn
+r8 = e0d9cd4bdf19b7dcc7e94dbd61488176068c12e5 (refs/remotes/git-svn)
+No changes between fd4920dc39a83f3d4ca6f0013020daf27331e434 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 7 - add a file with plus signs
 
@@ -530237,33 +531161,33 @@
 W: +empty_dir: regular_dir_name
 r1 = 59e52e14c25ee9de63713bf96cfe1588efee3e7f (refs/remotes/git-svn)
 	A	#{bad_directory_name}/ foo
-r2 = 40e06610695497cbaed1d7b0793cd42dea59c763 (refs/remotes/git-svn)
+r2 = c3c9efa9e5c2fddd3ae68273bfff9f43ad449013 (refs/remotes/git-svn)
 	D	#{bad_directory_name}/ foo
 	A	file name with feces
 W: -empty_dir: #{bad_directory_name}/ foo
-r3 = 02075ba36612f13a2ce16709463b488d042dfe44 (refs/remotes/git-svn)
+r3 = d7f391c70712577734e1002df51b3a1d64cbd9ca (refs/remotes/git-svn)
 	A	pretty
-r4 = cdbae4a39003d2810851fb7bee2b91c4471efe71 (refs/remotes/git-svn)
+r4 = 6d2c1631b99bfdda305c8628e0863f0336af17ec (refs/remotes/git-svn)
 	D	pretty
 	A	regular_dir_name/pretty
 W: -empty_dir: pretty
-r5 = 763c40efecd39ab388c764a592f58f2934fb4020 (refs/remotes/git-svn)
+r5 = 5c5b1adce1d50db6dbff46a955b812ab3ed16c47 (refs/remotes/git-svn)
 	A	#{bad_directory_name}/ booboo
 	D	regular_dir_name/pretty
 W: -empty_dir: regular_dir_name/pretty
-r6 = 42f4dcc290c5fb378086b8de2f40b668e552a5b7 (refs/remotes/git-svn)
+r6 = c06cf2c3f7717bb102265ba610a030fa0f88e982 (refs/remotes/git-svn)
 	A	+_+
-r7 = f8e9a5107ae607cada5223ebb6bb058710a53cb8 (refs/remotes/git-svn)
+r7 = 05d64337a0ed9e02da7fc12fefb14edf332a8ec3 (refs/remotes/git-svn)
 	D	+_+
 	A	gtk+/_+_
 W: -empty_dir: +_+
-r8 = ff563c302f2b160323f8f3c3350dae3ed0996ab7 (refs/remotes/git-svn)
+r8 = e0d9cd4bdf19b7dcc7e94dbd61488176068c12e5 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/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 5c666da] test-rebase
+[master bfe40aa] test-rebase
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 test-rebase
@@ -530275,7 +531199,7 @@
 		git commit -m test-rebase-main &&
 		git svn dcommit
 	
-[master 4014136] test-rebase-main
+[master 18f593b] test-rebase-main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 test-rebase-main
@@ -530284,8 +531208,8 @@
 	A	test-rebase-main
 Committed r9
 	A	test-rebase-main
-r9 = bbff87b0b60076939de8d1194b72198e4253f551 (refs/remotes/git-svn)
-No changes between 4014136f021ecd13c102051c64c9ee717da76083 and refs/remotes/git-svn
+r9 = 117e728357c103b8dc218f43d701ce4b2dad3597 (refs/remotes/git-svn)
+No changes between 18f593b32861c2e1a86c48dd84cf2bb7386972c3 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 9 - make a commit to test rebase
 
@@ -530297,7 +531221,7 @@
 		test -e test-rebase
 	)
 	A	test-rebase-main
-r9 = bbff87b0b60076939de8d1194b72198e4253f551 (refs/remotes/git-svn)
+r9 = 117e728357c103b8dc218f43d701ce4b2dad3597 (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
 
@@ -530324,7 +531248,7 @@
 	git commit -m "neq" &&
 	git svn dcommit
 
-[master 96403e1] neq
+[master cb123db] neq
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 "\201\202"
@@ -530333,8 +531257,8 @@
 	A	�‚
 Committed r10
 	A	�‚
-r10 = 8964e4baed8c408890fb1e6fb7382d5c273f466b (refs/remotes/git-svn)
-No changes between 96403e13594eb4e10f406d715716667e8feabd1e and refs/remotes/git-svn
+r10 = 6aef9d48a92e5006d3bc4c321b3170c04b5cf721 (refs/remotes/git-svn)
+No changes between cb123dbec2df667156a960a10a4d5344422bb02c and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 11 - svn.pathnameencoding=cp932 new file on dcommit
 
@@ -530351,7 +531275,7 @@
 	git commit -m "inf rename" &&
 	git svn dcommit
 
-[master 476fb0f] inf
+[master 4f8988b] inf
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 "\201\207"
@@ -530360,10 +531284,10 @@
 	A	�‡
 Committed r11
 	A	�‡
-r11 = f1ccac7edc41349482e07c525bd168d2333d9ec7 (refs/remotes/git-svn)
-No changes between 476fb0f2bed441cb14b2df8e1c2d0c205ee966fb and refs/remotes/git-svn
+r11 = 569a005abcbaa83bd2a5beb8ab5fa89ee0b2e869 (refs/remotes/git-svn)
+No changes between 4f8988bfd1cea7ab597df520dcf984115074e545 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master 2c799d6] inf rename
+[master 627dbdb] inf rename
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename "\201\207" => inf (100%)
@@ -530374,8 +531298,8 @@
 	D	�‡
 	A	inf
 W: -empty_dir: ∞
-r12 = 18a0f9e3c3f0fe488705d61c0709c269f1199bd8 (refs/remotes/git-svn)
-No changes between 2c799d6efb745b953aa28fc56047e429c41a1cae and refs/remotes/git-svn
+r12 = 4736a0f252d72b8f1c7f8b355e0dd97c0b39ff37 (refs/remotes/git-svn)
+No changes between 627dbdb02d39994970e0efd4c689ea539bbee98e and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 12 - svn.pathnameencoding=cp932 rename on dcommit
 
@@ -530383,187 +531307,6 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9131-git-svn-empty-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9131-git-svn-empty-symlink/.git/
-expecting success of 9131.1 'load svn dumpfile': 
-	svnadmin load "$rawsvnrepo" <<EOF
-SVN-fs-dump-format-version: 2
-
-UUID: 60780f9a-7df5-43b4-83ab-60e2c0673ef7
-
-Revision-number: 0
-Prop-content-length: 56
-Content-length: 56
-
-K 8
-svn:date
-V 27
-2008-11-26T07:17:27.590577Z
-PROPS-END
-
-Revision-number: 1
-Prop-content-length: 111
-Content-length: 111
-
-K 7
-svn:log
-V 4
-test
-K 10
-svn:author
-V 12
-normalperson
-K 8
-svn:date
-V 27
-2008-11-26T07:18:03.511836Z
-PROPS-END
-
-Node-path: bar
-Node-kind: file
-Node-action: add
-Prop-content-length: 33
-Text-content-length: 0
-Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
-Content-length: 33
-
-K 11
-svn:special
-V 1
-*
-PROPS-END
-
-Revision-number: 2
-Prop-content-length: 121
-Content-length: 121
-
-K 7
-svn:log
-V 13
-bar => doink
-
-K 10
-svn:author
-V 12
-normalperson
-K 8
-svn:date
-V 27
-2008-11-27T03:55:31.601672Z
-PROPS-END
-
-Node-path: bar
-Node-kind: file
-Node-action: change
-Text-content-length: 10
-Text-content-md5: 92ca4fe7a9721f877f765c252dcd66c9
-Content-length: 10
-
-link doink
-
-EOF
-
-<<< Started new transaction, based on original revision 1
-     * editing path : bar ... done.
-
-------- Committed revision 1 >>>
-
-<<< Started new transaction, based on original revision 2
-     * editing path : bar ... done.
-
-------- Committed revision 2 >>>
-
-ok 1 - load svn dumpfile
-
-expecting success of 9131.2 'clone using git svn': git svn clone -r1 "$svnrepo" x
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9131-git-svn-empty-symlink/x/.git/
-bar has mode 120000 but it points to nothing
-converting to an empty file with mode 100644
-	A	bar
-r1 = 64f967cb04d520df55b015d263effb4caebfa3eb (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
-ok 2 - clone using git svn
-
-expecting success of 9131.3 'enable broken symlink workaround': (cd x && git config svn.brokenSymlinkWorkaround true)
-ok 3 - enable broken symlink workaround
-
-expecting success of 9131.4 '"bar" is an empty file': test_must_be_empty x/bar
-ok 4 - "bar" is an empty file
-
-expecting success of 9131.5 'get "bar" => symlink fix from svn': (cd x && git svn rebase)
-Scanning for empty symlinks, this may take a while if you have many empty files
-You may disable this with `git config svn.brokenSymlinkWorkaround false'.
-This may be done in a different terminal without restarting git svn
-	M	bar
-r2 = 9c55c575112341366124f0627521e1d965467db3 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 5 - get "bar" => symlink fix from svn
-
-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 9131.6 '"bar" becomes a symlink': test -h x/bar
-ok 6 - "bar" becomes a symlink
-
-expecting success of 9131.7 'clone using git svn': git svn clone -r1 "$svnrepo" y
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9131-git-svn-empty-symlink/y/.git/
-bar has mode 120000 but it points to nothing
-converting to an empty file with mode 100644
-	A	bar
-r1 = 64f967cb04d520df55b015d263effb4caebfa3eb (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
-ok 7 - clone using git svn
-
-expecting success of 9131.8 'disable broken symlink workaround': (cd y && git config svn.brokenSymlinkWorkaround false)
-ok 8 - disable broken symlink workaround
-
-expecting success of 9131.9 '"bar" is an empty file': test_must_be_empty y/bar
-ok 9 - "bar" is an empty file
-
-expecting success of 9131.10 'get "bar" => symlink fix from svn': (cd y && git svn rebase)
-	M	bar
-r2 = 74368ab3980138bd3dec8b9aa8e879037225f7eb (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 10 - get "bar" => symlink fix from svn
-
-expecting success of 9131.11 '"bar" does not become a symlink': ! test -L y/bar
-ok 11 - "bar" does not become a symlink
-
-expecting success of 9131.12 'clone using git svn': git svn clone -r1 "$svnrepo" z
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9131-git-svn-empty-symlink/z/.git/
-bar has mode 120000 but it points to nothing
-converting to an empty file with mode 100644
-	A	bar
-r1 = 64f967cb04d520df55b015d263effb4caebfa3eb (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
-ok 12 - clone using git svn
-
-expecting success of 9131.13 '"bar" is an empty file': test_must_be_empty z/bar
-ok 13 - "bar" is an empty file
-
-expecting success of 9131.14 'get "bar" => symlink fix from svn': (cd z && git svn rebase)
-	M	bar
-r2 = 74368ab3980138bd3dec8b9aa8e879037225f7eb (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 14 - get "bar" => symlink fix from svn
-
-expecting success of 9131.15 '"bar" does not become a symlink': ! test -L z/bar
-ok 15 - "bar" does not become a symlink
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9133-git-svn-nested-git-repo.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9133-git-svn-nested-git-repo/.git/
 expecting success of 9133.1 'setup repo with a git repo inside it': 
@@ -530586,11 +531329,6 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9133-git-svn-nested-git-repo/s/.git/
 refs/heads/master
 A         .git
-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
@@ -530613,6 +531351,11 @@
 A         .git/objects
 A         .git/objects/info
 A         .git/objects/pack
+A         .git/info
+A         .git/info/exclude
+A         .git/refs
+A         .git/refs/heads
+A         .git/refs/tags
 A         a
 Adding         .git
 Adding         .git/HEAD
@@ -530663,8 +531406,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9133-git-svn-nested-git-repo/g/.git/
 	A	a
-r1 = ab30a5c0c74dcacb8d2e5b45c8c164591063646a (refs/remotes/git-svn)
-r2 = f6694a0b4caa235634541796070a0e3e1457da42 (refs/remotes/git-svn)
+r1 = 209239e0a3b4f4c3b72e63129ab2f4589f872465 (refs/remotes/git-svn)
+r2 = 02bd833cde3b0c2648324f05efa62ed6f4c62b6f (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9133-git-svn-nested-git-repo/svnrepo r2
 ok 2 - clone an SVN repo containing a git repo
@@ -530698,7 +531441,7 @@
 	)
 
 	M	a
-r3 = 7534c42a877b6572a8576ce528d54b07f1028e32 (refs/remotes/git-svn)
+r3 = e9b904ee32c64c795e5d3651df4550056b95300d (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 4 - update git svn-cloned repo
 
@@ -530723,12 +531466,11 @@
 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/HEAD
 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
@@ -530737,6 +531479,7 @@
 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
@@ -530769,7 +531512,7 @@
 		rm expect
 	)
 
-r4 = c5ee8fb17eabea01452beb0df6871926340e28b5 (refs/remotes/git-svn)
+r4 = 70d644404386ddddde586ebc7289755429b0999e (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 6 - update git svn-cloned repo
 
@@ -530812,7 +531555,7 @@
 	)
 
 	M	a
-r5 = adcfab3ccedef5e6f23d919d9ad7cea7d0504165 (refs/remotes/git-svn)
+r5 = d1fe528c1a97a9a66206a55984c4697db9e8a6af (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 8 - update git svn-cloned repo again
 
@@ -530820,6 +531563,187 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9131-git-svn-empty-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9131-git-svn-empty-symlink/.git/
+expecting success of 9131.1 'load svn dumpfile': 
+	svnadmin load "$rawsvnrepo" <<EOF
+SVN-fs-dump-format-version: 2
+
+UUID: 60780f9a-7df5-43b4-83ab-60e2c0673ef7
+
+Revision-number: 0
+Prop-content-length: 56
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2008-11-26T07:17:27.590577Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 111
+Content-length: 111
+
+K 7
+svn:log
+V 4
+test
+K 10
+svn:author
+V 12
+normalperson
+K 8
+svn:date
+V 27
+2008-11-26T07:18:03.511836Z
+PROPS-END
+
+Node-path: bar
+Node-kind: file
+Node-action: add
+Prop-content-length: 33
+Text-content-length: 0
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Content-length: 33
+
+K 11
+svn:special
+V 1
+*
+PROPS-END
+
+Revision-number: 2
+Prop-content-length: 121
+Content-length: 121
+
+K 7
+svn:log
+V 13
+bar => doink
+
+K 10
+svn:author
+V 12
+normalperson
+K 8
+svn:date
+V 27
+2008-11-27T03:55:31.601672Z
+PROPS-END
+
+Node-path: bar
+Node-kind: file
+Node-action: change
+Text-content-length: 10
+Text-content-md5: 92ca4fe7a9721f877f765c252dcd66c9
+Content-length: 10
+
+link doink
+
+EOF
+
+<<< Started new transaction, based on original revision 1
+     * editing path : bar ... done.
+
+------- Committed revision 1 >>>
+
+<<< Started new transaction, based on original revision 2
+     * editing path : bar ... done.
+
+------- Committed revision 2 >>>
+
+ok 1 - load svn dumpfile
+
+expecting success of 9131.2 'clone using git svn': git svn clone -r1 "$svnrepo" x
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9131-git-svn-empty-symlink/x/.git/
+bar has mode 120000 but it points to nothing
+converting to an empty file with mode 100644
+	A	bar
+r1 = 64f967cb04d520df55b015d263effb4caebfa3eb (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
+ok 2 - clone using git svn
+
+expecting success of 9131.3 'enable broken symlink workaround': (cd x && git config svn.brokenSymlinkWorkaround true)
+ok 3 - enable broken symlink workaround
+
+expecting success of 9131.4 '"bar" is an empty file': test_must_be_empty x/bar
+ok 4 - "bar" is an empty file
+
+expecting success of 9131.5 'get "bar" => symlink fix from svn': (cd x && git svn rebase)
+Scanning for empty symlinks, this may take a while if you have many empty files
+You may disable this with `git config svn.brokenSymlinkWorkaround false'.
+This may be done in a different terminal without restarting git svn
+	M	bar
+r2 = 9c55c575112341366124f0627521e1d965467db3 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 5 - get "bar" => symlink fix from svn
+
+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 9131.6 '"bar" becomes a symlink': test -h x/bar
+ok 6 - "bar" becomes a symlink
+
+expecting success of 9131.7 'clone using git svn': git svn clone -r1 "$svnrepo" y
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9131-git-svn-empty-symlink/y/.git/
+bar has mode 120000 but it points to nothing
+converting to an empty file with mode 100644
+	A	bar
+r1 = 64f967cb04d520df55b015d263effb4caebfa3eb (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
+ok 7 - clone using git svn
+
+expecting success of 9131.8 'disable broken symlink workaround': (cd y && git config svn.brokenSymlinkWorkaround false)
+ok 8 - disable broken symlink workaround
+
+expecting success of 9131.9 '"bar" is an empty file': test_must_be_empty y/bar
+ok 9 - "bar" is an empty file
+
+expecting success of 9131.10 'get "bar" => symlink fix from svn': (cd y && git svn rebase)
+	M	bar
+r2 = 74368ab3980138bd3dec8b9aa8e879037225f7eb (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 10 - get "bar" => symlink fix from svn
+
+expecting success of 9131.11 '"bar" does not become a symlink': ! test -L y/bar
+ok 11 - "bar" does not become a symlink
+
+expecting success of 9131.12 'clone using git svn': git svn clone -r1 "$svnrepo" z
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9131-git-svn-empty-symlink/z/.git/
+bar has mode 120000 but it points to nothing
+converting to an empty file with mode 100644
+	A	bar
+r1 = 64f967cb04d520df55b015d263effb4caebfa3eb (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
+ok 12 - clone using git svn
+
+expecting success of 9131.13 '"bar" is an empty file': test_must_be_empty z/bar
+ok 13 - "bar" is an empty file
+
+expecting success of 9131.14 'get "bar" => symlink fix from svn': (cd z && git svn rebase)
+	M	bar
+r2 = 74368ab3980138bd3dec8b9aa8e879037225f7eb (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 14 - get "bar" => symlink fix from svn
+
+expecting success of 9131.15 '"bar" does not become a symlink': ! test -L z/bar
+ok 15 - "bar" does not become a symlink
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9129-git-svn-i18n-commitencoding.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9129-git-svn-i18n-commitencoding/.git/
 expecting success of 9129.1 'ISO8859-1 setup': 
@@ -530830,7 +531754,7 @@
 Committing transaction...
 Committed revision 1.
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO8859-1/.git/
-r1 = 419dd8aae641158ab22df500ef22087c9ec36886 (refs/remotes/git-svn)
+r1 = 45cd8c92c3cffb338eb4801c689fbc7bb019462b (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1 r1
 ok 1 - ISO8859-1 setup
@@ -530843,7 +531767,7 @@
 Committing transaction...
 Committed revision 2.
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9129-git-svn-i18n-commitencoding/eucJP/.git/
-r2 = cd07fdb3f8e1017e01ae2e91734df00e9ef5f3dd (refs/remotes/git-svn)
+r2 = 5e5a4290f4f60255cdf86d2a5122f35bb1c4e851 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP r2
 ok 2 - eucJP setup
@@ -530856,7 +531780,7 @@
 Committing transaction...
 Committed revision 3.
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO-2022-JP/.git/
-r3 = af9d600c8f1a12f08ab8abc7ff161abd18134315 (refs/remotes/git-svn)
+r3 = 8a1f15570de6b5c15cda7b36a6ec45b79e35a164 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP r3
 ok 3 - ISO-2022-JP setup
@@ -530875,7 +531799,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 7c6be3d] ÄËÑÏÖ
+[t c686453] ÄËÑÏÖ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -530895,7 +531819,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 9516f78] ¤Ï¤ì¤Ò¤Û¤Õ
+[t e9114ae] ¤Ï¤ì¤Ò¤Û¤Õ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -530915,7 +531839,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 459938a] $B$O$l$R$[$U(B
+[t caee302] $B$O$l$R$[$U(B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -530936,10 +531860,10 @@
 	A	F
 Committed r4
 	A	F
-r4 = 498aee548b59829f3a4364c900c96390d9e914d3 (refs/remotes/git-svn)
-No changes between 7c6be3d3c6fbf9612db2cf772d2d0d0de3104d5c and refs/remotes/git-svn
+r4 = dbcee5c09131ffc7ff06fb3f4ac7ee3f850d2431 (refs/remotes/git-svn)
+No changes between c6864538a0718e9884e21509cc9fa6dd3af5191b and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1@4 642500ae-b483-4a7f-a02d-e71abe817da4
+git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1@4 8885ec99-bf51-46b8-91b1-daf9e5963fb1
 ok 7 - ISO8859-1 dcommit to svn
 
 expecting success of 9129.8 'eucJP dcommit to svn': 
@@ -530957,10 +531881,10 @@
 	A	F
 Committed r5
 	A	F
-r5 = e9fe80130f3912db611fc4b01f2e238cf3be58f8 (refs/remotes/git-svn)
-No changes between 9516f7822c41ec9c51faa6518889360ede38766d and refs/remotes/git-svn
+r5 = 42a56a386efa1f9a3efd2efb6bfc5001ec1a8c44 (refs/remotes/git-svn)
+No changes between e9114aed02794e84241e100b0b528ebcf82b7d24 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP@5 642500ae-b483-4a7f-a02d-e71abe817da4
+git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP@5 8885ec99-bf51-46b8-91b1-daf9e5963fb1
 ok 8 - eucJP dcommit to svn
 
 expecting success of 9129.9 'ISO-2022-JP dcommit to svn': 
@@ -530978,10 +531902,10 @@
 	A	F
 Committed r6
 	A	F
-r6 = 19c4d444e183a60ef05bac243ab16f3166c5bfb8 (refs/remotes/git-svn)
-No changes between 459938aff6376d78bd11d57fc2bcacfc6839396c and refs/remotes/git-svn
+r6 = 92c20acfc888ab4031c06f72bb9f13f926736f25 (refs/remotes/git-svn)
+No changes between caee302c8e24aa50648afcef0cc15012f64a3f31 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP@6 642500ae-b483-4a7f-a02d-e71abe817da4
+git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP@6 8885ec99-bf51-46b8-91b1-daf9e5963fb1
 ok 9 - ISO-2022-JP dcommit to svn
 
 expecting success of 9129.10 'ISO-8859-1 should match UTF-8 in svn': 
@@ -531012,3160 +531936,337 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t7610-mergetool.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7610-mergetool/.git/
-expecting success of 7610.1 'setup': 
-	test_config rerere.enabled true &&
-	echo main >file1 &&
-	echo main spaced >"spaced name" &&
-	echo main file11 >file11 &&
-	echo main file12 >file12 &&
-	echo main file13 >file13 &&
-	echo main file14 >file14 &&
-	mkdir subdir &&
-	echo main sub >subdir/file3 &&
-	test_create_repo submod &&
-	(
-		cd submod &&
-		: >foo &&
-		git add foo &&
-		git commit -m "Add foo"
-	) &&
-	git submodule add file:///dev/null submod &&
-	git add file1 "spaced name" file1[1-4] subdir/file3 .gitmodules submod &&
-	git commit -m "add initial versions" &&
-
-	git checkout -b branch1 main &&
-	git submodule update -N &&
-	echo branch1 change >file1 &&
-	echo branch1 newfile >file2 &&
-	echo branch1 spaced >"spaced name" &&
-	echo branch1 both added >both &&
-	echo branch1 change file11 >file11 &&
-	echo branch1 change file13 >file13 &&
-	echo branch1 sub >subdir/file3 &&
-	(
-		cd submod &&
-		echo branch1 submodule >bar &&
-		git add bar &&
-		git commit -m "Add bar on branch1" &&
-		git checkout -b submod-branch1
-	) &&
-	git add file1 "spaced name" file11 file13 file2 subdir/file3 submod &&
-	git add both &&
-	git rm file12 &&
-	git commit -m "branch1 changes" &&
-
-	git checkout -b delete-base branch1 &&
-	mkdir -p a/a &&
-	test_write_lines one two 3 4 >a/a/file.txt &&
-	git add a/a/file.txt &&
-	git commit -m"base file" &&
-	git checkout -b move-to-b delete-base &&
-	mkdir -p b/b &&
-	git mv a/a/file.txt b/b/file.txt &&
-	test_write_lines one two 4 >b/b/file.txt &&
-	git commit -a -m"move to b" &&
-	git checkout -b move-to-c delete-base &&
-	mkdir -p c/c &&
-	git mv a/a/file.txt c/c/file.txt &&
-	test_write_lines one two 3 >c/c/file.txt &&
-	git commit -a -m"move to c" &&
-
-	git checkout -b stash1 main &&
-	echo stash1 change file11 >file11 &&
-	git add file11 &&
-	git commit -m "stash1 changes" &&
-
-	git checkout -b stash2 main &&
-	echo stash2 change file11 >file11 &&
-	git add file11 &&
-	git commit -m "stash2 changes" &&
-
-	git checkout main &&
-	git submodule update -N &&
-	echo main updated >file1 &&
-	echo main new >file2 &&
-	echo main updated spaced >"spaced name" &&
-	echo main both added >both &&
-	echo main updated file12 >file12 &&
-	echo main updated file14 >file14 &&
-	echo main new sub >subdir/file3 &&
-	(
-		cd submod &&
-		echo main submodule >bar &&
-		git add bar &&
-		git commit -m "Add bar on main" &&
-		git checkout -b submod-main
-	) &&
-	git add file1 "spaced name" file12 file14 file2 subdir/file3 submod &&
-	git add both &&
-	git rm file11 &&
-	git commit -m "main updates" &&
-
-	git clean -fdx &&
-	git checkout -b order-file-start main &&
-	echo start >a &&
-	echo start >b &&
-	git add a b &&
-	git commit -m start &&
-	git checkout -b order-file-side1 order-file-start &&
-	echo side1 >a &&
-	echo side1 >b &&
-	git add a b &&
-	git commit -m side1 &&
-	git checkout -b order-file-side2 order-file-start &&
-	echo side2 >a &&
-	echo side2 >b &&
-	git add a b &&
-	git commit -m side2 &&
-
-	git config merge.tool mytool &&
-	git config mergetool.mytool.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
-	git config mergetool.mytool.trustExitCode true &&
-	git config mergetool.mybase.cmd "cat \"\$BASE\" >\"\$MERGED\"" &&
-	git config mergetool.mybase.trustExitCode true
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7610-mergetool/submod/.git/
-[main (root-commit) d8b1d8e] Add foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-Adding existing repo at 'submod' to the index
-[main (root-commit) 8119935] add initial versions
- Author: A U Thor <author@example.com>
- 9 files changed, 11 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 file1
- create mode 100644 file11
- create mode 100644 file12
- create mode 100644 file13
- create mode 100644 file14
- create mode 100644 spaced name
- create mode 100644 subdir/file3
- create mode 160000 submod
-Switched to a new branch 'branch1'
-[main b5507ac] Add bar on branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-Switched to a new branch 'submod-branch1'
-rm 'file12'
-[branch1 b56897f] branch1 changes
- Author: A U Thor <author@example.com>
- 9 files changed, 8 insertions(+), 7 deletions(-)
- create mode 100644 both
- delete mode 100644 file12
- create mode 100644 file2
-Switched to a new branch 'delete-base'
-[delete-base a20b9ac] base file
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
- create mode 100644 a/a/file.txt
-Switched to a new branch 'move-to-b'
-[move-to-b d173899] move to b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- rename {a/a => b/b}/file.txt (83%)
-Switched to a new branch 'move-to-c'
-[move-to-c 7baa014] move to c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- rename {a/a => c/c}/file.txt (83%)
-Switched to a new branch 'stash1'
-M	submod
-[stash1 7727624] stash1 changes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'stash2'
-M	submod
-[stash2 3eeb9f3] stash2 changes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-M	submod
-Submodule path 'submod': checked out 'd8b1d8e6424e753a8741ec5acadf448ece02afdc'
-[detached HEAD d1fea44] Add bar on main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-Switched to a new branch 'submod-main'
-rm 'file11'
-[main 42ed12d] main updates
- Author: A U Thor <author@example.com>
- 9 files changed, 8 insertions(+), 7 deletions(-)
- create mode 100644 both
- delete mode 100644 file11
- create mode 100644 file2
-Removing a/
-Switched to a new branch 'order-file-start'
-[order-file-start 8e07b42] start
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-Switched to a new branch 'order-file-side1'
-[order-file-side1 072d66b] side1
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'order-file-side2'
-[order-file-side2 50ba26c] side2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 1 - setup
-
-expecting success of 7610.2 'custom mergetool': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-	yes "" | git mergetool both &&
-	yes "" | git mergetool file1 file1 &&
-	yes "" | git mergetool file2 "spaced name" &&
-	yes "" | git mergetool subdir/file3 &&
-	yes "d" | git mergetool file11 &&
-	yes "d" | git mergetool file12 &&
-	yes "l" | git mergetool submod &&
-	echo "main updated" >expect &&
-	test_cmp expect file1 &&
-	echo "main new" >expect &&
-	test_cmp expect file2 &&
-	echo "main new sub" >expect &&
-	test_cmp expect subdir/file3 &&
-	echo "branch1 submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git commit -m "branch1 resolved with mergetool"
-
-Switched to a new branch 'test2'
-M	submod
-Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Recorded preimage for 'both'
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Recorded preimage for 'spaced name'
-Recorded preimage for 'subdir/file3'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file2
-spaced name
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file11
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-file12
-
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Recorded resolution for 'both'.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-Recorded resolution for 'spaced name'.
-Recorded resolution for 'subdir/file3'.
-[test2 2c3a7d1] branch1 resolved with mergetool
- Author: A U Thor <author@example.com>
-HEAD is now at 2c3a7d1 branch1 resolved with mergetool
-ok 2 - custom mergetool
-
-expecting success of 7610.3 'gui mergetool': 
-	test_config merge.guitool myguitool &&
-	test_config mergetool.myguitool.cmd "(printf \"gui \" && cat \"\$REMOTE\") >\"\$MERGED\"" &&
-	test_config mergetool.myguitool.trustExitCode true &&
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-	yes "" | git mergetool --gui both &&
-	yes "" | git mergetool -g file1 file1 &&
-	yes "" | git mergetool --gui file2 "spaced name" &&
-	yes "" | git mergetool --gui subdir/file3 &&
-	yes "d" | git mergetool --gui file11 &&
-	yes "d" | git mergetool --gui file12 &&
-	yes "l" | git mergetool --gui submod &&
-	echo "gui main updated" >expect &&
-	test_cmp expect file1 &&
-	echo "gui main new" >expect &&
-	test_cmp expect file2 &&
-	echo "gui main new sub" >expect &&
-	test_cmp expect subdir/file3 &&
-	echo "branch1 submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git commit -m "branch1 resolved with mergetool"
-
-Switched to a new branch 'test3'
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file2
-spaced name
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file11
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-file12
-
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? [test3 531fc95] branch1 resolved with mergetool
- Author: A U Thor <author@example.com>
-HEAD is now at 531fc95 branch1 resolved with mergetool
-ok 3 - gui mergetool
-
-expecting success of 7610.4 'gui mergetool without merge.guitool set falls back to merge.tool': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-	yes "" | git mergetool --gui both &&
-	yes "" | git mergetool -g file1 file1 &&
-	yes "" | git mergetool --gui file2 "spaced name" &&
-	yes "" | git mergetool --gui subdir/file3 &&
-	yes "d" | git mergetool --gui file11 &&
-	yes "d" | git mergetool --gui file12 &&
-	yes "l" | git mergetool --gui submod &&
-	echo "main updated" >expect &&
-	test_cmp expect file1 &&
-	echo "main new" >expect &&
-	test_cmp expect file2 &&
-	echo "main new sub" >expect &&
-	test_cmp expect subdir/file3 &&
-	echo "branch1 submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git commit -m "branch1 resolved with mergetool"
-
-Switched to a new branch 'test4'
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file2
-spaced name
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file11
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-file12
-
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? [test4 2c3a7d1] branch1 resolved with mergetool
- Author: A U Thor <author@example.com>
-HEAD is now at 2c3a7d1 branch1 resolved with mergetool
-ok 4 - gui mergetool without merge.guitool set falls back to merge.tool
-
-expecting success of 7610.5 'mergetool crlf': 
-	test_when_finished "git reset --hard" &&
-	# This test_config line must go after the above reset line so that
-	# core.autocrlf is unconfigured before reset runs.  (The
-	# test_config command uses test_when_finished internally and
-	# test_when_finished is LIFO.)
-	test_config core.autocrlf true &&
-	git checkout -b test$test_count branch1 &&
-	test_must_fail git merge main &&
-	yes "" | git mergetool file1 &&
-	yes "" | git mergetool file2 &&
-	yes "" | git mergetool "spaced name" &&
-	yes "" | git mergetool both &&
-	yes "" | git mergetool subdir/file3 &&
-	yes "d" | git mergetool file11 &&
-	yes "d" | git mergetool file12 &&
-	yes "r" | git mergetool submod &&
-	test "$(printf x | cat file1 -)" = "$(printf "main updated\r\nx")" &&
-	test "$(printf x | cat file2 -)" = "$(printf "main new\r\nx")" &&
-	test "$(printf x | cat subdir/file3 -)" = "$(printf "main new sub\r\nx")" &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git commit -m "branch1 resolved with mergetool - autocrlf"
-
-Switched to a new branch 'test5'
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Recorded preimage for 'both'
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Recorded preimage for 'spaced name'
-Recorded preimage for 'subdir/file3'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file2
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-Merging:
-spaced name
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file11
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-file12
-
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
-Recorded resolution for 'both'.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-Recorded resolution for 'spaced name'.
-Recorded resolution for 'subdir/file3'.
-[test5 2674795] branch1 resolved with mergetool - autocrlf
- Author: A U Thor <author@example.com>
-HEAD is now at 2674795 branch1 resolved with mergetool - autocrlf
-ok 5 - mergetool crlf
-
-expecting success of 7610.6 'mergetool in subdir': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	(
-		cd subdir &&
-		test_must_fail git merge main &&
-		yes "" | git mergetool file3 &&
-		echo "main new sub" >expect &&
-		test_cmp expect file3
-	)
-
-Switched to a new branch 'test6'
-M	submod
-Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-HEAD is now at b56897f branch1 changes
-ok 6 - mergetool in subdir
-
-expecting success of 7610.7 'mergetool on file in parent dir': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	(
-		cd subdir &&
-		test_must_fail git merge main &&
-		yes "" | git mergetool file3 &&
-		yes "" | git mergetool ../file1 &&
-		yes "" | git mergetool ../file2 ../spaced\ name &&
-		yes "" | git mergetool ../both &&
-		yes "d" | git mergetool ../file11 &&
-		yes "d" | git mergetool ../file12 &&
-		yes "l" | git mergetool ../submod &&
-		echo "main updated" >expect &&
-		test_cmp expect ../file1 &&
-		echo "main new" >expect &&
-		test_cmp expect ../file2 &&
-		echo "branch1 submodule" >expect &&
-		test_cmp expect ../submod/bar &&
-		git commit -m "branch1 resolved with mergetool - subdir"
-	)
-
-Switched to a new branch 'test7'
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file2
-spaced name
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-file12
-
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? [test7 3b3d211] branch1 resolved with mergetool - subdir
- Author: A U Thor <author@example.com>
-HEAD is now at 3b3d211 branch1 resolved with mergetool - subdir
-ok 7 - mergetool on file in parent dir
+*** t9135-git-svn-moved-branch-empty-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9135-git-svn-moved-branch-empty-file/.git/
+expecting success of 9135.1 'load svn dumpfile': 
+	svnadmin load "$rawsvnrepo" < "${TEST_DIRECTORY}/t9135/svn.dump"
+	
+<<< Started new transaction, based on original revision 1
+     * editing path : branches ... done.
+     * editing path : trunk ... done.
 
-expecting success of 7610.8 'mergetool skips autoresolved': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	yes "d" | git mergetool file11 &&
-	yes "d" | git mergetool file12 &&
-	yes "l" | git mergetool submod &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging"
+------- Committed revision 1 >>>
 
-Switched to a new branch 'test8'
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file11
+<<< Started new transaction, based on original revision 2
+     * editing path : branches/branch-b ...COPIED... done.
 
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-file12
+------- Committed revision 2 >>>
 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
+<<< Started new transaction, based on original revision 3
+     * editing path : branches/branch-b/b1 ... done.
 
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? HEAD is now at b56897f branch1 changes
-ok 8 - mergetool skips autoresolved
+------- Committed revision 3 >>>
 
-expecting success of 7610.9 'mergetool merges all from subdir (rerere disabled)': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config rerere.enabled false &&
-	(
-		cd subdir &&
-		test_must_fail git merge main &&
-		yes "r" | git mergetool ../submod &&
-		yes "d" "d" | git mergetool --no-prompt &&
-		echo "main updated" >expect &&
-		test_cmp expect ../file1 &&
-		echo "main new" >expect &&
-		test_cmp expect ../file2 &&
-		echo "main new sub" >expect &&
-		test_cmp expect file3 &&
-		( cd .. && git submodule update -N ) &&
-		echo "main submodule" >expect &&
-		test_cmp expect ../submod/bar &&
-		git commit -m "branch2 resolved by mergetool from subdir"
-	)
+<<< Started new transaction, based on original revision 4
+     * editing path : branches/branch-c ...COPIED... done.
 
-Switched to a new branch 'test9'
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
+------- Committed revision 4 >>>
 
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Merging:
-both
-file1
-file11
-file12
-file2
-spaced name
-subdir/file3
+<<< Started new transaction, based on original revision 5
+     * editing path : branches/branch-c ... done.
 
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
+------- Committed revision 5 >>>
 
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
+<<< Started new transaction, based on original revision 6
+     * editing path : branches/branch-c ...COPIED... done.
 
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
+------- Committed revision 6 >>>
 
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
+ok 1 - load svn dumpfile
 
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
-[test9 af143c6] branch2 resolved by mergetool from subdir
- Author: A U Thor <author@example.com>
-HEAD is now at af143c6 branch2 resolved by mergetool from subdir
-ok 9 - mergetool merges all from subdir (rerere disabled)
+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.51.0/t/trash directory.t9135-git-svn-moved-branch-empty-file/x/.git/
+r1 = b62bc00cd9a0470460ab19c77f0d0de7be40e8ab (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b, 1
+Found branch parent: (refs/remotes/origin/branch-b) b62bc00cd9a0470460ab19c77f0d0de7be40e8ab
+Following parent with do_switch
+Successfully followed parent
+r2 = fe9371cd4dfbf7486b2791cd20a8728fcfe449ea (refs/remotes/origin/branch-b)
+	A	b1
+r3 = b66d470119e50a6b332f7a65f11f368342edd721 (refs/remotes/origin/branch-b)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 3
+Found branch parent: (refs/remotes/origin/branch-c) b62bc00cd9a0470460ab19c77f0d0de7be40e8ab
+Following parent with do_switch
+Successfully followed parent
+r4 = 082c0cf65e2293f76e710258ce1ae2f1e558fe1d (refs/remotes/origin/branch-c)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 5
+Found branch parent: (refs/remotes/origin/branch-c) b66d470119e50a6b332f7a65f11f368342edd721
+Index mismatch: 934e48f4addc4882a9b7b99615348569d531c873 != 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+rereading b66d470119e50a6b332f7a65f11f368342edd721
+Following parent with do_switch
+Successfully followed parent
+r6 = bb28770c375743423af6219e0841719c84b25614 (refs/remotes/origin/branch-c)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk r1
+ok 2 - clone using git svn
 
-expecting success of 7610.10 'mergetool merges all from subdir (rerere enabled)': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config rerere.enabled true &&
-	rm -rf .git/rr-cache &&
+expecting success of 9135.3 'test that b1 exists and is empty': 
 	(
-		cd subdir &&
-		test_must_fail git merge main &&
-		yes "r" | git mergetool ../submod &&
-		yes "d" "d" | git mergetool --no-prompt &&
-		echo "main updated" >expect &&
-		test_cmp expect ../file1 &&
-		echo "main new" >expect &&
-		test_cmp expect ../file2 &&
-		echo "main new sub" >expect &&
-		test_cmp expect file3 &&
-		( cd .. && git submodule update -N ) &&
-		echo "main submodule" >expect &&
-		test_cmp expect ../submod/bar &&
-		git commit -m "branch2 resolved by mergetool from subdir"
+		cd x &&
+		git reset --hard origin/branch-c &&
+		test_must_be_empty b1
 	)
+	
+HEAD is now at bb28770 branch-c off of branch-b
+ok 3 - test that b1 exists and is empty
 
-Switched to a new branch 'test10'
-M	submod
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Recorded preimage for 'both'
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Recorded preimage for 'spaced name'
-Recorded preimage for 'subdir/file3'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Merging:
-both
-file1
-file11
-file12
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Recorded resolution for 'both'.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-Recorded resolution for 'spaced name'.
-Recorded resolution for 'subdir/file3'.
-[test10 af143c6] branch2 resolved by mergetool from subdir
- Author: A U Thor <author@example.com>
-HEAD is now at af143c6 branch2 resolved by mergetool from subdir
-ok 10 - mergetool merges all from subdir (rerere enabled)
-
-expecting success of 7610.11 'mergetool skips resolved paths when rerere is active': 
-	test_when_finished "git reset --hard" &&
-	test_config rerere.enabled true &&
-	rm -rf .git/rr-cache &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-	yes "l" | git mergetool --no-prompt submod &&
-	yes "d" "d" | git mergetool --no-prompt &&
-	git submodule update -N &&
-	output="$(yes "n" | git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging"
-
-Switched to a new branch 'test11'
-M	submod
-Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Recorded preimage for 'both'
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Recorded preimage for 'spaced name'
-Recorded preimage for 'subdir/file3'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Merging:
-both
-file1
-file11
-file12
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-HEAD is now at b56897f branch1 changes
-ok 11 - mergetool skips resolved paths when rerere is active
-
-expecting success of 7610.12 'conflicted stash sets up rerere': 
-	test_when_finished "git reset --hard" &&
-	test_config rerere.enabled true &&
-	git checkout stash1 &&
-	echo "Conflicting stash content" >file11 &&
-	git stash &&
-
-	git checkout --detach stash2 &&
-	test_must_fail git stash apply &&
-
-	test -n "$(git ls-files -u)" &&
-	conflicts="$(git rerere remaining)" &&
-	test "$conflicts" = "file11" &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" != "No files need merging" &&
-
-	git commit -am "save the stash resolution" &&
-
-	git reset --hard stash2 &&
-	test_must_fail git stash apply &&
-
-	test -n "$(git ls-files -u)" &&
-	conflicts="$(git rerere remaining)" &&
-	test -z "$conflicts" &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging"
-
-Switched to branch 'stash1'
-M	submod
-Saved working directory and index state WIP on stash1: 7727624 stash1 changes
-HEAD is now at 3eeb9f3 stash2 changes
-M	submod
-Merging Updated upstream with Stashed changes
-Auto-merging file11
-CONFLICT (content): Merge conflict in file11
-Recorded preimage for 'file11'
-HEAD detached at refs/heads/stash2
-Unmerged paths:
-  (use "git restore --staged <file>..." to unstage)
-  (use "git add <file>..." to mark resolution)
-	both modified:   file11
-
-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:   submod (new commits)
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	both.orig
-	expect
-	file1.orig
-	file2.orig
-	spaced name.orig
-	subdir/expect
-	subdir/file3.orig
-
-no changes added to commit (use "git add" and/or "git commit -a")
-Recorded resolution for 'file11'.
-[detached HEAD 22fbead] save the stash resolution
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-HEAD is now at 3eeb9f3 stash2 changes
-Merging Updated upstream with Stashed changes
-Auto-merging file11
-CONFLICT (content): Merge conflict in file11
-Resolved 'file11' using previous resolution.
-HEAD detached at refs/heads/stash2
-Unmerged paths:
-  (use "git restore --staged <file>..." to unstage)
-  (use "git add <file>..." to mark resolution)
-	both modified:   file11
-
-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:   submod (new commits)
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	both.orig
-	expect
-	file1.orig
-	file11.orig
-	file2.orig
-	spaced name.orig
-	subdir/expect
-	subdir/file3.orig
-
-no changes added to commit (use "git add" and/or "git commit -a")
-HEAD is now at 3eeb9f3 stash2 changes
-ok 12 - conflicted stash sets up rerere
-
-expecting success of 7610.13 'mergetool takes partial path': 
-	test_when_finished "git reset --hard" &&
-	test_config rerere.enabled false &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-
-	yes "" | git mergetool subdir &&
-
-	echo "main new sub" >expect &&
-	test_cmp expect subdir/file3
-
-Previous HEAD position was 3eeb9f3 stash2 changes
-Switched to a new branch 'test13'
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-HEAD is now at b56897f branch1 changes
-ok 13 - mergetool takes partial path
-
-expecting success of 7610.14 'mergetool delete/delete conflict': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count move-to-c &&
-	test_must_fail git merge move-to-b &&
-	echo d | git mergetool a/a/file.txt &&
-	! test -f a/a/file.txt &&
-	git reset --hard &&
-	test_must_fail git merge move-to-b &&
-	echo m | git mergetool a/a/file.txt &&
-	test -f b/b/file.txt &&
-	git reset --hard &&
-	test_must_fail git merge move-to-b &&
-	! echo a | git mergetool a/a/file.txt &&
-	! test -f a/a/file.txt
-
-Switched to a new branch 'test14'
-Auto-merging a/a/file.txt
-CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
-Auto-merging a/a/file.txt
-CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
-Auto-merging a/a/file.txt
-CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
-ok 14 - mergetool delete/delete conflict
-
-expecting success of 7610.15 'mergetool produces no errors when keepBackup is used': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count move-to-c &&
-	test_config mergetool.keepBackup true &&
-	test_must_fail git merge move-to-b &&
-	echo d | git mergetool a/a/file.txt 2>actual &&
-	test_must_be_empty actual &&
-	! test -d a
-
-Switched to a new branch 'test15'
-Auto-merging a/a/file.txt
-CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
-ok 15 - mergetool produces no errors when keepBackup is used
-
-expecting success of 7610.16 'mergetool honors tempfile config for deleted files': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count move-to-c &&
-	test_config mergetool.keepTemporaries false &&
-	test_must_fail git merge move-to-b &&
-	echo d | git mergetool a/a/file.txt &&
-	! test -d a
-
-Switched to a new branch 'test16'
-Auto-merging a/a/file.txt
-CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
-ok 16 - mergetool honors tempfile config for deleted files
-
-expecting success of 7610.17 'mergetool keeps tempfiles when aborting delete/delete': 
-	test_when_finished "git reset --hard" &&
-	test_when_finished "git clean -fdx" &&
-	git checkout -b test$test_count move-to-c &&
-	test_config mergetool.keepTemporaries true &&
-	test_must_fail git merge move-to-b &&
-	! test_write_lines a n | git mergetool a/a/file.txt &&
-	test -d a/a &&
-	cat >expect <<-\EOF &&
-	file_BASE_.txt
-	file_LOCAL_.txt
-	file_REMOTE_.txt
-	EOF
-	ls -1 a/a | sed -e "s/[0-9]*//g" >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'test17'
-Auto-merging a/a/file.txt
-CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-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_879766.txt
-Removing a/a/file_LOCAL_879766.txt
-Removing a/a/file_REMOTE_879766.txt
-Removing actual
-Removing both.orig
-Removing expect
-Removing file1.orig
-Removing file11.orig
-Removing file2.orig
-Removing spaced name.orig
-Removing subdir/expect
-Removing subdir/file3.orig
-HEAD is now at 7baa014 move to c
-ok 17 - mergetool keeps tempfiles when aborting delete/delete
-
-expecting success of 7610.18 'deleted vs modified submodule': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	mv submod submod-movedaside &&
-	git rm --cached submod &&
-	git commit -m "Submodule deleted from branch" &&
-	git checkout -b test$test_count.a test$test_count &&
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	yes "r" | git mergetool submod &&
-	rmdir submod && mv submod-movedaside submod &&
-	echo "branch1 submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping module" &&
-
-	mv submod submod-movedaside &&
-	git checkout -b test$test_count.b test$test_count &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	yes "l" | git mergetool submod &&
-	test ! -e submod &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by deleting module" &&
-
-	mv submod-movedaside submod &&
-	git checkout -b test$test_count.c main &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	yes "r" | git mergetool submod &&
-	test ! -e submod &&
-	test -d submod.orig &&
-	git submodule update -N &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by deleting module" &&
-	mv submod.orig submod &&
-
-	git checkout -b test$test_count.d main &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	yes "l" | git mergetool submod &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping module"
-
-Switched to a new branch 'test18'
-rm 'submod'
-[test18 5815277] Submodule deleted from branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 160000 submod
-Switched to a new branch 'test18.a'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (modify/delete): submod deleted in HEAD and modified in main.  Version main of submod left in tree.
-Recorded preimage for 'both'
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Recorded preimage for 'spaced name'
-Recorded preimage for 'subdir/file3'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: deleted
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
-Recorded resolution for 'both'.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-Recorded resolution for 'spaced name'.
-Recorded resolution for 'subdir/file3'.
-[test18.a 699f6ba] Merge resolved by keeping module
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test18.b'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (modify/delete): submod deleted in HEAD and modified in main.  Version main of submod left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: deleted
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? [test18.b ba131d0] Merge resolved by deleting module
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test18.c'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test18.  Version test18 of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in test18 and modified in HEAD.  Version HEAD of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (modify/delete): submod deleted in test18 and modified in HEAD.  Version HEAD of submod left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-  {remote}: deleted
-Use (l)ocal or (r)emote, or (a)bort? [test18.c 79dacce] Merge resolved by deleting module
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test18.d'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test18.  Version test18 of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in test18 and modified in HEAD.  Version HEAD of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (modify/delete): submod deleted in test18 and modified in HEAD.  Version HEAD of submod left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-  {remote}: deleted
-Use (l)ocal or (r)emote, or (a)bort? [test18.d 84e5f25] Merge resolved by keeping module
- Author: A U Thor <author@example.com>
-HEAD is now at 84e5f25 Merge resolved by keeping module
-ok 18 - deleted vs modified submodule
-
-expecting success of 7610.19 'file vs modified submodule': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	mv submod submod-movedaside &&
-	git rm --cached submod &&
-	echo not a submodule >submod &&
-	git add submod &&
-	git commit -m "Submodule path becomes file" &&
-	git checkout -b test$test_count.a branch1 &&
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	yes "r" | git mergetool submod &&
-	rmdir submod && mv submod-movedaside submod &&
-	echo "branch1 submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping module" &&
-
-	mv submod submod-movedaside &&
-	git checkout -b test$test_count.b test$test_count &&
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	yes "c" | git mergetool submod~HEAD &&
-	git rm submod &&
-	git mv submod~HEAD submod &&
-	git submodule update -N &&
-	echo "not a submodule" >expect &&
-	test_cmp expect submod &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping file" &&
-
-	git checkout -b test$test_count.c main &&
-	rmdir submod && mv submod-movedaside submod &&
-	test ! -e submod.orig &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	mv submod submod.orig &&
-	git rm --cached submod &&
-	yes "c" | git mergetool submod~test19 &&
-	git mv submod~test19 submod &&
-	test -d submod.orig &&
-	git submodule update -N &&
-	echo "not a submodule" >expect &&
-	test_cmp expect submod &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping file" &&
-
-	git checkout -b test$test_count.d main &&
-	rmdir submod && mv submod.orig submod &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	yes "l" | git mergetool submod &&
-	yes "d" | git mergetool submod~test19 &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping module"
-
-Switched to a new branch 'test19'
-M	submod
-Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
-rm 'submod'
-[test19 51d579a] Submodule path becomes file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 160000 => 100644 submod
-Switched to a new branch 'test19.a'
-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:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod (not checked out)
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
-[test19.a a22d630] Merge resolved by keeping module
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test19.b'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (distinct types): submod had different types on each side; renamed one of them so each can be recorded somewhere.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod~HEAD
-
-Deleted merge conflict for 'submod~HEAD':
-  {local}: created file
-  {remote}: deleted
-Use (c)reated or (d)eleted file, or (a)bort? rm 'submod'
-[test19.b 03808c9] Merge resolved by keeping file
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test19.c'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test19.  Version test19 of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in test19 and modified in HEAD.  Version HEAD of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (distinct types): submod had different types on each side; renamed one of them so each can be recorded somewhere.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? rm 'submod'
-Merging:
-submod~test19
-
-Deleted merge conflict for 'submod~test19':
-  {local}: deleted
-  {remote}: created file
-Use (c)reated or (d)eleted file, or (a)bort? [test19.c d6fb010] Merge resolved by keeping file
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test19.d'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test19.  Version test19 of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in test19 and modified in HEAD.  Version HEAD of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (distinct types): submod had different types on each side; renamed one of them so each can be recorded somewhere.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-  {remote}: deleted
-Use (l)ocal or (r)emote, or (a)bort? Merging:
-submod~test19
-
-Deleted merge conflict for 'submod~test19':
-  {local}: deleted
-  {remote}: created file
-Use (c)reated or (d)eleted file, or (a)bort? [test19.d 78b901a] Merge resolved by keeping module
- Author: A U Thor <author@example.com>
-HEAD is now at 78b901a Merge resolved by keeping module
-ok 19 - file vs modified submodule
-
-expecting success of 7610.20 'submodule in subdirectory': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	(
-		cd subdir &&
-		test_create_repo subdir_module &&
-		(
-		cd subdir_module &&
-		: >file15 &&
-		git add file15 &&
-		git commit -m "add initial versions"
-		)
-	) &&
-	test_when_finished "rm -rf subdir/subdir_module" &&
-	git submodule add file:///dev/null subdir/subdir_module &&
-	git add subdir/subdir_module &&
-	git commit -m "add submodule in subdirectory" &&
-
-	git checkout -b test$test_count.a test$test_count &&
-	git submodule update -N &&
-	(
-	cd subdir/subdir_module &&
-		git checkout -b super10.a &&
-		echo test$test_count.a >file15 &&
-		git add file15 &&
-		git commit -m "on branch 10.a"
-	) &&
-	git add subdir/subdir_module &&
-	git commit -m "change submodule in subdirectory on test$test_count.a" &&
-
-	git checkout -b test$test_count.b test$test_count &&
-	git submodule update -N &&
-	(
-		cd subdir/subdir_module &&
-		git checkout -b super10.b &&
-		echo test$test_count.b >file15 &&
-		git add file15 &&
-		git commit -m "on branch 10.b"
-	) &&
-	git add subdir/subdir_module &&
-	git commit -m "change submodule in subdirectory on test$test_count.b" &&
-
-	test_must_fail git merge test$test_count.a &&
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9116-git-svn-log.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9116-git-svn-log/.git/
+expecting success of 9116.1 'setup repository and import': 
+	mkdir import &&
 	(
-		cd subdir &&
-		yes "l" | git mergetool subdir_module
+		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"
 	) &&
-	echo "test$test_count.b" >expect &&
-	test_cmp expect subdir/subdir_module/file15 &&
-	git submodule update -N &&
-	echo "test$test_count.b" >expect &&
-	test_cmp expect subdir/subdir_module/file15 &&
-	git reset --hard &&
-	git submodule update -N &&
-
-	test_must_fail git merge test$test_count.a &&
-	yes "r" | git mergetool subdir/subdir_module &&
-	echo "test$test_count.b" >expect &&
-	test_cmp expect subdir/subdir_module/file15 &&
-	git submodule update -N &&
-	echo "test$test_count.a" >expect &&
-	test_cmp expect subdir/subdir_module/file15 &&
-	git commit -m "branch1 resolved with mergetool"
-
-Switched to a new branch 'test20'
-M	submod
-Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7610-mergetool/subdir/subdir_module/.git/
-[main (root-commit) 4026e0d] add initial versions
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file15
-Adding existing repo at 'subdir/subdir_module' to the index
-[test20 fa030bf] add submodule in subdirectory
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 subdir/subdir_module
-Switched to a new branch 'test20.a'
-Switched to a new branch 'super10.a'
-[super10.a e51e504] on branch 10.a
+	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 = ebb4996f91d04ea2313fe527fd08fa5bb3ce427a (refs/remotes/origin/tags/0.3)
+	A	README
+r1 = 346cfd8a6d27ed3a648ca3a49ec5faf3e26e9a8b (refs/remotes/origin/trunk)
+	A	README
+r1 = 9aebe5aa0f87594d1dc105d78d3a734fdc7e8381 (refs/remotes/origin/b)
+	A	README
+r1 = 5e15c4bc581682598b590ef28a63d21a7c00ee27 (refs/remotes/origin/a)
+	A	README
+r1 = dc4451dfac044e2812c9e78ce8632871c2ffb7ae (refs/remotes/origin/tags/0.2)
+	A	README
+r1 = c3148fd4c8047248f95820816990b609ed18f565 (refs/remotes/origin/tags/0.1)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk r1
+HEAD is now at 346cfd8 test
+[master 2a9dab5] bye
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[test20.a 36380aa] change submodule in subdirectory on test20.a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'test20.b'
-M	subdir/subdir_module
-Submodule path 'subdir/subdir_module': checked out '4026e0d3f7d9c9cd867521d1177656769bfa2be1'
-Switched to a new branch 'super10.b'
-[super10.b e7cb421] on branch 10.b
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
+	M	README
+Committed r2
+	M	README
+r2 = dea58735b2e85bf82d49cac617962b2a6a33a816 (refs/remotes/origin/trunk)
+No changes between 2a9dab5fdf53a6bc7892b03a8eb84f84383180ea and refs/remotes/origin/trunk
+Resetting to the latest refs/remotes/origin/trunk
+HEAD is now at 5e15c4b test
+[master 165ac92] feedme
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[test20.b 6eae923] change submodule in subdirectory on test20.b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-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 (subdir/subdir_module), and either merge commit e51e504
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add subdir/subdir_module
-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 subdir/subdir_module
-CONFLICT (submodule): Merge conflict in subdir/subdir_module
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-subdir/subdir_module
-
-Submodule merge conflict for 'subdir/subdir_module':
-  {local}: submodule commit e7cb42147e351dde456e7d86fbe5ac89f43de679
-  {remote}: submodule commit e51e504244acbfadc9e7ea9868c3cced1088346d
-Use (l)ocal or (r)emote, or (a)bort? HEAD is now at 6eae923 change submodule in subdirectory on test20.b
-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 (subdir/subdir_module), and either merge commit e51e504
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add subdir/subdir_module
-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 subdir/subdir_module
-CONFLICT (submodule): Merge conflict in subdir/subdir_module
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-subdir/subdir_module
-
-Submodule merge conflict for 'subdir/subdir_module':
-  {local}: submodule commit e7cb42147e351dde456e7d86fbe5ac89f43de679
-  {remote}: submodule commit e51e504244acbfadc9e7ea9868c3cced1088346d
-Use (l)ocal or (r)emote, or (a)bort? Submodule path 'subdir/subdir_module': checked out 'e51e504244acbfadc9e7ea9868c3cced1088346d'
-[test20.b 9ad20f7] branch1 resolved with mergetool
- Author: A U Thor <author@example.com>
-HEAD is now at 9ad20f7 branch1 resolved with mergetool
-ok 20 - submodule in subdirectory
-
-expecting success of 7610.21 'directory vs modified submodule': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	mv submod submod-movedaside &&
-	git rm --cached submod &&
-	mkdir submod &&
-	echo not a submodule >submod/file16 &&
-	git add submod/file16 &&
-	git commit -m "Submodule path becomes directory" &&
-
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	yes "l" | git mergetool submod &&
-	echo "not a submodule" >expect &&
-	test_cmp expect submod/file16 &&
-	rm -rf submod.orig &&
-
-	git reset --hard &&
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	test ! -e submod.orig &&
-	yes "r" | git mergetool submod~main &&
-	git mv submod submod.orig &&
-	git mv submod~main submod &&
-	test -d submod.orig &&
-	echo "not a submodule" >expect &&
-	test_cmp expect submod.orig/file16 &&
-	rm -r submod.orig &&
-	mv submod-movedaside/.git submod &&
-	( cd submod && git clean -f && git reset --hard ) &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git reset --hard &&
-	rm -rf submod-movedaside &&
-
-	git checkout -b test$test_count.c main &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	yes "l" | git mergetool submod &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-
-	git reset --hard &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	test ! -e submod.orig &&
-	yes "r" | git mergetool submod &&
-	echo "not a submodule" >expect &&
-	test_cmp expect submod/file16 &&
-
-	git reset --hard main &&
-	( cd submod && git clean -f && git reset --hard ) &&
-	git submodule update -N
-
-Switched to a new branch 'test21'
-rm 'submod'
-[test21 b88b6e4] Submodule path becomes directory
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 160000 submod
- create mode 100644 submod/file16
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (file/directory): directory in the way of submod from main; moving it to submod~main instead.
-CONFLICT (modify/delete): submod~main deleted in HEAD and modified in main.  Version main of submod~main left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-No files need merging
-HEAD is now at b88b6e4 Submodule path becomes directory
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (file/directory): directory in the way of submod from main; moving it to submod~main instead.
-CONFLICT (modify/delete): submod~main deleted in HEAD and modified in main.  Version main of submod~main left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod~main
-
-Submodule merge conflict for 'submod~main':
-  {local}: deleted
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? warning: Could not find section in .gitmodules where path=submod~main
-HEAD is now at b5507ac Add bar on branch1
-Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
-warning: unable to rmdir 'submod': Directory not empty
-HEAD is now at b88b6e4 Submodule path becomes directory
-Switched to a new branch 'test21.c'
-warning: unable to rmdir 'submod': Directory not empty
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test21.  Version test21 of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in test21 and modified in HEAD.  Version HEAD of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (file/directory): directory in the way of submod from HEAD; moving it to submod~HEAD instead.
-CONFLICT (modify/delete): submod~HEAD deleted in test21 and modified in HEAD.  Version HEAD of submod~HEAD left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-No files need merging
-Skipping unmerged submodule submod~HEAD
-HEAD is now at 42ed12d main updates
-warning: unable to rmdir 'submod': Directory not empty
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test21.  Version test21 of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in test21 and modified in HEAD.  Version HEAD of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (file/directory): directory in the way of submod from HEAD; moving it to submod~HEAD instead.
-CONFLICT (modify/delete): submod~HEAD deleted in test21 and modified in HEAD.  Version HEAD of submod~HEAD left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-No files need merging
-HEAD is now at 42ed12d main updates
-HEAD is now at d1fea44 Add bar on main
-HEAD is now at 42ed12d main updates
-ok 21 - directory vs modified submodule
-
-expecting success of 7610.22 'file with no base': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_must_fail git merge main &&
-	git mergetool --no-prompt --tool mybase -- both &&
-	test_must_be_empty both
-
-Switched to a new branch 'test22'
-M	submod
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-HEAD is now at b56897f branch1 changes
-ok 22 - file with no base
-
-expecting success of 7610.23 'custom commands override built-ins': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config mergetool.defaults.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
-	test_config mergetool.defaults.trustExitCode true &&
-	test_must_fail git merge main &&
-	git mergetool --no-prompt --tool defaults -- both &&
-	echo main both added >expected &&
-	test_cmp expected both
-
-Switched to a new branch 'test23'
-M	submod
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-HEAD is now at b56897f branch1 changes
-ok 23 - custom commands override built-ins
-
-expecting success of 7610.24 'filenames seen by tools start with ./': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config mergetool.writeToTemp false &&
-	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
-	test_config mergetool.myecho.trustExitCode true &&
-	test_must_fail git merge main &&
-	git mergetool --no-prompt --tool myecho -- both >actual &&
-	grep ^\./both_LOCAL_ actual
-
-Switched to a new branch 'test24'
-M	submod
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-./both_LOCAL_907665
-HEAD is now at b56897f branch1 changes
-ok 24 - filenames seen by tools start with ./
-
-checking prerequisite: MKTEMP
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-MKTEMP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-MKTEMP" &&
-	tempdir=$(mktemp -d -t foo.XXXXXX) &&
-	test -d "$tempdir" &&
-	rmdir "$tempdir"
-
-)
-prerequisite MKTEMP ok
-expecting success of 7610.25 'temporary filenames are used with mergetool.writeToTemp': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config mergetool.writeToTemp true &&
-	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
-	test_config mergetool.myecho.trustExitCode true &&
-	test_must_fail git merge main &&
-	git mergetool --no-prompt --tool myecho -- both >actual &&
-	! grep ^\./both_LOCAL_ actual &&
-	grep /both_LOCAL_ actual
-
-Switched to a new branch 'test25'
-M	submod
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-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-hVRStW/both_LOCAL_908150
-HEAD is now at b56897f branch1 changes
-ok 25 - temporary filenames are used with mergetool.writeToTemp
-
-expecting success of 7610.26 'diff.orderFile configuration is honored': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count order-file-side2 &&
-	test_config diff.orderFile order-file &&
-	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
-	test_config mergetool.myecho.trustExitCode true &&
-	echo b >order-file &&
-	echo a >>order-file &&
-	test_must_fail git merge order-file-side1 &&
-	cat >expect <<-\EOF &&
-		Merging:
-		b
-		a
-	EOF
-
-	# make sure "order-file" that is ambiguous between
-	# rev and path is understood correctly.
-	git branch order-file HEAD &&
-
-	git mergetool --no-prompt --tool myecho >output &&
-	git grep --no-index -h -A2 Merging: output >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'test26'
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Recorded preimage for 'a'
-Recorded preimage for 'b'
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 50ba26c side2
-ok 26 - diff.orderFile configuration is honored
-
-expecting success of 7610.27 'mergetool -Oorder-file is honored': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count order-file-side2 &&
-	test_config diff.orderFile order-file &&
-	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
-	test_config mergetool.myecho.trustExitCode true &&
-	echo b >order-file &&
-	echo a >>order-file &&
-	test_must_fail git merge order-file-side1 &&
-	cat >expect <<-\EOF &&
-		Merging:
-		a
-		b
-	EOF
-	git mergetool -O/dev/null --no-prompt --tool myecho >output &&
-	git grep --no-index -h -A2 Merging: output >actual &&
-	test_cmp expect actual &&
-	git reset --hard &&
-
-	git config --unset diff.orderFile &&
-	test_must_fail git merge order-file-side1 &&
-	cat >expect <<-\EOF &&
-		Merging:
-		b
-		a
-	EOF
-	git mergetool -Oorder-file --no-prompt --tool myecho >output &&
-	git grep --no-index -h -A2 Merging: output >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'test27'
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Recorded preimage for 'a'
-Recorded preimage for 'b'
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 50ba26c side2
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Recorded preimage for 'a'
-Recorded preimage for 'b'
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 50ba26c side2
-ok 27 - mergetool -Oorder-file is honored
-
-expecting success of 7610.28 'mergetool --tool-help shows recognized tools': 
-	# Check a few known tools are correctly shown
-	git mergetool --tool-help >mergetools &&
-	grep vimdiff mergetools &&
-	grep vimdiff3 mergetools &&
-	grep gvimdiff2 mergetools &&
-	grep araxis mergetools &&
-	grep xxdiff mergetools &&
-	grep meld mergetools
-
-		gvimdiff         Use gVim (requires a graphical session) with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)
-		gvimdiff1        Use gVim (requires a graphical session) with a 2 panes layout (LOCAL and REMOTE)
-		gvimdiff2        Use gVim (requires a graphical session) with a 3 panes layout (LOCAL, MERGED and REMOTE)
-		gvimdiff3        Use gVim (requires a graphical session) where only the MERGED file is shown
-		nvimdiff         Use Neovim with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)
-		nvimdiff1        Use Neovim with a 2 panes layout (LOCAL and REMOTE)
-		nvimdiff2        Use Neovim with a 3 panes layout (LOCAL, MERGED and REMOTE)
-		nvimdiff3        Use Neovim where only the MERGED file is shown
-		vimdiff          Use Vim with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)
-		vimdiff1         Use Vim with a 2 panes layout (LOCAL and REMOTE)
-		vimdiff2         Use Vim with a 3 panes layout (LOCAL, MERGED and REMOTE)
-		vimdiff3         Use Vim where only the MERGED file is shown
-		gvimdiff3        Use gVim (requires a graphical session) where only the MERGED file is shown
-		nvimdiff3        Use Neovim where only the MERGED file is shown
-		vimdiff3         Use Vim where only the MERGED file is shown
-		gvimdiff2        Use gVim (requires a graphical session) with a 3 panes layout (LOCAL, MERGED and REMOTE)
-		araxis           Use Araxis Merge (requires a graphical session)
-		xxdiff           Use xxdiff (requires a graphical session)
-		meld             Use Meld (requires a graphical session) with optional `auto merge` (see `git help mergetool`'s `CONFIGURATION` section)
-ok 28 - mergetool --tool-help shows recognized tools
-
-expecting success of 7610.29 'mergetool hideResolved': 
-	test_config mergetool.hideResolved true &&
-	test_when_finished "git reset --hard" &&
-	git checkout -b test${test_count}_b main &&
-	test_write_lines >file1 base "" a &&
-	git commit -a -m "base" &&
-	test_write_lines >file1 base "" c &&
-	git commit -a -m "remote update" &&
-	git checkout -b test${test_count}_a HEAD~ &&
-	test_write_lines >file1 local "" b &&
-	git commit -a -m "local update" &&
-	test_must_fail git merge test${test_count}_b &&
-	yes "" | git mergetool file1 &&
-	test_write_lines >expect local "" c &&
-	test_cmp expect file1 &&
-	git commit -m "test resolved with mergetool"
-
-Switched to a new branch 'test29_b'
-[test29_b b1eadc5] base
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+), 1 deletion(-)
-[test29_b 27f9bad] remote update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'test29_a'
-[test29_a a3aa5f2] local update
+ create mode 100644 FEEDME
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9116-git-svn-log/svnrepo/branches/a ...
+	A	FEEDME
+Committed r3
+	A	FEEDME
+r3 = 448ebb2591320eba56979de0dd8750bda42e62ad (refs/remotes/origin/a)
+No changes between 165ac92099cf665ef04220808c1035c2ea96720e and refs/remotes/origin/a
+Resetting to the latest refs/remotes/origin/a
+HEAD is now at dea5873 bye
+[master d1ed486] aye
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Recorded preimage for 'file1'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Recorded resolution for 'file1'.
-[test29_a 90808e5] test resolved with mergetool
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
+	M	README
+Committed r4
+	M	README
+r4 = f6f9a0cfb3c9008532088e687cf3c6951ced762e (refs/remotes/origin/trunk)
+No changes between d1ed4866e04539cf3085bc3cc70b4dae5ef06caa and refs/remotes/origin/trunk
+Resetting to the latest refs/remotes/origin/trunk
+HEAD is now at 9aebe5a test
+[master ce0ba41] spy
  Author: A U Thor <author@example.com>
-HEAD is now at 90808e5 test resolved with mergetool
-ok 29 - mergetool hideResolved
-
-expecting success of 7610.30 'mergetool with guiDefault': 
-	test_config merge.guitool myguitool &&
-	test_config mergetool.myguitool.cmd "(printf \"gui \" && cat \"\$REMOTE\") >\"\$MERGED\"" &&
-	test_config mergetool.myguitool.trustExitCode true &&
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-
-	test_config mergetool.guiDefault auto &&
-	DISPLAY=SOMETHING && export DISPLAY &&
-	yes "" | git mergetool both &&
-	yes "" | git mergetool file1 file1 &&
-
-	DISPLAY= && export DISPLAY &&
-	yes "" | git mergetool file2 "spaced name" &&
-
-	test_config mergetool.guiDefault true &&
-	yes "" | git mergetool subdir/file3 &&
-
-	yes "d" | git mergetool file11 &&
-	yes "d" | git mergetool file12 &&
-	yes "l" | git mergetool submod &&
-
-	echo "gui main updated" >expect &&
-	test_cmp expect file1 &&
-
-	echo "main new" >expect &&
-	test_cmp expect file2 &&
-
-	echo "gui main new sub" >expect &&
-	test_cmp expect subdir/file3 &&
-
-	echo "branch1 submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git commit -m "branch1 resolved with mergetool"
-
-Switched to a new branch 'test30'
-M	submod
-Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file2
-spaced name
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file11
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-file12
-
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? [test30 a348a8f] branch1 resolved with mergetool
+ 1 file changed, 1 insertion(+)
+[master fe433bf] try
  Author: A U Thor <author@example.com>
-HEAD is now at a348a8f branch1 resolved with mergetool
-ok 30 - mergetool with guiDefault
-
-expecting success of 7610.31 'mergetool with non-existent tool': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_must_fail git merge main &&
-	yes "" | test_must_fail git mergetool --tool=absent >out 2>&1 &&
-	test_grep "mergetool.absent.cmd not set for tool" out
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9116-git-svn-log/svnrepo/branches/b ...
+	M	README
+Committed r5
+	M	README
+r5 = f449664e2d612d5365ae4dea9359efef2f8460f7 (refs/remotes/origin/b)
+	M	README
+Committed r6
+	M	README
+r6 = 0233b7bb07a9beeb5b2f441eb0a7cdcb60b3e85b (refs/remotes/origin/b)
+No changes between fe433bf5d2b07cb7855c867d1ee2bd15dea4f827 and refs/remotes/origin/b
+Resetting to the latest refs/remotes/origin/b
+ok 1 - setup repository and import
 
-Switched to a new branch 'test31'
-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 (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-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"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-error: mergetool.absent.cmd not set for tool 'absent'
-HEAD is now at b56897f branch1 changes
-ok 31 - mergetool with non-existent tool
+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 448ebb2 feedme
+r2 | pbuilder2 | 2026-09-29 14:54:04 +0000 (Tue, 29 Sep 2026) | 2 lines
+r4 | pbuilder2 | 2026-09-29 14:54:06 +0000 (Tue, 29 Sep 2026) | 2 lines
+r3 | pbuilder2 | 2026-09-29 14:54:05 +0000 (Tue, 29 Sep 2026) | 2 lines
+ok 2 - run log
 
-# passed all 31 test(s)
-1..31
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9135-git-svn-moved-branch-empty-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9135-git-svn-moved-branch-empty-file/.git/
-expecting success of 9135.1 'load svn dumpfile': 
-	svnadmin load "$rawsvnrepo" < "${TEST_DIRECTORY}/t9135/svn.dump"
+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
 	
-<<< Started new transaction, based on original revision 1
-     * editing path : branches ... done.
-     * editing path : trunk ... done.
+HEAD is now at f6f9a0c aye
+r3 | pbuilder2 | 2026-09-29 14:54:05 +0000 (Tue, 29 Sep 2026) | 2 lines
+ok 3 - run log against a from trunk
 
-------- Committed revision 1 >>>
+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 f6f9a0c aye
+ok 4 - test ascending revision range
 
-<<< Started new transaction, based on original revision 2
-     * editing path : branches/branch-b ...COPIED... done.
+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 f6f9a0c aye
+ok 5 - test ascending revision range with --show-commit
 
-------- Committed revision 2 >>>
+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 f6f9a0c aye
+ok 6 - test ascending revision range with --show-commit (sha1)
 
-<<< Started new transaction, based on original revision 3
-     * editing path : branches/branch-b/b1 ... done.
+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 f6f9a0c aye
+ok 7 - test descending revision range
 
-------- Committed revision 3 >>>
+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 f6f9a0c aye
+ok 8 - test ascending revision range with unreachable revision
 
-<<< Started new transaction, based on original revision 4
-     * editing path : branches/branch-c ...COPIED... done.
+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 f6f9a0c aye
+ok 9 - test descending revision range with unreachable revision
 
-------- Committed revision 4 >>>
+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 f6f9a0c aye
+ok 10 - test ascending revision range with unreachable upper boundary revision and 1 commit
 
-<<< Started new transaction, based on original revision 5
-     * editing path : branches/branch-c ... done.
+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 f6f9a0c aye
+ok 11 - test descending revision range with unreachable upper boundary revision and 1 commit
 
-------- Committed revision 5 >>>
+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 f6f9a0c aye
+ok 12 - test ascending revision range with unreachable lower boundary revision and 1 commit
 
-<<< Started new transaction, based on original revision 6
-     * editing path : branches/branch-c ...COPIED... done.
+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 f6f9a0c aye
+ok 13 - test descending revision range with unreachable lower boundary revision and 1 commit
 
-------- Committed revision 6 >>>
+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 f6f9a0c aye
+ok 14 - test ascending revision range with unreachable boundary revisions and no commits
 
-ok 1 - load svn dumpfile
+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 f6f9a0c 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.51.0/t/trash directory.t9135-git-svn-moved-branch-empty-file/x/.git/
-r1 = b62bc00cd9a0470460ab19c77f0d0de7be40e8ab (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b, 1
-Found branch parent: (refs/remotes/origin/branch-b) b62bc00cd9a0470460ab19c77f0d0de7be40e8ab
-Following parent with do_switch
-Successfully followed parent
-r2 = fe9371cd4dfbf7486b2791cd20a8728fcfe449ea (refs/remotes/origin/branch-b)
-	A	b1
-r3 = b66d470119e50a6b332f7a65f11f368342edd721 (refs/remotes/origin/branch-b)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 3
-Found branch parent: (refs/remotes/origin/branch-c) b62bc00cd9a0470460ab19c77f0d0de7be40e8ab
-Following parent with do_switch
-Successfully followed parent
-r4 = 082c0cf65e2293f76e710258ce1ae2f1e558fe1d (refs/remotes/origin/branch-c)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 5
-Found branch parent: (refs/remotes/origin/branch-c) b66d470119e50a6b332f7a65f11f368342edd721
-Index mismatch: 934e48f4addc4882a9b7b99615348569d531c873 != 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-rereading b66d470119e50a6b332f7a65f11f368342edd721
-Following parent with do_switch
-Successfully followed parent
-r6 = bb28770c375743423af6219e0841719c84b25614 (refs/remotes/origin/branch-c)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/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 f6f9a0c 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 bb28770 branch-c off of branch-b
-ok 3 - test that b1 exists and is empty
+HEAD is now at f6f9a0c 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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9130-git-svn-authors-file.sh ***
@@ -534191,9 +532292,9 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9130-git-svn-authors-file/x/.git/
 W: +empty_dir: aa
-r1 = 39834d32f8a98296fdc6fc890756bc90f6794031 (refs/remotes/git-svn)
+r1 = a1bf526551352c14919fede244d5196f54b49e9d (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = 38b32329f83a157d0d02932006183e464cbdfe53 (refs/remotes/git-svn)
+r2 = 68adb899e046f82adb507d8b06c0fdb8a8acb79a (refs/remotes/git-svn)
 W: +empty_dir: cc
 Author: cc not defined in svn-authors file
 
@@ -534210,8 +532311,8 @@
 		grep "^author AAAAAAA AAAAAAA <aa@example\.com> " actual
 	)
 	
-author BBBBBBB BBBBBBB <bb@example.com> 1756283008 +0000
-author AAAAAAA AAAAAAA <aa@example.com> 1756283008 +0000
+author BBBBBBB BBBBBBB <bb@example.com> 1790693651 +0000
+author AAAAAAA AAAAAAA <aa@example.com> 1790693651 +0000
 ok 3 - imported 2 revisions successfully
 
 expecting success of 9130.4 'continues to import once authors have been added': 
@@ -534227,17 +532328,17 @@
 	)
 	
 W: +empty_dir: cc
-r3 = 111377a729b2caa9222f631acb4f99cb3052e328 (refs/remotes/git-svn)
+r3 = 0692d3cf4361e3b24f8060abcf752023b9d87b5a (refs/remotes/git-svn)
 W: +empty_dir: dd
-r4 = 82caadfb05f47aa27bf91f139e49cffc8f617a68 (refs/remotes/git-svn)
+r4 = a7b6a7072f9aa3284f6597a19dad39ffb2273940 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/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> 1756283008 +0000
-author CCCCCCC CCCCCCC <cc@example.com> 1756283008 +0000
+author DDDDDDD DDDDDDD <dd@example.com> 1790693651 +0000
+author CCCCCCC CCCCCCC <cc@example.com> 1790693651 +0000
 ok 4 - continues to import once authors have been added
 
 expecting success of 9130.5 'authors-file against globs': 
@@ -534254,7 +532355,7 @@
 Committed revision 5.
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9130-git-svn-authors-file/aa-work/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9130-git-svn-authors-file/svnrepo/aa => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9130-git-svn-authors-file/svnrepo
-r5 = 63b78399d7394e62b70f693fc3326ff28169f4f0 (refs/remotes/origin/trunk)
+r5 = a444c010827c0b5a50032043b2f0bdea61598f74 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9130-git-svn-authors-file/svnrepo/aa/trunk r5
 Committing transaction...
@@ -534268,7 +532369,7 @@
 expecting success of 9130.6 'fetch fails on ee': 
 	( cd aa-work && test_must_fail git svn fetch --authors-file=../svn-authors )
 	
-r6 = 4aefae5d3feccb230a2b2c511bbdfd3a5d083523 (refs/remotes/origin/bb)
+r6 = 2234ac6815c30ce0c15d85d5d1882891c91a0403 (refs/remotes/origin/bb)
 Author: ee not defined in ../svn-authors file
 
 ok 6 - fetch fails on ee
@@ -534290,8 +532391,8 @@
 		test 8 -eq "$(tmp_config_get svn-remote.svn.tags-maxRev)"
 	)
 	
-r7 = b383dc2ab58646291d843f4f7fdb1c4f10e18c88 (refs/remotes/origin/ee)
-r8 = 844f91cf32ff7d26029c81d4a0876460d17bf50b (refs/remotes/origin/cc)
+r7 = 76b9fd900e1c16a312a2d3f05161d500c82b3dc9 (refs/remotes/origin/ee)
+r8 = af69663b8702248c017d1fb89d4bbdf847e4d438 (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': 
@@ -534314,23 +532415,23 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9130-git-svn-authors-file/gitconfig.clone/.git/
 W: +empty_dir: aa
-r1 = 39834d32f8a98296fdc6fc890756bc90f6794031 (refs/remotes/git-svn)
+r1 = a1bf526551352c14919fede244d5196f54b49e9d (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = 38b32329f83a157d0d02932006183e464cbdfe53 (refs/remotes/git-svn)
+r2 = 68adb899e046f82adb507d8b06c0fdb8a8acb79a (refs/remotes/git-svn)
 W: +empty_dir: cc
-r3 = 111377a729b2caa9222f631acb4f99cb3052e328 (refs/remotes/git-svn)
+r3 = 0692d3cf4361e3b24f8060abcf752023b9d87b5a (refs/remotes/git-svn)
 W: +empty_dir: dd
-r4 = 82caadfb05f47aa27bf91f139e49cffc8f617a68 (refs/remotes/git-svn)
+r4 = a7b6a7072f9aa3284f6597a19dad39ffb2273940 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches
 W: +empty_dir: aa/tags
 W: +empty_dir: aa/trunk
-r5 = 20c7b9bccb1e0824793e94cadebc801c25dbdd29 (refs/remotes/git-svn)
+r5 = e451950405d44b6515744a34ac31f96be051ea81 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/bb
-r6 = f237232eabc6f6bdc6a8effd319476bf43c3a48e (refs/remotes/git-svn)
+r6 = 3389122ec1485ff397dd0990bf2e1783218309c8 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/ee
-r7 = bebab0a28c1259c10b443bf83b196277ea8792e8 (refs/remotes/git-svn)
+r7 = 30bbacdc316106b547162a98c89632ffb3d0dc66 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/cc
-r8 = 0def82a0d41981cdd6619cbd1dcabd1fe632e6a1 (refs/remotes/git-svn)
+r8 = 3df7c88b9af49fc8078e09ee9fa8514e15ee84f1 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9130-git-svn-authors-file/svnrepo r8
 creating empty directory: aa
@@ -534356,8 +532457,8 @@
 	
 Committing transaction...
 Committed revision 9.
-r9 = aeb192bd75e7686ab438e54dc5834d1dd8df0cd6 (refs/remotes/origin/ff)
-author FFFFFFF FFFFFFF <> 1756283019 +0000
+r9 = f579e842697847250ba90a3e268857674b38b564 (refs/remotes/origin/ff)
+author FFFFFFF FFFFFFF <> 1790693660 +0000
 ok 10 - authors-file imported user without email
 
 # passed all 10 test(s)
@@ -534436,261 +532537,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9116-git-svn-log.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 = b3c754c829b4fb525875283debb5441f1d79cd66 (refs/remotes/origin/tags/0.1)
-	A	README
-r1 = 5775336fc240d7a71b715eb74564d761a7b7fa45 (refs/remotes/origin/tags/0.3)
-	A	README
-r1 = c572ed05213f65f60113aac8bd8a6288f80747ba (refs/remotes/origin/b)
-	A	README
-r1 = 8ef414c0d90422ee1635314cf613e81db795ea9c (refs/remotes/origin/tags/0.2)
-	A	README
-r1 = bba738dbb1086ca45da1484123b1dbf8734b35b7 (refs/remotes/origin/trunk)
-	A	README
-r1 = 845f08d199cacce559f375f1a169f16530d148ac (refs/remotes/origin/a)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk r1
-HEAD is now at bba738d test
-[master e94a01a] 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.51.0/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
-	M	README
-Committed r2
-	M	README
-r2 = 92a1aade1adf093053b2f50d0f923f6d967a758f (refs/remotes/origin/trunk)
-No changes between e94a01a5273c47b962a310275fd1bba63c90b724 and refs/remotes/origin/trunk
-Resetting to the latest refs/remotes/origin/trunk
-HEAD is now at 845f08d test
-[master ef2b107] 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.51.0/t/trash%20directory.t9116-git-svn-log/svnrepo/branches/a ...
-	A	FEEDME
-Committed r3
-	A	FEEDME
-r3 = 61917bef13b3530467740d403bc3e8c3b0ecb7ab (refs/remotes/origin/a)
-No changes between ef2b107a98d91a43d2dd66417d2fd68916dc4108 and refs/remotes/origin/a
-Resetting to the latest refs/remotes/origin/a
-HEAD is now at 92a1aad bye
-[master b5790d9] 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.51.0/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
-	M	README
-Committed r4
-	M	README
-r4 = 14d4b2147f7dd423ffffb32d816bfcd37773c857 (refs/remotes/origin/trunk)
-No changes between b5790d915d27e3afca862d97e7cf534c0c49e31c and refs/remotes/origin/trunk
-Resetting to the latest refs/remotes/origin/trunk
-HEAD is now at c572ed0 test
-[master 1edb91f] spy
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 4127cb3] 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.51.0/t/trash%20directory.t9116-git-svn-log/svnrepo/branches/b ...
-	M	README
-Committed r5
-	M	README
-r5 = f5f2406ea72411774c354293073c60536e431c94 (refs/remotes/origin/b)
-	M	README
-Committed r6
-	M	README
-r6 = d6ae215a3e2503a3e2330ca08ba7859079c185c4 (refs/remotes/origin/b)
-No changes between 4127cb3a03120b07d6410c6e7173df776294dd83 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 61917be feedme
-r2 | pbuilder1 | 2025-08-27 08:23:20 +0000 (Wed, 27 Aug 2025) | 2 lines
-r4 | pbuilder1 | 2025-08-27 08:23:23 +0000 (Wed, 27 Aug 2025) | 2 lines
-r3 | pbuilder1 | 2025-08-27 08:23:22 +0000 (Wed, 27 Aug 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 14d4b21 aye
-r3 | pbuilder1 | 2025-08-27 08:23:22 +0000 (Wed, 27 Aug 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 14d4b21 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 14d4b21 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 14d4b21 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 14d4b21 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 14d4b21 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 14d4b21 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 14d4b21 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 14d4b21 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 14d4b21 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 14d4b21 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 14d4b21 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 14d4b21 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 14d4b21 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 14d4b21 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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9137-git-svn-dcommit-clobber-series.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9137-git-svn-dcommit-clobber-series/.git/
 expecting success of 9137.1 'initialize repo': 
@@ -534707,7 +532553,7 @@
 Committing transaction...
 Committed revision 1.
 	A	file
-r1 = 81cf5ad0b3326b63151e5e9bef7533898a2d2f7c (refs/remotes/git-svn)
+r1 = b342372811bcab4f2f440d81c258be371de6a78c (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9137-git-svn-dcommit-clobber-series/svnrepo r1
 ok 1 - initialize repo
@@ -534740,11 +532586,11 @@
 	echo bye >> life &&
 	git commit -m bye-life life
 	
-[master 04951fa] hi-life
+[master 16d9f89] hi-life
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 life
-[master ee91b0c] bye-life
+[master 94557cb] bye-life
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 3 - some unrelated changes to git
@@ -534765,7 +532611,7 @@
 		test x"$(sed -n -e 58p < file)" = x5588 &&
 		test x"$(sed -n -e 61p < file)" = x6611
 	
-[master 2ebd0c8] 4 => 4444, 7 => 7777
+[master 2d62323] 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"
@@ -534773,24 +532619,24 @@
 	A	life
 Committed r3
 	M	file
-r2 = 021c66594182914f17a3f6fe97f97a86a1fafff6 (refs/remotes/git-svn)
+r2 = 0528c75450486c57c6a6ac6dcd6fc7c075f117c5 (refs/remotes/git-svn)
 	A	life
-r3 = 34c3cd09cc1bfabc603178d55e932958cf111bb2 (refs/remotes/git-svn)
-W: 04951fa68248b9a2d1dfb02453255ba26f42c45e and refs/remotes/git-svn differ, using rebase:
+r3 = a2a3c2c6816e020cdb86679c0779b4f1407b1ad6 (refs/remotes/git-svn)
+W: 16d9f8926c8ce2b2b8cffc529f8fd3f4f4bd2180 and refs/remotes/git-svn differ, using rebase:
 :100644 100644 55200b3d5d7c0e515eaccaf8465a295017e88249 15dcf092297e5fcea41cadcc3eb0a689aaa3e65e M	file
-warning: skipped previously applied commit 04951fa
+warning: skipped previously applied commit 16d9f89
 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 = d75d01c2889c9ab4bc1087efa424abb34509f086 (refs/remotes/git-svn)
+r4 = c622d21219e60cfd1bc243258f2a296df89c1ccc (refs/remotes/git-svn)
 	M	file
 Committed r5
 	M	file
-r5 = feaa5d5655288566d4055957e3293bddda297499 (refs/remotes/git-svn)
-No changes between 58098fdba0d33d51dc79b16823d50def4b6adfe5 and refs/remotes/git-svn
+r5 = 10f4b95847ba895108f5e89180aa3c506050972d (refs/remotes/git-svn)
+No changes between 418f2d3dee59822363d9dd8ee8977b3b62dc291c and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating 'tmp':
 U    tmp/file
@@ -534846,7 +532692,7 @@
 	( cd g && git rev-parse --symbolic --verify HEAD )
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9142-git-svn-shallow-clone/g/.git/
-r1 = a28fa56fb87348ef513a53c6de82fd90816612dc (refs/remotes/git-svn)
+r1 = 245f406a37227b8c67ba20b8979fad40e98c65d5 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9142-git-svn-shallow-clone/svnrepo/trunk r1
 HEAD
@@ -534856,231 +532702,109 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9134-git-svn-ignore-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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
+*** t9139-git-svn-non-utf8-commitencoding.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9139-git-svn-non-utf8-commitencoding/.git/
+expecting success of 9139.1 'ISO8859-1 setup': 
+		mkdir $H &&
+		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
+		git svn clone "$svnrepo"/$H $H
+	
 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.51.0/t/trash directory.t9134-git-svn-ignore-paths/g/.git/
-	A	qqq/test_qqq.txt
-r1 = ce44452fd9760f9633f4d566871f7477d8bf6628 (refs/remotes/git-svn)
-r2 = 60fc6094a42242f27a97c3a97b62b7059bb95607 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t9134-git-svn-ignore-paths/c/.git/
-	A	qqq/test_qqq.txt
-r1 = ce44452fd9760f9633f4d566871f7477d8bf6628 (refs/remotes/git-svn)
-r2 = 60fc6094a42242f27a97c3a97b62b7059bb95607 (refs/remotes/git-svn)
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9139-git-svn-non-utf8-commitencoding/ISO8859-1/.git/
+r1 = 663e80cf5900ab4f4cf2bbf5690025fe1f4f2e3c (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/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"
-	)
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/ISO8859-1 r1
+ok 1 - ISO8859-1 setup
 
-Sending        qqq/test_qqq.txt
-Transmitting file data .done
+expecting success of 9139.2 'eucJP setup': 
+		mkdir $H &&
+		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
+		git svn clone "$svnrepo"/$H $H
+	
 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 = 9a7c4e69aabebe31bb78d67cf8fc24c4d828c59c (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 = 9a7c4e69aabebe31bb78d67cf8fc24c4d828c59c (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 7 - update git svn-cloned repo (option ignore)
+Committed revision 2.
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9139-git-svn-non-utf8-commitencoding/eucJP/.git/
+r2 = 245212ec66e8249fa9ad87f44ac8fbb30295b6cf (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/eucJP r2
+ok 2 - eucJP setup
 
-expecting success of 9134.8 'SVN-side change inside of ignored www': 
+expecting success of 9139.3 'ISO8859-1 commit on git side': 
 	(
-		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"
+		cd $H &&
+		git config i18n.commitencoding $H &&
+		git checkout -b t refs/remotes/git-svn &&
+		echo $H >F &&
+		git add F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
+		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H"
 	)
+	
+Switched to a new branch 't'
+[t 2dfd5c9] ÄËÑÏÖ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F
+ok 3 - ISO8859-1 commit on git side
 
-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)': 
+expecting success of 9139.4 'eucJP commit on git side': 
 	(
-		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
+		cd $H &&
+		git config i18n.commitencoding $H &&
+		git checkout -b t refs/remotes/git-svn &&
+		echo $H >F &&
+		git add F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
+		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H"
 	)
+	
+Switched to a new branch 't'
+[t 360a831] ¤Ï¤ì¤Ò¤Û¤Õ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F
+ok 4 - eucJP commit on git side
 
-r4 = f8c342aa15f6c67afdc34e5be33cbf036916aa15 (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)': 
+expecting success of 9139.5 'ISO8859-1 dcommit to svn': 
 	(
-		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
+		cd $H &&
+		git config --unset i18n.commitencoding &&
+		test_must_fail git svn dcommit
 	)
+	
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/ISO8859-1 ...
+Could not decode as UTF-8:
+ÄËÑÏÖ
 
-r4 = f8c342aa15f6c67afdc34e5be33cbf036916aa15 (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"
-	)
+Ábçdèfg
+Perhaps you need to set i18n.commitencoding
 
-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
+ok 5 - ISO8859-1 dcommit to svn
 
-expecting success of 9134.12 'update git svn-cloned repo again (config ignore)': 
+expecting success of 9139.6 'eucJP dcommit to svn': 
 	(
-		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
+		cd $H &&
+		git config --unset i18n.commitencoding &&
+		test_must_fail git svn dcommit
 	)
+	
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/eucJP ...
+Could not decode as UTF-8:
+¤Ï¤ì¤Ò¤Û¤Õ
 
-	M	qqq/test_qqq.txt
-r5 = 8cfda00c5d124626bde7b21450e79b638ea8ac2a (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
-	)
+¤·¤Æ¤¤¤ë¤Î¤¬¡¢¤¤¤ë¤Î¤Ç¡£
+ßÀÉͤۤì¤×¤ê¤Ý¤ì¤Þ¤Ó¤°¤ê¤í¤Ø¡£
+Perhaps you need to set i18n.commitencoding
 
-	M	qqq/test_qqq.txt
-r5 = 8cfda00c5d124626bde7b21450e79b638ea8ac2a (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 13 - update git svn-cloned repo again (option ignore)
+ok 6 - eucJP dcommit to svn
 
-# passed all 13 test(s)
-1..13
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9138-git-svn-authors-prog.sh ***
@@ -535118,17 +532842,17 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9138-git-svn-authors-prog/x/.git/
 W: +empty_dir: aa
-r1 = 07a7e769f2be751978baf536d27ae08abb46f9fa (refs/remotes/git-svn)
+r1 = f096c42c33b0ce1347bddeca611b933056bcad92 (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = 237459fcc56f14e750747ec34dafc5ff8db62dad (refs/remotes/git-svn)
+r2 = e9b5820d862541e4603ffcc720cbf09020b92d06 (refs/remotes/git-svn)
 W: +empty_dir: cc-sub
-r3 = b7f851dd77e1ac5dc880f65772567eaa7c1dde05 (refs/remotes/git-svn)
+r3 = 0f7c9d538ce38985b5f581b1838863398e565db7 (refs/remotes/git-svn)
 W: +empty_dir: dd-sub
-r4 = 587186ccb7b600a140769e0ba9e8bb0a9ba705ed (refs/remotes/git-svn)
+r4 = 2f8b60db5f9140b585ceff3ad61db0d039bd66a5 (refs/remotes/git-svn)
 W: +empty_dir: ee-foo
-r5 = bd834bbfe90f91c334845440644dd3d8ee4eed87 (refs/remotes/git-svn)
+r5 = d746073a3f64a8809a755eb89905b990436c8256 (refs/remotes/git-svn)
 W: +empty_dir: ff
-r6 = 22463aa33ee6ead7b134852e2423c410b9da9223 (refs/remotes/git-svn)
+r6 = e7f4d2b9a47d93aecdf4e7ce7305738d8567dd39 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9138-git-svn-authors-prog/svnrepo r6
 creating empty directory: aa
@@ -535163,11 +532887,11 @@
 		grep "^author aa <aa@example\.com> " actual
 	)
 
-author ee-foo <ee-foo@example.com> 1756283018 +0000
-author dd <dd@sub.example.com> 1756283018 +0000
-author cc <cc@sub.example.com> 1756283018 +0000
-author bb <bb@example.com> 1756283018 +0000
-author aa <aa@example.com> 1756283018 +0000
+author ee-foo <ee-foo@example.com> 1790693659 +0000
+author dd <dd@sub.example.com> 1790693659 +0000
+author cc <cc@sub.example.com> 1790693659 +0000
+author bb <bb@example.com> 1790693659 +0000
+author aa <aa@example.com> 1790693659 +0000
 ok 5 - authors-prog ran correctly
 
 expecting success of 9138.6 'authors-file overrode authors-prog': 
@@ -535177,7 +532901,7 @@
 		grep "^author FFFFFFF FFFFFFF <fFf@other\.example\.com> " actual
 	)
 
-author FFFFFFF FFFFFFF <fFf@other.example.com> 1756283018 +0000
+author FFFFFFF FFFFFFF <fFf@other.example.com> 1790693659 +0000
 ok 6 - authors-file overrode authors-prog
 
 expecting success of 9138.7 'authors-prog imported user without email': 
@@ -535192,8 +532916,8 @@
 Committing transaction...
 Committed revision 7.
 W: +empty_dir: gg
-r7 = 6f8095d7c2c48a3f1085709934a28dbafd0b4df3 (refs/remotes/git-svn)
-author gg <> 1756283021 +0000
+r7 = 57169b4c66a0f355914a9f7745a9d20461358d48 (refs/remotes/git-svn)
+author gg <> 1790693661 +0000
 ok 7 - authors-prog imported user without email
 
 expecting success of 9138.8 'imported without authors-prog and authors-file': 
@@ -535210,8 +532934,8 @@
 Committing transaction...
 Committed revision 8.
 W: +empty_dir: hh
-r8 = c001bbd2d4506160a7857c0330fb7af194f788d6 (refs/remotes/git-svn)
-author hh <hh@6469e617-be47-4187-b507-a910d5894117> 1756283022 +0000
+r8 = d7dc075376cf62463dabb4d9ef455c655ee23adc (refs/remotes/git-svn)
+author hh <hh@d369d317-e284-45fa-96a3-773b83e2d368> 1790693662 +0000
 ok 8 - imported without authors-prog and authors-file
 
 expecting success of 9138.9 'authors-prog handled special characters in username': 
@@ -535227,8 +532951,8 @@
 Committing transaction...
 Committed revision 9.
 W: +empty_dir: bad
-r9 = 933942bd773241e8a9cb3b98399dd31f156d2740 (refs/remotes/git-svn)
-author xyz; touch evil <xyz; touch evil@example.com> 1756283023 +0000
+r9 = 2781b1b1e9232a97292e73f11aff8a356c005054 (refs/remotes/git-svn)
+author xyz; touch evil <xyz; touch evil@example.com> 1790693663 +0000
 ok 9 - authors-prog handled special characters in username
 
 # passed all 9 test(s)
@@ -535267,9 +532991,9 @@
 
 expecting success of 9143.5 'Fetch repo': git svn fetch
 	A	test.txt
-r1 = ae99c915e187f4f6b48116dfb0574e552b991fbf (refs/remotes/git-svn)
+r1 = 21579721c0d5287d31df4ee7981f0ef0d1b15bf9 (refs/remotes/git-svn)
 	M	test.txt
-r2 = e59a81ec4ad34ac4a52d9bac297f48e0716c0f09 (refs/remotes/git-svn)
+r2 = ff10ec95b639500628cc6862ad6e90b6a7b58116 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9143-git-svn-gc/svnrepo r2
 ok 5 - Fetch repo
@@ -535302,109 +533026,231 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9139-git-svn-non-utf8-commitencoding.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9139-git-svn-non-utf8-commitencoding/.git/
-expecting success of 9139.1 'ISO8859-1 setup': 
-		mkdir $H &&
-		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
-		git svn clone "$svnrepo"/$H $H
-	
+*** t9134-git-svn-ignore-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9139-git-svn-non-utf8-commitencoding/ISO8859-1/.git/
-r1 = 280db1bb4bf016416cdbbbd37266215a5d709d58 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/ISO8859-1 r1
-ok 1 - ISO8859-1 setup
-
-expecting success of 9139.2 'eucJP setup': 
-		mkdir $H &&
-		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
-		git svn clone "$svnrepo"/$H $H
-	
+Updating '.':
+At revision 1.
+Sending        www/test_www.txt
+Transmitting file data .done
 Committing transaction...
 Committed revision 2.
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9139-git-svn-non-utf8-commitencoding/eucJP/.git/
-r2 = 7a84ae8c9944960b83b0307cc27c17783c39241d (refs/remotes/git-svn)
+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.51.0/t/trash directory.t9134-git-svn-ignore-paths/g/.git/
+	A	qqq/test_qqq.txt
+r1 = 1c3dd7e7fe13ce4d75b27255488144626c784e32 (refs/remotes/git-svn)
+r2 = 48f85ff1ed24339601d94397493c52cf5b03a535 (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/eucJP r2
-ok 2 - eucJP setup
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9134-git-svn-ignore-paths/svnrepo r2
+ok 2 - clone an SVN repository with ignored www directory
 
-expecting success of 9139.3 'ISO8859-1 commit on git side': 
+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.51.0/t/trash directory.t9134-git-svn-ignore-paths/c/.git/
+	A	qqq/test_qqq.txt
+r1 = 1c3dd7e7fe13ce4d75b27255488144626c784e32 (refs/remotes/git-svn)
+r2 = 48f85ff1ed24339601d94397493c52cf5b03a535 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/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 $H &&
-		git config i18n.commitencoding $H &&
-		git checkout -b t refs/remotes/git-svn &&
-		echo $H >F &&
-		git add F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
-		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H"
+	    cd g &&
+	    git config --get svn-remote.svn.ignore-paths | grep www
 	)
-	
-Switched to a new branch 't'
-[t 98041ea] ÄËÑÏÖ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F
-ok 3 - ISO8859-1 commit on git side
 
-expecting success of 9139.4 'eucJP commit on git side': 
+^www
+ok 4 - verify ignore-paths config saved by clone
+
+expecting success of 9134.5 'SVN-side change outside of www': 
 	(
-		cd $H &&
-		git config i18n.commitencoding $H &&
-		git checkout -b t refs/remotes/git-svn &&
-		echo $H >F &&
-		git add F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
-		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H"
+		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"
 	)
-	
-Switched to a new branch 't'
-[t dc09967] ¤Ï¤ì¤Ò¤Û¤Õ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F
-ok 4 - eucJP commit on git side
 
-expecting success of 9139.5 'ISO8859-1 dcommit to svn': 
+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 $H &&
-		git config --unset i18n.commitencoding &&
-		test_must_fail git svn dcommit
+		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
 	)
-	
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/ISO8859-1 ...
-Could not decode as UTF-8:
-ÄËÑÏÖ
 
-Ábçdèfg
-Perhaps you need to set i18n.commitencoding
+	M	qqq/test_qqq.txt
+r3 = 908da45ed596d4db447d918e0d775afd24e5991f (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 6 - update git svn-cloned repo (config ignore)
 
-ok 5 - ISO8859-1 dcommit to svn
+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
+	)
 
-expecting success of 9139.6 'eucJP dcommit to svn': 
+	M	qqq/test_qqq.txt
+r3 = 908da45ed596d4db447d918e0d775afd24e5991f (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 $H &&
-		git config --unset i18n.commitencoding &&
-		test_must_fail git svn dcommit
+		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"
 	)
-	
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/eucJP ...
-Could not decode as UTF-8:
-¤Ï¤ì¤Ò¤Û¤Õ
 
-¤·¤Æ¤¤¤ë¤Î¤¬¡¢¤¤¤ë¤Î¤Ç¡£
-ßÀÉͤۤì¤×¤ê¤Ý¤ì¤Þ¤Ó¤°¤ê¤í¤Ø¡£
-Perhaps you need to set i18n.commitencoding
+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
 
-ok 6 - eucJP dcommit to svn
+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
+	)
 
-# passed all 6 test(s)
-1..6
+r4 = 3fcc90a5c6cc6a67a913bf5d7ee3795ee60a199e (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 = 3fcc90a5c6cc6a67a913bf5d7ee3795ee60a199e (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 = 58201cf7584785e4d37c514c21fe498f880781f8 (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 = 58201cf7584785e4d37c514c21fe498f880781f8 (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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9145-git-svn-master-branch.sh ***
@@ -535437,11 +533283,11 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9145-git-svn-master-branch/g/.git/
 	A	a
-r1 = 07c1d2b3267ef36a8d0cf119f14bf65d32c87c62 (refs/remotes/origin/trunk)
+r1 = bc8edd7a0383757581a0effd1f7d843f9cff531f (refs/remotes/origin/trunk)
 	A	a
-r2 = 5f73731ec3dadd6e4ba96d3ba0510be36d4cc1a2 (refs/remotes/origin/a)
+r2 = 5a8e59f22b3c1668f6ad57703e9cab1f5031673f (refs/remotes/origin/a)
 	A	a
-r3 = d8b6989035d99aa0286e94a6b09155ce6f91d871 (refs/remotes/origin/b)
+r3 = 1ae4f065935b141e2711030fa2e6ce49dfe86873 (refs/remotes/origin/b)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9145-git-svn-master-branch/svnrepo/trunk r1
 ok 2 - git svn clone --stdlayout sets up trunk as main
@@ -535527,8 +533373,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:04 +0000
-Message-ID: <20250827082304.870062-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:50 +0000
+Message-ID: <20260929145350.2519692-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -535567,8 +533413,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:04 +0000
-Message-ID: <20250827082304.870487-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:50 +0000
+Message-ID: <20260929145350.2520036-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -535609,8 +533455,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:04 +0000
-Message-ID: <20250827082304.870857-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:50 +0000
+Message-ID: <20260929145350.2520292-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -535676,7 +533522,7 @@
  Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
  create mode 100644 cc-trailer.t
-/tmp/aUQ_c3uuYe/0001-Test-Cc-trailers.patch
+/tmp/PTlkhnFvbs/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'
@@ -535696,8 +533542,8 @@
 	five@example.com,
 	six@example.com
 Subject: [PATCH] Test Cc: trailers.
-Date: Wed, 27 Aug 2025 08:23:05 +0000
-Message-ID: <20250827082305.871364-1-author@example.com>
+Date: Tue, 29 Sep 2026 14:53:50 +0000
+Message-ID: <20260929145350.2520594-1-author@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -535725,7 +533571,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" &&
 	test_cmp expected-cc commandline1
 
-/tmp/KhDzipGDe4/0001-Second.patch
+/tmp/eUbGfvH1JG/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'
@@ -535745,8 +533591,8 @@
 	five@example.com (open list:FOR THING (FOO/bar)),
 	six@example.com (open list)
 Subject: [PATCH] Second.
-Date: Wed, 27 Aug 2025 08:23:05 +0000
-Message-ID: <20250827082305.871810-1-author@example.com>
+Date: Tue, 29 Sep 2026 14:53:51 +0000
+Message-ID: <20260929145351.2520975-1-author@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -535761,7 +533607,7 @@
 		--smtp-server="$(pwd)/fake.sendmail"
 
 error: invalid SMTP port 'bogus-symbolic-name'
-/tmp/5JibIj685E/0001-Second.patch
+/tmp/bkLUFjcAhc/0001-Second.patch
 not ok 20 - invalid smtp server port value # TODO known breakage
 
 expecting success of 9001.21 'setup expect': 
@@ -535818,8 +533664,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: Wed, 27 Aug 2025 08:23:05 +0000
-Message-ID: <20250827082305.872598-1-author@example.com>
+Date: Tue, 29 Sep 2026 14:53:51 +0000
+Message-ID: <20260929145351.2521765-1-author@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -535846,8 +533692,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: Wed, 27 Aug 2025 08:23:06 +0000
-Message-ID: <20250827082306.873228-1-author@example.com>
+Date: Tue, 29 Sep 2026 14:53:51 +0000
+Message-ID: <20260929145351.2522484-1-author@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -535874,8 +533720,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: Wed, 27 Aug 2025 08:23:06 +0000
-Message-ID: <20250827082306.873819-1-odd_?=mail@example.com>
+Date: Tue, 29 Sep 2026 14:53:51 +0000
+Message-ID: <20260929145352.2523121-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -535903,8 +533749,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: Wed, 27 Aug 2025 08:23:06 +0000
-Message-ID: <20250827082306.874321-1-odd_?=mail@example.com>
+Date: Tue, 29 Sep 2026 14:53:52 +0000
+Message-ID: <20260929145352.2523788-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -535932,8 +533778,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: Wed, 27 Aug 2025 08:23:07 +0000
-Message-ID: <20250827082307.874822-1-author@example.com>
+Date: Tue, 29 Sep 2026 14:53:52 +0000
+Message-ID: <20260929145352.2524444-1-author@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -535985,8 +533831,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:07 +0000
-Message-ID: <20250827082307.875403-1-author@example.com>
+Date: Tue, 29 Sep 2026 14:53:53 +0000
+Message-ID: <20260929145353.2525089-1-author@example.com>
 X-Mailer: git-send-email 2.51.0
 In-Reply-To: <my-message-id@example.com>
 References: <my-message-id@example.com>
@@ -536009,38 +533855,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@codethink04-arm64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-ok 29 # skip implicit ident is allowed (missing AUTOIDENT of PERL,AUTOIDENT)
-
-expecting success of 9001.30 'broken implicit ident aborts send-email': 
+second user <pbuilder2@codethink03-arm64.debian.net> 1112912293 -0700
+prerequisite AUTOIDENT ok
+expecting success of 9001.29 '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 30 - 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.51.0/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@codethink03-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: Tue, 29 Sep 2026 14:53:53 +0000
+Message-ID: <20260929145353.2525446-1-pbuilder2@codethink03-arm64.debian.net>
+X-Mailer: git-send-email 2.51.0
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+Result: OK
+ok 29 - implicit ident is allowed
+
+ok 30 # skip broken implicit ident aborts send-email (missing !AUTOIDENT of PERL,!AUTOIDENT)
 
 expecting success of 9001.31 'setup cmd scripts': 
 	write_script tocmd-sed <<-\EOF &&
@@ -536082,8 +533934,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:07 +0000
-Message-ID: <20250827082308.875972-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:53 +0000
+Message-ID: <20260929145353.2525823-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -536121,8 +533973,8 @@
 	C O Mitter <committer@example.com>,
 	cccmd@example.com
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:08 +0000
-Message-ID: <20250827082308.876260-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:54 +0000
+Message-ID: <20260929145354.2526276-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -536158,8 +534010,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:08 +0000
-Message-ID: <20250827082308.876489-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:54 +0000
+Message-ID: <20260929145354.2526564-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 X-Debbugs-CC: dummy@example.com
@@ -536197,8 +534049,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:08 +0000
-Message-ID: <20250827082308.876846-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:54 +0000
+Message-ID: <20260929145354.2527070-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -536237,8 +534089,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:08 +0000
-Message-ID: <20250827082308.877150-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:55 +0000
+Message-ID: <20260929145355.2527593-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 X-Debbugs-CC: someone@example.com
@@ -536325,8 +534177,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:09 +0000
-Message-ID: <20250827082309.877711-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:56 +0000
+Message-ID: <20260929145356.2528965-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -536359,8 +534211,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:09 +0000
-Message-ID: <20250827082309.877928-1-author@example.com>
+Date: Tue, 29 Sep 2026 14:53:56 +0000
+Message-ID: <20260929145356.2529461-1-author@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -536392,8 +534244,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:08 +0000
-Message-ID: <20250827082309.878230-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:55 +0000
+Message-ID: <20260929145356.2529855-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -536412,11 +534264,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:09 +0000
-Message-ID: <20250827082309.878230-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:56 +0000
+Message-ID: <20260929145356.2529855-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082309.878230-1-nobody@example.com>
-References: <20250827082309.878230-1-nobody@example.com>
+In-Reply-To: <20260929145356.2529855-1-nobody@example.com>
+References: <20260929145356.2529855-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -536447,8 +534299,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:10 +0000
-Message-ID: <20250827082310.878539-1-author@example.com>
+Date: Tue, 29 Sep 2026 14:53:56 +0000
+Message-ID: <20260929145356.2530131-1-author@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -536482,8 +534334,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:10 +0000
-Message-ID: <20250827082310.878774-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:56 +0000
+Message-ID: <20260929145356.2530338-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -536519,8 +534371,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:10 +0000
-Message-ID: <20250827082310.878958-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:56 +0000
+Message-ID: <20260929145356.2530526-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -536553,8 +534405,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:09 +0000
-Message-ID: <20250827082310.879110-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:56 +0000
+Message-ID: <20260929145357.2530759-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -536573,11 +534425,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:10 +0000
-Message-ID: <20250827082310.879110-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:57 +0000
+Message-ID: <20260929145357.2530759-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082310.879110-1-nobody@example.com>
-References: <20250827082310.879110-1-nobody@example.com>
+In-Reply-To: <20260929145357.2530759-1-nobody@example.com>
+References: <20260929145357.2530759-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -536608,8 +534460,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:09 +0000
-Message-ID: <20250827082310.879315-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:56 +0000
+Message-ID: <20260929145357.2530922-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -536628,11 +534480,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:10 +0000
-Message-ID: <20250827082310.879315-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:57 +0000
+Message-ID: <20260929145357.2530922-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082310.879315-1-nobody@example.com>
-References: <20250827082310.879315-1-nobody@example.com>
+In-Reply-To: <20260929145357.2530922-1-nobody@example.com>
+References: <20260929145357.2530922-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -536663,8 +534515,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:10 +0000
-Message-ID: <20250827082311.879600-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:56 +0000
+Message-ID: <20260929145357.2531178-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
@@ -536683,11 +534535,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:11 +0000
-Message-ID: <20250827082311.879600-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:57 +0000
+Message-ID: <20260929145357.2531178-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082311.879600-1-nobody@example.com>
-References: <20250827082311.879600-1-nobody@example.com>
+In-Reply-To: <20260929145357.2531178-1-nobody@example.com>
+References: <20260929145357.2531178-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
 
@@ -536794,8 +534646,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:13 +0000
-Message-ID: <20250827082312.880787-2-author@example.com>
+Date: Tue, 29 Sep 2026 14:53:59 +0000
+Message-ID: <20260929145358.2532512-2-author@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 X-test-header: v1.0
@@ -536832,8 +534684,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:13 +0000
-Message-ID: <20250827082312.881142-2-author@example.com>
+Date: Tue, 29 Sep 2026 14:53:59 +0000
+Message-ID: <20260929145358.2532834-2-author@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -536848,8 +534700,8 @@
 Cc: A <author@example.com>,
 	C O Mitter <committer@example.com>
 Subject: [PATCH] Second.
-Date: Wed, 27 Aug 2025 08:23:14 +0000
-Message-ID: <60cacbfe300cd164f7b9f1654d3409ba2f8d8d0e.1756282983.git.committer@example.com>
+Date: Tue, 29 Sep 2026 14:54:00 +0000
+Message-ID: <60cacbfe300cd164f7b9f1654d3409ba2f8d8d0e.1790693629.git.committer@example.com>
 X-Mailer: git-send-email 2.51.0
 In-Reply-To: <format>
 References: <format>
@@ -536883,8 +534735,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:12 +0000
-Message-ID: <20250827082312.881544-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:58 +0000
+Message-ID: <20260929145358.2533251-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
@@ -536917,8 +534769,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:12 +0000
-Message-ID: <20250827082312.881804-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:58 +0000
+Message-ID: <20260929145358.2533518-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -536951,8 +534803,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:13 +0000
-Message-ID: <20250827082313.882065-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:59 +0000
+Message-ID: <20260929145359.2533710-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -536985,8 +534837,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:13 +0000
-Message-ID: <20250827082313.882353-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:59 +0000
+Message-ID: <20260929145359.2533962-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
@@ -537020,8 +534872,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:13 +0000
-Message-ID: <20250827082313.882574-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:59 +0000
+Message-ID: <20260929145359.2534195-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -537053,8 +534905,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:13 +0000
-Message-ID: <20250827082313.882777-1-author@example.com>
+Date: Tue, 29 Sep 2026 14:53:59 +0000
+Message-ID: <20260929145359.2534447-1-author@example.com>
 X-Mailer: git-send-email 2.51.0
 In-Reply-To: <To Example <to@example.com>
 References: <To Example <to@example.com>
@@ -537101,8 +534953,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:12 +0000
-Message-ID: <20250827082314.883030-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:57 +0000
+Message-ID: <20260929145359.2534667-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 In-Reply-To: <unique-message-id@example.com>
 References: <unique-message-id@example.com>
@@ -537123,12 +534975,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:13 +0000
-Message-ID: <20250827082314.883030-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:58 +0000
+Message-ID: <20260929145359.2534667-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082314.883030-1-nobody@example.com>
+In-Reply-To: <20260929145359.2534667-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20250827082314.883030-1-nobody@example.com>
+ <20260929145359.2534667-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -537146,12 +534998,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:14 +0000
-Message-ID: <20250827082314.883030-3-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:59 +0000
+Message-ID: <20260929145359.2534667-3-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082314.883030-1-nobody@example.com>
+In-Reply-To: <20260929145359.2534667-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20250827082314.883030-1-nobody@example.com>
+ <20260929145359.2534667-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -537194,8 +535046,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:12 +0000
-Message-ID: <20250827082314.883403-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:57 +0000
+Message-ID: <20260929145359.2534956-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 In-Reply-To: <unique-message-id@example.com>
 References: <unique-message-id@example.com>
@@ -537216,12 +535068,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:13 +0000
-Message-ID: <20250827082314.883403-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:58 +0000
+Message-ID: <20260929145359.2534956-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082314.883403-1-nobody@example.com>
+In-Reply-To: <20260929145359.2534956-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20250827082314.883403-1-nobody@example.com>
+ <20260929145359.2534956-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -537239,13 +535091,13 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:14 +0000
-Message-ID: <20250827082314.883403-3-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:53:59 +0000
+Message-ID: <20260929145359.2534956-3-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082314.883403-2-nobody@example.com>
+In-Reply-To: <20260929145359.2534956-2-nobody@example.com>
 References: <unique-message-id@example.com>
- <20250827082314.883403-1-nobody@example.com>
- <20250827082314.883403-2-nobody@example.com>
+ <20260929145359.2534956-1-nobody@example.com>
+ <20260929145359.2534956-2-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -537299,8 +535151,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Wed, 27 Aug 2025 08:23:14 +0000
-Message-ID: <20250827082314.884054-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:00 +0000
+Message-ID: <20260929145400.2535546-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -537319,11 +535171,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:15 +0000
-Message-ID: <20250827082314.884054-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:01 +0000
+Message-ID: <20260929145400.2535546-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082314.884054-1-nobody@example.com>
-References: <20250827082314.884054-1-nobody@example.com>
+In-Reply-To: <20260929145400.2535546-1-nobody@example.com>
+References: <20260929145400.2535546-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -537725,8 +535577,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/2] Initial.
-Date: Wed, 27 Aug 2025 08:23:17 +0000
-Message-ID: <20250827082318.889245-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:01 +0000
+Message-ID: <20260929145402.2539888-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -537748,8 +535600,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/2] Initial.
-Date: Wed, 27 Aug 2025 08:23:17 +0000
-Message-ID: <20250827082318.889245-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:01 +0000
+Message-ID: <20260929145402.2539888-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -537761,11 +535613,11 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 2/2] Second.
-Date: Wed, 27 Aug 2025 08:23:18 +0000
-Message-ID: <20250827082318.889245-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:02 +0000
+Message-ID: <20260929145402.2539888-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082318.889245-1-nobody@example.com>
-References: <20250827082318.889245-1-nobody@example.com>
+In-Reply-To: <20260929145402.2539888-1-nobody@example.com>
+References: <20260929145402.2539888-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -537776,11 +535628,11 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 2/2] Second.
-Date: Wed, 27 Aug 2025 08:23:18 +0000
-Message-ID: <20250827082318.889245-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:02 +0000
+Message-ID: <20260929145402.2539888-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082318.889245-1-nobody@example.com>
-References: <20250827082318.889245-1-nobody@example.com>
+In-Reply-To: <20260929145402.2539888-1-nobody@example.com>
+References: <20260929145402.2539888-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -537811,8 +535663,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:18 +0000
-Message-ID: <20250827082318.889607-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:03 +0000
+Message-ID: <20260929145403.2540274-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -537845,8 +535697,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:19 +0000
-Message-ID: <20250827082319.889848-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:03 +0000
+Message-ID: <20260929145403.2540529-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -537877,8 +535729,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: Wed, 27 Aug 2025 08:23:19 +0000
-Message-ID: <20250827082319.890209-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:03 +0000
+Message-ID: <20260929145403.2540812-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -537908,8 +535760,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Wed, 27 Aug 2025 08:23:19 +0000
-Message-ID: <20250827082319.890536-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:03 +0000
+Message-ID: <20260929145403.2541073-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -537929,11 +535781,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:20 +0000
-Message-ID: <20250827082319.890536-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:04 +0000
+Message-ID: <20260929145403.2541073-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082319.890536-1-nobody@example.com>
-References: <20250827082319.890536-1-nobody@example.com>
+In-Reply-To: <20260929145403.2541073-1-nobody@example.com>
+References: <20260929145403.2541073-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -537971,8 +535823,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Wed, 27 Aug 2025 08:23:19 +0000
-Message-ID: <20250827082319.890940-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:03 +0000
+Message-ID: <20260929145403.2541445-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -537992,11 +535844,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:20 +0000
-Message-ID: <20250827082319.890940-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:04 +0000
+Message-ID: <20260929145403.2541445-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082319.890940-1-nobody@example.com>
-References: <20250827082319.890940-1-nobody@example.com>
+In-Reply-To: <20260929145403.2541445-1-nobody@example.com>
+References: <20260929145403.2541445-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -538023,8 +535875,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: =?UTF-8?q?utf8-s=C3=BCbj=C3=ABct?=
-Date: Wed, 27 Aug 2025 08:23:20 +0000
-Message-ID: <20250827082320.891337-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:04 +0000
+Message-ID: <20260929145404.2541730-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -538044,11 +535896,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:21 +0000
-Message-ID: <20250827082320.891337-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:05 +0000
+Message-ID: <20260929145404.2541730-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082320.891337-1-nobody@example.com>
-References: <20250827082320.891337-1-nobody@example.com>
+In-Reply-To: <20260929145404.2541730-1-nobody@example.com>
+References: <20260929145404.2541730-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -538086,8 +535938,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: Wed, 27 Aug 2025 08:23:20 +0000
-Message-ID: <20250827082320.891855-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:04 +0000
+Message-ID: <20260929145404.2542145-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -538128,8 +535980,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: Wed, 27 Aug 2025 08:23:20 +0000
-Message-ID: <20250827082320.892367-1-odd_?=mail@example.com>
+Date: Tue, 29 Sep 2026 14:54:04 +0000
+Message-ID: <20260929145404.2542522-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -538222,8 +536074,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Wed, 27 Aug 2025 08:23:21 +0000
-Message-ID: <20250827082321.893200-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:04 +0000
+Message-ID: <20260929145404.2543388-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -538243,11 +536095,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:22 +0000
-Message-ID: <20250827082321.893200-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:05 +0000
+Message-ID: <20260929145404.2543388-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082321.893200-1-nobody@example.com>
-References: <20250827082321.893200-1-nobody@example.com>
+In-Reply-To: <20260929145404.2543388-1-nobody@example.com>
+References: <20260929145404.2543388-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -538278,8 +536130,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Wed, 27 Aug 2025 08:23:21 +0000
-Message-ID: <20250827082321.893573-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:05 +0000
+Message-ID: <20260929145405.2543793-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -538299,11 +536151,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:22 +0000
-Message-ID: <20250827082321.893573-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:06 +0000
+Message-ID: <20260929145405.2543793-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082321.893573-1-nobody@example.com>
-References: <20250827082321.893573-1-nobody@example.com>
+In-Reply-To: <20260929145405.2543793-1-nobody@example.com>
+References: <20260929145405.2543793-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -538335,8 +536187,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Wed, 27 Aug 2025 08:23:21 +0000
-Message-ID: <20250827082322.893849-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:05 +0000
+Message-ID: <20260929145405.2544619-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-2
@@ -538356,11 +536208,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:22 +0000
-Message-ID: <20250827082322.893849-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:06 +0000
+Message-ID: <20260929145405.2544619-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082322.893849-1-nobody@example.com>
-References: <20250827082322.893849-1-nobody@example.com>
+In-Reply-To: <20260929145405.2544619-1-nobody@example.com>
+References: <20260929145405.2544619-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -538388,8 +536240,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: =?iso-8859-2?q?utf8-s=C3=BCbj=C3=ABct?=
-Date: Wed, 27 Aug 2025 08:23:22 +0000
-Message-ID: <20250827082322.894226-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:05 +0000
+Message-ID: <20260929145405.2545087-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-2
@@ -538409,11 +536261,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed, 27 Aug 2025 08:23:23 +0000
-Message-ID: <20250827082322.894226-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:06 +0000
+Message-ID: <20260929145405.2545087-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082322.894226-1-nobody@example.com>
-References: <20250827082322.894226-1-nobody@example.com>
+In-Reply-To: <20260929145405.2545087-1-nobody@example.com>
+References: <20260929145405.2545087-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -538486,7 +536338,7 @@
 		$patches $patches >stdout &&
 	grep "In-Reply-To: " stdout
 
-In-Reply-To: <20250827082323.895574-1-nobody@example.com>
+In-Reply-To: <20260929145406.2546473-1-nobody@example.com>
 ok 111 - threading but no chain-reply-to
 
 expecting success of 9001.112 'override in-reply-to if no threading': 
@@ -539574,6 +537426,7 @@
 	>actual-list &&
 	test_cmp expected-list actual-list
 
+./test-lib.sh: line 1010: warning: command substitution: ignored null byte in input
 ok 194 - leading and trailing whitespaces are removed
 
 expecting success of 9001.195 'mailmap support with --to': 
@@ -539722,7 +537575,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/ysUSFkJ9nX/0001-add-main.patch
+/tmp/7SLCBlxeFj/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
@@ -539731,8 +537584,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed, 27 Aug 2025 08:23:42 +0000
-Message-ID: <20250827082342.921633-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:23 +0000
+Message-ID: <20260929145423.2574086-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -539749,7 +537602,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/1CNvWWDZyA/0001-add-main.patch
+/tmp/c4CcsM18ao/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
@@ -539758,8 +537611,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed, 27 Aug 2025 08:23:42 +0000
-Message-ID: <20250827082342.921914-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:23 +0000
+Message-ID: <20260929145423.2574408-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -539776,7 +537629,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/yaIvxqq9WU/0001-add-main.patch
+/tmp/_WUQofgDRI/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
@@ -539785,8 +537638,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed, 27 Aug 2025 08:23:43 +0000
-Message-ID: <20250827082343.922247-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:23 +0000
+Message-ID: <20260929145423.2574803-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -539835,7 +537688,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch with in-reply-to
-Date: Wed, 27 Aug 2025 08:23:42 +0000
+Date: Tue, 29 Sep 2026 14:54:22 +0000
 Message-ID: <patch.with.in.reply.to@example.com>
 X-Mailer: git-send-email 2.51.0
 In-Reply-To: <replied.to@example.com>
@@ -539852,7 +537705,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch without in-reply-to
-Date: Wed, 27 Aug 2025 08:23:43 +0000
+Date: Tue, 29 Sep 2026 14:54:23 +0000
 Message-ID: <patch.without.in.reply.to@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
@@ -539886,7 +537739,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch with in-reply-to
-Date: Wed, 27 Aug 2025 08:23:42 +0000
+Date: Tue, 29 Sep 2026 14:54:22 +0000
 Message-ID: <patch.with.in.reply.to@example.com>
 X-Mailer: git-send-email 2.51.0
 In-Reply-To: <cmdline.reply@example.com>
@@ -539903,7 +537756,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch without in-reply-to
-Date: Wed, 27 Aug 2025 08:23:43 +0000
+Date: Tue, 29 Sep 2026 14:54:23 +0000
 Message-ID: <patch.without.in.reply.to@example.com>
 X-Mailer: git-send-email 2.51.0
 In-Reply-To: <cmdline.reply@example.com>
@@ -539965,8 +537818,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed, 27 Aug 2025 08:23:44 +0000
-Message-ID: <20250827082343.923095-2-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:25 +0000
+Message-ID: <20260929145424.2575816-2-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -539996,10 +537849,10 @@
 		--validate -3 --cover-letter --force &&
 	test_cmp expect my-hooks.log
 
-/tmp/AzveEqKXGx/0000-cover-letter.patch
-/tmp/AzveEqKXGx/0001-Initial.patch
-/tmp/AzveEqKXGx/0002-Second.patch
-/tmp/AzveEqKXGx/0003-add-main.patch
+/tmp/zN8Qj59ylP/0000-cover-letter.patch
+/tmp/zN8Qj59ylP/0001-Initial.patch
+/tmp/zN8Qj59ylP/0002-Second.patch
+/tmp/zN8Qj59ylP/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.51.0/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com committer@example.com other@ex.com
@@ -540008,8 +537861,8 @@
 Cc: Somebody <somebody@ex.com>,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 0/3] *** SUBJECT HERE ***
-Date: Wed, 27 Aug 2025 08:23:45 +0000
-Message-ID: <20250827082344.923596-5-from@example.com>
+Date: Tue, 29 Sep 2026 14:54:25 +0000
+Message-ID: <20260929145424.2576574-5-from@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -540023,11 +537876,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A <author@example.com>
 Subject: [PATCH 1/3] Initial.
-Date: Wed, 27 Aug 2025 08:23:46 +0000
-Message-ID: <20250827082344.923596-6-from@example.com>
+Date: Tue, 29 Sep 2026 14:54:26 +0000
+Message-ID: <20260929145424.2576574-6-from@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082344.923596-5-from@example.com>
-References: <20250827082344.923596-5-from@example.com>
+In-Reply-To: <20260929145424.2576574-5-from@example.com>
+References: <20260929145424.2576574-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -540040,11 +537893,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A <author@example.com>
 Subject: [PATCH 2/3] Second.
-Date: Wed, 27 Aug 2025 08:23:47 +0000
-Message-ID: <20250827082344.923596-7-from@example.com>
+Date: Tue, 29 Sep 2026 14:54:27 +0000
+Message-ID: <20260929145424.2576574-7-from@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082344.923596-5-from@example.com>
-References: <20250827082344.923596-5-from@example.com>
+In-Reply-To: <20260929145424.2576574-5-from@example.com>
+References: <20260929145424.2576574-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -540057,11 +537910,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH 3/3] add main
-Date: Wed, 27 Aug 2025 08:23:48 +0000
-Message-ID: <20250827082344.923596-8-from@example.com>
+Date: Tue, 29 Sep 2026 14:54:28 +0000
+Message-ID: <20260929145424.2576574-8-from@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082344.923596-5-from@example.com>
-References: <20250827082344.923596-5-from@example.com>
+In-Reply-To: <20260929145424.2576574-5-from@example.com>
+References: <20260929145424.2576574-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -540082,8 +537935,8 @@
 To: nobody@example.com
 Cc: A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed, 27 Aug 2025 08:23:44 +0000
-Message-ID: <20250827082344.924177-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:24 +0000
+Message-ID: <20260929145424.2577073-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -540105,8 +537958,8 @@
 To: nobody@example.com
 Cc: A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed, 27 Aug 2025 08:23:44 +0000
-Message-ID: <20250827082344.924177-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:24 +0000
+Message-ID: <20260929145424.2577073-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -540142,7 +537995,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" \
 		HEAD^
 
-/tmp/LphLXBuQaR/0001-add-main.patch
+/tmp/XtGG6Xzcar/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.51.0/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com author@example.com other@ex.com
@@ -540151,8 +538004,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed, 27 Aug 2025 08:23:45 +0000
-Message-ID: <20250827082345.924988-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:25 +0000
+Message-ID: <20260929145425.2577884-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -540169,7 +538022,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" \
 		HEAD^
 
-/tmp/i5_hn3g6v5/0001-add-main.patch
+/tmp/1DDSzUMGyG/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.51.0/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com author@example.com other@ex.com
@@ -540178,8 +538031,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed, 27 Aug 2025 08:23:45 +0000
-Message-ID: <20250827082345.925310-1-nobody@example.com>
+Date: Tue, 29 Sep 2026 14:54:25 +0000
+Message-ID: <20260929145425.2578231-1-nobody@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -540201,7 +538054,7 @@
 		HEAD^ &&
 	grep "From: edited-from@example.com" msgtxt1
 
-/tmp/V_aKODPI04/0001-add-main.patch
+/tmp/tnMddtobpQ/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:
@@ -540211,8 +538064,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed, 27 Aug 2025 08:23:45 +0000
-Message-ID: <20250827082345.925709-1-edited-from@example.com>
+Date: Tue, 29 Sep 2026 14:54:25 +0000
+Message-ID: <20260929145425.2578615-1-edited-from@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -540246,7 +538099,7 @@
 	grep -A1 "^To:" msgtxt2 >msgtxt2.to &&
 	test_cmp expect msgtxt2.to
 
-/tmp/xVVr8X9UEQ/0001-add-main.patch
+/tmp/JoVoZ6zF6_/0001-add-main.patch
 OK. Log says:
 Sendmail: /build/reproducible-path/git-2.51.0/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com edited-to@example.com somebody@ex.com
 From: Example <from@example.com>
@@ -540254,8 +538107,8 @@
 	edited-to@example.com
 Cc: Somebody <somebody@ex.com>
 Subject: 
-Date: Wed, 27 Aug 2025 08:23:46 +0000
-Message-ID: <20250827082346.926056-1-from@example.com>
+Date: Tue, 29 Sep 2026 14:54:25 +0000
+Message-ID: <20260929145425.2578970-1-from@example.com>
 X-Mailer: git-send-email 2.51.0
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -540270,11 +538123,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed, 27 Aug 2025 08:23:47 +0000
-Message-ID: <20250827082346.926056-2-from@example.com>
+Date: Tue, 29 Sep 2026 14:54:26 +0000
+Message-ID: <20260929145425.2578970-2-from@example.com>
 X-Mailer: git-send-email 2.51.0
-In-Reply-To: <20250827082346.926056-1-from@example.com>
-References: <20250827082346.926056-1-from@example.com>
+In-Reply-To: <20260929145425.2578970-1-from@example.com>
+References: <20260929145425.2578970-1-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -540286,61 +538139,6 @@
 1..216
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9144-git-svn-old-rev_map.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 = d49cc9f9372391e98384f3b92b5e85ecea3b721d (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/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 = 5f78aadad9d653ffa5aff9cc3b6284b17f4f377b (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-[master 90d11ba] -
- 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.51.0/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo ...
-	M	b/a
-Committed r3
-	M	b/a
-r3 = 14e3583c4a0a3be29bb6f71721cf66d02aca0f55 (refs/remotes/git-svn)
-No changes between 90d11ba8bc0dcf2b1cf797b82e1a1dbb3cea36ac 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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9100-git-svn-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9100-git-svn-basic/.git/
 expecting success of 9100.1 'git svn --version works anywhere': 
@@ -540616,7 +538414,7 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = bcd055d18e99aba1e7bd7fbcd8cf4ee8de8dc3af (refs/remotes/git-svn)
+r1 = a59762a53a165d78f6029664f1f9318241932a80 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9100-git-svn-basic/svnrepo r1
 ok 4 - import an SVN revision into git
@@ -540648,7 +538446,7 @@
 	svn_cmd up "$SVN_TREE" &&
 	test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a
 Switched to a new branch 'mybranch'
-[mybranch 2e007dd] try a deep --rmdir with a commit
+[mybranch c1ee908] 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%)
@@ -540665,7 +538463,7 @@
 	A	dir/file
 	A	file
 W: -empty_dir: dir/a
-r2 = b15ae01d2827cf302eea07b1134cfb668610ee07 (refs/remotes/git-svn)
+r2 = 9289413f6b6cd50f061f231411887bce33fedf81 (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
@@ -540684,7 +538482,7 @@
 	test_must_fail git svn set-tree --find-copies-harder --rmdir \
 		remotes/git-svn..mybranch
 
-[mybranch d676241] detect node change from file to directory #1
+[mybranch 98e00de] 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%)
@@ -540704,7 +538502,7 @@
 		remotes/git-svn..mybranch2
 
 Switched to a new branch 'mybranch2'
-[mybranch2 8a6a45f] detect node change from directory to file #1
+[mybranch2 9639644] 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%)
@@ -540728,7 +538526,7 @@
 	test -e "$SVN_TREE"/bar/zzz/yyy
 
 Switched to a new branch 'mybranch3'
-[mybranch3 2aaa9a0] detect node change from file to directory #2
+[mybranch3 7bf1a69] 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
@@ -540737,7 +538535,7 @@
 	A	bar/zzz/yyy
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 45fe69b61ff7453875fb469e4cebd2746dfb940a (refs/remotes/git-svn)
+r3 = 000d47906354dd2527c16d7735462338052ebb01 (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
@@ -540759,13 +538557,13 @@
 		remotes/git-svn..mybranch4
 
 Switched to a new branch 'mybranch4'
-[mybranch4 f6fab6d] detect node change from directory to file #2
+[mybranch4 a410535] 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 '24d8910e-40e8-4525-b861-d5ef616bd358', transaction '3-5', path '/dir' at /build/reproducible-path/git-2.51.0/perl/build/lib/Git/SVN.pm line 2079.
+Item already exists in filesystem: File already exists: filesystem 'ad29578b-76c0-439a-848c-d10d71dea6c2', transaction '3-5', path '/dir' at /build/reproducible-path/git-2.51.0/perl/build/lib/Git/SVN.pm line 2079.
 
 ok 10 - detect node change from directory to file #2
 
@@ -540780,13 +538578,13 @@
 	svn_cmd up "$SVN_TREE" &&
 	test ! -x "$SVN_TREE"/exec.sh
 Switched to a new branch 'mybranch5'
-[mybranch5 ed0520a] remove executable bit from a file
+[mybranch5 7dedcfb] 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 = 53b076ee267d3c8dfbc5c08baf360fbfe2d60921 (refs/remotes/git-svn)
+r4 = 678ea06f4363689991d154b85ee456ca79685d95 (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
@@ -540801,13 +538599,13 @@
 		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -x "$SVN_TREE"/exec.sh
-[mybranch5 4752a7d] add executable bit back file
+[mybranch5 d3b2402] 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 = dec6c232c4476437198ab2321a8f174453e0ae39 (refs/remotes/git-svn)
+r5 = 340a61f241e60f9d43eb6ac7529950b5b948d7bb (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
@@ -540833,7 +538631,7 @@
 		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -h "$SVN_TREE"/exec.sh
-[mybranch5 4366a58] executable file becomes a symlink to file
+[mybranch5 5bfca3d] 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
@@ -540842,7 +538640,7 @@
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = fe459d3753334ceba375796332840a96f69a83c8 (refs/remotes/git-svn)
+r6 = 42d8cd4b8cc5b702d2ccd88efd2a71c5e1497a1a (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
@@ -540860,7 +538658,7 @@
 	svn_cmd up "$SVN_TREE" &&
 	test -x "$SVN_TREE"/file &&
 	test -h "$SVN_TREE"/exec-2.sh
-[mybranch5 7109881] new symlink is added to a file that was also just made executable
+[mybranch5 cce2430] 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
@@ -540869,7 +538667,7 @@
 	M	file
 	A	exec-2.sh
 	M	file
-r7 = e066e99f221efc7ed7397701de186e2537da87c8 (refs/remotes/git-svn)
+r7 = e20b8aa7c9d4aad04775035e69981d980f7ea333 (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
@@ -540889,7 +538687,7 @@
 	test -f "$SVN_TREE"/exec-2.sh &&
 	test ! -h "$SVN_TREE"/exec-2.sh &&
 	test_cmp help "$SVN_TREE"/exec-2.sh
-[mybranch5 e664b8a] modify a symlink to become a file
+[mybranch5 8b796a6] 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
@@ -540898,7 +538696,7 @@
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = 64965c5d27855de6695034f30aa36638c574caa7 (refs/remotes/git-svn)
+r8 = db0841235d1a19410263213cf8c8ce6374c481e7 (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
@@ -540911,12 +538709,12 @@
 	git update-index exec-2.sh &&
 	git commit -m 'éï�' &&
 	git svn set-tree HEAD
-[mybranch5 09421d2] éï�
+[mybranch5 4b2d638] éï�
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 	M	exec-2.sh
 	M	exec-2.sh
-r9 = 0a63315227b76665ab19fd619d081160b0a912fa (refs/remotes/git-svn)
+r9 = 15b7506efa3b9e292ebc2b0cc2812c5c6fba49b7 (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 ok 16 - commit with UTF-8 message: locale: C.utf8
 
@@ -540931,33 +538729,33 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = bcd055d18e99aba1e7bd7fbcd8cf4ee8de8dc3af (refs/remotes/alt)
+r1 = a59762a53a165d78f6029664f1f9318241932a80 (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 = bdba99a03721768bf537bd92697542651c2b486c (refs/remotes/alt)
+r2 = 4cb230c274865a28ee71e5c93698e53816f3bc9e (refs/remotes/alt)
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 4dea5307fadd02ca64100f5c890e9e0d6d7f6e09 (refs/remotes/alt)
+r3 = a4d9f18b602c1d4ad19e53f69a3198ef552fdfd8 (refs/remotes/alt)
 	M	exec.sh
-r4 = a03f9878b07094c6d3e9094e6471322fa2f17e6d (refs/remotes/alt)
+r4 = dfb968852f7faba3b8e69bea4de5d76c7ccfa757 (refs/remotes/alt)
 	M	exec.sh
-r5 = f981a7bc7022ac00c39ab4686c3278e1535541b1 (refs/remotes/alt)
+r5 = e40243e22df602f9e23b5cec42fc6e1dc3e6e3b1 (refs/remotes/alt)
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 12c03d0e2531278bdaa2f94f1272ea8bbedda466 (refs/remotes/alt)
+r6 = 9d808b7288ed018e44d668300a84497729279a48 (refs/remotes/alt)
 	A	exec-2.sh
 	M	file
-r7 = e1f6f3010cd30dab9e3c65bee7d8b9923d175f49 (refs/remotes/alt)
+r7 = 08ca789338390e1394ce7355e1a0699c1261d6cc (refs/remotes/alt)
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = 48de5e1a9cac4cc4d6fa3de3c24020d7f76dcde6 (refs/remotes/alt)
+r8 = 528cf231685c39dc2bfd55bada64819bf94a8a21 (refs/remotes/alt)
 	M	exec-2.sh
-r9 = 8b52505d7c35754272ba9a97862e5d7b299912d8 (refs/remotes/alt)
+r9 = e0fd3c980bff5afe8092748c3262ed53dd3698e2 (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': 
@@ -541024,16 +538822,16 @@
 	git branch -D my-bar
 	
 	A	zzz
-r1 = a2bb9f4578f92730a2d3557983a4351465f0c81b (refs/remotes/bar)
+r1 = e8e8f7b81b9cfd538fed4f7beb2282d7740bc7b2 (refs/remotes/bar)
 	D	zzz
 	A	zzz/yyy
-r3 = c550df6141b497febcabb32f02826cf84c763ac9 (refs/remotes/bar)
+r3 = bca5a61e0d7216ce99f94a62ccda016a4327c1b1 (refs/remotes/bar)
 Switched to a new branch 'my-bar'
-[my-bar 8127f83] change 1
+[my-bar 2ce2158] change 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
-[my-bar 93098ac] change 2
+[my-bar 8b54ca0] change 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -541041,14 +538839,14 @@
 	A	foo
 Committed r10
 	A	foo
-r10 = 2791ccfe89c3fcafb00f582d273db3336a850c8c (refs/remotes/bar)
-No changes between 8127f83a1e8c437f576a82a05831c280e4127f78 and refs/remotes/bar
+r10 = 229e67701d4ef2faa5fbc706abadb273a3c95ac7 (refs/remotes/bar)
+No changes between 2ce2158febe7ab79d7b0e2eed65c3ddb8b9adb11 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: 2791ccfe89c3fcafb00f582d273db3336a850c8c
+The rewritten commit is: 229e67701d4ef2faa5fbc706abadb273a3c95ac7
     change 1
 Switched to branch 'main'
-Deleted branch my-bar (was 93098ac).
+Deleted branch my-bar (was 8b54ca0).
 ok 22 - dcommit $rev does not clobber current branch
 
 expecting success of 9100.23 'able to dcommit to a subdirectory': 
@@ -541072,9 +538870,9 @@
 	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
 
 	A	bar/foo
-r10 = 17c29e314192ea85181bf70a33673f4176c5daa4 (refs/remotes/alt)
+r10 = 6ec2eadaf154a6450cdc62317c821783071cc24e (refs/remotes/alt)
 Switched to a new branch 'my-bar'
-[my-bar 1f66d24] /bar/d should be in the log
+[my-bar 90ed9e4] /bar/d should be in the log
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 d
@@ -541083,10 +538881,10 @@
 	A	d
 Committed r11
 	A	d
-r11 = e0852deb0f9d8fead14d10ed750303facc2c69dd (refs/remotes/bar)
-No changes between 1f66d24259900163757ebed5b57416f18b8864c9 and refs/remotes/bar
+r11 = f5c5b37b9fe745010f7e2a583ef3223a29cd1aa7 (refs/remotes/bar)
+No changes between 90ed9e4f189c87b3de3e0881d582c6300fdf44b6 and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
-[my-bar 7779612] add a new directory
+[my-bar 527caea] add a new directory
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 newdir/dir
@@ -541095,10 +538893,10 @@
 	A	newdir/dir
 Committed r12
 	A	newdir/dir
-r12 = 0900f1bdd50099921189b7072818fd6b1e4e84b1 (refs/remotes/bar)
-No changes between 7779612d165045c99cf4524d9355f7e1b538f41b and refs/remotes/bar
+r12 = b563eef7993487a8011816a26c652c6dcb2a3a65 (refs/remotes/bar)
+No changes between 527caea470584ac22140598b34767d8da8de5b91 and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
-[my-bar 5c80790] modify a file in new directory
+[my-bar 18abfa8] 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"
@@ -541106,8 +538904,8 @@
 	M	newdir/dir
 Committed r13
 	M	newdir/dir
-r13 = 6666fc70e8df6598c6ea5fbbb41f988ba8b12b69 (refs/remotes/bar)
-No changes between 5c8079013a18ca52afa85ba379693b1ccdbe108f and refs/remotes/bar
+r13 = 22b4746b64a3a98b6e566fa3515acd69e2339cb7 (refs/remotes/bar)
+No changes between 18abfa8ec07b030329427c8ed6522557cae1667e and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
 ok 23 - able to dcommit to a subdirectory
 
@@ -541116,7 +538914,7 @@
 	test-tool chmtime =-60 foo &&
 	git svn dcommit
 
-[my-bar 4744ff7] commit-new-file-foo2
+[my-bar a34fb71] commit-new-file-foo2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo2
@@ -541125,8 +538923,8 @@
 	A	foo2
 Committed r14
 	A	foo2
-r14 = 18c3394a00b49deccdb4962cb86d34258da6da79 (refs/remotes/bar)
-No changes between 4744ff7618dadd200cabbee721015608e6ff2194 and refs/remotes/bar
+r14 = aec11df7128cf511aa68c057148df63f197d0e59 (refs/remotes/bar)
+No changes between a34fb7103957389f8af820bd10437fcca8921fbe and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
 ok 24 - dcommit should not fail with a touched file
 
@@ -541144,12 +538942,12 @@
 	git svn set-tree -i bar HEAD &&
 	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
 
-[my-bar a6b6e8a] update /bar/d
+[my-bar 7a519cd] update /bar/d
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 	M	d
 	M	d
-r15 = dbc61654b6f63ed2aee20f5014af884eaac14aeb (refs/remotes/bar)
+r15 = 2dbc56891e693aab69ce97a2190ece16bab92938 (refs/remotes/bar)
 Done committing 1 revisions to SVN
 ok 26 - able to set-tree to a subdirectory
 
@@ -541167,131 +538965,3356 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = bcd055d18e99aba1e7bd7fbcd8cf4ee8de8dc3af (refs/remotes/alt)
+r1 = a59762a53a165d78f6029664f1f9318241932a80 (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 = bdba99a03721768bf537bd92697542651c2b486c (refs/remotes/alt)
+r2 = 4cb230c274865a28ee71e5c93698e53816f3bc9e (refs/remotes/alt)
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 4dea5307fadd02ca64100f5c890e9e0d6d7f6e09 (refs/remotes/alt)
+r3 = a4d9f18b602c1d4ad19e53f69a3198ef552fdfd8 (refs/remotes/alt)
 	M	exec.sh
-r4 = a03f9878b07094c6d3e9094e6471322fa2f17e6d (refs/remotes/alt)
+r4 = dfb968852f7faba3b8e69bea4de5d76c7ccfa757 (refs/remotes/alt)
 	M	exec.sh
-r5 = f981a7bc7022ac00c39ab4686c3278e1535541b1 (refs/remotes/alt)
+r5 = e40243e22df602f9e23b5cec42fc6e1dc3e6e3b1 (refs/remotes/alt)
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 12c03d0e2531278bdaa2f94f1272ea8bbedda466 (refs/remotes/alt)
+r6 = 9d808b7288ed018e44d668300a84497729279a48 (refs/remotes/alt)
 	A	exec-2.sh
 	M	file
-r7 = e1f6f3010cd30dab9e3c65bee7d8b9923d175f49 (refs/remotes/alt)
+r7 = 08ca789338390e1394ce7355e1a0699c1261d6cc (refs/remotes/alt)
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = 48de5e1a9cac4cc4d6fa3de3c24020d7f76dcde6 (refs/remotes/alt)
+r8 = 528cf231685c39dc2bfd55bada64819bf94a8a21 (refs/remotes/alt)
 	M	exec-2.sh
-r9 = 8b52505d7c35754272ba9a97862e5d7b299912d8 (refs/remotes/alt)
+r9 = e0fd3c980bff5afe8092748c3262ed53dd3698e2 (refs/remotes/alt)
 	A	bar/foo
-r10 = 17c29e314192ea85181bf70a33673f4176c5daa4 (refs/remotes/alt)
+r10 = 6ec2eadaf154a6450cdc62317c821783071cc24e (refs/remotes/alt)
 	A	bar/d
-r11 = 0d4f30357c5b98ff8baa4cce9948061bddaedc5e (refs/remotes/alt)
+r11 = 56f534f93810f5f5791133e5e919d2dee408cc42 (refs/remotes/alt)
 	A	bar/newdir/dir
-r12 = 0f8345003765c13a032242ae99a6bac9c8936171 (refs/remotes/alt)
+r12 = 06eb990b5cab1701f8d99b3232a121f3757bf7a3 (refs/remotes/alt)
 	M	bar/newdir/dir
-r13 = d49071dfe30bf80a108e776d429f7017bf8201c7 (refs/remotes/alt)
+r13 = f7c10f30e53f7f4fcb79961761960b41ebe0c0ef (refs/remotes/alt)
 	A	bar/foo2
-r14 = b5be898d6fb676eebb30b4d84afabffb1d34493c (refs/remotes/alt)
+r14 = 412cbd0201e7acb6f2074550df658a4f5df98004 (refs/remotes/alt)
 	M	bar/d
-r15 = 95793d41e40f21e994b723647299e2d2e65efe33 (refs/remotes/alt)
+r15 = 16d75c193f62ffbac4b928a202f46381b90e5a8d (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': 
-	mkdir worktree gitdir &&
-	( cd worktree &&
-	git svn init "$svnrepo" &&
-	git init --separate-git-dir ../gitdir &&
-	git svn fetch ) &&
-	rm -rf worktree gitdir
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9100-git-svn-basic/worktree/.git/
-Reinitialized existing Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9100-git-svn-basic/gitdir/
-	A	bar/zzz
-	A	dir/a/b/c/d/e/file
-	A	exec.sh
-	A	foo
-	A	foo.link
-r1 = bcd055d18e99aba1e7bd7fbcd8cf4ee8de8dc3af (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 = bdba99a03721768bf537bd92697542651c2b486c (refs/remotes/alt)
-	D	bar/zzz
-	A	bar/zzz/yyy
-r3 = 4dea5307fadd02ca64100f5c890e9e0d6d7f6e09 (refs/remotes/alt)
-	M	exec.sh
-r4 = a03f9878b07094c6d3e9094e6471322fa2f17e6d (refs/remotes/alt)
-	M	exec.sh
-r5 = f981a7bc7022ac00c39ab4686c3278e1535541b1 (refs/remotes/alt)
-	D	exec.sh
-	A	exec.sh
-W: -empty_dir: exec.sh
-r6 = 12c03d0e2531278bdaa2f94f1272ea8bbedda466 (refs/remotes/alt)
-	A	exec-2.sh
-	M	file
-r7 = e1f6f3010cd30dab9e3c65bee7d8b9923d175f49 (refs/remotes/alt)
-	D	exec-2.sh
-	A	exec-2.sh
-W: -empty_dir: exec-2.sh
-r8 = 48de5e1a9cac4cc4d6fa3de3c24020d7f76dcde6 (refs/remotes/alt)
-	M	exec-2.sh
-r9 = 8b52505d7c35754272ba9a97862e5d7b299912d8 (refs/remotes/alt)
-	A	bar/foo
-r10 = 17c29e314192ea85181bf70a33673f4176c5daa4 (refs/remotes/alt)
-	A	bar/d
-r11 = 0d4f30357c5b98ff8baa4cce9948061bddaedc5e (refs/remotes/alt)
-	A	bar/newdir/dir
-r12 = 0f8345003765c13a032242ae99a6bac9c8936171 (refs/remotes/alt)
-	M	bar/newdir/dir
-r13 = d49071dfe30bf80a108e776d429f7017bf8201c7 (refs/remotes/alt)
-	A	bar/foo2
-r14 = b5be898d6fb676eebb30b4d84afabffb1d34493c (refs/remotes/alt)
-	M	bar/d
-r15 = 95793d41e40f21e994b723647299e2d2e65efe33 (refs/remotes/alt)
-ok 28 - git-svn works in a repository with a gitdir: link
+expecting success of 9100.28 'git-svn works in a repository with a gitdir: link': 
+	mkdir worktree gitdir &&
+	( cd worktree &&
+	git svn init "$svnrepo" &&
+	git init --separate-git-dir ../gitdir &&
+	git svn fetch ) &&
+	rm -rf worktree gitdir
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9100-git-svn-basic/worktree/.git/
+Reinitialized existing Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9100-git-svn-basic/gitdir/
+	A	bar/zzz
+	A	dir/a/b/c/d/e/file
+	A	exec.sh
+	A	foo
+	A	foo.link
+r1 = a59762a53a165d78f6029664f1f9318241932a80 (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 = 4cb230c274865a28ee71e5c93698e53816f3bc9e (refs/remotes/alt)
+	D	bar/zzz
+	A	bar/zzz/yyy
+r3 = a4d9f18b602c1d4ad19e53f69a3198ef552fdfd8 (refs/remotes/alt)
+	M	exec.sh
+r4 = dfb968852f7faba3b8e69bea4de5d76c7ccfa757 (refs/remotes/alt)
+	M	exec.sh
+r5 = e40243e22df602f9e23b5cec42fc6e1dc3e6e3b1 (refs/remotes/alt)
+	D	exec.sh
+	A	exec.sh
+W: -empty_dir: exec.sh
+r6 = 9d808b7288ed018e44d668300a84497729279a48 (refs/remotes/alt)
+	A	exec-2.sh
+	M	file
+r7 = 08ca789338390e1394ce7355e1a0699c1261d6cc (refs/remotes/alt)
+	D	exec-2.sh
+	A	exec-2.sh
+W: -empty_dir: exec-2.sh
+r8 = 528cf231685c39dc2bfd55bada64819bf94a8a21 (refs/remotes/alt)
+	M	exec-2.sh
+r9 = e0fd3c980bff5afe8092748c3262ed53dd3698e2 (refs/remotes/alt)
+	A	bar/foo
+r10 = 6ec2eadaf154a6450cdc62317c821783071cc24e (refs/remotes/alt)
+	A	bar/d
+r11 = 56f534f93810f5f5791133e5e919d2dee408cc42 (refs/remotes/alt)
+	A	bar/newdir/dir
+r12 = 06eb990b5cab1701f8d99b3232a121f3757bf7a3 (refs/remotes/alt)
+	M	bar/newdir/dir
+r13 = f7c10f30e53f7f4fcb79961761960b41ebe0c0ef (refs/remotes/alt)
+	A	bar/foo2
+r14 = 412cbd0201e7acb6f2074550df658a4f5df98004 (refs/remotes/alt)
+	M	bar/d
+r15 = 16d75c193f62ffbac4b928a202f46381b90e5a8d (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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9140-git-svn-reset.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9140-git-svn-reset/.git/
+expecting success of 9140.1 'setup test repository': 
+	svn_cmd co "$svnrepo" s &&
+	(
+		cd s &&
+		mkdir vis &&
+		echo always visible > vis/vis.txt &&
+		svn_cmd add vis &&
+		svn_cmd commit -m "create visible files" &&
+		mkdir hid &&
+		echo initially hidden > hid/hid.txt &&
+		svn_cmd add hid &&
+		svn_cmd commit -m "create initially hidden files" &&
+		svn_cmd up &&
+		echo mod >> vis/vis.txt &&
+		svn_cmd commit -m "modify vis" &&
+		svn_cmd up
+	)
+
+Checked out revision 0.
+A         vis
+A         vis/vis.txt
+Adding         vis
+Adding         vis/vis.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 1.
+A         hid
+A         hid/hid.txt
+Adding         hid
+Adding         hid/hid.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+Updating '.':
+At revision 2.
+Sending        vis/vis.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+Updating '.':
+At revision 3.
+ok 1 - setup test repository
+
+expecting success of 9140.2 'clone SVN repository with hidden directory': 
+	git svn init "$svnrepo" g &&
+	( cd g && git svn fetch --ignore-paths="^hid" )
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9140-git-svn-reset/g/.git/
+	A	vis/vis.txt
+r1 = 37e16d4d6bc57a079a989a061e8e4855e017cf3b (refs/remotes/git-svn)
+r2 = 97342c69fe0b65b5716bb8f7dbb5c17eea856c0a (refs/remotes/git-svn)
+	M	vis/vis.txt
+r3 = 69ac43a474f51165676b794f1ada09cce0e6b8a0 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9140-git-svn-reset/svnrepo r3
+ok 2 - clone SVN repository with hidden directory
+
+expecting success of 9140.3 'modify hidden file in SVN repo': 
+	( cd s &&
+	  echo mod hidden >> hid/hid.txt &&
+	  svn_cmd commit -m "modify hid" &&
+	  svn_cmd up
+	)
+
+Sending        hid/hid.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 4.
+Updating '.':
+At revision 4.
+ok 3 - modify hidden file in SVN repo
+
+expecting success of 9140.4 'fetch fails on modified hidden file': 
+	( cd g &&
+	  git svn find-rev refs/remotes/git-svn > ../expect &&
+	  test_must_fail git svn fetch 2> ../errors &&
+	  git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
+	grep "not found in commit" errors &&
+	test_cmp expect expect2
+
+hid/hid.txt was not found in commit 69ac43a474f51165676b794f1ada09cce0e6b8a0 (r3)
+ok 4 - fetch fails on modified hidden file
+
+expecting success of 9140.5 'reset unwinds back to r1': 
+	( cd g &&
+	  git svn reset -r1 &&
+	  git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
+	echo 1 >expect &&
+	test_cmp expect expect2
+
+r1 = 37e16d4d6bc57a079a989a061e8e4855e017cf3b (refs/remotes/git-svn)
+ok 5 - reset unwinds back to r1
+
+expecting success of 9140.6 'refetch succeeds not ignoring any files': 
+	( cd g &&
+	  git svn fetch &&
+	  git svn rebase &&
+	  grep "mod hidden" hid/hid.txt
+	)
+
+Index mismatch: a4b5c203f79112e92d530cb82366ca4d706fa4a8 != 6b5a1244749c8cdb5442eefd0abc3689d666322d
+rereading 37e16d4d6bc57a079a989a061e8e4855e017cf3b
+	A	hid/hid.txt
+r2 = 794a2bdd597dcd7ceed7c4007869f1582b1ccbe7 (refs/remotes/git-svn)
+	M	vis/vis.txt
+r3 = a9e6fbfff11adecc5fc6395afb90368cfc2794b4 (refs/remotes/git-svn)
+	M	hid/hid.txt
+r4 = 30fcc2a8bd9cda6dd4a2ad489f1462e40f550086 (refs/remotes/git-svn)
+warning: skipped previously applied commit 69ac43a
+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.
+mod hidden
+ok 6 - refetch succeeds not ignoring any files
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t7610-mergetool.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7610-mergetool/.git/
+expecting success of 7610.1 'setup': 
+	test_config rerere.enabled true &&
+	echo main >file1 &&
+	echo main spaced >"spaced name" &&
+	echo main file11 >file11 &&
+	echo main file12 >file12 &&
+	echo main file13 >file13 &&
+	echo main file14 >file14 &&
+	mkdir subdir &&
+	echo main sub >subdir/file3 &&
+	test_create_repo submod &&
+	(
+		cd submod &&
+		: >foo &&
+		git add foo &&
+		git commit -m "Add foo"
+	) &&
+	git submodule add file:///dev/null submod &&
+	git add file1 "spaced name" file1[1-4] subdir/file3 .gitmodules submod &&
+	git commit -m "add initial versions" &&
+
+	git checkout -b branch1 main &&
+	git submodule update -N &&
+	echo branch1 change >file1 &&
+	echo branch1 newfile >file2 &&
+	echo branch1 spaced >"spaced name" &&
+	echo branch1 both added >both &&
+	echo branch1 change file11 >file11 &&
+	echo branch1 change file13 >file13 &&
+	echo branch1 sub >subdir/file3 &&
+	(
+		cd submod &&
+		echo branch1 submodule >bar &&
+		git add bar &&
+		git commit -m "Add bar on branch1" &&
+		git checkout -b submod-branch1
+	) &&
+	git add file1 "spaced name" file11 file13 file2 subdir/file3 submod &&
+	git add both &&
+	git rm file12 &&
+	git commit -m "branch1 changes" &&
+
+	git checkout -b delete-base branch1 &&
+	mkdir -p a/a &&
+	test_write_lines one two 3 4 >a/a/file.txt &&
+	git add a/a/file.txt &&
+	git commit -m"base file" &&
+	git checkout -b move-to-b delete-base &&
+	mkdir -p b/b &&
+	git mv a/a/file.txt b/b/file.txt &&
+	test_write_lines one two 4 >b/b/file.txt &&
+	git commit -a -m"move to b" &&
+	git checkout -b move-to-c delete-base &&
+	mkdir -p c/c &&
+	git mv a/a/file.txt c/c/file.txt &&
+	test_write_lines one two 3 >c/c/file.txt &&
+	git commit -a -m"move to c" &&
+
+	git checkout -b stash1 main &&
+	echo stash1 change file11 >file11 &&
+	git add file11 &&
+	git commit -m "stash1 changes" &&
+
+	git checkout -b stash2 main &&
+	echo stash2 change file11 >file11 &&
+	git add file11 &&
+	git commit -m "stash2 changes" &&
+
+	git checkout main &&
+	git submodule update -N &&
+	echo main updated >file1 &&
+	echo main new >file2 &&
+	echo main updated spaced >"spaced name" &&
+	echo main both added >both &&
+	echo main updated file12 >file12 &&
+	echo main updated file14 >file14 &&
+	echo main new sub >subdir/file3 &&
+	(
+		cd submod &&
+		echo main submodule >bar &&
+		git add bar &&
+		git commit -m "Add bar on main" &&
+		git checkout -b submod-main
+	) &&
+	git add file1 "spaced name" file12 file14 file2 subdir/file3 submod &&
+	git add both &&
+	git rm file11 &&
+	git commit -m "main updates" &&
+
+	git clean -fdx &&
+	git checkout -b order-file-start main &&
+	echo start >a &&
+	echo start >b &&
+	git add a b &&
+	git commit -m start &&
+	git checkout -b order-file-side1 order-file-start &&
+	echo side1 >a &&
+	echo side1 >b &&
+	git add a b &&
+	git commit -m side1 &&
+	git checkout -b order-file-side2 order-file-start &&
+	echo side2 >a &&
+	echo side2 >b &&
+	git add a b &&
+	git commit -m side2 &&
+
+	git config merge.tool mytool &&
+	git config mergetool.mytool.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
+	git config mergetool.mytool.trustExitCode true &&
+	git config mergetool.mybase.cmd "cat \"\$BASE\" >\"\$MERGED\"" &&
+	git config mergetool.mybase.trustExitCode true
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7610-mergetool/submod/.git/
+[main (root-commit) d8b1d8e] Add foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+Adding existing repo at 'submod' to the index
+[main (root-commit) 8119935] add initial versions
+ Author: A U Thor <author@example.com>
+ 9 files changed, 11 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 file1
+ create mode 100644 file11
+ create mode 100644 file12
+ create mode 100644 file13
+ create mode 100644 file14
+ create mode 100644 spaced name
+ create mode 100644 subdir/file3
+ create mode 160000 submod
+Switched to a new branch 'branch1'
+[main b5507ac] Add bar on branch1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+Switched to a new branch 'submod-branch1'
+rm 'file12'
+[branch1 b56897f] branch1 changes
+ Author: A U Thor <author@example.com>
+ 9 files changed, 8 insertions(+), 7 deletions(-)
+ create mode 100644 both
+ delete mode 100644 file12
+ create mode 100644 file2
+Switched to a new branch 'delete-base'
+[delete-base a20b9ac] base file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 a/a/file.txt
+Switched to a new branch 'move-to-b'
+[move-to-b d173899] move to b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ rename {a/a => b/b}/file.txt (83%)
+Switched to a new branch 'move-to-c'
+[move-to-c 7baa014] move to c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ rename {a/a => c/c}/file.txt (83%)
+Switched to a new branch 'stash1'
+M	submod
+[stash1 7727624] stash1 changes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'stash2'
+M	submod
+[stash2 3eeb9f3] stash2 changes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+M	submod
+Submodule path 'submod': checked out 'd8b1d8e6424e753a8741ec5acadf448ece02afdc'
+[detached HEAD d1fea44] Add bar on main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+Switched to a new branch 'submod-main'
+rm 'file11'
+[main 42ed12d] main updates
+ Author: A U Thor <author@example.com>
+ 9 files changed, 8 insertions(+), 7 deletions(-)
+ create mode 100644 both
+ delete mode 100644 file11
+ create mode 100644 file2
+Removing a/
+Switched to a new branch 'order-file-start'
+[order-file-start 8e07b42] start
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+Switched to a new branch 'order-file-side1'
+[order-file-side1 072d66b] side1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'order-file-side2'
+[order-file-side2 50ba26c] side2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 1 - setup
+
+expecting success of 7610.2 'custom mergetool': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+	yes "" | git mergetool both &&
+	yes "" | git mergetool file1 file1 &&
+	yes "" | git mergetool file2 "spaced name" &&
+	yes "" | git mergetool subdir/file3 &&
+	yes "d" | git mergetool file11 &&
+	yes "d" | git mergetool file12 &&
+	yes "l" | git mergetool submod &&
+	echo "main updated" >expect &&
+	test_cmp expect file1 &&
+	echo "main new" >expect &&
+	test_cmp expect file2 &&
+	echo "main new sub" >expect &&
+	test_cmp expect subdir/file3 &&
+	echo "branch1 submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git commit -m "branch1 resolved with mergetool"
+
+Switched to a new branch 'test2'
+M	submod
+Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Recorded preimage for 'both'
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Recorded preimage for 'spaced name'
+Recorded preimage for 'subdir/file3'
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file1
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file2
+spaced name
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file11
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
+
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Recorded resolution for 'both'.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+Recorded resolution for 'spaced name'.
+Recorded resolution for 'subdir/file3'.
+[test2 2c3a7d1] branch1 resolved with mergetool
+ Author: A U Thor <author@example.com>
+HEAD is now at 2c3a7d1 branch1 resolved with mergetool
+ok 2 - custom mergetool
+
+expecting success of 7610.3 'gui mergetool': 
+	test_config merge.guitool myguitool &&
+	test_config mergetool.myguitool.cmd "(printf \"gui \" && cat \"\$REMOTE\") >\"\$MERGED\"" &&
+	test_config mergetool.myguitool.trustExitCode true &&
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+	yes "" | git mergetool --gui both &&
+	yes "" | git mergetool -g file1 file1 &&
+	yes "" | git mergetool --gui file2 "spaced name" &&
+	yes "" | git mergetool --gui subdir/file3 &&
+	yes "d" | git mergetool --gui file11 &&
+	yes "d" | git mergetool --gui file12 &&
+	yes "l" | git mergetool --gui submod &&
+	echo "gui main updated" >expect &&
+	test_cmp expect file1 &&
+	echo "gui main new" >expect &&
+	test_cmp expect file2 &&
+	echo "gui main new sub" >expect &&
+	test_cmp expect subdir/file3 &&
+	echo "branch1 submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git commit -m "branch1 resolved with mergetool"
+
+Switched to a new branch 'test3'
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file1
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file2
+spaced name
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file11
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
+
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? [test3 531fc95] branch1 resolved with mergetool
+ Author: A U Thor <author@example.com>
+HEAD is now at 531fc95 branch1 resolved with mergetool
+ok 3 - gui mergetool
+
+expecting success of 7610.4 'gui mergetool without merge.guitool set falls back to merge.tool': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+	yes "" | git mergetool --gui both &&
+	yes "" | git mergetool -g file1 file1 &&
+	yes "" | git mergetool --gui file2 "spaced name" &&
+	yes "" | git mergetool --gui subdir/file3 &&
+	yes "d" | git mergetool --gui file11 &&
+	yes "d" | git mergetool --gui file12 &&
+	yes "l" | git mergetool --gui submod &&
+	echo "main updated" >expect &&
+	test_cmp expect file1 &&
+	echo "main new" >expect &&
+	test_cmp expect file2 &&
+	echo "main new sub" >expect &&
+	test_cmp expect subdir/file3 &&
+	echo "branch1 submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git commit -m "branch1 resolved with mergetool"
+
+Switched to a new branch 'test4'
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file1
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file2
+spaced name
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file11
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
+
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? [test4 2c3a7d1] branch1 resolved with mergetool
+ Author: A U Thor <author@example.com>
+HEAD is now at 2c3a7d1 branch1 resolved with mergetool
+ok 4 - gui mergetool without merge.guitool set falls back to merge.tool
+
+expecting success of 7610.5 'mergetool crlf': 
+	test_when_finished "git reset --hard" &&
+	# This test_config line must go after the above reset line so that
+	# core.autocrlf is unconfigured before reset runs.  (The
+	# test_config command uses test_when_finished internally and
+	# test_when_finished is LIFO.)
+	test_config core.autocrlf true &&
+	git checkout -b test$test_count branch1 &&
+	test_must_fail git merge main &&
+	yes "" | git mergetool file1 &&
+	yes "" | git mergetool file2 &&
+	yes "" | git mergetool "spaced name" &&
+	yes "" | git mergetool both &&
+	yes "" | git mergetool subdir/file3 &&
+	yes "d" | git mergetool file11 &&
+	yes "d" | git mergetool file12 &&
+	yes "r" | git mergetool submod &&
+	test "$(printf x | cat file1 -)" = "$(printf "main updated\r\nx")" &&
+	test "$(printf x | cat file2 -)" = "$(printf "main new\r\nx")" &&
+	test "$(printf x | cat subdir/file3 -)" = "$(printf "main new sub\r\nx")" &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git commit -m "branch1 resolved with mergetool - autocrlf"
+
+Switched to a new branch 'test5'
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Recorded preimage for 'both'
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Recorded preimage for 'spaced name'
+Recorded preimage for 'subdir/file3'
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file2
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+Merging:
+spaced name
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file11
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
+
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
+Recorded resolution for 'both'.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+Recorded resolution for 'spaced name'.
+Recorded resolution for 'subdir/file3'.
+[test5 2674795] branch1 resolved with mergetool - autocrlf
+ Author: A U Thor <author@example.com>
+HEAD is now at 2674795 branch1 resolved with mergetool - autocrlf
+ok 5 - mergetool crlf
+
+expecting success of 7610.6 'mergetool in subdir': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	(
+		cd subdir &&
+		test_must_fail git merge main &&
+		yes "" | git mergetool file3 &&
+		echo "main new sub" >expect &&
+		test_cmp expect file3
+	)
+
+Switched to a new branch 'test6'
+M	submod
+Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+HEAD is now at b56897f branch1 changes
+ok 6 - mergetool in subdir
+
+expecting success of 7610.7 'mergetool on file in parent dir': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	(
+		cd subdir &&
+		test_must_fail git merge main &&
+		yes "" | git mergetool file3 &&
+		yes "" | git mergetool ../file1 &&
+		yes "" | git mergetool ../file2 ../spaced\ name &&
+		yes "" | git mergetool ../both &&
+		yes "d" | git mergetool ../file11 &&
+		yes "d" | git mergetool ../file12 &&
+		yes "l" | git mergetool ../submod &&
+		echo "main updated" >expect &&
+		test_cmp expect ../file1 &&
+		echo "main new" >expect &&
+		test_cmp expect ../file2 &&
+		echo "branch1 submodule" >expect &&
+		test_cmp expect ../submod/bar &&
+		git commit -m "branch1 resolved with mergetool - subdir"
+	)
+
+Switched to a new branch 'test7'
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file1
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file2
+spaced name
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
+
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? [test7 3b3d211] branch1 resolved with mergetool - subdir
+ Author: A U Thor <author@example.com>
+HEAD is now at 3b3d211 branch1 resolved with mergetool - subdir
+ok 7 - mergetool on file in parent dir
+
+expecting success of 7610.8 'mergetool skips autoresolved': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	yes "d" | git mergetool file11 &&
+	yes "d" | git mergetool file12 &&
+	yes "l" | git mergetool submod &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging"
+
+Switched to a new branch 'test8'
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file11
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
+
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? HEAD is now at b56897f branch1 changes
+ok 8 - mergetool skips autoresolved
+
+expecting success of 7610.9 'mergetool merges all from subdir (rerere disabled)': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config rerere.enabled false &&
+	(
+		cd subdir &&
+		test_must_fail git merge main &&
+		yes "r" | git mergetool ../submod &&
+		yes "d" "d" | git mergetool --no-prompt &&
+		echo "main updated" >expect &&
+		test_cmp expect ../file1 &&
+		echo "main new" >expect &&
+		test_cmp expect ../file2 &&
+		echo "main new sub" >expect &&
+		test_cmp expect file3 &&
+		( cd .. && git submodule update -N ) &&
+		echo "main submodule" >expect &&
+		test_cmp expect ../submod/bar &&
+		git commit -m "branch2 resolved by mergetool from subdir"
+	)
+
+Switched to a new branch 'test9'
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Merging:
+both
+file1
+file11
+file12
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
+[test9 af143c6] branch2 resolved by mergetool from subdir
+ Author: A U Thor <author@example.com>
+HEAD is now at af143c6 branch2 resolved by mergetool from subdir
+ok 9 - mergetool merges all from subdir (rerere disabled)
+
+expecting success of 7610.10 'mergetool merges all from subdir (rerere enabled)': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config rerere.enabled true &&
+	rm -rf .git/rr-cache &&
+	(
+		cd subdir &&
+		test_must_fail git merge main &&
+		yes "r" | git mergetool ../submod &&
+		yes "d" "d" | git mergetool --no-prompt &&
+		echo "main updated" >expect &&
+		test_cmp expect ../file1 &&
+		echo "main new" >expect &&
+		test_cmp expect ../file2 &&
+		echo "main new sub" >expect &&
+		test_cmp expect file3 &&
+		( cd .. && git submodule update -N ) &&
+		echo "main submodule" >expect &&
+		test_cmp expect ../submod/bar &&
+		git commit -m "branch2 resolved by mergetool from subdir"
+	)
+
+Switched to a new branch 'test10'
+M	submod
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Recorded preimage for 'both'
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Recorded preimage for 'spaced name'
+Recorded preimage for 'subdir/file3'
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Merging:
+both
+file1
+file11
+file12
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Recorded resolution for 'both'.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+Recorded resolution for 'spaced name'.
+Recorded resolution for 'subdir/file3'.
+[test10 af143c6] branch2 resolved by mergetool from subdir
+ Author: A U Thor <author@example.com>
+HEAD is now at af143c6 branch2 resolved by mergetool from subdir
+ok 10 - mergetool merges all from subdir (rerere enabled)
+
+expecting success of 7610.11 'mergetool skips resolved paths when rerere is active': 
+	test_when_finished "git reset --hard" &&
+	test_config rerere.enabled true &&
+	rm -rf .git/rr-cache &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+	yes "l" | git mergetool --no-prompt submod &&
+	yes "d" "d" | git mergetool --no-prompt &&
+	git submodule update -N &&
+	output="$(yes "n" | git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging"
+
+Switched to a new branch 'test11'
+M	submod
+Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Recorded preimage for 'both'
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Recorded preimage for 'spaced name'
+Recorded preimage for 'subdir/file3'
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Merging:
+both
+file1
+file11
+file12
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+HEAD is now at b56897f branch1 changes
+ok 11 - mergetool skips resolved paths when rerere is active
+
+expecting success of 7610.12 'conflicted stash sets up rerere': 
+	test_when_finished "git reset --hard" &&
+	test_config rerere.enabled true &&
+	git checkout stash1 &&
+	echo "Conflicting stash content" >file11 &&
+	git stash &&
+
+	git checkout --detach stash2 &&
+	test_must_fail git stash apply &&
+
+	test -n "$(git ls-files -u)" &&
+	conflicts="$(git rerere remaining)" &&
+	test "$conflicts" = "file11" &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" != "No files need merging" &&
+
+	git commit -am "save the stash resolution" &&
+
+	git reset --hard stash2 &&
+	test_must_fail git stash apply &&
+
+	test -n "$(git ls-files -u)" &&
+	conflicts="$(git rerere remaining)" &&
+	test -z "$conflicts" &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging"
+
+Switched to branch 'stash1'
+M	submod
+Saved working directory and index state WIP on stash1: 7727624 stash1 changes
+HEAD is now at 3eeb9f3 stash2 changes
+M	submod
+Merging Updated upstream with Stashed changes
+Auto-merging file11
+CONFLICT (content): Merge conflict in file11
+Recorded preimage for 'file11'
+HEAD detached at refs/heads/stash2
+Unmerged paths:
+  (use "git restore --staged <file>..." to unstage)
+  (use "git add <file>..." to mark resolution)
+	both modified:   file11
+
+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:   submod (new commits)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	both.orig
+	expect
+	file1.orig
+	file2.orig
+	spaced name.orig
+	subdir/expect
+	subdir/file3.orig
+
+no changes added to commit (use "git add" and/or "git commit -a")
+Recorded resolution for 'file11'.
+[detached HEAD 22fbead] save the stash resolution
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+HEAD is now at 3eeb9f3 stash2 changes
+Merging Updated upstream with Stashed changes
+Auto-merging file11
+CONFLICT (content): Merge conflict in file11
+Resolved 'file11' using previous resolution.
+HEAD detached at refs/heads/stash2
+Unmerged paths:
+  (use "git restore --staged <file>..." to unstage)
+  (use "git add <file>..." to mark resolution)
+	both modified:   file11
+
+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:   submod (new commits)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	both.orig
+	expect
+	file1.orig
+	file11.orig
+	file2.orig
+	spaced name.orig
+	subdir/expect
+	subdir/file3.orig
+
+no changes added to commit (use "git add" and/or "git commit -a")
+HEAD is now at 3eeb9f3 stash2 changes
+ok 12 - conflicted stash sets up rerere
+
+expecting success of 7610.13 'mergetool takes partial path': 
+	test_when_finished "git reset --hard" &&
+	test_config rerere.enabled false &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+
+	yes "" | git mergetool subdir &&
+
+	echo "main new sub" >expect &&
+	test_cmp expect subdir/file3
+
+Previous HEAD position was 3eeb9f3 stash2 changes
+Switched to a new branch 'test13'
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+HEAD is now at b56897f branch1 changes
+ok 13 - mergetool takes partial path
+
+expecting success of 7610.14 'mergetool delete/delete conflict': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count move-to-c &&
+	test_must_fail git merge move-to-b &&
+	echo d | git mergetool a/a/file.txt &&
+	! test -f a/a/file.txt &&
+	git reset --hard &&
+	test_must_fail git merge move-to-b &&
+	echo m | git mergetool a/a/file.txt &&
+	test -f b/b/file.txt &&
+	git reset --hard &&
+	test_must_fail git merge move-to-b &&
+	! echo a | git mergetool a/a/file.txt &&
+	! test -f a/a/file.txt
+
+Switched to a new branch 'test14'
+Auto-merging a/a/file.txt
+CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
+
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
+Auto-merging a/a/file.txt
+CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
+
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
+Auto-merging a/a/file.txt
+CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
+
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
+ok 14 - mergetool delete/delete conflict
+
+expecting success of 7610.15 'mergetool produces no errors when keepBackup is used': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count move-to-c &&
+	test_config mergetool.keepBackup true &&
+	test_must_fail git merge move-to-b &&
+	echo d | git mergetool a/a/file.txt 2>actual &&
+	test_must_be_empty actual &&
+	! test -d a
+
+Switched to a new branch 'test15'
+Auto-merging a/a/file.txt
+CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
+
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
+ok 15 - mergetool produces no errors when keepBackup is used
+
+expecting success of 7610.16 'mergetool honors tempfile config for deleted files': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count move-to-c &&
+	test_config mergetool.keepTemporaries false &&
+	test_must_fail git merge move-to-b &&
+	echo d | git mergetool a/a/file.txt &&
+	! test -d a
+
+Switched to a new branch 'test16'
+Auto-merging a/a/file.txt
+CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
+
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
+ok 16 - mergetool honors tempfile config for deleted files
+
+expecting success of 7610.17 'mergetool keeps tempfiles when aborting delete/delete': 
+	test_when_finished "git reset --hard" &&
+	test_when_finished "git clean -fdx" &&
+	git checkout -b test$test_count move-to-c &&
+	test_config mergetool.keepTemporaries true &&
+	test_must_fail git merge move-to-b &&
+	! test_write_lines a n | git mergetool a/a/file.txt &&
+	test -d a/a &&
+	cat >expect <<-\EOF &&
+	file_BASE_.txt
+	file_LOCAL_.txt
+	file_REMOTE_.txt
+	EOF
+	ls -1 a/a | sed -e "s/[0-9]*//g" >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'test17'
+Auto-merging a/a/file.txt
+CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
+
+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_2534284.txt
+Removing a/a/file_LOCAL_2534284.txt
+Removing a/a/file_REMOTE_2534284.txt
+Removing actual
+Removing both.orig
+Removing expect
+Removing file1.orig
+Removing file11.orig
+Removing file2.orig
+Removing spaced name.orig
+Removing subdir/expect
+Removing subdir/file3.orig
+HEAD is now at 7baa014 move to c
+ok 17 - mergetool keeps tempfiles when aborting delete/delete
+
+expecting success of 7610.18 'deleted vs modified submodule': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	mv submod submod-movedaside &&
+	git rm --cached submod &&
+	git commit -m "Submodule deleted from branch" &&
+	git checkout -b test$test_count.a test$test_count &&
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	yes "r" | git mergetool submod &&
+	rmdir submod && mv submod-movedaside submod &&
+	echo "branch1 submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping module" &&
+
+	mv submod submod-movedaside &&
+	git checkout -b test$test_count.b test$test_count &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	yes "l" | git mergetool submod &&
+	test ! -e submod &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by deleting module" &&
+
+	mv submod-movedaside submod &&
+	git checkout -b test$test_count.c main &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	yes "r" | git mergetool submod &&
+	test ! -e submod &&
+	test -d submod.orig &&
+	git submodule update -N &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by deleting module" &&
+	mv submod.orig submod &&
+
+	git checkout -b test$test_count.d main &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	yes "l" | git mergetool submod &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping module"
+
+Switched to a new branch 'test18'
+rm 'submod'
+[test18 5815277] Submodule deleted from branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 160000 submod
+Switched to a new branch 'test18.a'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (modify/delete): submod deleted in HEAD and modified in main.  Version main of submod left in tree.
+Recorded preimage for 'both'
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Recorded preimage for 'spaced name'
+Recorded preimage for 'subdir/file3'
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: deleted
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
+Recorded resolution for 'both'.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+Recorded resolution for 'spaced name'.
+Recorded resolution for 'subdir/file3'.
+[test18.a 699f6ba] Merge resolved by keeping module
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test18.b'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (modify/delete): submod deleted in HEAD and modified in main.  Version main of submod left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: deleted
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? [test18.b ba131d0] Merge resolved by deleting module
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test18.c'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test18.  Version test18 of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in test18 and modified in HEAD.  Version HEAD of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (modify/delete): submod deleted in test18 and modified in HEAD.  Version HEAD of submod left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
+
+Deleted merge conflict for 'file11':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+  {remote}: deleted
+Use (l)ocal or (r)emote, or (a)bort? [test18.c 79dacce] Merge resolved by deleting module
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test18.d'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test18.  Version test18 of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in test18 and modified in HEAD.  Version HEAD of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (modify/delete): submod deleted in test18 and modified in HEAD.  Version HEAD of submod left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
+
+Deleted merge conflict for 'file11':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+  {remote}: deleted
+Use (l)ocal or (r)emote, or (a)bort? [test18.d 84e5f25] Merge resolved by keeping module
+ Author: A U Thor <author@example.com>
+HEAD is now at 84e5f25 Merge resolved by keeping module
+ok 18 - deleted vs modified submodule
+
+expecting success of 7610.19 'file vs modified submodule': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	mv submod submod-movedaside &&
+	git rm --cached submod &&
+	echo not a submodule >submod &&
+	git add submod &&
+	git commit -m "Submodule path becomes file" &&
+	git checkout -b test$test_count.a branch1 &&
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	yes "r" | git mergetool submod &&
+	rmdir submod && mv submod-movedaside submod &&
+	echo "branch1 submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping module" &&
+
+	mv submod submod-movedaside &&
+	git checkout -b test$test_count.b test$test_count &&
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	yes "c" | git mergetool submod~HEAD &&
+	git rm submod &&
+	git mv submod~HEAD submod &&
+	git submodule update -N &&
+	echo "not a submodule" >expect &&
+	test_cmp expect submod &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping file" &&
+
+	git checkout -b test$test_count.c main &&
+	rmdir submod && mv submod-movedaside submod &&
+	test ! -e submod.orig &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	mv submod submod.orig &&
+	git rm --cached submod &&
+	yes "c" | git mergetool submod~test19 &&
+	git mv submod~test19 submod &&
+	test -d submod.orig &&
+	git submodule update -N &&
+	echo "not a submodule" >expect &&
+	test_cmp expect submod &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping file" &&
+
+	git checkout -b test$test_count.d main &&
+	rmdir submod && mv submod.orig submod &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	yes "l" | git mergetool submod &&
+	yes "d" | git mergetool submod~test19 &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping module"
+
+Switched to a new branch 'test19'
+M	submod
+Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
+rm 'submod'
+[test19 51d579a] Submodule path becomes file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 160000 => 100644 submod
+Switched to a new branch 'test19.a'
+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:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod (not checked out)
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
+[test19.a a22d630] Merge resolved by keeping module
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test19.b'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (distinct types): submod had different types on each side; renamed one of them so each can be recorded somewhere.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod~HEAD
+
+Deleted merge conflict for 'submod~HEAD':
+  {local}: created file
+  {remote}: deleted
+Use (c)reated or (d)eleted file, or (a)bort? rm 'submod'
+[test19.b 03808c9] Merge resolved by keeping file
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test19.c'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test19.  Version test19 of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in test19 and modified in HEAD.  Version HEAD of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (distinct types): submod had different types on each side; renamed one of them so each can be recorded somewhere.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
+
+Deleted merge conflict for 'file11':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? rm 'submod'
+Merging:
+submod~test19
+
+Deleted merge conflict for 'submod~test19':
+  {local}: deleted
+  {remote}: created file
+Use (c)reated or (d)eleted file, or (a)bort? [test19.c d6fb010] Merge resolved by keeping file
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test19.d'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test19.  Version test19 of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in test19 and modified in HEAD.  Version HEAD of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (distinct types): submod had different types on each side; renamed one of them so each can be recorded somewhere.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
+
+Deleted merge conflict for 'file11':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+  {remote}: deleted
+Use (l)ocal or (r)emote, or (a)bort? Merging:
+submod~test19
+
+Deleted merge conflict for 'submod~test19':
+  {local}: deleted
+  {remote}: created file
+Use (c)reated or (d)eleted file, or (a)bort? [test19.d 78b901a] Merge resolved by keeping module
+ Author: A U Thor <author@example.com>
+HEAD is now at 78b901a Merge resolved by keeping module
+ok 19 - file vs modified submodule
+
+expecting success of 7610.20 'submodule in subdirectory': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	(
+		cd subdir &&
+		test_create_repo subdir_module &&
+		(
+		cd subdir_module &&
+		: >file15 &&
+		git add file15 &&
+		git commit -m "add initial versions"
+		)
+	) &&
+	test_when_finished "rm -rf subdir/subdir_module" &&
+	git submodule add file:///dev/null subdir/subdir_module &&
+	git add subdir/subdir_module &&
+	git commit -m "add submodule in subdirectory" &&
+
+	git checkout -b test$test_count.a test$test_count &&
+	git submodule update -N &&
+	(
+	cd subdir/subdir_module &&
+		git checkout -b super10.a &&
+		echo test$test_count.a >file15 &&
+		git add file15 &&
+		git commit -m "on branch 10.a"
+	) &&
+	git add subdir/subdir_module &&
+	git commit -m "change submodule in subdirectory on test$test_count.a" &&
+
+	git checkout -b test$test_count.b test$test_count &&
+	git submodule update -N &&
+	(
+		cd subdir/subdir_module &&
+		git checkout -b super10.b &&
+		echo test$test_count.b >file15 &&
+		git add file15 &&
+		git commit -m "on branch 10.b"
+	) &&
+	git add subdir/subdir_module &&
+	git commit -m "change submodule in subdirectory on test$test_count.b" &&
+
+	test_must_fail git merge test$test_count.a &&
+	(
+		cd subdir &&
+		yes "l" | git mergetool subdir_module
+	) &&
+	echo "test$test_count.b" >expect &&
+	test_cmp expect subdir/subdir_module/file15 &&
+	git submodule update -N &&
+	echo "test$test_count.b" >expect &&
+	test_cmp expect subdir/subdir_module/file15 &&
+	git reset --hard &&
+	git submodule update -N &&
+
+	test_must_fail git merge test$test_count.a &&
+	yes "r" | git mergetool subdir/subdir_module &&
+	echo "test$test_count.b" >expect &&
+	test_cmp expect subdir/subdir_module/file15 &&
+	git submodule update -N &&
+	echo "test$test_count.a" >expect &&
+	test_cmp expect subdir/subdir_module/file15 &&
+	git commit -m "branch1 resolved with mergetool"
+
+Switched to a new branch 'test20'
+M	submod
+Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t7610-mergetool/subdir/subdir_module/.git/
+[main (root-commit) 4026e0d] add initial versions
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file15
+Adding existing repo at 'subdir/subdir_module' to the index
+[test20 fa030bf] add submodule in subdirectory
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 subdir/subdir_module
+Switched to a new branch 'test20.a'
+Switched to a new branch 'super10.a'
+[super10.a e51e504] on branch 10.a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[test20.a 36380aa] change submodule in subdirectory on test20.a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'test20.b'
+M	subdir/subdir_module
+Submodule path 'subdir/subdir_module': checked out '4026e0d3f7d9c9cd867521d1177656769bfa2be1'
+Switched to a new branch 'super10.b'
+[super10.b e7cb421] on branch 10.b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[test20.b 6eae923] change submodule in subdirectory on test20.b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+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 (subdir/subdir_module), and either merge commit e51e504
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add subdir/subdir_module
+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 subdir/subdir_module
+CONFLICT (submodule): Merge conflict in subdir/subdir_module
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+subdir/subdir_module
+
+Submodule merge conflict for 'subdir/subdir_module':
+  {local}: submodule commit e7cb42147e351dde456e7d86fbe5ac89f43de679
+  {remote}: submodule commit e51e504244acbfadc9e7ea9868c3cced1088346d
+Use (l)ocal or (r)emote, or (a)bort? HEAD is now at 6eae923 change submodule in subdirectory on test20.b
+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 (subdir/subdir_module), and either merge commit e51e504
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add subdir/subdir_module
+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 subdir/subdir_module
+CONFLICT (submodule): Merge conflict in subdir/subdir_module
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+subdir/subdir_module
+
+Submodule merge conflict for 'subdir/subdir_module':
+  {local}: submodule commit e7cb42147e351dde456e7d86fbe5ac89f43de679
+  {remote}: submodule commit e51e504244acbfadc9e7ea9868c3cced1088346d
+Use (l)ocal or (r)emote, or (a)bort? Submodule path 'subdir/subdir_module': checked out 'e51e504244acbfadc9e7ea9868c3cced1088346d'
+[test20.b 9ad20f7] branch1 resolved with mergetool
+ Author: A U Thor <author@example.com>
+HEAD is now at 9ad20f7 branch1 resolved with mergetool
+ok 20 - submodule in subdirectory
+
+expecting success of 7610.21 'directory vs modified submodule': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	mv submod submod-movedaside &&
+	git rm --cached submod &&
+	mkdir submod &&
+	echo not a submodule >submod/file16 &&
+	git add submod/file16 &&
+	git commit -m "Submodule path becomes directory" &&
+
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	yes "l" | git mergetool submod &&
+	echo "not a submodule" >expect &&
+	test_cmp expect submod/file16 &&
+	rm -rf submod.orig &&
+
+	git reset --hard &&
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	test ! -e submod.orig &&
+	yes "r" | git mergetool submod~main &&
+	git mv submod submod.orig &&
+	git mv submod~main submod &&
+	test -d submod.orig &&
+	echo "not a submodule" >expect &&
+	test_cmp expect submod.orig/file16 &&
+	rm -r submod.orig &&
+	mv submod-movedaside/.git submod &&
+	( cd submod && git clean -f && git reset --hard ) &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git reset --hard &&
+	rm -rf submod-movedaside &&
+
+	git checkout -b test$test_count.c main &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	yes "l" | git mergetool submod &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+
+	git reset --hard &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	test ! -e submod.orig &&
+	yes "r" | git mergetool submod &&
+	echo "not a submodule" >expect &&
+	test_cmp expect submod/file16 &&
+
+	git reset --hard main &&
+	( cd submod && git clean -f && git reset --hard ) &&
+	git submodule update -N
+
+Switched to a new branch 'test21'
+rm 'submod'
+[test21 b88b6e4] Submodule path becomes directory
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 160000 submod
+ create mode 100644 submod/file16
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (file/directory): directory in the way of submod from main; moving it to submod~main instead.
+CONFLICT (modify/delete): submod~main deleted in HEAD and modified in main.  Version main of submod~main left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+No files need merging
+HEAD is now at b88b6e4 Submodule path becomes directory
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (file/directory): directory in the way of submod from main; moving it to submod~main instead.
+CONFLICT (modify/delete): submod~main deleted in HEAD and modified in main.  Version main of submod~main left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod~main
+
+Submodule merge conflict for 'submod~main':
+  {local}: deleted
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? warning: Could not find section in .gitmodules where path=submod~main
+HEAD is now at b5507ac Add bar on branch1
+Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
+warning: unable to rmdir 'submod': Directory not empty
+HEAD is now at b88b6e4 Submodule path becomes directory
+Switched to a new branch 'test21.c'
+warning: unable to rmdir 'submod': Directory not empty
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test21.  Version test21 of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in test21 and modified in HEAD.  Version HEAD of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (file/directory): directory in the way of submod from HEAD; moving it to submod~HEAD instead.
+CONFLICT (modify/delete): submod~HEAD deleted in test21 and modified in HEAD.  Version HEAD of submod~HEAD left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+No files need merging
+Skipping unmerged submodule submod~HEAD
+HEAD is now at 42ed12d main updates
+warning: unable to rmdir 'submod': Directory not empty
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test21.  Version test21 of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in test21 and modified in HEAD.  Version HEAD of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (file/directory): directory in the way of submod from HEAD; moving it to submod~HEAD instead.
+CONFLICT (modify/delete): submod~HEAD deleted in test21 and modified in HEAD.  Version HEAD of submod~HEAD left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+No files need merging
+HEAD is now at 42ed12d main updates
+HEAD is now at d1fea44 Add bar on main
+HEAD is now at 42ed12d main updates
+ok 21 - directory vs modified submodule
+
+expecting success of 7610.22 'file with no base': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_must_fail git merge main &&
+	git mergetool --no-prompt --tool mybase -- both &&
+	test_must_be_empty both
+
+Switched to a new branch 'test22'
+M	submod
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+HEAD is now at b56897f branch1 changes
+ok 22 - file with no base
+
+expecting success of 7610.23 'custom commands override built-ins': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config mergetool.defaults.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
+	test_config mergetool.defaults.trustExitCode true &&
+	test_must_fail git merge main &&
+	git mergetool --no-prompt --tool defaults -- both &&
+	echo main both added >expected &&
+	test_cmp expected both
+
+Switched to a new branch 'test23'
+M	submod
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+HEAD is now at b56897f branch1 changes
+ok 23 - custom commands override built-ins
+
+expecting success of 7610.24 'filenames seen by tools start with ./': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config mergetool.writeToTemp false &&
+	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
+	test_config mergetool.myecho.trustExitCode true &&
+	test_must_fail git merge main &&
+	git mergetool --no-prompt --tool myecho -- both >actual &&
+	grep ^\./both_LOCAL_ actual
+
+Switched to a new branch 'test24'
+M	submod
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+./both_LOCAL_2568615
+HEAD is now at b56897f branch1 changes
+ok 24 - filenames seen by tools start with ./
+
+checking prerequisite: MKTEMP
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-MKTEMP" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-MKTEMP" &&
+	tempdir=$(mktemp -d -t foo.XXXXXX) &&
+	test -d "$tempdir" &&
+	rmdir "$tempdir"
+
+)
+prerequisite MKTEMP ok
+expecting success of 7610.25 'temporary filenames are used with mergetool.writeToTemp': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config mergetool.writeToTemp true &&
+	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
+	test_config mergetool.myecho.trustExitCode true &&
+	test_must_fail git merge main &&
+	git mergetool --no-prompt --tool myecho -- both >actual &&
+	! grep ^\./both_LOCAL_ actual &&
+	grep /both_LOCAL_ actual
+
+Switched to a new branch 'test25'
+M	submod
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+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-EJstTB/both_LOCAL_2569270
+HEAD is now at b56897f branch1 changes
+ok 25 - temporary filenames are used with mergetool.writeToTemp
+
+expecting success of 7610.26 'diff.orderFile configuration is honored': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count order-file-side2 &&
+	test_config diff.orderFile order-file &&
+	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
+	test_config mergetool.myecho.trustExitCode true &&
+	echo b >order-file &&
+	echo a >>order-file &&
+	test_must_fail git merge order-file-side1 &&
+	cat >expect <<-\EOF &&
+		Merging:
+		b
+		a
+	EOF
+
+	# make sure "order-file" that is ambiguous between
+	# rev and path is understood correctly.
+	git branch order-file HEAD &&
+
+	git mergetool --no-prompt --tool myecho >output &&
+	git grep --no-index -h -A2 Merging: output >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'test26'
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+Auto-merging b
+CONFLICT (content): Merge conflict in b
+Recorded preimage for 'a'
+Recorded preimage for 'b'
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 50ba26c side2
+ok 26 - diff.orderFile configuration is honored
+
+expecting success of 7610.27 'mergetool -Oorder-file is honored': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count order-file-side2 &&
+	test_config diff.orderFile order-file &&
+	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
+	test_config mergetool.myecho.trustExitCode true &&
+	echo b >order-file &&
+	echo a >>order-file &&
+	test_must_fail git merge order-file-side1 &&
+	cat >expect <<-\EOF &&
+		Merging:
+		a
+		b
+	EOF
+	git mergetool -O/dev/null --no-prompt --tool myecho >output &&
+	git grep --no-index -h -A2 Merging: output >actual &&
+	test_cmp expect actual &&
+	git reset --hard &&
+
+	git config --unset diff.orderFile &&
+	test_must_fail git merge order-file-side1 &&
+	cat >expect <<-\EOF &&
+		Merging:
+		b
+		a
+	EOF
+	git mergetool -Oorder-file --no-prompt --tool myecho >output &&
+	git grep --no-index -h -A2 Merging: output >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'test27'
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+Auto-merging b
+CONFLICT (content): Merge conflict in b
+Recorded preimage for 'a'
+Recorded preimage for 'b'
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 50ba26c side2
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+Auto-merging b
+CONFLICT (content): Merge conflict in b
+Recorded preimage for 'a'
+Recorded preimage for 'b'
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 50ba26c side2
+ok 27 - mergetool -Oorder-file is honored
+
+expecting success of 7610.28 'mergetool --tool-help shows recognized tools': 
+	# Check a few known tools are correctly shown
+	git mergetool --tool-help >mergetools &&
+	grep vimdiff mergetools &&
+	grep vimdiff3 mergetools &&
+	grep gvimdiff2 mergetools &&
+	grep araxis mergetools &&
+	grep xxdiff mergetools &&
+	grep meld mergetools
+
+		gvimdiff         Use gVim (requires a graphical session) with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)
+		gvimdiff1        Use gVim (requires a graphical session) with a 2 panes layout (LOCAL and REMOTE)
+		gvimdiff2        Use gVim (requires a graphical session) with a 3 panes layout (LOCAL, MERGED and REMOTE)
+		gvimdiff3        Use gVim (requires a graphical session) where only the MERGED file is shown
+		nvimdiff         Use Neovim with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)
+		nvimdiff1        Use Neovim with a 2 panes layout (LOCAL and REMOTE)
+		nvimdiff2        Use Neovim with a 3 panes layout (LOCAL, MERGED and REMOTE)
+		nvimdiff3        Use Neovim where only the MERGED file is shown
+		vimdiff          Use Vim with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)
+		vimdiff1         Use Vim with a 2 panes layout (LOCAL and REMOTE)
+		vimdiff2         Use Vim with a 3 panes layout (LOCAL, MERGED and REMOTE)
+		vimdiff3         Use Vim where only the MERGED file is shown
+		gvimdiff3        Use gVim (requires a graphical session) where only the MERGED file is shown
+		nvimdiff3        Use Neovim where only the MERGED file is shown
+		vimdiff3         Use Vim where only the MERGED file is shown
+		gvimdiff2        Use gVim (requires a graphical session) with a 3 panes layout (LOCAL, MERGED and REMOTE)
+		araxis           Use Araxis Merge (requires a graphical session)
+		xxdiff           Use xxdiff (requires a graphical session)
+		meld             Use Meld (requires a graphical session) with optional `auto merge` (see `git help mergetool`'s `CONFIGURATION` section)
+ok 28 - mergetool --tool-help shows recognized tools
+
+expecting success of 7610.29 'mergetool hideResolved': 
+	test_config mergetool.hideResolved true &&
+	test_when_finished "git reset --hard" &&
+	git checkout -b test${test_count}_b main &&
+	test_write_lines >file1 base "" a &&
+	git commit -a -m "base" &&
+	test_write_lines >file1 base "" c &&
+	git commit -a -m "remote update" &&
+	git checkout -b test${test_count}_a HEAD~ &&
+	test_write_lines >file1 local "" b &&
+	git commit -a -m "local update" &&
+	test_must_fail git merge test${test_count}_b &&
+	yes "" | git mergetool file1 &&
+	test_write_lines >expect local "" c &&
+	test_cmp expect file1 &&
+	git commit -m "test resolved with mergetool"
+
+Switched to a new branch 'test29_b'
+[test29_b b1eadc5] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+[test29_b 27f9bad] remote update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'test29_a'
+[test29_a a3aa5f2] local update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Recorded preimage for 'file1'
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Recorded resolution for 'file1'.
+[test29_a 90808e5] test resolved with mergetool
+ Author: A U Thor <author@example.com>
+HEAD is now at 90808e5 test resolved with mergetool
+ok 29 - mergetool hideResolved
+
+expecting success of 7610.30 'mergetool with guiDefault': 
+	test_config merge.guitool myguitool &&
+	test_config mergetool.myguitool.cmd "(printf \"gui \" && cat \"\$REMOTE\") >\"\$MERGED\"" &&
+	test_config mergetool.myguitool.trustExitCode true &&
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+
+	test_config mergetool.guiDefault auto &&
+	DISPLAY=SOMETHING && export DISPLAY &&
+	yes "" | git mergetool both &&
+	yes "" | git mergetool file1 file1 &&
+
+	DISPLAY= && export DISPLAY &&
+	yes "" | git mergetool file2 "spaced name" &&
+
+	test_config mergetool.guiDefault true &&
+	yes "" | git mergetool subdir/file3 &&
+
+	yes "d" | git mergetool file11 &&
+	yes "d" | git mergetool file12 &&
+	yes "l" | git mergetool submod &&
+
+	echo "gui main updated" >expect &&
+	test_cmp expect file1 &&
+
+	echo "main new" >expect &&
+	test_cmp expect file2 &&
+
+	echo "gui main new sub" >expect &&
+	test_cmp expect subdir/file3 &&
+
+	echo "branch1 submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git commit -m "branch1 resolved with mergetool"
+
+Switched to a new branch 'test30'
+M	submod
+Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file1
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file2
+spaced name
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
 
-# passed all 28 test(s)
-1..28
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file11
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
+
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? [test30 a348a8f] branch1 resolved with mergetool
+ Author: A U Thor <author@example.com>
+HEAD is now at a348a8f branch1 resolved with mergetool
+ok 30 - mergetool with guiDefault
+
+expecting success of 7610.31 'mergetool with non-existent tool': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_must_fail git merge main &&
+	yes "" | test_must_fail git mergetool --tool=absent >out 2>&1 &&
+	test_grep "mergetool.absent.cmd not set for tool" out
+
+Switched to a new branch 'test31'
+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 (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+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"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+error: mergetool.absent.cmd not set for tool 'absent'
+HEAD is now at b56897f branch1 changes
+ok 31 - mergetool with non-existent tool
+
+# passed all 31 test(s)
+1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9153-git-svn-rewrite-uuid.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' < '/build/reproducible-path/git-2.51.0/t/t9153/svn.dump' &&
-	git svn init --minimize-url --rewrite-uuid='6cc8ada4-5932-4b4a-8242-3534ed8a3232' 'file:///build/reproducible-path/git-2.51.0/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' &&
-	git svn fetch
-	
-	A	foo
-r1 = 5dbf64841de66991261950a5ae8690fea14ca1b0 (refs/remotes/git-svn)
-	M	foo
-r2 = 50c9f2548750ce369c5d2da5d53afaf9f84764f8 (refs/remotes/git-svn)
+*** t9144-git-svn-old-rev_map.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 = 4242622b770c3e06fae51c3e668fd76438a10bbc (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo r2
-ok 1 - load svn repo
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo r1
+ok 1 - setup test repository with old layout
 
-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.51.0/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232
-git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@1 6cc8ada4-5932-4b4a-8242-3534ed8a3232
-ok 2 - verify uuid
+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 = b11536d18f007300bb822a95bc55b9456e6a40b2 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+[master 6d6e65b] -
+ 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.51.0/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo ...
+	M	b/a
+Committed r3
+	M	b/a
+r3 = e1416c7aebca2d2a3065022f0bb934aba29d528f (refs/remotes/git-svn)
+No changes between 6d6e65bca7b9fdec2dd79063781cc9c02cf8b031 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
@@ -541334,125 +542357,33 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9140-git-svn-reset.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9140-git-svn-reset/.git/
-expecting success of 9140.1 'setup test repository': 
-	svn_cmd co "$svnrepo" s &&
-	(
-		cd s &&
-		mkdir vis &&
-		echo always visible > vis/vis.txt &&
-		svn_cmd add vis &&
-		svn_cmd commit -m "create visible files" &&
-		mkdir hid &&
-		echo initially hidden > hid/hid.txt &&
-		svn_cmd add hid &&
-		svn_cmd commit -m "create initially hidden files" &&
-		svn_cmd up &&
-		echo mod >> vis/vis.txt &&
-		svn_cmd commit -m "modify vis" &&
-		svn_cmd up
-	)
-
-Checked out revision 0.
-A         vis
-A         vis/vis.txt
-Adding         vis
-Adding         vis/vis.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 1.
-A         hid
-A         hid/hid.txt
-Adding         hid
-Adding         hid/hid.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-Updating '.':
-At revision 2.
-Sending        vis/vis.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-Updating '.':
-At revision 3.
-ok 1 - setup test repository
-
-expecting success of 9140.2 'clone SVN repository with hidden directory': 
-	git svn init "$svnrepo" g &&
-	( cd g && git svn fetch --ignore-paths="^hid" )
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9140-git-svn-reset/g/.git/
-	A	vis/vis.txt
-r1 = 076694645e0bb85f464d9337f2508665081d7164 (refs/remotes/git-svn)
-r2 = 3196686dba6adcc00f7b3fdd914ec1df11460f1d (refs/remotes/git-svn)
-	M	vis/vis.txt
-r3 = 02568ed1f3d5b1e9ca561523cead9b97a9335b09 (refs/remotes/git-svn)
+*** t9153-git-svn-rewrite-uuid.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' < '/build/reproducible-path/git-2.51.0/t/t9153/svn.dump' &&
+	git svn init --minimize-url --rewrite-uuid='6cc8ada4-5932-4b4a-8242-3534ed8a3232' 'file:///build/reproducible-path/git-2.51.0/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' &&
+	git svn fetch
+	
+	A	foo
+r1 = 5dbf64841de66991261950a5ae8690fea14ca1b0 (refs/remotes/git-svn)
+	M	foo
+r2 = 50c9f2548750ce369c5d2da5d53afaf9f84764f8 (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9140-git-svn-reset/svnrepo r3
-ok 2 - clone SVN repository with hidden directory
-
-expecting success of 9140.3 'modify hidden file in SVN repo': 
-	( cd s &&
-	  echo mod hidden >> hid/hid.txt &&
-	  svn_cmd commit -m "modify hid" &&
-	  svn_cmd up
-	)
-
-Sending        hid/hid.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 4.
-Updating '.':
-At revision 4.
-ok 3 - modify hidden file in SVN repo
-
-expecting success of 9140.4 'fetch fails on modified hidden file': 
-	( cd g &&
-	  git svn find-rev refs/remotes/git-svn > ../expect &&
-	  test_must_fail git svn fetch 2> ../errors &&
-	  git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
-	grep "not found in commit" errors &&
-	test_cmp expect expect2
-
-hid/hid.txt was not found in commit 02568ed1f3d5b1e9ca561523cead9b97a9335b09 (r3)
-ok 4 - fetch fails on modified hidden file
-
-expecting success of 9140.5 'reset unwinds back to r1': 
-	( cd g &&
-	  git svn reset -r1 &&
-	  git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
-	echo 1 >expect &&
-	test_cmp expect expect2
-
-r1 = 076694645e0bb85f464d9337f2508665081d7164 (refs/remotes/git-svn)
-ok 5 - reset unwinds back to r1
-
-expecting success of 9140.6 'refetch succeeds not ignoring any files': 
-	( cd g &&
-	  git svn fetch &&
-	  git svn rebase &&
-	  grep "mod hidden" hid/hid.txt
-	)
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo r2
+ok 1 - load svn repo
 
-Index mismatch: a4b5c203f79112e92d530cb82366ca4d706fa4a8 != 6b5a1244749c8cdb5442eefd0abc3689d666322d
-rereading 076694645e0bb85f464d9337f2508665081d7164
-	A	hid/hid.txt
-r2 = 3cb0f601aa616730a0feb2e20ffd2b56af04c21a (refs/remotes/git-svn)
-	M	vis/vis.txt
-r3 = 05949bcf8cd3c49b3e2ddd1bfb8f25e3d9595017 (refs/remotes/git-svn)
-	M	hid/hid.txt
-r4 = c92f768b39c324306be0424ccb152f30d3d6918a (refs/remotes/git-svn)
-warning: skipped previously applied commit 02568ed
-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.
-mod hidden
-ok 6 - refetch succeeds not ignoring any files
+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.51.0/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232
+git-svn-id: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@1 6cc8ada4-5932-4b4a-8242-3534ed8a3232
+ok 2 - verify uuid
 
-# passed all 6 test(s)
-1..6
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9152-svn-empty-dirs-after-gc.sh ***
@@ -541482,19 +542413,19 @@
 expecting success of 9152.2 'clone': git svn clone "$svnrepo" cloned
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9152-svn-empty-dirs-after-gc/cloned/.git/
 W: +empty_dir: a
-r1 = 245a954479602241305d6ebc2699479821c3fd79 (refs/remotes/git-svn)
+r1 = a50dadf72800812fe95849848c02650b12a883f0 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = 7b260c4eaa548103712ee7640d5c1e437ff6b000 (refs/remotes/git-svn)
+r2 = 9e8f6b83a980d302a54934de337c4bce4ba40ca0 (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = 73678f004bb77dd39bbb0859ea52ede757c29d8d (refs/remotes/git-svn)
+r3 = fd1a7dc094ddf32fa94b904c0222238fe33ed07d (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = 4f778c25364efbd13b4781b37657427033955bb0 (refs/remotes/git-svn)
+r4 = 6ec0c54ed5f3d156d22b0591efc32ed1cc03aefa (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = 5c3d452908176b2f6fad1c2c2a0887c122493167 (refs/remotes/git-svn)
+r5 = 052bb72519e9ccdc2640cf26109cc15e84670d5e (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = 6fbec9ea7a011a2b3b232152a82c8235420f2ca5 (refs/remotes/git-svn)
+r6 = 06af4b585e5608a39fdbd7b24ca60fbdcf6a7da4 (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = 39a1709e5eb1fa5f1fbb91b92042ac95681330e6 (refs/remotes/git-svn)
+r7 = ed4abd970315269ea1198e5fe7d3cfe75b17e75f (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9152-svn-empty-dirs-after-gc/svnrepo r7
 creating empty directory: a
@@ -541611,43 +542542,43 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9155-git-svn-fetch-deleted-tag/git_project/.git/
 	A	subdir/file
-r1 = 1a7a2eddf7cd7bcca052a768d98127e7e416e4ea (refs/remotes/origin/trunk)
-r2 = 1cb65835a72ae598011cf49e11463a68dd4b2178 (refs/remotes/origin/mybranch)
+r1 = 4191c2ca15392923035288303e8303be3d9d8bf4 (refs/remotes/origin/trunk)
+r2 = 38e26105d1bd22590e704c8b49bd1bd91b00c2e0 (refs/remotes/origin/mybranch)
 	A	trunk/subdir/file
-r3 = 19dc3cca46994fcbb84aad558488f16c22e4a66a (refs/remotes/origin/mybranch)
+r3 = 71534a5b6fdb9c9c43d715ad0c09ce5fca4cdc6b (refs/remotes/origin/mybranch)
 	M	subdir/file
-r4 = cf07cb48c8ee197a71f36ed145d81663cf2588f7 (refs/remotes/origin/trunk)
+r4 = 9968e8dfa8660437b344a0de84a66255c9d194b5 (refs/remotes/origin/trunk)
 	M	trunk/subdir/file
-r5 = 2a768acfcff6489a252aa0a48fbcceefbfff3c6b (refs/remotes/origin/mybranch)
+r5 = 7d3cf7bbed4630dba11326ee3d17bfdb3e5757cc (refs/remotes/origin/mybranch)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/tags/mytag, 5
 Initializing parent: refs/remotes/origin/tags/mytag@5
 	A	file
-r1 = 63f38f8dfe35639728a5470c6d24e5af66139f82 (refs/remotes/origin/tags/mytag@5)
+r1 = 107fa26a9cb6253af8468ea91e93e4fff616d429 (refs/remotes/origin/tags/mytag@5)
 	M	file
-r4 = 847a7e2049cb8063ee284eb9e8ceccf4bd43d79e (refs/remotes/origin/tags/mytag@5)
-Found branch parent: (refs/remotes/origin/tags/mytag) 847a7e2049cb8063ee284eb9e8ceccf4bd43d79e
+r4 = 027d852dddf944f4c2287fc28613ad6510c5efd2 (refs/remotes/origin/tags/mytag@5)
+Found branch parent: (refs/remotes/origin/tags/mytag) 027d852dddf944f4c2287fc28613ad6510c5efd2
 Following parent with do_switch
 Successfully followed parent
-r6 = 2ed0c43372cadfaff0b8efb97d70d4b2177b4740 (refs/remotes/origin/tags/mytag)
+r6 = d5008df6e97d714c7cc07496ee03a6c0ea8f4988 (refs/remotes/origin/tags/mytag)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/branches/mybranch/trunk/subdir => file:///build/reproducible-path/git-2.51.0/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.51.0/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.51.0/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 = 63f38f8dfe35639728a5470c6d24e5af66139f82 (refs/remotes/origin/tags/mytag@2)
-Found branch parent: (refs/remotes/origin/tags/mytag@5-) 63f38f8dfe35639728a5470c6d24e5af66139f82
+r1 = 107fa26a9cb6253af8468ea91e93e4fff616d429 (refs/remotes/origin/tags/mytag@2)
+Found branch parent: (refs/remotes/origin/tags/mytag@5-) 107fa26a9cb6253af8468ea91e93e4fff616d429
 Following parent with do_switch
 Successfully followed parent
-r3 = 855d4f70f1962e499f417f62523bfd65b6cdde79 (refs/remotes/origin/tags/mytag@5-)
+r3 = 49c80ba15c28e12780378121c46761db94de0c17 (refs/remotes/origin/tags/mytag@5-)
 	M	file
-r5 = 26201710c29a8917a158b5d60b9969dbde6a470f (refs/remotes/origin/tags/mytag@5-)
-Found branch parent: (refs/remotes/origin/tags/mytag) 26201710c29a8917a158b5d60b9969dbde6a470f
+r5 = 1f704ed66411dd9b541e5d79c691db36f0871e6d (refs/remotes/origin/tags/mytag@5-)
+Found branch parent: (refs/remotes/origin/tags/mytag) 1f704ed66411dd9b541e5d79c691db36f0871e6d
 Index mismatch: 13f9c6ca01f81b94d8eca8eba510eafa2445e890 != 343cf4718d6a013cf33cf3cea8e0dc0a8efa64dc
-rereading 26201710c29a8917a158b5d60b9969dbde6a470f
+rereading 1f704ed66411dd9b541e5d79c691db36f0871e6d
 Following parent with do_switch
 Successfully followed parent
-r8 = 12f3b79214a19c56004a8fbc52d72080db5b7d93 (refs/remotes/origin/tags/mytag)
+r8 = e0f7fae2317b77fbc3c0c70a7a75dd20eaf1cc5a (refs/remotes/origin/tags/mytag)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk r4
 ok 2 - fetch deleted tags from same revision with checksum error
@@ -541656,102 +542587,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9158-git-svn-mergeinfo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 = 964b49b9cad94f0e2a1d02bcc07ad94cda7c8ec1 (refs/remotes/git-svn)
-	A	foo
-r2 = fbfaf3a106d61e86c7cf112086246b5aa0eaee83 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/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 b87a2e6] 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.51.0/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.51.0/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/foo
-r3 = 4310bc2eb8a992ced305fe8ff7394f0860b474d3 (refs/remotes/git-svn)
-No changes between b87a2e6edddae916c79317d1ed4cfd55b0973b45 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 4a6196c] 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.51.0/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.51.0/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/bar
-Couldn't find revmap for file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/other
-r4 = 82506aca2e3378994977dc677ec550eaa8add06b (refs/remotes/git-svn)
-No changes between 4a6196c5702937a2705cdcdfe1317d6ad46a5b5c 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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9156-git-svn-fetch-deleted-tag-2.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9156-git-svn-fetch-deleted-tag-2/.git/
 expecting success of 9156.1 'setup svn repo': 
@@ -541829,45 +542664,45 @@
 	A	subdir1/file
 	A	subdir2/file
 	A	subdir3/file
-r1 = 1d358d24e23f2ac550f4cad376eafdcd7b098698 (refs/remotes/origin/trunk)
+r1 = e7cee3b6f8fbb4ef06599e9a78712afab1c87ad8 (refs/remotes/origin/trunk)
 	M	subdir1/file
 	M	subdir2/file
 	M	subdir3/file
-r2 = 93453e0a8f3e8ceecd9fc0d72b27cf5d91c32b22 (refs/remotes/origin/trunk)
+r2 = 693b3826ccd6bb37059a3908bc4d729e9d6f5160 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir1 => file:///build/reproducible-path/git-2.51.0/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 = 16a50bc2e93e51483d05097a4cf17d024aab1d0b (refs/remotes/origin/tags/mytag@2)
+r1 = 4941cd99134fa0c128657fde140bf88248ee527f (refs/remotes/origin/tags/mytag@2)
 	M	file
-r2 = 39d1d153ebe3803f84606083e1480579449a57c8 (refs/remotes/origin/tags/mytag@2)
-Found branch parent: (refs/remotes/origin/tags/mytag) 39d1d153ebe3803f84606083e1480579449a57c8
+r2 = 7bb867f39c1919555db02e29a31a62464c2891c3 (refs/remotes/origin/tags/mytag@2)
+Found branch parent: (refs/remotes/origin/tags/mytag) 7bb867f39c1919555db02e29a31a62464c2891c3
 Following parent with do_switch
 Successfully followed parent
-r3 = 884fb61500c9f19b0717c1ac1407a76170ea13cd (refs/remotes/origin/tags/mytag)
+r3 = 1c49520ab7caba18ddba31e24e908225aa150fb6 (refs/remotes/origin/tags/mytag)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir2 => file:///build/reproducible-path/git-2.51.0/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 = 881d3d8f1bdb75711f1c72cf6b9d4fd81b5bcd06 (refs/remotes/origin/tags/mytag@2-)
+r1 = ee9ef794ed5c5bc935c7dc13a4c5702b1506af41 (refs/remotes/origin/tags/mytag@2-)
 	M	file
-r2 = a83c8ecd91acfc831ba17ac21b58ff3d7974d1a0 (refs/remotes/origin/tags/mytag@2-)
-Found branch parent: (refs/remotes/origin/tags/mytag) a83c8ecd91acfc831ba17ac21b58ff3d7974d1a0
+r2 = e03189f5127b5f99dfc2c5ac5f57eadaae3ff6cd (refs/remotes/origin/tags/mytag@2-)
+Found branch parent: (refs/remotes/origin/tags/mytag) e03189f5127b5f99dfc2c5ac5f57eadaae3ff6cd
 Index mismatch: 03a4eca29b077f8b0867e84854a2c6e71eeac380 != 7745dab6988f4d78b3241eec1b66b56c15e67e83
-rereading a83c8ecd91acfc831ba17ac21b58ff3d7974d1a0
+rereading e03189f5127b5f99dfc2c5ac5f57eadaae3ff6cd
 Following parent with do_switch
 Successfully followed parent
-r5 = 0cc48faaa91c553a37d94e3247467be5250f3c4e (refs/remotes/origin/tags/mytag)
+r5 = b70f74f71799d8dd812eec8f7509bfd545b18421 (refs/remotes/origin/tags/mytag)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir3 => file:///build/reproducible-path/git-2.51.0/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 = eac0733bdbcd7a967c07b5940967a5b2cac78ca3 (refs/remotes/origin/tags/mytag@2--)
+r1 = 27f23efe9038abe3f9c9500f2758ed695b2576d2 (refs/remotes/origin/tags/mytag@2--)
 	M	file
-r2 = 549ee7812151c4fe2956d4540c5a678b40ea3b6e (refs/remotes/origin/tags/mytag@2--)
-Found branch parent: (refs/remotes/origin/tags/mytag) 549ee7812151c4fe2956d4540c5a678b40ea3b6e
+r2 = 1da944df9c0a1728abe1c340c7c220b009aff2fc (refs/remotes/origin/tags/mytag@2--)
+Found branch parent: (refs/remotes/origin/tags/mytag) 1da944df9c0a1728abe1c340c7c220b009aff2fc
 Index mismatch: de577018db9919b0130637aa9ac28b5dabe70913 != 03a4eca29b077f8b0867e84854a2c6e71eeac380
-rereading 549ee7812151c4fe2956d4540c5a678b40ea3b6e
+rereading 1da944df9c0a1728abe1c340c7c220b009aff2fc
 Following parent with do_switch
 Successfully followed parent
-r7 = db187537df3dbfe36aed25535807e314a995a331 (refs/remotes/origin/tags/mytag)
+r7 = 6c4c9067e853db6fab4310bdf282e4478cb9671e (refs/remotes/origin/tags/mytag)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/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
@@ -541876,259 +542711,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9154-git-svn-fancy-glob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9154-git-svn-fancy-glob/.git/
-expecting success of 9154.1 'load svn repo': 
-	svnadmin load -q '/build/reproducible-path/git-2.51.0/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' < '/build/reproducible-path/git-2.51.0/t/t9154/svn.dump' &&
-	git svn init --minimize-url -T trunk 'file:///build/reproducible-path/git-2.51.0/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' &&
-	git svn fetch
-	
-	A	foo
-r1 = cfcadcac30ca41ea73ddfeabffbc16eb41f030f5 (refs/remotes/origin/trunk)
-	M	foo
-r6 = 5da6c7fdf79891e383d6d1d0ae6a57b2d55f78fd (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk r6
-ok 1 - load svn repo
-
-expecting success of 9154.2 'add red branch': 
-	git config svn-remote.svn.branches 'branches/{red}:refs/remotes/*' &&
-	git svn fetch &&
-	git rev-parse refs/remotes/red &&
-	test_must_fail git rev-parse refs/remotes/green &&
-	test_must_fail git rev-parse refs/remotes/blue
-	
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/red, 1
-Found branch parent: (refs/remotes/red) cfcadcac30ca41ea73ddfeabffbc16eb41f030f5
-Following parent with do_switch
-Successfully followed parent
-r2 = e4afa3ce5cfa5c388c6de80d4fded80b1bd145ae (refs/remotes/red)
-	M	foo
-r3 = ef6cb22d607798435e11295db8318ab8488b5b6c (refs/remotes/red)
-ef6cb22d607798435e11295db8318ab8488b5b6c
-fatal: ambiguous argument 'refs/remotes/green': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/green
-fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/blue
-ok 2 - add red branch
-
-expecting success of 9154.3 'add gre branch': 
-	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
-	git config svn-remote.svn.branches 'branches/{red,gre}:refs/remotes/*' &&
-	git svn fetch &&
-	git rev-parse refs/remotes/red &&
-	test_must_fail git rev-parse refs/remotes/green &&
-	test_must_fail git rev-parse refs/remotes/blue
-	
-ef6cb22d607798435e11295db8318ab8488b5b6c
-fatal: ambiguous argument 'refs/remotes/green': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/green
-fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/blue
-ok 3 - add gre branch
-
-expecting success of 9154.4 'add green branch': 
-	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
-	git config svn-remote.svn.branches 'branches/{red,green}:refs/remotes/*' &&
-	git svn fetch &&
-	git rev-parse refs/remotes/red &&
-	git rev-parse refs/remotes/green &&
-	test_must_fail git rev-parse refs/remotes/blue
-	
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/green, 1
-Found branch parent: (refs/remotes/green) cfcadcac30ca41ea73ddfeabffbc16eb41f030f5
-Following parent with do_switch
-Successfully followed parent
-r2 = 1296ced4ca8c59b5476bfe4707788db898ed6dbb (refs/remotes/green)
-	M	foo
-r4 = 3d7cd2a0a223fa3fb1849082635afc97c47270f5 (refs/remotes/green)
-ef6cb22d607798435e11295db8318ab8488b5b6c
-3d7cd2a0a223fa3fb1849082635afc97c47270f5
-fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/blue
-ok 4 - add green branch
-
-expecting success of 9154.5 'add all branches': 
-	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
-	git config svn-remote.svn.branches 'branches/*:refs/remotes/*' &&
-	git svn fetch &&
-	git rev-parse refs/remotes/red &&
-	git rev-parse refs/remotes/green &&
-	git rev-parse refs/remotes/blue
-	
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/blue, 1
-Found branch parent: (refs/remotes/blue) cfcadcac30ca41ea73ddfeabffbc16eb41f030f5
-Following parent with do_switch
-Successfully followed parent
-r2 = 6fe2657a14909f221a0591a7a40bca7f7f89ca4d (refs/remotes/blue)
-	M	foo
-r5 = 2e74739bd967f3c8865a3a0d4e02caf3fecc3b58 (refs/remotes/blue)
-ef6cb22d607798435e11295db8318ab8488b5b6c
-3d7cd2a0a223fa3fb1849082635afc97c47270f5
-2e74739bd967f3c8865a3a0d4e02caf3fecc3b58
-ok 5 - add all branches
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9157-git-svn-fetch-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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.
-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.
-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 9157.2 'clone svn repo': 
-	git svn init -s "$svnrepo" &&
-	git svn fetch
-
-r1 = 0d7ef6f57485699a50f83aaf347779b39ec3de4a (refs/remotes/origin/trunk)
-	A	foo
-r3 = 3174ad553c21ef11ac204c930cb9319fac6e9783 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 3174ad553c21ef11ac204c930cb9319fac6e9783
-Following parent with do_switch
-Successfully followed parent
-r4 = 04bf48b23a22d5a1f3c3624ef8e5a8d970cbc0a7 (refs/remotes/origin/branch1)
-	A	bar
-r5 = 1a558863596227ed3d7d9a10a42ad4e0d2e7fe50 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) 1a558863596227ed3d7d9a10a42ad4e0d2e7fe50
-Following parent with do_switch
-Successfully followed parent
-r6 = 8ccbf0647184b2ebc475e26f7c227e41047f8d4e (refs/remotes/origin/branch2)
-	A	baz
-r7 = bccdaae435d14d736a182c2ce1b67f854b12f3c2 (refs/remotes/origin/branch1)
-	A	baz
-Checking svn:mergeinfo changes since r5: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-7): bccdaae435d14d736a182c2ce1b67f854b12f3c2
-r8 = b22965a39b8352f3341f1a56941a654817254b9d (refs/remotes/origin/trunk)
-	A	baz
-Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-8): bccdaae435d14d736a182c2ce1b67f854b12f3c2
-r9 = cbbe7fd30799d7b01978b48e8b86b2939bb2d5d3 (refs/remotes/origin/branch2)
-Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
-Found merge parent (/branches/branch2:6-9): cbbe7fd30799d7b01978b48e8b86b2939bb2d5d3
-r10 = 7efd66dc17f4375c030f45aa9212cd49493c32b4 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/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
-cbbe7fd30799d7b01978b48e8b86b2939bb2d5d3
-ok 3 - verify merge commit
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9148-git-svn-propset.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9148-git-svn-propset/.git/
 expecting success of 9148.1 'setup propset via import': 
@@ -542167,7 +542749,7 @@
 	A	foo
 	A	subdir/foo_subdir
 	A	subdir/subdir2/foo_subdir2
-r1 = e360c3d377988ac61b315f0dbabe1d6e7bac2c8c (refs/remotes/git-svn)
+r1 = 14f3b3a7e5aa09d5f0a7934a0dd1b58707ac492a (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9148-git-svn-propset/svnrepo r1
 ok 3 - fetch revisions from svn
@@ -542179,7 +542761,7 @@
 	confirm_props "." "foo" "svn:keywords" "FreeBSD=%H" &&
 	rm -rf svn_project
 	
-[master 720f84f] testing propset
+[master 1246feb] testing propset
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -542187,8 +542769,8 @@
 	M	foo
 Committed r2
 	M	foo
-r2 = e7b638b0ff56c78131dee003f116a7910e1bcd97 (refs/remotes/git-svn)
-No changes between 720f84f310a94e5ef6c3f97cc2b40f2e4173f39f and refs/remotes/git-svn
+r2 = 16d369f03e5c2491ffe5a90807690459c6b56325 (refs/remotes/git-svn)
+No changes between 1246feb73f1c5ca69b67bcee0f09c756213c06dc and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 A    svn_project/foo
 A    svn_project/subdir
@@ -542207,7 +542789,7 @@
 		"svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes &&
 	rm -rf svn_project
 	
-[master 41df315] testing propset
+[master a1be933] testing propset
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -542215,8 +542797,8 @@
 	M	foo
 Committed r3
 	M	foo
-r3 = 1e0c9b06309e569ebeed21f17e8866a6f25692e6 (refs/remotes/git-svn)
-No changes between 41df315d13813ba1bb744563835086afa307840a and refs/remotes/git-svn
+r3 = 4dd998c536c9e5d9eba495a7be2113bbf92f386a (refs/remotes/git-svn)
+No changes between a1be93353f81b709a0061fed3047236675f93ec2 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 A    svn_project/foo
 A    svn_project/subdir
@@ -542233,7 +542815,7 @@
 	confirm_props "." "$foo_subdir2" "svn:keywords" "FreeBSD=%H" &&
 	rm -rf svn_project
 	
-[master beab8f9] testing propset
+[master 08ade77] testing propset
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -542241,8 +542823,8 @@
 	M	subdir/subdir2/foo_subdir2
 Committed r4
 	M	subdir/subdir2/foo_subdir2
-r4 = 5018deaa21f85b9cbee37838c919d0b3a2a7d556 (refs/remotes/git-svn)
-No changes between beab8f9c51623ea75be1aa1c2c535e5ef38bdef2 and refs/remotes/git-svn
+r4 = 7ce7e14aee4ed729d0af0fd6ec325417ff0df06b (refs/remotes/git-svn)
+No changes between 08ade77ed473cb44d8a00e4658cb168957dc54a7 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 A    svn_project/foo
 A    svn_project/subdir
@@ -542261,7 +542843,7 @@
 		svn:keywords "FreeBSD=%H" &&
 	rm -rf svn_project
 	
-[master d5979b0] testing propset
+[master c4cf5c7] testing propset
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -542269,8 +542851,8 @@
 	M	subdir/foo_subdir
 Committed r5
 	M	subdir/foo_subdir
-r5 = 8b4dd9fec7eb84b5b42569aa0abe5bf4a67c6a92 (refs/remotes/git-svn)
-No changes between d5979b05b1852adcea69582cb7c4732361a18e11 and refs/remotes/git-svn
+r5 = e6ef65c2d6cfdbe813614cea2cc5992282dad5b3 (refs/remotes/git-svn)
+No changes between c4cf5c7c96442dd33f3414b6ebc8019c146f78dd and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 A    svn_project/foo
 A    svn_project/subdir
@@ -542338,8 +542920,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9147-git-svn-include-paths/g/.git/
 	A	qqq/test_qqq.txt
-r1 = f6e458bb6dc5974ac5d5002b813d99969a2c24a1 (refs/remotes/git-svn)
-r2 = d23d9ab0f6c69c55fe1822375c8aa923946cd1ed (refs/remotes/git-svn)
+r1 = 29a7902dbb2371061605a10f80202e4da52f5c5e (refs/remotes/git-svn)
+r2 = 9d066b00f6bc03596af8ad696bf88a38b119cb88 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
 ok 2 - clone an SVN repository with filter to include qqq directory
@@ -542354,8 +542936,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9147-git-svn-include-paths/c/.git/
 	A	qqq/test_qqq.txt
-r1 = f6e458bb6dc5974ac5d5002b813d99969a2c24a1 (refs/remotes/git-svn)
-r2 = d23d9ab0f6c69c55fe1822375c8aa923946cd1ed (refs/remotes/git-svn)
+r1 = 29a7902dbb2371061605a10f80202e4da52f5c5e (refs/remotes/git-svn)
+r2 = 9d066b00f6bc03596af8ad696bf88a38b119cb88 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
 ok 3 - init+fetch an SVN repository with included qqq directory
@@ -542398,7 +542980,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = 378b40e01d27419c42233cf76ed5876781054c4b (refs/remotes/git-svn)
+r3 = 1eacb6c8830414fadfda01401ba485d7f7d394b9 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 6 - update git svn-cloned repo (config include)
 
@@ -542413,7 +542995,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = 378b40e01d27419c42233cf76ed5876781054c4b (refs/remotes/git-svn)
+r3 = 1eacb6c8830414fadfda01401ba485d7f7d394b9 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 7 - update git svn-cloned repo (option include)
 
@@ -542445,7 +543027,7 @@
 		rm expect expect2
 	)
 
-r4 = 7e4094f4bd2a0860ae656ddd6a39e8c9ae369db9 (refs/remotes/git-svn)
+r4 = fac9f1ba1cbfc92f63ac608e8451e95da4eea73b (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 9 - update git svn-cloned repo (config include)
 
@@ -542459,7 +543041,7 @@
 		rm expect expect2
 	)
 
-r4 = 7e4094f4bd2a0860ae656ddd6a39e8c9ae369db9 (refs/remotes/git-svn)
+r4 = fac9f1ba1cbfc92f63ac608e8451e95da4eea73b (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 10 - update git svn-cloned repo (option include)
 
@@ -542494,7 +543076,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = a04b2e646e670e769e13b2443bdf3dd8cc44c28e (refs/remotes/git-svn)
+r5 = dbd76edc9f1fc8f9aca464aac890d8fa86733015 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 12 - update git svn-cloned repo again (config include)
 
@@ -542509,7 +543091,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = a04b2e646e670e769e13b2443bdf3dd8cc44c28e (refs/remotes/git-svn)
+r5 = dbd76edc9f1fc8f9aca464aac890d8fa86733015 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 13 - update git svn-cloned repo again (option include)
 
@@ -542517,6 +543099,102 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9158-git-svn-mergeinfo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 = ef4d2e9a7175a47b2e21764f839aec89e4e21cec (refs/remotes/git-svn)
+	A	foo
+r2 = f40faf74a1e56c67a3132ac9b6f360ee87cea9a7 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/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 4c1d7e4] 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.51.0/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.51.0/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/foo
+r3 = 638f5db136118b249245e9bce96e0ba2e35a067b (refs/remotes/git-svn)
+No changes between 4c1d7e4f0a26b42ef4ec1aa188780e3e48b54f86 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 e461aa5] 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.51.0/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.51.0/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/bar
+Couldn't find revmap for file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/other
+r4 = 86eadd3adfa25f8df735bc4b2296a835dc1c50ae (refs/remotes/git-svn)
+No changes between e461aa54a8d4c93e60875e16d10e13b960e859dd 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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9159-git-svn-no-parent-mergeinfo.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9159-git-svn-no-parent-mergeinfo/.git/
 expecting success of 9159.1 'test handling of root commits in merge ranges': 
@@ -542591,29 +543269,29 @@
 Committing transaction...
 Committed revision 8.
 	A	file.txt
-r1 = b8e91584c0802505c5b1da848c5eaad2b00a9245 (refs/remotes/origin/trunk)
+r1 = 2d6318f965b34a38f9f6307f201dfaac67cd7d56 (refs/remotes/origin/trunk)
 	M	file.txt
-r2 = 1a818df406f25a1147bd100e0f4131bdd6b6a9b8 (refs/remotes/origin/trunk)
+r2 = fd2fdba03d0d36b3463ff16f971721f0782d1738 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) b8e91584c0802505c5b1da848c5eaad2b00a9245
+Found branch parent: (refs/remotes/origin/a) 2d6318f965b34a38f9f6307f201dfaac67cd7d56
 Following parent with do_switch
 Successfully followed parent
-r3 = 82844436869636c78cb7641eeefe3b130cfafae0 (refs/remotes/origin/a)
+r3 = 982b0e063ae9fb2dc010fade643bb1d6b1a80cb0 (refs/remotes/origin/a)
 Checking svn:mergeinfo changes since r3: 1 sources, 1 changed
-Found merge parent (/trunk:1-2): 1a818df406f25a1147bd100e0f4131bdd6b6a9b8
-r4 = 6524b07e04343bd8b19609ac30c9ef83ecadbedb (refs/remotes/origin/a)
+Found merge parent (/trunk:1-2): fd2fdba03d0d36b3463ff16f971721f0782d1738
+r4 = 03fdfaed39508b087861fa4321c342cbc29143ad (refs/remotes/origin/a)
 	A	file2.txt
-r5 = 9c5a867dadf0b3a37d7de737d9771a85bb4a5938 (refs/remotes/origin/b)
+r5 = 253e25070b1ebab0195da2468651a6d730dd0e4f (refs/remotes/origin/b)
 	M	file2.txt
-r6 = df3bb2c1f166fec9bbb32ec4cb9f4415a497aa09 (refs/remotes/origin/b)
+r6 = 1eaf60b39dad4eb377275e9b5565a785badf17e1 (refs/remotes/origin/b)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/b => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/c, 5
-Found branch parent: (refs/remotes/origin/c) 9c5a867dadf0b3a37d7de737d9771a85bb4a5938
+Found branch parent: (refs/remotes/origin/c) 253e25070b1ebab0195da2468651a6d730dd0e4f
 Following parent with do_switch
 Successfully followed parent
-r7 = 48f2065cf7a437afd01666171f16bfcdad5554cd (refs/remotes/origin/c)
+r7 = 755929ec36203d54ead4bf51dda627d2dfbb8626 (refs/remotes/origin/c)
 Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/branches/b:5-6): df3bb2c1f166fec9bbb32ec4cb9f4415a497aa09
-r8 = 7555cb416777120e2e69b909238d8334dc613247 (refs/remotes/origin/c)
+Found merge parent (/branches/b:5-6): 1eaf60b39dad4eb377275e9b5565a785badf17e1
+r8 = 96802101077e44399bf7b12366be54d4fcd3cb44 (refs/remotes/origin/c)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk r2
 ok 1 - test handling of root commits in merge ranges
@@ -542622,6 +543300,259 @@
 1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9157-git-svn-fetch-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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 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.
+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.
+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 9157.2 'clone svn repo': 
+	git svn init -s "$svnrepo" &&
+	git svn fetch
+
+r1 = b3344f2f589086f4bb6ef77518ded1a96cb578f7 (refs/remotes/origin/trunk)
+	A	foo
+r3 = 13505356bb0ef4bd9f8124af06a682f70adb4d81 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch1, 3
+Found branch parent: (refs/remotes/origin/branch1) 13505356bb0ef4bd9f8124af06a682f70adb4d81
+Following parent with do_switch
+Successfully followed parent
+r4 = 7bf8e62b5212eec9883af32c292f591c397db7cf (refs/remotes/origin/branch1)
+	A	bar
+r5 = 0cbbc200e8a9dc099fe2876a04618d7d9247189a (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch2, 5
+Found branch parent: (refs/remotes/origin/branch2) 0cbbc200e8a9dc099fe2876a04618d7d9247189a
+Following parent with do_switch
+Successfully followed parent
+r6 = 337c8301e4868ca9e4a4fef043aff7cc96388294 (refs/remotes/origin/branch2)
+	A	baz
+r7 = ebcdc53b5e747fb04f3aa0115376dcde9cd6345e (refs/remotes/origin/branch1)
+	A	baz
+Checking svn:mergeinfo changes since r5: 1 sources, 1 changed
+Found merge parent (/branches/branch1:4-7): ebcdc53b5e747fb04f3aa0115376dcde9cd6345e
+r8 = 4b4554ce811ac46c79a68632b9a687c6f2e057fb (refs/remotes/origin/trunk)
+	A	baz
+Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
+Found merge parent (/branches/branch1:4-8): ebcdc53b5e747fb04f3aa0115376dcde9cd6345e
+r9 = a7862a1ea32c8ac759d3e42fb9f6cf7c47896136 (refs/remotes/origin/branch2)
+Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
+Found merge parent (/branches/branch2:6-9): a7862a1ea32c8ac759d3e42fb9f6cf7c47896136
+r10 = d4eeaec05d38e66c99e5eacff6586bedb2630cf0 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/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
+a7862a1ea32c8ac759d3e42fb9f6cf7c47896136
+ok 3 - verify merge commit
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9154-git-svn-fancy-glob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9154-git-svn-fancy-glob/.git/
+expecting success of 9154.1 'load svn repo': 
+	svnadmin load -q '/build/reproducible-path/git-2.51.0/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' < '/build/reproducible-path/git-2.51.0/t/t9154/svn.dump' &&
+	git svn init --minimize-url -T trunk 'file:///build/reproducible-path/git-2.51.0/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' &&
+	git svn fetch
+	
+	A	foo
+r1 = cfcadcac30ca41ea73ddfeabffbc16eb41f030f5 (refs/remotes/origin/trunk)
+	M	foo
+r6 = 5da6c7fdf79891e383d6d1d0ae6a57b2d55f78fd (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk r6
+ok 1 - load svn repo
+
+expecting success of 9154.2 'add red branch': 
+	git config svn-remote.svn.branches 'branches/{red}:refs/remotes/*' &&
+	git svn fetch &&
+	git rev-parse refs/remotes/red &&
+	test_must_fail git rev-parse refs/remotes/green &&
+	test_must_fail git rev-parse refs/remotes/blue
+	
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/red, 1
+Found branch parent: (refs/remotes/red) cfcadcac30ca41ea73ddfeabffbc16eb41f030f5
+Following parent with do_switch
+Successfully followed parent
+r2 = e4afa3ce5cfa5c388c6de80d4fded80b1bd145ae (refs/remotes/red)
+	M	foo
+r3 = ef6cb22d607798435e11295db8318ab8488b5b6c (refs/remotes/red)
+ef6cb22d607798435e11295db8318ab8488b5b6c
+fatal: ambiguous argument 'refs/remotes/green': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/green
+fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/blue
+ok 2 - add red branch
+
+expecting success of 9154.3 'add gre branch': 
+	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
+	git config svn-remote.svn.branches 'branches/{red,gre}:refs/remotes/*' &&
+	git svn fetch &&
+	git rev-parse refs/remotes/red &&
+	test_must_fail git rev-parse refs/remotes/green &&
+	test_must_fail git rev-parse refs/remotes/blue
+	
+ef6cb22d607798435e11295db8318ab8488b5b6c
+fatal: ambiguous argument 'refs/remotes/green': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/green
+fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/blue
+ok 3 - add gre branch
+
+expecting success of 9154.4 'add green branch': 
+	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
+	git config svn-remote.svn.branches 'branches/{red,green}:refs/remotes/*' &&
+	git svn fetch &&
+	git rev-parse refs/remotes/red &&
+	git rev-parse refs/remotes/green &&
+	test_must_fail git rev-parse refs/remotes/blue
+	
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/green, 1
+Found branch parent: (refs/remotes/green) cfcadcac30ca41ea73ddfeabffbc16eb41f030f5
+Following parent with do_switch
+Successfully followed parent
+r2 = 1296ced4ca8c59b5476bfe4707788db898ed6dbb (refs/remotes/green)
+	M	foo
+r4 = 3d7cd2a0a223fa3fb1849082635afc97c47270f5 (refs/remotes/green)
+ef6cb22d607798435e11295db8318ab8488b5b6c
+3d7cd2a0a223fa3fb1849082635afc97c47270f5
+fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/blue
+ok 4 - add green branch
+
+expecting success of 9154.5 'add all branches': 
+	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
+	git config svn-remote.svn.branches 'branches/*:refs/remotes/*' &&
+	git svn fetch &&
+	git rev-parse refs/remotes/red &&
+	git rev-parse refs/remotes/green &&
+	git rev-parse refs/remotes/blue
+	
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/blue, 1
+Found branch parent: (refs/remotes/blue) cfcadcac30ca41ea73ddfeabffbc16eb41f030f5
+Following parent with do_switch
+Successfully followed parent
+r2 = 6fe2657a14909f221a0591a7a40bca7f7f89ca4d (refs/remotes/blue)
+	M	foo
+r5 = 2e74739bd967f3c8865a3a0d4e02caf3fecc3b58 (refs/remotes/blue)
+ef6cb22d607798435e11295db8318ab8488b5b6c
+3d7cd2a0a223fa3fb1849082635afc97c47270f5
+2e74739bd967f3c8865a3a0d4e02caf3fecc3b58
+ok 5 - add all branches
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9167-git-svn-cmd-branch-subproject.sh ***
 skipping test t9167 altogether
 1..0 # SKIP skip all tests in t9167
@@ -542688,14 +543619,14 @@
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
 Initializing parent: refs/remotes/thunk@2
 	A	readme
-r1 = 355d89abc604572abf7ce722442294f1e4067b3f (refs/remotes/thunk@2)
+r1 = 2aaa6e989d4328963755dada8649933c28ef09dc (refs/remotes/thunk@2)
 	M	readme
-r2 = 575c42efec132b8540bd244866be3bd90097f605 (refs/remotes/thunk@2)
-Found branch parent: (refs/remotes/thunk) 575c42efec132b8540bd244866be3bd90097f605
+r2 = 4a9b484cc56a38eb165e4b66fc6973df640ff42d (refs/remotes/thunk@2)
+Found branch parent: (refs/remotes/thunk) 4a9b484cc56a38eb165e4b66fc6973df640ff42d
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = 4e447596aadaa0d71840461fe80281f003afbc4c (refs/remotes/thunk)
+r3 = 6edff01d9eff4b5f63bac13fecc1b69a75e503b3 (refs/remotes/thunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk r3
 ok 2 - init and fetch a moved directory
@@ -542713,15 +543644,15 @@
 	test "$(sed -n -e "3p" actual)" = goodbye
 
 	A	readme
-r1 = 355d89abc604572abf7ce722442294f1e4067b3f (refs/remotes/svn/trunk)
+r1 = 2aaa6e989d4328963755dada8649933c28ef09dc (refs/remotes/svn/trunk)
 	M	readme
-r2 = 575c42efec132b8540bd244866be3bd90097f605 (refs/remotes/svn/trunk)
+r2 = 4a9b484cc56a38eb165e4b66fc6973df640ff42d (refs/remotes/svn/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
-Found branch parent: (refs/remotes/svn/thunk) 575c42efec132b8540bd244866be3bd90097f605
+Found branch parent: (refs/remotes/svn/thunk) 4a9b484cc56a38eb165e4b66fc6973df640ff42d
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = 4e447596aadaa0d71840461fe80281f003afbc4c (refs/remotes/svn/thunk)
+r3 = 6edff01d9eff4b5f63bac13fecc1b69a75e503b3 (refs/remotes/svn/thunk)
 ok 3 - init and fetch from one svn-remote
 
 expecting success of 9104.4 'follow deleted parent': 
@@ -542740,10 +543671,10 @@
 Committing transaction...
 Committed revision 4.
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
-Found branch parent: (refs/remotes/svn/junk) 575c42efec132b8540bd244866be3bd90097f605
+Found branch parent: (refs/remotes/svn/junk) 4a9b484cc56a38eb165e4b66fc6973df640ff42d
 Following parent with do_switch
 Successfully followed parent
-r4 = 5489ca7c869d9001b79e97a80ef76fa9467368e0 (refs/remotes/svn/junk)
+r4 = 6fa421354bd7c5c339c9cb80727912ddcdb72965 (refs/remotes/svn/junk)
 ok 4 - follow deleted parent
 
 expecting success of 9104.5 'follow larger parent': 
@@ -542778,17 +543709,17 @@
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	file
-r5 = 4bfaea2d51ee0c82ea91d3b9a87e678df813d210 (refs/remotes/larger)
+r5 = a0769f19321839dd1e23d0dfe97e104cbca5e8aa (refs/remotes/larger)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.51.0/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.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
-Found branch parent: (refs/remotes/larger-parent) 4bfaea2d51ee0c82ea91d3b9a87e678df813d210
+Found branch parent: (refs/remotes/larger-parent) a0769f19321839dd1e23d0dfe97e104cbca5e8aa
 Following parent with do_switch
 Successfully followed parent
-r6 = 6bbddc9525ed09001000e438d25476188f018c6e (refs/remotes/larger-parent)
-4bfaea2d51ee0c82ea91d3b9a87e678df813d210
-6bbddc9525ed09001000e438d25476188f018c6e
+r6 = 20151eb32656b7b3fbd8ff2e0011bdce5ea4cad3 (refs/remotes/larger-parent)
+a0769f19321839dd1e23d0dfe97e104cbca5e8aa
+20151eb32656b7b3fbd8ff2e0011bdce5ea4cad3
 ok 5 - follow larger parent
 
 expecting success of 9104.6 'follow higher-level parent': 
@@ -542821,13 +543752,13 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
 Initializing parent: refs/remotes/blob@9
-r7 = 141fcf299e6bee1408253b70d43c0de7a00101ee (refs/remotes/blob@9)
+r7 = 3cc8c708db68869273de26737a22c72e69112299 (refs/remotes/blob@9)
 	A	hi
-r8 = 42efcd4148aa472ad31509940a81cc2d5679621e (refs/remotes/blob@9)
-Found branch parent: (refs/remotes/blob) 42efcd4148aa472ad31509940a81cc2d5679621e
+r8 = 3efcb3019572a45f4ed35916a0ba117a25f014e4 (refs/remotes/blob@9)
+Found branch parent: (refs/remotes/blob) 3efcb3019572a45f4ed35916a0ba117a25f014e4
 Following parent with do_switch
 Successfully followed parent
-r10 = 171cff291c3b6c9e9fbc73f5ee8b3e241f2a0cb7 (refs/remotes/blob)
+r10 = e52e46e9883743f418146a4868ee1180b2d5fa30 (refs/remotes/blob)
 ok 6 - follow higher-level parent
 
 expecting success of 9104.7 'follow deleted directory': 
@@ -542845,17 +543776,17 @@
 Committed revision 12.
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-r9 = bcd3d669643f095132108de16815618f8e427276 (refs/remotes/glob)
+r9 = c56f7d1f30fbddf49e2df7e936a242653d7b2242 (refs/remotes/glob)
 	A	blob/hi
-r10 = cf3ec1684408f805ab0fa00d1c05b480bb973c19 (refs/remotes/glob)
+r10 = 361c89b27ce2703055760fa8c7c9f64716eec278 (refs/remotes/glob)
 	D	blob/hi
 	A	blob/bye
 W: -empty_dir: glob/blob/hi
-r11 = 68701886d5ffdb878518cae0120f709bbcf3166b (refs/remotes/glob)
+r11 = daf06cf76fffb5a46e97d77c07057c7bccb49a8e (refs/remotes/glob)
 	D	hi
 	A	bye
 W: -empty_dir: glob/blob/hi
-r11 = bed5562fb85001212076bfb5ccf0b44d36f2ee42 (refs/remotes/blob)
+r11 = 92dc9f9a9bd0d99c796d7b3d61d167d4685b1f99 (refs/remotes/blob)
 ok 7 - follow deleted directory
 
 expecting success of 9104.8 'follow-parent avoids deleting relevant info': 
@@ -542957,12 +543888,12 @@
 	A	b.t
 	A	c.t
 	A	larger-parent
-r13 = 699cd8051c601f216a7936f8f231de47b2cb7ea7 (refs/remotes/r9270-t@13)
-Found branch parent: (refs/remotes/r9270-t) 699cd8051c601f216a7936f8f231de47b2cb7ea7
+r13 = 078f53513ca6727b57d99b16f56cb24afcd8160e (refs/remotes/r9270-t@13)
+Found branch parent: (refs/remotes/r9270-t) 078f53513ca6727b57d99b16f56cb24afcd8160e
 Following parent with do_switch
 	M	c.t
 Successfully followed parent
-r14 = f0fa6a1ebe0cbcf3c02cc1080d1fbec215e287aa (refs/remotes/r9270-t)
+r14 = 8edb2fe1e39c42d59c14a6d236e127ae47a067e8 (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': 
@@ -542982,10 +543913,10 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.51.0/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.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.51.0/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) f0fa6a1ebe0cbcf3c02cc1080d1fbec215e287aa
+Found branch parent: (refs/remotes/r9270-d) 8edb2fe1e39c42d59c14a6d236e127ae47a067e8
 Following parent with do_switch
 Successfully followed parent
-r15 = 50322ea203f8388fe37b619c8b7e0efad3a79e70 (refs/remotes/r9270-d)
+r15 = 8ae598da34a68f71de099c46e7954895db1d34fb (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': 
@@ -543111,41 +544042,41 @@
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	readme
-r16 = ad1db53c4f9a67034f1e14b83bd5b94adea58d5c (refs/remotes/stunk)
+r16 = bbb7298a0afc8c6333cbde5d6d2bb2a034700ae4 (refs/remotes/stunk)
 	M	readme
-r17 = 32ae3a443018f683115d28d8366ea33e49e2a26d (refs/remotes/stunk)
+r17 = b9de8e44ff9eee9d27bc4ebded758001086332c9 (refs/remotes/stunk)
 	M	readme
-r18 = a2c7ffaea4c18cc4b2a673d352c9a21622a550b9 (refs/remotes/stunk)
+r18 = 577d5a33c45ce0777a452c2db2f7608d14794e43 (refs/remotes/stunk)
 1+0 records in
 1+0 records out
-24 bytes copied, 3.188e-05 s, 753 kB/s
+24 bytes copied, 2.848e-05 s, 843 kB/s
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
 Initializing parent: refs/remotes/flunk@18
 	M	readme
-r17 = 32ae3a443018f683115d28d8366ea33e49e2a26d (refs/remotes/flunk@18)
+r17 = b9de8e44ff9eee9d27bc4ebded758001086332c9 (refs/remotes/flunk@18)
 	M	readme
-r18 = a2c7ffaea4c18cc4b2a673d352c9a21622a550b9 (refs/remotes/flunk@18)
-Found branch parent: (refs/remotes/flunk) a2c7ffaea4c18cc4b2a673d352c9a21622a550b9
+r18 = 577d5a33c45ce0777a452c2db2f7608d14794e43 (refs/remotes/flunk@18)
+Found branch parent: (refs/remotes/flunk) 577d5a33c45ce0777a452c2db2f7608d14794e43
 Following parent with do_switch
 Successfully followed parent
-r19 = 6f774b8a4b7f946c884ac3afab50865bc26d49ce (refs/remotes/flunk)
+r19 = 33348755a8389fe628eabed0c5c341a17e46ed5d (refs/remotes/flunk)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	readme
-r16 = ad1db53c4f9a67034f1e14b83bd5b94adea58d5c (refs/remotes/stunk)
+r16 = bbb7298a0afc8c6333cbde5d6d2bb2a034700ae4 (refs/remotes/stunk)
 	M	readme
-r17 = 32ae3a443018f683115d28d8366ea33e49e2a26d (refs/remotes/stunk)
+r17 = b9de8e44ff9eee9d27bc4ebded758001086332c9 (refs/remotes/stunk)
 	M	readme
-r18 = a2c7ffaea4c18cc4b2a673d352c9a21622a550b9 (refs/remotes/stunk)
+r18 = 577d5a33c45ce0777a452c2db2f7608d14794e43 (refs/remotes/stunk)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
-Found branch parent: (refs/remotes/flunked) 32ae3a443018f683115d28d8366ea33e49e2a26d
+Found branch parent: (refs/remotes/flunked) b9de8e44ff9eee9d27bc4ebded758001086332c9
 Following parent with do_switch
 Successfully followed parent
-r20 = 4ffc1a9eba71c84e4874493808e839e7ee38514c (refs/remotes/flunked)
+r20 = 8089a833ca8ef31c9b3832e3fbdbea17607ce392 (refs/remotes/flunked)
 ok 10 - follow-parent is atomic
 
 expecting success of 9104.11 'track multi-parent paths': 
@@ -543169,7 +544100,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 = 038988926a03c579a009e14d7aefc3f13110b0bf (refs/remotes/glob@20)
+r13 = 0190b63cf45e84ebcf75df9d2f23357702f183f3 (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
@@ -543189,7 +544120,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 = 8b30c21d989238f0879336af7caded45070951eb (refs/remotes/glob@20)
+r14 = 322ec4041c11d18b12b2c12f0d9dd888baa42a57 (refs/remotes/glob@20)
 	A	drunk/readme
 	A	drunk/subversion/bindings/swig/perl/another-larger
 	A	drunk/subversion/bindings/swig/perl/native/a.pm
@@ -543200,13 +544131,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 = 5e8717405c8b077250912f482e6aa645c3c7b010 (refs/remotes/glob@20)
-Found branch parent: (refs/remotes/glob) 5e8717405c8b077250912f482e6aa645c3c7b010
+r15 = 868cb276ddd2cc9a91df0ed9ad29618762c12252 (refs/remotes/glob@20)
+Found branch parent: (refs/remotes/glob) 868cb276ddd2cc9a91df0ed9ad29618762c12252
 Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
-rereading 5e8717405c8b077250912f482e6aa645c3c7b010
+rereading 868cb276ddd2cc9a91df0ed9ad29618762c12252
 Following parent with do_switch
 Successfully followed parent
-r21 = c65a6ea9e6956f280b44260ed28c960c909bba59 (refs/remotes/glob)
+r21 = e59cbe9703fee325fa7b05f926888b1978e3edeb (refs/remotes/glob)
 ok 11 - track multi-parent paths
 
 expecting success of 9104.12 'multi-fetch continues to work': 
@@ -543223,82 +544154,82 @@
 	git svn multi-fetch
 	
 	A	readme
-r1 = 355d89abc604572abf7ce722442294f1e4067b3f (refs/remotes/svn/trunk)
+r1 = 2aaa6e989d4328963755dada8649933c28ef09dc (refs/remotes/svn/trunk)
 	M	readme
-r2 = 575c42efec132b8540bd244866be3bd90097f605 (refs/remotes/svn/trunk)
+r2 = 4a9b484cc56a38eb165e4b66fc6973df640ff42d (refs/remotes/svn/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
-Found branch parent: (refs/remotes/svn/thunk) 575c42efec132b8540bd244866be3bd90097f605
+Found branch parent: (refs/remotes/svn/thunk) 4a9b484cc56a38eb165e4b66fc6973df640ff42d
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = 4e447596aadaa0d71840461fe80281f003afbc4c (refs/remotes/svn/thunk)
+r3 = 6edff01d9eff4b5f63bac13fecc1b69a75e503b3 (refs/remotes/svn/thunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
-Found branch parent: (refs/remotes/svn/junk) 575c42efec132b8540bd244866be3bd90097f605
+Found branch parent: (refs/remotes/svn/junk) 4a9b484cc56a38eb165e4b66fc6973df640ff42d
 Following parent with do_switch
 Successfully followed parent
-r4 = 5489ca7c869d9001b79e97a80ef76fa9467368e0 (refs/remotes/svn/junk)
+r4 = 6fa421354bd7c5c339c9cb80727912ddcdb72965 (refs/remotes/svn/junk)
 	A	file
-r5 = 4bfaea2d51ee0c82ea91d3b9a87e678df813d210 (refs/remotes/larger)
+r5 = a0769f19321839dd1e23d0dfe97e104cbca5e8aa (refs/remotes/larger)
 branch_from: /larger-parent => /larger-parent/trunk/thunk/bump/thud
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
-Found branch parent: (refs/remotes/larger-parent) 4bfaea2d51ee0c82ea91d3b9a87e678df813d210
+Found branch parent: (refs/remotes/larger-parent) a0769f19321839dd1e23d0dfe97e104cbca5e8aa
 Following parent with do_switch
 Successfully followed parent
-r6 = 6bbddc9525ed09001000e438d25476188f018c6e (refs/remotes/larger-parent)
-r9 = bcd3d669643f095132108de16815618f8e427276 (refs/remotes/glob)
-	A	blob/hi
-r10 = cf3ec1684408f805ab0fa00d1c05b480bb973c19 (refs/remotes/glob)
+r6 = 20151eb32656b7b3fbd8ff2e0011bdce5ea4cad3 (refs/remotes/larger-parent)
+r9 = c56f7d1f30fbddf49e2df7e936a242653d7b2242 (refs/remotes/glob)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
 Initializing parent: refs/remotes/blob@9
-r7 = 141fcf299e6bee1408253b70d43c0de7a00101ee (refs/remotes/blob@9)
+r7 = 3cc8c708db68869273de26737a22c72e69112299 (refs/remotes/blob@9)
 	A	hi
-r8 = 42efcd4148aa472ad31509940a81cc2d5679621e (refs/remotes/blob@9)
-Found branch parent: (refs/remotes/blob) 42efcd4148aa472ad31509940a81cc2d5679621e
+r8 = 3efcb3019572a45f4ed35916a0ba117a25f014e4 (refs/remotes/blob@9)
+Found branch parent: (refs/remotes/blob) 3efcb3019572a45f4ed35916a0ba117a25f014e4
 Following parent with do_switch
 Successfully followed parent
-r10 = 171cff291c3b6c9e9fbc73f5ee8b3e241f2a0cb7 (refs/remotes/blob)
-	D	blob/hi
-	A	blob/bye
-W: -empty_dir: glob/blob/hi
-r11 = 68701886d5ffdb878518cae0120f709bbcf3166b (refs/remotes/glob)
+r10 = e52e46e9883743f418146a4868ee1180b2d5fa30 (refs/remotes/blob)
+	A	blob/hi
+r10 = 361c89b27ce2703055760fa8c7c9f64716eec278 (refs/remotes/glob)
 	D	hi
 	A	bye
 W: -empty_dir: glob/blob/hi
-r11 = bed5562fb85001212076bfb5ccf0b44d36f2ee42 (refs/remotes/blob)
+r11 = 92dc9f9a9bd0d99c796d7b3d61d167d4685b1f99 (refs/remotes/blob)
+	D	blob/hi
+	A	blob/bye
+W: -empty_dir: glob/blob/hi
+r11 = daf06cf76fffb5a46e97d77c07057c7bccb49a8e (refs/remotes/glob)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/t => file:///build/reproducible-path/git-2.51.0/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 = 699cd8051c601f216a7936f8f231de47b2cb7ea7 (refs/remotes/r9270-t@13)
-Found branch parent: (refs/remotes/r9270-t) 699cd8051c601f216a7936f8f231de47b2cb7ea7
+r13 = 078f53513ca6727b57d99b16f56cb24afcd8160e (refs/remotes/r9270-t@13)
+Found branch parent: (refs/remotes/r9270-t) 078f53513ca6727b57d99b16f56cb24afcd8160e
 Following parent with do_switch
 	M	c.t
 Successfully followed parent
-r14 = f0fa6a1ebe0cbcf3c02cc1080d1fbec215e287aa (refs/remotes/r9270-t)
+r14 = 8edb2fe1e39c42d59c14a6d236e127ae47a067e8 (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.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.51.0/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) f0fa6a1ebe0cbcf3c02cc1080d1fbec215e287aa
+Found branch parent: (refs/remotes/r9270-d) 8edb2fe1e39c42d59c14a6d236e127ae47a067e8
 Following parent with do_switch
 Successfully followed parent
-r15 = 50322ea203f8388fe37b619c8b7e0efad3a79e70 (refs/remotes/r9270-d)
+r15 = 8ae598da34a68f71de099c46e7954895db1d34fb (refs/remotes/r9270-d)
 	A	readme
-r16 = ad1db53c4f9a67034f1e14b83bd5b94adea58d5c (refs/remotes/stunk)
+r16 = bbb7298a0afc8c6333cbde5d6d2bb2a034700ae4 (refs/remotes/stunk)
 	M	readme
-r17 = 32ae3a443018f683115d28d8366ea33e49e2a26d (refs/remotes/stunk)
+r17 = b9de8e44ff9eee9d27bc4ebded758001086332c9 (refs/remotes/stunk)
 	M	readme
-r18 = a2c7ffaea4c18cc4b2a673d352c9a21622a550b9 (refs/remotes/stunk)
+r18 = 577d5a33c45ce0777a452c2db2f7608d14794e43 (refs/remotes/stunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
-Found branch parent: (refs/remotes/flunk) a2c7ffaea4c18cc4b2a673d352c9a21622a550b9
+Found branch parent: (refs/remotes/flunk) 577d5a33c45ce0777a452c2db2f7608d14794e43
 Following parent with do_switch
 Successfully followed parent
-r19 = 6f774b8a4b7f946c884ac3afab50865bc26d49ce (refs/remotes/flunk)
+r19 = 33348755a8389fe628eabed0c5c341a17e46ed5d (refs/remotes/flunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
-Found branch parent: (refs/remotes/flunked) 32ae3a443018f683115d28d8366ea33e49e2a26d
+Found branch parent: (refs/remotes/flunked) b9de8e44ff9eee9d27bc4ebded758001086332c9
 Following parent with do_switch
 Successfully followed parent
-r20 = 4ffc1a9eba71c84e4874493808e839e7ee38514c (refs/remotes/flunked)
+r20 = 8089a833ca8ef31c9b3832e3fbdbea17607ce392 (refs/remotes/flunked)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270 => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob, 20
 Initializing parent: refs/remotes/glob@20
 	A	trunk/readme
@@ -543311,7 +544242,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 = 038988926a03c579a009e14d7aefc3f13110b0bf (refs/remotes/glob@20)
+r13 = 0190b63cf45e84ebcf75df9d2f23357702f183f3 (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
@@ -543331,7 +544262,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 = 8b30c21d989238f0879336af7caded45070951eb (refs/remotes/glob@20)
+r14 = 322ec4041c11d18b12b2c12f0d9dd888baa42a57 (refs/remotes/glob@20)
 	A	drunk/readme
 	A	drunk/subversion/bindings/swig/perl/another-larger
 	A	drunk/subversion/bindings/swig/perl/native/a.pm
@@ -543342,13 +544273,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 = 5e8717405c8b077250912f482e6aa645c3c7b010 (refs/remotes/glob@20)
-Found branch parent: (refs/remotes/glob) 5e8717405c8b077250912f482e6aa645c3c7b010
+r15 = 868cb276ddd2cc9a91df0ed9ad29618762c12252 (refs/remotes/glob@20)
+Found branch parent: (refs/remotes/glob) 868cb276ddd2cc9a91df0ed9ad29618762c12252
 Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
-rereading 5e8717405c8b077250912f482e6aa645c3c7b010
+rereading 868cb276ddd2cc9a91df0ed9ad29618762c12252
 Following parent with do_switch
 Successfully followed parent
-r21 = c65a6ea9e6956f280b44260ed28c960c909bba59 (refs/remotes/glob)
+r21 = e59cbe9703fee325fa7b05f926888b1978e3edeb (refs/remotes/glob)
 ok 13 - multi-fetch works off a 'clean' repository
 
 # passed all 13 test(s)
@@ -543382,19 +544313,19 @@
 expecting success of 9146.2 'clone': git svn clone "$svnrepo" cloned
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9146-git-svn-empty-dirs/cloned/.git/
 W: +empty_dir: a
-r1 = 70abcd8db69b264894033db6ebb138dff201ab3f (refs/remotes/git-svn)
+r1 = b93c6446ec86584b3fd1e7c5008d08c8ff3f07d9 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = b10ce5e63bef0bdcfd4bcf1cd5d4ad265fb63dd4 (refs/remotes/git-svn)
+r2 = b5b326f4a217a5bbe15cf61ae4c834ec642c6d81 (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = 4638634ce3661ddbaf2cca9687d2609abbea0894 (refs/remotes/git-svn)
+r3 = 6af64b6e13309390533ab99c398ec56d60ca2598 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = f767e2ad33e6afa407c3c00f3e6769f8a859f078 (refs/remotes/git-svn)
+r4 = 7693a195c44dbfd5ce3321a3eca5572b23302648 (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = 1405d9acba2d64f997d0859a91ce23e3d71f9abe (refs/remotes/git-svn)
+r5 = 825bd9cf0559f07dc9bb5e644f1b6392a974c493 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = abeec628cc3a05cd0cb6e2d43160c835f8fe33f3 (refs/remotes/git-svn)
+r6 = bab2ce1383d0e7e97e7937ae2d24a84f6c19c583 (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = ac666292e292f603444568b1c579ab9f49a61312 (refs/remotes/git-svn)
+r7 = 26fc2eee1f4a313185d8c5d52117853748147d6b (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r7
 creating empty directory: a
@@ -543431,19 +544362,19 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9146-git-svn-empty-dirs/cloned-no-mkdirs/.git/
 W: +empty_dir: a
-r1 = 70abcd8db69b264894033db6ebb138dff201ab3f (refs/remotes/git-svn)
+r1 = b93c6446ec86584b3fd1e7c5008d08c8ff3f07d9 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = b10ce5e63bef0bdcfd4bcf1cd5d4ad265fb63dd4 (refs/remotes/git-svn)
+r2 = b5b326f4a217a5bbe15cf61ae4c834ec642c6d81 (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = 4638634ce3661ddbaf2cca9687d2609abbea0894 (refs/remotes/git-svn)
+r3 = 6af64b6e13309390533ab99c398ec56d60ca2598 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = f767e2ad33e6afa407c3c00f3e6769f8a859f078 (refs/remotes/git-svn)
+r4 = 7693a195c44dbfd5ce3321a3eca5572b23302648 (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = 1405d9acba2d64f997d0859a91ce23e3d71f9abe (refs/remotes/git-svn)
+r5 = 825bd9cf0559f07dc9bb5e644f1b6392a974c493 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = abeec628cc3a05cd0cb6e2d43160c835f8fe33f3 (refs/remotes/git-svn)
+r6 = bab2ce1383d0e7e97e7937ae2d24a84f6c19c583 (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = ac666292e292f603444568b1c579ab9f49a61312 (refs/remotes/git-svn)
+r7 = 26fc2eee1f4a313185d8c5d52117853748147d6b (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r7
 ok 4 - option automkdirs set to false
@@ -543460,7 +544391,7 @@
 	test_path_is_dir cloned/"! !"
 
 W: +empty_dir: ! !
-r8 = a11e6a7d048b9f0ed46d1b16181cacd9c54a55c4 (refs/remotes/git-svn)
+r8 = 51054f74bc0a1f9c6b08705076a2bec85a65b2b8 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 creating empty directory: ! !
 ok 6 - git svn rebase creates empty directory
@@ -543528,11 +544459,11 @@
 
 expecting success of 9146.10 'clone trunk': git svn clone -s "$svnrepo" trunk
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9146-git-svn-empty-dirs/trunk/.git/
-r9 = 68c0e8cf2338185ce2c6295c534034b796c8ee25 (refs/remotes/origin/trunk)
+r9 = 4e702d4d4f01a9b87edbf6d774765995364ef8bd (refs/remotes/origin/trunk)
 W: +empty_dir: trunk/a
-r10 = b1183781334ded3a567d8f16d49abba5a777974a (refs/remotes/origin/trunk)
+r10 = c26886ea8ebed518a124a1265dec644d675dbf0a (refs/remotes/origin/trunk)
 W: +empty_dir: trunk/weird file name
-r11 = cc5fd997b7ef93c72809dd5e8b3dd1bd446fde73 (refs/remotes/origin/trunk)
+r11 = d8eed4d3721824822288f6175d290439ef17bc21 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo/trunk r11
 creating empty directory: a
@@ -543564,30 +544495,30 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9146-git-svn-empty-dirs/removed/.git/
 W: +empty_dir: a
-r1 = 70abcd8db69b264894033db6ebb138dff201ab3f (refs/remotes/git-svn)
+r1 = b93c6446ec86584b3fd1e7c5008d08c8ff3f07d9 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = b10ce5e63bef0bdcfd4bcf1cd5d4ad265fb63dd4 (refs/remotes/git-svn)
+r2 = b5b326f4a217a5bbe15cf61ae4c834ec642c6d81 (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = 4638634ce3661ddbaf2cca9687d2609abbea0894 (refs/remotes/git-svn)
+r3 = 6af64b6e13309390533ab99c398ec56d60ca2598 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = f767e2ad33e6afa407c3c00f3e6769f8a859f078 (refs/remotes/git-svn)
+r4 = 7693a195c44dbfd5ce3321a3eca5572b23302648 (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = 1405d9acba2d64f997d0859a91ce23e3d71f9abe (refs/remotes/git-svn)
+r5 = 825bd9cf0559f07dc9bb5e644f1b6392a974c493 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = abeec628cc3a05cd0cb6e2d43160c835f8fe33f3 (refs/remotes/git-svn)
+r6 = bab2ce1383d0e7e97e7937ae2d24a84f6c19c583 (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = ac666292e292f603444568b1c579ab9f49a61312 (refs/remotes/git-svn)
+r7 = 26fc2eee1f4a313185d8c5d52117853748147d6b (refs/remotes/git-svn)
 W: +empty_dir: ! !
-r8 = a11e6a7d048b9f0ed46d1b16181cacd9c54a55c4 (refs/remotes/git-svn)
+r8 = 51054f74bc0a1f9c6b08705076a2bec85a65b2b8 (refs/remotes/git-svn)
 W: +empty_dir: trunk
-r9 = 182bc7be37b2498b35b811f803a04e047ec45233 (refs/remotes/git-svn)
+r9 = 96afac2c1a1a82f3c20e55f6589782d16a1b0544 (refs/remotes/git-svn)
 W: +empty_dir: trunk/a
-r10 = 4f67aa9f5f6c5555eff628899e161f7682ae5574 (refs/remotes/git-svn)
+r10 = e07c4d8b2986f8efd2cf830ad2614909952a69b5 (refs/remotes/git-svn)
 W: +empty_dir: trunk/weird file name
-r11 = 600f88cc9d01150b0ca26518b2c2b1bb32da27f4 (refs/remotes/git-svn)
+r11 = b43f10f1c1906d45e9ce2e4e8ccdcc919f5dae32 (refs/remotes/git-svn)
 	D	d
 W: -empty_dir: d
-r12 = 5ab245c60550e87ad03e7b6ce01b33190ed440ac (refs/remotes/git-svn)
+r12 = fd2a2345c62447bfb22108b66ee7af968e4ec066 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r12
 creating empty directory: ! !
@@ -543621,9 +544552,9 @@
 
 Committing transaction...
 Committed revision 13.
-HEAD is now at 70abcd8 mkdir a
+HEAD is now at b93c644 mkdir a
 W: +empty_dir: gz
-r13 = e6dc2da4d3d6030ea9f4c971ceb54b4ea44ca59f (refs/remotes/git-svn)
+r13 = 3809599a593d0dcd9949beb607d67ab7a4915753 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 creating empty directory: gz
 ok 14 - git svn gc-ed files work
@@ -543797,95 +544728,95 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9141-git-svn-multiple-branches/git_project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo
 	A	a.file
-r1 = eecd6a470b38f128715387555f916e5aa1b97d39 (refs/remotes/origin/trunk)
+r1 = 814232f9aa7e3b6a2cf408f865231b8298309684 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/first, 1
-Found branch parent: (refs/remotes/origin/first) eecd6a470b38f128715387555f916e5aa1b97d39
+Found branch parent: (refs/remotes/origin/first) 814232f9aa7e3b6a2cf408f865231b8298309684
 Following parent with do_switch
 Successfully followed parent
-r2 = 1e33a84512021db447ffada4e2a2144753d490ed (refs/remotes/origin/first)
+r2 = 4ce68e02b6ad6305f2616540c2bf68f7ff00f1fe (refs/remotes/origin/first)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/1.0, 2
-Found branch parent: (refs/remotes/origin/tags/1.0) eecd6a470b38f128715387555f916e5aa1b97d39
+Found branch parent: (refs/remotes/origin/tags/1.0) 814232f9aa7e3b6a2cf408f865231b8298309684
 Following parent with do_switch
 Successfully followed parent
-r3 = e48bfba991acb6a8a9fbe2284e0ae769016f28d4 (refs/remotes/origin/tags/1.0)
+r3 = 9f87ae266d3a9f1259ed20787eae2de7756b785e (refs/remotes/origin/tags/1.0)
 	M	a.file
-r4 = cfcd5cdbeddafe875b7cea7a854e6064f32975a0 (refs/remotes/origin/trunk)
+r4 = aed033a4063e7fb94e106ee04cd3f9d1549633a6 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/second, 4
-Found branch parent: (refs/remotes/origin/second) cfcd5cdbeddafe875b7cea7a854e6064f32975a0
+Found branch parent: (refs/remotes/origin/second) aed033a4063e7fb94e106ee04cd3f9d1549633a6
 Following parent with do_switch
 Successfully followed parent
-r5 = 395227afeb3bf0227858cb91c08d449e70ced3f4 (refs/remotes/origin/second)
+r5 = 1ec4900d4d5c062ea66fdd8ab6b11e635a440114 (refs/remotes/origin/second)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/2.0, 5
-Found branch parent: (refs/remotes/origin/tags/2.0) cfcd5cdbeddafe875b7cea7a854e6064f32975a0
+Found branch parent: (refs/remotes/origin/tags/2.0) aed033a4063e7fb94e106ee04cd3f9d1549633a6
 Following parent with do_switch
 Successfully followed parent
-r6 = 26cb4771e32e73073361790e20a008064cee0014 (refs/remotes/origin/tags/2.0)
+r6 = f47e2a20de1590b6088967d8b677758843510e7f (refs/remotes/origin/tags/2.0)
 	M	a.file
-r7 = d05021b2f75b041590e0c82420c9b62423d1e4bd (refs/remotes/origin/trunk)
+r7 = b0ce523d27a8a0ebc797ed0e41fd2e7623f68d93 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/1, 7
-Found branch parent: (refs/remotes/origin/1) d05021b2f75b041590e0c82420c9b62423d1e4bd
+Found branch parent: (refs/remotes/origin/1) b0ce523d27a8a0ebc797ed0e41fd2e7623f68d93
 Following parent with do_switch
 Successfully followed parent
-r8 = efb2ab041dde1c90e388da9759af7fed5334af95 (refs/remotes/origin/1)
+r8 = 402047e7ff5a074e9025c349dfedbb8b25c2c2a4 (refs/remotes/origin/1)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/3.0, 8
-Found branch parent: (refs/remotes/origin/tags/3.0) d05021b2f75b041590e0c82420c9b62423d1e4bd
+Found branch parent: (refs/remotes/origin/tags/3.0) b0ce523d27a8a0ebc797ed0e41fd2e7623f68d93
 Following parent with do_switch
 Successfully followed parent
-r9 = c41e3bed3943cdeba5c93e6273bb62d56871554c (refs/remotes/origin/tags/3.0)
+r9 = 08a5efbcf53ec20f97ed134f202b1f088eb1b50a (refs/remotes/origin/tags/3.0)
 	M	a.file
-r10 = 441833c122f6c302dc2a7af53456bf555e123718 (refs/remotes/origin/trunk)
+r10 = 82f610463b8658df200337b9c9dafe0ee2bc88a2 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/2, 10
-Found branch parent: (refs/remotes/origin/2) 441833c122f6c302dc2a7af53456bf555e123718
+Found branch parent: (refs/remotes/origin/2) 82f610463b8658df200337b9c9dafe0ee2bc88a2
 Following parent with do_switch
 Successfully followed parent
-r11 = 8d6117348bcb86651bc2ea1ebfc19a363705db7a (refs/remotes/origin/2)
+r11 = 73e4ae8cd0766d302de488df2255961e662e6a03 (refs/remotes/origin/2)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/4.0, 11
-Found branch parent: (refs/remotes/origin/tags/4.0) 441833c122f6c302dc2a7af53456bf555e123718
+Found branch parent: (refs/remotes/origin/tags/4.0) 82f610463b8658df200337b9c9dafe0ee2bc88a2
 Following parent with do_switch
 Successfully followed parent
-r12 = b3038ade3db26f936da17571b17fd21759ac65dd (refs/remotes/origin/tags/4.0)
+r12 = bd3f84fde1e30cfa34f22ac90edbb016acd4134b (refs/remotes/origin/tags/4.0)
 	M	a.file
-r13 = 15f40a3782533a4aadc2ace085a0f8eea9826e4c (refs/remotes/origin/first)
+r13 = e83f28a643bfefa0e40b86dd4357c0b2891fc699 (refs/remotes/origin/first)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/first => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v5, 13
-Found branch parent: (refs/remotes/origin/tags/v5) 15f40a3782533a4aadc2ace085a0f8eea9826e4c
+Found branch parent: (refs/remotes/origin/tags/v5) e83f28a643bfefa0e40b86dd4357c0b2891fc699
 Following parent with do_switch
 Successfully followed parent
-r14 = 706934b81d7c6de04b86a5c81f838cfe504912ae (refs/remotes/origin/tags/v5)
+r14 = 652473db1aa8c4da83d7e4864d8af6f7bcad06f8 (refs/remotes/origin/tags/v5)
 	M	a.file
-r15 = da61b8430bd5b42f4899b06f09f88da5785eba6a (refs/remotes/origin/second)
+r15 = 71a7a2695c81bf6b1b510b724b06daf9faa7b363 (refs/remotes/origin/second)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/second => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v6, 15
-Found branch parent: (refs/remotes/origin/tags/v6) da61b8430bd5b42f4899b06f09f88da5785eba6a
+Found branch parent: (refs/remotes/origin/tags/v6) 71a7a2695c81bf6b1b510b724b06daf9faa7b363
 Following parent with do_switch
 Successfully followed parent
-r16 = 022b5cab3d15940395d3e3db2847ee26dba912e9 (refs/remotes/origin/tags/v6)
+r16 = f96070d66cfb68eec72e570c99bf239a46616640 (refs/remotes/origin/tags/v6)
 	M	a.file
-r17 = 5a333cdb0eac9269b1a462282e4a8debcaf9223b (refs/remotes/origin/1)
+r17 = 16bb3e8da68144b19585c6c6619d1a8fe9bd817f (refs/remotes/origin/1)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/1 => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v7, 17
-Found branch parent: (refs/remotes/origin/tags/v7) 5a333cdb0eac9269b1a462282e4a8debcaf9223b
+Found branch parent: (refs/remotes/origin/tags/v7) 16bb3e8da68144b19585c6c6619d1a8fe9bd817f
 Following parent with do_switch
 Successfully followed parent
-r18 = cf0002182cea37f137d46b676ed180f90403f9ba (refs/remotes/origin/tags/v7)
+r18 = f2a263d600ae9b913374eda7f751977bffe63025 (refs/remotes/origin/tags/v7)
 	M	a.file
-r19 = e49359bcf7104a11aafbeaf24c2135b2019106b2 (refs/remotes/origin/2)
+r19 = 97f8f33fda57755eda21de03b62e8e9461c89e27 (refs/remotes/origin/2)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/2 => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v8, 19
-Found branch parent: (refs/remotes/origin/tags/v8) e49359bcf7104a11aafbeaf24c2135b2019106b2
+Found branch parent: (refs/remotes/origin/tags/v8) 97f8f33fda57755eda21de03b62e8e9461c89e27
 Following parent with do_switch
 Successfully followed parent
-r20 = 90411f176e6ecd2bbbb49dccb950f01e7a7a2a1b (refs/remotes/origin/tags/v8)
+r20 = 35821aed07f1afa471d41be3f9a0b7997bba2e24 (refs/remotes/origin/tags/v8)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk r10
-15f40a3782533a4aadc2ace085a0f8eea9826e4c
-da61b8430bd5b42f4899b06f09f88da5785eba6a
-5a333cdb0eac9269b1a462282e4a8debcaf9223b
-e49359bcf7104a11aafbeaf24c2135b2019106b2
-e48bfba991acb6a8a9fbe2284e0ae769016f28d4
-26cb4771e32e73073361790e20a008064cee0014
-c41e3bed3943cdeba5c93e6273bb62d56871554c
-b3038ade3db26f936da17571b17fd21759ac65dd
-706934b81d7c6de04b86a5c81f838cfe504912ae
-022b5cab3d15940395d3e3db2847ee26dba912e9
-cf0002182cea37f137d46b676ed180f90403f9ba
-90411f176e6ecd2bbbb49dccb950f01e7a7a2a1b
+e83f28a643bfefa0e40b86dd4357c0b2891fc699
+71a7a2695c81bf6b1b510b724b06daf9faa7b363
+16bb3e8da68144b19585c6c6619d1a8fe9bd817f
+97f8f33fda57755eda21de03b62e8e9461c89e27
+9f87ae266d3a9f1259ed20787eae2de7756b785e
+f47e2a20de1590b6088967d8b677758843510e7f
+08a5efbcf53ec20f97ed134f202b1f088eb1b50a
+bd3f84fde1e30cfa34f22ac90edbb016acd4134b
+652473db1aa8c4da83d7e4864d8af6f7bcad06f8
+f96070d66cfb68eec72e570c99bf239a46616640
+f2a263d600ae9b913374eda7f751977bffe63025
+35821aed07f1afa471d41be3f9a0b7997bba2e24
 ok 2 - clone multiple branch and tag paths
 
 expecting success of 9141.3 'Multiple branch or tag paths require -d': 
@@ -543952,40 +544883,40 @@
 
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/New1...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/New1, 10
-Found branch parent: (refs/remotes/origin/New1) 441833c122f6c302dc2a7af53456bf555e123718
+Found branch parent: (refs/remotes/origin/New1) 82f610463b8658df200337b9c9dafe0ee2bc88a2
 Following parent with do_switch
 Successfully followed parent
-r21 = 4f45b116aa02e6ccf8f55f6de010c7f463497180 (refs/remotes/origin/New1)
+r21 = 4c1a40ff7fed3ac3054a7f8cc5f147ae7e895ab5 (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.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/New2...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/New2, 10
-Found branch parent: (refs/remotes/origin/New2) 441833c122f6c302dc2a7af53456bf555e123718
+Found branch parent: (refs/remotes/origin/New2) 82f610463b8658df200337b9c9dafe0ee2bc88a2
 Following parent with do_switch
 Successfully followed parent
-r22 = 91a34352883e8cf34720b88c9de94165f237b3eb (refs/remotes/origin/New2)
+r22 = db67f6457a2b6ef206f928c3950ff1bf27380957 (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.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/Tag1...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/Tag1, 10
-Found branch parent: (refs/remotes/origin/tags/Tag1) 441833c122f6c302dc2a7af53456bf555e123718
+Found branch parent: (refs/remotes/origin/tags/Tag1) 82f610463b8658df200337b9c9dafe0ee2bc88a2
 Following parent with do_switch
 Successfully followed parent
-r23 = ecbe96f4953e069547247e1d77e09a34a8917532 (refs/remotes/origin/tags/Tag1)
+r23 = 212a3522ddce0ee6e1221bac5e93d29704226f24 (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.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/Tag2...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/Tag2, 10
-Found branch parent: (refs/remotes/origin/tags/Tag2) 441833c122f6c302dc2a7af53456bf555e123718
+Found branch parent: (refs/remotes/origin/tags/Tag2) 82f610463b8658df200337b9c9dafe0ee2bc88a2
 Following parent with do_switch
 Successfully followed parent
-r24 = 33d882266c9930ba0f2363a43abb0bd536c2ebce (refs/remotes/origin/tags/Tag2)
+r24 = 5f6d281e0b8ffa0ab0a6f8e9a7eb38d801c5e866 (refs/remotes/origin/tags/Tag2)
 Updating '.':
 A    tags_B/Tag2
 A    tags_B/Tag2/a.file
@@ -543996,50 +544927,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9169-git-svn-dcommit-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9169-git-svn-dcommit-crlf/.git/
-expecting success of 9169.1 'setup commit repository': 
-	svn_cmd mkdir -m "$test_description" "$svnrepo/dir" &&
-	git svn clone "$svnrepo" work &&
-	(
-		cd work &&
-		echo foo >>foo &&
-		git update-index --add foo &&
-		printf "a\\r\\n\\r\\nb\\r\\nc\\r\\n" >cmt &&
-		p=$(git rev-parse HEAD) &&
-		t=$(git write-tree) &&
-		cmt=$(git commit-tree -p $p $t <cmt) &&
-		git update-ref refs/heads/main $cmt &&
-		git cat-file commit HEAD | tail -n4 >out &&
-		test_cmp cmt out &&
-		git svn dcommit &&
-		printf "a\\n\\nb\\nc\\n" >exp &&
-		git cat-file commit HEAD | sed -ne 6,9p >out &&
-		test_cmp exp out
-	)
-
-Committing transaction...
-Committed revision 1.
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9169-git-svn-dcommit-crlf/work/.git/
-W: +empty_dir: dir
-r1 = 5ee1a08929279dd3b9a8fa8c377273b9e6c29b42 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo r1
-creating empty directory: dir
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo ...
-	A	foo
-Committed r2
-	A	foo
-r2 = 9aaa2079c5a94cf42a81df121c186c31dd503930 (refs/remotes/git-svn)
-No changes between 473f6e8868fbd14d139f0a4a7f2ee5393054d668 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 1 - setup commit repository
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9166-git-svn-fetch-merge-branch-of-branch2.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9166-git-svn-fetch-merge-branch-of-branch2/.git/
 expecting success of 9166.1 'initialize source svn repo': 
@@ -544112,29 +544999,29 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = 8e5813f86c8703a375810fd7277408a9336edb8c (refs/remotes/origin/trunk)
+r1 = 2deb0e3c29c102ff15d3076e5e123e7f0090ca6e (refs/remotes/origin/trunk)
 	A	foo
-r3 = 1bdb66d7e4983f49e00fa7f5f335e86198036ca8 (refs/remotes/origin/trunk)
+r3 = 39046323d10136604894d2d77efcc61edb1a5ef1 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 1bdb66d7e4983f49e00fa7f5f335e86198036ca8
+Found branch parent: (refs/remotes/origin/branch1) 39046323d10136604894d2d77efcc61edb1a5ef1
 Following parent with do_switch
 Successfully followed parent
-r4 = af0a57759917b0c8568c5f752dbe301c98da6d22 (refs/remotes/origin/branch1)
+r4 = 2cd47266c7e927027873bca8bb773813a51796d1 (refs/remotes/origin/branch1)
 	A	bar
-r5 = 6b280244aa468b5d6416f6580a118a7cedefe713 (refs/remotes/origin/branch1)
+r5 = db395c1fdb2b853fd1f8545189d82cff1fd12647 (refs/remotes/origin/branch1)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch1 => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) 6b280244aa468b5d6416f6580a118a7cedefe713
+Found branch parent: (refs/remotes/origin/branch2) db395c1fdb2b853fd1f8545189d82cff1fd12647
 Following parent with do_switch
 Successfully followed parent
-r6 = 888aad02265a0d85df2722a6d1f2bf35c3db3d93 (refs/remotes/origin/branch2)
+r6 = 54b3802bb5bf7718f6aff79773f910815c39fd04 (refs/remotes/origin/branch2)
 	A	baz
-r7 = 91983890a61cd5131a59af42f8f4ab8fa48051f4 (refs/remotes/origin/branch2)
+r7 = 7f2370432c503290d93c9d26c46b5a467e002cad (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): 6b280244aa468b5d6416f6580a118a7cedefe713
-Found merge parent (/branches/branch2:6-7): 91983890a61cd5131a59af42f8f4ab8fa48051f4
-r8 = 4d8d45410a4ac702792b18e6ec4153e6a159338a (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-5): db395c1fdb2b853fd1f8545189d82cff1fd12647
+Found merge parent (/branches/branch2:6-7): 7f2370432c503290d93c9d26c46b5a467e002cad
+r8 = d04369e7ec2a58523bde88f6f64d71619458507d (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/trunk r8
 ok 2 - clone svn repo
@@ -544149,6 +545036,50 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9169-git-svn-dcommit-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9169-git-svn-dcommit-crlf/.git/
+expecting success of 9169.1 'setup commit repository': 
+	svn_cmd mkdir -m "$test_description" "$svnrepo/dir" &&
+	git svn clone "$svnrepo" work &&
+	(
+		cd work &&
+		echo foo >>foo &&
+		git update-index --add foo &&
+		printf "a\\r\\n\\r\\nb\\r\\nc\\r\\n" >cmt &&
+		p=$(git rev-parse HEAD) &&
+		t=$(git write-tree) &&
+		cmt=$(git commit-tree -p $p $t <cmt) &&
+		git update-ref refs/heads/main $cmt &&
+		git cat-file commit HEAD | tail -n4 >out &&
+		test_cmp cmt out &&
+		git svn dcommit &&
+		printf "a\\n\\nb\\nc\\n" >exp &&
+		git cat-file commit HEAD | sed -ne 6,9p >out &&
+		test_cmp exp out
+	)
+
+Committing transaction...
+Committed revision 1.
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9169-git-svn-dcommit-crlf/work/.git/
+W: +empty_dir: dir
+r1 = 85e4447d443f7e0b4ea586ec08a41badf17aae06 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo r1
+creating empty directory: dir
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo ...
+	A	foo
+Committed r2
+	A	foo
+r2 = 7da98c4fcb8ecaa2d4ca609edd61ce35eb317a87 (refs/remotes/git-svn)
+No changes between aa350d3d6191c78fa4f60fd5ee6ac4f4cf873bfc and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 1 - setup commit repository
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9165-git-svn-fetch-merge-branch-of-branch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9165-git-svn-fetch-merge-branch-of-branch/.git/
 expecting success of 9165.1 'initialize source svn repo': 
@@ -544249,35 +545180,35 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = e10165022a57407dfc623fe06c20216dd6a6f0fd (refs/remotes/origin/trunk)
+r1 = 283024a516d6c30144b8da9181c4b54ce0e48d9a (refs/remotes/origin/trunk)
 	A	foo
-r3 = 161605bd48c4feb9246c77e89a51fcf402928818 (refs/remotes/origin/trunk)
+r3 = 0ccf0e06666e11d76709e8d12a84a08a06594c1b (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 161605bd48c4feb9246c77e89a51fcf402928818
+Found branch parent: (refs/remotes/origin/branch1) 0ccf0e06666e11d76709e8d12a84a08a06594c1b
 Following parent with do_switch
 Successfully followed parent
-r4 = 050246be0063865c714ae387f08d034986795bdb (refs/remotes/origin/branch1)
+r4 = e7540fdf99196504820a4abc6daf50d6e236b294 (refs/remotes/origin/branch1)
 	A	bar
-r5 = e5f968da6bf917657f8a331598f79edcd41bbaf0 (refs/remotes/origin/branch1)
+r5 = 96e1514f93d8e60ddafb265af7511a1acaeeed9c (refs/remotes/origin/branch1)
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1 => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) e5f968da6bf917657f8a331598f79edcd41bbaf0
+Found branch parent: (refs/remotes/origin/branch2) 96e1514f93d8e60ddafb265af7511a1acaeeed9c
 Following parent with do_switch
 Successfully followed parent
-r6 = 8c4c8f154c3e3746d3efad20dbd5bd6305313f25 (refs/remotes/origin/branch2)
+r6 = 83334d09965369240daf85ac5bd25e4e77fb76a4 (refs/remotes/origin/branch2)
 	A	baz
-r7 = 11a7d5e5ff70408fc3817d09125475d8871008ba (refs/remotes/origin/branch2)
+r7 = 242393160f5f94bcecb0098c6fd9111aa77cf45b (refs/remotes/origin/branch2)
 	A	bar2
-r8 = 6d3d401d7d703d1e6da267bdfd28ae2bd0926af0 (refs/remotes/origin/trunk)
+r8 = 67960cd23958caa840c2eaeb55180d7b4a42d62f (refs/remotes/origin/trunk)
 	A	bar2
 Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/trunk:4-8): 6d3d401d7d703d1e6da267bdfd28ae2bd0926af0
-r9 = 37227583802f8d37c8762763298e6a335eda94ca (refs/remotes/origin/branch2)
+Found merge parent (/trunk:4-8): 67960cd23958caa840c2eaeb55180d7b4a42d62f
+r9 = 12c2606e495c2b0e878865a101a062447135d43b (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): e5f968da6bf917657f8a331598f79edcd41bbaf0
-Found merge parent (/branches/branch2:6-9): 37227583802f8d37c8762763298e6a335eda94ca
-r10 = abf86e9ee6ed36bef22f411caf56deeda38e867b (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-5): 96e1514f93d8e60ddafb265af7511a1acaeeed9c
+Found merge parent (/branches/branch2:6-9): 12c2606e495c2b0e878865a101a062447135d43b
+r10 = 020c1020f87d52cce211714c86ee46d429fdaebf (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk r10
 ok 2 - clone svn repo
@@ -544409,43 +545340,43 @@
 	git svn clone "$svnrepo"/trunk --preserve-empty-dirs "$GIT_REPO"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
-r1 = 9ae99466763d308765e3c30ff79f2929b650ee3b (refs/remotes/git-svn)
+r1 = 3d29d87df7db7e81315ddc9a931cc495cbb16bed (refs/remotes/git-svn)
 	A	2/file1.txt
 	A	2/file2.txt
 	A	3/a/file1.txt
 	A	3/b/file1.txt
-r2 = b56f4efbf63317804a7ba179c7cbdbc0b2d645d5 (refs/remotes/git-svn)
+r2 = 1448e3482ec45734a7a9ab8f250309186128add6 (refs/remotes/git-svn)
 	D	4/.gitignore
 W: -empty_dir: 4/.gitignore
-r3 = 8e3329bd9e9f58638288fb3c4053318e74ee5ed4 (refs/remotes/git-svn)
+r3 = 11940f1c4c176ec25a8c68e00ff1d05e1da3cda0 (refs/remotes/git-svn)
 	D	4/a/.gitignore
 W: -empty_dir: 4/a/.gitignore
-r4 = 3c4efe08544135225b5b506f46d451642cb714a2 (refs/remotes/git-svn)
+r4 = f6372bf61228ac151464c5483f00863246be6e55 (refs/remotes/git-svn)
 	D	4/a/b/.gitignore
 W: -empty_dir: 4/a/b/.gitignore
-r5 = 8d3084b60e1c264cc71aca9853383cec7fc88c01 (refs/remotes/git-svn)
+r5 = 9f2056e4fe43e82c9b7c49f7c90cda703e134e63 (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 = 8f9e40ac453684feda2d3ad07d8b67787b33c00d (refs/remotes/git-svn)
+r6 = ad2828d1de104a0e3b2990f832d537febda5672b (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 = 086517c758387aa5e5ae02b89b8454253c1520df (refs/remotes/git-svn)
+r7 = 4d60ab638c8a00f0e5e1e78a7bdc5e172c5a4aef (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 = 0333a9670ff17a24931669fd78cf31731100e759 (refs/remotes/git-svn)
+r8 = e0e10273b956cc5d0259386bb8437fb33e81db91 (refs/remotes/git-svn)
 	D	5/.gitignore
 	A	5/.placeholder
 	D	6/.gitignore
 W: -empty_dir: 5/.gitignore
 W: -empty_dir: 6/.gitignore
-r9 = 9fa62d7fdeaa1fde709e8cded02a1e7847878f1a (refs/remotes/git-svn)
+r9 = 0948757a428bfc967d6047e6fc37aa93490119d3 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
 ok 2 - clone svn repo with --preserve-empty-dirs
@@ -544495,7 +545426,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 086517c delete non-last entry in directory
+HEAD is now at 4d60ab6 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': 
@@ -544506,40 +545437,40 @@
 	test $(find "$GIT_REPO" -type f -name ".placeholder" | wc -l) = "5"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
-r1 = 9ae99466763d308765e3c30ff79f2929b650ee3b (refs/remotes/git-svn)
+r1 = 3d29d87df7db7e81315ddc9a931cc495cbb16bed (refs/remotes/git-svn)
 	A	2/file1.txt
 	A	2/file2.txt
 	A	3/a/file1.txt
 	A	3/b/file1.txt
-r2 = 8ef798da783ca26234dd04b89200df2a0e19681d (refs/remotes/git-svn)
+r2 = f89a5e479e0c1e28f80ab2108401ed7bf5ea270e (refs/remotes/git-svn)
 	D	4/.placeholder
 W: -empty_dir: 4/.placeholder
-r3 = 269e396edde75deed624b7023e789d2e08394319 (refs/remotes/git-svn)
+r3 = ea7394ba18769af100082a1f6b4846764e709488 (refs/remotes/git-svn)
 	D	4/a/.placeholder
 W: -empty_dir: 4/a/.placeholder
-r4 = 8b2fdfd85371bd20754938f95bea1f9153822422 (refs/remotes/git-svn)
+r4 = 467110b2d4123d7fe080cb7eb41e82fd6de3569a (refs/remotes/git-svn)
 	D	4/a/b/.placeholder
 W: -empty_dir: 4/a/b/.placeholder
-r5 = 2f86822621998586c34f5972d18a2333ec19e50d (refs/remotes/git-svn)
+r5 = 45a2ff56a6118c21695e50231ae245adcb00e30f (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 = d4c52ccaccf809de70a0c80384e3b54a732dc000 (refs/remotes/git-svn)
+r6 = 91b0fb2004d68f86084c946feb079c7c2bd5ede3 (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 = 3967666b86e752621928339cc5127e7c3561262b (refs/remotes/git-svn)
+r7 = 64e66316c838223a74cfdff69bd2268b7805fe0f (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 = a5dc0ce5d69747af91965e5137cbfa0084116810 (refs/remotes/git-svn)
+r8 = 30def04d7e1999df10ed4745f463d7bf33a148f9 (refs/remotes/git-svn)
 	A	5/.placeholder
 	D	6/.placeholder
-r9 = f3fc87acb14bfa9698ea8d11fcb92c55b5c658c4 (refs/remotes/git-svn)
+r9 = f4cebd175104d567ef852022d34c0f20e8899355 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
 git-svn-repo/6/.placeholder/.placeholder
@@ -544603,7 +545534,7 @@
 	A	1/file1.txt
 	A	5/file1.txt
 W: -empty_dir: 1/.placeholder
-r10 = a8992dee8ef332cd2c71e0a9614468fd396cc0ce (refs/remotes/git-svn)
+r10 = 7c9e07858dcd21e0d9c0fb26e1c00d2f324cf3d3 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 10 - second set of svn commits and rebase
 
@@ -544627,6 +545558,337 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9163-git-svn-reset-clears-caches.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9163-git-svn-reset-clears-caches/.git/
+expecting success of 9163.1 'initialize source svn repo': 
+	svn_cmd mkdir -m "create trunk" "$svnrepo"/trunk &&
+	svn_cmd mkdir -m "create branches" "$svnrepo/branches" &&
+	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
+	(
+		cd "$SVN_TREE" &&
+		touch foo &&
+		svn_cmd add foo &&
+		svn_cmd commit -m "a" &&
+		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 b &&
+		svn_cmd switch "$svnrepo"/trunk &&
+		touch baz &&
+		svn_cmd add baz &&
+		svn_cmd commit -m c &&
+		svn_cmd up &&
+		svn_cmd merge "$svnrepo"/branches/branch1 &&
+		svn_cmd commit -m "m"
+	) &&
+	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.
+D    bar
+Updated to revision 5.
+A         baz
+Adding         baz
+Transmitting file data .done
+Committing transaction...
+Committed revision 6.
+Updating '.':
+At revision 6.
+--- Merging r4 through r6 into '.':
+A    bar
+--- Recording mergeinfo for merge of r4 through r6 into '.':
+ U   .
+Sending        .
+Adding         bar
+Committing transaction...
+Committed revision 7.
+ok 1 - initialize source svn repo
+
+expecting success of 9163.2 'fetch to merge-base (a)': 
+	git svn init -s "$svnrepo" &&
+	git svn fetch --revision BASE:3
+
+r1 = d67144e195cb67f9c8182932fd8099b120550b53 (refs/remotes/origin/trunk)
+	A	foo
+r3 = 862dd2253c126cd4dfc9020a3cc8244c8a8c270c (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk r3
+ok 2 - fetch to merge-base (a)
+
+expecting success of 9163.3 'rebase looses SVN merge (m)': 
+	git svn rebase &&
+	git svn fetch &&
+	test 1 = $(git cat-file -p main|grep parent|wc -l)
+
+	A	baz
+r6 = 1896d15419251e74f5daad7e47fed90f0a466e9d (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.51.0/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1
+r7 = 430b3b9f6931b1004bb2d3040f1fe7b657bc95be (refs/remotes/origin/trunk)
+Successfully rebased and updated refs/heads/main.
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1, 3
+Found branch parent: (refs/remotes/origin/branch1) 862dd2253c126cd4dfc9020a3cc8244c8a8c270c
+Following parent with do_switch
+Successfully followed parent
+r4 = de6b7489318a92fdf02528977fa0bd49aaf7ee42 (refs/remotes/origin/branch1)
+	A	bar
+r5 = d7a88d977163e69e5d00f2470f7c89c70f5e4214 (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': 
+	git svn reset -r 3 &&
+	git reset --hard origin/trunk &&
+	git svn fetch &&
+	test 2 = $(git cat-file -p origin/trunk|grep parent|wc -l)
+
+r3 = 862dd2253c126cd4dfc9020a3cc8244c8a8c270c (refs/remotes/origin/trunk)
+HEAD is now at 862dd22 a
+Index mismatch: 4d5fcadc293a348e88f777dc0920f11e7d71441c != 4e126a1a1821dd5763468eb219c1ecdb6f7f0fda
+rereading 862dd2253c126cd4dfc9020a3cc8244c8a8c270c
+	A	baz
+r6 = 1896d15419251e74f5daad7e47fed90f0a466e9d (refs/remotes/origin/trunk)
+	A	bar
+Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
+Found merge parent (/branches/branch1:4-6): d7a88d977163e69e5d00f2470f7c89c70f5e4214
+r7 = d168a7aab2288bca89ee90564e09bedad01878c9 (refs/remotes/origin/trunk)
+ok 4 - reset and fetch gets the SVN merge (m) correctly
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9162-git-svn-dcommit-interactive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9162-git-svn-dcommit-interactive/.git/
+expecting success of 9162.1 'initialize repo': 
+	svn_cmd mkdir -m"mkdir test-interactive" "$svnrepo/test-interactive" &&
+	git svn clone "$svnrepo/test-interactive" test-interactive &&
+	cd test-interactive &&
+	touch foo && git add foo && git commit -m"foo: first commit" &&
+	git svn dcommit
+	
+Committing transaction...
+Committed revision 1.
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9162-git-svn-dcommit-interactive/test-interactive/.git/
+r1 = 3d4f2badd07fcbe920abd70fc446c5afcff750b0 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive r1
+[master 32450e4] foo: first commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+	A	foo
+Committed r2
+	A	foo
+r2 = f674c64e39b9782ec758f4eee3776d3554f08b34 (refs/remotes/git-svn)
+No changes between 32450e473965f5e8f682926a1a6ed721aa7e0fee and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 1 - initialize repo
+
+expecting success of 9162.2 'answers: y [\n] yes': 
+	(
+		echo "change #1" >> foo && git commit -a -m"change #1" &&
+		echo "change #2" >> foo && git commit -a -m"change #2" &&
+		echo "change #3" >> foo && git commit -a -m"change #3" &&
+		( echo "y
+
+y" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
+		test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn)
+	)
+	
+[master 151a5c1] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master e46c720] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master d799caa] 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.51.0/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit 151a5c1ab23b24ced11bfbe4406698dbf02e8a01
+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 e46c7206758a6a24b7bae160f6fcaf30d1975e0b
+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 d799caa7f3b83d4ba58486850b5b49bb1c86a26c
+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): 	M	foo
+Committed r3
+	M	foo
+r3 = 5fd431fdbb0ef27cde465e23d0436e695f72b047 (refs/remotes/git-svn)
+	M	foo
+Committed r4
+	M	foo
+r4 = e6b1532c265a4eb665ac4f63cbbec9143b505332 (refs/remotes/git-svn)
+	M	foo
+Committed r5
+	M	foo
+r5 = 4518e2ce755133fbedd16a83a3a9d71171c64f3e (refs/remotes/git-svn)
+No changes between d799caa7f3b83d4ba58486850b5b49bb1c86a26c and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 2 - answers: y [\n] yes
+
+expecting success of 9162.3 'answers: yes yes no': 
+	(
+		echo "change #1" >> foo && git commit -a -m"change #1" &&
+		echo "change #2" >> foo && git commit -a -m"change #2" &&
+		echo "change #3" >> foo && git commit -a -m"change #3" &&
+		( echo "yes
+yes
+no" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
+		test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) &&
+		git reset --hard remotes/git-svn
+	)
+	
+[master 6dfe4db] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 6218c36] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master ed5d894] 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.51.0/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit 6dfe4db32cdc4cbf8d4f26f36d443a63a567317a
+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 6218c365285d7980ceef586ce64503a3ba264520
+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 ed5d894c1c447048861b6c06a9a3f0fff5b344b5
+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 4518e2c change #3
+ok 3 - answers: yes yes no
+
+expecting success of 9162.4 'answers: yes quit': 
+	(
+		echo "change #1" >> foo && git commit -a -m"change #1" &&
+		echo "change #2" >> foo && git commit -a -m"change #2" &&
+		echo "change #3" >> foo && git commit -a -m"change #3" &&
+		( echo "yes
+quit" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
+		test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) &&
+		git reset --hard remotes/git-svn
+	)
+	
+[master 6dfe4db] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 6218c36] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master ed5d894] 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.51.0/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit 6dfe4db32cdc4cbf8d4f26f36d443a63a567317a
+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 6218c365285d7980ceef586ce64503a3ba264520
+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 4518e2c change #3
+ok 4 - answers: yes quit
+
+expecting success of 9162.5 'answers: all': 
+	(
+		echo "change #1" >> foo && git commit -a -m"change #1" &&
+		echo "change #2" >> foo && git commit -a -m"change #2" &&
+		echo "change #3" >> foo && git commit -a -m"change #3" &&
+		( echo "all" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
+		test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn) &&
+		git reset --hard remotes/git-svn
+	)
+	
+[master 6dfe4db] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 6218c36] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master ed5d894] 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.51.0/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit 6dfe4db32cdc4cbf8d4f26f36d443a63a567317a
+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): 	M	foo
+Committed r6
+	M	foo
+r6 = 25be98a600d8b4fa42ac9245ad95e7c2c012237a (refs/remotes/git-svn)
+	M	foo
+Committed r7
+	M	foo
+r7 = b33a348b756a5412e4ca6f36d84372d4dd27e08d (refs/remotes/git-svn)
+	M	foo
+Committed r8
+	M	foo
+r8 = a7fdcb016893d3e586ae7d6763616ce75a5d9d5a (refs/remotes/git-svn)
+No changes between ed5d894c1c447048861b6c06a9a3f0fff5b344b5 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+HEAD is now at a7fdcb0 change #3
+ok 5 - answers: all
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9151-svn-mergeinfo.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9151-svn-mergeinfo/.git/
 expecting success of 9151.1 'load svn dump': 
@@ -545243,337 +546505,6 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9162-git-svn-dcommit-interactive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9162-git-svn-dcommit-interactive/.git/
-expecting success of 9162.1 'initialize repo': 
-	svn_cmd mkdir -m"mkdir test-interactive" "$svnrepo/test-interactive" &&
-	git svn clone "$svnrepo/test-interactive" test-interactive &&
-	cd test-interactive &&
-	touch foo && git add foo && git commit -m"foo: first commit" &&
-	git svn dcommit
-	
-Committing transaction...
-Committed revision 1.
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9162-git-svn-dcommit-interactive/test-interactive/.git/
-r1 = c6346639de404a8749361e78fd1ee868b14e0b62 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive r1
-[master 2a7e683] foo: first commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-	A	foo
-Committed r2
-	A	foo
-r2 = 772abaa82b48a95aeb9504b15101dc5f4483157a (refs/remotes/git-svn)
-No changes between 2a7e6838c55f1e5dae85581e06b8aa6e9fff5180 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 1 - initialize repo
-
-expecting success of 9162.2 'answers: y [\n] yes': 
-	(
-		echo "change #1" >> foo && git commit -a -m"change #1" &&
-		echo "change #2" >> foo && git commit -a -m"change #2" &&
-		echo "change #3" >> foo && git commit -a -m"change #3" &&
-		( echo "y
-
-y" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
-		test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn)
-	)
-	
-[master 3e5ae04] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 4e765b3] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master eb740d7] 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.51.0/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 3e5ae047053fda4904d382a2864bf1b343fa85c0
-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 4e765b31981d75697df2c7c266e72b9faa08b181
-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 eb740d7767974544efcd8e17145c561395bb0626
-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): 	M	foo
-Committed r3
-	M	foo
-r3 = ae9fdde11f5a5a99299df287a603c2f1cd74e636 (refs/remotes/git-svn)
-	M	foo
-Committed r4
-	M	foo
-r4 = afdfbc1c7c2246130239e62efb55d12e589f830b (refs/remotes/git-svn)
-	M	foo
-Committed r5
-	M	foo
-r5 = 7f8c7cb1ba3159b6769b3893644a62169e4eb2ed (refs/remotes/git-svn)
-No changes between eb740d7767974544efcd8e17145c561395bb0626 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 2 - answers: y [\n] yes
-
-expecting success of 9162.3 'answers: yes yes no': 
-	(
-		echo "change #1" >> foo && git commit -a -m"change #1" &&
-		echo "change #2" >> foo && git commit -a -m"change #2" &&
-		echo "change #3" >> foo && git commit -a -m"change #3" &&
-		( echo "yes
-yes
-no" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
-		test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) &&
-		git reset --hard remotes/git-svn
-	)
-	
-[master fa7b875] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 20e0147] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b904bd0] 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.51.0/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit fa7b8758cdd26cb58cb83d28f8836ee23733ea66
-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 20e0147f0a7e6a82cc416b98b5684d6e16368671
-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 b904bd02e51246a7e79e1c5e04807992cddadfa4
-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 7f8c7cb change #3
-ok 3 - answers: yes yes no
-
-expecting success of 9162.4 'answers: yes quit': 
-	(
-		echo "change #1" >> foo && git commit -a -m"change #1" &&
-		echo "change #2" >> foo && git commit -a -m"change #2" &&
-		echo "change #3" >> foo && git commit -a -m"change #3" &&
-		( echo "yes
-quit" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
-		test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) &&
-		git reset --hard remotes/git-svn
-	)
-	
-[master fa7b875] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 20e0147] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b904bd0] 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.51.0/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit fa7b8758cdd26cb58cb83d28f8836ee23733ea66
-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 20e0147f0a7e6a82cc416b98b5684d6e16368671
-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 7f8c7cb change #3
-ok 4 - answers: yes quit
-
-expecting success of 9162.5 'answers: all': 
-	(
-		echo "change #1" >> foo && git commit -a -m"change #1" &&
-		echo "change #2" >> foo && git commit -a -m"change #2" &&
-		echo "change #3" >> foo && git commit -a -m"change #3" &&
-		( echo "all" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
-		test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn) &&
-		git reset --hard remotes/git-svn
-	)
-	
-[master fa7b875] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 20e0147] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b904bd0] 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.51.0/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit fa7b8758cdd26cb58cb83d28f8836ee23733ea66
-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): 	M	foo
-Committed r6
-	M	foo
-r6 = 5697b6a7d50d50052a6b44371243698c8b1d0bfa (refs/remotes/git-svn)
-	M	foo
-Committed r7
-	M	foo
-r7 = da749550bd7530965a198fd7b9a86d3d60b7f9cd (refs/remotes/git-svn)
-	M	foo
-Committed r8
-	M	foo
-r8 = c8f968f38f0cc6b0b7a58f8694733909e0923efd (refs/remotes/git-svn)
-No changes between b904bd02e51246a7e79e1c5e04807992cddadfa4 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-HEAD is now at c8f968f change #3
-ok 5 - answers: all
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9163-git-svn-reset-clears-caches.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9163-git-svn-reset-clears-caches/.git/
-expecting success of 9163.1 'initialize source svn repo': 
-	svn_cmd mkdir -m "create trunk" "$svnrepo"/trunk &&
-	svn_cmd mkdir -m "create branches" "$svnrepo/branches" &&
-	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
-	(
-		cd "$SVN_TREE" &&
-		touch foo &&
-		svn_cmd add foo &&
-		svn_cmd commit -m "a" &&
-		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 b &&
-		svn_cmd switch "$svnrepo"/trunk &&
-		touch baz &&
-		svn_cmd add baz &&
-		svn_cmd commit -m c &&
-		svn_cmd up &&
-		svn_cmd merge "$svnrepo"/branches/branch1 &&
-		svn_cmd commit -m "m"
-	) &&
-	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.
-D    bar
-Updated to revision 5.
-A         baz
-Adding         baz
-Transmitting file data .done
-Committing transaction...
-Committed revision 6.
-Updating '.':
-At revision 6.
---- Merging r4 through r6 into '.':
-A    bar
---- Recording mergeinfo for merge of r4 through r6 into '.':
- U   .
-Sending        .
-Adding         bar
-Committing transaction...
-Committed revision 7.
-ok 1 - initialize source svn repo
-
-expecting success of 9163.2 'fetch to merge-base (a)': 
-	git svn init -s "$svnrepo" &&
-	git svn fetch --revision BASE:3
-
-r1 = 9c9539b752392902bf200d782a69044423f0868d (refs/remotes/origin/trunk)
-	A	foo
-r3 = a57c86e09487a1625450c866434b5a74269b565a (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk r3
-ok 2 - fetch to merge-base (a)
-
-expecting success of 9163.3 'rebase looses SVN merge (m)': 
-	git svn rebase &&
-	git svn fetch &&
-	test 1 = $(git cat-file -p main|grep parent|wc -l)
-
-	A	baz
-r6 = 825b9575ca071c732b1da10783fc7d018f9e609d (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.51.0/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1
-r7 = ad6065e4aaaa2830dd5fb1d07e10108e5cc23032 (refs/remotes/origin/trunk)
-Successfully rebased and updated refs/heads/main.
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) a57c86e09487a1625450c866434b5a74269b565a
-Following parent with do_switch
-Successfully followed parent
-r4 = c448cb63fe297e20b9d475a4608361c344452c80 (refs/remotes/origin/branch1)
-	A	bar
-r5 = 2778cf79c186cb8677228ac0f62cfb7233896142 (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': 
-	git svn reset -r 3 &&
-	git reset --hard origin/trunk &&
-	git svn fetch &&
-	test 2 = $(git cat-file -p origin/trunk|grep parent|wc -l)
-
-r3 = a57c86e09487a1625450c866434b5a74269b565a (refs/remotes/origin/trunk)
-HEAD is now at a57c86e a
-Index mismatch: 4d5fcadc293a348e88f777dc0920f11e7d71441c != 4e126a1a1821dd5763468eb219c1ecdb6f7f0fda
-rereading a57c86e09487a1625450c866434b5a74269b565a
-	A	baz
-r6 = 825b9575ca071c732b1da10783fc7d018f9e609d (refs/remotes/origin/trunk)
-	A	bar
-Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-6): 2778cf79c186cb8677228ac0f62cfb7233896142
-r7 = aa128bc209053c0ee4c8b1dca96dfc581f6b8aa4 (refs/remotes/origin/trunk)
-ok 4 - reset and fetch gets the SVN merge (m) correctly
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9304-fast-import-marks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9304-fast-import-marks/.git/
 expecting success of 9304.1 'setup dump of basic history': 
@@ -546168,8 +547099,8 @@
 	test_line_count = 1 unique &&
 	! test_cmp authors committers
 
---- authors	2025-08-27 08:24:07.600903010 +0000
-+++ committers	2025-08-27 08:24:07.608903063 +0000
+--- authors	2026-09-29 14:54:39.382548970 +0000
++++ committers	2026-09-29 14:54:39.402548970 +0000
 @@ -1,6 +1,6 @@
 -User 1 <user1@example.com>
 -User 1 <user1@example.com>
@@ -547070,7 +548001,7 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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":"20250827T082405.414338Z-Hcf858c9d-P000e773f","thread":"main","time":"2025-08-27T08:24:05.449421Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","fetch","--quiet","--no-progress","origin","--no-tags"]}
+{"event":"child_start","sid":"20260929T145438.114011Z-H5c947e1c-P0027b2f8","thread":"main","time":"2026-09-29T14:54:38.148295Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","fetch","--quiet","--no-progress","origin","--no-tags"]}
 ok 13 - scalar clone --no-... opts
 
 expecting success of 9210.14 'scalar reconfigure': 
@@ -547098,16 +548029,16 @@
 	test_subcommand ! git maintenance unregister --force <reconfigure-maint-keep
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9210-scalar/one/src/.git/
-{"event":"child_start","sid":"20250827T082405.742205Z-Hcf858c9d-P000e795c","thread":"main","time":"2025-08-27T08:24:05.750498Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20250827T082405.742205Z-Hcf858c9d-P000e795c","thread":"main","time":"2025-08-27T08:24:05.821309Z","file":"run-command.c","line":740,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20250827T082405.742205Z-Hcf858c9d-P000e795c","thread":"main","time":"2025-08-27T08:24:05.877161Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20250827T082405.742205Z-Hcf858c9d-P000e795c","thread":"main","time":"2025-08-27T08:24:05.916427Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20250827T082405.742205Z-Hcf858c9d-P000e795c","thread":"main","time":"2025-08-27T08:24:05.968820Z","file":"run-command.c","line":740,"child_id":4,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20250827T082406.030286Z-Hcf858c9d-P000e7b41","thread":"main","time":"2025-08-27T08:24:06.043373Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","unregister","--force"]}
-{"event":"child_start","sid":"20250827T082406.030286Z-Hcf858c9d-P000e7b41","thread":"main","time":"2025-08-27T08:24:06.051080Z","file":"run-command.c","line":740,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","maintenance","unregister","--force"]}
-{"event":"child_start","sid":"20250827T082406.030286Z-Hcf858c9d-P000e7b41","thread":"main","time":"2025-08-27T08:24:06.067203Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","unregister","--force"]}
-{"event":"child_start","sid":"20250827T082406.030286Z-Hcf858c9d-P000e7b41","thread":"main","time":"2025-08-27T08:24:06.089370Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","maintenance","unregister","--force"]}
-{"event":"child_start","sid":"20250827T082406.030286Z-Hcf858c9d-P000e7b41","thread":"main","time":"2025-08-27T08:24:06.099620Z","file":"run-command.c","line":740,"child_id":4,"child_class":"?","use_shell":false,"argv":["git","maintenance","unregister","--force"]}
+{"event":"child_start","sid":"20260929T145438.364332Z-H5c947e1c-P0027b5a4","thread":"main","time":"2026-09-29T14:54:38.368036Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20260929T145438.364332Z-H5c947e1c-P0027b5a4","thread":"main","time":"2026-09-29T14:54:38.392626Z","file":"run-command.c","line":740,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20260929T145438.364332Z-H5c947e1c-P0027b5a4","thread":"main","time":"2026-09-29T14:54:38.423422Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20260929T145438.364332Z-H5c947e1c-P0027b5a4","thread":"main","time":"2026-09-29T14:54:38.450172Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20260929T145438.364332Z-H5c947e1c-P0027b5a4","thread":"main","time":"2026-09-29T14:54:38.476292Z","file":"run-command.c","line":740,"child_id":4,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20260929T145438.513166Z-H5c947e1c-P0027b732","thread":"main","time":"2026-09-29T14:54:38.516515Z","file":"run-command.c","line":740,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","unregister","--force"]}
+{"event":"child_start","sid":"20260929T145438.513166Z-H5c947e1c-P0027b732","thread":"main","time":"2026-09-29T14:54:38.523853Z","file":"run-command.c","line":740,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","maintenance","unregister","--force"]}
+{"event":"child_start","sid":"20260929T145438.513166Z-H5c947e1c-P0027b732","thread":"main","time":"2026-09-29T14:54:38.531509Z","file":"run-command.c","line":740,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","unregister","--force"]}
+{"event":"child_start","sid":"20260929T145438.513166Z-H5c947e1c-P0027b732","thread":"main","time":"2026-09-29T14:54:38.538736Z","file":"run-command.c","line":740,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","maintenance","unregister","--force"]}
+{"event":"child_start","sid":"20260929T145438.513166Z-H5c947e1c-P0027b732","thread":"main","time":"2026-09-29T14:54:38.545448Z","file":"run-command.c","line":740,"child_id":4,"child_class":"?","use_shell":false,"argv":["git","maintenance","unregister","--force"]}
 ok 14 - scalar reconfigure
 
 expecting success of 9210.15 'scalar reconfigure --all with includeIf.onbranch': 
@@ -547301,41 +548232,41 @@
  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.51.0/t/trash directory.t9210-scalar/cloned/src': 87.54 GiB (mount flags 0x1000)
-Archive:  /build/reproducible-path/git-2.51.0/t/trash directory.t9210-scalar/cloned/.scalarDiagnostics/git-diagnostics-20250827_082408.zip
+Available space on '/build/reproducible-path/git-2.51.0/t/trash directory.t9210-scalar/cloned/src': 83.13 GiB (mount flags 0x1000)
+Archive:  /build/reproducible-path/git-2.51.0/t/trash directory.t9210-scalar/cloned/.scalarDiagnostics/git-diagnostics-20260929_145440.zip
  Length   Method    Size  Cmpr    Date    Time   CRC-32   Name
 --------  ------  ------- ---- ---------- ----- --------  ----
-     487  Defl:N      300  38% 2025-08-27 08:24 76dd283d  diagnostics.log
-    1087  Defl:N      260  76% 2025-08-27 08:24 aa1ab0b0  packs-local.txt
-     198  Defl:N      132  33% 2025-08-27 08:24 778f6eb2  objects-local.txt
-       6  Stored        6   0% 2025-08-27 08:24 183bc9be  .git/COMMIT_EDITMSG
-     602  Defl:N      414  31% 2025-08-27 08:24 2efcc1a6  .git/index
-    1143  Defl:N      585  49% 2025-08-27 08:24 4a7b51e0  .git/config
-      25  Stored       25   0% 2025-08-27 08:24 7ce4afd6  .git/HEAD
-     425  Defl:N      177  58% 2025-08-27 08:24 855a80f7  .git/FETCH_HEAD
-      57  Defl:N       39  32% 2025-08-27 08:24 795d289e  .git/config.worktree
-      73  Defl:N       63  14% 2025-08-27 08:24 1f078b37  .git/description
-     478  Defl:N      279  42% 2025-08-27 08:24 09f84f85  .git/hooks/applypatch-msg.sample
-     896  Defl:N      503  44% 2025-08-27 08:24 10caf8e9  .git/hooks/commit-msg.sample
-    4726  Defl:N     1814  62% 2025-08-27 08:24 793c7cef  .git/hooks/fsmonitor-watchman.sample
-     189  Defl:N      138  27% 2025-08-27 08:24 c0f70c9a  .git/hooks/post-update.sample
-     424  Defl:N      265  38% 2025-08-27 08:24 024cc0cf  .git/hooks/pre-applypatch.sample
-    1649  Defl:N      907  45% 2025-08-27 08:24 1b0e50ae  .git/hooks/pre-commit.sample
-     416  Defl:N      255  39% 2025-08-27 08:24 5ef33f44  .git/hooks/pre-merge-commit.sample
-    1492  Defl:N      744  50% 2025-08-27 08:24 303613ed  .git/hooks/prepare-commit-msg.sample
-    1374  Defl:N      701  49% 2025-08-27 08:24 f90a0f0f  .git/hooks/pre-push.sample
-    4898  Defl:N     2015  59% 2025-08-27 08:24 5158ec84  .git/hooks/pre-rebase.sample
-     544  Defl:N      329  40% 2025-08-27 08:24 96f8c492  .git/hooks/pre-receive.sample
-    2783  Defl:N     1254  55% 2025-08-27 08:24 f00806d3  .git/hooks/push-to-checkout.sample
-    2308  Defl:N      975  58% 2025-08-27 08:24 4b9edd4e  .git/hooks/sendemail-validate.sample
-    3650  Defl:N     1173  68% 2025-08-27 08:24 06fcf0d9  .git/hooks/update.sample
-       8  Stored        8   0% 2025-08-27 08:24 4cc141be  .git/info/sparse-checkout
-     240  Defl:N      173  28% 2025-08-27 08:24 21cd3d77  .git/info/exclude
-     323  Defl:N      168  48% 2025-08-27 08:24 dc297921  .git/logs/HEAD
-     319  Defl:N      164  49% 2025-08-27 08:24 51851cc6  .git/logs/refs/heads/parallel
-     140  Defl:N      100  29% 2025-08-27 08:24 7e602633  .git/logs/refs/remotes/origin/HEAD
-     183  Defl:N      131  28% 2025-08-27 08:24 403541c6  .git/logs/refs/remotes/origin/parallel
-      81  Defl:N       76   6% 2025-08-27 08:24 12465565  .git/objects/info/alternates
+     487  Defl:N      299  39% 2026-09-29 14:54 535c16ef  diagnostics.log
+    1087  Defl:N      260  76% 2026-09-29 14:54 aa1ab0b0  packs-local.txt
+     198  Defl:N      132  33% 2026-09-29 14:54 778f6eb2  objects-local.txt
+       6  Stored        6   0% 2026-09-29 14:54 183bc9be  .git/COMMIT_EDITMSG
+     602  Defl:N      415  31% 2026-09-29 14:54 7eaa89fa  .git/index
+    1143  Defl:N      585  49% 2026-09-29 14:54 4a7b51e0  .git/config
+      25  Stored       25   0% 2026-09-29 14:54 7ce4afd6  .git/HEAD
+     425  Defl:N      177  58% 2026-09-29 14:54 855a80f7  .git/FETCH_HEAD
+      57  Defl:N       39  32% 2026-09-29 14:54 795d289e  .git/config.worktree
+      73  Defl:N       63  14% 2026-09-29 14:54 1f078b37  .git/description
+     478  Defl:N      279  42% 2026-09-29 14:54 09f84f85  .git/hooks/applypatch-msg.sample
+     896  Defl:N      503  44% 2026-09-29 14:54 10caf8e9  .git/hooks/commit-msg.sample
+    4726  Defl:N     1814  62% 2026-09-29 14:54 793c7cef  .git/hooks/fsmonitor-watchman.sample
+     189  Defl:N      138  27% 2026-09-29 14:54 c0f70c9a  .git/hooks/post-update.sample
+     424  Defl:N      265  38% 2026-09-29 14:54 024cc0cf  .git/hooks/pre-applypatch.sample
+    1649  Defl:N      907  45% 2026-09-29 14:54 1b0e50ae  .git/hooks/pre-commit.sample
+     416  Defl:N      255  39% 2026-09-29 14:54 5ef33f44  .git/hooks/pre-merge-commit.sample
+    1492  Defl:N      744  50% 2026-09-29 14:54 303613ed  .git/hooks/prepare-commit-msg.sample
+    1374  Defl:N      701  49% 2026-09-29 14:54 f90a0f0f  .git/hooks/pre-push.sample
+    4898  Defl:N     2015  59% 2026-09-29 14:54 5158ec84  .git/hooks/pre-rebase.sample
+     544  Defl:N      329  40% 2026-09-29 14:54 96f8c492  .git/hooks/pre-receive.sample
+    2783  Defl:N     1254  55% 2026-09-29 14:54 f00806d3  .git/hooks/push-to-checkout.sample
+    2308  Defl:N      975  58% 2026-09-29 14:54 4b9edd4e  .git/hooks/sendemail-validate.sample
+    3650  Defl:N     1173  68% 2026-09-29 14:54 06fcf0d9  .git/hooks/update.sample
+       8  Stored        8   0% 2026-09-29 14:54 4cc141be  .git/info/sparse-checkout
+     240  Defl:N      173  28% 2026-09-29 14:54 21cd3d77  .git/info/exclude
+     323  Defl:N      168  48% 2026-09-29 14:54 dc297921  .git/logs/HEAD
+     319  Defl:N      164  49% 2026-09-29 14:54 51851cc6  .git/logs/refs/heads/parallel
+     140  Defl:N      100  29% 2026-09-29 14:54 7e602633  .git/logs/refs/remotes/origin/HEAD
+     183  Defl:N      131  28% 2026-09-29 14:54 403541c6  .git/logs/refs/remotes/origin/parallel
+      81  Defl:N       76   6% 2026-09-29 14:54 12465565  .git/objects/info/alternates
 --------          -------  ---                            -------
    31224            14173  55%                            31 files
 Contents of /build/reproducible-path/git-2.51.0/t/trash directory.t9210-scalar/.git/objects:
@@ -548400,8 +549331,8 @@
 		test_cmp expected output
 	)
 
---- expected	2025-08-27 08:24:09.052912591 +0000
-+++ output	2025-08-27 08:24:09.060912643 +0000
+--- expected	2026-09-29 14:54:40.470548970 +0000
++++ output	2026-09-29 14:54:40.478548970 +0000
 @@ -8,8 +8,7 @@
  data 3
  hi
@@ -549053,6 +549984,438 @@
 1..67
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9168-git-svn-partially-globbed-names.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9168-git-svn-partially-globbed-names/.git/
+expecting success of 9168.1 'prepare test refspec prefixed globbing': 
+	cat >expect.end <<EOF
+the end
+hi
+start a new branch
+initial
+EOF
+	
+ok 1 - prepare test refspec prefixed globbing
+
+expecting success of 9168.2 'test refspec prefixed globbing': 
+	mkdir -p trunk/src/a trunk/src/b trunk/doc &&
+	echo "hello world" >trunk/src/a/readme &&
+	echo "goodbye world" >trunk/src/b/readme &&
+	svn_cmd import -m "initial" trunk "$svnrepo"/trunk &&
+	svn_cmd co "$svnrepo" tmp &&
+	(
+		cd tmp &&
+		mkdir branches tags &&
+		svn_cmd add branches tags &&
+		svn_cmd cp trunk branches/b_start &&
+		svn_cmd commit -m "start a new branch" &&
+		svn_cmd up &&
+		echo "hi" >>branches/b_start/src/b/readme &&
+		poke branches/b_start/src/b/readme &&
+		echo "hey" >>branches/b_start/src/a/readme &&
+		poke branches/b_start/src/a/readme &&
+		svn_cmd commit -m "hi" &&
+		svn_cmd up &&
+		svn_cmd cp branches/b_start tags/t_end &&
+		echo "bye" >>tags/t_end/src/b/readme &&
+		poke tags/t_end/src/b/readme &&
+		echo "aye" >>tags/t_end/src/a/readme &&
+		poke tags/t_end/src/a/readme &&
+		svn_cmd commit -m "the end" &&
+		echo "byebye" >>tags/t_end/src/b/readme &&
+		poke tags/t_end/src/b/readme &&
+		svn_cmd commit -m "nothing to see here"
+	) &&
+	git config --add svn-remote.svn.url "$svnrepo" &&
+	git config --add svn-remote.svn.fetch \
+			 "trunk/src/a:refs/remotes/trunk" &&
+	git config --add svn-remote.svn.branches \
+			 "branches/b_*/src/a:refs/remotes/branches/b_*" &&
+	git config --add svn-remote.svn.tags\
+			 "tags/t_*/src/a:refs/remotes/tags/t_*" &&
+	git svn multi-fetch &&
+	git log --pretty=oneline refs/remotes/tags/t_end >actual &&
+	cut -d" " -f2- actual >output.end &&
+	test_cmp expect.end output.end &&
+	test "$(git rev-parse refs/remotes/tags/t_end~1)" = \
+		"$(git rev-parse refs/remotes/branches/b_start)" &&
+	test "$(git rev-parse refs/remotes/branches/b_start~2)" = \
+		"$(git rev-parse refs/remotes/trunk)" &&
+	test_must_fail git rev-parse refs/remotes/tags/t_end@3
+	
+Adding         trunk/doc
+Adding         trunk/src
+Adding         trunk/src/a
+Adding         trunk/src/a/readme
+Adding         trunk/src/b
+Adding         trunk/src/b/readme
+Committing transaction...
+Committed revision 1.
+A    tmp/trunk
+A    tmp/trunk/doc
+A    tmp/trunk/src
+A    tmp/trunk/src/a
+A    tmp/trunk/src/a/readme
+A    tmp/trunk/src/b
+A    tmp/trunk/src/b/readme
+Checked out revision 1.
+A         branches
+A         tags
+A         branches/b_start
+Adding         branches
+Adding         branches/b_start
+Adding         tags
+Committing transaction...
+Committed revision 2.
+Updating '.':
+At revision 2.
+Sending        branches/b_start/src/a/readme
+Sending        branches/b_start/src/b/readme
+Transmitting file data ..done
+Committing transaction...
+Committed revision 3.
+Updating '.':
+At revision 3.
+A         tags/t_end
+Adding         tags/t_end
+Sending        tags/t_end/src/a/readme
+Sending        tags/t_end/src/b/readme
+Transmitting file data ..done
+Committing transaction...
+Committed revision 4.
+Sending        tags/t_end/src/b/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 5.
+Migrating from a git-svn v1 layout...
+Data from a previous version of git-svn exists, but
+	.git/svn
+	(required for this version (2.51.0) of git-svn) does not exist.
+Done migrating from a git-svn v1 layout
+	A	readme
+r1 = 6ceba2787ff04e81714860a8d9600d0d8470560b (refs/remotes/trunk)
+branch_from: /trunk => /trunk/src/a
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a, 1
+Found branch parent: (refs/remotes/branches/b_start) 6ceba2787ff04e81714860a8d9600d0d8470560b
+Following parent with do_switch
+Successfully followed parent
+r2 = cf41f2b224e55b38e61467a55d829e90a9fa0006 (refs/remotes/branches/b_start)
+	M	readme
+r3 = 8b660ccc163790a0ddcdcb2dd791a47564e66ef6 (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.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end/src/a, 3
+Found branch parent: (refs/remotes/tags/t_end) 8b660ccc163790a0ddcdcb2dd791a47564e66ef6
+Following parent with do_switch
+	M	readme
+Successfully followed parent
+r4 = 5e482ce74da240b6e65873f36a8f903a7241d88b (refs/remotes/tags/t_end)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.51.0/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.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/tags/t_end@3
+ok 2 - test refspec prefixed globbing
+
+expecting success of 9168.3 'prepare test left-hand-side only prefixed globbing': 
+	echo try to try >expect.two &&
+	echo nothing to see here >>expect.two &&
+	cat expect.end >>expect.two
+	
+ok 3 - prepare test left-hand-side only prefixed globbing
+
+expecting success of 9168.4 'test left-hand-side only prefixed globbing': 
+	git config --add svn-remote.two.url "$svnrepo" &&
+	git config --add svn-remote.two.fetch trunk:refs/remotes/two/trunk &&
+	git config --add svn-remote.two.branches \
+			 "branches/b_*:refs/remotes/two/branches/*" &&
+	git config --add svn-remote.two.tags \
+			 "tags/t_*:refs/remotes/two/tags/*" &&
+	(
+		cd tmp &&
+		echo "try try" >>tags/t_end/src/b/readme &&
+		poke tags/t_end/src/b/readme &&
+		svn_cmd commit -m "try to try"
+	) &&
+	git svn fetch two &&
+	git rev-list refs/remotes/two/tags/t_end >actual &&
+	test_line_count = 6 actual &&
+	git rev-list refs/remotes/two/branches/b_start >actual &&
+	test_line_count = 3 actual &&
+	test $(git rev-parse refs/remotes/two/branches/b_start~2) = \
+	     $(git rev-parse refs/remotes/two/trunk) &&
+	test $(git rev-parse refs/remotes/two/tags/t_end~3) = \
+	     $(git rev-parse refs/remotes/two/branches/b_start) &&
+	git log --pretty=oneline refs/remotes/two/tags/t_end >actual &&
+	cut -d" " -f2- actual >output.two &&
+	test_cmp expect.two output.two
+	
+Sending        tags/t_end/src/b/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 6.
+	A	src/a/readme
+	A	src/b/readme
+W: +empty_dir: trunk/doc
+r1 = eb4934efb403b25c243028ad5f56413e1013c2df (refs/remotes/two/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
+Found branch parent: (refs/remotes/two/branches/b_start) eb4934efb403b25c243028ad5f56413e1013c2df
+Following parent with do_switch
+Successfully followed parent
+r2 = d3eda0e5b9ac5a5dd1dbaebfc35ae3ff99747337 (refs/remotes/two/branches/b_start)
+	M	src/a/readme
+	M	src/b/readme
+r3 = ffbe000f799f1359b8e6d7333c6070228c52ae2e (refs/remotes/two/branches/b_start)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
+Found branch parent: (refs/remotes/two/tags/t_end) ffbe000f799f1359b8e6d7333c6070228c52ae2e
+Following parent with do_switch
+	M	src/a/readme
+	M	src/b/readme
+Successfully followed parent
+r4 = 725968c40baedc4cfbe9a9273b1a3c52d91683ea (refs/remotes/two/tags/t_end)
+	M	src/b/readme
+r5 = 63f9e5558f942cdcd490e53ef16e3af8e764e865 (refs/remotes/two/tags/t_end)
+	M	src/b/readme
+r6 = 65f4a0856523de8fd24912ecf6ba7da28e36263d (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': 
+	cat >expect.three <<EOF
+Tag commit to t_
+Branch commit to b_
+initial
+EOF
+	
+ok 5 - prepare test prefixed globs match just prefix
+
+expecting success of 9168.6 'test prefixed globs match just prefix': 
+	git config --add svn-remote.three.url "$svnrepo" &&
+	git config --add svn-remote.three.fetch \
+			 trunk:refs/remotes/three/trunk &&
+	git config --add svn-remote.three.branches \
+			 "branches/b_*:refs/remotes/three/branches/*" &&
+	git config --add svn-remote.three.tags \
+			 "tags/t_*:refs/remotes/three/tags/*" &&
+	(
+		cd tmp &&
+		svn_cmd cp trunk branches/b_ &&
+		echo "Branch commit to b_" >>branches/b_/src/a/readme &&
+		poke branches/b_/src/a/readme &&
+		svn_cmd commit -m "Branch commit to b_" &&
+		svn_cmd up && svn_cmd cp branches/b_ tags/t_ &&
+		echo "Tag commit to t_" >>tags/t_/src/a/readme &&
+		poke tags/t_/src/a/readme &&
+		svn_cmd commit -m "Tag commit to t_" &&
+		svn_cmd up
+	) &&
+	git svn fetch three &&
+	git rev-list refs/remotes/three/branches/b_ >actual &&
+	test_line_count = 2 actual &&
+	git rev-list refs/remotes/three/tags/t_ >actual &&
+	test_line_count = 3 actual &&
+	test $(git rev-parse refs/remotes/three/branches/b_~1) = \
+	     $(git rev-parse refs/remotes/three/trunk) &&
+	test $(git rev-parse refs/remotes/three/tags/t_~1) = \
+	     $(git rev-parse refs/remotes/three/branches/b_) &&
+	git log --pretty=oneline refs/remotes/three/tags/t_ >actual &&
+	cut -d" " -f2- actual >output.three &&
+	test_cmp expect.three output.three
+	
+A         branches/b_
+Adding         branches/b_
+Sending        branches/b_/src/a/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 7.
+Updating '.':
+At revision 7.
+A         tags/t_
+Adding         tags/t_
+Sending        tags/t_/src/a/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 8.
+Updating '.':
+At revision 8.
+	A	src/a/readme
+	A	src/b/readme
+W: +empty_dir: trunk/doc
+r1 = eb4934efb403b25c243028ad5f56413e1013c2df (refs/remotes/three/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
+Found branch parent: (refs/remotes/three/branches/b_start) eb4934efb403b25c243028ad5f56413e1013c2df
+Following parent with do_switch
+Successfully followed parent
+r2 = d3eda0e5b9ac5a5dd1dbaebfc35ae3ff99747337 (refs/remotes/three/branches/b_start)
+	M	src/a/readme
+	M	src/b/readme
+r3 = ffbe000f799f1359b8e6d7333c6070228c52ae2e (refs/remotes/three/branches/b_start)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
+Found branch parent: (refs/remotes/three/tags/t_end) ffbe000f799f1359b8e6d7333c6070228c52ae2e
+Following parent with do_switch
+	M	src/a/readme
+	M	src/b/readme
+Successfully followed parent
+r4 = 725968c40baedc4cfbe9a9273b1a3c52d91683ea (refs/remotes/three/tags/t_end)
+	M	src/b/readme
+r5 = 63f9e5558f942cdcd490e53ef16e3af8e764e865 (refs/remotes/three/tags/t_end)
+	M	src/b/readme
+r6 = 65f4a0856523de8fd24912ecf6ba7da28e36263d (refs/remotes/three/tags/t_end)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_, 3
+Found branch parent: (refs/remotes/three/branches/b_) eb4934efb403b25c243028ad5f56413e1013c2df
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r7 = 9344619a07ed4e5937efe5907721bf4dc186c554 (refs/remotes/three/branches/b_)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_ => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_, 7
+Found branch parent: (refs/remotes/three/tags/t_) 9344619a07ed4e5937efe5907721bf4dc186c554
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r8 = e7962d691ac2234ab7cb59ae04a6aa967ea78b0f (refs/remotes/three/tags/t_)
+ok 6 - test prefixed globs match just prefix
+
+expecting success of 9168.7 'prepare test disallow prefixed multi-globs': 
+cat >expect.four <<EOF
+Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/b_*/t/*
+
+EOF
+	
+ok 7 - prepare test disallow prefixed multi-globs
+
+expecting success of 9168.8 'test disallow prefixed multi-globs': 
+	git config --add svn-remote.four.url "$svnrepo" &&
+	git config --add svn-remote.four.fetch \
+			 trunk:refs/remotes/four/trunk &&
+	git config --add svn-remote.four.branches \
+			 "branches/b_*/t/*:refs/remotes/four/branches/*" &&
+	git config --add svn-remote.four.tags \
+			 "tags/t_*/*:refs/remotes/four/tags/*" &&
+	(
+		cd tmp &&
+		echo "try try" >>tags/t_end/src/b/readme &&
+		poke tags/t_end/src/b/readme &&
+		svn_cmd commit -m "try to try"
+	) &&
+	test_must_fail git svn fetch four 2>stderr.four &&
+	test_cmp expect.four stderr.four &&
+	git config --unset svn-remote.four.branches &&
+	git config --unset svn-remote.four.tags
+	
+Sending        tags/t_end/src/b/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 9.
+ok 8 - test disallow prefixed multi-globs
+
+expecting success of 9168.9 'prepare test globbing in the middle of the word': 
+	cat >expect.five <<EOF
+Tag commit to fghij
+Branch commit to abcde
+initial
+EOF
+	
+ok 9 - prepare test globbing in the middle of the word
+
+expecting success of 9168.10 'test globbing in the middle of the word': 
+	git config --add svn-remote.five.url "$svnrepo" &&
+	git config --add svn-remote.five.fetch \
+			 trunk:refs/remotes/five/trunk &&
+	git config --add svn-remote.five.branches \
+			 "branches/a*e:refs/remotes/five/branches/*" &&
+	git config --add svn-remote.five.tags \
+			 "tags/f*j:refs/remotes/five/tags/*" &&
+	(
+		cd tmp &&
+		svn_cmd cp trunk branches/abcde &&
+		echo "Branch commit to abcde" >>branches/abcde/src/a/readme &&
+		poke branches/b_/src/a/readme &&
+		svn_cmd commit -m "Branch commit to abcde" &&
+		svn_cmd up &&
+		svn_cmd cp branches/abcde tags/fghij &&
+		echo "Tag commit to fghij" >>tags/fghij/src/a/readme &&
+		poke tags/fghij/src/a/readme &&
+		svn_cmd commit -m "Tag commit to fghij" &&
+		svn_cmd up
+	) &&
+	git svn fetch five &&
+	git rev-list refs/remotes/five/branches/abcde >actual &&
+	test_line_count = 2 actual &&
+	git rev-list refs/remotes/five/tags/fghij >actual &&
+	test_line_count = 3 actual &&
+	test $(git rev-parse refs/remotes/five/branches/abcde~1) = \
+	     $(git rev-parse refs/remotes/five/trunk) &&
+	test $(git rev-parse refs/remotes/five/tags/fghij~1) = \
+	     $(git rev-parse refs/remotes/five/branches/abcde) &&
+	git log --pretty=oneline refs/remotes/five/tags/fghij >actual &&
+	cut -d" " -f2- actual >output.five &&
+	test_cmp expect.five output.five
+	
+A         branches/abcde
+Adding         branches/abcde
+Sending        branches/abcde/src/a/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 10.
+Updating '.':
+At revision 10.
+A         tags/fghij
+Adding         tags/fghij
+Sending        tags/fghij/src/a/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 11.
+Updating '.':
+At revision 11.
+	A	src/a/readme
+	A	src/b/readme
+W: +empty_dir: trunk/doc
+r1 = eb4934efb403b25c243028ad5f56413e1013c2df (refs/remotes/five/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde, 8
+Found branch parent: (refs/remotes/five/branches/abcde) eb4934efb403b25c243028ad5f56413e1013c2df
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r10 = a6404777015728f7acc9a8e7e5b8ac63cf7bf263 (refs/remotes/five/branches/abcde)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/fghij, 10
+Found branch parent: (refs/remotes/five/tags/fghij) a6404777015728f7acc9a8e7e5b8ac63cf7bf263
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r11 = 32a2309544525a72929aabe2f8b17385d5b7cfb5 (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': 
+	echo "Only one '*' is allowed in a pattern: 'a*c*e'" >expect.six &&
+	echo "" >>expect.six
+	
+ok 11 - prepare test disallow multiple asterisks in one word
+
+expecting success of 9168.12 'test disallow multiple asterisks in one word': 
+	git config --add svn-remote.six.url "$svnrepo" &&
+	git config --add svn-remote.six.fetch \
+			 trunk:refs/remotes/six/trunk &&
+	git config --add svn-remote.six.branches \
+			 "branches/a*c*e:refs/remotes/six/branches/*" &&
+	git config --add svn-remote.six.tags \
+			 "tags/f*h*j:refs/remotes/six/tags/*" &&
+	(
+		cd tmp &&
+		echo "try try" >>tags/fghij/src/b/readme &&
+		poke tags/fghij/src/b/readme &&
+		svn_cmd commit -m "try to try"
+	) &&
+	test_must_fail git svn fetch six 2>stderr.six &&
+	test_cmp expect.six stderr.six
+	
+Sending        tags/fghij/src/b/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 12.
+ok 12 - test disallow multiple asterisks in one word
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9300-fast-import.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9300-fast-import/.git/
 expecting success of 9300.1 'empty stream succeeds': 
@@ -549089,7 +550452,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_945876
+fast-import: dumping crash report to .git/fast_import_crash_2598749
 ok 2 - truncated stream complains
 
 expecting success of 9300.3 'A: create pack from stdin': 
@@ -549583,7 +550946,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_946689
+fast-import: dumping crash report to .git/fast_import_crash_2599848
 ok 20 - B: fail on invalid blob sha1
 
 expecting success of 9300.21 'B: accept branch name "TEMP_TAG"': 
@@ -549691,7 +551054,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_946957
+fast-import: dumping crash report to .git/fast_import_crash_2600248
 ok 23 - B: reject invalid timezone
 
 expecting success of 9300.24 'B: accept invalid timezone with raw-permissive': 
@@ -549799,7 +551162,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_947201
+fast-import: dumping crash report to .git/fast_import_crash_2600612
 ok 26 - B: fail on invalid committer (1)
 
 expecting success of 9300.27 'B: fail on invalid committer (2)': 
@@ -549815,7 +551178,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_947227
+fast-import: dumping crash report to .git/fast_import_crash_2600650
 ok 27 - B: fail on invalid committer (2)
 
 expecting success of 9300.28 'B: fail on invalid committer (3)': 
@@ -549831,7 +551194,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_947259
+fast-import: dumping crash report to .git/fast_import_crash_2600697
 ok 28 - B: fail on invalid committer (3)
 
 expecting success of 9300.29 'B: fail on invalid committer (4)': 
@@ -549847,7 +551210,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_947296
+fast-import: dumping crash report to .git/fast_import_crash_2600750
 ok 29 - B: fail on invalid committer (4)
 
 expecting success of 9300.30 'B: fail on invalid committer (5)': 
@@ -549863,7 +551226,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_947326
+fast-import: dumping crash report to .git/fast_import_crash_2600784
 ok 30 - B: fail on invalid committer (5)
 
 expecting success of 9300.31 'B: fail on invalid file path of ..': 
@@ -549886,7 +551249,7 @@
 	test_must_fail git fast-import <input
 
 fatal: invalid path '../invalid-path'
-fast-import: dumping crash report to .git/fast_import_crash_947369
+fast-import: dumping crash report to .git/fast_import_crash_2600842
 ok 31 - B: fail on invalid file path of ..
 
 expecting success of 9300.32 'B: fail on invalid file path of .': 
@@ -549916,7 +551279,7 @@
 	test_must_fail git fast-import <input
 
 fatal: invalid path './invalid-path'
-fast-import: dumping crash report to .git/fast_import_crash_947404
+fast-import: dumping crash report to .git/fast_import_crash_2600876
 ok 32 - B: fail on invalid file path of .
 
 ok 33 # skip B: fail on invalid file path of C: (missing WINDOWS)
@@ -549941,7 +551304,7 @@
 	test_must_fail git fast-import <input
 
 fatal: invalid path '.git/invalid-path'
-fast-import: dumping crash report to .git/fast_import_crash_947446
+fast-import: dumping crash report to .git/fast_import_crash_2600918
 ok 34 - B: fail on invalid file path of .git
 
 expecting success of 9300.35 'B: fail on invalid file path of .gitmodules': 
@@ -549964,7 +551327,7 @@
 	test_must_fail git fast-import <input
 
 fatal: invalid path '.gitmodules'
-fast-import: dumping crash report to .git/fast_import_crash_947512
+fast-import: dumping crash report to .git/fast_import_crash_2600960
 ok 35 - B: fail on invalid file path of .gitmodules
 
 expecting success of 9300.36 'C: incremental import create pack from stdin': 
@@ -550197,7 +551560,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_948020
+fast-import: dumping crash report to .git/fast_import_crash_2601610
 ok 46 - E: rfc2822 date, --date-format=raw
 
 expecting success of 9300.47 'E: rfc2822 date, --date-format=rfc2822': 
@@ -550602,7 +551965,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_949231
+fast-import: dumping crash report to .git/fast_import_crash_2602961
 ok 64 - J: tag must fail on empty branch
 
 expecting success of 9300.65 'K: reinit branch with from': 
@@ -550800,9 +552163,9 @@
 warning in tag 56c14ce987117cf2e391ebef3dbab65e4c1ed202: missingTaggerEntry: invalid format - expected 'tagger' line
 warning in tag e0764732957e237a858c7535fca3c2b966065dac: missingTaggerEntry: invalid format - expected 'tagger' line
 dangling blob 8436d07c4b682e3c824ffae4608920535091c4d0
-dangling commit 8cecdab6b3e4062de5b06ad3accf5bff1449e99b
-dangling tag 0e22025f0f5cea5d83b68c3dc9fc334571f7196c
 dangling commit 8c1bf1b9f891df8805c27a54986e5043829939ad
+dangling tag 0e22025f0f5cea5d83b68c3dc9fc334571f7196c
+dangling commit 8cecdab6b3e4062de5b06ad3accf5bff1449e99b
 dangling tag 103553a16e02d76e288cec0f76240f1ad97caeb9
 dangling commit 0f211fb139642df301c0d0ceedd2021012d4dd8d
 dangling commit 994b824fbe51b899f546383c3ba14a28a07c1022
@@ -551718,7 +553081,7 @@
 	INPUT_END
 
 fatal: invalid path 'file3/'
-fast-import: dumping crash report to .git/fast_import_crash_950932
+fast-import: dumping crash report to .git/fast_import_crash_2605099
 ok 86 - N: reject foo/ syntax
 
 expecting success of 9300.87 'N: reject foo/ syntax in copy source': 
@@ -551734,7 +553097,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_950957
+fast-import: dumping crash report to .git/fast_import_crash_2605156
 ok 87 - N: reject foo/ syntax in copy source
 
 expecting success of 9300.88 'N: reject foo/ syntax in rename source': 
@@ -551750,7 +553113,7 @@
 	INPUT_END
 
 fatal: Path file2/ not in branch
-fast-import: dumping crash report to .git/fast_import_crash_950992
+fast-import: dumping crash report to .git/fast_import_crash_2605185
 ok 88 - N: reject foo/ syntax in rename source
 
 expecting success of 9300.89 'N: reject foo/ syntax in ls argument': 
@@ -551766,7 +553129,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_951016
+fast-import: dumping crash report to .git/fast_import_crash_2605215
 ok 89 - N: reject foo/ syntax in ls argument
 
 expecting success of 9300.90 'N: copy to root ("") by id and modify': 
@@ -552533,7 +553896,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          2
 pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       8497 /       8497
+pack_report: pack_mapped              =       8575 /       8575
 ---------------------------------------------------------------------
 
 Switched to branch 'subuse1'
@@ -552603,7 +553966,7 @@
 pack_report: pack_used_ctr            =          4
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7998 /       7998
+pack_report: pack_mapped              =       8384 /       8384
 ---------------------------------------------------------------------
 
 ok 102 - P: verbatim SHA gitlinks
@@ -552629,7 +553992,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_952579
+fast-import: dumping crash report to .git/fast_import_crash_2606983
 ok 103 - P: fail on inline gitlink
 
 expecting success of 9300.104 'P: fail on blob mark in gitlink': 
@@ -552656,7 +554019,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_952598
+fast-import: dumping crash report to .git/fast_import_crash_2607025
 ok 104 - P: fail on blob mark in gitlink
 
 expecting success of 9300.105 'Q: commit notes': 
@@ -553043,7 +554406,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_953305
+fast-import: dumping crash report to .git/fast_import_crash_2607917
 ok 126 - Q: deny note on empty branch
 
 expecting success of 9300.127 'R: abort on unsupported feature': 
@@ -553054,7 +554417,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_953320
+fast-import: dumping crash report to .git/fast_import_crash_2607944
 ok 127 - R: abort on unsupported feature
 
 expecting success of 9300.128 'R: supported feature is accepted': 
@@ -553101,7 +554464,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_953367
+fast-import: dumping crash report to .git/fast_import_crash_2608038
 ok 129 - R: abort on receiving feature after data command
 
 expecting success of 9300.130 'R: import-marks features forbidden by default': 
@@ -553112,9 +554475,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_953383
+fast-import: dumping crash report to .git/fast_import_crash_2608072
 fatal: feature 'import-marks-if-exists' forbidden in input without --allow-unsafe-features
-fast-import: dumping crash report to .git/fast_import_crash_953394
+fast-import: dumping crash report to .git/fast_import_crash_2608082
 ok 130 - R: import-marks features forbidden by default
 
 expecting success of 9300.131 'R: only one import-marks feature allowed per stream': 
@@ -553128,7 +554491,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_953416
+fast-import: dumping crash report to .git/fast_import_crash_2608125
 ok 131 - R: only one import-marks feature allowed per stream
 
 expecting success of 9300.132 'R: export-marks feature forbidden by default': 
@@ -553136,7 +554499,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_953428
+fast-import: dumping crash report to .git/fast_import_crash_2608158
 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': 
@@ -553226,9 +554589,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_953490
+fast-import: dumping crash report to .git/fast_import_crash_2608271
 fatal: cannot read 'nonexistent.marks': No such file or directory
-fast-import: dumping crash report to .git/fast_import_crash_953504
+fast-import: dumping crash report to .git/fast_import_crash_2608287
 ok 135 - R: catch typo in marks file name
 
 expecting success of 9300.136 'R: import and output marks can be the same file': 
@@ -553315,7 +554678,7 @@
 	EOF
 
 fatal: cannot read 'io.marks': No such file or directory
-fast-import: dumping crash report to .git/fast_import_crash_953566
+fast-import: dumping crash report to .git/fast_import_crash_2608354
 ok 137 - R: --import-marks=foo --output-marks=foo to create foo fails
 
 expecting success of 9300.138 'R: --import-marks-if-exists': 
@@ -553532,7 +554895,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7998 /       7998
+pack_report: pack_mapped              =       8384 /       8384
 ---------------------------------------------------------------------
 
 ok 140 - R: import to output marks works without any content
@@ -553567,7 +554930,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7998 /       7998
+pack_report: pack_mapped              =       8384 /       8384
 ---------------------------------------------------------------------
 
 ok 141 - R: import marks prefers commandline marks file over the stream
@@ -553605,7 +554968,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7998 /       7998
+pack_report: pack_mapped              =       8384 /       8384
 ---------------------------------------------------------------------
 
 ok 142 - R: multiple --import-marks= should be honoured
@@ -553643,7 +555006,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7998 /       7998
+pack_report: pack_mapped              =       8384 /       8384
 ---------------------------------------------------------------------
 
 ok 143 - R: feature relative-marks should be honoured
@@ -553680,7 +555043,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7998 /       7998
+pack_report: pack_mapped              =       8384 /       8384
 ---------------------------------------------------------------------
 
 ok 144 - R: feature no-relative-marks should be honoured
@@ -553749,7 +555112,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_953877
+fast-import: dumping crash report to .git/fast_import_crash_2608650
 ok 147 - R: cat-blob-fd must be a nonnegative integer
 
 expecting success of 9300.148 'R: print old blob': 
@@ -553830,7 +555193,7 @@
 pack_report: pack_used_ctr            =          1
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7998 /       7998
+pack_report: pack_mapped              =       8384 /       8384
 ---------------------------------------------------------------------
 
 fast-import statistics:
@@ -553854,7 +555217,7 @@
 pack_report: pack_used_ctr            =          1
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7998 /       7998
+pack_report: pack_mapped              =       8384 /       8384
 ---------------------------------------------------------------------
 
 ok 149 - R: in-stream cat-blob-fd not respected
@@ -554051,7 +555414,7 @@
 pack_report: pack_used_ctr            =          2
 pack_report: pack_mmap_calls          =          2
 pack_report: pack_open_windows        =          1 /          2
-pack_report: pack_mapped              =       7998 /       8623
+pack_report: pack_mapped              =       8384 /       9009
 ---------------------------------------------------------------------
 
 ok 154 - R: print two blobs to stdout
@@ -554261,9 +555624,9 @@
 	test_must_fail git fast-import --done </dev/null
 
 fatal: stream ends early
-fast-import: dumping crash report to .git/fast_import_crash_954493
+fast-import: dumping crash report to .git/fast_import_crash_2609388
 fatal: stream ends early
-fast-import: dumping crash report to .git/fast_import_crash_954521
+fast-import: dumping crash report to .git/fast_import_crash_2609408
 ok 159 - R: feature done means terminating "done" is mandatory
 
 expecting success of 9300.160 'R: terminating "done" with trailing gibberish is ok': 
@@ -554385,14 +555748,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_954631
+fast-import: dumping crash report to .git/fast_import_crash_2609498
 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_954640
+fast-import: dumping crash report to .git/fast_import_crash_2609522
 ok 163 - R: unknown commandline options are rejected
 
 expecting success of 9300.164 'R: die on invalid option argument': 
@@ -554403,11 +555766,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_954650
+fast-import: dumping crash report to .git/fast_import_crash_2609540
 fatal: --depth: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_954669
+fast-import: dumping crash report to .git/fast_import_crash_2609552
 fatal: --depth: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_954694
+fast-import: dumping crash report to .git/fast_import_crash_2609559
 ok 164 - R: die on invalid option argument
 
 expecting success of 9300.165 'R: ignore non-git options': 
@@ -554458,7 +555821,7 @@
 	test_cmp expect io.marks
 
 fatal: object not found: 0000000000000000000000000000000000000000
-fast-import: dumping crash report to .git/fast_import_crash_954749
+fast-import: dumping crash report to .git/fast_import_crash_2609626
 ok 166 - R: corrupt lines do not mess marks file
 
 expecting success of 9300.167 'R: blob bigger than threshold': 
@@ -556947,7 +558310,7 @@
 
 cruft: progress foo
 cruft: progress bar
-Terminated
+./test-lib.sh: line 1005: wait: pid 2613122 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': 
@@ -556961,7 +558324,7 @@
 	test "$(git rev-parse --verify V)" = "$(git rev-parse --verify U)" &&
 	background_import_still_running
 
-Terminated
+./test-lib.sh: line 1005: wait: pid 2613183 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': 
@@ -556982,7 +558345,7 @@
 	test_cmp marks.expected marks.actual &&
 	background_import_still_running
 
-Terminated
+./test-lib.sh: line 1005: wait: pid 2613277 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)': 
@@ -557003,7 +558366,7 @@
 	test_cmp marks.expected marks.actual &&
 	background_import_still_running
 
-Terminated
+./test-lib.sh: line 1005: wait: pid 2613377 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': 
@@ -557021,7 +558384,7 @@
 
 257d40767a41942fd4cbdd546e6183e743d96bbf refs/tags/Vtag
 114b4ec89664abe96ffe4873754fefc6aff6c1a2 refs/tags/Vtag^{}
-Terminated
+./test-lib.sh: line 1005: wait: pid 2613460 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': 
@@ -557125,7 +558488,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_958033
+fast-import: dumping crash report to .git/fast_import_crash_2613580
 ok 252 - W: get-mark & empty orphan commit with erroneous third newline
 
 expecting success of 9300.253 'X: handling encoding': 
@@ -557284,6 +558647,191 @@
 1..256
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9501-gitweb-standalone-http-status.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9501-gitweb-standalone-http-status/.git/
+expecting success of 9501.1 'setup': 
+	test_commit 'SnapshotTests' 'i can has snapshot'
+
+[main (root-commit) cea0920] SnapshotTests
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 i can has snapshot
+ok 1 - setup
+
+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 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
+
+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
+
+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
+
+grep: gitweb.output: binary file matches
+ok 6 - snapshots: good tree-ish id
+
+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
+
+[main 031b7cf] Object to be tagged
+ 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)
+
+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
+
+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
+
+404 - Object does not exist
+ok 10 - snapshots: bad object id
+
+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
+
+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
+
+Status: 200 OK
+ok 12 - modification: feed if-modified-since (modified)
+
+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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9301-fast-import-notes.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9301-fast-import-notes/.git/
 expecting success of 9301.1 'set up main branch': 
@@ -557802,868 +559350,6 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9168-git-svn-partially-globbed-names.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9168-git-svn-partially-globbed-names/.git/
-expecting success of 9168.1 'prepare test refspec prefixed globbing': 
-	cat >expect.end <<EOF
-the end
-hi
-start a new branch
-initial
-EOF
-	
-ok 1 - prepare test refspec prefixed globbing
-
-expecting success of 9168.2 'test refspec prefixed globbing': 
-	mkdir -p trunk/src/a trunk/src/b trunk/doc &&
-	echo "hello world" >trunk/src/a/readme &&
-	echo "goodbye world" >trunk/src/b/readme &&
-	svn_cmd import -m "initial" trunk "$svnrepo"/trunk &&
-	svn_cmd co "$svnrepo" tmp &&
-	(
-		cd tmp &&
-		mkdir branches tags &&
-		svn_cmd add branches tags &&
-		svn_cmd cp trunk branches/b_start &&
-		svn_cmd commit -m "start a new branch" &&
-		svn_cmd up &&
-		echo "hi" >>branches/b_start/src/b/readme &&
-		poke branches/b_start/src/b/readme &&
-		echo "hey" >>branches/b_start/src/a/readme &&
-		poke branches/b_start/src/a/readme &&
-		svn_cmd commit -m "hi" &&
-		svn_cmd up &&
-		svn_cmd cp branches/b_start tags/t_end &&
-		echo "bye" >>tags/t_end/src/b/readme &&
-		poke tags/t_end/src/b/readme &&
-		echo "aye" >>tags/t_end/src/a/readme &&
-		poke tags/t_end/src/a/readme &&
-		svn_cmd commit -m "the end" &&
-		echo "byebye" >>tags/t_end/src/b/readme &&
-		poke tags/t_end/src/b/readme &&
-		svn_cmd commit -m "nothing to see here"
-	) &&
-	git config --add svn-remote.svn.url "$svnrepo" &&
-	git config --add svn-remote.svn.fetch \
-			 "trunk/src/a:refs/remotes/trunk" &&
-	git config --add svn-remote.svn.branches \
-			 "branches/b_*/src/a:refs/remotes/branches/b_*" &&
-	git config --add svn-remote.svn.tags\
-			 "tags/t_*/src/a:refs/remotes/tags/t_*" &&
-	git svn multi-fetch &&
-	git log --pretty=oneline refs/remotes/tags/t_end >actual &&
-	cut -d" " -f2- actual >output.end &&
-	test_cmp expect.end output.end &&
-	test "$(git rev-parse refs/remotes/tags/t_end~1)" = \
-		"$(git rev-parse refs/remotes/branches/b_start)" &&
-	test "$(git rev-parse refs/remotes/branches/b_start~2)" = \
-		"$(git rev-parse refs/remotes/trunk)" &&
-	test_must_fail git rev-parse refs/remotes/tags/t_end@3
-	
-Adding         trunk/doc
-Adding         trunk/src
-Adding         trunk/src/a
-Adding         trunk/src/a/readme
-Adding         trunk/src/b
-Adding         trunk/src/b/readme
-Committing transaction...
-Committed revision 1.
-A    tmp/trunk
-A    tmp/trunk/doc
-A    tmp/trunk/src
-A    tmp/trunk/src/a
-A    tmp/trunk/src/a/readme
-A    tmp/trunk/src/b
-A    tmp/trunk/src/b/readme
-Checked out revision 1.
-A         branches
-A         tags
-A         branches/b_start
-Adding         branches
-Adding         branches/b_start
-Adding         tags
-Committing transaction...
-Committed revision 2.
-Updating '.':
-At revision 2.
-Sending        branches/b_start/src/a/readme
-Sending        branches/b_start/src/b/readme
-Transmitting file data ..done
-Committing transaction...
-Committed revision 3.
-Updating '.':
-At revision 3.
-A         tags/t_end
-Adding         tags/t_end
-Sending        tags/t_end/src/a/readme
-Sending        tags/t_end/src/b/readme
-Transmitting file data ..done
-Committing transaction...
-Committed revision 4.
-Sending        tags/t_end/src/b/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 5.
-Migrating from a git-svn v1 layout...
-Data from a previous version of git-svn exists, but
-	.git/svn
-	(required for this version (2.51.0) of git-svn) does not exist.
-Done migrating from a git-svn v1 layout
-	A	readme
-r1 = 05dd2393d9eae23db8dc34de642d0fb0dd86b7ac (refs/remotes/trunk)
-branch_from: /trunk => /trunk/src/a
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a, 1
-Found branch parent: (refs/remotes/branches/b_start) 05dd2393d9eae23db8dc34de642d0fb0dd86b7ac
-Following parent with do_switch
-Successfully followed parent
-r2 = 301191715cc992e8e441cb584d1f8c52021ed4de (refs/remotes/branches/b_start)
-	M	readme
-r3 = a9155c17285c03234af457dcda37e1bb464c62cc (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.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end/src/a, 3
-Found branch parent: (refs/remotes/tags/t_end) a9155c17285c03234af457dcda37e1bb464c62cc
-Following parent with do_switch
-	M	readme
-Successfully followed parent
-r4 = 59583edce22d9ee07e2817833cab1401fb3739c5 (refs/remotes/tags/t_end)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.51.0/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.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/tags/t_end@3
-ok 2 - test refspec prefixed globbing
-
-expecting success of 9168.3 'prepare test left-hand-side only prefixed globbing': 
-	echo try to try >expect.two &&
-	echo nothing to see here >>expect.two &&
-	cat expect.end >>expect.two
-	
-ok 3 - prepare test left-hand-side only prefixed globbing
-
-expecting success of 9168.4 'test left-hand-side only prefixed globbing': 
-	git config --add svn-remote.two.url "$svnrepo" &&
-	git config --add svn-remote.two.fetch trunk:refs/remotes/two/trunk &&
-	git config --add svn-remote.two.branches \
-			 "branches/b_*:refs/remotes/two/branches/*" &&
-	git config --add svn-remote.two.tags \
-			 "tags/t_*:refs/remotes/two/tags/*" &&
-	(
-		cd tmp &&
-		echo "try try" >>tags/t_end/src/b/readme &&
-		poke tags/t_end/src/b/readme &&
-		svn_cmd commit -m "try to try"
-	) &&
-	git svn fetch two &&
-	git rev-list refs/remotes/two/tags/t_end >actual &&
-	test_line_count = 6 actual &&
-	git rev-list refs/remotes/two/branches/b_start >actual &&
-	test_line_count = 3 actual &&
-	test $(git rev-parse refs/remotes/two/branches/b_start~2) = \
-	     $(git rev-parse refs/remotes/two/trunk) &&
-	test $(git rev-parse refs/remotes/two/tags/t_end~3) = \
-	     $(git rev-parse refs/remotes/two/branches/b_start) &&
-	git log --pretty=oneline refs/remotes/two/tags/t_end >actual &&
-	cut -d" " -f2- actual >output.two &&
-	test_cmp expect.two output.two
-	
-Sending        tags/t_end/src/b/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 6.
-	A	src/a/readme
-	A	src/b/readme
-W: +empty_dir: trunk/doc
-r1 = 0bfdd40dda1ae5bb7f51cbd93f56c9f9634b45d2 (refs/remotes/two/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
-Found branch parent: (refs/remotes/two/branches/b_start) 0bfdd40dda1ae5bb7f51cbd93f56c9f9634b45d2
-Following parent with do_switch
-Successfully followed parent
-r2 = f90276c0762999f87ed8c0a7c8b127b8bbefdb51 (refs/remotes/two/branches/b_start)
-	M	src/a/readme
-	M	src/b/readme
-r3 = 69f2c81a217969a67099f7ec7a3212f8295bd6a8 (refs/remotes/two/branches/b_start)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
-Found branch parent: (refs/remotes/two/tags/t_end) 69f2c81a217969a67099f7ec7a3212f8295bd6a8
-Following parent with do_switch
-	M	src/a/readme
-	M	src/b/readme
-Successfully followed parent
-r4 = 2dede11294ac857ecaa6cfcde5ac34e8ce791e2b (refs/remotes/two/tags/t_end)
-	M	src/b/readme
-r5 = e0f7035892a2fad8441b787d5526d853df40565c (refs/remotes/two/tags/t_end)
-	M	src/b/readme
-r6 = 14040be4eab06c6924897c0384d4805cf5ef09ca (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': 
-	cat >expect.three <<EOF
-Tag commit to t_
-Branch commit to b_
-initial
-EOF
-	
-ok 5 - prepare test prefixed globs match just prefix
-
-expecting success of 9168.6 'test prefixed globs match just prefix': 
-	git config --add svn-remote.three.url "$svnrepo" &&
-	git config --add svn-remote.three.fetch \
-			 trunk:refs/remotes/three/trunk &&
-	git config --add svn-remote.three.branches \
-			 "branches/b_*:refs/remotes/three/branches/*" &&
-	git config --add svn-remote.three.tags \
-			 "tags/t_*:refs/remotes/three/tags/*" &&
-	(
-		cd tmp &&
-		svn_cmd cp trunk branches/b_ &&
-		echo "Branch commit to b_" >>branches/b_/src/a/readme &&
-		poke branches/b_/src/a/readme &&
-		svn_cmd commit -m "Branch commit to b_" &&
-		svn_cmd up && svn_cmd cp branches/b_ tags/t_ &&
-		echo "Tag commit to t_" >>tags/t_/src/a/readme &&
-		poke tags/t_/src/a/readme &&
-		svn_cmd commit -m "Tag commit to t_" &&
-		svn_cmd up
-	) &&
-	git svn fetch three &&
-	git rev-list refs/remotes/three/branches/b_ >actual &&
-	test_line_count = 2 actual &&
-	git rev-list refs/remotes/three/tags/t_ >actual &&
-	test_line_count = 3 actual &&
-	test $(git rev-parse refs/remotes/three/branches/b_~1) = \
-	     $(git rev-parse refs/remotes/three/trunk) &&
-	test $(git rev-parse refs/remotes/three/tags/t_~1) = \
-	     $(git rev-parse refs/remotes/three/branches/b_) &&
-	git log --pretty=oneline refs/remotes/three/tags/t_ >actual &&
-	cut -d" " -f2- actual >output.three &&
-	test_cmp expect.three output.three
-	
-A         branches/b_
-Adding         branches/b_
-Sending        branches/b_/src/a/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 7.
-Updating '.':
-At revision 7.
-A         tags/t_
-Adding         tags/t_
-Sending        tags/t_/src/a/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 8.
-Updating '.':
-At revision 8.
-	A	src/a/readme
-	A	src/b/readme
-W: +empty_dir: trunk/doc
-r1 = 0bfdd40dda1ae5bb7f51cbd93f56c9f9634b45d2 (refs/remotes/three/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
-Found branch parent: (refs/remotes/three/branches/b_start) 0bfdd40dda1ae5bb7f51cbd93f56c9f9634b45d2
-Following parent with do_switch
-Successfully followed parent
-r2 = f90276c0762999f87ed8c0a7c8b127b8bbefdb51 (refs/remotes/three/branches/b_start)
-	M	src/a/readme
-	M	src/b/readme
-r3 = 69f2c81a217969a67099f7ec7a3212f8295bd6a8 (refs/remotes/three/branches/b_start)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
-Found branch parent: (refs/remotes/three/tags/t_end) 69f2c81a217969a67099f7ec7a3212f8295bd6a8
-Following parent with do_switch
-	M	src/a/readme
-	M	src/b/readme
-Successfully followed parent
-r4 = 2dede11294ac857ecaa6cfcde5ac34e8ce791e2b (refs/remotes/three/tags/t_end)
-	M	src/b/readme
-r5 = e0f7035892a2fad8441b787d5526d853df40565c (refs/remotes/three/tags/t_end)
-	M	src/b/readme
-r6 = 14040be4eab06c6924897c0384d4805cf5ef09ca (refs/remotes/three/tags/t_end)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_, 3
-Found branch parent: (refs/remotes/three/branches/b_) 0bfdd40dda1ae5bb7f51cbd93f56c9f9634b45d2
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r7 = c0d269f2fd002dc89b759b7ae12705b98a139350 (refs/remotes/three/branches/b_)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_ => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_, 7
-Found branch parent: (refs/remotes/three/tags/t_) c0d269f2fd002dc89b759b7ae12705b98a139350
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r8 = d7e3c929e07435729c918123791126a19ef99486 (refs/remotes/three/tags/t_)
-ok 6 - test prefixed globs match just prefix
-
-expecting success of 9168.7 'prepare test disallow prefixed multi-globs': 
-cat >expect.four <<EOF
-Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/b_*/t/*
-
-EOF
-	
-ok 7 - prepare test disallow prefixed multi-globs
-
-expecting success of 9168.8 'test disallow prefixed multi-globs': 
-	git config --add svn-remote.four.url "$svnrepo" &&
-	git config --add svn-remote.four.fetch \
-			 trunk:refs/remotes/four/trunk &&
-	git config --add svn-remote.four.branches \
-			 "branches/b_*/t/*:refs/remotes/four/branches/*" &&
-	git config --add svn-remote.four.tags \
-			 "tags/t_*/*:refs/remotes/four/tags/*" &&
-	(
-		cd tmp &&
-		echo "try try" >>tags/t_end/src/b/readme &&
-		poke tags/t_end/src/b/readme &&
-		svn_cmd commit -m "try to try"
-	) &&
-	test_must_fail git svn fetch four 2>stderr.four &&
-	test_cmp expect.four stderr.four &&
-	git config --unset svn-remote.four.branches &&
-	git config --unset svn-remote.four.tags
-	
-Sending        tags/t_end/src/b/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 9.
-ok 8 - test disallow prefixed multi-globs
-
-expecting success of 9168.9 'prepare test globbing in the middle of the word': 
-	cat >expect.five <<EOF
-Tag commit to fghij
-Branch commit to abcde
-initial
-EOF
-	
-ok 9 - prepare test globbing in the middle of the word
-
-expecting success of 9168.10 'test globbing in the middle of the word': 
-	git config --add svn-remote.five.url "$svnrepo" &&
-	git config --add svn-remote.five.fetch \
-			 trunk:refs/remotes/five/trunk &&
-	git config --add svn-remote.five.branches \
-			 "branches/a*e:refs/remotes/five/branches/*" &&
-	git config --add svn-remote.five.tags \
-			 "tags/f*j:refs/remotes/five/tags/*" &&
-	(
-		cd tmp &&
-		svn_cmd cp trunk branches/abcde &&
-		echo "Branch commit to abcde" >>branches/abcde/src/a/readme &&
-		poke branches/b_/src/a/readme &&
-		svn_cmd commit -m "Branch commit to abcde" &&
-		svn_cmd up &&
-		svn_cmd cp branches/abcde tags/fghij &&
-		echo "Tag commit to fghij" >>tags/fghij/src/a/readme &&
-		poke tags/fghij/src/a/readme &&
-		svn_cmd commit -m "Tag commit to fghij" &&
-		svn_cmd up
-	) &&
-	git svn fetch five &&
-	git rev-list refs/remotes/five/branches/abcde >actual &&
-	test_line_count = 2 actual &&
-	git rev-list refs/remotes/five/tags/fghij >actual &&
-	test_line_count = 3 actual &&
-	test $(git rev-parse refs/remotes/five/branches/abcde~1) = \
-	     $(git rev-parse refs/remotes/five/trunk) &&
-	test $(git rev-parse refs/remotes/five/tags/fghij~1) = \
-	     $(git rev-parse refs/remotes/five/branches/abcde) &&
-	git log --pretty=oneline refs/remotes/five/tags/fghij >actual &&
-	cut -d" " -f2- actual >output.five &&
-	test_cmp expect.five output.five
-	
-A         branches/abcde
-Adding         branches/abcde
-Sending        branches/abcde/src/a/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 10.
-Updating '.':
-At revision 10.
-A         tags/fghij
-Adding         tags/fghij
-Sending        tags/fghij/src/a/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 11.
-Updating '.':
-At revision 11.
-	A	src/a/readme
-	A	src/b/readme
-W: +empty_dir: trunk/doc
-r1 = 0bfdd40dda1ae5bb7f51cbd93f56c9f9634b45d2 (refs/remotes/five/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde, 8
-Found branch parent: (refs/remotes/five/branches/abcde) 0bfdd40dda1ae5bb7f51cbd93f56c9f9634b45d2
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r10 = b422f4d7082477e236f1af465331a779828d59b6 (refs/remotes/five/branches/abcde)
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/fghij, 10
-Found branch parent: (refs/remotes/five/tags/fghij) b422f4d7082477e236f1af465331a779828d59b6
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r11 = 8ccf9cd993c11aa464e169482a39f052dae75561 (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': 
-	echo "Only one '*' is allowed in a pattern: 'a*c*e'" >expect.six &&
-	echo "" >>expect.six
-	
-ok 11 - prepare test disallow multiple asterisks in one word
-
-expecting success of 9168.12 'test disallow multiple asterisks in one word': 
-	git config --add svn-remote.six.url "$svnrepo" &&
-	git config --add svn-remote.six.fetch \
-			 trunk:refs/remotes/six/trunk &&
-	git config --add svn-remote.six.branches \
-			 "branches/a*c*e:refs/remotes/six/branches/*" &&
-	git config --add svn-remote.six.tags \
-			 "tags/f*h*j:refs/remotes/six/tags/*" &&
-	(
-		cd tmp &&
-		echo "try try" >>tags/fghij/src/b/readme &&
-		poke tags/fghij/src/b/readme &&
-		svn_cmd commit -m "try to try"
-	) &&
-	test_must_fail git svn fetch six 2>stderr.six &&
-	test_cmp expect.six stderr.six
-	
-Sending        tags/fghij/src/b/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 12.
-ok 12 - test disallow multiple asterisks in one word
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9501-gitweb-standalone-http-status.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9501-gitweb-standalone-http-status/.git/
-expecting success of 9501.1 'setup': 
-	test_commit 'SnapshotTests' 'i can has snapshot'
-
-[main (root-commit) cea0920] SnapshotTests
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 i can has snapshot
-ok 1 - setup
-
-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 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
-
-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
-
-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
-
-grep: gitweb.output: binary file matches
-ok 6 - snapshots: good tree-ish id
-
-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
-
-[main 031b7cf] Object to be tagged
- 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)
-
-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
-
-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
-
-404 - Object does not exist
-ok 10 - snapshots: bad object id
-
-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
-
-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
-
-Status: 200 OK
-ok 12 - modification: feed if-modified-since (modified)
-
-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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9601-cvsimport-vendor-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9601-cvsimport-vendor-branch/.git/
-expecting success of 9601.1 'import a module with a vendor branch': 
-
-	git cvsimport -C module-git module
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9601-cvsimport-vendor-branch/module-git/.git/
-Skipping #CVSPS_NO_BRANCH
-ok 1 - import a module with a vendor branch
-
-expecting success of 9601.2 'check HEAD out of cvs repository': test_cvs_co main
-cvs checkout: Updating module-cvs-main
-U module-cvs-main/added-imported.txt
-U module-cvs-main/imported-anonymously.txt
-U module-cvs-main/imported-modified-imported.txt
-U module-cvs-main/imported-modified.txt
-U module-cvs-main/imported-once.txt
-U module-cvs-main/imported-twice.txt
-ok 2 - check HEAD out of cvs repository
-
-expecting success of 9601.3 'check main out of git repository': test_git_co main
-Already on 'main'
-ok 3 - check main out of git repository
-
-expecting success of 9601.4 'check a file that was imported once': 
-
-	test_cmp_branch_file main imported-once.txt
-
-
-ok 4 - check a file that was imported once
-
-checking known breakage of 9601.5 'check a file that was imported twice': 
-
-	test_cmp_branch_file main imported-twice.txt
-
-
---- module-cvs-main/imported-twice.txt	2004-02-09 15:43:13.000000000 +0000
-+++ module-git/imported-twice.txt	2025-08-27 08:24:14.700949857 +0000
-@@ -1 +1 @@
--This is vtag-2 (on vbranchA) of imported-twice.txt.
-+This is vtag-1 (on vbranchA) of imported-twice.txt.
-not ok 5 - check a file that was imported twice # TODO known breakage
-
-expecting success of 9601.6 'check a file that was imported then modified on HEAD': 
-
-	test_cmp_branch_file main imported-modified.txt
-
-
-ok 6 - check a file that was imported then modified on HEAD
-
-expecting success of 9601.7 'check a file that was imported, modified, then imported again': 
-
-	test_cmp_branch_file main imported-modified-imported.txt
-
-
-ok 7 - check a file that was imported, modified, then imported again
-
-expecting success of 9601.8 'check a file that was added to HEAD then imported': 
-
-	test_cmp_branch_file main added-imported.txt
-
-
-ok 8 - check a file that was added to HEAD then imported
-
-expecting success of 9601.9 'a vendor branch whose tag has been removed': 
-
-	test_cmp_branch_file main imported-anonymously.txt
-
-
-ok 9 - a vendor branch whose tag has been removed
-
-# still have 1 known breakage(s)
-# passed all remaining 8 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9603-cvsimport-patchsets.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t9603-cvsimport-patchsets/module-git/.git/
---- expect-main	2025-08-27 08:24:15.432954687 +0000
-+++ actual-main	2025-08-27 08:24:15.432954687 +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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9700-perl-git.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9161-git-svn-mergeinfo-push.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9161-git-svn-mergeinfo-push/.git/
 expecting success of 9161.1 'load svn dump': 
@@ -558750,7 +559436,7 @@
 	A	b2file
 Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
 Found merge parent (/branches/svnb2:3,8): 4c8381397f84e7fc4f333d72d05b8cc0e2f43926
-r13 = 796c0680e52c52a6efdff0df1fec19f752e888e3 (refs/remotes/origin/svnb1)
+r13 = 902f12365af6cb29c4c8bc023571ea2ed8dbbf70 (refs/remotes/origin/svnb1)
 No changes between b5b8c2ffb3f73e6eb178a831e70ee1e60720e785 and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 2 - propagate merge information
@@ -558776,8 +559462,8 @@
 	A	b3file
 Checking svn:mergeinfo changes since r13: 2 sources, 1 changed
 Found merge parent (/branches/svnb3:4,9): 1e7a42c688c631166199f66b30966bb0f1286e8a
-r14 = 96a385ab950aa0516e65899d0017a85ccd1e6d16 (refs/remotes/origin/svnb1)
-No changes between a711f89bc974092c43e40183c2de851cb0450122 and refs/remotes/origin/svnb1
+r14 = c024135a9f1fe6aa2ad700802ce6e919d4e973ed (refs/remotes/origin/svnb1)
+No changes between c84a863bad03f26d256d36181dc89f084e369924 and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 4 - merge another branch
 
@@ -558808,8 +559494,8 @@
 Checking svn:mergeinfo changes since r14: 4 sources, 2 changed
 Found merge parent (/branches/svnb4:5-6,10-12): 1b07daada22c9650feeef217d92e48fb61737b1b
 Found merge parent (/branches/svnb5:6,11): 0516292de1e2929f77174307ce40ab13e2f46c60
-r15 = ae87654389a4b5373499bb2bfc51ad03b17dec80 (refs/remotes/origin/svnb1)
-No changes between e925de8e2e6bddd5ef6edd4a1258ce8d7f21bc8d and refs/remotes/origin/svnb1
+r15 = 80e707603537939624c87bd5fa6c08f4a5ac9feb (refs/remotes/origin/svnb1)
+No changes between 885030bbe2e1ae6160b1af6cc6e4141b4ef85f1d and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 6 - merge existing merge
 
@@ -558832,7 +559518,7 @@
 	git commit -m "later b2 commit 2" &&
 	git svn dcommit
 	
-Previous HEAD position was ae87654 Merge remote-tracking branch 'origin/svnb4' into HEAD
+Previous HEAD position was 80e7076 Merge remote-tracking branch 'origin/svnb4' into HEAD
 HEAD is now at 4c83813 b2 commit
 [detached HEAD c280bb3] later b2 commit
  Author: A U Thor <author@example.com>
@@ -558847,11 +559533,11 @@
 	A	newb2file
 Committed r16
 	A	newb2file
-r16 = 494090f497dd780afcb01ff535ba73602bcf4e90 (refs/remotes/origin/svnb2)
+r16 = b03461ab2e5aa318e7fc56bb46abb73eb1f6e741 (refs/remotes/origin/svnb2)
 	A	newb2file-2
 Committed r17
 	A	newb2file-2
-r17 = 0badd8d6f5397286a29c350d903204012e96dffa (refs/remotes/origin/svnb2)
+r17 = a9c042aa39bd76fdb6e29431d8c7d503a60be503 (refs/remotes/origin/svnb2)
 No changes between b95663bca122ef9bf8f920aef01caa5a581d0acd and refs/remotes/origin/svnb2
 Resetting to the latest refs/remotes/origin/svnb2
 ok 8 - make further commits to branch
@@ -558861,8 +559547,8 @@
 	git merge --no-ff origin/svnb2 &&
 	git svn dcommit
 	
-Previous HEAD position was 0badd8d later b2 commit 2
-HEAD is now at ae87654 Merge remote-tracking branch 'origin/svnb4' into HEAD
+Previous HEAD position was a9c042a later b2 commit 2
+HEAD is now at 80e7076 Merge remote-tracking branch 'origin/svnb4' into HEAD
 Merge made by the 'ort' strategy.
  newb2file   | 0
  newb2file-2 | 0
@@ -558877,9 +559563,9 @@
 	A	newb2file
 	A	newb2file-2
 Checking svn:mergeinfo changes since r15: 4 sources, 1 changed
-Found merge parent (/branches/svnb2:8,16-17): 0badd8d6f5397286a29c350d903204012e96dffa
-r18 = 45bad87fe451e295d3ae43c1e90c325c34627e17 (refs/remotes/origin/svnb1)
-No changes between d70cf4a91ecebaf2cc29a50ca46b4b9405f6b0b3 and refs/remotes/origin/svnb1
+Found merge parent (/branches/svnb2:8,16-17): a9c042aa39bd76fdb6e29431d8c7d503a60be503
+r18 = b3eb9087b5d7f9a7e4fd0719b7a462644769f8b9 (refs/remotes/origin/svnb1)
+No changes between c5ca084e2394b89a7517e3c467311c4fb6fc78f6 and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 9 - second forward merge
 
@@ -558897,7 +559583,7 @@
 	git merge --no-ff origin/svnb1 &&
 	git svn dcommit
 	
-Previous HEAD position was 45bad87 Merge remote-tracking branch 'origin/svnb2' into HEAD
+Previous HEAD position was b3eb908 Merge remote-tracking branch 'origin/svnb2' into HEAD
 HEAD is now at 1b07daa Merge remote-tracking branch 'svnb5' into HEAD
 Merge made by the 'ort' strategy.
  b1file      | 0
@@ -558925,11 +559611,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): 45bad87fe451e295d3ae43c1e90c325c34627e17
-Found merge parent (/branches/svnb2:3,8,16-17): 0badd8d6f5397286a29c350d903204012e96dffa
+Found merge parent (/branches/svnb1:2-4,7-9,13-18): b3eb9087b5d7f9a7e4fd0719b7a462644769f8b9
+Found merge parent (/branches/svnb2:3,8,16-17): a9c042aa39bd76fdb6e29431d8c7d503a60be503
 Found merge parent (/branches/svnb3:4,9): 1e7a42c688c631166199f66b30966bb0f1286e8a
-r19 = 79146914c712444b80389b74cbbc158844d40454 (refs/remotes/origin/svnb4)
-No changes between a81bf7577a47295f0ecceaebb8d4d8f292f61cde and refs/remotes/origin/svnb4
+r19 = 8fb015b9ddfff6eb1ffc853144b50780645ac052 (refs/remotes/origin/svnb4)
+No changes between 376ab3fb5ed826da368bc636e0c30d093206ae00 and refs/remotes/origin/svnb4
 Resetting to the latest refs/remotes/origin/svnb4
 ok 11 - reintegration merge
 
@@ -558950,9 +559636,9 @@
 	git merge origin/svnb4 &&
 	git svn dcommit
 	
-Previous HEAD position was 7914691 Merge remote-tracking branch 'origin/svnb1' into HEAD
-HEAD is now at 45bad87 Merge remote-tracking branch 'origin/svnb2' into HEAD
-[detached HEAD bcb47ab] a commit
+Previous HEAD position was 8fb015b Merge remote-tracking branch 'origin/svnb1' into HEAD
+HEAD is now at b3eb908 Merge remote-tracking branch 'origin/svnb2' into HEAD
+[detached HEAD 043a448] a commit
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 anotherfile
@@ -558962,14 +559648,14 @@
 	A	anotherfile
 Committed r20
 	A	anotherfile
-r20 = 3659054d53bfa2322fee65af543182be44bc2159 (refs/remotes/origin/svnb1)
+r20 = a776902edc6329af38f9bfc11fe4d43e4c9a754f (refs/remotes/origin/svnb1)
 Committed r21
 No changes
-6c0e1e51a77cebfe69535e6d5a1f2caed20c41a8~1 == 6c0e1e51a77cebfe69535e6d5a1f2caed20c41a8
+964fe39de96c9b5a327d0abefe0379be9ae18bf1~1 == 964fe39de96c9b5a327d0abefe0379be9ae18bf1
 Checking svn:mergeinfo changes since r20: 4 sources, 1 changed
-Found merge parent (/branches/svnb4:10-12,19): 79146914c712444b80389b74cbbc158844d40454
-r21 = 3713c2f1557b2807285a3a7d232bd7defc711e4a (refs/remotes/origin/svnb1)
-No changes between 6c0e1e51a77cebfe69535e6d5a1f2caed20c41a8 and refs/remotes/origin/svnb1
+Found merge parent (/branches/svnb4:10-12,19): 8fb015b9ddfff6eb1ffc853144b50780645ac052
+r21 = 19e3b1d14b91aca3fe4ac6acdf21695fce430006 (refs/remotes/origin/svnb1)
+No changes between 964fe39de96c9b5a327d0abefe0379be9ae18bf1 and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 13 - dcommit a merge at the top of a stack
 
@@ -558977,11 +559663,252 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9801-git-p4-branch.sh ***
+*** t9601-cvsimport-vendor-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9601-cvsimport-vendor-branch/.git/
+expecting success of 9601.1 'import a module with a vendor branch': 
+
+	git cvsimport -C module-git module
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9601-cvsimport-vendor-branch/module-git/.git/
+Skipping #CVSPS_NO_BRANCH
+ok 1 - import a module with a vendor branch
+
+expecting success of 9601.2 'check HEAD out of cvs repository': test_cvs_co main
+cvs checkout: Updating module-cvs-main
+U module-cvs-main/added-imported.txt
+U module-cvs-main/imported-anonymously.txt
+U module-cvs-main/imported-modified-imported.txt
+U module-cvs-main/imported-modified.txt
+U module-cvs-main/imported-once.txt
+U module-cvs-main/imported-twice.txt
+ok 2 - check HEAD out of cvs repository
+
+expecting success of 9601.3 'check main out of git repository': test_git_co main
+Already on 'main'
+ok 3 - check main out of git repository
+
+expecting success of 9601.4 'check a file that was imported once': 
+
+	test_cmp_branch_file main imported-once.txt
+
+
+ok 4 - check a file that was imported once
+
+checking known breakage of 9601.5 'check a file that was imported twice': 
+
+	test_cmp_branch_file main imported-twice.txt
+
+
+--- module-cvs-main/imported-twice.txt	2004-02-09 15:43:13.000000000 +0000
++++ module-git/imported-twice.txt	2026-09-29 14:54:45.178548970 +0000
+@@ -1 +1 @@
+-This is vtag-2 (on vbranchA) of imported-twice.txt.
++This is vtag-1 (on vbranchA) of imported-twice.txt.
+not ok 5 - check a file that was imported twice # TODO known breakage
+
+expecting success of 9601.6 'check a file that was imported then modified on HEAD': 
+
+	test_cmp_branch_file main imported-modified.txt
+
+
+ok 6 - check a file that was imported then modified on HEAD
+
+expecting success of 9601.7 'check a file that was imported, modified, then imported again': 
+
+	test_cmp_branch_file main imported-modified-imported.txt
+
+
+ok 7 - check a file that was imported, modified, then imported again
+
+expecting success of 9601.8 'check a file that was added to HEAD then imported': 
+
+	test_cmp_branch_file main added-imported.txt
+
+
+ok 8 - check a file that was added to HEAD then imported
+
+expecting success of 9601.9 'a vendor branch whose tag has been removed': 
+
+	test_cmp_branch_file main imported-anonymously.txt
+
+
+ok 9 - a vendor branch whose tag has been removed
+
+# still have 1 known breakage(s)
+# passed all remaining 8 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9603-cvsimport-patchsets.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/t/trash directory.t9603-cvsimport-patchsets/module-git/.git/
+--- expect-main	2026-09-29 14:54:46.770548970 +0000
++++ actual-main	2026-09-29 14:54:46.766548970 +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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9802-git-p4-filetype.sh ***
+*** t9700-perl-git.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
@@ -558989,7 +559916,7 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9804-git-p4-label.sh ***
+*** t9802-git-p4-filetype.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
@@ -559115,7 +560042,7 @@
 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
 
 
-Updating 32a5dfc..6aba637
+Updating c3d1af2..f8e5806
 Fast-forward (no commit created; -m option ignored)
  o_fortuna | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
@@ -559157,7 +560084,7 @@
 	test_cmp module-cvs/tick module-git/tick
 
 
-Updating 6aba637..2e453d2
+Updating f8e5806..6193462
 Fast-forward (no commit created; -m option ignored)
  tick | 1 +
  1 file changed, 1 insertion(+)
@@ -559211,6 +560138,10 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** 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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** 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.51.0/t'
@@ -559231,22 +560162,6 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9810-git-p4-rcs.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9812-git-p4-wildcards.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** 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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9502-gitweb-standalone-parse-output.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9502-gitweb-standalone-parse-output/.git/
 expecting success of 9502.1 'setup': 
@@ -559428,32 +560343,32 @@
 <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">20 years ago</td>
+<td><i>second user</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">20 years ago</td>
+<td><i>second user</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">20 years ago</td>
+<td><i>second user</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">20 years ago</td>
+<td><i>second user</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>
@@ -559510,32 +560425,32 @@
 <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">20 years ago</td>
+<td><i>second user</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">20 years ago</td>
+<td><i>second user</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">20 years ago</td>
+<td><i>second user</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">20 years ago</td>
+<td><i>second user</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>
@@ -559624,7 +560539,19 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9814-git-p4-rename.sh ***
+*** t9810-git-p4-rcs.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9812-git-p4-wildcards.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** 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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
@@ -559636,7 +560563,7 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9818-git-p4-block.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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
@@ -559644,6 +560571,26 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9821-git-p4-path-variations.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9604-cvsimport-timestamps.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9604-cvsimport-timestamps/.git/
 checking prerequisite: POSIX_TIMEZONE
@@ -559740,15 +560687,7 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9821-git-p4-path-variations.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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
@@ -559756,23 +560695,23 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9823-git-p4-mock-lfs.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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9824-git-p4-git-lfs.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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9825-git-p4-handle-utf16-without-bom.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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9826-git-p4-keep-empty-commits.sh ***
+*** t9829-git-p4-jobs.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9827-git-p4-change-filetype.sh ***
+*** t9826-git-p4-keep-empty-commits.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
@@ -559780,19 +560719,15 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9829-git-p4-jobs.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9832-unshelve.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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9831-git-p4-triggers.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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9830-git-p4-symlink-dir.sh ***
+*** 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.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
@@ -559800,7 +560735,7 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9834-git-p4-file-dir-bug.sh ***
+*** t9832-unshelve.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
@@ -559808,10 +560743,6 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9850-shell.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9850-shell/.git/
 expecting success of 9850.1 'shell allows upload-pack': 
@@ -559954,11 +560885,11 @@
 Updating '.':
 U    auto_updated_file
 Updated to revision 3.
---- auto_updated_file	2025-08-27 08:23:58.008839721 +0000
-+++ au_file_saved	2025-08-27 08:23:57.788838269 +0000
+--- auto_updated_file	2026-09-29 14:54:32.334548970 +0000
++++ au_file_saved	2026-09-29 14:54:32.190548970 +0000
 @@ -1,2 +1 @@
  
--939886
+-2591355
 ok 2 - check if post-commit hook creates a concurrent commit
 
 expecting success of 9164.3 'check if pre-commit hook fails': 
@@ -560004,22 +560935,22 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9164-git-svn-dcommit-concurrent/work1.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = f908747a8390bd4c3c6ebc255159c195f4397d61 (refs/remotes/git-svn)
+r1 = 7a210b3accf7050147cffd1c4e8d9f77151a763f (refs/remotes/git-svn)
 	M	file
-r2 = 472850c7a938e82cb698acd6194abecaa407c1c2 (refs/remotes/git-svn)
+r2 = b5fed5b2111b1148863492e1d71ddc356f223d8c (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = d8ef4114273af8a45d51245723f57b343abb59c0 (refs/remotes/git-svn)
+r3 = 4e305dec4c5b047f924dadb8522fda7b1890f3c4 (refs/remotes/git-svn)
 	M	file
-r4 = f74d2c04a4cbf2a1f4f2f4c38d0a93102cb3b593 (refs/remotes/git-svn)
+r4 = 3748fe58fd87e32bf876884c080590eb7b4a4cdd (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r4
-[master dbdf0d0] commit change 1.1
+[master e0e19cf] commit change 1.1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 8e2285f] commit change 1.2
+[master 429d504] commit change 1.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 2e2a8e1] commit change 1.3
+[master 034f659] commit change 1.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -560027,14 +560958,14 @@
 	M	file
 Committed r5
 	M	file
-r5 = a937aeb8bed3a4630176144f306863c0c5ac2c8a (refs/remotes/git-svn)
+r5 = 9dd080a036982d98ea1bdd69521fff696ff42fb2 (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: 2e2a8e17c4133a14cc98d2d5f20f60095b169f8e and refs/remotes/git-svn differ, using rebase:
+W: 034f6592b52c2c87d9169813f05b2d504bff173a and refs/remotes/git-svn differ, using rebase:
 :100644 100644 fb014dd41485c73acf40cd9548cd4cd812fee4ec e6ac0ef8373861d92d8eecf8d88e592606a70872 M	file
-warning: skipped previously applied commit dbdf0d0
+warning: skipped previously applied commit e0e19cf
 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.
@@ -560065,24 +560996,24 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9164-git-svn-dcommit-concurrent/work2.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = f908747a8390bd4c3c6ebc255159c195f4397d61 (refs/remotes/git-svn)
+r1 = 7a210b3accf7050147cffd1c4e8d9f77151a763f (refs/remotes/git-svn)
 	M	file
-r2 = 472850c7a938e82cb698acd6194abecaa407c1c2 (refs/remotes/git-svn)
+r2 = b5fed5b2111b1148863492e1d71ddc356f223d8c (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = d8ef4114273af8a45d51245723f57b343abb59c0 (refs/remotes/git-svn)
+r3 = 4e305dec4c5b047f924dadb8522fda7b1890f3c4 (refs/remotes/git-svn)
 	M	file
-r4 = f74d2c04a4cbf2a1f4f2f4c38d0a93102cb3b593 (refs/remotes/git-svn)
+r4 = 3748fe58fd87e32bf876884c080590eb7b4a4cdd (refs/remotes/git-svn)
 	M	file
-r5 = a937aeb8bed3a4630176144f306863c0c5ac2c8a (refs/remotes/git-svn)
+r5 = 9dd080a036982d98ea1bdd69521fff696ff42fb2 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r5
-[master cafbeb8] commit change 2.1
+[master c4cae3b] commit change 2.1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 5b15ce4] commit change 2.2
+[master a4a9fee] commit change 2.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 98bc07a] commit change 2.3
+[master 624ed31] commit change 2.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -560090,25 +561021,25 @@
 	M	file
 Committed r6
 	M	file
-r6 = 3206d5192683c1e171ef54f7980d4aca57af08d2 (refs/remotes/git-svn)
+r6 = f8d83eb27f8f23dba675a5fdfe00af2349b0759a (refs/remotes/git-svn)
 	M	file
 Committed r7
 	M	file
-r7 = bbabca51301e98dc77a5051c2572d1a578d9f4ef (refs/remotes/git-svn)
+r7 = 1f03687be8e116a359bee0779330ce7ed75a9f08 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = dbf6cc4bd3c60bbf54b2f7aa307cb3d23a7a9727 (refs/remotes/git-svn)
-W: 5b15ce48cfea4ae869d32c226326a97194e8abb2 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 6c94c2e0b21677057861b9ff539db25aeb32bc36 8a7f24871aa2e5d0d40cbeb2da08ad139178bd83 M	auto_updated_file
-warning: skipped previously applied commit cafbeb8
-warning: skipped previously applied commit 5b15ce4
+r8 = 86adbb52d33cc3171aadbbc55de041d376f6e843 (refs/remotes/git-svn)
+W: a4a9feefaaf446b362ffc840007631d7921a66fa and refs/remotes/git-svn differ, using rebase:
+:100644 100644 9aa893677668906efa9c5f9791f8fcb0549d1855 ae6abd448ba93849d431f26b334e58aec7b9d9a2 M	auto_updated_file
+warning: skipped previously applied commit c4cae3b
+warning: skipped previously applied commit a4a9fee
 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 = ce980af55383b08578b7d5aa7267e9cc6d5c79e0 (refs/remotes/git-svn)
-No changes between f6f8c6d2d54591d22ff04b65890012f89da580ad and refs/remotes/git-svn
+r9 = 0701e841d6409fd105911873307daf3504d58669 (refs/remotes/git-svn)
+No changes between ad96f32069a24d1924512c231c39564916aa085a and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 U    file
@@ -560140,32 +561071,32 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9164-git-svn-dcommit-concurrent/work3.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = f908747a8390bd4c3c6ebc255159c195f4397d61 (refs/remotes/git-svn)
+r1 = 7a210b3accf7050147cffd1c4e8d9f77151a763f (refs/remotes/git-svn)
 	M	file
-r2 = 472850c7a938e82cb698acd6194abecaa407c1c2 (refs/remotes/git-svn)
+r2 = b5fed5b2111b1148863492e1d71ddc356f223d8c (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = d8ef4114273af8a45d51245723f57b343abb59c0 (refs/remotes/git-svn)
+r3 = 4e305dec4c5b047f924dadb8522fda7b1890f3c4 (refs/remotes/git-svn)
 	M	file
-r4 = f74d2c04a4cbf2a1f4f2f4c38d0a93102cb3b593 (refs/remotes/git-svn)
+r4 = 3748fe58fd87e32bf876884c080590eb7b4a4cdd (refs/remotes/git-svn)
 	M	file
-r5 = a937aeb8bed3a4630176144f306863c0c5ac2c8a (refs/remotes/git-svn)
+r5 = 9dd080a036982d98ea1bdd69521fff696ff42fb2 (refs/remotes/git-svn)
 	M	file
-r6 = 3206d5192683c1e171ef54f7980d4aca57af08d2 (refs/remotes/git-svn)
+r6 = f8d83eb27f8f23dba675a5fdfe00af2349b0759a (refs/remotes/git-svn)
 	M	file
-r7 = bbabca51301e98dc77a5051c2572d1a578d9f4ef (refs/remotes/git-svn)
+r7 = 1f03687be8e116a359bee0779330ce7ed75a9f08 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = dbf6cc4bd3c60bbf54b2f7aa307cb3d23a7a9727 (refs/remotes/git-svn)
+r8 = 86adbb52d33cc3171aadbbc55de041d376f6e843 (refs/remotes/git-svn)
 	M	file
-r9 = ce980af55383b08578b7d5aa7267e9cc6d5c79e0 (refs/remotes/git-svn)
+r9 = 0701e841d6409fd105911873307daf3504d58669 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r9
-[master d980561] commit change 3.1
+[master 441c6d1] commit change 3.1
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
-[master 3039324] commit change 3.2
+[master d84f9bd] commit change 3.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
-[master e644045] commit change 3.3
+[master 2131456] commit change 3.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -560173,25 +561104,25 @@
 	M	auto_updated_file
 Committed r10
 	M	auto_updated_file
-r10 = e93570f89106c6e368da1d0733c5df7a1f290051 (refs/remotes/git-svn)
+r10 = 9aefd60c627c46023478a96bf9f95a482c70a5de (refs/remotes/git-svn)
 	M	auto_updated_file
 Committed r11
 	M	auto_updated_file
-r11 = d2892bfb6dbc550c86fc49b957b2227475e64383 (refs/remotes/git-svn)
+r11 = 0f56e4454da2b69b633d965cf0d9c2bfcade29ef (refs/remotes/git-svn)
 	M	auto_updated_file
-r12 = e977d0798091bdecccd02fdb2e4f91eb10bb2663 (refs/remotes/git-svn)
-W: 303932487880ae9273546ed2b6546f20a088b6fb and refs/remotes/git-svn differ, using rebase:
-:100644 100644 4badb25cc782a63143631b1f3e6164a8a807c035 7145ebabe99847db078e1ef810ccfb2e39927465 M	auto_updated_file
-warning: skipped previously applied commit d980561
-warning: skipped previously applied commit 3039324
+r12 = 39fbf856c06b693d733295bb93f23ef3a45a0743 (refs/remotes/git-svn)
+W: d84f9bde7db4865849465b7dd1a58c37526140f2 and refs/remotes/git-svn differ, using rebase:
+:100644 100644 ae5128454363206aaa1e84b3dcc04dab6cc4bf6e 788b67dcc76addad36b6607f572cc21c721c987d M	auto_updated_file
+warning: skipped previously applied commit 441c6d1
+warning: skipped previously applied commit d84f9bd
 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 = 7a7cb4b823489b87fde5ac9a2576ed6ad8db897e (refs/remotes/git-svn)
-No changes between 0f29bb91acc9d96ee4e8ac664679746162fca44e and refs/remotes/git-svn
+r13 = 3ac80672db85a25f35cc175c66bba865d68c639d (refs/remotes/git-svn)
+No changes between 39e337a873be4380a99e81fb8700e2483fba42a8 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 U    auto_updated_file
@@ -560221,40 +561152,40 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9164-git-svn-dcommit-concurrent/work4.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = f908747a8390bd4c3c6ebc255159c195f4397d61 (refs/remotes/git-svn)
+r1 = 7a210b3accf7050147cffd1c4e8d9f77151a763f (refs/remotes/git-svn)
 	M	file
-r2 = 472850c7a938e82cb698acd6194abecaa407c1c2 (refs/remotes/git-svn)
+r2 = b5fed5b2111b1148863492e1d71ddc356f223d8c (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = d8ef4114273af8a45d51245723f57b343abb59c0 (refs/remotes/git-svn)
+r3 = 4e305dec4c5b047f924dadb8522fda7b1890f3c4 (refs/remotes/git-svn)
 	M	file
-r4 = f74d2c04a4cbf2a1f4f2f4c38d0a93102cb3b593 (refs/remotes/git-svn)
+r4 = 3748fe58fd87e32bf876884c080590eb7b4a4cdd (refs/remotes/git-svn)
 	M	file
-r5 = a937aeb8bed3a4630176144f306863c0c5ac2c8a (refs/remotes/git-svn)
+r5 = 9dd080a036982d98ea1bdd69521fff696ff42fb2 (refs/remotes/git-svn)
 	M	file
-r6 = 3206d5192683c1e171ef54f7980d4aca57af08d2 (refs/remotes/git-svn)
+r6 = f8d83eb27f8f23dba675a5fdfe00af2349b0759a (refs/remotes/git-svn)
 	M	file
-r7 = bbabca51301e98dc77a5051c2572d1a578d9f4ef (refs/remotes/git-svn)
+r7 = 1f03687be8e116a359bee0779330ce7ed75a9f08 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = dbf6cc4bd3c60bbf54b2f7aa307cb3d23a7a9727 (refs/remotes/git-svn)
+r8 = 86adbb52d33cc3171aadbbc55de041d376f6e843 (refs/remotes/git-svn)
 	M	file
-r9 = ce980af55383b08578b7d5aa7267e9cc6d5c79e0 (refs/remotes/git-svn)
+r9 = 0701e841d6409fd105911873307daf3504d58669 (refs/remotes/git-svn)
 	M	auto_updated_file
-r10 = e93570f89106c6e368da1d0733c5df7a1f290051 (refs/remotes/git-svn)
+r10 = 9aefd60c627c46023478a96bf9f95a482c70a5de (refs/remotes/git-svn)
 	M	auto_updated_file
-r11 = d2892bfb6dbc550c86fc49b957b2227475e64383 (refs/remotes/git-svn)
+r11 = 0f56e4454da2b69b633d965cf0d9c2bfcade29ef (refs/remotes/git-svn)
 	M	auto_updated_file
-r12 = e977d0798091bdecccd02fdb2e4f91eb10bb2663 (refs/remotes/git-svn)
+r12 = 39fbf856c06b693d733295bb93f23ef3a45a0743 (refs/remotes/git-svn)
 	M	auto_updated_file
-r13 = 7a7cb4b823489b87fde5ac9a2576ed6ad8db897e (refs/remotes/git-svn)
+r13 = 3ac80672db85a25f35cc175c66bba865d68c639d (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r13
-[master cb77459] commit change 4.1
+[master 608cd13] commit change 4.1
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
-[master 4cad6cc] commit change 4.2
+[master 3101f91] commit change 4.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
-[master 7bf1b07] commit change 4.3
+[master 0d57da9] commit change 4.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -560264,13 +561195,13 @@
 	M	auto_updated_file
 Committed r14
 	M	auto_updated_file
-r14 = 9023a10fd539309b36c1afa45462e9352792f505 (refs/remotes/git-svn)
+r14 = 2e9eeb253f58193672bf93e04edde5a753755bcc (refs/remotes/git-svn)
 	M	auto_updated_file
 Committed r15
 	M	auto_updated_file
-r15 = be563d29bbe12e6c96ccc5246a59cca005b73737 (refs/remotes/git-svn)
+r15 = 05dc947f0a43225da44a8fe663deef508fcdceec (refs/remotes/git-svn)
 	M	auto_updated_file
-r16 = c444372431dede39091b639e13fba151733f3f59 (refs/remotes/git-svn)
+r16 = cba810ea3e55c436e073a4fd78869ec85d5d0abc (refs/remotes/git-svn)
 
 ERROR from SVN:
 Transaction is out of date: File '/auto_updated_file' is out of date
@@ -560297,46 +561228,46 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9164-git-svn-dcommit-concurrent/work5.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = f908747a8390bd4c3c6ebc255159c195f4397d61 (refs/remotes/git-svn)
+r1 = 7a210b3accf7050147cffd1c4e8d9f77151a763f (refs/remotes/git-svn)
 	M	file
-r2 = 472850c7a938e82cb698acd6194abecaa407c1c2 (refs/remotes/git-svn)
+r2 = b5fed5b2111b1148863492e1d71ddc356f223d8c (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = d8ef4114273af8a45d51245723f57b343abb59c0 (refs/remotes/git-svn)
+r3 = 4e305dec4c5b047f924dadb8522fda7b1890f3c4 (refs/remotes/git-svn)
 	M	file
-r4 = f74d2c04a4cbf2a1f4f2f4c38d0a93102cb3b593 (refs/remotes/git-svn)
+r4 = 3748fe58fd87e32bf876884c080590eb7b4a4cdd (refs/remotes/git-svn)
 	M	file
-r5 = a937aeb8bed3a4630176144f306863c0c5ac2c8a (refs/remotes/git-svn)
+r5 = 9dd080a036982d98ea1bdd69521fff696ff42fb2 (refs/remotes/git-svn)
 	M	file
-r6 = 3206d5192683c1e171ef54f7980d4aca57af08d2 (refs/remotes/git-svn)
+r6 = f8d83eb27f8f23dba675a5fdfe00af2349b0759a (refs/remotes/git-svn)
 	M	file
-r7 = bbabca51301e98dc77a5051c2572d1a578d9f4ef (refs/remotes/git-svn)
+r7 = 1f03687be8e116a359bee0779330ce7ed75a9f08 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = dbf6cc4bd3c60bbf54b2f7aa307cb3d23a7a9727 (refs/remotes/git-svn)
+r8 = 86adbb52d33cc3171aadbbc55de041d376f6e843 (refs/remotes/git-svn)
 	M	file
-r9 = ce980af55383b08578b7d5aa7267e9cc6d5c79e0 (refs/remotes/git-svn)
+r9 = 0701e841d6409fd105911873307daf3504d58669 (refs/remotes/git-svn)
 	M	auto_updated_file
-r10 = e93570f89106c6e368da1d0733c5df7a1f290051 (refs/remotes/git-svn)
+r10 = 9aefd60c627c46023478a96bf9f95a482c70a5de (refs/remotes/git-svn)
 	M	auto_updated_file
-r11 = d2892bfb6dbc550c86fc49b957b2227475e64383 (refs/remotes/git-svn)
+r11 = 0f56e4454da2b69b633d965cf0d9c2bfcade29ef (refs/remotes/git-svn)
 	M	auto_updated_file
-r12 = e977d0798091bdecccd02fdb2e4f91eb10bb2663 (refs/remotes/git-svn)
+r12 = 39fbf856c06b693d733295bb93f23ef3a45a0743 (refs/remotes/git-svn)
 	M	auto_updated_file
-r13 = 7a7cb4b823489b87fde5ac9a2576ed6ad8db897e (refs/remotes/git-svn)
+r13 = 3ac80672db85a25f35cc175c66bba865d68c639d (refs/remotes/git-svn)
 	M	auto_updated_file
-r14 = 9023a10fd539309b36c1afa45462e9352792f505 (refs/remotes/git-svn)
+r14 = 2e9eeb253f58193672bf93e04edde5a753755bcc (refs/remotes/git-svn)
 	M	auto_updated_file
-r15 = be563d29bbe12e6c96ccc5246a59cca005b73737 (refs/remotes/git-svn)
+r15 = 05dc947f0a43225da44a8fe663deef508fcdceec (refs/remotes/git-svn)
 	M	auto_updated_file
-r16 = c444372431dede39091b639e13fba151733f3f59 (refs/remotes/git-svn)
+r16 = cba810ea3e55c436e073a4fd78869ec85d5d0abc (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r16
-[master a49817e] commit change 5.1
+[master 5cf1976] commit change 5.1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 23caa88] commit change 5.2
+[master 8f18395] commit change 5.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master c59e9c1] commit change 5.3
+[master dd29a7a] commit change 5.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -560344,23 +561275,23 @@
 	M	file
 Committed r17
 	M	file
-r17 = af666bb46be80bcafb967d137b0ed731e691ad35 (refs/remotes/git-svn)
+r17 = 1b926d30dc48dac5166fef86d5b7e1fa9a5953b9 (refs/remotes/git-svn)
 	M	auto_updated_file
-r18 = 40fd0954acf2e8a6b3efa93fe934410b71cd5153 (refs/remotes/git-svn)
-W: a49817ef8b748f9cb3878fcfba2a9cc429df8d14 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 71afa8b3b15c16d3b6d3d16d7a3c7c0d542db5db 5e0f84b959dd958aaac3fd80bf09ecc4c514245f M	auto_updated_file
-warning: skipped previously applied commit a49817e
+r18 = f07a02cd93f63fdbf14fa910e4d36a36693107d4 (refs/remotes/git-svn)
+W: 5cf1976216c6506d45172cff08adda7d8ffd83bb and refs/remotes/git-svn differ, using rebase:
+:100644 100644 85408051f3760cda37e9ead32b8aa14e90ee00c6 b4261297d016d6c6d24ccf32a1cc37cc2c9089c4 M	auto_updated_file
+warning: skipped previously applied commit 5cf1976
 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 23caa88... commit change 5.2
+error: could not apply 8f18395... 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 23caa88... # commit change 5.2
+Could not apply 8f18395... # commit change 5.2
 rebase refs/remotes/git-svn: command returned error: 1
 
 auto_updated_file: needs merge
@@ -560370,6 +561301,274 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9602-cvsimport-branches-tags.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/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.51.0/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-09-29 14:54:51.034548970 +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-09-29 14:54:56.034548970 +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.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9903-bash-prompt.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9903-bash-prompt/.git/
 expecting success of 9903.1 'setup for prompt tests': 
@@ -561487,621 +562686,625 @@
 1..67
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9602-cvsimport-branches-tags.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9602-cvsimport-branches-tags/.git/
-expecting success of 9602.1 'import module': 
+*** t9400-git-cvsserver-server.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9400-git-cvsserver-server/.git/
+expecting success of 9400.1 'setup': 
+  git config push.default matching &&
+  echo >empty &&
+  git add empty &&
+  git commit -q -m "First Commit" &&
+  mkdir secondroot &&
+  ( cd secondroot &&
+  git init &&
+  touch secondrootfile &&
+  git add secondrootfile &&
+  git commit -m "second root") &&
+  git fetch secondroot main &&
+  git merge --allow-unrelated-histories FETCH_HEAD &&
+  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" &&
+  GIT_DIR="$SERVERDIR" git config gitcvs.authdb "$SERVERDIR/auth.db" &&
+  echo "cvsuser:$PWDHASH" >"$SERVERDIR/auth.db"
 
-	git cvsimport -C module-git module
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9400-git-cvsserver-server/secondroot/.git/
+[main (root-commit) 0fe3a5e] second root
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 secondrootfile
+From secondroot
+ * branch            main       -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ secondrootfile | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 secondrootfile
+ok 1 - setup
 
+expecting success of 9400.2 'basic checkout': 
+	GIT_CONFIG="$git_config" cvs -Q co -d cvswork main &&
+	test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | head -n 1))" = "empty/1.1/" &&
+	test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | sed -ne \$p))" = "secondrootfile/1.1/"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9602-cvsimport-branches-tags/module-git/.git/
-ok 1 - import module
+U cvswork/empty
+U cvswork/secondrootfile
+ok 2 - basic checkout
 
-expecting success of 9602.2 'test branch main': 
+expecting success of 9400.3 'pserver authentication': 
+	git-cvsserver pserver <request-anonymous >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
 
-	test_cmp_branch_tree main
+I LOVE YOU
+ok 3 - pserver authentication
 
+expecting success of 9400.4 'pserver authentication failure (non-anonymous user)': 
+	if git-cvsserver pserver <request-git >log 2>&1
+	then
+	    false
+	else
+	    true
+	fi &&
+	sed -ne \$p log | grep "^I HATE YOU\$"
 
-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
+I HATE YOU
+ok 4 - pserver authentication failure (non-anonymous user)
 
-expecting success of 9602.3 'test branch vendorbranch': 
+expecting success of 9400.5 'pserver authentication success (non-anonymous user with password)': 
+	git-cvsserver pserver <login-git-ok >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
 
-	test_cmp_branch_tree vendorbranch
+I LOVE YOU
+ok 5 - pserver authentication success (non-anonymous user with password)
 
+expecting success of 9400.6 'pserver authentication (login)': 
+	git-cvsserver pserver <login-anonymous >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
 
-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
+I LOVE YOU
+ok 6 - pserver authentication (login)
 
-checking known breakage of 9602.4 'test branch B_FROM_INITIALS': 
+expecting success of 9400.7 'pserver authentication failure (login/non-anonymous user)': 
+	if git-cvsserver pserver <login-git >log 2>&1
+	then
+	    false
+	else
+	    true
+	fi &&
+	sed -ne \$p log | grep "^I HATE YOU\$"
 
-	test_cmp_branch_tree B_FROM_INITIALS
+I HATE YOU
+ok 7 - pserver authentication failure (login/non-anonymous user)
 
+expecting success of 9400.8 'req_Root failure (relative pathname)': 
+	if git-cvsserver pserver <request-relative >log 2>&1
+	then
+		echo unexpected success
+		false
+	else
+		true
+	fi &&
+	tail log | grep "^error 1 Root must be an absolute pathname$"
 
-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
+error 1 Root must be an absolute pathname
+ok 8 - req_Root failure (relative pathname)
 
-checking known breakage of 9602.5 'test branch B_FROM_INITIALS_BUT_ONE': 
+expecting success of 9400.9 'req_Root failure (conflicting roots)': 
+	git-cvsserver pserver <request-conflict >log 2>&1 &&
+	tail log | grep "^error 1 Conflicting roots specified$"
 
-	test_cmp_branch_tree B_FROM_INITIALS_BUT_ONE
+error 1 Conflicting roots specified
+ok 9 - req_Root failure (conflicting roots)
 
+expecting success of 9400.10 'req_Root (strict paths)': 
+	git-cvsserver --strict-paths pserver "$SERVERDIR" <request-anonymous >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
 
-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
+I LOVE YOU
+ok 10 - req_Root (strict paths)
 
-checking known breakage of 9602.6 'test branch B_MIXED': 
+expecting success of 9400.11 'req_Root failure (strict-paths)': 
+	! git-cvsserver --strict-paths pserver "$WORKDIR" <request-anonymous >log 2>&1
 
-	test_cmp_branch_tree B_MIXED
+ok 11 - req_Root failure (strict-paths)
 
+expecting success of 9400.12 'req_Root (w/o strict-paths)': 
+	git-cvsserver pserver "$WORKDIR/" <request-anonymous >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
 
-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-08-27 08:24:20.024984987 +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
+I LOVE YOU
+ok 12 - req_Root (w/o strict-paths)
 
-expecting success of 9602.7 'test branch B_SPLIT': 
+expecting success of 9400.13 'req_Root failure (w/o strict-paths)': 
+	! git-cvsserver pserver "$WORKDIR/gitcvs" <request-anonymous >log 2>&1
 
-	test_cmp_branch_tree B_SPLIT
+ok 13 - req_Root failure (w/o strict-paths)
 
+expecting success of 9400.14 'req_Root (base-path)': 
+	git-cvsserver --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" <request-base >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
 
-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
+I LOVE YOU
+ok 14 - req_Root (base-path)
 
-checking known breakage of 9602.8 'test tag vendortag': 
+expecting success of 9400.15 'req_Root failure (base-path)': 
+	! git-cvsserver --strict-paths --base-path "$WORKDIR" pserver "$SERVERDIR" <request-anonymous >log 2>&1
 
-	test_cmp_branch_tree vendortag
+ok 15 - req_Root failure (base-path)
 
+expecting success of 9400.16 'req_Root (export-all)': 
+	git-cvsserver --export-all pserver "$WORKDIR" <request-anonymous >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
 
-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
+I LOVE YOU
+ok 16 - req_Root (export-all)
 
-expecting success of 9602.9 'test tag T_ALL_INITIAL_FILES': 
+expecting success of 9400.17 'req_Root failure (export-all w/o directory list)': 
+	! (git-cvsserver --export-all pserver <request-anonymous >log 2>&1 || false)
+ok 17 - req_Root failure (export-all w/o directory list)
 
-	test_cmp_branch_tree T_ALL_INITIAL_FILES
+expecting success of 9400.18 'req_Root (everything together)': 
+	git-cvsserver --export-all --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" <request-base >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
 
+I LOVE YOU
+ok 18 - req_Root (everything together)
 
-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'.
+expecting success of 9400.19 'gitcvs.enabled = false': GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
+   if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
+   then
+     echo unexpected cvs success
+     false
+   else
+     true
+   fi &&
+   grep "GITCVS emulation disabled" cvs.log &&
+   test ! -d cvswork2
+GITCVS emulation disabled
+ok 19 - gitcvs.enabled = false
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 9400.20 'gitcvs.ext.enabled = true': 
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
+	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
+	test_cmp cvswork cvswork2
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+Common subdirectories: cvswork/CVS and cvswork2/CVS
+ok 20 - gitcvs.ext.enabled = true
 
-  git switch -c <new-branch-name>
+expecting success of 9400.21 'gitcvs.ext.enabled = false': 
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled false &&
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
+	if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
+	then
+		echo unexpected cvs success
+		false
+	else
+		true
+	fi &&
+	grep "GITCVS emulation disabled" cvs.log &&
+	test ! -d cvswork2
 
-Or undo this operation with:
+GITCVS emulation disabled
+ok 21 - gitcvs.ext.enabled = false
 
-  git switch -
+expecting success of 9400.22 'gitcvs.dbname': 
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
+	GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs.%a.%m.sqlite &&
+	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
+	test_cmp cvswork cvswork2 &&
+	test -f "$SERVERDIR/gitcvs.ext.main.sqlite" &&
+	cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs.ext.main.sqlite"
 
-Turn off this advice by setting config variable advice.detachedHead to false
+Common subdirectories: cvswork/CVS and cvswork2/CVS
+ok 22 - gitcvs.dbname
 
-HEAD is now at e9bb65d Initial import.
-ok 9 - test tag T_ALL_INITIAL_FILES
+expecting success of 9400.23 'gitcvs.ext.dbname': 
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
+	GIT_DIR="$SERVERDIR" git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
+	GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
+	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
+	test_cmp cvswork cvswork2 &&
+	test -f "$SERVERDIR/gitcvs1.ext.main.sqlite" &&
+	test ! -f "$SERVERDIR/gitcvs2.ext.main.sqlite" &&
+	cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs1.ext.main.sqlite"
 
-checking known breakage of 9602.10 'test tag T_ALL_INITIAL_FILES_BUT_ONE': 
+Common subdirectories: cvswork/CVS and cvswork2/CVS
+ok 23 - gitcvs.ext.dbname
 
-	test_cmp_branch_tree T_ALL_INITIAL_FILES_BUT_ONE
+expecting success of 9400.24 'cvs update (create new file)': 
+	echo testfile1 >testfile1 &&
+	git add testfile1 &&
+	git commit -q -m "Add testfile1" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.1/" &&
+	test_cmp testfile1 ../testfile1
 
+To gitcvs.git
+   4ea9390..3c6a419  main -> main
+U testfile1
+ok 24 - cvs update (create new file)
 
-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
+expecting success of 9400.25 'cvs update (update existing file)': 
+	echo line 2 >>testfile1 &&
+	git add testfile1 &&
+	git commit -q -m "Append to testfile1" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.2/" &&
+	test_cmp testfile1 ../testfile1
 
-checking known breakage of 9602.11 'test tag T_MIXED': 
+To gitcvs.git
+   3c6a419..696e081  main -> main
+U testfile1
+ok 25 - cvs update (update existing file)
+
+checking known breakage of 9400.26 'cvs update w/o -d doesn't create subdir (TODO)': 
+	mkdir test &&
+	echo >test/empty &&
+	git add test &&
+	git commit -q -m "Single Subdirectory" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test ! -d test
+
+To gitcvs.git
+   696e081..33879bd  main -> main
+U test/empty
+not ok 26 - cvs update w/o -d doesn't create subdir (TODO) # TODO known breakage
+
+expecting success of 9400.27 'cvs update (subdirectories)': 
+	(for dir in A A/B A/B/C A/D E; do
+		mkdir $dir &&
+		echo "test file in $dir" >"$dir/file_in_$(echo $dir|sed -e "s#/# #g")"  &&
+		git add $dir || exit 1
+	done) &&
+	git commit -q -m "deep sub directory structure" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update -d &&
+	(for dir in A A/B A/B/C A/D E; do
+		filename="file_in_$(echo $dir|sed -e "s#/# #g")" &&
+		if test "$(echo $(grep -v ^D $dir/CVS/Entries|cut -d/ -f2,3,5))" = "$filename/1.1/" &&
+			test_cmp "$dir/$filename" "../$dir/$filename"; then
+		:
+		else
+			exit 1
+		fi
+	done)
+
+To gitcvs.git
+   33879bd..9436d83  main -> main
+U A/file_in_A
+U E/file_in_E
+U A/B/file_in_A B
+U A/D/file_in_A D
+U A/B/C/file_in_A B C
+ok 27 - cvs update (subdirectories)
+
+expecting success of 9400.28 'cvs update (delete file)': 
+	git rm testfile1 &&
+	git commit -q -m "Remove testfile1" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test -z "$(grep testfile1 CVS/Entries)" &&
+	test ! -f testfile1
 
-	test_cmp_branch_tree T_MIXED
+rm 'testfile1'
+To gitcvs.git
+   9436d83..09366c6  main -> main
+cvs update: `testfile1' is no longer in the repository
+ok 28 - cvs update (delete file)
 
+expecting success of 9400.29 'cvs update (re-add deleted file)': 
+	echo readded testfile >testfile1 &&
+	git add testfile1 &&
+	git commit -q -m "Re-Add testfile1" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.4/" &&
+	test_cmp testfile1 ../testfile1
 
-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-08-27 08:24:25.029018005 +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
+To gitcvs.git
+   09366c6..8ea0549  main -> main
+U testfile1
+ok 29 - cvs update (re-add deleted file)
 
-# still have 6 known breakage(s)
-# passed all remaining 5 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9401-git-cvsserver-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9401-git-cvsserver-crlf/.git/
-expecting success of 9401.1 'setup': 
-    git config push.default matching &&
-    echo "Simple text file" >textfile.c &&
-    echo "File with embedded NUL: Q <- there" | q_to_nul > binfile.bin &&
-    mkdir subdir &&
-    echo "Another text file" > subdir/file.h &&
-    echo "Another binary: Q (this time CR)" | q_to_cr > subdir/withCr.bin &&
-    echo "Mixed up NUL, but marked text: Q <- there" | q_to_nul > mixedUp.c &&
-    echo "Unspecified" > subdir/unspecified.other &&
-    echo "/*.bin -crlf" > .gitattributes &&
-    echo "/*.c crlf" >> .gitattributes &&
-    echo "subdir/*.bin -crlf" >> .gitattributes &&
-    echo "subdir/*.c crlf" >> .gitattributes &&
-    echo "subdir/file.h crlf" >> .gitattributes &&
-    git add .gitattributes textfile.c binfile.bin mixedUp.c subdir/* &&
-    git commit -q -m "First Commit" &&
-    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"
+expecting success of 9400.30 'cvs update (merge)': 
+	echo Line 0 >expected &&
+	for i in 1 2 3 4 5 6 7
+	do
+		echo Line $i >>merge &&
+		echo Line $i >>expected || return 1
+	done &&
+	echo Line 8 >>expected &&
+	git add merge &&
+	git commit -q -m "Merge test (pre-merge)" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test "$(echo $(grep merge CVS/Entries|cut -d/ -f2,3,5))" = "merge/1.1/" &&
+	test_cmp merge ../merge &&
+	( echo Line 0 && cat merge ) >merge.tmp &&
+	mv merge.tmp merge &&
+	cd "$WORKDIR" &&
+	echo Line 8 >>merge &&
+	git add merge &&
+	git commit -q -m "Merge test (merge)" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	sleep 1 && touch merge &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test_cmp merge ../expected
 
-ok 1 - setup
+To gitcvs.git
+   8ea0549..f31ee25  main -> main
+U merge
+To gitcvs.git
+   f31ee25..792463d  main -> main
+Merging differences between 1.1 and 1.2 into merge
+M merge
+ok 30 - cvs update (merge)
 
-expecting success of 9401.2 'cvs co (default crlf)': 
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    test x"$(grep /-k cvswork/CVS/Entries cvswork/subdir/CVS/Entries)" = x""
+expecting success of 9400.31 'cvs update (conflict merge)': 
+	( echo LINE 0 && cat merge ) >merge.tmp &&
+	mv merge.tmp merge &&
+	git add merge &&
+	git commit -q -m "Merge test (conflict)" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test_cmp merge ../expected.C
 
-ok 2 - cvs co (default crlf)
+To gitcvs.git
+   792463d..ba02484  main -> main
+Merging differences between 1.2 and 1.3 into merge
+cvs update: conflicts found in merge
+C merge
+ok 31 - cvs update (conflict merge)
 
-expecting success of 9401.3 'cvs co (allbinary)': 
-    GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary true &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    marked_as cvswork textfile.c -kb &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes -kb &&
-    marked_as cvswork mixedUp.c -kb &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h -kb &&
-    marked_as cvswork/subdir unspecified.other -kb
+expecting success of 9400.32 'cvs update (-C)': 
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update -C &&
+	test_cmp merge ../merge
 
-ok 3 - cvs co (allbinary)
+U empty
+U merge
+U secondrootfile
+U testfile1
+U A/file_in_A
+U E/file_in_E
+U test/empty
+U A/B/file_in_A B
+U A/D/file_in_A D
+U A/B/C/file_in_A B C
+ok 32 - cvs update (-C)
 
-expecting success of 9401.4 'cvs co (use attributes/allbinary)': 
-    GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr true &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    marked_as cvswork textfile.c "" &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes -kb &&
-    marked_as cvswork mixedUp.c "" &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h "" &&
-    marked_as cvswork/subdir unspecified.other -kb
+expecting success of 9400.33 'cvs update (merge no-op)': 
+	echo Line 9 >>merge &&
+	cp merge cvswork/merge &&
+	git add merge &&
+	git commit -q -m "Merge test (no-op)" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	sleep 1 && touch merge &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test_cmp merge ../merge
 
-ok 4 - cvs co (use attributes/allbinary)
+To gitcvs.git
+   ba02484..2f86a26  main -> main
+Merging differences between 1.3 and 1.4 into merge
+M merge
+ok 33 - cvs update (merge no-op)
 
-expecting success of 9401.5 'cvs co (use attributes)': 
-    GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary false &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    marked_as cvswork textfile.c "" &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes "" &&
-    marked_as cvswork mixedUp.c "" &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h "" &&
-    marked_as cvswork/subdir unspecified.other ""
+expecting success of 9400.34 'cvs update (-p)': 
+	touch really-empty &&
+	echo Line 1 > no-lf &&
+	printf "Line 2" >> no-lf &&
+	git add really-empty no-lf &&
+	git commit -q -m "Update -p test" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs update &&
+	for i in merge no-lf empty really-empty; do
+		GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out &&
+		test_cmp $i.out ../$i || return 1
+	done
 
-ok 5 - cvs co (use attributes)
+To gitcvs.git
+   2f86a26..9cef819  main -> main
+cvs update: Updating .
+M merge
+U no-lf
+U really-empty
+cvs update: Updating A
+cvs update: Updating E
+cvs update: Updating test
+cvs update: Updating A/B
+cvs update: Updating A/D
+cvs update: Updating A/B/C
+ok 34 - cvs update (-p)
 
-expecting success of 9401.6 'adding files': 
-    (cd cvswork &&
-    (cd subdir &&
-    echo "more text" > src.c &&
-    GIT_CONFIG="$git_config" cvs -Q add src.c >cvs.log 2>&1 &&
-    marked_as . src.c "" &&
-    echo "pseudo-binary" > temp.bin
-    ) &&
-    GIT_CONFIG="$git_config" cvs -Q add subdir/temp.bin >cvs.log 2>&1 &&
-    marked_as subdir temp.bin "-kb" &&
-    cd subdir &&
-    GIT_CONFIG="$git_config" cvs -Q ci -m "adding files" >cvs.log 2>&1 &&
-    marked_as . temp.bin "-kb" &&
-    marked_as . src.c ""
-    )
+expecting success of 9400.35 'cvs update (module list supports packed refs)': 
+	GIT_DIR="$SERVERDIR" git pack-refs --all &&
+	GIT_CONFIG="$git_config" cvs -n up -d 2> out &&
+	grep "cvs update: New directory \`main'" < out
 
-ok 6 - adding files
+cvs update: New directory `main'
+ok 35 - cvs update (module list supports packed refs)
 
-expecting success of 9401.7 'updating': 
-    git pull gitcvs.git &&
-    echo "hi" >subdir/newfile.bin &&
-    echo "junk" >subdir/file.h &&
-    echo "hi" >subdir/newfile.c &&
-    echo "hello" >>binfile.bin &&
-    git add subdir/newfile.bin subdir/file.h subdir/newfile.c binfile.bin &&
-    git commit -q -m "Add and change some files" &&
-    git push gitcvs.git >/dev/null &&
-    (cd cvswork &&
-    GIT_CONFIG="$git_config" cvs -Q update
-    ) &&
-    marked_as cvswork textfile.c "" &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes "" &&
-    marked_as cvswork mixedUp.c "" &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h "" &&
-    marked_as cvswork/subdir unspecified.other "" &&
-    marked_as cvswork/subdir newfile.bin -kb &&
-    marked_as cvswork/subdir newfile.c "" &&
-    echo "File with embedded NUL: Q <- there" | q_to_nul > tmpExpect1 &&
-    echo "hello" >> tmpExpect1 &&
-    cmp cvswork/binfile.bin tmpExpect1
+expecting success of 9400.36 'cvs status': 
+	mkdir status.dir &&
+	echo Line > status.dir/status.file &&
+	echo Line > status.file &&
+	git add status.dir status.file &&
+	git commit -q -m "Status test" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs update &&
+	GIT_CONFIG="$git_config" cvs status | grep "^File: status.file" >../out &&
+	test_line_count = 2 ../out
 
-From gitcvs
- * branch            HEAD       -> FETCH_HEAD
-Updating 9796767..6d431cd
-Fast-forward
- subdir/src.c    | 1 +
- subdir/temp.bin | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 subdir/src.c
- create mode 100644 subdir/temp.bin
 To gitcvs.git
-   6d431cd..faca8d4  main -> main
+   9cef819..590c22f  main -> main
 Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1267.
 Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1312.
-U binfile.bin
-cvs update: `cvs.log' is no longer in the repository
 Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1267.
 Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1312.
-cvs update: `subdir/cvs.log' is no longer in the repository
-U subdir/file.h
-U subdir/newfile.bin
-U subdir/newfile.c
-ok 7 - updating
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1312.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1312.
+cvs update: Updating .
+cvs update: `empty.out' is no longer in the repository
+M merge
+cvs update: `merge.out' is no longer in the repository
+cvs update: `no-lf.out' is no longer in the repository
+cvs update: `really-empty.out' is no longer in the repository
+U status.file
+cvs update: Updating A
+cvs update: Updating E
+cvs update: Updating status.dir
+U status.dir/status.file
+cvs update: Updating test
+cvs update: Updating A/B
+cvs update: Updating A/D
+cvs update: Updating A/B/C
+ok 36 - cvs status
 
-expecting success of 9401.8 'cvs co (use attributes/guess)': 
-    GIT_DIR="$SERVERDIR" git config gitcvs.allbinary guess &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    marked_as cvswork textfile.c "" &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes "" &&
-    marked_as cvswork mixedUp.c "" &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h "" &&
-    marked_as cvswork/subdir unspecified.other "" &&
-    marked_as cvswork/subdir newfile.bin -kb &&
-    marked_as cvswork/subdir newfile.c ""
+expecting success of 9400.37 'cvs status (nonrecursive)': 
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs status -l | grep "^File: status.file" >../out &&
+	test_line_count = 1 ../out
 
-ok 8 - cvs co (use attributes/guess)
+ok 37 - cvs status (nonrecursive)
 
-expecting success of 9401.9 'setup multi-line files': 
-    ( echo "line 1" &&
-      echo "line 2" &&
-      echo "line 3" &&
-      echo "line 4 with NUL: Q <-" ) | q_to_nul > multiline.c &&
-    git add multiline.c &&
-    ( echo "line 1" &&
-      echo "line 2" &&
-      echo "line 3" &&
-      echo "line 4" ) | q_to_nul > multilineTxt.c &&
-    git add multilineTxt.c &&
-    git commit -q -m "multiline files" &&
-    git push gitcvs.git >/dev/null
+expecting success of 9400.38 'cvs status (no subdirs in header)': 
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs status | grep ^File: >../out &&
+	! grep / <../out
 
-To gitcvs.git
-   faca8d4..509c7f1  main -> main
-ok 9 - setup multi-line files
+ok 38 - cvs status (no subdirs in header)
 
-expecting success of 9401.10 'cvs co (guess)': 
-    GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr false &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    marked_as cvswork textfile.c "" &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes "" &&
-    marked_as cvswork mixedUp.c -kb &&
-    marked_as cvswork multiline.c -kb &&
-    marked_as cvswork multilineTxt.c "" &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h "" &&
-    marked_as cvswork/subdir unspecified.other "" &&
-    marked_as cvswork/subdir newfile.bin "" &&
-    marked_as cvswork/subdir newfile.c ""
+expecting success of 9400.39 'cvs co -c (shows module database)': 
+	GIT_CONFIG="$git_config" cvs co -c > out &&
+	grep "^main[	 ][ 	]*main$" <out &&
+	! grep -v "^main[	 ][ 	]*main$" <out
 
-ok 10 - cvs co (guess)
+main	main
+ok 39 - cvs co -c (shows module database)
 
-expecting success of 9401.11 'cvs co another copy (guess)': 
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
-    marked_as cvswork2 textfile.c "" &&
-    marked_as cvswork2 binfile.bin -kb &&
-    marked_as cvswork2 .gitattributes "" &&
-    marked_as cvswork2 mixedUp.c -kb &&
-    marked_as cvswork2 multiline.c -kb &&
-    marked_as cvswork2 multilineTxt.c "" &&
-    marked_as cvswork2/subdir withCr.bin -kb &&
-    marked_as cvswork2/subdir file.h "" &&
-    marked_as cvswork2/subdir unspecified.other "" &&
-    marked_as cvswork2/subdir newfile.bin "" &&
-    marked_as cvswork2/subdir newfile.c ""
+expecting success of 9400.40 'cvs log': 
+	cd cvswork &&
+	test x"$expectStat" = x"0" &&
+	GIT_CONFIG="$git_config" cvs log merge >../out &&
+sed -e "s%2[0-9][0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9]%__DATE__%" ../out > ../actual &&
+	test_cmp ../expect ../actual
 
-ok 11 - cvs co another copy (guess)
+ok 40 - cvs log
 
-expecting success of 9401.12 'cvs status - sticky options': 
-    check_status_options cvswork2 textfile.c "" &&
-    check_status_options cvswork2 binfile.bin -kb &&
-    check_status_options cvswork2 .gitattributes "" &&
-    check_status_options cvswork2 mixedUp.c -kb &&
-    check_status_options cvswork2 multiline.c -kb &&
-    check_status_options cvswork2 multilineTxt.c "" &&
-    check_status_options cvswork2/subdir withCr.bin -kb &&
-    check_status_options cvswork2 subdir/withCr.bin -kb &&
-    check_status_options cvswork2/subdir file.h "" &&
-    check_status_options cvswork2 subdir/file.h "" &&
-    check_status_options cvswork2/subdir unspecified.other "" &&
-    check_status_options cvswork2/subdir newfile.bin "" &&
-    check_status_options cvswork2/subdir newfile.c ""
+expecting success of 9400.41 'cvs annotate': 
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs annotate merge >../out &&
+	sed -e "s/ .*//" ../out >../actual &&
+	printf "1.%d\n" 3 1 1 1 1 1 1 1 2 4 >../expect &&
+	test_cmp ../expect ../actual
 
-ok 12 - cvs status - sticky options
+Annotations for merge
+***************
+ok 41 - cvs annotate
 
-expecting success of 9401.13 'add text (guess)': 
-    (cd cvswork &&
-    echo "simpleText" > simpleText.c &&
-    GIT_CONFIG="$git_config" cvs -Q add simpleText.c
-    ) &&
-    marked_as cvswork simpleText.c ""
+expecting success of 9400.42 'create remote-cvs helper': 
+	write_script remote-cvs <<-\EOF
+	exec git shell -c "cvs server"
+	EOF
 
-cvs add: scheduling file `simpleText.c' for addition
-cvs add: use `cvs commit' to add this file permanently
-ok 13 - add text (guess)
+ok 42 - create remote-cvs helper
 
-expecting success of 9401.14 'add bin (guess)': 
-    (cd cvswork &&
-    echo "simpleBin: NUL: Q <- there" | q_to_nul > simpleBin.bin &&
-    GIT_CONFIG="$git_config" cvs -Q add simpleBin.bin
-    ) &&
-    marked_as cvswork simpleBin.bin -kb
+expecting success of 9400.43 'cvs server does not run with vanilla git-shell': 
+	(
+		cd cvswork &&
+		CVS_SERVER=$WORKDIR/remote-cvs &&
+		export CVS_SERVER &&
+		! cvs log merge
+	)
 
-cvs add: scheduling file `simpleBin.bin' for addition
-cvs add: use `cvs commit' to add this file permanently
-ok 14 - add bin (guess)
+fatal: unrecognized command 'cvs server'
+cvs [log aborted]: end of file from server (consult above messages if any)
+ok 43 - cvs server does not run with vanilla git-shell
 
-expecting success of 9401.15 'remove files (guess)': 
-    (cd cvswork &&
-    GIT_CONFIG="$git_config" cvs -Q rm -f subdir/file.h &&
-    (cd subdir &&
-    GIT_CONFIG="$git_config" cvs -Q rm -f withCr.bin
-    )) &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h ""
+expecting success of 9400.44 'configure git shell to run cvs server': 
+	mkdir "$HOME"/git-shell-commands &&
 
-cvs remove: scheduling `subdir/file.h' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-cvs remove: scheduling `subdir/withCr.bin' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-ok 15 - remove files (guess)
+	write_script "$HOME"/git-shell-commands/cvs <<-\EOF &&
+	if ! test $# = 1 && test "$1" = "server"
+	then
+		echo >&2 "git-cvsserver only handles \"server\""
+		exit 1
+	fi
+	exec git cvsserver server
+	EOF
 
-expecting success of 9401.16 'cvs ci (guess)': 
-    (cd cvswork &&
-    GIT_CONFIG="$git_config" cvs -Q ci -m "add/rm files" >cvs.log 2>&1
-    ) &&
-    marked_as cvswork textfile.c "" &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes "" &&
-    marked_as cvswork mixedUp.c -kb &&
-    marked_as cvswork multiline.c -kb &&
-    marked_as cvswork multilineTxt.c "" &&
-    not_present cvswork/subdir withCr.bin &&
-    not_present cvswork/subdir file.h &&
-    marked_as cvswork/subdir unspecified.other "" &&
-    marked_as cvswork/subdir newfile.bin "" &&
-    marked_as cvswork/subdir newfile.c "" &&
-    marked_as cvswork simpleBin.bin -kb &&
-    marked_as cvswork simpleText.c ""
+	# Should not be used, but part of the recommended setup
+	write_script "$HOME"/git-shell-commands/no-interactive-login <<-\EOF
+	echo Interactive login forbidden
+	EOF
 
-ok 16 - cvs ci (guess)
+ok 44 - configure git shell to run cvs server
 
-expecting success of 9401.17 'update subdir of other copy (guess)': 
-    (cd cvswork2/subdir &&
-    GIT_CONFIG="$git_config" cvs -Q update
-    ) &&
-    marked_as cvswork2 textfile.c "" &&
-    marked_as cvswork2 binfile.bin -kb &&
-    marked_as cvswork2 .gitattributes "" &&
-    marked_as cvswork2 mixedUp.c -kb &&
-    marked_as cvswork2 multiline.c -kb &&
-    marked_as cvswork2 multilineTxt.c "" &&
-    not_present cvswork2/subdir withCr.bin &&
-    not_present cvswork2/subdir file.h &&
-    marked_as cvswork2/subdir unspecified.other "" &&
-    marked_as cvswork2/subdir newfile.bin "" &&
-    marked_as cvswork2/subdir newfile.c "" &&
-    not_present cvswork2 simpleBin.bin &&
-    not_present cvswork2 simpleText.c
+expecting success of 9400.45 'cvs server can run with recommended config': 
+	(
+		cd cvswork &&
+		CVS_SERVER=$WORKDIR/remote-cvs &&
+		export CVS_SERVER &&
+		cvs log merge
+	)
 
-cvs update: `subdir/file.h' is no longer in the repository
-cvs update: `subdir/withCr.bin' is no longer in the repository
-ok 17 - update subdir of other copy (guess)
 
-expecting success of 9401.18 'update/merge full other copy (guess)': 
-    git pull gitcvs.git main &&
-    sed "s/3/replaced_3/" < multilineTxt.c > ml.temp &&
-    mv ml.temp multilineTxt.c &&
-    git add multilineTxt.c &&
-    git commit -q -m "modify multiline file" >> "${WORKDIR}/marked.log" &&
-    git push gitcvs.git >/dev/null &&
-    (cd cvswork2 &&
-    sed "s/1/replaced_1/" < multilineTxt.c > ml.temp &&
-    mv ml.temp multilineTxt.c &&
-    GIT_CONFIG="$git_config" cvs update > cvs.log 2>&1
-    ) &&
-    marked_as cvswork2 textfile.c "" &&
-    marked_as cvswork2 binfile.bin -kb &&
-    marked_as cvswork2 .gitattributes "" &&
-    marked_as cvswork2 mixedUp.c -kb &&
-    marked_as cvswork2 multiline.c -kb &&
-    marked_as cvswork2 multilineTxt.c "" &&
-    not_present cvswork2/subdir withCr.bin &&
-    not_present cvswork2/subdir file.h &&
-    marked_as cvswork2/subdir unspecified.other "" &&
-    marked_as cvswork2/subdir newfile.bin "" &&
-    marked_as cvswork2/subdir newfile.c "" &&
-    marked_as cvswork2 simpleBin.bin -kb &&
-    marked_as cvswork2 simpleText.c "" &&
-    echo "line replaced_1" > tmpExpect2 &&
-    echo "line 2" >> tmpExpect2 &&
-    echo "line replaced_3" >> tmpExpect2 &&
-    echo "line 4" | q_to_nul >> tmpExpect2 &&
-    cmp cvswork2/multilineTxt.c tmpExpect2
+RCS file: /build/reproducible-path/git-2.51.0/t/trash directory.t9400-git-cvsserver-server/gitcvs.git/main/merge,v
+Working file: merge
+head: 1.4
+branch:
+locks: strict
+access list:
+symbolic names:
+keyword substitution: kv
+total revisions: 4;	selected revisions: 4
+description:
+----------------------------
+revision 1.4
+date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
 
-From gitcvs
- * branch            main       -> FETCH_HEAD
-Updating 509c7f1..11562e1
-Fast-forward
- simpleBin.bin     | Bin 0 -> 27 bytes
- simpleText.c      |   1 +
- subdir/file.h     |   1 -
- subdir/withCr.bin |   1 -
- 4 files changed, 1 insertion(+), 2 deletions(-)
- create mode 100644 simpleBin.bin
- create mode 100644 simpleText.c
- delete mode 100644 subdir/file.h
- delete mode 100644 subdir/withCr.bin
-To gitcvs.git
-   11562e1..e3c7165  main -> main
-ok 18 - update/merge full other copy (guess)
+Merge test (no-op)
+ 
+----------------------------
+revision 1.3
+date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
 
-# passed all 18 test(s)
-1..18
+Merge test (conflict)
+ 
+----------------------------
+revision 1.2
+date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+
+Merge test (merge)
+ 
+----------------------------
+revision 1.1
+date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+
+Merge test (pre-merge)
+ 
+=============================================================================
+ok 45 - cvs server can run with recommended config
+
+# still have 1 known breakage(s)
+# passed all remaining 44 test(s)
+1..45
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9200-git-cvsexportcommit.sh ***
@@ -562479,10 +563682,10 @@
 	test_must_fail git cvsexportcommit -c $id
 	)
 
-[master 77fce26] Update one
+[master 1533731] Update one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 06fef16] Update two
+[master e2c1bce] Update two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Checking if patch will apply
@@ -562515,7 +563718,7 @@
 	! test -x G/off
 	)
 
-[master 9a386fc] Execute test
+[master a978f42] Execute test
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 G/off
@@ -562554,7 +563757,7 @@
 	test_cmp "$CVSWORK/W/file2.txt" ../W/file2.txt
 	)
 
-[master 2972df4] More updates
+[master a6dbcde] More updates
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 W/file1.txt
@@ -562600,7 +563803,7 @@
 	test_cmp "$CVSWORK/release-notes" release-notes
 
 
-[master 9394f22] Add release notes
+[master c5cf4f2] Add release notes
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 release-notes
@@ -562617,14 +563820,14 @@
 /build/reproducible-path/git-2.51.0/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/release-notes,v  <--  release-notes
 initial revision: 1.1
 Committed successfully to CVS
-[master a5036bc] Add two files with the same basename
+[master 0ba9275] 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 `E/DS'
 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
@@ -562660,7 +563863,7 @@
 	(cd "$CVSWORK" && cvs -Q update -d) &&
 	test -f "$CVSWORK/attic_gremlin"
 
-[master 9b0b28f] Added attic_gremlin
+[master c4b0755] Added attic_gremlin
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 attic_gremlin
@@ -562692,7 +563895,7 @@
 	test_cmp "$CVSWORK/ space" " space"
 
 
-[master 00826fa] Add a file with a leading space
+[master 2d48483] Add a file with a leading space
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644  space
@@ -562823,625 +564026,1108 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9400-git-cvsserver-server.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9400-git-cvsserver-server/.git/
-expecting success of 9400.1 'setup': 
-  git config push.default matching &&
-  echo >empty &&
-  git add empty &&
-  git commit -q -m "First Commit" &&
-  mkdir secondroot &&
-  ( cd secondroot &&
-  git init &&
-  touch secondrootfile &&
-  git add secondrootfile &&
-  git commit -m "second root") &&
-  git fetch secondroot main &&
-  git merge --allow-unrelated-histories FETCH_HEAD &&
-  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" &&
-  GIT_DIR="$SERVERDIR" git config gitcvs.authdb "$SERVERDIR/auth.db" &&
-  echo "cvsuser:$PWDHASH" >"$SERVERDIR/auth.db"
+*** t9401-git-cvsserver-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9401-git-cvsserver-crlf/.git/
+expecting success of 9401.1 'setup': 
+    git config push.default matching &&
+    echo "Simple text file" >textfile.c &&
+    echo "File with embedded NUL: Q <- there" | q_to_nul > binfile.bin &&
+    mkdir subdir &&
+    echo "Another text file" > subdir/file.h &&
+    echo "Another binary: Q (this time CR)" | q_to_cr > subdir/withCr.bin &&
+    echo "Mixed up NUL, but marked text: Q <- there" | q_to_nul > mixedUp.c &&
+    echo "Unspecified" > subdir/unspecified.other &&
+    echo "/*.bin -crlf" > .gitattributes &&
+    echo "/*.c crlf" >> .gitattributes &&
+    echo "subdir/*.bin -crlf" >> .gitattributes &&
+    echo "subdir/*.c crlf" >> .gitattributes &&
+    echo "subdir/file.h crlf" >> .gitattributes &&
+    git add .gitattributes textfile.c binfile.bin mixedUp.c subdir/* &&
+    git commit -q -m "First Commit" &&
+    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"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9400-git-cvsserver-server/secondroot/.git/
-[main (root-commit) 0fe3a5e] second root
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 secondrootfile
-From secondroot
- * branch            main       -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- secondrootfile | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 secondrootfile
 ok 1 - setup
 
-expecting success of 9400.2 'basic checkout': 
-	GIT_CONFIG="$git_config" cvs -Q co -d cvswork main &&
-	test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | head -n 1))" = "empty/1.1/" &&
-	test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | sed -ne \$p))" = "secondrootfile/1.1/"
+expecting success of 9401.2 'cvs co (default crlf)': 
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
+    test x"$(grep /-k cvswork/CVS/Entries cvswork/subdir/CVS/Entries)" = x""
 
-U cvswork/empty
-U cvswork/secondrootfile
-ok 2 - basic checkout
+ok 2 - cvs co (default crlf)
 
-expecting success of 9400.3 'pserver authentication': 
-	git-cvsserver pserver <request-anonymous >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 9401.3 'cvs co (allbinary)': 
+    GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary true &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
+    marked_as cvswork textfile.c -kb &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes -kb &&
+    marked_as cvswork mixedUp.c -kb &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h -kb &&
+    marked_as cvswork/subdir unspecified.other -kb
 
-I LOVE YOU
-ok 3 - pserver authentication
+ok 3 - cvs co (allbinary)
 
-expecting success of 9400.4 'pserver authentication failure (non-anonymous user)': 
-	if git-cvsserver pserver <request-git >log 2>&1
-	then
-	    false
-	else
-	    true
-	fi &&
-	sed -ne \$p log | grep "^I HATE YOU\$"
+expecting success of 9401.4 'cvs co (use attributes/allbinary)': 
+    GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr true &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
+    marked_as cvswork textfile.c "" &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes -kb &&
+    marked_as cvswork mixedUp.c "" &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h "" &&
+    marked_as cvswork/subdir unspecified.other -kb
 
-I HATE YOU
-ok 4 - pserver authentication failure (non-anonymous user)
+ok 4 - cvs co (use attributes/allbinary)
 
-expecting success of 9400.5 'pserver authentication success (non-anonymous user with password)': 
-	git-cvsserver pserver <login-git-ok >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 9401.5 'cvs co (use attributes)': 
+    GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary false &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
+    marked_as cvswork textfile.c "" &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes "" &&
+    marked_as cvswork mixedUp.c "" &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h "" &&
+    marked_as cvswork/subdir unspecified.other ""
 
-I LOVE YOU
-ok 5 - pserver authentication success (non-anonymous user with password)
+ok 5 - cvs co (use attributes)
 
-expecting success of 9400.6 'pserver authentication (login)': 
-	git-cvsserver pserver <login-anonymous >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 9401.6 'adding files': 
+    (cd cvswork &&
+    (cd subdir &&
+    echo "more text" > src.c &&
+    GIT_CONFIG="$git_config" cvs -Q add src.c >cvs.log 2>&1 &&
+    marked_as . src.c "" &&
+    echo "pseudo-binary" > temp.bin
+    ) &&
+    GIT_CONFIG="$git_config" cvs -Q add subdir/temp.bin >cvs.log 2>&1 &&
+    marked_as subdir temp.bin "-kb" &&
+    cd subdir &&
+    GIT_CONFIG="$git_config" cvs -Q ci -m "adding files" >cvs.log 2>&1 &&
+    marked_as . temp.bin "-kb" &&
+    marked_as . src.c ""
+    )
 
-I LOVE YOU
-ok 6 - pserver authentication (login)
+ok 6 - adding files
 
-expecting success of 9400.7 'pserver authentication failure (login/non-anonymous user)': 
-	if git-cvsserver pserver <login-git >log 2>&1
-	then
-	    false
-	else
-	    true
-	fi &&
-	sed -ne \$p log | grep "^I HATE YOU\$"
+expecting success of 9401.7 'updating': 
+    git pull gitcvs.git &&
+    echo "hi" >subdir/newfile.bin &&
+    echo "junk" >subdir/file.h &&
+    echo "hi" >subdir/newfile.c &&
+    echo "hello" >>binfile.bin &&
+    git add subdir/newfile.bin subdir/file.h subdir/newfile.c binfile.bin &&
+    git commit -q -m "Add and change some files" &&
+    git push gitcvs.git >/dev/null &&
+    (cd cvswork &&
+    GIT_CONFIG="$git_config" cvs -Q update
+    ) &&
+    marked_as cvswork textfile.c "" &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes "" &&
+    marked_as cvswork mixedUp.c "" &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h "" &&
+    marked_as cvswork/subdir unspecified.other "" &&
+    marked_as cvswork/subdir newfile.bin -kb &&
+    marked_as cvswork/subdir newfile.c "" &&
+    echo "File with embedded NUL: Q <- there" | q_to_nul > tmpExpect1 &&
+    echo "hello" >> tmpExpect1 &&
+    cmp cvswork/binfile.bin tmpExpect1
 
-I HATE YOU
-ok 7 - pserver authentication failure (login/non-anonymous user)
+From gitcvs
+ * branch            HEAD       -> FETCH_HEAD
+Updating 9796767..6d431cd
+Fast-forward
+ subdir/src.c    | 1 +
+ subdir/temp.bin | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 subdir/src.c
+ create mode 100644 subdir/temp.bin
+To gitcvs.git
+   6d431cd..faca8d4  main -> main
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1312.
+U binfile.bin
+cvs update: `cvs.log' is no longer in the repository
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1312.
+cvs update: `subdir/cvs.log' is no longer in the repository
+U subdir/file.h
+U subdir/newfile.bin
+U subdir/newfile.c
+ok 7 - updating
 
-expecting success of 9400.8 'req_Root failure (relative pathname)': 
-	if git-cvsserver pserver <request-relative >log 2>&1
-	then
-		echo unexpected success
-		false
-	else
-		true
-	fi &&
-	tail log | grep "^error 1 Root must be an absolute pathname$"
+expecting success of 9401.8 'cvs co (use attributes/guess)': 
+    GIT_DIR="$SERVERDIR" git config gitcvs.allbinary guess &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
+    marked_as cvswork textfile.c "" &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes "" &&
+    marked_as cvswork mixedUp.c "" &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h "" &&
+    marked_as cvswork/subdir unspecified.other "" &&
+    marked_as cvswork/subdir newfile.bin -kb &&
+    marked_as cvswork/subdir newfile.c ""
 
-error 1 Root must be an absolute pathname
-ok 8 - req_Root failure (relative pathname)
+ok 8 - cvs co (use attributes/guess)
 
-expecting success of 9400.9 'req_Root failure (conflicting roots)': 
-	git-cvsserver pserver <request-conflict >log 2>&1 &&
-	tail log | grep "^error 1 Conflicting roots specified$"
+expecting success of 9401.9 'setup multi-line files': 
+    ( echo "line 1" &&
+      echo "line 2" &&
+      echo "line 3" &&
+      echo "line 4 with NUL: Q <-" ) | q_to_nul > multiline.c &&
+    git add multiline.c &&
+    ( echo "line 1" &&
+      echo "line 2" &&
+      echo "line 3" &&
+      echo "line 4" ) | q_to_nul > multilineTxt.c &&
+    git add multilineTxt.c &&
+    git commit -q -m "multiline files" &&
+    git push gitcvs.git >/dev/null
 
-error 1 Conflicting roots specified
-ok 9 - req_Root failure (conflicting roots)
+To gitcvs.git
+   faca8d4..509c7f1  main -> main
+ok 9 - setup multi-line files
 
-expecting success of 9400.10 'req_Root (strict paths)': 
-	git-cvsserver --strict-paths pserver "$SERVERDIR" <request-anonymous >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 9401.10 'cvs co (guess)': 
+    GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr false &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
+    marked_as cvswork textfile.c "" &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes "" &&
+    marked_as cvswork mixedUp.c -kb &&
+    marked_as cvswork multiline.c -kb &&
+    marked_as cvswork multilineTxt.c "" &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h "" &&
+    marked_as cvswork/subdir unspecified.other "" &&
+    marked_as cvswork/subdir newfile.bin "" &&
+    marked_as cvswork/subdir newfile.c ""
 
-I LOVE YOU
-ok 10 - req_Root (strict paths)
+ok 10 - cvs co (guess)
 
-expecting success of 9400.11 'req_Root failure (strict-paths)': 
-	! git-cvsserver --strict-paths pserver "$WORKDIR" <request-anonymous >log 2>&1
+expecting success of 9401.11 'cvs co another copy (guess)': 
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
+    marked_as cvswork2 textfile.c "" &&
+    marked_as cvswork2 binfile.bin -kb &&
+    marked_as cvswork2 .gitattributes "" &&
+    marked_as cvswork2 mixedUp.c -kb &&
+    marked_as cvswork2 multiline.c -kb &&
+    marked_as cvswork2 multilineTxt.c "" &&
+    marked_as cvswork2/subdir withCr.bin -kb &&
+    marked_as cvswork2/subdir file.h "" &&
+    marked_as cvswork2/subdir unspecified.other "" &&
+    marked_as cvswork2/subdir newfile.bin "" &&
+    marked_as cvswork2/subdir newfile.c ""
 
-ok 11 - req_Root failure (strict-paths)
+ok 11 - cvs co another copy (guess)
 
-expecting success of 9400.12 'req_Root (w/o strict-paths)': 
-	git-cvsserver pserver "$WORKDIR/" <request-anonymous >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 9401.12 'cvs status - sticky options': 
+    check_status_options cvswork2 textfile.c "" &&
+    check_status_options cvswork2 binfile.bin -kb &&
+    check_status_options cvswork2 .gitattributes "" &&
+    check_status_options cvswork2 mixedUp.c -kb &&
+    check_status_options cvswork2 multiline.c -kb &&
+    check_status_options cvswork2 multilineTxt.c "" &&
+    check_status_options cvswork2/subdir withCr.bin -kb &&
+    check_status_options cvswork2 subdir/withCr.bin -kb &&
+    check_status_options cvswork2/subdir file.h "" &&
+    check_status_options cvswork2 subdir/file.h "" &&
+    check_status_options cvswork2/subdir unspecified.other "" &&
+    check_status_options cvswork2/subdir newfile.bin "" &&
+    check_status_options cvswork2/subdir newfile.c ""
 
-I LOVE YOU
-ok 12 - req_Root (w/o strict-paths)
+ok 12 - cvs status - sticky options
 
-expecting success of 9400.13 'req_Root failure (w/o strict-paths)': 
-	! git-cvsserver pserver "$WORKDIR/gitcvs" <request-anonymous >log 2>&1
+expecting success of 9401.13 'add text (guess)': 
+    (cd cvswork &&
+    echo "simpleText" > simpleText.c &&
+    GIT_CONFIG="$git_config" cvs -Q add simpleText.c
+    ) &&
+    marked_as cvswork simpleText.c ""
 
-ok 13 - req_Root failure (w/o strict-paths)
+cvs add: scheduling file `simpleText.c' for addition
+cvs add: use `cvs commit' to add this file permanently
+ok 13 - add text (guess)
 
-expecting success of 9400.14 'req_Root (base-path)': 
-	git-cvsserver --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" <request-base >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 9401.14 'add bin (guess)': 
+    (cd cvswork &&
+    echo "simpleBin: NUL: Q <- there" | q_to_nul > simpleBin.bin &&
+    GIT_CONFIG="$git_config" cvs -Q add simpleBin.bin
+    ) &&
+    marked_as cvswork simpleBin.bin -kb
 
-I LOVE YOU
-ok 14 - req_Root (base-path)
+cvs add: scheduling file `simpleBin.bin' for addition
+cvs add: use `cvs commit' to add this file permanently
+ok 14 - add bin (guess)
 
-expecting success of 9400.15 'req_Root failure (base-path)': 
-	! git-cvsserver --strict-paths --base-path "$WORKDIR" pserver "$SERVERDIR" <request-anonymous >log 2>&1
+expecting success of 9401.15 'remove files (guess)': 
+    (cd cvswork &&
+    GIT_CONFIG="$git_config" cvs -Q rm -f subdir/file.h &&
+    (cd subdir &&
+    GIT_CONFIG="$git_config" cvs -Q rm -f withCr.bin
+    )) &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h ""
 
-ok 15 - req_Root failure (base-path)
+cvs remove: scheduling `subdir/file.h' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+cvs remove: scheduling `subdir/withCr.bin' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+ok 15 - remove files (guess)
 
-expecting success of 9400.16 'req_Root (export-all)': 
-	git-cvsserver --export-all pserver "$WORKDIR" <request-anonymous >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 9401.16 'cvs ci (guess)': 
+    (cd cvswork &&
+    GIT_CONFIG="$git_config" cvs -Q ci -m "add/rm files" >cvs.log 2>&1
+    ) &&
+    marked_as cvswork textfile.c "" &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes "" &&
+    marked_as cvswork mixedUp.c -kb &&
+    marked_as cvswork multiline.c -kb &&
+    marked_as cvswork multilineTxt.c "" &&
+    not_present cvswork/subdir withCr.bin &&
+    not_present cvswork/subdir file.h &&
+    marked_as cvswork/subdir unspecified.other "" &&
+    marked_as cvswork/subdir newfile.bin "" &&
+    marked_as cvswork/subdir newfile.c "" &&
+    marked_as cvswork simpleBin.bin -kb &&
+    marked_as cvswork simpleText.c ""
 
-I LOVE YOU
-ok 16 - req_Root (export-all)
+ok 16 - cvs ci (guess)
 
-expecting success of 9400.17 'req_Root failure (export-all w/o directory list)': 
-	! (git-cvsserver --export-all pserver <request-anonymous >log 2>&1 || false)
-ok 17 - req_Root failure (export-all w/o directory list)
+expecting success of 9401.17 'update subdir of other copy (guess)': 
+    (cd cvswork2/subdir &&
+    GIT_CONFIG="$git_config" cvs -Q update
+    ) &&
+    marked_as cvswork2 textfile.c "" &&
+    marked_as cvswork2 binfile.bin -kb &&
+    marked_as cvswork2 .gitattributes "" &&
+    marked_as cvswork2 mixedUp.c -kb &&
+    marked_as cvswork2 multiline.c -kb &&
+    marked_as cvswork2 multilineTxt.c "" &&
+    not_present cvswork2/subdir withCr.bin &&
+    not_present cvswork2/subdir file.h &&
+    marked_as cvswork2/subdir unspecified.other "" &&
+    marked_as cvswork2/subdir newfile.bin "" &&
+    marked_as cvswork2/subdir newfile.c "" &&
+    not_present cvswork2 simpleBin.bin &&
+    not_present cvswork2 simpleText.c
 
-expecting success of 9400.18 'req_Root (everything together)': 
-	git-cvsserver --export-all --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" <request-base >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+cvs update: `subdir/file.h' is no longer in the repository
+cvs update: `subdir/withCr.bin' is no longer in the repository
+ok 17 - update subdir of other copy (guess)
 
-I LOVE YOU
-ok 18 - req_Root (everything together)
+expecting success of 9401.18 'update/merge full other copy (guess)': 
+    git pull gitcvs.git main &&
+    sed "s/3/replaced_3/" < multilineTxt.c > ml.temp &&
+    mv ml.temp multilineTxt.c &&
+    git add multilineTxt.c &&
+    git commit -q -m "modify multiline file" >> "${WORKDIR}/marked.log" &&
+    git push gitcvs.git >/dev/null &&
+    (cd cvswork2 &&
+    sed "s/1/replaced_1/" < multilineTxt.c > ml.temp &&
+    mv ml.temp multilineTxt.c &&
+    GIT_CONFIG="$git_config" cvs update > cvs.log 2>&1
+    ) &&
+    marked_as cvswork2 textfile.c "" &&
+    marked_as cvswork2 binfile.bin -kb &&
+    marked_as cvswork2 .gitattributes "" &&
+    marked_as cvswork2 mixedUp.c -kb &&
+    marked_as cvswork2 multiline.c -kb &&
+    marked_as cvswork2 multilineTxt.c "" &&
+    not_present cvswork2/subdir withCr.bin &&
+    not_present cvswork2/subdir file.h &&
+    marked_as cvswork2/subdir unspecified.other "" &&
+    marked_as cvswork2/subdir newfile.bin "" &&
+    marked_as cvswork2/subdir newfile.c "" &&
+    marked_as cvswork2 simpleBin.bin -kb &&
+    marked_as cvswork2 simpleText.c "" &&
+    echo "line replaced_1" > tmpExpect2 &&
+    echo "line 2" >> tmpExpect2 &&
+    echo "line replaced_3" >> tmpExpect2 &&
+    echo "line 4" | q_to_nul >> tmpExpect2 &&
+    cmp cvswork2/multilineTxt.c tmpExpect2
 
-expecting success of 9400.19 'gitcvs.enabled = false': GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
-   if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
-   then
-     echo unexpected cvs success
-     false
-   else
-     true
-   fi &&
-   grep "GITCVS emulation disabled" cvs.log &&
-   test ! -d cvswork2
-GITCVS emulation disabled
-ok 19 - gitcvs.enabled = false
+From gitcvs
+ * branch            main       -> FETCH_HEAD
+Updating 509c7f1..11562e1
+Fast-forward
+ simpleBin.bin     | Bin 0 -> 27 bytes
+ simpleText.c      |   1 +
+ subdir/file.h     |   1 -
+ subdir/withCr.bin |   1 -
+ 4 files changed, 1 insertion(+), 2 deletions(-)
+ create mode 100644 simpleBin.bin
+ create mode 100644 simpleText.c
+ delete mode 100644 subdir/file.h
+ delete mode 100644 subdir/withCr.bin
+To gitcvs.git
+   11562e1..e3c7165  main -> main
+ok 18 - update/merge full other copy (guess)
 
-expecting success of 9400.20 'gitcvs.ext.enabled = true': 
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
-	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
-	test_cmp cvswork cvswork2
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
+*** t9500-gitweb-standalone-no-errors.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9500-gitweb-standalone-no-errors/.git/
+expecting success of 9500.1 'no commits: projects_list (implicit)': gitweb_run
+ok 1 - no commits: projects_list (implicit)
 
-Common subdirectories: cvswork/CVS and cvswork2/CVS
-ok 20 - gitcvs.ext.enabled = true
+expecting success of 9500.2 'no commits: projects_index': gitweb_run "a=project_index"
+ok 2 - no commits: projects_index
 
-expecting success of 9400.21 'gitcvs.ext.enabled = false': 
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled false &&
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
-	if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
-	then
-		echo unexpected cvs success
-		false
-	else
-		true
-	fi &&
-	grep "GITCVS emulation disabled" cvs.log &&
-	test ! -d cvswork2
+expecting success of 9500.3 'no commits: .git summary (implicit)': gitweb_run "p=.git"
+ok 3 - no commits: .git summary (implicit)
 
-GITCVS emulation disabled
-ok 21 - gitcvs.ext.enabled = false
+expecting success of 9500.4 'no commits: .git commit (implicit HEAD)': gitweb_run "p=.git;a=commit"
+ok 4 - no commits: .git commit (implicit HEAD)
 
-expecting success of 9400.22 'gitcvs.dbname': 
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
-	GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs.%a.%m.sqlite &&
-	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
-	test_cmp cvswork cvswork2 &&
-	test -f "$SERVERDIR/gitcvs.ext.main.sqlite" &&
-	cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs.ext.main.sqlite"
+expecting success of 9500.5 'no commits: .git commitdiff (implicit HEAD)': gitweb_run "p=.git;a=commitdiff"
+ok 5 - no commits: .git commitdiff (implicit HEAD)
 
-Common subdirectories: cvswork/CVS and cvswork2/CVS
-ok 22 - gitcvs.dbname
+expecting success of 9500.6 'no commits: .git tree (implicit HEAD)': gitweb_run "p=.git;a=tree"
+ok 6 - no commits: .git tree (implicit HEAD)
 
-expecting success of 9400.23 'gitcvs.ext.dbname': 
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
-	GIT_DIR="$SERVERDIR" git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
-	GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
-	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
-	test_cmp cvswork cvswork2 &&
-	test -f "$SERVERDIR/gitcvs1.ext.main.sqlite" &&
-	test ! -f "$SERVERDIR/gitcvs2.ext.main.sqlite" &&
-	cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs1.ext.main.sqlite"
+expecting success of 9500.7 'no commits: .git heads': gitweb_run "p=.git;a=heads"
+ok 7 - no commits: .git heads
 
-Common subdirectories: cvswork/CVS and cvswork2/CVS
-ok 23 - gitcvs.ext.dbname
+expecting success of 9500.8 'no commits: .git tags': gitweb_run "p=.git;a=tags"
+ok 8 - no commits: .git tags
 
-expecting success of 9400.24 'cvs update (create new file)': 
-	echo testfile1 >testfile1 &&
-	git add testfile1 &&
-	git commit -q -m "Add testfile1" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.1/" &&
-	test_cmp testfile1 ../testfile1
+expecting success of 9500.9 'Make initial commit': echo "Not an empty file." >file &&
+	 git add file &&
+	 git commit -a -m "Initial commit." &&
+	 git branch b
+[main (root-commit) f6e1c08] Initial commit.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 9 - Make initial commit
 
-To gitcvs.git
-   4ea9390..3c6a419  main -> main
-U testfile1
-ok 24 - cvs update (create new file)
+expecting success of 9500.10 'projects_list (implicit)': gitweb_run
+ok 10 - projects_list (implicit)
 
-expecting success of 9400.25 'cvs update (update existing file)': 
-	echo line 2 >>testfile1 &&
-	git add testfile1 &&
-	git commit -q -m "Append to testfile1" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.2/" &&
-	test_cmp testfile1 ../testfile1
+expecting success of 9500.11 'projects_index': gitweb_run "a=project_index"
+ok 11 - projects_index
 
-To gitcvs.git
-   3c6a419..696e081  main -> main
-U testfile1
-ok 25 - cvs update (update existing file)
+expecting success of 9500.12 '.git summary (implicit)': gitweb_run "p=.git"
+ok 12 - .git summary (implicit)
 
-checking known breakage of 9400.26 'cvs update w/o -d doesn't create subdir (TODO)': 
-	mkdir test &&
-	echo >test/empty &&
-	git add test &&
-	git commit -q -m "Single Subdirectory" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test ! -d test
+expecting success of 9500.13 '.git commit (implicit HEAD)': gitweb_run "p=.git;a=commit"
+ok 13 - .git commit (implicit HEAD)
 
-To gitcvs.git
-   696e081..33879bd  main -> main
-U test/empty
-not ok 26 - cvs update w/o -d doesn't create subdir (TODO) # TODO known breakage
+expecting success of 9500.14 '.git commitdiff (implicit HEAD, root commit)': gitweb_run "p=.git;a=commitdiff"
+ok 14 - .git commitdiff (implicit HEAD, root commit)
 
-expecting success of 9400.27 'cvs update (subdirectories)': 
-	(for dir in A A/B A/B/C A/D E; do
-		mkdir $dir &&
-		echo "test file in $dir" >"$dir/file_in_$(echo $dir|sed -e "s#/# #g")"  &&
-		git add $dir || exit 1
-	done) &&
-	git commit -q -m "deep sub directory structure" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update -d &&
-	(for dir in A A/B A/B/C A/D E; do
-		filename="file_in_$(echo $dir|sed -e "s#/# #g")" &&
-		if test "$(echo $(grep -v ^D $dir/CVS/Entries|cut -d/ -f2,3,5))" = "$filename/1.1/" &&
-			test_cmp "$dir/$filename" "../$dir/$filename"; then
-		:
-		else
-			exit 1
-		fi
-	done)
+expecting success of 9500.15 '.git commitdiff_plain (implicit HEAD, root commit)': gitweb_run "p=.git;a=commitdiff_plain"
+ok 15 - .git commitdiff_plain (implicit HEAD, root commit)
 
-To gitcvs.git
-   33879bd..9436d83  main -> main
-U A/file_in_A
-U E/file_in_E
-U A/B/file_in_A B
-U A/D/file_in_A D
-U A/B/C/file_in_A B C
-ok 27 - cvs update (subdirectories)
+expecting success of 9500.16 '.git commit (HEAD)': gitweb_run "p=.git;a=commit;h=HEAD"
+ok 16 - .git commit (HEAD)
 
-expecting success of 9400.28 'cvs update (delete file)': 
-	git rm testfile1 &&
-	git commit -q -m "Remove testfile1" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test -z "$(grep testfile1 CVS/Entries)" &&
-	test ! -f testfile1
+expecting success of 9500.17 '.git tree (implicit HEAD)': gitweb_run "p=.git;a=tree"
+ok 17 - .git tree (implicit HEAD)
 
-rm 'testfile1'
-To gitcvs.git
-   9436d83..09366c6  main -> main
-cvs update: `testfile1' is no longer in the repository
-ok 28 - cvs update (delete file)
+expecting success of 9500.18 '.git blob (file)': gitweb_run "p=.git;a=blob;f=file"
+ok 18 - .git blob (file)
 
-expecting success of 9400.29 'cvs update (re-add deleted file)': 
-	echo readded testfile >testfile1 &&
-	git add testfile1 &&
-	git commit -q -m "Re-Add testfile1" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.4/" &&
-	test_cmp testfile1 ../testfile1
+expecting success of 9500.19 '.git blob_plain (file)': gitweb_run "p=.git;a=blob_plain;f=file"
+ok 19 - .git blob_plain (file)
 
-To gitcvs.git
-   09366c6..8ea0549  main -> main
-U testfile1
-ok 29 - cvs update (re-add deleted file)
+expecting success of 9500.20 '.git commit (non-existent)': gitweb_run "p=.git;a=commit;h=non-existent"
+ok 20 - .git commit (non-existent)
 
-expecting success of 9400.30 'cvs update (merge)': 
-	echo Line 0 >expected &&
-	for i in 1 2 3 4 5 6 7
-	do
-		echo Line $i >>merge &&
-		echo Line $i >>expected || return 1
-	done &&
-	echo Line 8 >>expected &&
-	git add merge &&
-	git commit -q -m "Merge test (pre-merge)" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test "$(echo $(grep merge CVS/Entries|cut -d/ -f2,3,5))" = "merge/1.1/" &&
-	test_cmp merge ../merge &&
-	( echo Line 0 && cat merge ) >merge.tmp &&
-	mv merge.tmp merge &&
-	cd "$WORKDIR" &&
-	echo Line 8 >>merge &&
-	git add merge &&
-	git commit -q -m "Merge test (merge)" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	sleep 1 && touch merge &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test_cmp merge ../expected
+expecting success of 9500.21 '.git commitdiff (non-existent)': gitweb_run "p=.git;a=commitdiff;h=non-existent"
+ok 21 - .git commitdiff (non-existent)
 
-To gitcvs.git
-   8ea0549..f31ee25  main -> main
-U merge
-To gitcvs.git
-   f31ee25..792463d  main -> main
-Merging differences between 1.1 and 1.2 into merge
-M merge
-ok 30 - cvs update (merge)
+expecting success of 9500.22 '.git commitdiff (non-existent vs HEAD)': gitweb_run "p=.git;a=commitdiff;hp=non-existent;h=HEAD"
+ok 22 - .git commitdiff (non-existent vs HEAD)
 
-expecting success of 9400.31 'cvs update (conflict merge)': 
-	( echo LINE 0 && cat merge ) >merge.tmp &&
-	mv merge.tmp merge &&
-	git add merge &&
-	git commit -q -m "Merge test (conflict)" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test_cmp merge ../expected.C
+expecting success of 9500.23 '.git tree (0000000000000000000000000000000000000000)': gitweb_run "p=.git;a=tree;h=0000000000000000000000000000000000000000"
+ok 23 - .git tree (0000000000000000000000000000000000000000)
 
-To gitcvs.git
-   792463d..ba02484  main -> main
-Merging differences between 1.2 and 1.3 into merge
-cvs update: conflicts found in merge
-C merge
-ok 31 - cvs update (conflict merge)
+expecting success of 9500.24 '.git tag (0000000000000000000000000000000000000000)': gitweb_run "p=.git;a=tag;h=0000000000000000000000000000000000000000"
+ok 24 - .git tag (0000000000000000000000000000000000000000)
 
-expecting success of 9400.32 'cvs update (-C)': 
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update -C &&
-	test_cmp merge ../merge
+expecting success of 9500.25 '.git blob (non-existent)': gitweb_run "p=.git;a=blob;f=non-existent"
+ok 25 - .git blob (non-existent)
 
-U empty
-U merge
-U secondrootfile
-U testfile1
-U A/file_in_A
-U E/file_in_E
-U test/empty
-U A/B/file_in_A B
-U A/D/file_in_A D
-U A/B/C/file_in_A B C
-ok 32 - cvs update (-C)
+expecting success of 9500.26 '.git blob_plain (non-existent)': gitweb_run "p=.git;a=blob_plain;f=non-existent"
+ok 26 - .git blob_plain (non-existent)
 
-expecting success of 9400.33 'cvs update (merge no-op)': 
-	echo Line 9 >>merge &&
-	cp merge cvswork/merge &&
-	git add merge &&
-	git commit -q -m "Merge test (no-op)" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	sleep 1 && touch merge &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test_cmp merge ../merge
+expecting success of 9500.27 'commitdiff(0): root': gitweb_run "p=.git;a=commitdiff"
+ok 27 - commitdiff(0): root
 
-To gitcvs.git
-   ba02484..2f86a26  main -> main
-Merging differences between 1.3 and 1.4 into merge
-M merge
-ok 33 - cvs update (merge no-op)
+expecting success of 9500.28 'commitdiff(0): file added': echo "New file" >new_file &&
+	 git add new_file &&
+	 git commit -a -m "File added." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main aef3daf] File added.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new_file
+ok 28 - commitdiff(0): file added
 
-expecting success of 9400.34 'cvs update (-p)': 
-	touch really-empty &&
-	echo Line 1 > no-lf &&
-	printf "Line 2" >> no-lf &&
-	git add really-empty no-lf &&
-	git commit -q -m "Update -p test" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs update &&
-	for i in merge no-lf empty really-empty; do
-		GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out &&
-		test_cmp $i.out ../$i || return 1
-	done
+expecting success of 9500.29 'commitdiff(0): mode change': test_chmod +x new_file &&
+	 git commit -a -m "Mode changed." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main 4d63074] Mode changed.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 new_file
+ok 29 - commitdiff(0): mode change
 
-To gitcvs.git
-   2f86a26..9cef819  main -> main
-cvs update: Updating .
-M merge
-U no-lf
-U really-empty
-cvs update: Updating A
-cvs update: Updating E
-cvs update: Updating test
-cvs update: Updating A/B
-cvs update: Updating A/D
-cvs update: Updating A/B/C
-ok 34 - cvs update (-p)
+expecting success of 9500.30 'commitdiff(0): file renamed': git mv new_file renamed_file &&
+	 git commit -a -m "File renamed." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main c3af6e3] File renamed.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename new_file => renamed_file (100%)
+ok 30 - commitdiff(0): file renamed
 
-expecting success of 9400.35 'cvs update (module list supports packed refs)': 
-	GIT_DIR="$SERVERDIR" git pack-refs --all &&
-	GIT_CONFIG="$git_config" cvs -n up -d 2> out &&
-	grep "cvs update: New directory \`main'" < out
+expecting success of 9500.31 'commitdiff(0): file to symlink': rm renamed_file &&
+	 test_ln_s_add file renamed_file &&
+	 git commit -a -m "File to symlink." &&
+	 gitweb_run "p=.git;a=commitdiff"
+checking prerequisite: SYMLINKS
 
-cvs update: New directory `main'
-ok 35 - cvs update (module list supports packed refs)
+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 9400.36 'cvs status': 
-	mkdir status.dir &&
-	echo Line > status.dir/status.file &&
-	echo Line > status.file &&
-	git add status.dir status.file &&
-	git commit -q -m "Status test" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs update &&
-	GIT_CONFIG="$git_config" cvs status | grep "^File: status.file" >../out &&
-	test_line_count = 2 ../out
+)
+prerequisite SYMLINKS ok
+[main 9d683f7] File to symlink.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 100755 => 120000 renamed_file
+ok 31 - commitdiff(0): file to symlink
 
-To gitcvs.git
-   9cef819..590c22f  main -> main
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1312.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1312.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1312.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.51.0/git-cvsserver line 1312.
-cvs update: Updating .
-cvs update: `empty.out' is no longer in the repository
-M merge
-cvs update: `merge.out' is no longer in the repository
-cvs update: `no-lf.out' is no longer in the repository
-cvs update: `really-empty.out' is no longer in the repository
-U status.file
-cvs update: Updating A
-cvs update: Updating E
-cvs update: Updating status.dir
-U status.dir/status.file
-cvs update: Updating test
-cvs update: Updating A/B
-cvs update: Updating A/D
-cvs update: Updating A/B/C
-ok 36 - cvs status
+expecting success of 9500.32 'commitdiff(0): file deleted': git rm renamed_file &&
+	 rm -f renamed_file &&
+	 git commit -a -m "File removed." &&
+	 gitweb_run "p=.git;a=commitdiff"
+rm 'renamed_file'
+[main a32c3dd] File removed.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 120000 renamed_file
+ok 32 - commitdiff(0): file deleted
 
-expecting success of 9400.37 'cvs status (nonrecursive)': 
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs status -l | grep "^File: status.file" >../out &&
-	test_line_count = 1 ../out
+expecting success of 9500.33 'commitdiff(0): file copied / new file': cp file file2 &&
+	 git add file2 &&
+	 git commit -a -m "File copied." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main 13afdf6] File copied.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+ok 33 - commitdiff(0): file copied / new file
 
-ok 37 - cvs status (nonrecursive)
+expecting success of 9500.34 'commitdiff(0): mode change and modified': echo "New line" >>file2 &&
+	 test_chmod +x file2 &&
+	 git commit -a -m "Mode change and modification." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main b2fe804] Mode change and modification.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ mode change 100644 => 100755 file2
+ok 34 - commitdiff(0): mode change and modified
 
-expecting success of 9400.38 'cvs status (no subdirs in header)': 
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs status | grep ^File: >../out &&
-	! grep / <../out
+expecting success of 9500.35 'commitdiff(0): renamed and modified': cat >file2<<EOF &&
+Dominus regit me,
+et nihil mihi deerit.
+In loco pascuae ibi me collocavit,
+super aquam refectionis educavit me;
+animam meam convertit,
+deduxit me super semitas jusitiae,
+propter nomen suum.
+EOF
+	 git commit -a -m "File added." &&
+	 git mv file2 file3 &&
+	 echo "Propter nomen suum." >>file3 &&
+	 git commit -a -m "File rename and modification." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main ce1348f] File added.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+[main 763e503] File rename and modification.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename file2 => file3 (90%)
+ok 35 - commitdiff(0): renamed and modified
 
-ok 38 - cvs status (no subdirs in header)
+expecting success of 9500.36 'commitdiff(0): renamed, mode change and modified': git mv file3 file2 &&
+	 echo "Propter nomen suum." >>file2 &&
+	 test_chmod +x file2 &&
+	 git commit -a -m "File rename, mode change and modification." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main 54200a9] File rename, mode change and modification.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename file3 => file2 (91%)
+ok 36 - commitdiff(0): renamed, mode change and modified
 
-expecting success of 9400.39 'cvs co -c (shows module database)': 
-	GIT_CONFIG="$git_config" cvs co -c > out &&
-	grep "^main[	 ][ 	]*main$" <out &&
-	! grep -v "^main[	 ][ 	]*main$" <out
+expecting success of 9500.37 'setup typechange 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 &&
+	rm -f foo &&
+	echo "how far is the sun?" >foo &&
+	git update-index foo &&
+	git commit -m "foo back to file" &&
+	git branch foo-back-to-file &&
+	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
+	
+[main 1c15952] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 bar
+ create mode 100644 foo
+[main fc2bb47] foo symlinked to bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 100644 => 120000 foo
+[main 4ac81f8] foo back to file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 120000 => 100644 foo
+[main e02950a] foo becomes a directory
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo
+ create mode 100644 foo/baz
+[main 758ecec] foo/baz is the original foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 37 - setup typechange commits
 
-main	main
-ok 39 - cvs co -c (shows module database)
+expecting success of 9500.38 'commitdiff(2): file renamed from foo to foo/baz': gitweb_run "p=.git;a=commitdiff;hp=initial;h=foo-baz-renamed-from-foo"
+ok 38 - commitdiff(2): file renamed from foo to foo/baz
 
-expecting success of 9400.40 'cvs log': 
-	cd cvswork &&
-	test x"$expectStat" = x"0" &&
-	GIT_CONFIG="$git_config" cvs log merge >../out &&
-sed -e "s%2[0-9][0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9]%__DATE__%" ../out > ../actual &&
-	test_cmp ../expect ../actual
+expecting success of 9500.39 'commitdiff(2): file renamed from foo/baz to foo': gitweb_run "p=.git;a=commitdiff;hp=foo-baz-renamed-from-foo;h=initial"
+ok 39 - commitdiff(2): file renamed from foo/baz to foo
 
-ok 40 - cvs log
+expecting success of 9500.40 'commitdiff(2): directory becomes file': gitweb_run "p=.git;a=commitdiff;hp=foo-becomes-a-directory;h=initial"
+ok 40 - commitdiff(2): directory becomes file
 
-expecting success of 9400.41 'cvs annotate': 
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs annotate merge >../out &&
-	sed -e "s/ .*//" ../out >../actual &&
-	printf "1.%d\n" 3 1 1 1 1 1 1 1 2 4 >../expect &&
-	test_cmp ../expect ../actual
+expecting success of 9500.41 'commitdiff(2): file becomes directory': gitweb_run "p=.git;a=commitdiff;hp=initial;h=foo-becomes-a-directory"
+ok 41 - commitdiff(2): file becomes directory
 
-Annotations for merge
-***************
-ok 41 - cvs annotate
+expecting success of 9500.42 'commitdiff(2): file becomes symlink': gitweb_run "p=.git;a=commitdiff;hp=initial;h=foo-symlinked-to-bar"
+ok 42 - commitdiff(2): file becomes symlink
 
-expecting success of 9400.42 'create remote-cvs helper': 
-	write_script remote-cvs <<-\EOF
-	exec git shell -c "cvs server"
+expecting success of 9500.43 'commitdiff(2): symlink becomes file': gitweb_run "p=.git;a=commitdiff;hp=foo-symlinked-to-bar;h=foo-back-to-file"
+ok 43 - commitdiff(2): symlink becomes file
+
+expecting success of 9500.44 'commitdiff(2): symlink becomes directory': gitweb_run "p=.git;a=commitdiff;hp=foo-symlinked-to-bar;h=foo-becomes-a-directory"
+ok 44 - commitdiff(2): symlink becomes directory
+
+expecting success of 9500.45 'commitdiff(2): directory becomes symlink': gitweb_run "p=.git;a=commitdiff;hp=foo-becomes-a-directory;h=foo-symlinked-to-bar"
+ok 45 - commitdiff(2): directory becomes symlink
+
+expecting success of 9500.46 'setup incomplete lines': 
+	cat >file<<-\EOF &&
+	Dominus regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	CHANGE_ME
 	EOF
+	git commit -a -m "Preparing for incomplete lines" &&
+	echo "incomplete" | tr -d "\\012" >>file &&
+	git commit -a -m "Add incomplete line" &&
+	git tag incomplete_lines_add &&
+	sed -e s/CHANGE_ME/change_me/ <file >file+ &&
+	mv -f file+ file &&
+	git commit -a -m "Incomplete context line" &&
+	git tag incomplete_lines_ctx &&
+	echo "Dominus regit me," >file &&
+	echo "incomplete line" | tr -d "\\012" >>file &&
+	git commit -a -m "Change incomplete line" &&
+	git tag incomplete_lines_chg &&
+	echo "Dominus regit me," >file &&
+	git commit -a -m "Remove incomplete line" &&
+	git tag incomplete_lines_rem
 
-ok 42 - create remote-cvs helper
+[main 726d325] Preparing for incomplete lines
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+[main 5ece9db] Add incomplete line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 7182367] Incomplete context line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 19ad71b] Change incomplete line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+[main 08fef32] Remove incomplete line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ok 46 - setup incomplete lines
 
-expecting success of 9400.43 'cvs server does not run with vanilla git-shell': 
-	(
-		cd cvswork &&
-		CVS_SERVER=$WORKDIR/remote-cvs &&
-		export CVS_SERVER &&
-		! cvs log merge
-	)
+expecting success of 9500.47 'commitdiff(1): addition of incomplete line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_add"
 
-fatal: unrecognized command 'cvs server'
-cvs [log aborted]: end of file from server (consult above messages if any)
-ok 43 - cvs server does not run with vanilla git-shell
+ok 47 - commitdiff(1): addition of incomplete line
 
-expecting success of 9400.44 'configure git shell to run cvs server': 
-	mkdir "$HOME"/git-shell-commands &&
+expecting success of 9500.48 'commitdiff(1): incomplete line as context line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_ctx"
 
-	write_script "$HOME"/git-shell-commands/cvs <<-\EOF &&
-	if ! test $# = 1 && test "$1" = "server"
+ok 48 - commitdiff(1): incomplete line as context line
+
+expecting success of 9500.49 'commitdiff(1): change incomplete line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_chg"
+
+ok 49 - commitdiff(1): change incomplete line
+
+expecting success of 9500.50 'commitdiff(1): removal of incomplete line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_rem"
+
+ok 50 - commitdiff(1): removal of incomplete line
+
+expecting success of 9500.51 'Create a merge': git checkout b &&
+	 echo "Branch" >>b &&
+	 git add b &&
+	 git commit -a -m "On branch" &&
+	 git checkout main &&
+	 git merge b &&
+	 git tag merge_commit
+Switched to branch 'b'
+[b 3f8100f] On branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ b | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+ok 51 - Create a merge
+
+expecting success of 9500.52 'commit(0): merge commit': gitweb_run "p=.git;a=commit"
+ok 52 - commit(0): merge commit
+
+expecting success of 9500.53 'commitdiff(0): merge commit': gitweb_run "p=.git;a=commitdiff"
+ok 53 - commitdiff(0): merge commit
+
+expecting success of 9500.54 'Prepare large commit': git checkout b &&
+	 echo "To be changed" >01-change &&
+	 echo "To be renamed" >02-pure-rename-from &&
+	 echo "To be deleted" >03-delete &&
+	 echo "To be renamed and changed" >04-rename-from &&
+	 echo "To have mode changed" >05-mode-change &&
+	 echo "File to symlink" >06-file-or-symlink &&
+	 echo "To be changed and have mode changed" >07-change-mode-change &&
+	 git add 0* &&
+	 git commit -a -m "Prepare large commit" &&
+	 echo "Changed" >01-change &&
+	 git mv 02-pure-rename-from 02-pure-rename-to &&
+	 git rm 03-delete && rm -f 03-delete &&
+	 echo "A new file" >03-new &&
+	 git add 03-new &&
+	 git mv 04-rename-from 04-rename-to &&
+	 echo "Changed" >>04-rename-to &&
+	 test_chmod +x 05-mode-change &&
+	 rm -f 06-file-or-symlink &&
+	 test_ln_s_add 01-change 06-file-or-symlink &&
+	 echo "Changed and have mode changed" >07-change-mode-change &&
+	 test_chmod +x 07-change-mode-change &&
+	 git commit -a -m "Large commit" &&
+	 git checkout main
+Switched to branch 'b'
+[b 42d1b13] Prepare large commit
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+)
+ create mode 100644 01-change
+ create mode 100644 02-pure-rename-from
+ create mode 100644 03-delete
+ create mode 100644 04-rename-from
+ create mode 100644 05-mode-change
+ create mode 100644 06-file-or-symlink
+ create mode 100644 07-change-mode-change
+rm '03-delete'
+[b a99c658] Large commit
+ Author: A U Thor <author@example.com>
+ 8 files changed, 5 insertions(+), 4 deletions(-)
+ rename 02-pure-rename-from => 02-pure-rename-to (100%)
+ delete mode 100644 03-delete
+ create mode 100644 03-new
+ rename 04-rename-from => 04-rename-to (76%)
+ mode change 100644 => 100755 05-mode-change
+ mode change 100644 => 120000 06-file-or-symlink
+ mode change 100644 => 100755 07-change-mode-change
+Switched to branch 'main'
+ok 54 - Prepare large commit
+
+expecting success of 9500.55 'commit(1): large commit': gitweb_run "p=.git;a=commit;h=b"
+ok 55 - commit(1): large commit
+
+expecting success of 9500.56 'commitdiff(1): large commit': gitweb_run "p=.git;a=commitdiff;h=b"
+ok 56 - commitdiff(1): large commit
+
+expecting success of 9500.57 'side-by-side: addition of incomplete line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_add;ds=sidebyside"
+
+ok 57 - side-by-side: addition of incomplete line
+
+expecting success of 9500.58 'side-by-side: incomplete line as context line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_ctx;ds=sidebyside"
+
+ok 58 - side-by-side: incomplete line as context line
+
+expecting success of 9500.59 'side-by-side: changed incomplete line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_chg;ds=sidebyside"
+
+ok 59 - side-by-side: changed incomplete line
+
+expecting success of 9500.60 'side-by-side: removal of incomplete line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_rem;ds=sidebyside"
+
+ok 60 - side-by-side: removal of incomplete line
+
+expecting success of 9500.61 'side-by-side: merge commit': 
+	gitweb_run "p=.git;a=commitdiff;h=merge_commit;ds=sidebyside"
+
+ok 61 - side-by-side: merge commit
+
+expecting success of 9500.62 'tags: list of different types of tags': git checkout main &&
+	 git tag -a -m "Tag commit object" tag-commit HEAD &&
+	 git tag -a -m "" tag-commit-nomessage HEAD &&
+	 git tag -a -m "Tag tag object" tag-tag tag-commit &&
+	 git tag -a -m "Tag tree object" tag-tree HEAD^{tree} &&
+	 git tag -a -m "Tag blob object" tag-blob HEAD:file &&
+	 git tag lightweight/tag-commit HEAD &&
+	 git tag lightweight/tag-tag tag-commit &&
+	 git tag lightweight/tag-tree HEAD^{tree} &&
+	 git tag lightweight/tag-blob HEAD:file &&
+	 gitweb_run "p=.git;a=tags"
+Already on '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-tag tag-commit^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+ok 62 - tags: list of different types of tags
+
+expecting success of 9500.63 'tag: Tag to commit object': gitweb_run "p=.git;a=tag;h=tag-commit"
+ok 63 - tag: Tag to commit object
+
+expecting success of 9500.64 'tag: on lightweight tag (invalid)': gitweb_run "p=.git;a=tag;h=lightweight/tag-commit"
+ok 64 - tag: on lightweight tag (invalid)
+
+expecting success of 9500.65 'logs: log (implicit HEAD)': gitweb_run "p=.git;a=log"
+ok 65 - logs: log (implicit HEAD)
+
+expecting success of 9500.66 'logs: shortlog (implicit HEAD)': gitweb_run "p=.git;a=shortlog"
+ok 66 - logs: shortlog (implicit HEAD)
+
+expecting success of 9500.67 'logs: history (implicit HEAD, file)': gitweb_run "p=.git;a=history;f=file"
+ok 67 - logs: history (implicit HEAD, file)
+
+expecting success of 9500.68 'logs: history (implicit HEAD, non-existent file)': gitweb_run "p=.git;a=history;f=non-existent"
+ok 68 - logs: history (implicit HEAD, non-existent file)
+
+expecting success of 9500.69 'logs: history (implicit HEAD, deleted file)': git checkout main &&
+	 echo "to be deleted" >deleted_file &&
+	 git add deleted_file &&
+	 git commit -m "Add file to be deleted" &&
+	 git rm deleted_file &&
+	 git commit -m "Delete file" &&
+	 gitweb_run "p=.git;a=history;f=deleted_file"
+Already on 'main'
+[main 0b30cc4] Add file to be deleted
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 deleted_file
+rm 'deleted_file'
+[main 07aeaf6] Delete file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 deleted_file
+ok 69 - logs: history (implicit HEAD, deleted file)
+
+expecting success of 9500.70 'path_info: project': gitweb_run "" "/.git"
+ok 70 - path_info: project
+
+expecting success of 9500.71 'path_info: project/branch': gitweb_run "" "/.git/b"
+ok 71 - path_info: project/branch
+
+expecting success of 9500.72 'path_info: project/branch:file': gitweb_run "" "/.git/main:file"
+ok 72 - path_info: project/branch:file
+
+expecting success of 9500.73 'path_info: project/branch:dir/': gitweb_run "" "/.git/main:foo/"
+ok 73 - path_info: project/branch:dir/
+
+expecting success of 9500.74 'path_info: project/branch (non-existent)': gitweb_run "" "/.git/non-existent"
+ok 74 - path_info: project/branch (non-existent)
+
+expecting success of 9500.75 'path_info: project/branch:filename (non-existent branch)': gitweb_run "" "/.git/non-existent:non-existent"
+ok 75 - path_info: project/branch:filename (non-existent branch)
+
+expecting success of 9500.76 'path_info: project/branch:file (non-existent)': gitweb_run "" "/.git/main:non-existent"
+ok 76 - path_info: project/branch:file (non-existent)
+
+expecting success of 9500.77 'path_info: project/branch:dir/ (non-existent)': gitweb_run "" "/.git/main:non-existent/"
+ok 77 - path_info: project/branch:dir/ (non-existent)
+
+expecting success of 9500.78 'path_info: project/branch:/file': gitweb_run "" "/.git/main:/file"
+ok 78 - path_info: project/branch:/file
+
+expecting success of 9500.79 'path_info: project/:/file (implicit HEAD)': gitweb_run "" "/.git/:/file"
+ok 79 - path_info: project/:/file (implicit HEAD)
+
+expecting success of 9500.80 'path_info: project/:/ (implicit HEAD, top tree)': gitweb_run "" "/.git/:/"
+ok 80 - path_info: project/:/ (implicit HEAD, top tree)
+
+expecting success of 9500.81 'feeds: OPML': gitweb_run "a=opml"
+ok 81 - feeds: OPML
+
+expecting success of 9500.82 'feed: RSS': gitweb_run "p=.git;a=rss"
+ok 82 - feed: RSS
+
+expecting success of 9500.83 'feed: Atom': gitweb_run "p=.git;a=atom"
+ok 83 - feed: Atom
+
+expecting success of 9500.84 'encode(commit): utf8': . "$TEST_DIRECTORY"/t3901/utf8.txt &&
+	 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
+	 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
+	 echo "UTF-8" >>file &&
+	 git add file &&
+	 git commit -F "$TEST_DIRECTORY"/t3900/1-UTF-8.txt &&
+	 gitweb_run "p=.git;a=commit"
+[main 18589a2] ÄËÑ�Ö
+ Author: �éí óú <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 84 - encode(commit): utf8
+
+expecting success of 9500.85 'encode(commit): iso-8859-1': . "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+	 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
+	 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
+	 echo "ISO-8859-1" >>file &&
+	 git add file &&
+	 test_config i18n.commitencoding ISO-8859-1 &&
+	 git commit -F "$TEST_DIRECTORY"/t3900/ISO8859-1.txt &&
+	 gitweb_run "p=.git;a=commit"
+[main c6c3c80] ÄËÑ�Ö
+ Author: Áéí óú <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 85 - encode(commit): iso-8859-1
+
+expecting success of 9500.86 'encode(log): utf-8 and iso-8859-1': gitweb_run "p=.git;a=log"
+ok 86 - encode(log): utf-8 and iso-8859-1
+
+expecting success of 9500.87 'opt: log --no-merges': gitweb_run "p=.git;a=log;opt=--no-merges"
+ok 87 - opt: log --no-merges
+
+expecting success of 9500.88 'opt: atom --no-merges': gitweb_run "p=.git;a=log;opt=--no-merges"
+ok 88 - opt: atom --no-merges
+
+expecting success of 9500.89 'opt: "file" history --no-merges': gitweb_run "p=.git;a=history;f=file;opt=--no-merges"
+ok 89 - opt: "file" history --no-merges
+
+expecting success of 9500.90 'opt: log --no-such-option (invalid option)': gitweb_run "p=.git;a=log;opt=--no-such-option"
+ok 90 - opt: log --no-such-option (invalid option)
+
+expecting success of 9500.91 'opt: tree --no-merges (invalid option for action)': gitweb_run "p=.git;a=tree;opt=--no-merges"
+ok 91 - opt: tree --no-merges (invalid option for action)
+
+expecting success of 9500.92 'URL: no project URLs, no base URL': gitweb_run "p=.git;a=summary"
+ok 92 - URL: no project URLs, no base URL
+
+expecting success of 9500.93 'URL: project URLs via gitweb.url': git config --add gitweb.url git://example.com/git/trash.git &&
+        git config --add gitweb.url http://example.com/git/trash.git &&
+        gitweb_run "p=.git;a=summary"
+ok 93 - URL: project URLs via gitweb.url
+
+expecting success of 9500.94 'URL: project URLs via cloneurl file': gitweb_run "p=.git;a=summary"
+ok 94 - URL: project URLs via cloneurl file
+
+expecting success of 9500.95 'config override: projects list (implicit)': gitweb_run
+ok 95 - config override: projects list (implicit)
+
+expecting success of 9500.96 'config override: tree view, features not overridden in repo config': gitweb_run "p=.git;a=tree"
+ok 96 - config override: tree view, features not overridden in repo config
+
+expecting success of 9500.97 'config override: tree view, features disabled in repo config': git config gitweb.blame no &&
+	 git config gitweb.snapshot none &&
+	 git config gitweb.avatar gravatar &&
+	 gitweb_run "p=.git;a=tree"
+ok 97 - config override: tree view, features disabled in repo config
+
+expecting success of 9500.98 'config override: tree view, features enabled in repo config (1)': git config gitweb.blame yes &&
+	 git config gitweb.snapshot "zip,tgz, tbz2" &&
+	 gitweb_run "p=.git;a=tree"
+ok 98 - config override: tree view, features enabled in repo config (1)
+
+expecting success of 9500.99 'setup': 
+	version=$(git config core.repositoryformatversion) &&
+	algo=$(test_might_fail git config extensions.objectformat) &&
+	refstorage=$(test_might_fail git config extensions.refstorage) &&
+	cat >.git/config <<-\EOF &&
+	# testing noval and alternate separator
+	[gitweb]
+		blame
+		snapshot = zip tgz
+	EOF
+	git config core.repositoryformatversion "$version" &&
+	if test -n "$algo"
 	then
-		echo >&2 "git-cvsserver only handles \"server\""
-		exit 1
+		git config extensions.objectformat "$algo"
+	fi &&
+	if test -n "$refstorage"
+	then
+		git config extensions.refstorage "$refstorage"
 	fi
-	exec git cvsserver server
-	EOF
 
-	# Should not be used, but part of the recommended setup
-	write_script "$HOME"/git-shell-commands/no-interactive-login <<-\EOF
-	echo Interactive login forbidden
+ok 99 - setup
+
+expecting success of 9500.100 'config override: tree view, features enabled in repo config (2)': gitweb_run "p=.git;a=tree"
+ok 100 - config override: tree view, features enabled in repo config (2)
+
+expecting success of 9500.101 'search: preparation': echo "1st MATCH" >>file &&
+	 echo "2nd MATCH" >>file &&
+	 echo "MATCH" >>bar &&
+	 git add file bar &&
+	 git commit -m "Added MATCH word"
+[main 13113e4] Added MATCH word
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+)
+ok 101 - search: preparation
+
+expecting success of 9500.102 'search: commit author': gitweb_run "p=.git;a=search;h=HEAD;st=author;s=A+U+Thor"
+ok 102 - search: commit author
+
+expecting success of 9500.103 'search: commit message': gitweb_run "p=.git;a=search;h=HEAD;st=commitr;s=MATCH"
+ok 103 - search: commit message
+
+expecting success of 9500.104 'search: grep': gitweb_run "p=.git;a=search;h=HEAD;st=grep;s=MATCH"
+ok 104 - search: grep
+
+expecting success of 9500.105 'search: pickaxe': gitweb_run "p=.git;a=search;h=HEAD;st=pickaxe;s=MATCH"
+ok 105 - search: pickaxe
+
+expecting success of 9500.106 'search: projects': gitweb_run "a=project_list;s=.git"
+ok 106 - search: projects
+
+expecting success of 9500.107 'README.html with non-ASCII characters (utf-8)': echo "<b>UTF-8 example:</b><br />" >.git/README.html &&
+	 cat "$TEST_DIRECTORY"/t3900/1-UTF-8.txt >>.git/README.html &&
+	 gitweb_run "p=.git;a=summary"
+ok 107 - README.html with non-ASCII characters (utf-8)
+
+expecting success of 9500.108 'HIGHLIGHT': 
+	cat >>gitweb_config.perl <<-\EOF
+	our $highlight_bin = "highlight";
+	$feature{"highlight"}{"override"} = 1;
 	EOF
 
-ok 44 - configure git shell to run cvs server
+ok 108 - HIGHLIGHT
 
-expecting success of 9400.45 'cvs server can run with recommended config': 
-	(
-		cd cvswork &&
-		CVS_SERVER=$WORKDIR/remote-cvs &&
-		export CVS_SERVER &&
-		cvs log merge
-	)
+checking prerequisite: HIGHLIGHT
 
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-HIGHLIGHT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-HIGHLIGHT" &&
+	highlight_version=$(highlight --version </dev/null 2>/dev/null) &&
+	test -n "$highlight_version"
 
-RCS file: /build/reproducible-path/git-2.51.0/t/trash directory.t9400-git-cvsserver-server/gitcvs.git/main/merge,v
-Working file: merge
-head: 1.4
-branch:
-locks: strict
-access list:
-symbolic names:
-keyword substitution: kv
-total revisions: 4;	selected revisions: 4
-description:
-----------------------------
-revision 1.4
-date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+)
+prerequisite HIGHLIGHT not satisfied
+ok 109 # skip syntax highlighting (no highlight, unknown syntax) (missing HIGHLIGHT)
 
-Merge test (no-op)
- 
-----------------------------
-revision 1.3
-date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+ok 110 # skip syntax highlighting (highlighted, shell script) (missing HIGHLIGHT)
 
-Merge test (conflict)
- 
-----------------------------
-revision 1.2
-date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+ok 111 # skip syntax highlighting (highlighter language autodetection) (missing HIGHLIGHT)
 
-Merge test (merge)
- 
-----------------------------
-revision 1.1
-date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+expecting success of 9500.112 'forks: prepare': git init --bare foo.git &&
+	 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 &&
+	 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.51.0/t/trash directory.t9500-gitweb-standalone-no-errors/foo.git/
+[main (root-commit) cae743e] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 file
+Cloning into bare repository 'foo-forked.git'...
+done.
+ok 112 - forks: prepare
 
-Merge test (pre-merge)
- 
-=============================================================================
-ok 45 - cvs server can run with recommended config
+expecting success of 9500.113 'forks: projects list': gitweb_run
+ok 113 - forks: projects list
 
-# still have 1 known breakage(s)
-# passed all remaining 44 test(s)
-1..45
+expecting success of 9500.114 'forks: forks action': gitweb_run "p=foo.git;a=forks"
+ok 114 - forks: forks action
+
+expecting success of 9500.115 'ctags: tag cloud in projects list': mkdir .git/ctags &&
+	 echo "2" >.git/ctags/foo &&
+	 echo "1" >.git/ctags/bar &&
+	gitweb_run
+ok 115 - ctags: tag cloud in projects list
+
+expecting success of 9500.116 'ctags: search projects by existing tag': gitweb_run "by_tag=foo"
+ok 116 - ctags: search projects by existing tag
+
+expecting success of 9500.117 'ctags: search projects by non existent tag': gitweb_run "by_tag=non-existent"
+ok 117 - ctags: search projects by non existent tag
+
+expecting success of 9500.118 'ctags: malformed tag weights': mkdir -p .git/ctags &&
+	 echo "not-a-number" >.git/ctags/nan &&
+	 echo "not-a-number-2" >.git/ctags/nan2 &&
+	 echo "0.1" >.git/ctags/floating-point &&
+	 gitweb_run
+ok 118 - ctags: malformed tag weights
+
+expecting success of 9500.119 'categories: projects list, only default category': echo "\$projects_list_group_categories = 1;" >>gitweb_config.perl &&
+	 gitweb_run
+ok 119 - categories: projects list, only default category
+
+expecting success of 9500.120 'unborn HEAD: "summary" page (with "heads" subview)': {
+		git checkout orphan_branch ||
+		git checkout --orphan orphan_branch
+	 } &&
+	 test_when_finished "git checkout main" &&
+	 gitweb_run "p=.git;a=summary"
+error: pathspec 'orphan_branch' did not match any file(s) known to git
+Switched to a new branch 'orphan_branch'
+Switched to branch 'main'
+ok 120 - unborn HEAD: "summary" page (with "heads" subview)
+
+# passed all 120 test(s)
+1..120
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9902-completion.sh ***
@@ -566555,8 +568241,8 @@
 	test_completion "git add ~/tmp/" "~/tmp/file"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9902-completion/tmp/.git/
---- expected	2025-08-27 08:24:30.181052000 +0000
-+++ out_sorted	2025-08-27 08:24:30.217052238 +0000
+--- expected	2026-09-29 14:55:09.426548970 +0000
++++ out_sorted	2026-09-29 14:55:09.446548970 +0000
 @@ -1 +1 @@
 -~/tmp/file
 +
@@ -566600,8 +568286,8 @@
 		) &&
 		test_cmp expected out
 	
---- expected	2025-08-27 08:24:30.273052607 +0000
-+++ out	2025-08-27 08:24:30.285052686 +0000
+--- expected	2026-09-29 14:55:09.506548970 +0000
++++ out	2026-09-29 14:55:09.526548970 +0000
 @@ -1 +1 @@
 -main-in-other 
 +main 
@@ -566635,8 +568321,8 @@
 		) &&
 		test_cmp expected out
 	
---- expected	2025-08-27 08:24:30.321052924 +0000
-+++ out	2025-08-27 08:24:30.329052977 +0000
+--- expected	2026-09-29 14:55:09.562548970 +0000
++++ out	2026-09-29 14:55:09.570548970 +0000
 @@ -1 +1 @@
 -main-in-other 
 +main 
@@ -566979,761 +568665,6 @@
 1..263
 make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
-*** t9500-gitweb-standalone-no-errors.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9500-gitweb-standalone-no-errors/.git/
-expecting success of 9500.1 'no commits: projects_list (implicit)': gitweb_run
-ok 1 - no commits: projects_list (implicit)
-
-expecting success of 9500.2 'no commits: projects_index': gitweb_run "a=project_index"
-ok 2 - no commits: projects_index
-
-expecting success of 9500.3 'no commits: .git summary (implicit)': gitweb_run "p=.git"
-ok 3 - no commits: .git summary (implicit)
-
-expecting success of 9500.4 'no commits: .git commit (implicit HEAD)': gitweb_run "p=.git;a=commit"
-ok 4 - no commits: .git commit (implicit HEAD)
-
-expecting success of 9500.5 'no commits: .git commitdiff (implicit HEAD)': gitweb_run "p=.git;a=commitdiff"
-ok 5 - no commits: .git commitdiff (implicit HEAD)
-
-expecting success of 9500.6 'no commits: .git tree (implicit HEAD)': gitweb_run "p=.git;a=tree"
-ok 6 - no commits: .git tree (implicit HEAD)
-
-expecting success of 9500.7 'no commits: .git heads': gitweb_run "p=.git;a=heads"
-ok 7 - no commits: .git heads
-
-expecting success of 9500.8 'no commits: .git tags': gitweb_run "p=.git;a=tags"
-ok 8 - no commits: .git tags
-
-expecting success of 9500.9 'Make initial commit': echo "Not an empty file." >file &&
-	 git add file &&
-	 git commit -a -m "Initial commit." &&
-	 git branch b
-[main (root-commit) f6e1c08] Initial commit.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 9 - Make initial commit
-
-expecting success of 9500.10 'projects_list (implicit)': gitweb_run
-ok 10 - projects_list (implicit)
-
-expecting success of 9500.11 'projects_index': gitweb_run "a=project_index"
-ok 11 - projects_index
-
-expecting success of 9500.12 '.git summary (implicit)': gitweb_run "p=.git"
-ok 12 - .git summary (implicit)
-
-expecting success of 9500.13 '.git commit (implicit HEAD)': gitweb_run "p=.git;a=commit"
-ok 13 - .git commit (implicit HEAD)
-
-expecting success of 9500.14 '.git commitdiff (implicit HEAD, root commit)': gitweb_run "p=.git;a=commitdiff"
-ok 14 - .git commitdiff (implicit HEAD, root commit)
-
-expecting success of 9500.15 '.git commitdiff_plain (implicit HEAD, root commit)': gitweb_run "p=.git;a=commitdiff_plain"
-ok 15 - .git commitdiff_plain (implicit HEAD, root commit)
-
-expecting success of 9500.16 '.git commit (HEAD)': gitweb_run "p=.git;a=commit;h=HEAD"
-ok 16 - .git commit (HEAD)
-
-expecting success of 9500.17 '.git tree (implicit HEAD)': gitweb_run "p=.git;a=tree"
-ok 17 - .git tree (implicit HEAD)
-
-expecting success of 9500.18 '.git blob (file)': gitweb_run "p=.git;a=blob;f=file"
-ok 18 - .git blob (file)
-
-expecting success of 9500.19 '.git blob_plain (file)': gitweb_run "p=.git;a=blob_plain;f=file"
-ok 19 - .git blob_plain (file)
-
-expecting success of 9500.20 '.git commit (non-existent)': gitweb_run "p=.git;a=commit;h=non-existent"
-ok 20 - .git commit (non-existent)
-
-expecting success of 9500.21 '.git commitdiff (non-existent)': gitweb_run "p=.git;a=commitdiff;h=non-existent"
-ok 21 - .git commitdiff (non-existent)
-
-expecting success of 9500.22 '.git commitdiff (non-existent vs HEAD)': gitweb_run "p=.git;a=commitdiff;hp=non-existent;h=HEAD"
-ok 22 - .git commitdiff (non-existent vs HEAD)
-
-expecting success of 9500.23 '.git tree (0000000000000000000000000000000000000000)': gitweb_run "p=.git;a=tree;h=0000000000000000000000000000000000000000"
-ok 23 - .git tree (0000000000000000000000000000000000000000)
-
-expecting success of 9500.24 '.git tag (0000000000000000000000000000000000000000)': gitweb_run "p=.git;a=tag;h=0000000000000000000000000000000000000000"
-ok 24 - .git tag (0000000000000000000000000000000000000000)
-
-expecting success of 9500.25 '.git blob (non-existent)': gitweb_run "p=.git;a=blob;f=non-existent"
-ok 25 - .git blob (non-existent)
-
-expecting success of 9500.26 '.git blob_plain (non-existent)': gitweb_run "p=.git;a=blob_plain;f=non-existent"
-ok 26 - .git blob_plain (non-existent)
-
-expecting success of 9500.27 'commitdiff(0): root': gitweb_run "p=.git;a=commitdiff"
-ok 27 - commitdiff(0): root
-
-expecting success of 9500.28 'commitdiff(0): file added': echo "New file" >new_file &&
-	 git add new_file &&
-	 git commit -a -m "File added." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main aef3daf] File added.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new_file
-ok 28 - commitdiff(0): file added
-
-expecting success of 9500.29 'commitdiff(0): mode change': test_chmod +x new_file &&
-	 git commit -a -m "Mode changed." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main 4d63074] Mode changed.
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 new_file
-ok 29 - commitdiff(0): mode change
-
-expecting success of 9500.30 'commitdiff(0): file renamed': git mv new_file renamed_file &&
-	 git commit -a -m "File renamed." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main c3af6e3] File renamed.
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename new_file => renamed_file (100%)
-ok 30 - commitdiff(0): file renamed
-
-expecting success of 9500.31 'commitdiff(0): file to symlink': rm renamed_file &&
-	 test_ln_s_add file renamed_file &&
-	 git commit -a -m "File to symlink." &&
-	 gitweb_run "p=.git;a=commitdiff"
-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 9d683f7] File to symlink.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 100755 => 120000 renamed_file
-ok 31 - commitdiff(0): file to symlink
-
-expecting success of 9500.32 'commitdiff(0): file deleted': git rm renamed_file &&
-	 rm -f renamed_file &&
-	 git commit -a -m "File removed." &&
-	 gitweb_run "p=.git;a=commitdiff"
-rm 'renamed_file'
-[main a32c3dd] File removed.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 120000 renamed_file
-ok 32 - commitdiff(0): file deleted
-
-expecting success of 9500.33 'commitdiff(0): file copied / new file': cp file file2 &&
-	 git add file2 &&
-	 git commit -a -m "File copied." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main 13afdf6] File copied.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 33 - commitdiff(0): file copied / new file
-
-expecting success of 9500.34 'commitdiff(0): mode change and modified': echo "New line" >>file2 &&
-	 test_chmod +x file2 &&
-	 git commit -a -m "Mode change and modification." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main b2fe804] Mode change and modification.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- mode change 100644 => 100755 file2
-ok 34 - commitdiff(0): mode change and modified
-
-expecting success of 9500.35 'commitdiff(0): renamed and modified': cat >file2<<EOF &&
-Dominus regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-EOF
-	 git commit -a -m "File added." &&
-	 git mv file2 file3 &&
-	 echo "Propter nomen suum." >>file3 &&
-	 git commit -a -m "File rename and modification." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main ce1348f] File added.
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+), 2 deletions(-)
-[main 763e503] File rename and modification.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename file2 => file3 (90%)
-ok 35 - commitdiff(0): renamed and modified
-
-expecting success of 9500.36 'commitdiff(0): renamed, mode change and modified': git mv file3 file2 &&
-	 echo "Propter nomen suum." >>file2 &&
-	 test_chmod +x file2 &&
-	 git commit -a -m "File rename, mode change and modification." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main 54200a9] File rename, mode change and modification.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename file3 => file2 (91%)
-ok 36 - commitdiff(0): renamed, mode change and modified
-
-expecting success of 9500.37 'setup typechange 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 &&
-	rm -f foo &&
-	echo "how far is the sun?" >foo &&
-	git update-index foo &&
-	git commit -m "foo back to file" &&
-	git branch foo-back-to-file &&
-	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
-	
-[main 1c15952] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 bar
- create mode 100644 foo
-[main fc2bb47] foo symlinked to bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 100644 => 120000 foo
-[main 4ac81f8] foo back to file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 120000 => 100644 foo
-[main e02950a] foo becomes a directory
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo
- create mode 100644 foo/baz
-[main 758ecec] foo/baz is the original foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 37 - setup typechange commits
-
-expecting success of 9500.38 'commitdiff(2): file renamed from foo to foo/baz': gitweb_run "p=.git;a=commitdiff;hp=initial;h=foo-baz-renamed-from-foo"
-ok 38 - commitdiff(2): file renamed from foo to foo/baz
-
-expecting success of 9500.39 'commitdiff(2): file renamed from foo/baz to foo': gitweb_run "p=.git;a=commitdiff;hp=foo-baz-renamed-from-foo;h=initial"
-ok 39 - commitdiff(2): file renamed from foo/baz to foo
-
-expecting success of 9500.40 'commitdiff(2): directory becomes file': gitweb_run "p=.git;a=commitdiff;hp=foo-becomes-a-directory;h=initial"
-ok 40 - commitdiff(2): directory becomes file
-
-expecting success of 9500.41 'commitdiff(2): file becomes directory': gitweb_run "p=.git;a=commitdiff;hp=initial;h=foo-becomes-a-directory"
-ok 41 - commitdiff(2): file becomes directory
-
-expecting success of 9500.42 'commitdiff(2): file becomes symlink': gitweb_run "p=.git;a=commitdiff;hp=initial;h=foo-symlinked-to-bar"
-ok 42 - commitdiff(2): file becomes symlink
-
-expecting success of 9500.43 'commitdiff(2): symlink becomes file': gitweb_run "p=.git;a=commitdiff;hp=foo-symlinked-to-bar;h=foo-back-to-file"
-ok 43 - commitdiff(2): symlink becomes file
-
-expecting success of 9500.44 'commitdiff(2): symlink becomes directory': gitweb_run "p=.git;a=commitdiff;hp=foo-symlinked-to-bar;h=foo-becomes-a-directory"
-ok 44 - commitdiff(2): symlink becomes directory
-
-expecting success of 9500.45 'commitdiff(2): directory becomes symlink': gitweb_run "p=.git;a=commitdiff;hp=foo-becomes-a-directory;h=foo-symlinked-to-bar"
-ok 45 - commitdiff(2): directory becomes symlink
-
-expecting success of 9500.46 'setup incomplete lines': 
-	cat >file<<-\EOF &&
-	Dominus regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	CHANGE_ME
-	EOF
-	git commit -a -m "Preparing for incomplete lines" &&
-	echo "incomplete" | tr -d "\\012" >>file &&
-	git commit -a -m "Add incomplete line" &&
-	git tag incomplete_lines_add &&
-	sed -e s/CHANGE_ME/change_me/ <file >file+ &&
-	mv -f file+ file &&
-	git commit -a -m "Incomplete context line" &&
-	git tag incomplete_lines_ctx &&
-	echo "Dominus regit me," >file &&
-	echo "incomplete line" | tr -d "\\012" >>file &&
-	git commit -a -m "Change incomplete line" &&
-	git tag incomplete_lines_chg &&
-	echo "Dominus regit me," >file &&
-	git commit -a -m "Remove incomplete line" &&
-	git tag incomplete_lines_rem
-
-[main 726d325] Preparing for incomplete lines
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+), 1 deletion(-)
-[main 5ece9db] Add incomplete line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 7182367] Incomplete context line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 19ad71b] Change incomplete line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 8 deletions(-)
-[main 08fef32] Remove incomplete line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-ok 46 - setup incomplete lines
-
-expecting success of 9500.47 'commitdiff(1): addition of incomplete line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_add"
-
-ok 47 - commitdiff(1): addition of incomplete line
-
-expecting success of 9500.48 'commitdiff(1): incomplete line as context line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_ctx"
-
-ok 48 - commitdiff(1): incomplete line as context line
-
-expecting success of 9500.49 'commitdiff(1): change incomplete line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_chg"
-
-ok 49 - commitdiff(1): change incomplete line
-
-expecting success of 9500.50 'commitdiff(1): removal of incomplete line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_rem"
-
-ok 50 - commitdiff(1): removal of incomplete line
-
-expecting success of 9500.51 'Create a merge': git checkout b &&
-	 echo "Branch" >>b &&
-	 git add b &&
-	 git commit -a -m "On branch" &&
-	 git checkout main &&
-	 git merge b &&
-	 git tag merge_commit
-Switched to branch 'b'
-[b 3f8100f] On branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- b | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-ok 51 - Create a merge
-
-expecting success of 9500.52 'commit(0): merge commit': gitweb_run "p=.git;a=commit"
-ok 52 - commit(0): merge commit
-
-expecting success of 9500.53 'commitdiff(0): merge commit': gitweb_run "p=.git;a=commitdiff"
-ok 53 - commitdiff(0): merge commit
-
-expecting success of 9500.54 'Prepare large commit': git checkout b &&
-	 echo "To be changed" >01-change &&
-	 echo "To be renamed" >02-pure-rename-from &&
-	 echo "To be deleted" >03-delete &&
-	 echo "To be renamed and changed" >04-rename-from &&
-	 echo "To have mode changed" >05-mode-change &&
-	 echo "File to symlink" >06-file-or-symlink &&
-	 echo "To be changed and have mode changed" >07-change-mode-change &&
-	 git add 0* &&
-	 git commit -a -m "Prepare large commit" &&
-	 echo "Changed" >01-change &&
-	 git mv 02-pure-rename-from 02-pure-rename-to &&
-	 git rm 03-delete && rm -f 03-delete &&
-	 echo "A new file" >03-new &&
-	 git add 03-new &&
-	 git mv 04-rename-from 04-rename-to &&
-	 echo "Changed" >>04-rename-to &&
-	 test_chmod +x 05-mode-change &&
-	 rm -f 06-file-or-symlink &&
-	 test_ln_s_add 01-change 06-file-or-symlink &&
-	 echo "Changed and have mode changed" >07-change-mode-change &&
-	 test_chmod +x 07-change-mode-change &&
-	 git commit -a -m "Large commit" &&
-	 git checkout main
-Switched to branch 'b'
-[b 42d1b13] Prepare large commit
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+)
- create mode 100644 01-change
- create mode 100644 02-pure-rename-from
- create mode 100644 03-delete
- create mode 100644 04-rename-from
- create mode 100644 05-mode-change
- create mode 100644 06-file-or-symlink
- create mode 100644 07-change-mode-change
-rm '03-delete'
-[b a99c658] Large commit
- Author: A U Thor <author@example.com>
- 8 files changed, 5 insertions(+), 4 deletions(-)
- rename 02-pure-rename-from => 02-pure-rename-to (100%)
- delete mode 100644 03-delete
- create mode 100644 03-new
- rename 04-rename-from => 04-rename-to (76%)
- mode change 100644 => 100755 05-mode-change
- mode change 100644 => 120000 06-file-or-symlink
- mode change 100644 => 100755 07-change-mode-change
-Switched to branch 'main'
-ok 54 - Prepare large commit
-
-expecting success of 9500.55 'commit(1): large commit': gitweb_run "p=.git;a=commit;h=b"
-ok 55 - commit(1): large commit
-
-expecting success of 9500.56 'commitdiff(1): large commit': gitweb_run "p=.git;a=commitdiff;h=b"
-ok 56 - commitdiff(1): large commit
-
-expecting success of 9500.57 'side-by-side: addition of incomplete line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_add;ds=sidebyside"
-
-ok 57 - side-by-side: addition of incomplete line
-
-expecting success of 9500.58 'side-by-side: incomplete line as context line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_ctx;ds=sidebyside"
-
-ok 58 - side-by-side: incomplete line as context line
-
-expecting success of 9500.59 'side-by-side: changed incomplete line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_chg;ds=sidebyside"
-
-ok 59 - side-by-side: changed incomplete line
-
-expecting success of 9500.60 'side-by-side: removal of incomplete line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_rem;ds=sidebyside"
-
-ok 60 - side-by-side: removal of incomplete line
-
-expecting success of 9500.61 'side-by-side: merge commit': 
-	gitweb_run "p=.git;a=commitdiff;h=merge_commit;ds=sidebyside"
-
-ok 61 - side-by-side: merge commit
-
-expecting success of 9500.62 'tags: list of different types of tags': git checkout main &&
-	 git tag -a -m "Tag commit object" tag-commit HEAD &&
-	 git tag -a -m "" tag-commit-nomessage HEAD &&
-	 git tag -a -m "Tag tag object" tag-tag tag-commit &&
-	 git tag -a -m "Tag tree object" tag-tree HEAD^{tree} &&
-	 git tag -a -m "Tag blob object" tag-blob HEAD:file &&
-	 git tag lightweight/tag-commit HEAD &&
-	 git tag lightweight/tag-tag tag-commit &&
-	 git tag lightweight/tag-tree HEAD^{tree} &&
-	 git tag lightweight/tag-blob HEAD:file &&
-	 gitweb_run "p=.git;a=tags"
-Already on '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-tag tag-commit^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-ok 62 - tags: list of different types of tags
-
-expecting success of 9500.63 'tag: Tag to commit object': gitweb_run "p=.git;a=tag;h=tag-commit"
-ok 63 - tag: Tag to commit object
-
-expecting success of 9500.64 'tag: on lightweight tag (invalid)': gitweb_run "p=.git;a=tag;h=lightweight/tag-commit"
-ok 64 - tag: on lightweight tag (invalid)
-
-expecting success of 9500.65 'logs: log (implicit HEAD)': gitweb_run "p=.git;a=log"
-ok 65 - logs: log (implicit HEAD)
-
-expecting success of 9500.66 'logs: shortlog (implicit HEAD)': gitweb_run "p=.git;a=shortlog"
-ok 66 - logs: shortlog (implicit HEAD)
-
-expecting success of 9500.67 'logs: history (implicit HEAD, file)': gitweb_run "p=.git;a=history;f=file"
-ok 67 - logs: history (implicit HEAD, file)
-
-expecting success of 9500.68 'logs: history (implicit HEAD, non-existent file)': gitweb_run "p=.git;a=history;f=non-existent"
-ok 68 - logs: history (implicit HEAD, non-existent file)
-
-expecting success of 9500.69 'logs: history (implicit HEAD, deleted file)': git checkout main &&
-	 echo "to be deleted" >deleted_file &&
-	 git add deleted_file &&
-	 git commit -m "Add file to be deleted" &&
-	 git rm deleted_file &&
-	 git commit -m "Delete file" &&
-	 gitweb_run "p=.git;a=history;f=deleted_file"
-Already on 'main'
-[main 0b30cc4] Add file to be deleted
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 deleted_file
-rm 'deleted_file'
-[main 07aeaf6] Delete file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 deleted_file
-ok 69 - logs: history (implicit HEAD, deleted file)
-
-expecting success of 9500.70 'path_info: project': gitweb_run "" "/.git"
-ok 70 - path_info: project
-
-expecting success of 9500.71 'path_info: project/branch': gitweb_run "" "/.git/b"
-ok 71 - path_info: project/branch
-
-expecting success of 9500.72 'path_info: project/branch:file': gitweb_run "" "/.git/main:file"
-ok 72 - path_info: project/branch:file
-
-expecting success of 9500.73 'path_info: project/branch:dir/': gitweb_run "" "/.git/main:foo/"
-ok 73 - path_info: project/branch:dir/
-
-expecting success of 9500.74 'path_info: project/branch (non-existent)': gitweb_run "" "/.git/non-existent"
-ok 74 - path_info: project/branch (non-existent)
-
-expecting success of 9500.75 'path_info: project/branch:filename (non-existent branch)': gitweb_run "" "/.git/non-existent:non-existent"
-ok 75 - path_info: project/branch:filename (non-existent branch)
-
-expecting success of 9500.76 'path_info: project/branch:file (non-existent)': gitweb_run "" "/.git/main:non-existent"
-ok 76 - path_info: project/branch:file (non-existent)
-
-expecting success of 9500.77 'path_info: project/branch:dir/ (non-existent)': gitweb_run "" "/.git/main:non-existent/"
-ok 77 - path_info: project/branch:dir/ (non-existent)
-
-expecting success of 9500.78 'path_info: project/branch:/file': gitweb_run "" "/.git/main:/file"
-ok 78 - path_info: project/branch:/file
-
-expecting success of 9500.79 'path_info: project/:/file (implicit HEAD)': gitweb_run "" "/.git/:/file"
-ok 79 - path_info: project/:/file (implicit HEAD)
-
-expecting success of 9500.80 'path_info: project/:/ (implicit HEAD, top tree)': gitweb_run "" "/.git/:/"
-ok 80 - path_info: project/:/ (implicit HEAD, top tree)
-
-expecting success of 9500.81 'feeds: OPML': gitweb_run "a=opml"
-ok 81 - feeds: OPML
-
-expecting success of 9500.82 'feed: RSS': gitweb_run "p=.git;a=rss"
-ok 82 - feed: RSS
-
-expecting success of 9500.83 'feed: Atom': gitweb_run "p=.git;a=atom"
-ok 83 - feed: Atom
-
-expecting success of 9500.84 'encode(commit): utf8': . "$TEST_DIRECTORY"/t3901/utf8.txt &&
-	 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
-	 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
-	 echo "UTF-8" >>file &&
-	 git add file &&
-	 git commit -F "$TEST_DIRECTORY"/t3900/1-UTF-8.txt &&
-	 gitweb_run "p=.git;a=commit"
-[main 18589a2] ÄËÑ�Ö
- Author: �éí óú <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 84 - encode(commit): utf8
-
-expecting success of 9500.85 'encode(commit): iso-8859-1': . "$TEST_DIRECTORY"/t3901/8859-1.txt &&
-	 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
-	 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
-	 echo "ISO-8859-1" >>file &&
-	 git add file &&
-	 test_config i18n.commitencoding ISO-8859-1 &&
-	 git commit -F "$TEST_DIRECTORY"/t3900/ISO8859-1.txt &&
-	 gitweb_run "p=.git;a=commit"
-[main c6c3c80] ÄËÑ�Ö
- Author: Áéí óú <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 85 - encode(commit): iso-8859-1
-
-expecting success of 9500.86 'encode(log): utf-8 and iso-8859-1': gitweb_run "p=.git;a=log"
-ok 86 - encode(log): utf-8 and iso-8859-1
-
-expecting success of 9500.87 'opt: log --no-merges': gitweb_run "p=.git;a=log;opt=--no-merges"
-ok 87 - opt: log --no-merges
-
-expecting success of 9500.88 'opt: atom --no-merges': gitweb_run "p=.git;a=log;opt=--no-merges"
-ok 88 - opt: atom --no-merges
-
-expecting success of 9500.89 'opt: "file" history --no-merges': gitweb_run "p=.git;a=history;f=file;opt=--no-merges"
-ok 89 - opt: "file" history --no-merges
-
-expecting success of 9500.90 'opt: log --no-such-option (invalid option)': gitweb_run "p=.git;a=log;opt=--no-such-option"
-ok 90 - opt: log --no-such-option (invalid option)
-
-expecting success of 9500.91 'opt: tree --no-merges (invalid option for action)': gitweb_run "p=.git;a=tree;opt=--no-merges"
-ok 91 - opt: tree --no-merges (invalid option for action)
-
-expecting success of 9500.92 'URL: no project URLs, no base URL': gitweb_run "p=.git;a=summary"
-ok 92 - URL: no project URLs, no base URL
-
-expecting success of 9500.93 'URL: project URLs via gitweb.url': git config --add gitweb.url git://example.com/git/trash.git &&
-        git config --add gitweb.url http://example.com/git/trash.git &&
-        gitweb_run "p=.git;a=summary"
-ok 93 - URL: project URLs via gitweb.url
-
-expecting success of 9500.94 'URL: project URLs via cloneurl file': gitweb_run "p=.git;a=summary"
-ok 94 - URL: project URLs via cloneurl file
-
-expecting success of 9500.95 'config override: projects list (implicit)': gitweb_run
-ok 95 - config override: projects list (implicit)
-
-expecting success of 9500.96 'config override: tree view, features not overridden in repo config': gitweb_run "p=.git;a=tree"
-ok 96 - config override: tree view, features not overridden in repo config
-
-expecting success of 9500.97 'config override: tree view, features disabled in repo config': git config gitweb.blame no &&
-	 git config gitweb.snapshot none &&
-	 git config gitweb.avatar gravatar &&
-	 gitweb_run "p=.git;a=tree"
-ok 97 - config override: tree view, features disabled in repo config
-
-expecting success of 9500.98 'config override: tree view, features enabled in repo config (1)': git config gitweb.blame yes &&
-	 git config gitweb.snapshot "zip,tgz, tbz2" &&
-	 gitweb_run "p=.git;a=tree"
-ok 98 - config override: tree view, features enabled in repo config (1)
-
-expecting success of 9500.99 'setup': 
-	version=$(git config core.repositoryformatversion) &&
-	algo=$(test_might_fail git config extensions.objectformat) &&
-	refstorage=$(test_might_fail git config extensions.refstorage) &&
-	cat >.git/config <<-\EOF &&
-	# testing noval and alternate separator
-	[gitweb]
-		blame
-		snapshot = zip tgz
-	EOF
-	git config core.repositoryformatversion "$version" &&
-	if test -n "$algo"
-	then
-		git config extensions.objectformat "$algo"
-	fi &&
-	if test -n "$refstorage"
-	then
-		git config extensions.refstorage "$refstorage"
-	fi
-
-ok 99 - setup
-
-expecting success of 9500.100 'config override: tree view, features enabled in repo config (2)': gitweb_run "p=.git;a=tree"
-ok 100 - config override: tree view, features enabled in repo config (2)
-
-expecting success of 9500.101 'search: preparation': echo "1st MATCH" >>file &&
-	 echo "2nd MATCH" >>file &&
-	 echo "MATCH" >>bar &&
-	 git add file bar &&
-	 git commit -m "Added MATCH word"
-[main 13113e4] Added MATCH word
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+)
-ok 101 - search: preparation
-
-expecting success of 9500.102 'search: commit author': gitweb_run "p=.git;a=search;h=HEAD;st=author;s=A+U+Thor"
-ok 102 - search: commit author
-
-expecting success of 9500.103 'search: commit message': gitweb_run "p=.git;a=search;h=HEAD;st=commitr;s=MATCH"
-ok 103 - search: commit message
-
-expecting success of 9500.104 'search: grep': gitweb_run "p=.git;a=search;h=HEAD;st=grep;s=MATCH"
-ok 104 - search: grep
-
-expecting success of 9500.105 'search: pickaxe': gitweb_run "p=.git;a=search;h=HEAD;st=pickaxe;s=MATCH"
-ok 105 - search: pickaxe
-
-expecting success of 9500.106 'search: projects': gitweb_run "a=project_list;s=.git"
-ok 106 - search: projects
-
-expecting success of 9500.107 'README.html with non-ASCII characters (utf-8)': echo "<b>UTF-8 example:</b><br />" >.git/README.html &&
-	 cat "$TEST_DIRECTORY"/t3900/1-UTF-8.txt >>.git/README.html &&
-	 gitweb_run "p=.git;a=summary"
-ok 107 - README.html with non-ASCII characters (utf-8)
-
-expecting success of 9500.108 'HIGHLIGHT': 
-	cat >>gitweb_config.perl <<-\EOF
-	our $highlight_bin = "highlight";
-	$feature{"highlight"}{"override"} = 1;
-	EOF
-
-ok 108 - HIGHLIGHT
-
-checking prerequisite: HIGHLIGHT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-HIGHLIGHT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-HIGHLIGHT" &&
-	highlight_version=$(highlight --version </dev/null 2>/dev/null) &&
-	test -n "$highlight_version"
-
-)
-prerequisite HIGHLIGHT not satisfied
-ok 109 # skip syntax highlighting (no highlight, unknown syntax) (missing HIGHLIGHT)
-
-ok 110 # skip syntax highlighting (highlighted, shell script) (missing HIGHLIGHT)
-
-ok 111 # skip syntax highlighting (highlighter language autodetection) (missing HIGHLIGHT)
-
-expecting success of 9500.112 'forks: prepare': git init --bare foo.git &&
-	 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 &&
-	 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.51.0/t/trash directory.t9500-gitweb-standalone-no-errors/foo.git/
-[main (root-commit) cae743e] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 file
-Cloning into bare repository 'foo-forked.git'...
-done.
-ok 112 - forks: prepare
-
-expecting success of 9500.113 'forks: projects list': gitweb_run
-ok 113 - forks: projects list
-
-expecting success of 9500.114 'forks: forks action': gitweb_run "p=foo.git;a=forks"
-ok 114 - forks: forks action
-
-expecting success of 9500.115 'ctags: tag cloud in projects list': mkdir .git/ctags &&
-	 echo "2" >.git/ctags/foo &&
-	 echo "1" >.git/ctags/bar &&
-	gitweb_run
-ok 115 - ctags: tag cloud in projects list
-
-expecting success of 9500.116 'ctags: search projects by existing tag': gitweb_run "by_tag=foo"
-ok 116 - ctags: search projects by existing tag
-
-expecting success of 9500.117 'ctags: search projects by non existent tag': gitweb_run "by_tag=non-existent"
-ok 117 - ctags: search projects by non existent tag
-
-expecting success of 9500.118 'ctags: malformed tag weights': mkdir -p .git/ctags &&
-	 echo "not-a-number" >.git/ctags/nan &&
-	 echo "not-a-number-2" >.git/ctags/nan2 &&
-	 echo "0.1" >.git/ctags/floating-point &&
-	 gitweb_run
-ok 118 - ctags: malformed tag weights
-
-expecting success of 9500.119 'categories: projects list, only default category': echo "\$projects_list_group_categories = 1;" >>gitweb_config.perl &&
-	 gitweb_run
-ok 119 - categories: projects list, only default category
-
-expecting success of 9500.120 'unborn HEAD: "summary" page (with "heads" subview)': {
-		git checkout orphan_branch ||
-		git checkout --orphan orphan_branch
-	 } &&
-	 test_when_finished "git checkout main" &&
-	 gitweb_run "p=.git;a=summary"
-error: pathspec 'orphan_branch' did not match any file(s) known to git
-Switched to a new branch 'orphan_branch'
-Switched to branch 'main'
-ok 120 - unborn HEAD: "summary" page (with "heads" subview)
-
-# passed all 120 test(s)
-1..120
-make[4]: Leaving directory '/build/reproducible-path/git-2.51.0/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 *** t9402-git-cvsserver-refs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.51.0/t/trash directory.t9402-git-cvsserver-refs/.git/
 expecting success of 9402.1 'setup v1, b1': 
@@ -568270,10 +569201,10 @@
 /usr/bin/make aggregate-results
 make[5]: Entering directory '/build/reproducible-path/git-2.51.0/t'
 
-missing prereq: !LONG_IS_64BIT !PCRE !PTHREADS !SYMLINKS 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 !SYMLINKS 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 30778
+success 30777
 failed  0
 broken  275
 total   31590
@@ -568335,9 +569266,9 @@
 	git checkout remotes/origin/trunk
 
 	A	foo
-r1 = 4d1d9ec0e46ca1813e384a2f82cb0c5dd56afd58 (refs/remotes/origin/trunk)
+r1 = 4f1875c7ae5561ba97a770ee9181329a93e09daf (refs/remotes/origin/trunk)
 	M	foo
-r2 = c7e4fd5fa9c3f0351713cd4c8d773a9cde7c9938 (refs/remotes/origin/trunk)
+r2 = 3b9b8e8e8560324203d43dd6beb2ba9fde3f76df (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project r2
 Note: switching to 'remotes/origin/trunk'.
@@ -568357,7 +569288,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at c7e4fd5 updated trunk
+HEAD is now at 3b9b8e8 updated trunk
 ok 2 - import into git
 
 expecting success of 9167.3 'git svn branch tests': 
@@ -568376,40 +569307,40 @@
 Creating parent folder file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a ...
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a/project...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a/project, 2
-Found branch parent: (refs/remotes/origin/a) c7e4fd5fa9c3f0351713cd4c8d773a9cde7c9938
+Found branch parent: (refs/remotes/origin/a) 3b9b8e8e8560324203d43dd6beb2ba9fde3f76df
 Following parent with do_switch
 Successfully followed parent
-r4 = 2b528fa80c7016a145a62bcc6b012cd62cb4bf3c (refs/remotes/origin/a)
+r4 = 028a7a038e977702c5d1ab13dd3cecd369d87489 (refs/remotes/origin/a)
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.51.0/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.51.0/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1 ...
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag1) c7e4fd5fa9c3f0351713cd4c8d773a9cde7c9938
+Found branch parent: (refs/remotes/origin/tags/tag1) 3b9b8e8e8560324203d43dd6beb2ba9fde3f76df
 Following parent with do_switch
 Successfully followed parent
-r6 = 3a6b9ed33c787df4550b49543f6e4ef9573d524c (refs/remotes/origin/tags/tag1)
+r6 = be2fcae3facc7e0438679ef31c9a3dcf7113b30e (refs/remotes/origin/tags/tag1)
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.51.0/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.51.0/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2 ...
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag2) c7e4fd5fa9c3f0351713cd4c8d773a9cde7c9938
+Found branch parent: (refs/remotes/origin/tags/tag2) 3b9b8e8e8560324203d43dd6beb2ba9fde3f76df
 Following parent with do_switch
 Successfully followed parent
-r8 = b43c7add924a85c8edacf6d18217cbc0658f782a (refs/remotes/origin/tags/tag2)
+r8 = ae0373a35cd7d16d38a0b23cb1ac8d27d929e76a (refs/remotes/origin/tags/tag2)
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.51.0/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.51.0/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3 ...
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag3) c7e4fd5fa9c3f0351713cd4c8d773a9cde7c9938
+Found branch parent: (refs/remotes/origin/tags/tag3) 3b9b8e8e8560324203d43dd6beb2ba9fde3f76df
 Following parent with do_switch
 Successfully followed parent
-r10 = 5bde613edca8a270157a0718cc848e4551f8dbfe (refs/remotes/origin/tags/tag3)
+r10 = 1e9d814f12e6d43c5aaa3f6bb91187c6028245ee (refs/remotes/origin/tags/tag3)
 ok 3 - git svn branch tests
 
 # passed all 3 test(s)
@@ -568451,9 +569382,9 @@
 	git checkout remotes/origin/trunk
 
 	A	foo
-r1 = c459191e6c3d9f64d0be7543a67423e34f2bc113 (refs/remotes/origin/trunk)
+r1 = e47751a63734dd719342a9ff5f9074dea1575e37 (refs/remotes/origin/trunk)
 	M	foo
-r2 = aace9e88f99e28efd43859beb3a228e77fe5a027 (refs/remotes/origin/trunk)
+r2 = c23d025b8d7359ed73055ce05585cc4e6e52dcc3 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk r2
 Note: switching to 'remotes/origin/trunk'.
@@ -568473,7 +569404,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at aace9e8 updated trunk
+HEAD is now at c23d025 updated trunk
 ok 2 - import into git
 
 expecting success of 9128.3 'git svn branch tests': 
@@ -568501,16 +569432,16 @@
 
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a, 2
-Found branch parent: (refs/remotes/origin/a) aace9e88f99e28efd43859beb3a228e77fe5a027
+Found branch parent: (refs/remotes/origin/a) c23d025b8d7359ed73055ce05585cc4e6e52dcc3
 Following parent with do_switch
 Successfully followed parent
-r3 = a5714030dab6da8897cbdc4c44c8cab525b2f8bd (refs/remotes/origin/a)
+r3 = f034098afe753d07728c5110cd1eca5e2b9fac40 (refs/remotes/origin/a)
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b, 2
-Found branch parent: (refs/remotes/origin/b) aace9e88f99e28efd43859beb3a228e77fe5a027
+Found branch parent: (refs/remotes/origin/b) c23d025b8d7359ed73055ce05585cc4e6e52dcc3
 Following parent with do_switch
 Successfully followed parent
-r4 = db6e01b910db2e14a13e5abf1a8157e6eb786a88 (refs/remotes/origin/b)
+r4 = dca405fb4e101e2d4aa7d1485119b6761779cc05 (refs/remotes/origin/b)
 fatal: cannot rename the current branch while not on any
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.51.0/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.
@@ -568521,28 +569452,28 @@
 
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1, 2
-Found branch parent: (refs/remotes/origin/tags/tag1) aace9e88f99e28efd43859beb3a228e77fe5a027
+Found branch parent: (refs/remotes/origin/tags/tag1) c23d025b8d7359ed73055ce05585cc4e6e52dcc3
 Following parent with do_switch
 Successfully followed parent
-r5 = 087eb32dff6c3a46e417ced27d9a85bf1dcdda93 (refs/remotes/origin/tags/tag1)
+r5 = 08dac9e7fb0805c14b2bb85ee15e6741a977de17 (refs/remotes/origin/tags/tag1)
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2, 2
-Found branch parent: (refs/remotes/origin/tags/tag2) aace9e88f99e28efd43859beb3a228e77fe5a027
+Found branch parent: (refs/remotes/origin/tags/tag2) c23d025b8d7359ed73055ce05585cc4e6e52dcc3
 Following parent with do_switch
 Successfully followed parent
-r6 = d1cd5b9ce8fdfbfcc52d70171a07285f8488225d (refs/remotes/origin/tags/tag2)
+r6 = e4515b86116ce965b331a2d18a0e082002ed6ecd (refs/remotes/origin/tags/tag2)
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3, 2
-Found branch parent: (refs/remotes/origin/tags/tag3) aace9e88f99e28efd43859beb3a228e77fe5a027
+Found branch parent: (refs/remotes/origin/tags/tag3) c23d025b8d7359ed73055ce05585cc4e6e52dcc3
 Following parent with do_switch
 Successfully followed parent
-r7 = 2f6fd635c1d0ce87a7b594caaddd43c2e7b534d2 (refs/remotes/origin/tags/tag3)
+r7 = dbcca2655098061b3111df893f3111f02aa5bdf4 (refs/remotes/origin/tags/tag3)
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4, 2
-Found branch parent: (refs/remotes/origin/tags/tag4) aace9e88f99e28efd43859beb3a228e77fe5a027
+Found branch parent: (refs/remotes/origin/tags/tag4) c23d025b8d7359ed73055ce05585cc4e6e52dcc3
 Following parent with do_switch
 Successfully followed parent
-r8 = 870b135f079281210a641485547ab40fef77adf6 (refs/remotes/origin/tags/tag4)
+r8 = 2cb35800b10e1b7de87cca01e5baf7013dc156a9 (refs/remotes/origin/tags/tag4)
 tag name required
 
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag5...
@@ -568600,55 +569531,55 @@
 Committing transaction...
 Committed revision 9.
 Using higher level of URL: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk, 8
-Found branch parent: (refs/remotes/mirror/trunk) aace9e88f99e28efd43859beb3a228e77fe5a027
-Following parent with do_switch
-Successfully followed parent
-r9 = be5d8cc47bce58ed3e605129b5c8921a102dfb0e (refs/remotes/mirror/trunk)
-branch_from: /branches => /branches/b
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/b, 8
-Found branch parent: (refs/remotes/mirror/b) db6e01b910db2e14a13e5abf1a8157e6eb786a88
-Following parent with do_switch
-Successfully followed parent
-r9 = 51fb5582dd42f052e0a5efe2a5deea9941fbf587 (refs/remotes/mirror/b)
-branch_from: /branches => /branches/a
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/a, 8
-Found branch parent: (refs/remotes/mirror/a) a5714030dab6da8897cbdc4c44c8cab525b2f8bd
+branch_from: /tags => /tags/tag4
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4 => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag4, 8
+Found branch parent: (refs/remotes/mirror/tags/tag4) 2cb35800b10e1b7de87cca01e5baf7013dc156a9
 Following parent with do_switch
 Successfully followed parent
-r9 = ce80c7794f949783d507f8826950d254dc53c514 (refs/remotes/mirror/a)
+r9 = 51ada00cd4bfc6b5b14fac9f3e699110b1aab622 (refs/remotes/mirror/tags/tag4)
 branch_from: /tags => /tags/tag2
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2 => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag2, 8
-Found branch parent: (refs/remotes/mirror/tags/tag2) d1cd5b9ce8fdfbfcc52d70171a07285f8488225d
+Found branch parent: (refs/remotes/mirror/tags/tag2) e4515b86116ce965b331a2d18a0e082002ed6ecd
 Following parent with do_switch
 Successfully followed parent
-r9 = e44d04a83b2d659f9861cff823d9eef0b190ffb2 (refs/remotes/mirror/tags/tag2)
+r9 = 07157da94fee5b8e5d2f2987250daf4c6eb050fe (refs/remotes/mirror/tags/tag2)
 branch_from: /tags => /tags/tag3
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3 => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag3, 8
-Found branch parent: (refs/remotes/mirror/tags/tag3) 2f6fd635c1d0ce87a7b594caaddd43c2e7b534d2
+Found branch parent: (refs/remotes/mirror/tags/tag3) dbcca2655098061b3111df893f3111f02aa5bdf4
 Following parent with do_switch
 Successfully followed parent
-r9 = 609bb3497db24e4931937020147f99474200205d (refs/remotes/mirror/tags/tag3)
-branch_from: /tags => /tags/tag4
-Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4 => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag4, 8
-Found branch parent: (refs/remotes/mirror/tags/tag4) 870b135f079281210a641485547ab40fef77adf6
+r9 = d2d4981e2995f68d203c8d6661ba5ab46371f1eb (refs/remotes/mirror/tags/tag3)
+branch_from: /branches => /branches/b
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/b, 8
+Found branch parent: (refs/remotes/mirror/b) dca405fb4e101e2d4aa7d1485119b6761779cc05
+Following parent with do_switch
+Successfully followed parent
+r9 = 1bd89a8fe94972d09f7a8e43ebbdbd24d107787a (refs/remotes/mirror/b)
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk, 8
+Found branch parent: (refs/remotes/mirror/trunk) c23d025b8d7359ed73055ce05585cc4e6e52dcc3
+Following parent with do_switch
+Successfully followed parent
+r9 = 5117913064f744ad63df53d865805ab4ab079fa1 (refs/remotes/mirror/trunk)
+branch_from: /branches => /branches/a
+Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/a, 8
+Found branch parent: (refs/remotes/mirror/a) f034098afe753d07728c5110cd1eca5e2b9fac40
 Following parent with do_switch
 Successfully followed parent
-r9 = 6e54771099e433d7a82fb4b8520d0f82f1aa7f26 (refs/remotes/mirror/tags/tag4)
+r9 = 1f8fe5cc87e9144f3e850e725ba4b4cb25af61d1 (refs/remotes/mirror/a)
 branch_from: /tags => /tags/tag1
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1 => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag1, 8
-Found branch parent: (refs/remotes/mirror/tags/tag1) 087eb32dff6c3a46e417ced27d9a85bf1dcdda93
+Found branch parent: (refs/remotes/mirror/tags/tag1) 08dac9e7fb0805c14b2bb85ee15e6741a977de17
 Following parent with do_switch
 Successfully followed parent
-r9 = b0a209b0d3be6b27fb114c2cf25fa40b102d1005 (refs/remotes/mirror/tags/tag1)
-Previous HEAD position was aace9e8 updated trunk
-HEAD is now at be5d8cc made mirror
+r9 = d03f0538da3353b1b6d9a9732d8cf2a64acc3c25 (refs/remotes/mirror/tags/tag1)
+Previous HEAD position was c23d025 updated trunk
+HEAD is now at 5117913 made mirror
 Copying file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk at r9 to file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/d...
 Found possible branch point: file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk => file:///build/reproducible-path/git-2.51.0/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/d, 9
-Found branch parent: (refs/remotes/mirror/d) be5d8cc47bce58ed3e605129b5c8921a102dfb0e
+Found branch parent: (refs/remotes/mirror/d) 5117913064f744ad63df53d865805ab4ab079fa1
 Following parent with do_switch
 Successfully followed parent
-r10 = 7c4255ba8af02bb418181facaca204e494a26a0a (refs/remotes/mirror/d)
+r10 = 43694a5e0be8fb6b053e8144a79979689919a04f (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>...]'
@@ -572224,22 +573155,22 @@
 	'/build/reproducible-path/git-2.51.0/debian/git/usr/share/gitweb/static'
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 ./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 ./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+./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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+./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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 ./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.51.0'
@@ -572248,64 +573179,64 @@
 mv git-merge-resolve+ git-merge-resolve
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-submodule.sh" "git-submodule+" ./GIT-BUILD-OPTIONS && \
-mv git-submodule+ git-submodule
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-archimport.perl" "git-archimport+" && \
+mv git-archimport+ git-archimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsimport.perl" "git-cvsimport+" && \
-mv git-cvsimport+ git-cvsimport
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 ./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/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.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-archimport.perl" "git-archimport+" && \
-mv git-archimport+ git-archimport
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 ./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsserver.perl" "git-cvsserver+" && \
-mv git-cvsserver+ git-cvsserver
+/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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-svn.perl" "git-svn+" && \
-mv git-svn+ git-svn
+/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-mergetool--lib.sh" "git-mergetool--lib+" ./GIT-BUILD-OPTIONS && \
-mv git-mergetool--lib+ git-mergetool--lib
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsimport.perl" "git-cvsimport+" && \
+mv git-cvsimport+ git-cvsimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsserver.perl" "git-cvsserver+" && \
+mv git-cvsserver+ git-cvsserver
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-send-email.perl" "git-send-email+" && \
 mv git-send-email+ git-send-email
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-sh-setup.sh" "git-sh-setup+" ./GIT-BUILD-OPTIONS && \
-mv git-sh-setup+ git-sh-setup
+./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 ./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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-./generate-script.sh "git-instaweb.sh" "git-instaweb+" ./GIT-BUILD-OPTIONS && \
-chmod +x git-instaweb+ && \
-mv git-instaweb+ git-instaweb
+/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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+./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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+./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.51.0'
 /usr/bin/make -C git-gui  gitexecdir='/usr/lib/git-core' all
 /usr/bin/make -C gitk-git  all
@@ -572314,34 +573245,34 @@
 : no custom templates yet
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/templates'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git.pm" "perl/build/lib/Git.pm"
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/I18N.pm" "perl/build/lib/Git/I18N.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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/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.pm" "perl/build/lib/Git.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/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/I18N.pm" "perl/build/lib/Git/I18N.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/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"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/GlobSpec.pm" "perl/build/lib/Git/SVN/GlobSpec.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Fetcher.pm" "perl/build/lib/Git/SVN/Fetcher.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/GlobSpec.pm" "perl/build/lib/Git/SVN/GlobSpec.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.51.0'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
+/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"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Log.pm" "perl/build/lib/Git/SVN/Log.pm"
@@ -572350,19 +573281,19 @@
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Migration.pm" "perl/build/lib/Git/SVN/Migration.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Utils.pm" "perl/build/lib/Git/SVN/Utils.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Ra.pm" "perl/build/lib/Git/SVN/Ra.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Prompt.pm" "perl/build/lib/Git/SVN/Prompt.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Utils.pm" "perl/build/lib/Git/SVN/Utils.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Ra.pm" "perl/build/lib/Git/SVN/Ra.pm"
+/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.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/LoadCPAN/Mail/Address.pm" "perl/build/lib/Git/LoadCPAN/Mail/Address.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
-/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"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Prompt.pm" "perl/build/lib/Git/SVN/Prompt.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 install -d -m 755 '/build/reproducible-path/git-2.51.0/debian/git/usr/bin'
@@ -572493,29 +573424,26 @@
 	'/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitweb/static'
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 /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.51.0/templates'
+: no custom templates yet
+make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/templates'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 pod2man perl/Git.pm perl/build/man/man3/Git.3pm
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
-/usr/bin/make -C gitk-git  all
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 install -d -m 755 '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/man/man3'
 (cd perl/build/man/man3 && tar cf - .) | \
 (cd '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/man/man3' && umask 022 && tar xof -)
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 /usr/bin/make -C Documentation install
-/usr/bin/make -C templates  SHELL_PATH='/bin/sh' PERL_PATH='/usr/bin/perl'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/templates'
-: no custom templates yet
-make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/templates'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 /usr/bin/perl ./build-docdep.perl "/build/reproducible-path/git-2.51.0/Documentation" >doc.dep 
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     * new asciidoc flags
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-GIT_BUILT_FROM_COMMIT="" GIT_DATE="" GIT_USER_AGENT="" GIT_VERSION="" /bin/sh ""/build/reproducible-path/git-2.51.0/Documentation/.."/GIT-VERSION-GEN" ""/build/reproducible-path/git-2.51.0/Documentation/.."" "asciidoc.conf.in" "asciidoc.conf"
-make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 install -d -m 755 '/build/reproducible-path/git-2.51.0/debian/tmp/usr/bin'
 install -d -m 755 '/build/reproducible-path/git-2.51.0/debian/tmp/usr/lib/git-core'
@@ -572526,6 +573454,9 @@
 install git-cvsserver '/build/reproducible-path/git-2.51.0/debian/tmp/usr/bin'
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 /usr/bin/make -C templates DESTDIR='/build/reproducible-path/git-2.51.0/debian/tmp' install
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+GIT_BUILT_FROM_COMMIT="" GIT_DATE="" GIT_USER_AGENT="" GIT_VERSION="" /bin/sh ""/build/reproducible-path/git-2.51.0/Documentation/.."/GIT-VERSION-GEN" ""/build/reproducible-path/git-2.51.0/Documentation/.."" "asciidoc.conf.in" "asciidoc.conf"
+make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/templates'
 : no custom templates yet
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/templates'
@@ -572545,40 +573476,49 @@
 (cd '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/perl5' && umask 022 && tar xof -)
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 /usr/bin/make -C gitk-git install
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/gitk-git'
 install -d -m 755 '/build/reproducible-path/git-2.51.0/debian/tmp/usr/bin'
 install -m 755 gitk-wish '/build/reproducible-path/git-2.51.0/debian/tmp/usr/bin'/gitk
 install -d -m 755 '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs'
 install -m 644 po/bg.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/ca.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/de.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/es.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/fr.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/hu.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/it.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/ja.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/pt_br.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/pt_pt.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/ru.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/sv.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/ta.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/vi.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' &&  install -m 644 po/zh_cn.msg '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/gitk/lib/msgs' && true
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/gitk-git'
+/usr/bin/make -C git-gui gitexecdir='/usr/lib/git-core' install
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-/usr/bin/make -C git-gui gitexecdir='/usr/lib/git-core' install
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/git-gui'
 install -d -m 755 '/build/reproducible-path/git-2.51.0/debian/tmp/usr/lib/git-core' 
 install -m 755 git-gui  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/lib/git-core'
@@ -572591,86 +573531,92 @@
 install -m 644 po/bg.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/de.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/el.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/fr.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/hu.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/it.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/ja.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/nb.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/pt_br.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/pt_pt.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/ru.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/sv.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/vi.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/zh_cn.msg  '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/git-gui/lib/msgs' && true
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-commit-tree.xml git-commit-tree.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-commit-tree.xml git-commit-tree.adoc
-make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-checkout.xml git-checkout.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-checkout.xml git-checkout.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0'
 install -d -m 755 '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/bash-completion/completions' && \
 install -m 644 contrib/completion/git-completion.bash '/build/reproducible-path/git-2.51.0/debian/tmp/usr/share/bash-completion/completions/git'
@@ -572720,157 +573666,148 @@
 done
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
@@ -572879,67 +573816,64 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
@@ -572948,79 +573882,82 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
@@ -573029,13 +573966,13 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
@@ -573044,13 +573981,13 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
@@ -573059,136 +573996,133 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
-make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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
@@ -573197,37 +574131,34 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitworkflows.xml gitworkflows.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gittutorial.xml gittutorial.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.51.0/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-add.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-backfill.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-apply.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -573239,43 +574170,40 @@
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-checkout-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-cherry.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-cat-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -573284,22 +574212,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-column.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-clean.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-credential-cache.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-commit-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -573308,52 +574242,52 @@
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-cvsimport.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-cvsserver.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-diff-pairs.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-fetch-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-fmt-merge-msg.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -573362,6 +574296,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-for-each-repo.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
@@ -573371,13 +574308,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-fsmonitor--daemon.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -573386,52 +574317,58 @@
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-hash-object.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-gui.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-help.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-http-backend.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-http-push.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-init-db.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-index-pack.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-config.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-interpret-trailers.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -573440,82 +574377,76 @@
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-merge-one-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-maintenance.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-base.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-mktag.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-mv.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-name-rev.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-log.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-pack-redundant.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-patch-id.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-p4.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-prune-packed.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-prune.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -573524,91 +574455,88 @@
 xmlto -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
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-refs.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-reflog.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-push.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-remote-ext.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-pull.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-remote-fd.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-rebase.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-replace.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-reset.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-sh-i18n--envsubst.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-replay.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-rm.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-sh-i18n.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-shell.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-rev-list.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-show-branch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-send-email.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -573617,40 +574545,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-stage.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-show-index.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-stash.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-tag.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-show.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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
@@ -573671,61 +574602,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-upload-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-verify-tag.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-verify-commit.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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
+xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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-version.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-xmlto -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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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-write-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 xmlto -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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitformat-commit-graph.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitformat-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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
@@ -573737,75 +574662,81 @@
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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
+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.51.0/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitdiffcore.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitcli.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitcredentials.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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
+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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitcore-tutorial.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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
+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[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitglossary.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gitsubmodules.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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 gittutorial-2.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-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.51.0/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
 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.51.0/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
@@ -573828,49 +574759,52 @@
     GEN asciidoc.conf
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-backfill.html
+    ASCIIDOC git-archimport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-am.html
+    ASCIIDOC git-archive.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-bisect.html
+    ASCIIDOC git-backfill.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-annotate.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-archimport.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-bugreport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-archive.html
+    ASCIIDOC git-bisect.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-add.html
+    ASCIIDOC git-bundle.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-apply.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-bundle.html
+    ASCIIDOC git-am.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-check-mailmap.html
+    ASCIIDOC git-add.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-cat-file.html
+    ASCIIDOC git-check-ignore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-check-attr.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-check-mailmap.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-branch.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-blame.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-check-ignore.html
+    ASCIIDOC git-cat-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-check-ref-format.html
@@ -573879,10 +574813,10 @@
     ASCIIDOC git-checkout-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-branch.html
+    ASCIIDOC git-cherry.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-cherry.html
+    ASCIIDOC git-citool.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-cherry-pick.html
@@ -573891,46 +574825,37 @@
     ASCIIDOC git-clean.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-citool.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-count-objects.html
+    ASCIIDOC git-commit-graph.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-commit-graph.html
+    ASCIIDOC git-credential-cache--daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-column.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-credential-cache.html
+    ASCIIDOC git-commit-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-checkout.html
+    ASCIIDOC git-count-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-credential-cache--daemon.html
+    ASCIIDOC git-credential-cache.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-commit-tree.html
+    ASCIIDOC git-credential-store.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-credential.html
+    ASCIIDOC git-checkout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-clone.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-cvsexportcommit.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-credential-store.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-cvsimport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-cvsserver.html
+    ASCIIDOC git-cvsexportcommit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-describe.html
@@ -573939,25 +574864,40 @@
     ASCIIDOC git-diagnose.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-credential.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-commit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-fetch-pack.html
+    ASCIIDOC git-cvsserver.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-difftool.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-fast-export.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-difftool.html
+    ASCIIDOC git-fetch-pack.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-diff-pairs.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-fmt-merge-msg.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-diff-pairs.html
+    ASCIIDOC git-diff-files.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-diff-index.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-filter-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-for-each-repo.html
@@ -573972,28 +574912,25 @@
     ASCIIDOC git-for-each-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-filter-branch.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-fast-import.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-diff-files.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-fsmonitor--daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-diff-index.html
+    ASCIIDOC git-diff-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-get-tar-commit-id.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-gui.html
+    ASCIIDOC git-gc.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-diff.html
+    ASCIIDOC git-grep.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-fsck.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-hook.html
@@ -574002,55 +574939,43 @@
     ASCIIDOC git-hash-object.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-grep.html
+    ASCIIDOC git-gui.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-fsck.html
+    ASCIIDOC git-diff.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-help.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-format-patch.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-gc.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-http-fetch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-http-push.html
+    ASCIIDOC git-http-backend.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-init-db.html
+    ASCIIDOC git-http-push.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-diff-tree.html
+    ASCIIDOC git-format-patch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-imap-send.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-index-pack.html
+    ASCIIDOC git-init-db.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-http-backend.html
+    ASCIIDOC git-index-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-instaweb.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-init.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-interpret-trailers.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-mailinfo.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-mailsplit.html
+    ASCIIDOC git-init.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-ls-remote.html
@@ -574059,10 +574984,10 @@
     ASCIIDOC git-ls-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-ls-files.html
+    ASCIIDOC git-mailsplit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-merge-one-file.html
+    ASCIIDOC git-mailinfo.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-merge-base.html
@@ -574071,55 +574996,61 @@
     ASCIIDOC git-merge-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-merge-tree.html
+    ASCIIDOC git-ls-files.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-mktree.html
+    ASCIIDOC git-merge-file.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-merge-one-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-mergetool--lib.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-merge-file.html
+    ASCIIDOC git-maintenance.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-mktag.html
+    ASCIIDOC git-mktree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-mergetool.html
+    ASCIIDOC git-merge-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-mv.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-multi-pack-index.html
+    ASCIIDOC git-name-rev.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-maintenance.html
+    ASCIIDOC git-mktag.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-name-rev.html
+    ASCIIDOC git-mergetool.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-patch-id.html
+    ASCIIDOC git-multi-pack-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-prune.html
+    ASCIIDOC git-patch-id.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-pack-refs.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-pack-redundant.html
+    ASCIIDOC git-prune.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-prune-packed.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-merge.html
+    ASCIIDOC git-pack-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-notes.html
+    ASCIIDOC git-pack-redundant.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-quiltimport.html
@@ -574128,7 +575059,7 @@
     ASCIIDOC git-p4.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-pack-objects.html
+    ASCIIDOC git-notes.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-range-diff.html
@@ -574140,39 +575071,45 @@
     ASCIIDOC git-reflog.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-remote-ext.html
+    ASCIIDOC git-pull.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-refs.html
+    ASCIIDOC git-receive-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-pull.html
+    ASCIIDOC git-refs.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-remote-fd.html
+    ASCIIDOC git-log.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-receive-pack.html
+    ASCIIDOC git-remote-ext.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-push.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-repack.html
+    ASCIIDOC git-remote-fd.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-remote.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-replace.html
+    ASCIIDOC git-request-pull.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-request-pull.html
+    ASCIIDOC git-replace.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-rerere.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-repack.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-restore.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-reset.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
@@ -574182,73 +575119,70 @@
     ASCIIDOC git-rm.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-restore.html
+    ASCIIDOC git-sh-i18n--envsubst.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-rebase.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-send-pack.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-sh-i18n--envsubst.html
+    ASCIIDOC git-sh-i18n.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-log.html
+    ASCIIDOC git-send-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-shell.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-sh-i18n.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-rev-parse.html
+    ASCIIDOC git-config.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-sh-setup.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-show-index.html
+    ASCIIDOC git-replay.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-send-email.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-replay.html
+    ASCIIDOC git-rev-parse.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-show-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-show-index.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-show-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-stage.html
+    ASCIIDOC git-sparse-checkout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-submodule.html
+    ASCIIDOC git-shortlog.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-stash.html
+    ASCIIDOC git-stage.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-stripspace.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-sparse-checkout.html
+    ASCIIDOC git-status.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-symbolic-ref.html
+    ASCIIDOC git-unpack-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-shortlog.html
+    ASCIIDOC git-rev-list.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-status.html
+    ASCIIDOC git-symbolic-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-switch.html
+    ASCIIDOC git-stash.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-unpack-objects.html
@@ -574260,88 +575194,91 @@
     ASCIIDOC git-tag.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-switch.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-upload-archive.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-unpack-file.html
+    ASCIIDOC git-submodule.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC git-svn.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-update-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-upload-pack.html
+    ASCIIDOC git-var.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-verify-tag.html
+    ASCIIDOC git-update-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-version.html
+    ASCIIDOC git-upload-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-verify-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-verify-commit.html
+    ASCIIDOC git-verify-tag.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-var.html
+    ASCIIDOC git-version.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-update-index.html
+    ASCIIDOC git-verify-commit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-rev-list.html
+    ASCIIDOC git-show.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-svn.html
+    ASCIIDOC git-whatchanged.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-web--browse.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-config.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-whatchanged.html
+    ASCIIDOC git-write-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-write-tree.html
+    ASCIIDOC gitformat-bundle.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-show.html
+    ASCIIDOC gitformat-chunk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-worktree.html
+    ASCIIDOC scalar.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitformat-commit-graph.html
+    ASCIIDOC gitformat-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitformat-chunk.html
+    ASCIIDOC gitformat-signature.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC gitk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC scalar.html
+    ASCIIDOC gitweb.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitformat-bundle.html
+    ASCIIDOC gitformat-commit-graph.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitformat-index.html
+    ASCIIDOC gitformat-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitformat-signature.html
+    ASCIIDOC git-worktree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitweb.html
+    ASCIIDOC gitignore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitmailmap.html
+    ASCIIDOC gitprotocol-capabilities.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitignore.html
+    ASCIIDOC gitmailmap.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC gitmodules.html
@@ -574350,61 +575287,61 @@
     ASCIIDOC gitprotocol-common.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitprotocol-http.html
+    ASCIIDOC githooks.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitformat-pack.html
+    ASCIIDOC gitattributes.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC githooks.html
+    ASCIIDOC gitprotocol-http.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitprotocol-capabilities.html
+    ASCIIDOC gitcli.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitcli.html
+    ASCIIDOC gitcvs-migration.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC gitrepository-layout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitcvs-migration.html
+    ASCIIDOC git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitprotocol-pack.html
+    ASCIIDOC gitcredentials.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitcredentials.html
+    ASCIIDOC gitdiffcore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitattributes.html
+    ASCIIDOC gitnamespaces.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitprotocol-v2.html
+    ASCIIDOC gitpacking.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC giteveryday.html
+    ASCIIDOC gitprotocol-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitdiffcore.html
+    ASCIIDOC gitfaq.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitpacking.html
+    ASCIIDOC gitprotocol-v2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitnamespaces.html
+    ASCIIDOC giteveryday.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitfaq.html
+    ASCIIDOC gitcore-tutorial.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC gitsubmodules.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git.html
+    ASCIIDOC gitweb.conf.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-tools.html
+    ASCIIDOC howto-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC gitrevisions.html
@@ -574413,180 +575350,174 @@
     ASCIIDOC gittutorial-2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto-index.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitweb.conf.html
+    ASCIIDOC gitglossary.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC gitremote-helpers.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto/new-command.html
+    ASCIIDOC git-tools.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gittutorial.html
+    ASCIIDOC gitworkflows.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC howto/using-merge-subtree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitworkflows.html
+    ASCIIDOC gittutorial.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto/use-git-daemon.html
+    ASCIIDOC howto/new-command.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitglossary.html
+    ASCIIDOC howto/revert-branch-rebase.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC gitcore-tutorial.html
+    ASCIIDOC howto/update-hook-example.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto/revert-branch-rebase.html
+    ASCIIDOC howto/separating-topic-branches.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto/using-signed-tag-in-pull-request.html
+    ASCIIDOC howto/use-git-daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto/update-hook-example.html
+    ASCIIDOC howto/setup-git-server-over-http.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto/recover-corrupted-blob-object.html
+    ASCIIDOC howto/using-signed-tag-in-pull-request.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto/separating-topic-branches.html
+    ASCIIDOC howto/revert-a-faulty-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC howto/rebase-from-internal-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto/revert-a-faulty-merge.html
+    ASCIIDOC howto/rebuild-from-update-hook.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto/recover-corrupted-object-harder.html
+    ASCIIDOC howto/coordinate-embargoed-releases.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/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.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto/keep-canonical-history-correct.html
+    ASCIIDOC technical/api-error-handling.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto/rebuild-from-update-hook.html
+    ASCIIDOC howto/maintain-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/api-error-handling.html
+    ASCIIDOC howto/recover-corrupted-object-harder.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC git-bisect-lk2009.html
+    ASCIIDOC howto/keep-canonical-history-correct.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/api-path-walk.html
+    ASCIIDOC technical/api-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto/coordinate-embargoed-releases.html
+    ASCIIDOC git-bisect-lk2009.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC howto/maintain-git.html
+    ASCIIDOC technical/api-simple-ipc.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/api-merge.html
+    ASCIIDOC technical/api-path-walk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC BreakingChanges.html
+    ASCIIDOC technical/api-parse-options.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC DecisionMaking.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/api-simple-ipc.html
+    ASCIIDOC ReviewingGuidelines.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC ToolsForGit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/api-parse-options.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC ReviewingGuidelines.html
+    ASCIIDOC BreakingChanges.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC technical/long-running-process-protocol.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC MyFirstObjectWalk.html
+    ASCIIDOC technical/bitmap-format.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/multi-pack-index.html
+    ASCIIDOC technical/build-systems.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC technical/api-trace2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/build-systems.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/bitmap-format.html
+    ASCIIDOC SubmittingPatches.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/hash-function-transition.html
+    ASCIIDOC technical/bundle-uri.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/parallel-checkout.html
+    ASCIIDOC technical/multi-pack-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/platform-support.html
+    ASCIIDOC technical/racy-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/bundle-uri.html
+    ASCIIDOC technical/partial-clone.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC SubmittingPatches.html
+    ASCIIDOC technical/platform-support.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/partial-clone.html
+    ASCIIDOC technical/scalar.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/pack-heuristics.html
+    ASCIIDOC MyFirstContribution.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/send-pack-pipeline.html
+    ASCIIDOC technical/parallel-checkout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/shallow.html
+    ASCIIDOC MyFirstObjectWalk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/racy-git.html
+    ASCIIDOC technical/pack-heuristics.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC technical/trivial-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/scalar.html
+    ASCIIDOC technical/api-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC everyday.html
+    ASCIIDOC technical/shallow.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC git-remote-helpers.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC MyFirstContribution.html
+    ASCIIDOC technical/hash-function-transition.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/api-index.html
+    ASCIIDOC technical/send-pack-pipeline.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC technical/unit-tests.html
+    ASCIIDOC everyday.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
-    ASCIIDOC user-manual.xml
+    ASCIIDOC technical/unit-tests.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     ASCIIDOC technical/reftable.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
+    ASCIIDOC user-manual.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
     XSLTPROC user-manual.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.51.0/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.51.0/Documentation'
@@ -574662,26 +575593,26 @@
    dh_perl
    dh_link
    dh_strip_nondeterminism
-	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/bg/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/ca/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/uk/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
-	Normalized debian/git/usr/share/locale/zh_TW/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/ga/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/id/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/pt_PT/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/tr/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/is/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/it/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/pt_PT/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/ru/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/sv/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/vi/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/zh_CN/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/zh_TW/LC_MESSAGES/git.mo
    debian/rules override_dh_compress
 make[1]: Entering directory '/build/reproducible-path/git-2.51.0'
 dh_compress -X.adoc -Xcontrib
@@ -574697,22 +575628,22 @@
  diversion by libc6 to: /lib/ld-linux-aarch64.so.1.usr-is-merged
    dh_installdeb
    dh_gencontrol
-dpkg-gencontrol: warning: package git-svn: 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-cvs: 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-svn: 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.51.0-1_arm64.deb'.
 dpkg-deb: building package 'git-man' in '../git-man_2.51.0-1_all.deb'.
-dpkg-deb: building package 'git-doc' in '../git-doc_2.51.0-1_all.deb'.
 dpkg-deb: building package 'git-dbgsym' in '../git-dbgsym_2.51.0-1_arm64.deb'.
-dpkg-deb: building package 'git-email' in '../git-email_2.51.0-1_all.deb'.
-dpkg-deb: building package 'git-gui' in '../git-gui_2.51.0-1_all.deb'.
-dpkg-deb: building package 'git-svn' in '../git-svn_2.51.0-1_all.deb'.
+dpkg-deb: building package 'git' in '../git_2.51.0-1_arm64.deb'.
+dpkg-deb: building package 'git-doc' in '../git-doc_2.51.0-1_all.deb'.
 dpkg-deb: building package 'git-cvs' in '../git-cvs_2.51.0-1_all.deb'.
+dpkg-deb: building package 'git-svn' in '../git-svn_2.51.0-1_all.deb'.
+dpkg-deb: building package 'git-email' in '../git-email_2.51.0-1_all.deb'.
 dpkg-deb: building package 'git-all' in '../git-all_2.51.0-1_all.deb'.
+dpkg-deb: building package 'git-gui' in '../git-gui_2.51.0-1_all.deb'.
 dpkg-deb: building package 'gitk' in '../gitk_2.51.0-1_all.deb'.
 dpkg-deb: building package 'gitweb' in '../gitweb_2.51.0-1_all.deb'.
  dpkg-genbuildinfo --build=binary -O../git_2.51.0-1_arm64.buildinfo
@@ -574722,12 +575653,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/1962045/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/1962045/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/295742 and its subdirectories
-I: Current time: Tue Aug 26 20:26:56 -12 2025
-I: pbuilder-time-stamp: 1756283216
+I: removing directory /srv/workspace/pbuilder/1962045 and its subdirectories
+I: Current time: Wed Sep 30 04:57:49 +14 2026
+I: pbuilder-time-stamp: 1790693869